diff --git a/.dockerignore b/.dockerignore
index 603386e55e3b..ee2e8af78dd3 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -24,6 +24,7 @@ keys/setup
 !Cargo.toml
 !contracts/
 !setup_2\^26.key
+!setup_2\^24.key
 # It's required to remove .git from contracts,
 # otherwise yarn tries to use .git parent directory that
 # doesn't exist.
@@ -45,3 +46,4 @@ contracts/.git
 !etc/env/dev.toml
 !etc/env/consensus_secrets.yaml
 !etc/env/consensus_config.yaml
+!rust-toolchain
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 764b85baccaf..dba6efd2fdff 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -18,4 +18,3 @@
 - [ ] Tests for the changes have been added / updated.
 - [ ] Documentation comments have been added / updated.
 - [ ] Code has been formatted via `zk fmt` and `zk lint`.
-- [ ] Spellcheck has been run via `zk spellcheck`.
diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
index 26b89c3bd39b..fabe0b625f01 100644
--- a/.github/release-please/manifest.json
+++ b/.github/release-please/manifest.json
@@ -1,4 +1,4 @@
 {
-  "core": "24.1.0",
-  "prover": "14.0.0"
+  "core": "24.8.0",
+  "prover": "15.0.0"
 }
diff --git a/.github/workflows/build-contract-verifier-template.yml b/.github/workflows/build-contract-verifier-template.yml
index 2346efc96152..2b24801d065f 100644
--- a/.github/workflows/build-contract-verifier-template.yml
+++ b/.github/workflows/build-contract-verifier-template.yml
@@ -31,13 +31,14 @@ jobs:
     runs-on: ${{ fromJSON('["matterlabs-ci-runner", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
     strategy:
       matrix:
-          components:
-            - contract-verifier
-          platforms:
-            - linux/amd64
+        components:
+          - contract-verifier
+          - verified-sources-fetcher
+        platforms:
+          - linux/amd64
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -56,7 +57,7 @@ jobs:
           filtered_tag=""
           while [ true ]; do
             echo "Page: $page"
-            tags=$(curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github+json" \
+            tags=$(run_retried curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github+json" \
               "https://api.github.com/repos/matter-labs/era-contracts/tags?per_page=100&page=${page}" | jq .)
             if [ $(jq length <<<"$tags") -eq 0 ]; then
               echo "No tag found on all pages."
@@ -72,9 +73,9 @@ jobs:
           done
           echo "Contracts tag is: ${filtered_tag}"
           mkdir -p ./contracts
-          curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/l1-contracts.tar.gz
-          curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/l2-contracts.tar.gz
-          curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/system-contracts.tar.gz
+          run_retried curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/l1-contracts.tar.gz
+          run_retried curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/l2-contracts.tar.gz
+          run_retried curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/system-contracts.tar.gz
           tar -C ./contracts -zxf l1-contracts.tar.gz
           tar -C ./contracts -zxf l2-contracts.tar.gz
           tar -C ./contracts -zxf system-contracts.tar.gz
@@ -101,7 +102,9 @@ jobs:
         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 pre_download_compilers.sh
           ci_run sccache --start-server
 
       - name: init
@@ -112,7 +115,7 @@ jobs:
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts
           ci_run zk || true
           ci_run yarn zk build
-          ci_run curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
+          ci_run run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
 
       - name: build contracts
         if: env.BUILD_CONTRACTS == 'true'
@@ -135,14 +138,14 @@ jobs:
           COMPONENT: ${{ matrix.components }}
           PLATFORM: ${{ matrix.platforms }}
         run: |
-          ci_run rustup default nightly-2023-08-21
+          ci_run run_retried rustup default nightly-2024-05-07
           platform=$(echo $PLATFORM | tr '/' '-')
           ci_run zk docker $DOCKER_ACTION --custom-tag=${IMAGE_TAG_SUFFIX} --platform=${PLATFORM} $COMPONENT
       - name: Show sccache stats
         if: always()
         run: |
-          ci_run sccache --show-stats
-          ci_run cat /tmp/sccache_log.txt
+          ci_run sccache --show-stats || true
+          ci_run cat /tmp/sccache_log.txt || true
 
   create_manifest:
     name: Create release manifest
@@ -154,10 +157,12 @@ jobs:
         component:
           - name: contract-verifier
             platform: linux/amd64
+          - name: verified-sources-fetcher
+            platform: linux/amd64
     env:
       IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
 
       - name: login to Docker registries
         run: |
diff --git a/.github/workflows/build-core-template.yml b/.github/workflows/build-core-template.yml
index 27bb29e68165..4ead6cb746dd 100644
--- a/.github/workflows/build-core-template.yml
+++ b/.github/workflows/build-core-template.yml
@@ -36,18 +36,18 @@ jobs:
     runs-on: ${{ fromJSON('["matterlabs-ci-runner", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
     strategy:
       matrix:
-          components:
-            - server-v2
-            - external-node
-            - snapshots-creator
-          platforms:
-            - linux/amd64
-          include:
-            - components: external-node
-              platforms: linux/arm64
+        components:
+          - server-v2
+          - external-node
+          - snapshots-creator
+        platforms:
+          - linux/amd64
+        include:
+          - components: external-node
+            platforms: linux/arm64
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -66,7 +66,7 @@ jobs:
           filtered_tag=""
           while [ true ]; do
             echo "Page: $page"
-            tags=$(curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github+json" \
+            tags=$(run_retried curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -H "Accept: application/vnd.github+json" \
               "https://api.github.com/repos/matter-labs/era-contracts/tags?per_page=100&page=${page}" | jq .)
             if [ $(jq length <<<"$tags") -eq 0 ]; then
               echo "No tag found on all pages."
@@ -82,9 +82,9 @@ jobs:
           done
           echo "Contracts tag is: ${filtered_tag}"
           mkdir -p ./contracts
-          curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/l1-contracts.tar.gz
-          curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/l2-contracts.tar.gz
-          curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/system-contracts.tar.gz
+          run_retried curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/l1-contracts.tar.gz
+          run_retried curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/l2-contracts.tar.gz
+          run_retried curl -s -LO https://github.com/matter-labs/era-contracts/releases/download/${filtered_tag}/system-contracts.tar.gz
           tar -C ./contracts -zxf l1-contracts.tar.gz
           tar -C ./contracts -zxf l2-contracts.tar.gz
           tar -C ./contracts -zxf system-contracts.tar.gz
@@ -111,7 +111,9 @@ jobs:
         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 pre_download_compilers.sh
           ci_run sccache --start-server
 
       - name: init
@@ -122,7 +124,7 @@ jobs:
           ci_run git config --global --add safe.directory /usr/src/zksync/contracts
           ci_run zk || true
           ci_run yarn zk build
-          ci_run curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
+          ci_run run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
 
       - name: build contracts
         if: env.BUILD_CONTRACTS == 'true'
@@ -145,14 +147,14 @@ jobs:
           COMPONENT: ${{ matrix.components }}
           PLATFORM: ${{ matrix.platforms }}
         run: |
-          ci_run rustup default nightly-2023-08-21
+          ci_run run_retried rustup default nightly-2024-05-07
           platform=$(echo $PLATFORM | tr '/' '-')
           ci_run zk docker $DOCKER_ACTION --custom-tag=${IMAGE_TAG_SUFFIX} --platform=${PLATFORM} $COMPONENT
       - name: Show sccache stats
         if: always()
         run: |
-          ci_run sccache --show-stats
-          ci_run cat /tmp/sccache_log.txt
+          ci_run sccache --show-stats || true
+          ci_run cat /tmp/sccache_log.txt || true
 
   create_manifest:
     name: Create release manifest
@@ -168,10 +170,11 @@ jobs:
             platform: linux/amd64,linux/arm64
           - name: snapshots-creator
             platform: linux/amd64
+
     env:
       IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}${{ (inputs.en_alpha_release && matrix.component.name == 'external-node') && '-alpha' || '' }}
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
 
       - 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 526274a59f70..138e93810934 100644
--- a/.github/workflows/build-docker-from-tag.yml
+++ b/.github/workflows/build-docker-from-tag.yml
@@ -29,7 +29,7 @@ jobs:
       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
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
       - name: Generate output with git tag
         id: set
         run: |
@@ -92,3 +92,4 @@ jobs:
     with:
       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 }}
diff --git a/.github/workflows/build-local-node-docker.yml b/.github/workflows/build-local-node-docker.yml
index 442f7ecdb883..e5e8fb69fb1d 100644
--- a/.github/workflows/build-local-node-docker.yml
+++ b/.github/workflows/build-local-node-docker.yml
@@ -18,7 +18,7 @@ jobs:
     name: Local Node - Build and Push Docker Image
     runs-on: [matterlabs-ci-runner]
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -51,6 +51,7 @@ jobs:
       - name: start-services
         run: |
           mkdir -p ./volumes/postgres
+          run_retried docker compose pull zk postgres
           docker compose up -d zk postgres
 
       - name: init
diff --git a/.github/workflows/build-prover-fri-gpu-gar.yml b/.github/workflows/build-prover-fri-gpu-gar.yml
index b919cda71836..4a83af559e50 100644
--- a/.github/workflows/build-prover-fri-gpu-gar.yml
+++ b/.github/workflows/build-prover-fri-gpu-gar.yml
@@ -11,13 +11,17 @@ on:
         description: "Commit sha for downloading setup data from bucket dir"
         required: true
         type: string
+      protocol_version:
+        description: "Protocol version to be included in the images tag"
+        required: true
+        type: string
 
 jobs:
   build-gar-prover-fri-gpu:
     name: Build prover FRI GPU GAR
     runs-on: [matterlabs-ci-runner]
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -44,6 +48,7 @@ jobs:
           push: true
           tags: |
             us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }}
+            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
 
       - name: Login to Asia GAR
         run: |
@@ -54,6 +59,9 @@ jobs:
           docker buildx imagetools create \
             --tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }} \
             us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }}
+          docker buildx imagetools create \
+            --tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }} \
+            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
 
       - name: Login to Europe GAR
         run: |
@@ -64,3 +72,6 @@ jobs:
           docker buildx imagetools create \
             --tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }} \
             us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }}
+          docker buildx imagetools create \
+            --tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }} \
+            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
diff --git a/.github/workflows/build-prover-template.yml b/.github/workflows/build-prover-template.yml
index bd8ba742aed1..d03ae124b176 100644
--- a/.github/workflows/build-prover-template.yml
+++ b/.github/workflows/build-prover-template.yml
@@ -32,6 +32,10 @@ on:
         type: string
         default: "89"
         required: false
+    outputs:
+      protocol_version:
+        description: "Protocol version of the binary"
+        value: ${{ jobs.build-images.outputs.protocol_version }}
 
 jobs:
   build-images:
@@ -41,7 +45,7 @@ jobs:
       RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml"
       ERA_BELLMAN_CUDA_RELEASE: ${{ inputs.ERA_BELLMAN_CUDA_RELEASE }}
       CUDA_ARCH: ${{ inputs.CUDA_ARCH }}
-    runs-on: [matterlabs-ci-runner]
+    runs-on: [ matterlabs-ci-runner ]
     strategy:
       matrix:
         component:
@@ -51,8 +55,11 @@ jobs:
           - witness-vector-generator
           - prover-fri-gateway
           - proof-fri-compressor
+          - proof-fri-gpu-compressor
+    outputs:
+      protocol_version: ${{ steps.protocolversion.outputs.protocol_version }}
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -68,6 +75,7 @@ jobs:
         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
 
@@ -79,10 +87,16 @@ jobs:
           ci_run zk
 
       # We need the CRS only for the fri compressor.
-      - name: download CRS
+      - name: download CRS for CPU compressor
         if: matrix.component == 'proof-fri-compressor'
         run: |
-          ci_run curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
+          ci_run run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
+
+      - 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/'))
@@ -101,7 +115,7 @@ jobs:
           retry_count=0
 
           while [[ $retry_count -lt $max_retries ]]; do
-            response=$(curl -s -w "%{http_code}" -o temp.json "$api_endpoint")
+            response=$(run_retried curl -s -w "%{http_code}" -o temp.json "$api_endpoint")
             http_code=$(echo "$response" | tail -n1)
 
             if [[ "$http_code" == "200" ]]; then
@@ -133,26 +147,38 @@ jobs:
           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: update-images
         env:
           DOCKER_ACTION: ${{ inputs.action }}
           COMPONENT: ${{ matrix.component }}
-        run: |          
-          PASSED_ENV_VARS="ERA_BELLMAN_CUDA_RELEASE,CUDA_ARCH" \
+        run: |
+          PASSED_ENV_VARS="ERA_BELLMAN_CUDA_RELEASE,CUDA_ARCH,PROTOCOL_VERSION" \
           ci_run zk docker $DOCKER_ACTION $COMPONENT
 
       - name: Show sccache stats
         if: always()
         run: |
-          ci_run sccache --show-stats
-          ci_run cat /tmp/sccache_log.txt
+          ci_run sccache --show-stats || true
+          ci_run cat /tmp/sccache_log.txt || true
   
   copy-images:
     name: Copy images between docker registries
+    needs: build-images
     env:
       IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}
+      PROTOCOL_VERSION: ${{ needs.build-images.outputs.protocol_version }}
     runs-on: matterlabs-ci-runner
-    needs: build-images
     if: ${{ inputs.action == 'push' }}
     strategy:
       matrix:
@@ -176,6 +202,9 @@ jobs:
           docker buildx imagetools create \
             --tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }} \
             us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }}
+          docker buildx imagetools create \
+            --tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ needs.build-images.outputs.protocol_version }}-${{ inputs.image_tag_suffix }} \
+            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ needs.build-images.outputs.protocol_version }}-${{ inputs.image_tag_suffix }}
 
       - name: Login and push to Europe GAR
         run: |
@@ -183,4 +212,7 @@ jobs:
           docker buildx imagetools create \
             --tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }} \
             us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ inputs.image_tag_suffix }}
+          docker buildx imagetools create \
+            --tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ needs.build-images.outputs.protocol_version }}-${{ inputs.image_tag_suffix }} \
+            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.component }}:2.0-${{ needs.build-images.outputs.protocol_version }}-${{ inputs.image_tag_suffix }}
           
diff --git a/.github/workflows/cargo-license.yaml b/.github/workflows/cargo-license.yaml
index 8daf43ed8a40..db3cd4ddd895 100644
--- a/.github/workflows/cargo-license.yaml
+++ b/.github/workflows/cargo-license.yaml
@@ -4,5 +4,5 @@ jobs:
   cargo-deny:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
     - uses: EmbarkStudios/cargo-deny-action@68cd9c5e3e16328a430a37c743167572e3243e7e
diff --git a/.github/workflows/check-spelling.yml b/.github/workflows/check-spelling.yml
deleted file mode 100644
index 0a3bce24cb7e..000000000000
--- a/.github/workflows/check-spelling.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Check Spelling
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-  merge_group:
-
-env:
-  CARGO_TERM_COLOR: always
-
-jobs:
-  spellcheck:
-    runs-on: [matterlabs-ci-runner]
-    steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
-        with:
-          submodules: "recursive"
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Setup environment
-        run: |
-          echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
-          echo $(pwd)/bin >> $GITHUB_PATH
-          echo IN_DOCKER=1 >> .env
-
-      - name: Start services
-        run: |
-          docker compose up -d zk
-
-      - name: Build zk
-        run: |
-          ci_run zk
-
-      - name: Run spellcheck
-        run: |
-          ci_run zk spellcheck
diff --git a/.github/workflows/ci-common-reusable.yml b/.github/workflows/ci-common-reusable.yml
index ce8884f00f6e..191c69180631 100644
--- a/.github/workflows/ci-common-reusable.yml
+++ b/.github/workflows/ci-common-reusable.yml
@@ -9,7 +9,7 @@ jobs:
       RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml"
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -21,7 +21,7 @@ jobs:
 
       - name: Start services
         run: |
-          docker-compose -f ${RUNNER_COMPOSE_FILE} pull
+          run_retried docker-compose -f ${RUNNER_COMPOSE_FILE} pull
           mkdir -p ./volumes/postgres
           docker-compose -f ${RUNNER_COMPOSE_FILE} up --build -d zk postgres
           ci_run sccache --start-server
@@ -29,6 +29,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db setup
 
       # This does both linting and "building". We're using `zk lint prover` as it's common practice within our repo
diff --git a/.github/workflows/ci-core-lint-reusable.yml b/.github/workflows/ci-core-lint-reusable.yml
index 541049cdeb0c..4fd8f76a5383 100644
--- a/.github/workflows/ci-core-lint-reusable.yml
+++ b/.github/workflows/ci-core-lint-reusable.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: [matterlabs-ci-runner]
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -21,18 +21,21 @@ jobs:
       - name: Start services
         run: |
           mkdir -p ./volumes/postgres
+          run_retried docker compose pull zk postgres
           docker compose up -d zk postgres
           ci_run sccache --start-server
 
       - name: Setup db
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db migrate
 
       - name: Lints
         run: |
           ci_run zk fmt --check
           ci_run zk lint rust --check
+          ci_run zk lint toolbox --check
           ci_run zk lint js --check
           ci_run zk lint ts --check
           ci_run zk lint md --check
diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml
index b581803569a9..288bed7f9671 100644
--- a/.github/workflows/ci-core-reusable.yml
+++ b/.github/workflows/ci-core-reusable.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: [matterlabs-ci-runner]
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
           fetch-depth: 0
@@ -53,6 +53,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk run yarn
           ci_run zk db setup
           ci_run zk compiler all
@@ -68,7 +69,7 @@ jobs:
     runs-on: [matterlabs-ci-runner]
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
           fetch-depth: 0
@@ -104,7 +105,7 @@ jobs:
       # `sleep 60` because we need to wait until server added all the tokens
       - name: Run server
         run: |
-          ci_run zk server --uring --components api,tree,eth,state_keeper,housekeeper,commitment_generator &>server.log &
+          ci_run zk server --uring --components api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads &>server.log &
           ci_run sleep 60
 
       - name: Deploy legacy era contracts
@@ -120,8 +121,8 @@ jobs:
       - name: Show sccache logs
         if: always()
         run: |
-          ci_run sccache --show-stats
-          ci_run cat /tmp/sccache_log.txt
+          ci_run sccache --show-stats || true
+          ci_run cat /tmp/sccache_log.txt || true
 
   integration:
     name: Integration (consensus=${{ matrix.consensus }}, base_token=${{ matrix.base_token }}, deployment_mode=${{ matrix.deployment_mode }})
@@ -134,11 +135,11 @@ jobs:
         base_token: ["Eth", "Custom"]
         deployment_mode: ["Rollup", "Validium"]
     env:
-      SERVER_COMPONENTS: "api,tree,eth,state_keeper,housekeeper,commitment_generator${{ matrix.consensus && ',consensus' || '' }}"
+      SERVER_COMPONENTS: "api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,da_dispatcher,base_token_ratio_persister${{ matrix.consensus && ',consensus' || '' }}"
 
     runs-on: [matterlabs-ci-runner]
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
           fetch-depth: 0
@@ -182,6 +183,7 @@ jobs:
       - name: Start services
         run: |
           ci_localnet_up
+          ci_run pre_download_compilers.sh
           ci_run sccache --start-server
 
       - name: Init
@@ -191,6 +193,7 @@ jobs:
           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
+          ci_run run_retried rustup show
           if [[ "${{ matrix.deployment_mode }}" == "Validium" ]]; then
             ci_run zk env dev_validium_docker
             ci_run zk config compile dev_validium_docker
@@ -217,12 +220,29 @@ jobs:
         # We use `yarn` directly because the test launches `zk` commands in both server and EN envs.
         # An empty topmost environment helps avoid a mess when redefining env vars shared between both envs
         # (e.g., DATABASE_URL).
+        #
+        # Since `base_token` doesn't meaningfully influence the test, we use it as a flag for
+        # enabling / disabling tree during pruning.
         run: |
           if [[ "${{ matrix.deployment_mode }}" == "Validium" ]]; then
             ci_run zk config compile ext-node-validium
             ci_run zk config compile ext-node-validium-docker
           fi
-          ENABLE_CONSENSUS=${{ matrix.consensus }} DEPLOYMENT_MODE=${{ matrix.deployment_mode }} PASSED_ENV_VARS="ENABLE_CONSENSUS,DEPLOYMENT_MODE" ci_run yarn snapshot-recovery-test snapshot-recovery-test
+          ENABLE_CONSENSUS=${{ matrix.consensus }} \
+          DEPLOYMENT_MODE=${{ matrix.deployment_mode }} \
+          SNAPSHOTS_CREATOR_VERSION=${{ matrix.deployment_mode == 'Validium' && '0' || '1' }} \
+          DISABLE_TREE_DURING_PRUNING=${{ matrix.base_token == 'Eth' }} \
+          ETH_CLIENT_WEB3_URL="http://reth:8545" \
+          PASSED_ENV_VARS="ENABLE_CONSENSUS,DEPLOYMENT_MODE,DISABLE_TREE_DURING_PRUNING,SNAPSHOTS_CREATOR_VERSION,ETH_CLIENT_WEB3_URL" \
+            ci_run yarn recovery-test snapshot-recovery-test
+
+      - name: Genesis recovery test
+        run: |
+          ENABLE_CONSENSUS=${{ matrix.consensus }} \
+          DEPLOYMENT_MODE=${{ matrix.deployment_mode }} \
+          ETH_CLIENT_WEB3_URL="http://reth:8545" \
+          PASSED_ENV_VARS="ENABLE_CONSENSUS,DEPLOYMENT_MODE,ETH_CLIENT_WEB3_URL" \
+            ci_run yarn recovery-test genesis-recovery-test
 
       - name: Fee projection tests
         run: ci_run zk test i fees
@@ -252,10 +272,13 @@ jobs:
 
       - name: Show snapshot-creator.log logs
         if: always()
-        run: ci_run cat core/tests/snapshot-recovery-test/snapshot-creator.log || true
+        run: ci_run cat core/tests/recovery-test/snapshot-creator.log || true
       - name: Show snapshot-recovery.log logs
         if: always()
-        run: ci_run cat core/tests/snapshot-recovery-test/snapshot-recovery.log || true
+        run: ci_run cat core/tests/recovery-test/snapshot-recovery.log || true
+      - name: Show genesis-recovery.log logs
+        if: always()
+        run: ci_run cat core/tests/recovery-test/genesis-recovery.log || true
 
       - name: Show revert.log logs
         if: always()
@@ -265,11 +288,15 @@ jobs:
         if: always()
         run: ci_run cat core/tests/upgrade-test/upgrade.log || true
 
+      - name: Show fee-projection.log logs
+        if: always()
+        run: ci_run cat core/tests/ts-integration/fees.log || true
+
       - name: Show sccache logs
         if: always()
         run: |
-          ci_run sccache --show-stats
-          ci_run cat /tmp/sccache_log.txt
+          ci_run sccache --show-stats || true
+          ci_run cat /tmp/sccache_log.txt || true
 
   external-node:
     name: External node (consensus=${{ matrix.consensus }}, base_token=${{ matrix.base_token }}, deployment_mode=${{ matrix.deployment_mode }})
@@ -282,12 +309,12 @@ jobs:
     runs-on: [matterlabs-ci-runner]
 
     env:
-      SERVER_COMPONENTS: "api,tree,eth,state_keeper,housekeeper,commitment_generator${{ matrix.consensus && ',consensus' || '' }}"
+      SERVER_COMPONENTS: "api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,da_dispatcher,base_token_ratio_persister${{ matrix.consensus && ',consensus' || '' }}"
       EXT_NODE_FLAGS: "${{ matrix.consensus && '-- --enable-consensus' || '' }}"
 
     steps:
       - name: Checkout code # Checks out the repository under $GITHUB_WORKSPACE, so the job can access it.
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
           fetch-depth: 0
@@ -303,6 +330,7 @@ jobs:
       - name: Start services
         run: |
           ci_localnet_up
+          ci_run pre_download_compilers.sh
           ci_run sccache --start-server
 
       - name: Init
@@ -312,6 +340,7 @@ jobs:
           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
+          ci_run run_retried rustup show
           if [[ "${{ matrix.deployment_mode }}" == "Rollup" ]]; then
             ci_run zk config compile
           elif [[ "${{ matrix.deployment_mode }}" == "Validium" ]]; then
@@ -389,5 +418,5 @@ jobs:
       - name: Show sccache logs
         if: always()
         run: |
-          ci_run sccache --show-stats
-          ci_run cat /tmp/sccache_log.txt
+          ci_run sccache --show-stats || true
+          ci_run cat /tmp/sccache_log.txt || true
diff --git a/.github/workflows/ci-docs-reusable.yml b/.github/workflows/ci-docs-reusable.yml
index 68d4c1adb946..82ef312c9832 100644
--- a/.github/workflows/ci-docs-reusable.yml
+++ b/.github/workflows/ci-docs-reusable.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: [matterlabs-ci-runner]
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -20,6 +20,7 @@ jobs:
       - name: Start services
         run: |
           mkdir -p ./volumes/postgres
+          run_retried docker compose pull zk postgres
           docker compose up -d zk postgres
 
       - name: Lints
diff --git a/.github/workflows/ci-prover-reusable.yml b/.github/workflows/ci-prover-reusable.yml
index ee6d5da99843..6a8813a0a343 100644
--- a/.github/workflows/ci-prover-reusable.yml
+++ b/.github/workflows/ci-prover-reusable.yml
@@ -9,7 +9,7 @@ jobs:
       RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml"
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -21,7 +21,7 @@ jobs:
 
       - name: Start services
         run: |
-          docker-compose -f ${RUNNER_COMPOSE_FILE} pull
+          run_retried docker-compose -f ${RUNNER_COMPOSE_FILE} pull
           mkdir -p ./volumes/postgres
           docker-compose -f ${RUNNER_COMPOSE_FILE} up --build -d zk postgres
           ci_run sccache --start-server
@@ -40,7 +40,7 @@ jobs:
       RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml"
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -52,7 +52,7 @@ jobs:
 
       - name: Start services
         run: |
-          docker-compose -f ${RUNNER_COMPOSE_FILE} pull
+          run_retried docker-compose -f ${RUNNER_COMPOSE_FILE} pull
           mkdir -p ./volumes/postgres
           docker-compose -f ${RUNNER_COMPOSE_FILE} up --build -d zk postgres
           ci_run sccache --start-server
@@ -60,6 +60,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db setup
 
       - name: Prover unit tests
diff --git a/.github/workflows/ci-zk-toolbox-reusable.yml b/.github/workflows/ci-zk-toolbox-reusable.yml
new file mode 100644
index 000000000000..102c3d56c331
--- /dev/null
+++ b/.github/workflows/ci-zk-toolbox-reusable.yml
@@ -0,0 +1,126 @@
+name: Workflow template for CI jobs for Core Components
+on:
+  workflow_call:
+
+env:
+  CLICOLOR: 1
+
+jobs:
+  lint:
+    name: lint
+    uses: ./.github/workflows/ci-core-lint-reusable.yml
+
+  build:
+    runs-on: [matterlabs-ci-runner]
+
+    steps:
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        with:
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Setup environment
+        run: |
+          echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
+          echo $(pwd)/bin >> $GITHUB_PATH
+          echo IN_DOCKER=1 >> .env
+
+      - name: Start services
+        run: |
+          ci_localnet_up
+          ci_run sccache --start-server
+
+      - name: Build
+        run: |
+          ci_run bash -c "cd zk_toolbox && cargo build --release"
+
+      # Compress with tar to avoid permission loss
+      # https://github.com/actions/upload-artifact?tab=readme-ov-file#permission-loss
+      - name: Tar zk_toolbox binaries
+        run: |
+          tar -C ./zk_toolbox/target/release -cvf zk_toolbox.tar zk_inception zk_supervisor
+
+      - name: Upload zk_toolbox binaries
+        uses: actions/upload-artifact@v4
+        with:
+          name: zk_toolbox
+          path: zk_toolbox.tar
+          compression-level: 0
+
+  tests:
+    runs-on: [matterlabs-ci-runner]
+    needs: [build]
+
+    steps:
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        with:
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Download zk_toolbox binaries
+        uses: actions/download-artifact@v4
+        with:
+          name: zk_toolbox
+          path: .
+
+      - name: Extract zk_toolbox binaries
+        run: |
+          tar -xvf zk_toolbox.tar -C ./bin
+
+      - name: Setup environment
+        run: |
+          echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
+          echo $(pwd)/bin >> $GITHUB_PATH
+          echo IN_DOCKER=1 >> .env
+
+      - name: Start services
+        run: |
+          ci_localnet_up
+          ci_run sccache --start-server
+
+      - name: Initialize ecosystem
+        run: |
+          ci_run zk_inception ecosystem init --deploy-paymaster --deploy-erc20 \
+          --deploy-ecosystem --l1-rpc-url=http://reth:8545 \
+          --server-db-url=postgres://postgres:notsecurepassword@postgres:5432 \
+          --server-db-name=zksync_server_localhost_era \
+          --prover-db-url=postgres://postgres:notsecurepassword@postgres:5432 \
+          --prover-db-name=zksync_prover_localhost_era \
+          --ignore-prerequisites --verbose
+
+      - name: Run server
+        run: |
+          ci_run zk_inception server --ignore-prerequisites &>server.log &
+          ci_run sleep 5
+
+      - name: Run integration tests
+        run: |
+          ci_run zk_supervisor test integration --ignore-prerequisites --verbose
+
+      - name: Run external node server
+        run: |
+          ci_run zk_inception external-node configs --db-url=postgres://postgres:notsecurepassword@postgres:5432 \
+          --db-name=zksync_en_localhost_era --l1-rpc-url=http://reth:8545
+          ci_run zk_inception external-node init --ignore-prerequisites
+          ci_run zk_inception external-node run --ignore-prerequisites &>external_node.log &
+          ci_run sleep 5
+
+      - name: Run integration tests en
+        run: |
+          ci_run zk_supervisor test integration --ignore-prerequisites --verbose --external-node
+
+      - name: Run revert tests
+        run: |
+          ci_run zk_supervisor test revert --ignore-prerequisites --verbose
+
+      - name: Show server.log logs
+        if: always()
+        run: ci_run cat server.log || true
+
+      - name: Show external_node.log logs
+        if: always()
+        run: ci_run cat external_node.log || true
+
+      - name: Show revert.log logs
+        if: always()
+        run: ci_run cat ./core/tests/revert-test/revert.log || true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d5f4a474c7f..9e4d093e317a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,10 +20,11 @@ jobs:
     outputs:
       core: ${{ steps.changed-files.outputs.core_any_changed }}
       prover: ${{ steps.changed-files.outputs.prover_any_changed }}
+      zk_toolbox: ${{ steps.changed-files.outputs.zk_toolbox_any_changed }}
       docs: ${{ steps.changed-files.outputs.docs_any_changed }}
       all: ${{ steps.changed-files.outputs.all_any_changed }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           fetch-depth: 2
           submodules: "recursive"
@@ -60,6 +61,10 @@ jobs:
               - '!**/*.md'
               - '!**/*.MD'
               - 'docker-compose.yml'
+            zk_toolbox:
+              - 'zk_toolbox/**'
+              - '!**/*.md'
+              - '!**/*.MD'
             docs:
               - '**/*.md'
               - '**/*.MD'
@@ -91,6 +96,12 @@ jobs:
     name: CI for Prover Components
     uses: ./.github/workflows/ci-prover-reusable.yml
 
+  ci-for-zk-toolbox:
+    needs: changed_files
+    if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.zk_toolbox == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
+    name: CI for zk_toolbox
+    uses: ./.github/workflows/ci-zk-toolbox-reusable.yml
+
   ci-for-docs:
     needs: changed_files
     if: needs.changed_files.outputs.docs == 'true'
@@ -146,7 +157,7 @@ jobs:
     name: Github Status Check
     runs-on: ubuntu-latest
     if: always() && !cancelled()
-    needs: [ci-for-core-lint, ci-for-core, ci-for-prover, ci-for-docs, build-core-images, build-prover-images]
+    needs: [ci-for-core-lint, ci-for-common, ci-for-core, ci-for-prover, ci-for-docs, build-core-images, build-contract-verifier, build-prover-images]
     steps:
       - name: Status
         run: |
diff --git a/.github/workflows/nodejs-license.yaml b/.github/workflows/nodejs-license.yaml
index 80a2eb276b3f..b776673e1298 100644
--- a/.github/workflows/nodejs-license.yaml
+++ b/.github/workflows/nodejs-license.yaml
@@ -30,7 +30,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
       - run: |
           DIRS=$(find -not \( -path \*node_modules -prune \) -type f -name yarn.lock  | xargs dirname | awk -v RS='' -v OFS='","' 'NF { $1 = $1; print "\"" $0 "\"" }')
           echo "matrix=[${DIRS}]" >> $GITHUB_OUTPUT
@@ -44,7 +44,7 @@ jobs:
         dir: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
     steps:
       - name: Checkout latest code
-        uses: actions/checkout@v3
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
 
       - name: Use Node.js
         uses: actions/setup-node@v3
diff --git a/.github/workflows/protobuf.yaml b/.github/workflows/protobuf.yaml
index bc8da1a3a347..d2885f613aa0 100644
--- a/.github/workflows/protobuf.yaml
+++ b/.github/workflows/protobuf.yaml
@@ -36,7 +36,7 @@ jobs:
       - uses: mozilla-actions/sccache-action@v0.0.3
 
       # before
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           ref: ${{ env.BASE }}
           path: before
@@ -55,7 +55,7 @@ jobs:
           | xargs cat > ./before.binpb
 
       # after
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           ref: ${{ env.HEAD }}
           path: after
diff --git a/.github/workflows/release-please-cargo-lock.yml b/.github/workflows/release-please-cargo-lock.yml
index bf0e8e051022..a602eaaf083a 100644
--- a/.github/workflows/release-please-cargo-lock.yml
+++ b/.github/workflows/release-please-cargo-lock.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: [matterlabs-ci-runner]
 
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
           persist-credentials: false
diff --git a/.github/workflows/release-stable-en.yml b/.github/workflows/release-stable-en.yml
index 253f89755ebb..b68f36c3e6fd 100644
--- a/.github/workflows/release-stable-en.yml
+++ b/.github/workflows/release-stable-en.yml
@@ -13,7 +13,9 @@ jobs:
     runs-on: [matterlabs-ci-runner]
     steps:
       - name: Login to Docker registries
-        run: docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
+        run: |
+          docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
+          gcloud auth configure-docker us-docker.pkg.dev -q
 
       - name: Check if alpha image exists
         run: |
@@ -22,13 +24,29 @@ jobs:
           exitcode=$?
           set -e
           if [[ "$exitcode" -eq "1" ]]; then
-            echo "Image matterlabs/external-node:${{ inputs.tag_name }} doesn't exist"
+            echo "Image matterlabs/external-node:${{ inputs.tag_name }}-alpha doesn't exist"
             exit 1
           fi
 
       - name: Push stable image
         run: |
-          docker pull matterlabs/external-node:${{ inputs.tag_name }}-alpha
-          docker tag matterlabs/external-node:${{ inputs.tag_name }}-alpha \
-            matterlabs/external-node:${{ inputs.tag_name }}
-          docker push matterlabs/external-node:${{ inputs.tag_name }}
+          docker_repositories=("matterlabs/external-node" "us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/external-node")
+          platforms=("linux/amd64" "linux/arm64")
+          tag_name="${{ inputs.tag_name }}"
+          for repo in "${docker_repositories[@]}"; do
+            platform_tags=""
+            for platform in "${platforms[@]}"; do
+              platform=$(echo $platform | tr '/' '-')
+              alpha_tag="${repo}:${tag_name}-alpha-${platform}"
+              tag="${repo}:${tag_name}-${platform}"
+              docker pull $alpha_tag
+              docker tag $alpha_tag $tag
+              docker push $tag
+               
+              platform_tags+=" --amend $tag"
+            done
+            for manifest in "${repo}:${tag_name}" "${repo}:2.0-${tag_name}"; do
+              docker manifest create ${manifest} ${platform_tags}
+              docker manifest push ${manifest}
+            done
+          done
diff --git a/.github/workflows/release-test-stage.yml b/.github/workflows/release-test-stage.yml
index c54d84565015..dc56aa977617 100644
--- a/.github/workflows/release-test-stage.yml
+++ b/.github/workflows/release-test-stage.yml
@@ -6,7 +6,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ github.event_name != 'push' || github.ref != 'refs/heads/main' }}
 
 jobs:
   changed_files:
@@ -17,7 +17,7 @@ jobs:
       prover: ${{ steps.changed-files-yaml.outputs.prover_any_changed }}
       all: ${{ steps.changed-files-yaml.outputs.all_any_changed }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           fetch-depth: 2
 
@@ -45,7 +45,7 @@ jobs:
       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
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
 
       - name: Generate image tag suffix
         id: generate-tag-suffix
@@ -103,3 +103,4 @@ jobs:
     with:
       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 }}
diff --git a/.github/workflows/secrets_scanner.yaml b/.github/workflows/secrets_scanner.yaml
index 6a1faa200cc4..fa896bf10561 100644
--- a/.github/workflows/secrets_scanner.yaml
+++ b/.github/workflows/secrets_scanner.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           fetch-depth: 0
       - name: TruffleHog OSS
diff --git a/.github/workflows/vm-perf-comparison.yml b/.github/workflows/vm-perf-comparison.yml
index a6b2b71ce605..53dada123574 100644
--- a/.github/workflows/vm-perf-comparison.yml
+++ b/.github/workflows/vm-perf-comparison.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: checkout base branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
           fetch-depth: 0
@@ -38,6 +38,7 @@ jobs:
 
       - name: init
         run: |
+          run_retried docker compose pull zk
           docker compose up -d zk
 
       - name: run benchmarks on base branch
diff --git a/.github/workflows/vm-perf-to-prometheus.yml b/.github/workflows/vm-perf-to-prometheus.yml
index 8bf905d7c0b7..fce7ead2d696 100644
--- a/.github/workflows/vm-perf-to-prometheus.yml
+++ b/.github/workflows/vm-perf-to-prometheus.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: [matterlabs-ci-runner]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -28,6 +28,7 @@ jobs:
 
       - name: init
         run: |
+          run_retried docker compose pull zk
           docker compose up -d zk
           ci_run zk
           ci_run zk compiler system-contracts
diff --git a/.github/workflows/zk-environment-publish.yml b/.github/workflows/zk-environment-publish.yml
index 0551b15aac50..46ceeb2cb5a9 100644
--- a/.github/workflows/zk-environment-publish.yml
+++ b/.github/workflows/zk-environment-publish.yml
@@ -1,6 +1,10 @@
 name: Publish zk-environment Docker images
 
 on:
+  # Workflow dispatch, to allow building and pushing new environments.
+  # It will NOT mark them as latest.
+  workflow_dispatch:
+
   push:
     branches:
       - main
@@ -26,7 +30,7 @@ jobs:
       zk_environment_cuda_12_0: ${{ steps.changed-files-yaml.outputs.zk_env_cuda_12_any_changed }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
           submodules: "recursive"
 
@@ -46,7 +50,7 @@ jobs:
               - .github/workflows/zk-environment-publish.yml
 
   get_short_sha:
-    if: needs.changed_files.outputs.zk_environment == 'true'
+    if: ${{ (needs.changed_files.outputs.zk_environment == 'true') || (github.event_name == 'workflow_dispatch') }}
     needs: [changed_files]
     runs-on: ubuntu-latest
     outputs:
@@ -60,7 +64,8 @@ jobs:
         run: echo "short_sha=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
 
   zk_environment:
-    if: needs.changed_files.outputs.zk_environment == 'true'
+    # Build and push new environment, if workflow dispatch is requested.
+    if: ${{ (needs.changed_files.outputs.zk_environment == 'true') || (github.event_name == 'workflow_dispatch') }}
     needs: [changed_files, get_short_sha]
     name: Build and optionally push zk-environment Docker images to Docker Hub
     strategy:
@@ -79,7 +84,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # v2
       - name: Log in to Docker Hub
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'workflow_dispatch') }}
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
@@ -91,7 +96,7 @@ jobs:
           target: rust-lightweight
           tags: "matterlabs/zk-environment:${{ needs.get_short_sha.outputs.short_sha }}-lightweight-${{ matrix.arch }}"
           build-args: ARCH=${{ matrix.arch }}
-          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+          push: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'workflow_dispatch') }}
       - name: Build and optionally push zk-environment lightweight Rust nightly
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
@@ -99,9 +104,10 @@ jobs:
           target: rust-lightweight-nightly
           tags: "matterlabs/zk-environment:${{ needs.get_short_sha.outputs.short_sha }}-lightweight-nightly-${{ matrix.arch }}"
           build-args: ARCH=${{ matrix.arch }}
-          push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+          push: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'workflow_dispatch') }}
 
   zk_environment_multiarch_manifest:
+    # We'll update the 'latest' tag, only on environments generated from 'main'.
     if: needs.changed_files.outputs.zk_environment == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: [changed_files, get_short_sha, zk_environment]
     runs-on: ubuntu-latest
diff --git a/.gitignore b/.gitignore
index d6658ac4df42..32ed5815b017 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@
 node_modules
 *.log
 target
-a.out 
+a.out
 .gitconfig
 cobertura.xml
 tags
@@ -30,6 +30,7 @@ Cargo.lock
 !/Cargo.lock
 !/infrastructure/zksync-crypto/Cargo.lock
 !/prover/Cargo.lock
+!/zk_toolbox/Cargo.lock
 
 /etc/env/target/*
 /etc/env/.current
@@ -41,8 +42,20 @@ Cargo.lock
 !/etc/env/configs/ext-node-validium.toml
 !/etc/env/configs/ext-node-docker.toml
 !/etc/env/configs/ext-node-validium-docker.toml
+!/etc/env/configs/stage.toml
+!/etc/env/configs/stage-proofs.toml
+!/etc/env/configs/testnet.toml
+!/etc/env/configs/mainnet.toml
 /etc/env/l1-inits
+!/etc/env/l1-inits/stage.env
+!/etc/env/l1-inits/stage_proofs.env
+!/etc/env/l1-inits/testnet.env
+!/etc/env/l1-inits/mainnet.env
 /etc/env/l2-inits
+!/etc/env/l2-inits/stage.init.env
+!/etc/env/l2-inits/stage_proofs.init.env
+!/etc/env/l2-inits/testnet.init.env
+!/etc/env/l2-inits/mainnet.init.env
 !/etc/env/base
 !/etc/env/file_based
 !/etc/env/dev.toml
@@ -96,3 +109,7 @@ hyperchain-*.yml
 
 # Prover keys that should not be commited
 prover/vk_setup_data_generator_server_fri/data/setup_*
+
+# Zk Toolbox
+chains/era/configs/*
+configs/*
diff --git a/CODEOWNERS b/CODEOWNERS
index eea7f1fa1373..63094b333057 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,4 +1,4 @@
-.github/release-please/** @RomanBrodetski @perekopskiy @Deniallugo @popzxc
-**/CHANGELOG.md @RomanBrodetski @perekopskiy @Deniallugo @popzxc
+.github/release-please/** @RomanBrodetski @perekopskiy @Deniallugo @popzxc @EmilLuta
+**/CHANGELOG.md @RomanBrodetski @perekopskiy @Deniallugo @popzxc @EmilLuta
 CODEOWNERS @RomanBrodetski @perekopskiy @Deniallugo @popzxc
 .github/workflows/** @matter-labs/devops
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a30e273d6046..0791a311fed3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,7 +40,7 @@ We aim to make it as easy as possible to contribute to the mission. This is stil
 and suggestions here too. Some resources to help:
 
 1. [In-repo docs aimed at developers](docs)
-2. [zkSync Era docs!](https://era.zksync.io/docs/)
+2. [ZKsync Era docs!](https://docs.zksync.io)
 3. Company links can be found in the [repositories' readme](README.md)
 
 ## Code of Conduct
@@ -52,8 +52,6 @@ Be polite and respectful.
 **Q**: I have a small contribution that's not getting traction/being merged?
 
 **A**: Due to capacity, contributions that are simple renames of variables or stylistic/minor text improvements, one-off
-typo fix will not be merged. If you do find any typos or grammar errors, the preferred avenue is to improve the existing
-spellchecker. Given you have no technical prowess to do so, please create an issue. Please note that issues will be
-resolved on a best effort basis.
+typo fix will not be merged.
 
 ### Thank you
diff --git a/Cargo.lock b/Cargo.lock
index 050073afbb06..5cc13f2897ce 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -96,21 +96,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
 [[package]]
 name = "allocator-api2"
 version = "0.2.16"
@@ -255,33 +240,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
-[[package]]
-name = "async-compression"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2"
-dependencies = [
- "brotli",
- "flate2",
- "futures-core",
- "memchr",
- "pin-project-lite",
- "tokio",
- "zstd",
- "zstd-safe",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c"
-dependencies = [
- "event-listener 4.0.0",
- "event-listener-strategy",
- "pin-project-lite",
-]
-
 [[package]]
 name = "async-stream"
 version = "0.3.5"
@@ -324,6 +282,12 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "atomic-write-file"
 version = "0.1.2"
@@ -358,13 +322,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
- "axum-core",
+ "axum-core 0.3.4",
  "bitflags 1.3.2",
  "bytes",
  "futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 0.2.9",
+ "http-body 0.4.6",
+ "hyper 0.14.29",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper 0.1.2",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
+dependencies = [
+ "async-trait",
+ "axum-core 0.4.3",
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-util",
  "itoa",
  "matchit",
  "memchr",
@@ -376,11 +369,12 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.1",
  "tokio",
  "tower",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -392,12 +386,33 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http",
- "http-body",
+ "http 0.2.9",
+ "http-body 0.4.6",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
  "mime",
+ "pin-project-lite",
  "rustversion",
+ "sync_wrapper 0.1.2",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -451,12 +466,27 @@ version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "base64ct"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
+[[package]]
+name = "basic-toml"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "beef"
 version = "0.5.2"
@@ -477,7 +507,7 @@ dependencies = [
  "blake2s_simd",
  "byteorder",
  "cfg-if 1.0.0",
- "crossbeam 0.7.3",
+ "crossbeam",
  "futures 0.3.28",
  "hex",
  "lazy_static",
@@ -547,9 +577,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -668,13 +698,15 @@ dependencies = [
  "clap 4.4.6",
  "serde_json",
  "tokio",
- "vlog",
  "zksync_block_reverter",
  "zksync_config",
+ "zksync_core_leftovers",
  "zksync_dal",
  "zksync_env_config",
  "zksync_object_store",
+ "zksync_protobuf_config",
  "zksync_types",
+ "zksync_vlog",
 ]
 
 [[package]]
@@ -692,14 +724,14 @@ dependencies = [
 [[package]]
 name = "boojum"
 version = "0.2.0"
-source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#30300f043c9afaeeb35d0f7bd3cc0acaf69ccde4"
+source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#4bcb11f0610302110ae8109af01d5b652191b2f6"
 dependencies = [
  "arrayvec 0.7.4",
  "bincode",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "const_format",
  "convert_case",
- "crossbeam 0.8.2",
+ "crossbeam",
  "crypto-bigint 0.5.3",
  "cs_derive",
  "derivative",
@@ -709,7 +741,6 @@ dependencies = [
  "lazy_static",
  "num-modular",
  "num_cpus",
- "packed_simd",
  "pairing_ce 0.28.5 (git+https://github.com/matter-labs/pairing.git)",
  "rand 0.8.5",
  "rayon",
@@ -737,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0"
 dependencies = [
  "once_cell",
- "proc-macro-crate 2.0.1",
+ "proc-macro-crate 2.0.0",
  "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 2.0.38",
@@ -745,25 +776,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "brotli"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.5.0"
+name = "build_html"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
+checksum = "3108fe6fe7ac796fb7625bdde8fa2b67b5a7731496251ca57c7b8cadd78a16a1"
 
 [[package]]
 name = "bumpalo"
@@ -813,9 +829,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "bytesize"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc"
 
 [[package]]
 name = "bzip2-sys"
@@ -875,6 +897,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
 [[package]]
 name = "cexpr"
 version = "0.6.0"
@@ -1015,7 +1043,7 @@ dependencies = [
 [[package]]
 name = "circuit_encodings"
 version = "0.1.50"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#05502ec874bd1dbfd8a72cd7df340a2fe3f6d3a0"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#a9b1c3a3cf46e683d6a27db33805d994ca8476ec"
 dependencies = [
  "derivative",
  "serde",
@@ -1077,14 +1105,13 @@ dependencies = [
 [[package]]
 name = "circuit_sequencer_api"
 version = "0.1.50"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#05502ec874bd1dbfd8a72cd7df340a2fe3f6d3a0"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#a9b1c3a3cf46e683d6a27db33805d994ca8476ec"
 dependencies = [
  "bellman_ce",
  "circuit_encodings 0.1.50",
  "derivative",
  "rayon",
  "serde",
- "zk_evm 1.5.0",
 ]
 
 [[package]]
@@ -1206,19 +1233,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
-name = "compile-fmt"
-version = "0.1.0"
+name = "combine"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bed69047ed42e52c7e38d6421eeb8ceefb4f2a2b52eed59137f7bad7908f6800"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
 
 [[package]]
-name = "concurrent-queue"
-version = "2.4.0"
+name = "compile-fmt"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
-dependencies = [
- "crossbeam-utils 0.8.16",
-]
+checksum = "bed69047ed42e52c7e38d6421eeb8ceefb4f2a2b52eed59137f7bad7908f6800"
 
 [[package]]
 name = "console"
@@ -1272,9 +1300,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1282,9 +1310,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
@@ -1369,20 +1397,6 @@ dependencies = [
  "crossbeam-utils 0.7.2",
 ]
 
-[[package]]
-name = "crossbeam"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-channel 0.5.8",
- "crossbeam-deque 0.8.3",
- "crossbeam-epoch 0.9.15",
- "crossbeam-queue 0.3.8",
- "crossbeam-utils 0.8.16",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.4.4"
@@ -1548,7 +1562,7 @@ dependencies = [
 [[package]]
 name = "cs_derive"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#30300f043c9afaeeb35d0f7bd3cc0acaf69ccde4"
+source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#4bcb11f0610302110ae8109af01d5b652191b2f6"
 dependencies = [
  "proc-macro-error",
  "proc-macro2 1.0.69",
@@ -1577,16 +1591,15 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "platforms",
  "rustc_version",
  "subtle",
  "zeroize",
@@ -1783,7 +1796,7 @@ checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
  "der 0.7.8",
  "digest 0.10.7",
- "elliptic-curve 0.13.7",
+ "elliptic-curve 0.13.8",
  "rfc6979 0.4.0",
  "signature 2.2.0",
  "spki 0.7.2",
@@ -1844,9 +1857,9 @@ dependencies = [
 
 [[package]]
 name = "elliptic-curve"
-version = "0.13.7"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9775b22bc152ad86a0cf23f0f348b884b26add12bf741e7ffc4d4ab2ab4d205"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct 0.2.0",
  "crypto-bigint 0.5.3",
@@ -2000,27 +2013,6 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
-[[package]]
-name = "event-listener"
-version = "4.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
-dependencies = [
- "event-listener 4.0.0",
- "pin-project-lite",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.0.1"
@@ -2359,7 +2351,7 @@ dependencies = [
  "tracing",
  "zksync_config",
  "zksync_contracts",
- "zksync_core",
+ "zksync_core_leftovers",
  "zksync_dal",
  "zksync_env_config",
  "zksync_node_genesis",
@@ -2376,8 +2368,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if 1.0.0",
+ "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -2412,7 +2406,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils",
- "http",
+ "http 0.2.9",
  "js-sys",
  "pin-project",
  "serde",
@@ -2450,9 +2444,9 @@ dependencies = [
 
 [[package]]
 name = "google-cloud-auth"
-version = "0.13.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1087f1fbd2dd3f58c17c7574ddd99cd61cbbbc2c4dc81114b8687209b196cb"
+checksum = "1112c453c2e155b3e683204ffff52bcc6d6495d04b68d9e90cd24161270c5058"
 dependencies = [
  "async-trait",
  "base64 0.21.5",
@@ -2460,7 +2454,7 @@ dependencies = [
  "google-cloud-token",
  "home",
  "jsonwebtoken",
- "reqwest",
+ "reqwest 0.12.5",
  "serde",
  "serde_json",
  "thiserror",
@@ -2472,21 +2466,22 @@ dependencies = [
 
 [[package]]
 name = "google-cloud-metadata"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc279bfb50487d7bcd900e8688406475fc750fe474a835b2ab9ade9eb1fc90e2"
+checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f"
 dependencies = [
- "reqwest",
+ "reqwest 0.12.5",
  "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "google-cloud-storage"
-version = "0.15.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac04b29849ebdeb9fb008988cc1c4d1f0c9d121b4c7f1ddeb8061df124580e93"
+checksum = "cc0c5b7469142d91bd77959e69375bede324a5def07c7f29aa0d582586cba305"
 dependencies = [
+ "anyhow",
  "async-stream",
  "async-trait",
  "base64 0.21.5",
@@ -2500,8 +2495,9 @@ dependencies = [
  "percent-encoding",
  "pkcs8 0.10.2",
  "regex",
- "reqwest",
- "ring 0.17.7",
+ "reqwest 0.12.5",
+ "reqwest-middleware",
+ "ring",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -2514,9 +2510,9 @@ dependencies = [
 
 [[package]]
 name = "google-cloud-token"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcd62eb34e3de2f085bcc33a09c3e17c4f65650f36d53eb328b00d63bcb536a"
+checksum = "8f49c12ba8b21d128a2ce8585955246977fbce4415f680ebf9199b6f9d6d725f"
 dependencies = [
  "async-trait",
 ]
@@ -2533,7 +2529,7 @@ dependencies = [
  "no-std-compat",
  "nonzero_ext",
  "parking_lot",
- "quanta 0.9.3",
+ "quanta",
  "rand 0.8.5",
  "smallvec",
 ]
@@ -2571,7 +2567,26 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
+ "http 0.2.9",
+ "indexmap 2.1.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
  "indexmap 2.1.0",
  "slab",
  "tokio",
@@ -2608,15 +2623,6 @@ dependencies = [
  "ahash 0.7.7",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash 0.8.7",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.2"
@@ -2636,16 +2642,6 @@ dependencies = [
  "hashbrown 0.14.2",
 ]
 
-[[package]]
-name = "hdrhistogram"
-version = "7.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8"
-dependencies = [
- "byteorder",
- "num-traits",
-]
-
 [[package]]
 name = "heck"
 version = "0.3.3"
@@ -2740,22 +2736,50 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http",
+ "http 0.2.9",
  "pin-project-lite",
 ]
 
 [[package]]
-name = "http-range-header"
-version = "0.3.1"
+name = "http-body"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.1.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "pin-project-lite",
+]
 
 [[package]]
 name = "httparse"
@@ -2771,42 +2795,65 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.26",
+ "http 0.2.9",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
 [[package]]
 name = "hyper-rustls"
-version = "0.24.1"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
 dependencies = [
  "futures-util",
- "http",
- "hyper",
+ "http 1.1.0",
+ "hyper 1.3.1",
+ "hyper-util",
  "log",
- "rustls 0.21.11",
- "rustls-native-certs 0.6.3",
+ "rustls 0.23.10",
+ "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.24.1",
+ "tokio-rustls 0.26.0",
+ "tower-service",
 ]
 
 [[package]]
@@ -2815,7 +2862,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper",
+ "hyper 0.14.29",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2828,29 +2875,65 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper",
+ "hyper 0.14.29",
  "native-tls",
  "tokio",
  "tokio-native-tls",
 ]
 
 [[package]]
-name = "iai"
-version = "0.1.1"
+name = "hyper-tls"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71a816c97c42258aa5834d07590b718b4c9a598944cd39a52dc25b351185d678"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
 
 [[package]]
-name = "iana-time-zone"
-version = "0.1.58"
+name = "hyper-util"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
 dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "hyper 1.3.1",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iai"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71a816c97c42258aa5834d07590b718b4c9a598944cd39a52dc25b351185d678"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
  "windows-core",
 ]
 
@@ -2989,16 +3072,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "iri-string"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21859b667d66a4c1dacd9df0863b3efb65785474255face87f5bca39dd8407c0"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -3023,6 +3096,26 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
+[[package]]
+name = "jni"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+dependencies = [
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
 [[package]]
 name = "jobserver"
 version = "0.1.27"
@@ -3043,9 +3136,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9579d0ca9fb30da026bac2f0f7d9576ec93489aeb7cd4971dd5b4617d82c79b2"
+checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -3061,41 +3154,44 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9f9ed46590a8d5681975f126e22531698211b926129a40a2db47cbca429220"
+checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432"
 dependencies = [
+ "base64 0.22.1",
  "futures-channel",
  "futures-util",
  "gloo-net",
- "http",
+ "http 1.1.0",
  "jsonrpsee-core",
  "pin-project",
- "rustls-native-certs 0.7.0",
+ "rustls 0.23.10",
  "rustls-pki-types",
+ "rustls-platform-verifier",
  "soketto",
  "thiserror",
  "tokio",
- "tokio-rustls 0.25.0",
+ "tokio-rustls 0.26.0",
  "tokio-util",
  "tracing",
  "url",
- "webpki-roots",
 ]
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "776d009e2f591b78c038e0d053a796f94575d66ca4e77dd84bfc5e81419e436c"
+checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b"
 dependencies = [
  "anyhow",
- "async-lock",
  "async-trait",
  "beef",
+ "bytes",
  "futures-timer",
  "futures-util",
- "hyper",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
  "jsonrpsee-types",
  "parking_lot",
  "pin-project",
@@ -3112,15 +3208,20 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572"
+checksum = "2d90064e04fb9d7282b1c71044ea94d0bbc6eff5621c66f1a0bce9e9de7cf3ac"
 dependencies = [
  "async-trait",
- "hyper",
+ "base64 0.22.1",
+ "http-body 1.0.0",
+ "hyper 1.3.1",
  "hyper-rustls",
+ "hyper-util",
  "jsonrpsee-core",
  "jsonrpsee-types",
+ "rustls 0.23.10",
+ "rustls-platform-verifier",
  "serde",
  "serde_json",
  "thiserror",
@@ -3132,26 +3233,30 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d94b7505034e2737e688e1153bf81e6f93ad296695c43958d6da2e4321f0a990"
+checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4"
 dependencies = [
- "heck 0.4.1",
- "proc-macro-crate 2.0.1",
+ "heck 0.5.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.69",
  "quote 1.0.33",
- "syn 1.0.109",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "jsonrpsee-server"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc7c6d1a2c58f6135810284a390d9f823d0f508db74cd914d8237802de80f98"
+checksum = "654afab2e92e5d88ebd8a39d6074483f3f2bfdf91c5ac57fe285e7127cdd4f51"
 dependencies = [
+ "anyhow",
  "futures-util",
- "http",
- "hyper",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-util",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "pin-project",
@@ -3169,12 +3274,12 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3266dfb045c9174b24c77c2dfe0084914bb23a6b2597d70c9dc6018392e1cd1b"
+checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af"
 dependencies = [
- "anyhow",
  "beef",
+ "http 1.1.0",
  "serde",
  "serde_json",
  "thiserror",
@@ -3182,9 +3287,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-wasm-client"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30f36d27503d0efc0355c1630b74ecfb367050847bf7241a0ed75fab6dfa96c0"
+checksum = "4727ac037f834c6f04c0912cada7532dbddb54e92fbc64e33d6cb8c24af313c9"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -3193,11 +3298,11 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "073c077471e89c4b511fa88b3df9a0f0abdf4a0a2e6683dd2ab36893af87bb2d"
+checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e"
 dependencies = [
- "http",
+ "http 1.1.0",
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -3206,13 +3311,14 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "8.3.0"
+version = "9.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
+checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
 dependencies = [
  "base64 0.21.5",
+ "js-sys",
  "pem",
- "ring 0.16.20",
+ "ring",
  "serde",
  "serde_json",
  "simple_asn1",
@@ -3232,13 +3338,13 @@ dependencies = [
 
 [[package]]
 name = "k256"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
 dependencies = [
  "cfg-if 1.0.0",
  "ecdsa 0.16.9",
- "elliptic-curve 0.13.7",
+ "elliptic-curve 0.13.8",
  "once_cell",
  "sha2 0.10.8",
  "signature 2.2.0",
@@ -3256,13 +3362,16 @@ dependencies = [
 [[package]]
 name = "kzg"
 version = "0.1.50"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#394e1c7d1aec06d2f3abd63bdc2ddf0efef5ac49"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#a9b1c3a3cf46e683d6a27db33805d994ca8476ec"
 dependencies = [
  "boojum",
  "derivative",
+ "hex",
+ "once_cell",
  "rayon",
  "serde",
  "serde_json",
+ "serde_with",
  "zkevm_circuits 1.5.0",
 ]
 
@@ -3388,20 +3497,18 @@ dependencies = [
  "envy",
  "futures 0.3.28",
  "hex",
- "metrics",
  "num",
  "once_cell",
- "prometheus_exporter",
  "rand 0.8.5",
  "regex",
- "reqwest",
+ "reqwest 0.12.5",
  "serde",
  "serde_json",
  "static_assertions",
  "thiserror",
  "tokio",
  "tracing",
- "vlog",
+ "vise",
  "zksync_config",
  "zksync_contracts",
  "zksync_eth_client",
@@ -3409,6 +3516,7 @@ dependencies = [
  "zksync_system_constants",
  "zksync_types",
  "zksync_utils",
+ "zksync_vlog",
  "zksync_web3_decl",
 ]
 
@@ -3485,15 +3593,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "mach2"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -3562,67 +3661,12 @@ dependencies = [
  "anyhow",
  "clap 4.4.6",
  "tracing",
- "vlog",
  "zksync_config",
  "zksync_env_config",
  "zksync_merkle_tree",
  "zksync_storage",
  "zksync_types",
-]
-
-[[package]]
-name = "metrics"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5"
-dependencies = [
- "ahash 0.8.7",
- "metrics-macros",
- "portable-atomic",
-]
-
-[[package]]
-name = "metrics-exporter-prometheus"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5"
-dependencies = [
- "base64 0.21.5",
- "hyper",
- "indexmap 1.9.3",
- "ipnet",
- "metrics",
- "metrics-util",
- "quanta 0.11.1",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "metrics-macros"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df"
-dependencies = [
- "proc-macro2 1.0.69",
- "quote 1.0.33",
- "syn 2.0.38",
-]
-
-[[package]]
-name = "metrics-util"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "111cb375987443c3de8d503580b536f77dc8416d32db62d9456db5d93bd7ac47"
-dependencies = [
- "crossbeam-epoch 0.9.15",
- "crossbeam-utils 0.8.16",
- "hashbrown 0.13.2",
- "metrics",
- "num_cpus",
- "quanta 0.11.1",
- "sketches-ddsketch",
+ "zksync_vlog",
 ]
 
 [[package]]
@@ -3711,38 +3755,6 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
-[[package]]
-name = "multivm"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "circuit_sequencer_api 0.1.0",
- "circuit_sequencer_api 0.1.40",
- "circuit_sequencer_api 0.1.41",
- "circuit_sequencer_api 0.1.42",
- "circuit_sequencer_api 0.1.50",
- "ethabi",
- "hex",
- "itertools 0.10.5",
- "once_cell",
- "thiserror",
- "tokio",
- "tracing",
- "vise",
- "zk_evm 1.3.1",
- "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)",
- "zk_evm 1.4.0",
- "zk_evm 1.4.1",
- "zk_evm 1.5.0",
- "zksync_contracts",
- "zksync_eth_signer",
- "zksync_state",
- "zksync_system_constants",
- "zksync_test_account",
- "zksync_types",
- "zksync_utils",
-]
-
 [[package]]
 name = "native-tls"
 version = "0.2.11"
@@ -3767,7 +3779,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "cfg-if 1.0.0",
  "libc",
 ]
@@ -3985,7 +3997,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 2.0.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2 1.0.69",
  "quote 1.0.33",
  "syn 2.0.38",
@@ -4024,7 +4036,7 @@ version = "0.10.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
@@ -4080,9 +4092,9 @@ checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b"
 dependencies = [
  "async-trait",
  "bytes",
- "http",
+ "http 0.2.9",
  "opentelemetry_api",
- "reqwest",
+ "reqwest 0.11.22",
 ]
 
 [[package]]
@@ -4093,14 +4105,14 @@ checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275"
 dependencies = [
  "async-trait",
  "futures-core",
- "http",
+ "http 0.2.9",
  "opentelemetry-http",
  "opentelemetry-proto",
  "opentelemetry-semantic-conventions",
  "opentelemetry_api",
  "opentelemetry_sdk",
  "prost 0.11.9",
- "reqwest",
+ "reqwest 0.11.22",
  "thiserror",
  "tokio",
  "tonic",
@@ -4214,21 +4226,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
 dependencies = [
  "ecdsa 0.16.9",
- "elliptic-curve 0.13.7",
+ "elliptic-curve 0.13.8",
  "primeorder",
  "sha2 0.10.8",
 ]
 
-[[package]]
-name = "packed_simd"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d"
-dependencies = [
- "cfg-if 1.0.0",
- "num-traits",
-]
-
 [[package]]
 name = "pairing_ce"
 version = "0.28.5"
@@ -4257,7 +4259,7 @@ dependencies = [
 [[package]]
 name = "pairing_ce"
 version = "0.28.5"
-source = "git+https://github.com/matter-labs/pairing.git#f55393fd366596eac792d78525d26e9c4d6ed1ca"
+source = "git+https://github.com/matter-labs/pairing.git#d24f2c5871089c4cd4f54c0ca266bb9fef6115eb"
 dependencies = [
  "byteorder",
  "cfg-if 1.0.0",
@@ -4292,12 +4294,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -4335,11 +4331,12 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pem"
-version = "1.1.1"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
+ "serde",
 ]
 
 [[package]]
@@ -4481,12 +4478,6 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
-[[package]]
-name = "platforms"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0"
-
 [[package]]
 name = "plotters"
 version = "0.3.5"
@@ -4538,12 +4529,6 @@ dependencies = [
  "universal-hash",
 ]
 
-[[package]]
-name = "portable-atomic"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b559898e0b4931ed2d3b959ab0c2da4d99cc644c4b0b1a35b4d344027f474023"
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -4582,7 +4567,7 @@ version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
 dependencies = [
- "elliptic-curve 0.13.7",
+ "elliptic-curve 0.13.8",
 ]
 
 [[package]]
@@ -4610,14 +4595,22 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "2.0.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
 dependencies = [
- "toml_datetime",
  "toml_edit 0.20.2",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -4689,18 +4682,6 @@ dependencies = [
  "syn 2.0.38",
 ]
 
-[[package]]
-name = "prometheus_exporter"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "metrics",
- "metrics-exporter-prometheus",
- "tokio",
- "vise",
- "vise-exporter",
-]
-
 [[package]]
 name = "prost"
 version = "0.11.9"
@@ -4821,16 +4802,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "prover_dal"
-version = "0.1.0"
-dependencies = [
- "sqlx",
- "strum",
- "zksync_basic_types",
- "zksync_db_connection",
-]
-
 [[package]]
 name = "ptr_meta"
 version = "0.1.4"
@@ -4878,22 +4849,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "quanta"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
-dependencies = [
- "crossbeam-utils 0.8.16",
- "libc",
- "mach2",
- "once_cell",
- "raw-cpuid",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "quick-protobuf"
 version = "0.8.1"
@@ -5114,11 +5069,53 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
+ "h2 0.3.26",
+ "http 0.2.9",
+ "http-body 0.4.6",
+ "hyper 0.14.29",
+ "hyper-tls 0.5.0",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg 0.50.0",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-rustls",
+ "hyper-tls 0.6.0",
+ "hyper-util",
  "ipnet",
  "js-sys",
  "log",
@@ -5128,9 +5125,11 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sync_wrapper 1.0.1",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -5141,7 +5140,22 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "winreg",
+ "winreg 0.52.0",
+]
+
+[[package]]
+name = "reqwest-middleware"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "http 1.1.0",
+ "reqwest 0.12.5",
+ "serde",
+ "thiserror",
+ "tower-service",
 ]
 
 [[package]]
@@ -5187,30 +5201,15 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.16.20"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
 dependencies = [
  "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
-dependencies = [
- "cc",
- "getrandom",
+ "getrandom",
  "libc",
  "spin 0.9.8",
- "untrusted 0.9.0",
+ "untrusted",
  "windows-sys 0.48.0",
 ]
 
@@ -5338,25 +5337,13 @@ version = "0.38.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.21.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
-dependencies = [
- "log",
- "ring 0.17.7",
- "rustls-webpki 0.101.7",
- "sct",
-]
-
 [[package]]
 name = "rustls"
 version = "0.22.4"
@@ -5364,23 +5351,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
 dependencies = [
  "log",
- "ring 0.17.7",
+ "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.2",
+ "rustls-webpki",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
-name = "rustls-native-certs"
-version = "0.6.3"
+name = "rustls"
+version = "0.23.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
 dependencies = [
- "openssl-probe",
- "rustls-pemfile 1.0.3",
- "schannel",
- "security-framework",
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
@@ -5390,21 +5380,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.0.0",
+ "rustls-pemfile",
  "rustls-pki-types",
  "schannel",
  "security-framework",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
-dependencies = [
- "base64 0.21.5",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "2.0.0"
@@ -5417,29 +5398,46 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.4.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
-name = "rustls-webpki"
-version = "0.101.7"
+name = "rustls-platform-verifier"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1"
 dependencies = [
- "ring 0.17.7",
- "untrusted 0.9.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls 0.23.10",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-roots",
+ "winapi",
 ]
 
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad"
+
 [[package]]
 name = "rustls-webpki"
-version = "0.102.2"
+version = "0.102.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
 dependencies = [
- "ring 0.17.7",
+ "ring",
  "rustls-pki-types",
- "untrusted 0.9.0",
+ "untrusted",
 ]
 
 [[package]]
@@ -5478,16 +5476,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
-
 [[package]]
 name = "seahash"
 version = "4.1.0"
@@ -5540,24 +5528,34 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secrecy"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
+ "num-bigint 0.4.4",
  "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5586,7 +5584,7 @@ checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc"
 dependencies = [
  "httpdate",
  "native-tls",
- "reqwest",
+ "reqwest 0.11.22",
  "sentry-backtrace",
  "sentry-contexts",
  "sentry-core",
@@ -5792,19 +5790,6 @@ dependencies = [
  "unsafe-libyaml",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -5974,12 +5959,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "sketches-ddsketch"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1"
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -6004,17 +5983,16 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "futures 0.3.28",
- "prometheus_exporter",
  "rand 0.8.5",
  "tokio",
  "tracing",
  "vise",
- "vlog",
  "zksync_config",
  "zksync_dal",
  "zksync_env_config",
  "zksync_object_store",
  "zksync_types",
+ "zksync_vlog",
 ]
 
 [[package]]
@@ -6033,16 +6011,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "socket2"
 version = "0.5.5"
@@ -6055,18 +6023,18 @@ dependencies = [
 
 [[package]]
 name = "soketto"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
+checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
  "bytes",
  "futures 0.3.28",
- "http",
+ "http 1.1.0",
  "httparse",
  "log",
  "rand 0.8.5",
- "sha-1",
+ "sha1",
 ]
 
 [[package]]
@@ -6150,7 +6118,7 @@ dependencies = [
  "crossbeam-queue 0.3.8",
  "dotenvy",
  "either",
- "event-listener 2.5.3",
+ "event-listener",
  "futures-channel",
  "futures-core",
  "futures-intrusive",
@@ -6228,7 +6196,7 @@ dependencies = [
  "atoi",
  "base64 0.21.5",
  "bigdecimal",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "byteorder",
  "bytes",
  "chrono",
@@ -6273,7 +6241,7 @@ dependencies = [
  "atoi",
  "base64 0.21.5",
  "bigdecimal",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "byteorder",
  "chrono",
  "crc",
@@ -6470,6 +6438,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -6496,11 +6470,11 @@ name = "system-constants-generator"
 version = "0.1.0"
 dependencies = [
  "codegen 0.2.0",
- "multivm",
  "once_cell",
  "serde",
  "serde_json",
  "zksync_contracts",
+ "zksync_multivm",
  "zksync_state",
  "zksync_types",
  "zksync_utils",
@@ -6531,6 +6505,15 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "test-casing"
 version = "0.1.2"
@@ -6718,6 +6701,19 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
+[[package]]
+name = "tls-listener"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce110c38c3c9b6e5cc4fe72e60feb5b327750388a10a276e3d5d7d431e3dc76c"
+dependencies = [
+ "futures-util",
+ "pin-project-lite",
+ "thiserror",
+ "tokio",
+ "tokio-rustls 0.25.0",
+]
+
 [[package]]
 name = "tokio"
 version = "1.34.0"
@@ -6732,7 +6728,7 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
@@ -6770,21 +6766,22 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.24.1"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
 dependencies = [
- "rustls 0.21.11",
+ "rustls 0.22.4",
+ "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.22.4",
+ "rustls 0.23.10",
  "rustls-pki-types",
  "tokio",
 ]
@@ -6798,6 +6795,7 @@ dependencies = [
  "futures-core",
  "pin-project-lite",
  "tokio",
+ "tokio-util",
 ]
 
 [[package]]
@@ -6817,9 +6815,9 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 
 [[package]]
 name = "toml_edit"
@@ -6843,6 +6841,17 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tonic"
 version = "0.9.2"
@@ -6850,15 +6859,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
 dependencies = [
  "async-trait",
- "axum",
+ "axum 0.6.20",
  "base64 0.21.5",
  "bytes",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.26",
+ "http 0.2.9",
+ "http-body 0.4.6",
+ "hyper 0.14.29",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -6879,7 +6888,6 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
  "futures-core",
  "futures-util",
- "hdrhistogram",
  "indexmap 1.9.3",
  "pin-project",
  "pin-project-lite",
@@ -6894,32 +6902,19 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.4.4"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "async-compression",
- "base64 0.21.5",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "bytes",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "http-range-header",
- "httpdate",
- "iri-string",
- "mime",
- "mime_guess",
- "percent-encoding",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
  "pin-project-lite",
  "tokio",
- "tokio-util",
- "tower",
  "tower-layer",
  "tower-service",
- "tracing",
- "uuid",
 ]
 
 [[package]]
@@ -7038,6 +7033,21 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
+[[package]]
+name = "trybuild"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8419ecd263363827c5730386f418715766f584e2f874d32c23c5b00bd9727e7e"
+dependencies = [
+ "basic-toml",
+ "glob",
+ "once_cell",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "termcolor",
+]
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -7157,12 +7167,6 @@ version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
 
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -7212,7 +7216,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 dependencies = [
- "getrandom",
  "serde",
 ]
 
@@ -7271,8 +7274,7 @@ name = "vise-exporter"
 version = "0.1.0"
 source = "git+https://github.com/matter-labs/vise.git?rev=a5bb80c9ce7168663114ee30e794d6dc32159ee4#a5bb80c9ce7168663114ee30e794d6dc32159ee4"
 dependencies = [
- "hyper",
- "metrics-exporter-prometheus",
+ "hyper 0.14.29",
  "once_cell",
  "tokio",
  "tracing",
@@ -7289,60 +7291,16 @@ dependencies = [
  "syn 2.0.38",
 ]
 
-[[package]]
-name = "vlog"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "opentelemetry",
- "opentelemetry-otlp",
- "opentelemetry-semantic-conventions",
- "sentry",
- "serde_json",
- "tracing",
- "tracing-opentelemetry",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "vm-benchmark"
 version = "0.1.0"
 dependencies = [
  "criterion",
  "iai",
- "metrics",
- "metrics-exporter-prometheus",
- "tokio",
- "vm-benchmark-harness",
-]
-
-[[package]]
-name = "vm-benchmark-harness"
-version = "0.1.0"
-dependencies = [
- "multivm",
- "once_cell",
- "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)",
- "zksync_contracts",
- "zksync_state",
- "zksync_system_constants",
- "zksync_types",
- "zksync_utils",
-]
-
-[[package]]
-name = "vm_utils"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "multivm",
  "tokio",
- "tracing",
- "zksync_contracts",
- "zksync_dal",
- "zksync_state",
- "zksync_types",
- "zksync_utils",
+ "vise",
+ "zksync_vlog",
+ "zksync_vm_benchmark_harness",
 ]
 
 [[package]]
@@ -7450,9 +7408,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wasm-streams"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7"
+checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -7693,6 +7651,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if 1.0.0",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -7837,7 +7805,7 @@ dependencies = [
 [[package]]
 name = "zk_evm"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.5.0#06deb82ef51666b21ac5ebb543366906db04916b"
+source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.5.0#0c5cdca00cca4fa0a8c49147a11048c24f8a4b12"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -7929,7 +7897,7 @@ dependencies = [
 [[package]]
 name = "zkevm_circuits"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=v1.5.0#b2d0db2f08de3037aebcaa8b394981e57158bdbe"
+source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=v1.5.0#b7a86c739e8a8f88e788e90893c6e7496f6d7dfc"
 dependencies = [
  "arrayvec 0.7.4",
  "boojum",
@@ -7961,7 +7929,7 @@ name = "zkevm_opcode_defs"
 version = "1.3.2"
 source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.2#dffacadeccdfdbff4bc124d44c595c4a6eae5013"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "blake2 0.10.6 (git+https://github.com/RustCrypto/hashes.git?rev=1f727ce37ff40fa0cce84eb8543a45bdd3ca4a4e)",
  "ethereum-types",
  "k256 0.11.6",
@@ -7975,10 +7943,10 @@ name = "zkevm_opcode_defs"
 version = "1.4.1"
 source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.4.1#ba8228ff0582d21f64d6a319d50d0aec48e9e7b6"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethereum-types",
- "k256 0.13.2",
+ "k256 0.13.3",
  "lazy_static",
  "sha2 0.10.8",
  "sha3 0.10.8",
@@ -7987,12 +7955,12 @@ dependencies = [
 [[package]]
 name = "zkevm_opcode_defs"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.5.0#dc74cf4e1167a9636e14725da09c8020a8bfa26b"
+source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.5.0#28d2edabf902ea9b08f6a26a4506831fd89346b9"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethereum-types",
- "k256 0.13.2",
+ "k256 0.13.3",
  "lazy_static",
  "p256",
  "serde",
@@ -8000,6 +7968,21 @@ dependencies = [
  "sha3 0.10.8",
 ]
 
+[[package]]
+name = "zksync_base_token_adjuster"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "chrono",
+ "rand 0.8.5",
+ "tokio",
+ "tracing",
+ "zksync_config",
+ "zksync_dal",
+ "zksync_types",
+]
+
 [[package]]
 name = "zksync_basic_types"
 version = "0.1.0"
@@ -8012,6 +7995,7 @@ dependencies = [
  "num_enum 0.7.2",
  "serde",
  "serde_json",
+ "serde_with",
  "strum",
  "thiserror",
  "tiny-keccak 2.0.2",
@@ -8024,6 +8008,8 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "assert_matches",
+ "async-trait",
+ "futures 0.3.28",
  "serde",
  "tempfile",
  "test-casing",
@@ -8063,8 +8049,10 @@ dependencies = [
  "circuit_sequencer_api 0.1.40",
  "circuit_sequencer_api 0.1.41",
  "circuit_sequencer_api 0.1.50",
+ "futures 0.3.28",
  "itertools 0.10.5",
- "multivm",
+ "num_cpus",
+ "rand 0.8.5",
  "serde_json",
  "tokio",
  "tracing",
@@ -8072,17 +8060,23 @@ dependencies = [
  "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)",
  "zk_evm 1.4.1",
  "zk_evm 1.5.0",
+ "zksync_contracts",
  "zksync_dal",
+ "zksync_eth_client",
  "zksync_health_check",
  "zksync_l1_contract_interface",
+ "zksync_multivm",
+ "zksync_node_genesis",
+ "zksync_node_test_utils",
  "zksync_types",
  "zksync_utils",
+ "zksync_web3_decl",
 ]
 
 [[package]]
 name = "zksync_concurrency"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "once_cell",
@@ -8103,9 +8097,10 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "rand 0.8.5",
+ "secrecy",
  "serde",
- "url",
  "zksync_basic_types",
+ "zksync_concurrency",
  "zksync_consensus_utils",
  "zksync_crypto_primitives",
 ]
@@ -8113,7 +8108,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_bft"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -8134,13 +8129,15 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_crypto"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "blst",
  "ed25519-dalek",
+ "elliptic-curve 0.13.8",
  "ff_ce",
  "hex",
+ "k256 0.13.3",
  "num-bigint 0.4.4",
  "num-traits",
  "pairing_ce 0.28.5 (git+https://github.com/matter-labs/pairing.git?rev=d24f2c5871089c4cd4f54c0ca266bb9fef6115eb)",
@@ -8155,7 +8152,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_executor"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "rand 0.8.5",
@@ -8174,10 +8171,16 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_network"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "async-trait",
+ "base64 0.22.1",
+ "build_html",
+ "bytesize",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-util",
  "im",
  "once_cell",
  "pin-project",
@@ -8185,6 +8188,9 @@ dependencies = [
  "rand 0.8.5",
  "snow",
  "thiserror",
+ "tls-listener",
+ "tokio",
+ "tokio-rustls 0.25.0",
  "tracing",
  "vise",
  "zksync_concurrency",
@@ -8199,7 +8205,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_roles"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "bit-vec",
@@ -8220,7 +8226,7 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_storage"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -8238,35 +8244,94 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_utils"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
+ "anyhow",
  "rand 0.8.5",
  "thiserror",
  "zksync_concurrency",
 ]
 
 [[package]]
-name = "zksync_contract_verifier"
+name = "zksync_consistency_checker"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "assert_matches",
  "chrono",
- "ctrlc",
- "ethabi",
- "futures 0.3.28",
- "hex",
- "lazy_static",
- "metrics",
- "prometheus_exporter",
- "regex",
+ "once_cell",
+ "serde",
+ "test-casing",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "zksync_config",
+ "zksync_contracts",
+ "zksync_dal",
+ "zksync_eth_client",
+ "zksync_eth_sender",
+ "zksync_health_check",
+ "zksync_l1_contract_interface",
+ "zksync_node_genesis",
+ "zksync_node_test_utils",
+ "zksync_shared_metrics",
+ "zksync_types",
+]
+
+[[package]]
+name = "zksync_contract_verification_server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "axum 0.7.5",
  "serde",
  "serde_json",
+ "tokio",
+ "tower-http",
+ "tracing",
+ "vise",
+ "zksync_config",
+ "zksync_dal",
+ "zksync_types",
+]
+
+[[package]]
+name = "zksync_contract_verifier"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "ctrlc",
+ "futures 0.3.28",
  "structopt",
+ "tokio",
+ "tracing",
+ "zksync_config",
+ "zksync_contract_verifier_lib",
+ "zksync_dal",
+ "zksync_env_config",
+ "zksync_queued_job_processor",
+ "zksync_utils",
+ "zksync_vlog",
+]
+
+[[package]]
+name = "zksync_contract_verifier_lib"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "ethabi",
+ "hex",
+ "lazy_static",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
  "tempfile",
  "thiserror",
  "tokio",
  "tracing",
- "vlog",
+ "vise",
  "zksync_config",
  "zksync_contracts",
  "zksync_dal",
@@ -8290,87 +8355,17 @@ dependencies = [
 ]
 
 [[package]]
-name = "zksync_core"
+name = "zksync_core_leftovers"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "assert_matches",
- "async-trait",
- "axum",
- "backon",
- "chrono",
  "ctrlc",
- "futures 0.3.28",
- "governor",
- "hex",
- "itertools 0.10.5",
- "jsonrpsee",
- "lru",
- "metrics",
- "multivm",
- "once_cell",
- "pin-project-lite",
- "prometheus_exporter",
- "prost 0.12.1",
- "prover_dal",
- "rand 0.8.5",
- "reqwest",
- "serde",
- "serde_json",
  "serde_yaml",
- "tempfile",
- "test-casing",
- "test-log",
- "thiserror",
- "thread_local",
  "tokio",
- "tower",
- "tower-http",
- "tracing",
- "vise",
- "vlog",
- "vm_utils",
- "zksync_circuit_breaker",
- "zksync_commitment_generator",
- "zksync_concurrency",
  "zksync_config",
- "zksync_consensus_bft",
- "zksync_consensus_crypto",
- "zksync_consensus_executor",
- "zksync_consensus_network",
- "zksync_consensus_roles",
- "zksync_consensus_storage",
- "zksync_consensus_utils",
- "zksync_contracts",
  "zksync_dal",
- "zksync_db_connection",
- "zksync_eth_client",
- "zksync_eth_sender",
- "zksync_eth_signer",
- "zksync_eth_watch",
- "zksync_health_check",
- "zksync_house_keeper",
- "zksync_l1_contract_interface",
- "zksync_mempool",
- "zksync_merkle_tree",
- "zksync_mini_merkle_tree",
- "zksync_node_fee_model",
  "zksync_node_genesis",
- "zksync_node_test_utils",
- "zksync_object_store",
- "zksync_proof_data_handler",
  "zksync_protobuf",
- "zksync_protobuf_build",
- "zksync_protobuf_config",
- "zksync_prover_interface",
- "zksync_shared_metrics",
- "zksync_state",
- "zksync_storage",
- "zksync_system_constants",
- "zksync_test_account",
- "zksync_types",
- "zksync_utils",
- "zksync_web3_decl",
 ]
 
 [[package]]
@@ -8402,6 +8397,36 @@ dependencies = [
  "zksync_utils",
 ]
 
+[[package]]
+name = "zksync_da_client"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "serde",
+ "tracing",
+ "zksync_config",
+ "zksync_types",
+]
+
+[[package]]
+name = "zksync_da_dispatcher"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "futures 0.3.28",
+ "rand 0.8.5",
+ "tokio",
+ "tracing",
+ "vise",
+ "zksync_config",
+ "zksync_da_client",
+ "zksync_dal",
+ "zksync_types",
+ "zksync_utils",
+]
+
 [[package]]
 name = "zksync_dal"
 version = "0.1.0"
@@ -8422,6 +8447,7 @@ dependencies = [
  "tokio",
  "tracing",
  "vise",
+ "zksync_concurrency",
  "zksync_consensus_roles",
  "zksync_consensus_storage",
  "zksync_contracts",
@@ -8429,6 +8455,7 @@ dependencies = [
  "zksync_protobuf",
  "zksync_protobuf_build",
  "zksync_system_constants",
+ "zksync_test_account",
  "zksync_types",
  "zksync_utils",
 ]
@@ -8443,6 +8470,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sqlx",
+ "test-casing",
  "thiserror",
  "tokio",
  "tracing",
@@ -8451,6 +8479,23 @@ dependencies = [
  "zksync_health_check",
 ]
 
+[[package]]
+name = "zksync_default_da_clients"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "flate2",
+ "serde",
+ "tracing",
+ "zksync_config",
+ "zksync_da_client",
+ "zksync_env_config",
+ "zksync_node_framework",
+ "zksync_object_store",
+ "zksync_types",
+]
+
 [[package]]
 name = "zksync_env_config"
 version = "0.1.0"
@@ -8467,13 +8512,13 @@ dependencies = [
 name = "zksync_eth_client"
 version = "0.1.0"
 dependencies = [
+ "assert_matches",
  "async-trait",
  "hex",
  "jsonrpsee",
  "pretty_assertions",
  "rlp",
  "serde_json",
- "static_assertions",
  "thiserror",
  "tokio",
  "tracing",
@@ -8482,6 +8527,7 @@ dependencies = [
  "zksync_contracts",
  "zksync_eth_signer",
  "zksync_types",
+ "zksync_web3_decl",
 ]
 
 [[package]]
@@ -8533,6 +8579,7 @@ dependencies = [
  "tokio",
  "tracing",
  "vise",
+ "zksync_concurrency",
  "zksync_contracts",
  "zksync_dal",
  "zksync_eth_client",
@@ -8543,14 +8590,13 @@ dependencies = [
 
 [[package]]
 name = "zksync_external_node"
-version = "24.1.0"
+version = "24.8.0"
 dependencies = [
  "anyhow",
  "assert_matches",
  "clap 4.4.6",
  "envy",
  "futures 0.3.28",
- "prometheus_exporter",
  "rustc_version",
  "semver",
  "serde",
@@ -8561,35 +8607,52 @@ dependencies = [
  "tracing",
  "url",
  "vise",
- "vlog",
- "zksync_basic_types",
  "zksync_block_reverter",
  "zksync_commitment_generator",
  "zksync_concurrency",
  "zksync_config",
  "zksync_consensus_roles",
+ "zksync_consistency_checker",
  "zksync_contracts",
- "zksync_core",
+ "zksync_core_leftovers",
  "zksync_dal",
  "zksync_db_connection",
  "zksync_eth_client",
  "zksync_eth_sender",
  "zksync_health_check",
  "zksync_l1_contract_interface",
+ "zksync_metadata_calculator",
+ "zksync_node_api_server",
+ "zksync_node_consensus",
  "zksync_node_db_pruner",
  "zksync_node_fee_model",
+ "zksync_node_framework",
  "zksync_node_genesis",
+ "zksync_node_sync",
  "zksync_object_store",
  "zksync_protobuf_config",
+ "zksync_reorg_detector",
  "zksync_shared_metrics",
  "zksync_snapshots_applier",
  "zksync_state",
+ "zksync_state_keeper",
  "zksync_storage",
  "zksync_types",
  "zksync_utils",
+ "zksync_vlog",
  "zksync_web3_decl",
 ]
 
+[[package]]
+name = "zksync_external_price_api"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "zksync_config",
+ "zksync_types",
+]
+
 [[package]]
 name = "zksync_health_check"
 version = "0.1.0"
@@ -8611,13 +8674,12 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "metrics",
- "prover_dal",
  "tokio",
  "tracing",
  "vise",
  "zksync_config",
  "zksync_dal",
+ "zksync_prover_dal",
  "zksync_shared_metrics",
  "zksync_types",
 ]
@@ -8675,16 +8737,175 @@ dependencies = [
  "zksync_system_constants",
  "zksync_types",
  "zksync_utils",
-]
-
-[[package]]
-name = "zksync_mini_merkle_tree"
-version = "0.1.0"
-dependencies = [
- "criterion",
- "once_cell",
- "zksync_basic_types",
- "zksync_crypto",
+]
+
+[[package]]
+name = "zksync_metadata_calculator"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "assert_matches",
+ "async-trait",
+ "axum 0.7.5",
+ "futures 0.3.28",
+ "itertools 0.10.5",
+ "once_cell",
+ "reqwest 0.12.5",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "test-casing",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "vise",
+ "zksync_config",
+ "zksync_crypto",
+ "zksync_dal",
+ "zksync_health_check",
+ "zksync_merkle_tree",
+ "zksync_node_genesis",
+ "zksync_node_test_utils",
+ "zksync_object_store",
+ "zksync_prover_interface",
+ "zksync_shared_metrics",
+ "zksync_storage",
+ "zksync_types",
+ "zksync_utils",
+]
+
+[[package]]
+name = "zksync_mini_merkle_tree"
+version = "0.1.0"
+dependencies = [
+ "criterion",
+ "once_cell",
+ "zksync_basic_types",
+ "zksync_crypto",
+]
+
+[[package]]
+name = "zksync_multivm"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "circuit_sequencer_api 0.1.0",
+ "circuit_sequencer_api 0.1.40",
+ "circuit_sequencer_api 0.1.41",
+ "circuit_sequencer_api 0.1.42",
+ "circuit_sequencer_api 0.1.50",
+ "ethabi",
+ "hex",
+ "itertools 0.10.5",
+ "once_cell",
+ "serde",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "vise",
+ "zk_evm 1.3.1",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)",
+ "zk_evm 1.4.0",
+ "zk_evm 1.4.1",
+ "zk_evm 1.5.0",
+ "zksync_contracts",
+ "zksync_eth_signer",
+ "zksync_state",
+ "zksync_system_constants",
+ "zksync_test_account",
+ "zksync_types",
+ "zksync_utils",
+]
+
+[[package]]
+name = "zksync_node_api_server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "assert_matches",
+ "async-trait",
+ "axum 0.7.5",
+ "chrono",
+ "futures 0.3.28",
+ "governor",
+ "hex",
+ "http 1.1.0",
+ "itertools 0.10.5",
+ "lru",
+ "once_cell",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "serde",
+ "serde_json",
+ "strum",
+ "test-casing",
+ "thiserror",
+ "thread_local",
+ "tokio",
+ "tower",
+ "tower-http",
+ "tracing",
+ "vise",
+ "zksync_config",
+ "zksync_contracts",
+ "zksync_dal",
+ "zksync_health_check",
+ "zksync_metadata_calculator",
+ "zksync_mini_merkle_tree",
+ "zksync_multivm",
+ "zksync_node_fee_model",
+ "zksync_node_genesis",
+ "zksync_node_sync",
+ "zksync_node_test_utils",
+ "zksync_protobuf",
+ "zksync_shared_metrics",
+ "zksync_state",
+ "zksync_state_keeper",
+ "zksync_system_constants",
+ "zksync_types",
+ "zksync_utils",
+ "zksync_web3_decl",
+]
+
+[[package]]
+name = "zksync_node_consensus"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "rand 0.8.5",
+ "secrecy",
+ "tempfile",
+ "test-casing",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "zksync_concurrency",
+ "zksync_config",
+ "zksync_consensus_bft",
+ "zksync_consensus_crypto",
+ "zksync_consensus_executor",
+ "zksync_consensus_network",
+ "zksync_consensus_roles",
+ "zksync_consensus_storage",
+ "zksync_consensus_utils",
+ "zksync_contracts",
+ "zksync_dal",
+ "zksync_l1_contract_interface",
+ "zksync_merkle_tree",
+ "zksync_metadata_calculator",
+ "zksync_node_api_server",
+ "zksync_node_genesis",
+ "zksync_node_sync",
+ "zksync_node_test_utils",
+ "zksync_protobuf",
+ "zksync_state",
+ "zksync_state_keeper",
+ "zksync_system_constants",
+ "zksync_test_account",
+ "zksync_types",
+ "zksync_utils",
+ "zksync_web3_decl",
 ]
 
 [[package]]
@@ -8705,6 +8926,7 @@ dependencies = [
  "zksync_dal",
  "zksync_db_connection",
  "zksync_health_check",
+ "zksync_node_genesis",
  "zksync_node_test_utils",
  "zksync_types",
 ]
@@ -8715,10 +8937,12 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
+ "bigdecimal",
  "test-casing",
  "tokio",
  "tracing",
  "vise",
+ "zksync_base_token_adjuster",
  "zksync_config",
  "zksync_dal",
  "zksync_eth_client",
@@ -8737,18 +8961,22 @@ dependencies = [
  "async-trait",
  "ctrlc",
  "futures 0.3.28",
- "prometheus_exporter",
- "prover_dal",
+ "pin-project-lite",
  "thiserror",
  "tokio",
  "tracing",
- "vlog",
+ "trybuild",
+ "zksync_base_token_adjuster",
+ "zksync_block_reverter",
  "zksync_circuit_breaker",
  "zksync_commitment_generator",
  "zksync_concurrency",
  "zksync_config",
+ "zksync_consistency_checker",
+ "zksync_contract_verification_server",
  "zksync_contracts",
- "zksync_core",
+ "zksync_da_client",
+ "zksync_da_dispatcher",
  "zksync_dal",
  "zksync_db_connection",
  "zksync_env_config",
@@ -8757,24 +8985,45 @@ dependencies = [
  "zksync_eth_watch",
  "zksync_health_check",
  "zksync_house_keeper",
+ "zksync_metadata_calculator",
+ "zksync_node_api_server",
+ "zksync_node_consensus",
+ "zksync_node_db_pruner",
  "zksync_node_fee_model",
+ "zksync_node_framework_derive",
+ "zksync_node_sync",
  "zksync_object_store",
  "zksync_proof_data_handler",
  "zksync_protobuf_config",
+ "zksync_prover_dal",
+ "zksync_queued_job_processor",
+ "zksync_reorg_detector",
  "zksync_state",
+ "zksync_state_keeper",
  "zksync_storage",
+ "zksync_tee_verifier_input_producer",
  "zksync_types",
  "zksync_utils",
+ "zksync_vlog",
+ "zksync_vm_runner",
  "zksync_web3_decl",
 ]
 
+[[package]]
+name = "zksync_node_framework_derive"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2 1.0.69",
+ "quote 1.0.33",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "zksync_node_genesis"
 version = "0.1.0"
 dependencies = [
  "anyhow",
  "itertools 0.10.5",
- "multivm",
  "thiserror",
  "tokio",
  "tracing",
@@ -8784,19 +9033,54 @@ dependencies = [
  "zksync_dal",
  "zksync_eth_client",
  "zksync_merkle_tree",
+ "zksync_multivm",
+ "zksync_system_constants",
+ "zksync_types",
+ "zksync_utils",
+]
+
+[[package]]
+name = "zksync_node_sync"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "assert_matches",
+ "async-trait",
+ "chrono",
+ "futures 0.3.28",
+ "once_cell",
+ "serde",
+ "serde_json",
+ "test-casing",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "vise",
+ "zksync_concurrency",
+ "zksync_config",
+ "zksync_contracts",
+ "zksync_dal",
+ "zksync_eth_client",
+ "zksync_health_check",
+ "zksync_node_genesis",
+ "zksync_node_test_utils",
+ "zksync_shared_metrics",
+ "zksync_state_keeper",
  "zksync_system_constants",
  "zksync_types",
  "zksync_utils",
+ "zksync_vm_utils",
+ "zksync_web3_decl",
 ]
 
 [[package]]
 name = "zksync_node_test_utils"
 version = "0.1.0"
 dependencies = [
- "multivm",
  "zksync_contracts",
  "zksync_dal",
  "zksync_merkle_tree",
+ "zksync_multivm",
  "zksync_node_genesis",
  "zksync_system_constants",
  "zksync_types",
@@ -8808,13 +9092,16 @@ name = "zksync_object_store"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "assert_matches",
  "async-trait",
  "bincode",
  "flate2",
  "google-cloud-auth",
  "google-cloud-storage",
- "http",
+ "http 1.1.0",
  "prost 0.12.1",
+ "rand 0.8.5",
+ "reqwest 0.12.5",
  "serde_json",
  "tempfile",
  "tokio",
@@ -8830,20 +9117,28 @@ name = "zksync_proof_data_handler"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum",
+ "axum 0.7.5",
+ "chrono",
+ "hyper 1.3.1",
+ "serde_json",
  "tokio",
+ "tower",
  "tracing",
+ "zksync_basic_types",
  "zksync_config",
+ "zksync_contracts",
  "zksync_dal",
+ "zksync_multivm",
  "zksync_object_store",
  "zksync_prover_interface",
+ "zksync_tee_verifier",
  "zksync_types",
 ]
 
 [[package]]
 name = "zksync_protobuf"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "bit-vec",
@@ -8863,7 +9158,7 @@ dependencies = [
 [[package]]
 name = "zksync_protobuf_build"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
@@ -8884,6 +9179,7 @@ dependencies = [
  "hex",
  "prost 0.12.1",
  "rand 0.8.5",
+ "secrecy",
  "serde_json",
  "serde_yaml",
  "zksync_basic_types",
@@ -8893,6 +9189,16 @@ dependencies = [
  "zksync_types",
 ]
 
+[[package]]
+name = "zksync_prover_dal"
+version = "0.1.0"
+dependencies = [
+ "sqlx",
+ "strum",
+ "zksync_basic_types",
+ "zksync_db_connection",
+]
+
 [[package]]
 name = "zksync_prover_interface"
 version = "0.1.0"
@@ -8901,9 +9207,11 @@ dependencies = [
  "chrono",
  "circuit_sequencer_api 0.1.50",
  "serde",
+ "serde_json",
  "serde_with",
  "strum",
  "tokio",
+ "zksync_multivm",
  "zksync_object_store",
  "zksync_types",
 ]
@@ -8920,6 +9228,27 @@ dependencies = [
  "zksync_utils",
 ]
 
+[[package]]
+name = "zksync_reorg_detector"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "assert_matches",
+ "async-trait",
+ "serde_json",
+ "test-casing",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "zksync_dal",
+ "zksync_health_check",
+ "zksync_node_genesis",
+ "zksync_node_test_utils",
+ "zksync_shared_metrics",
+ "zksync_types",
+ "zksync_web3_decl",
+]
+
 [[package]]
 name = "zksync_server"
 version = "0.1.0"
@@ -8931,26 +9260,32 @@ dependencies = [
  "tikv-jemallocator",
  "tokio",
  "tracing",
- "vlog",
  "zksync_concurrency",
  "zksync_config",
  "zksync_consensus_crypto",
  "zksync_consensus_executor",
  "zksync_consensus_roles",
- "zksync_core",
+ "zksync_core_leftovers",
+ "zksync_default_da_clients",
  "zksync_env_config",
  "zksync_eth_client",
+ "zksync_metadata_calculator",
+ "zksync_node_api_server",
+ "zksync_node_framework",
  "zksync_node_genesis",
  "zksync_protobuf_config",
  "zksync_storage",
  "zksync_types",
  "zksync_utils",
+ "zksync_vlog",
 ]
 
 [[package]]
 name = "zksync_shared_metrics"
 version = "0.1.0"
 dependencies = [
+ "rustc_version",
+ "tracing",
  "vise",
  "zksync_dal",
  "zksync_types",
@@ -8986,6 +9321,7 @@ dependencies = [
  "anyhow",
  "assert_matches",
  "async-trait",
+ "backon",
  "chrono",
  "itertools 0.10.5",
  "mini-moka",
@@ -9003,6 +9339,44 @@ dependencies = [
  "zksync_utils",
 ]
 
+[[package]]
+name = "zksync_state_keeper"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "assert_matches",
+ "async-trait",
+ "futures 0.3.28",
+ "hex",
+ "itertools 0.10.5",
+ "once_cell",
+ "tempfile",
+ "test-casing",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "vise",
+ "zksync_base_token_adjuster",
+ "zksync_config",
+ "zksync_contracts",
+ "zksync_dal",
+ "zksync_eth_client",
+ "zksync_mempool",
+ "zksync_multivm",
+ "zksync_node_fee_model",
+ "zksync_node_genesis",
+ "zksync_node_test_utils",
+ "zksync_protobuf",
+ "zksync_shared_metrics",
+ "zksync_state",
+ "zksync_storage",
+ "zksync_system_constants",
+ "zksync_test_account",
+ "zksync_types",
+ "zksync_utils",
+ "zksync_vm_utils",
+]
+
 [[package]]
 name = "zksync_storage"
 version = "0.1.0"
@@ -9025,12 +9399,79 @@ dependencies = [
  "zksync_utils",
 ]
 
+[[package]]
+name = "zksync_tee_prover"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "reqwest 0.12.5",
+ "secp256k1",
+ "serde",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "url",
+ "zksync_basic_types",
+ "zksync_config",
+ "zksync_env_config",
+ "zksync_node_framework",
+ "zksync_prover_interface",
+ "zksync_tee_verifier",
+ "zksync_types",
+ "zksync_vlog",
+]
+
+[[package]]
+name = "zksync_tee_verifier"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "serde",
+ "tracing",
+ "zksync_basic_types",
+ "zksync_config",
+ "zksync_contracts",
+ "zksync_crypto",
+ "zksync_dal",
+ "zksync_db_connection",
+ "zksync_merkle_tree",
+ "zksync_multivm",
+ "zksync_object_store",
+ "zksync_prover_interface",
+ "zksync_queued_job_processor",
+ "zksync_state",
+ "zksync_types",
+ "zksync_utils",
+ "zksync_vm_utils",
+]
+
+[[package]]
+name = "zksync_tee_verifier_input_producer"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "tokio",
+ "tracing",
+ "vise",
+ "zksync_dal",
+ "zksync_object_store",
+ "zksync_prover_interface",
+ "zksync_queued_job_processor",
+ "zksync_tee_verifier",
+ "zksync_types",
+ "zksync_utils",
+ "zksync_vm_utils",
+]
+
 [[package]]
 name = "zksync_test_account"
 version = "0.1.0"
 dependencies = [
  "ethabi",
  "hex",
+ "rand 0.8.5",
  "zksync_contracts",
  "zksync_eth_signer",
  "zksync_system_constants",
@@ -9043,6 +9484,7 @@ name = "zksync_types"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "bigdecimal",
  "bincode",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono",
@@ -9060,6 +9502,7 @@ dependencies = [
  "strum",
  "thiserror",
  "tokio",
+ "tracing",
  "zksync_basic_types",
  "zksync_config",
  "zksync_contracts",
@@ -9077,20 +9520,56 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bigdecimal",
+ "bincode",
  "futures 0.3.28",
  "hex",
  "itertools 0.10.5",
  "num",
+ "once_cell",
  "rand 0.8.5",
- "reqwest",
+ "reqwest 0.12.5",
  "serde",
  "serde_json",
  "thiserror",
  "tokio",
  "tracing",
- "vlog",
  "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)",
  "zksync_basic_types",
+ "zksync_vlog",
+]
+
+[[package]]
+name = "zksync_vlog"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "opentelemetry",
+ "opentelemetry-otlp",
+ "opentelemetry-semantic-conventions",
+ "sentry",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing",
+ "tracing-opentelemetry",
+ "tracing-subscriber",
+ "vise",
+ "vise-exporter",
+]
+
+[[package]]
+name = "zksync_vm_benchmark_harness"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)",
+ "zksync_contracts",
+ "zksync_multivm",
+ "zksync_state",
+ "zksync_system_constants",
+ "zksync_types",
+ "zksync_utils",
 ]
 
 [[package]]
@@ -9100,20 +9579,41 @@ dependencies = [
  "anyhow",
  "async-trait",
  "backon",
- "multivm",
+ "dashmap",
+ "futures 0.3.28",
  "once_cell",
  "rand 0.8.5",
  "tempfile",
  "tokio",
  "tracing",
- "vm_utils",
+ "vise",
  "zksync_contracts",
  "zksync_dal",
+ "zksync_multivm",
  "zksync_node_genesis",
  "zksync_node_test_utils",
  "zksync_state",
+ "zksync_state_keeper",
  "zksync_storage",
+ "zksync_test_account",
+ "zksync_types",
+ "zksync_utils",
+ "zksync_vm_utils",
+]
+
+[[package]]
+name = "zksync_vm_utils"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "tokio",
+ "tracing",
+ "zksync_contracts",
+ "zksync_dal",
+ "zksync_multivm",
+ "zksync_state",
  "zksync_types",
+ "zksync_utils",
 ]
 
 [[package]]
@@ -9139,24 +9639,6 @@ dependencies = [
  "zksync_types",
 ]
 
-[[package]]
-name = "zstd"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
-dependencies = [
- "zstd-sys",
-]
-
 [[package]]
 name = "zstd-sys"
 version = "2.0.9+zstd.1.5.5"
diff --git a/Cargo.toml b/Cargo.toml
index d0112a46bbc0..432f0c031b6a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,7 @@ members = [
     "core/bin/verified_sources_fetcher",
     "core/bin/zksync_server",
     "core/bin/genesis_generator",
+    "core/bin/zksync_tee_prover",
     # Node services
     "core/node/node_framework",
     "core/node/proof_data_handler",
@@ -20,32 +21,47 @@ members = [
     "core/node/shared_metrics",
     "core/node/db_pruner",
     "core/node/fee_model",
+    "core/node/da_dispatcher",
     "core/node/eth_sender",
     "core/node/vm_runner",
     "core/node/test_utils",
+    "core/node/state_keeper",
+    "core/node/reorg_detector",
+    "core/node/consistency_checker",
+    "core/node/metadata_calculator",
+    "core/node/node_sync",
+    "core/node/consensus",
+    "core/node/contract_verification_server",
+    "core/node/api_server",
+    "core/node/tee_verifier_input_producer",
+    "core/node/base_token_adjuster",
     # Libraries
     "core/lib/db_connection",
-    "core/lib/zksync_core",
+    "core/lib/zksync_core_leftovers",
     "core/lib/basic_types",
     "core/lib/config",
     "core/lib/constants",
+    "core/lib/contract_verifier",
     "core/lib/contracts",
     "core/lib/crypto",
     "core/lib/circuit_breaker",
     "core/lib/dal",
     "core/lib/env_config",
+    "core/lib/da_client",
+    "core/lib/default_da_clients",
     "core/lib/eth_client",
     "core/lib/eth_signer",
     "core/lib/l1_contract_interface",
     "core/lib/mempool",
     "core/lib/merkle_tree",
     "core/lib/mini_merkle_tree",
+    "core/lib/node_framework_derive",
     "core/lib/object_store",
-    "core/lib/prometheus_exporter",
     "core/lib/prover_interface",
     "core/lib/queued_job_processor",
     "core/lib/state",
     "core/lib/storage",
+    "core/lib/tee_verifier",
     "core/lib/types",
     "core/lib/protobuf_config",
     "core/lib/utils",
@@ -55,6 +71,7 @@ members = [
     "core/lib/web3_decl",
     "core/lib/snapshots_applier",
     "core/lib/crypto_primitives",
+    "core/lib/external_price_api",
     # Test infrastructure
     "core/tests/test_account",
     "core/tests/loadnext",
@@ -85,7 +102,7 @@ categories = ["cryptography"]
 anyhow = "1"
 assert_matches = "1.5"
 async-trait = "0.1"
-axum = "0.6.19"
+axum = "0.7.5"
 backon = "0.4.4"
 bigdecimal = "0.3.0"
 bincode = "1"
@@ -95,25 +112,25 @@ clap = "4.2.2"
 codegen = "0.2.0"
 criterion = "0.4.0"
 ctrlc = "3.1"
+dashmap = "5.5.3"
 derive_more = "=1.0.0-beta.6"
 envy = "0.4"
 ethabi = "18.0.0"
 flate2 = "1.0.28"
 futures = "0.3"
-google-cloud-auth = "0.13.0"
-google-cloud-storage = "0.15.0"
+google-cloud-auth = "0.16.0"
+google-cloud-storage = "0.20.0"
 governor = "0.4.2"
 hex = "0.4"
-http = "0.2.9"
+http = "1.1"
+hyper = "1.3"
 iai = "0.1"
 insta = "1.29.0"
 itertools = "0.10"
-jsonrpsee = { version = "0.21.0", default-features = false }
+jsonrpsee = { version = "0.23", default-features = false }
 lazy_static = "1.4"
 leb128 = "0.2.5"
 lru = { version = "0.12.1", default-features = false }
-metrics = "0.21"
-metrics-exporter-prometheus = "0.12"
 mini-moka = "0.10.0"
 num = "0.4.0"
 num_cpus = "1.13"
@@ -128,11 +145,12 @@ prost = "0.12.1"
 rand = "0.8"
 rayon = "1.3.1"
 regex = "1"
-reqwest = "0.11"
+reqwest = "0.12"
 rlp = "0.5"
 rocksdb = "0.21.0"
 rustc_version = "0.4.0"
 secp256k1 = { version = "0.27.0", features = ["recovery", "global-context"] }
+secrecy = "0.8.0"
 semver = "1"
 sentry = "0.31"
 serde = "1"
@@ -154,13 +172,19 @@ tikv-jemallocator = "0.5"
 tiny-keccak = "2"
 tokio = "1"
 tower = "0.4.13"
-tower-http = "0.4.1"
+tower-http = "0.5.2"
 tracing = "0.1"
 tracing-subscriber = "0.3"
 tracing-opentelemetry = "0.21.0"
 url = "2"
 web3 = "0.19.0"
 
+# Proc-macro
+syn = "2.0"
+quote = "1.0"
+proc-macro2 = "1.0"
+trybuild = "1.0"
+
 # "Internal" dependencies
 circuit_sequencer_api_1_3_3 = { package = "circuit_sequencer_api", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3" }
 circuit_sequencer_api_1_4_0 = { package = "circuit_sequencer_api", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.0" }
@@ -177,35 +201,36 @@ zk_evm_1_3_3 = { package = "zk_evm", git = "https://github.com/matter-labs/era-z
 zk_evm_1_4_0 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.4.0" }
 zk_evm_1_4_1 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.4.1" }
 zk_evm_1_5_0 = { package = "zk_evm", git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.5.0" }
-zksync_concurrency = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
-zksync_consensus_bft = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
-zksync_consensus_crypto = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
-zksync_consensus_executor = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
-zksync_consensus_network = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
-zksync_consensus_roles = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
-zksync_consensus_storage = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
-zksync_consensus_utils = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
-zksync_protobuf = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
-zksync_protobuf_build = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "92ecb2d5d65e3bc4a883dacd18d0640e86576c8c" }
+zksync_concurrency = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
+zksync_consensus_bft = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
+zksync_consensus_crypto = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
+zksync_consensus_executor = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
+zksync_consensus_network = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
+zksync_consensus_roles = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
+zksync_consensus_storage = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
+zksync_consensus_utils = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
+zksync_protobuf = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
+zksync_protobuf_build = { version = "0.1.0", git = "https://github.com/matter-labs/era-consensus.git", rev = "ba7b171456e7362eada685234a91c20907b6a097" }
 
 # "Local" dependencies
-multivm = { path = "core/lib/multivm" }
-prometheus_exporter = { path = "core/lib/prometheus_exporter" }
-prover_dal = { path = "prover/prover_dal" }
-vlog = { path = "core/lib/vlog" }
-vm_utils = { path = "core/lib/vm_utils" }
-vm-benchmark-harness = { path = "core/tests/vm-benchmark/harness" }
-zksync = { path = "sdk/zksync-rs" }
+zksync_multivm = { path = "core/lib/multivm" }
+zksync_prover_dal = { path = "prover/prover_dal" }
+zksync_vlog = { path = "core/lib/vlog" }
+zksync_vm_utils = { path = "core/lib/vm_utils" }
+zksync_vm_benchmark_harness = { path = "core/tests/vm-benchmark/harness" }
 zksync_basic_types = { path = "core/lib/basic_types" }
 zksync_circuit_breaker = { path = "core/lib/circuit_breaker" }
 zksync_config = { path = "core/lib/config" }
+zksync_contract_verifier_lib = { path = "core/lib/contract_verifier" }
 zksync_contracts = { path = "core/lib/contracts" }
-zksync_core = { path = "core/lib/zksync_core" }
+zksync_core_leftovers = { path = "core/lib/zksync_core_leftovers" }
 zksync_crypto = { path = "core/lib/crypto" }
 zksync_dal = { path = "core/lib/dal" }
 zksync_db_connection = { path = "core/lib/db_connection" }
 zksync_env_config = { path = "core/lib/env_config" }
 zksync_eth_client = { path = "core/lib/eth_client" }
+zksync_da_client = { path = "core/lib/da_client" }
+zksync_default_da_clients = { path = "core/lib/default_da_clients" }
 zksync_eth_signer = { path = "core/lib/eth_signer" }
 zksync_health_check = { path = "core/lib/health_check" }
 zksync_l1_contract_interface = { path = "core/lib/l1_contract_interface" }
@@ -220,14 +245,17 @@ zksync_snapshots_applier = { path = "core/lib/snapshots_applier" }
 zksync_state = { path = "core/lib/state" }
 zksync_storage = { path = "core/lib/storage" }
 zksync_system_constants = { path = "core/lib/constants" }
+zksync_tee_verifier = { path = "core/lib/tee_verifier" }
 zksync_test_account = { path = "core/tests/test_account" }
 zksync_types = { path = "core/lib/types" }
 zksync_utils = { path = "core/lib/utils" }
 zksync_web3_decl = { path = "core/lib/web3_decl" }
 zksync_crypto_primitives = { path = "core/lib/crypto_primitives" }
+zksync_external_price_api = { path = "core/lib/external_price_api" }
 
 # Framework and components
 zksync_node_framework = { path = "core/node/node_framework" }
+zksync_node_framework_derive = { path = "core/lib/node_framework_derive" }
 zksync_eth_watch = { path = "core/node/eth_watch" }
 zksync_shared_metrics = { path = "core/node/shared_metrics" }
 zksync_proof_data_handler = { path = "core/node/proof_data_handler" }
@@ -235,8 +263,19 @@ zksync_block_reverter = { path = "core/node/block_reverter" }
 zksync_commitment_generator = { path = "core/node/commitment_generator" }
 zksync_house_keeper = { path = "core/node/house_keeper" }
 zksync_node_genesis = { path = "core/node/genesis" }
+zksync_da_dispatcher = { path = "core/node/da_dispatcher" }
 zksync_eth_sender = { path = "core/node/eth_sender" }
 zksync_node_db_pruner = { path = "core/node/db_pruner" }
 zksync_node_fee_model = { path = "core/node/fee_model" }
 zksync_vm_runner = { path = "core/node/vm_runner" }
 zksync_node_test_utils = { path = "core/node/test_utils" }
+zksync_state_keeper = { path = "core/node/state_keeper" }
+zksync_reorg_detector = { path = "core/node/reorg_detector" }
+zksync_consistency_checker = { path = "core/node/consistency_checker" }
+zksync_metadata_calculator = { path = "core/node/metadata_calculator" }
+zksync_node_sync = { path = "core/node/node_sync" }
+zksync_node_consensus = { path = "core/node/consensus" }
+zksync_contract_verification_server = { path = "core/node/contract_verification_server" }
+zksync_node_api_server = { path = "core/node/api_server" }
+zksync_tee_verifier_input_producer = { path = "core/node/tee_verifier_input_producer" }
+zksync_base_token_adjuster = {path = "core/node/base_token_adjuster"}
diff --git a/README.md b/README.md
index 478f26890512..013d932aa1ae 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-# zkSync Era: A ZK Rollup For Scaling Ethereum
+# ZKsync Era: A ZK Rollup For Scaling Ethereum
 
 [![Logo](eraLogo.png)](https://zksync.io/)
 
-zkSync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or
+ZKsync Era is a layer 2 rollup that uses zero-knowledge proofs to scale Ethereum without compromising on security or
 decentralization. Since it's EVM compatible (Solidity/Vyper), 99% of Ethereum projects can redeploy without refactoring
-or re-auditing a single line of code. zkSync Era also uses an LLVM-based compiler that will eventually let developers
+or re-auditing a single line of code. ZKsync Era also uses an LLVM-based compiler that will eventually let developers
 write smart contracts in C++, Rust and other popular languages.
 
 ## Knowledge Index
@@ -17,8 +17,8 @@ The following questions will be answered by the following resources:
 | How can I set up my dev environment?                    | [setup-dev.md](docs/guides/setup-dev.md)       |
 | How can I run the project?                              | [launch.md](docs/guides/launch.md)             |
 | What is the logical project structure and architecture? | [architecture.md](docs/guides/architecture.md) |
-| Where can I find protocol specs?                        | [specs](docs/specs/README.md)                  |
-| Where can I find developer docs?                        | [docs](https://era.zksync.io/docs/)            |
+| Where can I find protocol specs?                        | [specs.md](docs/specs/README.md)               |
+| Where can I find developer docs?                        | [docs](https://docs.zksync.io)                 |
 
 ## Policies
 
@@ -27,7 +27,7 @@ The following questions will be answered by the following resources:
 
 ## License
 
-zkSync Era is distributed under the terms of either
+ZKsync Era is distributed under the terms of either
 
 - Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
 - MIT license ([LICENSE-MIT](LICENSE-MIT) or <https://opensource.org/blog/license/mit/>)
@@ -47,7 +47,7 @@ at your option.
 
 ## Disclaimer
 
-zkSync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go
+ZKsync Era has been through lots of testing and audits. Although it is live, it is still in alpha state and will go
 through more audits and bug bounty programs. We would love to hear our community's thoughts and suggestions about it! It
 is important to state that forking it now can potentially lead to missing important security updates, critical features,
 and performance improvements.
diff --git a/SECURITY.md b/SECURITY.md
index 3889e68977aa..471ccf672320 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -5,7 +5,7 @@ We truly appreciate efforts to discover and disclose security issues responsibly
 ## Vulnerabilities
 
 If you'd like to report a security issue in the repositories of matter-labs organization, please proceed to our
-[Bug Bounty Program on Immunefi](https://era.zksync.io/docs/reference/troubleshooting/audit-bug-bounty.html#bug-bounty-program).
+[Bug Bounty Program on Immunefi](https://docs.zksync.io/build/resources/audit-bug-bounty#bug-bounty-program).
 
 ## Other Security Issues
 
diff --git a/ZkStack.yaml b/ZkStack.yaml
new file mode 100644
index 000000000000..33af09572190
--- /dev/null
+++ b/ZkStack.yaml
@@ -0,0 +1,9 @@
+name: zk
+l1_network: Localhost
+link_to_code: .
+chains: ./chains
+config: ./configs/
+default_chain: era
+era_chain_id: 270
+prover_version: NoProofs
+wallet_creation: Localhost
diff --git a/bin/ci_localnet_up b/bin/ci_localnet_up
index 4431cba3dc65..8673a909af77 100755
--- a/bin/ci_localnet_up
+++ b/bin/ci_localnet_up
@@ -5,4 +5,5 @@ set -e
 cd $ZKSYNC_HOME
 
 mkdir -p ./volumes/postgres ./volumes/reth/data
+run_retried docker-compose pull
 docker-compose --profile runner up -d --wait
diff --git a/bin/pre_download_compilers.sh b/bin/pre_download_compilers.sh
new file mode 100755
index 000000000000..8a02dca6f98b
--- /dev/null
+++ b/bin/pre_download_compilers.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+set -e
+
+# This ./cache/hardhat-nodejs is coming from the env-paths module
+# that hardhat is using.
+COMPILER_DIR=/root/.cache/hardhat-nodejs/compilers-v2
+mkdir -p $COMPILER_DIR/{/linux-amd64,/vyper/linux,/zksolc,/zkvyper}
+
+# Fetch latest compiler version
+wget -nv -O $COMPILER_DIR/zksolc/compilerVersionInfo.json  "https://raw.githubusercontent.com/matter-labs/zksolc-bin/main/version.json"
+
+
+# These are the versions that we currently have in hardhat.config.ts in zksync-era and era-contracts.
+# For now, if there is a new version of compiler, we'd have to modify this file.
+# In the future, we should make it more automatic.
+(for ver in v1.3.18 v1.3.21 v1.4.0 v1.4.1; do wget -nv -O $COMPILER_DIR/zksolc/zksolc-$ver  https://raw.githubusercontent.com/matter-labs/zksolc-bin/main/linux-amd64/zksolc-linux-amd64-musl-$ver; done)
+
+# Special pre-release 1.5.0 compiler.
+# It can be removed once system-contracts/hardhatconfig.ts stops using it.
+wget -nv -O $COMPILER_DIR/zksolc/zksolc-remote-4cad2deaa6801d7a419f1ed6503c999948b0d6d8.0 https://github.com/matter-labs/era-compiler-solidity/releases/download/prerelease-a167aa3-code4rena/zksolc-linux-amd64-musl-v1.5.0
+
+
+wget -nv -O $COMPILER_DIR/zkvyper/compilerVersionInfo.json  "https://raw.githubusercontent.com/matter-labs/zkvyper-bin/main/version.json"
+
+(for ver in v1.3.13; do wget -nv -O $COMPILER_DIR/zkvyper/zkvyper-$ver  https://raw.githubusercontent.com/matter-labs/zkvyper-bin/main/linux-amd64/zkvyper-linux-amd64-musl-$ver; done)
+
+
+# This matches VYPER_RELEASES_MIRROR_URL from hardhat-vyper
+wget -nv -O $COMPILER_DIR/vyper/linux/list.json https://vyper-releases-mirror.hardhat.org/list.json
+
+# Currently we only use 0.3.10 release of vyper compiler (path taken from the list.json above)
+wget -nv -O $COMPILER_DIR/vyper/linux/0.3.10 https://github.com/vyperlang/vyper/releases/download/v0.3.10/vyper.0.3.10%2Bcommit.91361694.linux
+
+
+# This matches COMPILER_REPOSITORY_URL from hardhat-core.
+wget -nv -O $COMPILER_DIR/linux-amd64/list.json https://binaries.soliditylang.org/linux-amd64/list.json
+
+(for ver in solc-linux-amd64-v0.8.20+commit.a1b79de6 solc-linux-amd64-v0.8.23+commit.f704f362 solc-linux-amd64-v0.8.24+commit.e11b9ed9; do \
+    wget -nv -O $COMPILER_DIR/linux-amd64/$ver https://binaries.soliditylang.org/linux-amd64/$ver; \
+    done)
+
+chmod -R +x /root/.cache/hardhat-nodejs/
diff --git a/bin/run_retried b/bin/run_retried
new file mode 100755
index 000000000000..339f5927d679
--- /dev/null
+++ b/bin/run_retried
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+BACKOFF=1
+MAX_ATTEMPTS=5
+attempt=1
+
+while [ $attempt -le $MAX_ATTEMPTS ]; do
+
+    "$@"
+
+    if [ $? -eq 0 ]; then
+        exit 0
+    else
+        echo "Command \"$*\" failed with code $?. Retrying in $BACKOFF seconds..."
+        sleep $BACKOFF
+        let BACKOFF*=2
+        let attempt++
+    fi
+done
+
+echo "Command failed after $MAX_ATTEMPTS attempts."
+exit 1
diff --git a/bin/zk b/bin/zk
index f22ce90440fc..868c4e338cdf 100755
--- a/bin/zk
+++ b/bin/zk
@@ -41,7 +41,7 @@ check_subdirectory
 check_yarn_version
 if [ -z "$1" ]; then
     cd $ZKSYNC_HOME
-    yarn install --frozen-lockfile && yarn zk build
+    run_retried yarn install --frozen-lockfile && yarn utils build && yarn zk build
 else
     # can't start this with yarn since it has quirks with `--` as an argument
     node -- $ZKSYNC_HOME/infrastructure/zk/build/index.js "$@"
diff --git a/bin/zkt b/bin/zkt
new file mode 100755
index 000000000000..337ad5d73953
--- /dev/null
+++ b/bin/zkt
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+cd $(dirname $0)
+cd ../zk_toolbox
+
+cargo install --path ./crates/zk_inception --force
+cargo install --path ./crates/zk_supervisor --force
diff --git a/chains/era/ZkStack.yaml b/chains/era/ZkStack.yaml
new file mode 100644
index 000000000000..8dbd49c02c67
--- /dev/null
+++ b/chains/era/ZkStack.yaml
@@ -0,0 +1,13 @@
+id: 1
+name: era
+chain_id: 271
+prover_version: NoProofs
+configs: ./chains/era/configs/
+rocks_db_path: ./chains/era/db/
+external_node_config_path: ./chains/era/configs/external_node
+l1_batch_commit_data_generator_mode: Rollup
+base_token:
+  address: '0x0000000000000000000000000000000000000001'
+  nominator: 1
+  denominator: 1
+wallet_creation: Localhost
diff --git a/chains/era/configs/.gitkeep b/chains/era/configs/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/checks-config/cspell.json b/checks-config/cspell.json
deleted file mode 100644
index bafb5e036d04..000000000000
--- a/checks-config/cspell.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "language": "en",
-    "ignorePaths": [
-        "**/CHANGELOG.md",
-        "**/node_modules/**", 
-        ".github/**",
-        ".firebase/**",
-        ".yarn/**",
-        "dist/**",
-        "**/contracts/**",
-        "**/target/**"
-    ],
-    "dictionaries": [
-        "typescript",
-        "cpp",
-        "npm",
-        "filetypes",
-        "cpp",
-        "en_GB",
-        "en_US",
-        "node",
-        "bash",
-        "fonts",
-        "npm",
-        "cryptocurrencies",
-        "companies",
-        "rust",
-        "html",
-        "css",
-        "entities",
-        "softwareTerms",
-        "misc",
-        "fullstack",
-        "softwareTerms",
-        "zksync",
-        "nuxt",
-        "viem"
-    ],
-    "dictionaryDefinitions": [
-        {
-        "name": "zksync",
-        "addWords": true,
-        "path": "./era.dic"
-        }
-    ],
-    "allowCompoundWords": true
-    }
\ No newline at end of file
diff --git a/checks-config/era.cfg b/checks-config/era.cfg
deleted file mode 100644
index c8a6baba820a..000000000000
--- a/checks-config/era.cfg
+++ /dev/null
@@ -1,69 +0,0 @@
-# Project settings where a Cargo.toml exists and is passed
-# ${CARGO_MANIFEST_DIR}/.config/spellcheck.toml
-
-# Also take into account developer comments
-dev_comments = true
-
-# Skip the README.md file as defined in the cargo manifest
-skip_readme = false
-
-[Hunspell]
-# lang and name of `.dic` file
-lang = "en_US"
-# OS specific additives
-# Linux: [ /usr/share/myspell ]
-# Windows: []
-# macOS [ /home/alice/Libraries/hunspell, /Libraries/hunspell ]
-
-# Additional search paths, which take precedence over the default
-# os specific search dirs, searched in order, defaults last
-search_dirs = ["."]
-
-# Adds additional dictionaries, can be specified as
-# absolute paths or relative in the search dirs (in this order).
-# Relative paths are resolved relative to the configuration file
-# which is used.
-# Refer to `man 5 hunspell`
-# or https://www.systutorials.com/docs/linux/man/4-hunspell/#lbAE
-# on how to define a custom dictionary file.
-extra_dictionaries = ["era.dic"]
-
-# If set to `true`, the OS specific default search paths
-# are skipped and only explicitly specified ones are used.
-skip_os_lookups = false
-
-# Use the builtin dictionaries if none were found in
-# in the configured lookup paths.
-# Usually combined with `skip_os_lookups=true`
-# to enforce the `builtin` usage for consistent
-# results across distributions and CI runs.
-# Setting this will still use the dictionaries
-# specified in `extra_dictionaries = [..]`
-# for topic specific lingo.
-use_builtin = true
-
-
-[Hunspell.quirks]
-# Transforms words that are provided by the tokenizer
-# into word fragments based on the capture groups which are to
-# be checked.
-# If no capture groups are present, the matched word is whitelisted.
-transform_regex = ["^'([^\\s])'$", "^[0-9]+x$"]
-# Accepts `alphabeta` variants if the checker provides a replacement suggestion
-# of `alpha-beta`.
-allow_concatenation = true
-# And the counterpart, which accepts words with dashes, when the suggestion has
-# recommendations without the dashes. This is less common.
-allow_dashed = false
-
-[NlpRules]
-# Allows the user to override the default included
-# exports of LanguageTool, with other custom
-# languages
-
-# override_rules = "/path/to/rules_binencoded.bin"
-# override_tokenizer = "/path/to/tokenizer_binencoded.bin"
-
-[Reflow]
-# Reflows doc comments to adhere to a given maximum line width limit.
-max_line_length = 80
diff --git a/checks-config/era.dic b/checks-config/era.dic
deleted file mode 100644
index 28b326ce2812..000000000000
--- a/checks-config/era.dic
+++ /dev/null
@@ -1,959 +0,0 @@
-42
-<=
-=>
-==
-->
-<-
-+
--
-*
-\
-=
-/
-||
-<
->
-%
-^
-0x00
-0x01
-0x02
-0x20
-~10x
-u32
-u64
-u8
-1B
-H256
-10e18
-10^9
-2^32
-2^128
-2^24
-10^32
-10^*
-2^16
-2^64
-10^8
-U256
-12.5%
-5%
-10%
-20%
-*%
-90%
-1%
-f64
-k
-M
-kb
-Gbps
-50M
-2M
-130µs
-–
-18kb
-128kb
-10k
-100k
-120k
-800k
-24k
-500k
-50k
-52k
-260k
-120kb
-18kb
-12GB
-20GB
-500B
-100M
-~100us
-10ms
-1_000ms
-1us
-~100
-gwei
-
-ABI
-vlog
-const
-L2
-L2s
-L1
-json
-l1
-l2
-G1
-G2
-SystemConfig
-TODO
-se
-ZKSYNC_HOME
-MultiVMTracer
-vm_virtual_blocks
-eth_node
-EthCall
-BaseSystemContracts
-eth_calls
-refactor
-WS
-env
-url
-GasAdjuster
-base_fee
-base_fee_per_gas
-ERC20
-Finalizer
-Backoff
-middleware
-parallelization
-precompute
-precomputed
-Postgres
-parallelized
-parallelize
-job_id
-API
-APIs
-async
-pointwise
-observability
-atomics
-integrations
-stdout
-GCS
-websocket
-struct
-struct's
-localhost
-TOML
-config
-finalizer
-boolean
-prover
-timestamp
-H160
-zkSync
-AccessList
-miniblock
-member₁
-member₂
-memberₙ
-merkle
-eth
-Ethereum
-deployer
-designator
-designators
-RPC
-tx
-txs
-subtrees
-subtree
-unfinalizable
-meterer
-Timedout
-bootloader
-bootloader's
-testkit
-Sepolia
-Goerli
-miniblock
-miniblocks
-MempoolIO
-mempool
-latencies
-OracleTools
-StorageOracle
-zk_evm
-zkEVM
-src
-utils
-ptr
-recurse
-RefCell
-Rc
-StorageView
-VM_HOOK_POSITION
-VM_HOOKS_PARAMS_COUNT
-PAYMASTER_CONTEXT_SLOTS
-PrecompilerProcessor
-MAX_POSTOP_SLOTS
-postOp
-type
-opcode
-KnownCodesStorage
-param
-HistoryDisabled
-HistoryEnabled
-sorted_timestamps
-known_bytecodes
-returndata
-namespaces
-natively
-StateDiffRecord
-BYTES_PER_ENUMERATION_INDEX
-derived_key
-prefill
-reorg
-precompile
-Init
-init
-enqueued
-stage2
-testnets
-ethCalls
-generable
-Serde
-tokenize
-EOAs
-zeroized
-cardinality
-
-// zkSync-related words
-matterlabs
-zkweb
-zksync
-blockchain
-zkscan
-zkscrypto
-PubSub
-loadtest
-BigUint
-radix
-state_keeper
-MIN_PAYMASTER_BALANCE
-PrometheusCollector
-RetryCollector
-ScriptCollector
-MetricsCollector
-OperationResultsCollector
-ReportCollector
-filesystem
-hasher
-Hasher
-grafana
-prometheus
-serializer
-serializable
-deserializer
-Deserializes
-deserializes
-serializing
-deserializing
-deserialization
-configs
-operation_number
-hashed_key
-deduplication
-mutexes
-mutex
-Blake2s
-Blake2
-web3
-Testnets
-miniblock_number
-hashed_key
-tuples
-\x19Ethereum
-libzkscrypto
-EOA
-MultiVM
-nonces
-fri
-rollup
-pubkey
-JSON
-keccak256
-pubdata
-timestamps
-keccak
-musig
-len
-calldata
-DApp
-metadata
-boojum
-deps
-Precalculated
-precalculated
-WASM
-DefaultPrecompilesProcessor
-LSB
-DDoS
-refactored
-tuple
-HistoryMode
-vm
-VM
-VMs
-VM's
-MSB
-Enum
-PublishProof
-jsrpc
-backends
-ethsig
-ethop
-decentralization
-rollups
-zkrollup
-unencrypted
-permissionless
-trustlessness
-IERC
-Schnorr
-MuSig
-Merkle
-decentralised
-mainchain
-offchain
-processed
-zcli
-blockchains
-sidechain
-sidechains
-tokenomics
-validator
-validator's
-validator
-validators
-Validators
-CHAINID
-PREVRANDAO
-ECDSA
-EIP712
-EIP1559
-EIPs
-eth_estimateGas
-eth_call
-versa
-blake2
-AR16MT
-Preimages
-EN's
-SystemContext
-StorageOracle
-intrinsics
-chunked
-chunking
-deadbeef01
-deadbeef0
-deadbeef
-unsynced
-computable
-DevEx
-Workspace
-NFT
-preimage
-subcalls
-hashmaps
-monotonicity
-subquery
-RPCs
-programmatically
-stdin
-stderr
-Linter
-SmallRng
-ZkPorter
-StateDiffs
-HashMaps
-encodings
-CTPOP
-decommitter
-Decommitter
-Decommitments
-Decommitment
-decommitment
-decommitments
-Decommit
-decommit
-decommits
-DecommiterOracle
-DecommitmentProcessor
-decommitted
-decommit
-decommitting
-Demuxer
-demultiplex
-recid
-inversed
-plux
-Binop
-Arithmetization
-arithmetization
-nocapture
-Plonky
-permissioned
-mathbb
-Invb
-REDC
-iszero
-skept
-ECADD
-ECMUL
-preds
-inttoptr
-syncvm
-nasm
-rodata
-ISZERO
-JUMPI
-ethir
-ptrtoint
-lshr
-getu
-zext
-noprofile
-umin
-cccond
-ccret
-prodm
-prodl
-prodeh
-prodh
-interm
-signv
-ashr
-noalias
-immediates
-prode
-StorageBatchInfo
-CommitBatchInfo
-IExecutor
-SetChainId
-setChainId
-SetChainIdUpgrade
-state_transition_manager_contract
-prunable
-bytea
-
-// Names
-Vyper
-stimate
-samount
-Stichting
-Kingsfordweg
-RSIN
-ABDK
-Alef
-Zcon
-Paypal
-Numio
-MLTT
-USDCs
-dapi
-validiums
-validium
-Validium
-sharded
-pepe
-Arweave
-Streamr
-dutterbutter
-NixOS
-CLI
-SQLx
-Rustup
-nextest
-NTFS
-toolchains
-toolchain
-IDE
-M1
-M2
-MacOS
-OpenSSL
-Xcode
-LLVM
-nvm
-LTS
-logout
-WSL
-orchestrator
-TypeScript
-Cryptographical
-cryptographical
-microservices
-Executables
-subcomponents
-v2
-v1
-rmSync
-SSL
-setup_2^26
-uncomment
-toml
-GCP
-dev
-workspace
-subcommand
-Kubernetes
-Etherscan
-cryptographic
-hashers
-MacBook
-DDR5
-~
-
-// Used libraries
-numberish
-arrayify
-hexlify
-markdownlint
-ethersproject
-nomicfoundation
-nomiclabs
-Consensys
-zkforge
-zkcast
-Eigen
-IPFS
-
-// Used programming language words
-printf
-charsets
-println
-fatalf
-allowfullscreen
-inttypes
-zbin
-Panicf
-Deri
-DERI
-Furucombo
-kwargs
-scaleb
-isinstance
-RocksDB
-mload
-secp
-porco
-rosso
-insize
-MLOAD
-sload
-sload
-uadd
-nocallback
-nosync
-swrite
-Devs
-insta
-NFTF
-yaml
-
-// ETC
-gitter
-signup
-signups
-precompiled
-checkmark
-Vitalik
-Buterin
-roadmap
-majeure
-conveniens
-reimplementing
-subsecond
-supermajority
-gemeente
-unauthorised
-Ethereum's
-SDKs
-EVM's
-EVM
-Göerli
-ETHUSDC
-USDCUSD
-ETHUS
-USDCUS
-ETHUSD
-Arbitrum
-Adamantium
-Immunefi
-Winternitz
-ewasm
-Evmla
-UUPS
-Uups
-TLDR
-BLAKE2s
-bytes32
-enumeration_index
-backend
-enum
-num_initial
-to_check_storage
-source_storage
-prepend
-deduplicated
-user_l2_to_l1_logs
-L1Messeger
-params
-provers
-zk
-substring
-reverter
-wei
-deduplicate
-testnet
-mainnet
-performant
-opcodes
-USDC
-USD
-DBs
-unexecutable
-RLP
-DAL
-zkSync's
-l2_to_l1
-PoW
-coinbase
-FIXME
-ASC
-DESC
-versioning
-initializer
-refactoring
-prefetch
-unformatted
-
-// crypto events
-Edcon
-
-// Famous crypto people
-Gluchowski
-Vitalik's
-Buterin's
-multisignature
-onchain
-convertion
-Keyhash
-Armeabi
-scijava
-gluk
-@Deniallugo's
-emilluta
-
-// Programming related words
-backfill
-bytecode
-bytecodes
-impl
-subrange
-timeframe
-leaf_count
-mkdir
-librocksdb
-zksolc
-zksyncrobot
-precompiles
-vyper
-zkvyper
-undol
-applyl
-Upgradability
-Initializable
-Hola
-mundo
-ISTN
-Zerion
-Maverik
-zk_evm_1_3_3
-vk
-vks
-CORS
-verifier
-crypto
-callee
-Subcalls
-Vec
-vec
-vecs
-L1Messenger
-SystemL2ToL1Log
-witness_inputs
-StateKeeper
-enum_index
-virtual_block_start_batch
-virtual_block_finish_l2_block
-base_token_address
-maxFeePerGas
-maxPriorityFeePerGas
-structs
-all_circuit
-OversizedData
-M5
-eth_sign
-geth
-reth
-ethers
-js
-recovery_id
-&self
-ETHSignature
-recover_signer
-BlockNumber
-(de)
-{result
-DebugCall}
-CREATE2
-memtables
-memtable
-PostgreSQL
-OneTx
-DefaultTracer
-Tx1
-Tx2
-TxN
-VmStopped
-Unversioned
-versioned
-l2_block
-submodule
-enums
-deserialized
-deserialize
-hashmap
-vm_m5
-SDK
-1M
-dir
-SSD
-getter
-Getters
-WebSocket
-gasLimit
-MiBs
-MiB
-GiB
-GiBs
-pubsub
-\x19Ethereum
-nibbles–node
-ZkSyncTree
-invariants
-LEB128
-workflow
-L1Batch
-runtime
-Tokio
-Blobstore
-S3
-AWS
-ExternalIO
-ClosedFormInputWrapper
-AggregationWrapper
-(de)serializer
-typesafe
-LRU
-ns
-Q3
-loadnext
-args
-with_arg
-node_aggregation_job
-scheduler_job
-leaf_aggregation_job
-MAX_ATTEMPTs
-fsync
-TEST_DATABASE_URL
-newest_block
-block_count
-contracts_verification_info
-RNG
-jsonrpsee
-l1_batch
-Namespace
-ExecutionStatus
-VmStarted
-reproducibility
-CFs
-key–value
-enum_index_migration_cursor
-block_number
-initial_writes
-errored
-FactoryDeps
-de
-StorageView's
-Yul
-eth_txs
-eth_tx
-ExecuteBlock
-PublishProofBlocksOnchain
-CommitBlocks
-entrypoint
-gas_limit
-TxSender
-UX
-BasicWitnessInputProducer
-eth_tx_history
-PENDING_BLOCK
-from_block
-namespace
-PriorityQueue
-Görli
-Ropsten
-Rinkeby
-tokio
-threadpool
-IntrinsicGas
-InsufficientFundsForTransfer
-ChainId
-hyperchains
-eth_getLogs
-façade
-virtual_blocks_per_miniblock
-virtual_block_interval
-max_overhead
-total_gas_limit
-cloneable
-timestamped
-healthcheck
-Healthcheck
-HealthCheck
-readonly
-upgrader
-startup
-BFT
-PingCAP
-witgen
-ok
-hacky
-ceil
-Infura
-synth
-proto
-
-AUTOGENERATED
-x19Ethereum
-block_timestamp
-SYSTEM_BLOCK_INFO_BLOCK_NUMBER_MULTIPLIER
-MAX_L2_TX_GAS_LIMIT
-MAX_TX_ERGS_LIMIT
-OneTxTracer
-multicall
-Multicall's
-Multicall3
-proxied
-scalers
-updatable
-instantiation
-unexecuted
-transactional
-benchmarking
-virtual_blocks_interval
-dal
-codebase
-compactions
-M6
-compiler_common
-noop
-tokenized
-rustc
-sqlx
-zkevm
-Boojum
-Sepolia
-psql
-Cuda
-cuda
-hdcaa
-impls
-abda
-edaf
-unsynchronized
-CUDA
-gcloud
-NVME
-OTLP
-multiVM
-Deduplicator
-lobkc
-sread
-myfunction
-merklelization
-beaf
-subcalls
-unallowed
-Nuxt
-Merklized
-satisfiability
-demultiplex
-precompile
-statekeeper
-matchers
-lifecycle
-dedup
-deduped
-crаsh
-protobuf
-L1Tx
-EIP
-DecommittmentProcessor
-decommitment
-tokenized
-Aggregator
-DecommittmentProcessor
-decommitment
-hardcoded
-plookup
-shivini
-EIP4844
-KZG
-secp256k1
-vendoring
-publickey
-keypair
-Electrum
-healthcheck
-healthchecks
-after_node_shutdown
-runnable
-downcasting
-parameterized
-reimplementation
-composability
-md5
-shivini
-balancer
-lookups
-stateful
-getPubdataPricingMode
-Uint
-implementors
-WIP
-oneshot
-p2p
-StorageProcessor
-StorageMarker
-SIGINT
-opentelemetry
-PubdataSendingMode
-FriGpuProverArchiver
-vm
-demuxer
-2k
-4k
-superset
-80M
-780kb
-None
-Nones
-evm_simulator_code_hash
-pubdata_costs
-storage_refunds
-state_keeper's
-witness_generator
-arity
-recursion_tip
-RECURSION_TIP_ARITY
-empty_proof
-hyperchain
-storages
diff --git a/checks-config/links.json b/checks-config/links.json
deleted file mode 100644
index b18b9608f16f..000000000000
--- a/checks-config/links.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "ignorePatterns": [
-        {
-            "pattern": "^https://github\\.com/matter-labs/zksync-2-dev/"
-        },
-        {
-            "pattern": "^https://www\\.notion\\.so/"
-        },
-        {
-            "pattern": "^https://github\\.com/matter-labs/zksync-era/compare/"
-        },
-        {
-            "pattern": "^https://twitter\\.com/zksync"
-        },
-        {
-            "pattern": "^https://twitter\\.com/zkSyncDevs"
-        },
-        {
-            "pattern": "^https://github\\.com/matter-labs/zk_evm"
-        },
-        {
-            "pattern": "^https://sepolia\\.etherscan\\.io/tx/0x18c2a113d18c53237a4056403047ff9fafbf772cb83ccd44bb5b607f8108a64c"
-        },
-        {
-            "pattern": "^https://github\\.com/matter-labs/zksync-era/commit/"
-        },
-        {
-            "pattern": "^https://github\\.com/matter-labs//era-compiler-llvm"
-        }
-    ],
-    "aliveStatusCodes": [0, 200, 206, 304]
-}
diff --git a/configs/.gitkeep b/configs/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/contracts b/contracts
index accecc4526c9..8172969672cc 160000
--- a/contracts
+++ b/contracts
@@ -1 +1 @@
-Subproject commit accecc4526c95fccbf190d7c2f97f174d1c5fce0
+Subproject commit 8172969672cc6a38542cd8f5578c74b7e30cd3b4
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index 8c510b251760..35caa523a253 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -1,5 +1,221 @@
 # Changelog
 
+## [24.8.0](https://github.com/matter-labs/zksync-era/compare/core-v24.7.0...core-v24.8.0) (2024-06-24)
+
+
+### ⚠ BREAKING CHANGES
+
+* updated boojum and nightly rust compiler ([#2126](https://github.com/matter-labs/zksync-era/issues/2126))
+
+### Features
+
+* Add metrics for transaction execution result in state keeper ([#2021](https://github.com/matter-labs/zksync-era/issues/2021)) ([dde0fc4](https://github.com/matter-labs/zksync-era/commit/dde0fc4b469474525fd5e4fd1594c3710d6d91f5))
+* **api:** Add new `l1_committed` block tag ([#2282](https://github.com/matter-labs/zksync-era/issues/2282)) ([d5e8e9b](https://github.com/matter-labs/zksync-era/commit/d5e8e9bc66ff38b828730b62d8a7b8794cb1758a))
+* **api:** Rework zks_getProtocolVersion ([#2146](https://github.com/matter-labs/zksync-era/issues/2146)) ([800b8f4](https://github.com/matter-labs/zksync-era/commit/800b8f456282685e81d3423ba3e27d017db2f183))
+* change `zkSync` occurences to `ZKsync` ([#2227](https://github.com/matter-labs/zksync-era/issues/2227)) ([0b4104d](https://github.com/matter-labs/zksync-era/commit/0b4104dbb996ec6333619ea05f3a99e6d4f3b8fa))
+* **contract-verifier:** Adjust contract verifier for zksolc 1.5.0 ([#2255](https://github.com/matter-labs/zksync-era/issues/2255)) ([63efb2e](https://github.com/matter-labs/zksync-era/commit/63efb2e530d8b1445bdd58537d6f0cdb5593cd75))
+* **docs:** Add documentation for subset of wiring layer implementations, used by Main node ([#2292](https://github.com/matter-labs/zksync-era/issues/2292)) ([06c287b](https://github.com/matter-labs/zksync-era/commit/06c287b630707843fd92cb88f899a8fd1dcc7147))
+* **docs:** Pruning and Snapshots recovery basic docs ([#2265](https://github.com/matter-labs/zksync-era/issues/2265)) ([619a525](https://github.com/matter-labs/zksync-era/commit/619a525bc8f1098297259ddb296b4b5dee223944))
+* **en:** Allow recovery from specific snapshot ([#2137](https://github.com/matter-labs/zksync-era/issues/2137)) ([ac61fed](https://github.com/matter-labs/zksync-era/commit/ac61fedb5756ed700e35f231a364b9c933423ab8))
+* **eth-sender:** fix for missing eth_txs_history entries ([#2236](https://github.com/matter-labs/zksync-era/issues/2236)) ([f05b0ae](https://github.com/matter-labs/zksync-era/commit/f05b0aefbb04ce715431bf039b8760e95f87dc93))
+* Expose fair_pubdata_price for blocks and batches ([#2244](https://github.com/matter-labs/zksync-era/issues/2244)) ([0d51cd6](https://github.com/matter-labs/zksync-era/commit/0d51cd6f3e65eef1bda981fe96f3026d8e12156d))
+* **merkle-tree:** Rework tree rollback ([#2207](https://github.com/matter-labs/zksync-era/issues/2207)) ([c3b9c38](https://github.com/matter-labs/zksync-era/commit/c3b9c38ca07f01e6f7b2d7e631b2b811cacecf3a))
+* **node-framework:** Add Main Node Client layer ([#2132](https://github.com/matter-labs/zksync-era/issues/2132)) ([927d842](https://github.com/matter-labs/zksync-era/commit/927d8427e05b6d1a3aa9a63ee8e0db4fb1b82094))
+* **node:** Move some stuff around ([#2151](https://github.com/matter-labs/zksync-era/issues/2151)) ([bad5a6c](https://github.com/matter-labs/zksync-era/commit/bad5a6c0ec2e166235418a2796b6ccf6f8b3b05f))
+* **node:** Port (most of) Node to the Node Framework ([#2196](https://github.com/matter-labs/zksync-era/issues/2196)) ([7842bc4](https://github.com/matter-labs/zksync-era/commit/7842bc4842c5c92437639105d8edac5f775ad0e6))
+* **object-store:** Allow caching object store objects locally ([#2153](https://github.com/matter-labs/zksync-era/issues/2153)) ([6c6e65c](https://github.com/matter-labs/zksync-era/commit/6c6e65ce646bcb4ed9ba8b2dd6be676bb6e66324))
+* **proof_data_handler:** add new endpoints to the TEE prover interface API ([#1993](https://github.com/matter-labs/zksync-era/issues/1993)) ([eca98cc](https://github.com/matter-labs/zksync-era/commit/eca98cceeb74a979040279caaf1d05d1fdf1b90c))
+* **prover:** Add file based config for fri prover gateway ([#2150](https://github.com/matter-labs/zksync-era/issues/2150)) ([81ffc6a](https://github.com/matter-labs/zksync-era/commit/81ffc6a753fb72747c01ddc8a37211bf6a8a1a27))
+* Remove initialize_components function ([#2284](https://github.com/matter-labs/zksync-era/issues/2284)) ([0a38891](https://github.com/matter-labs/zksync-era/commit/0a388911914bfcf58785e394db9d5ddce3afdef0))
+* **state-keeper:** Add metric for l2 block seal reason ([#2229](https://github.com/matter-labs/zksync-era/issues/2229)) ([f967e6d](https://github.com/matter-labs/zksync-era/commit/f967e6d20bb7f9192af08e5040c58af97585862d))
+* **state-keeper:** More state keeper metrics ([#2224](https://github.com/matter-labs/zksync-era/issues/2224)) ([1e48cd9](https://github.com/matter-labs/zksync-era/commit/1e48cd99a0e5ea8bedff91135938dbbb70141d43))
+* **sync-layer:** adapt MiniMerkleTree to manage priority queue ([#2068](https://github.com/matter-labs/zksync-era/issues/2068)) ([3e72364](https://github.com/matter-labs/zksync-era/commit/3e7236494e346324fe1254038632ee005e0083e5))
+* **tee_verifier_input_producer:** use `FactoryDepsDal::get_factory_deps() ([#2271](https://github.com/matter-labs/zksync-era/issues/2271)) ([2c0a00a](https://github.com/matter-labs/zksync-era/commit/2c0a00add179cc4ed521bbb9d616b8828f0ad3c1))
+* **toolbox:** add zk_toolbox ci ([#1985](https://github.com/matter-labs/zksync-era/issues/1985)) ([4ab4922](https://github.com/matter-labs/zksync-era/commit/4ab492201a1654a254c0b14a382a2cb67e3cb9e5))
+* updated boojum and nightly rust compiler ([#2126](https://github.com/matter-labs/zksync-era/issues/2126)) ([9e39f13](https://github.com/matter-labs/zksync-era/commit/9e39f13c29788e66645ea57f623555c4b36b8aff))
+* upgraded encoding of transactions in consensus Payload. ([#2245](https://github.com/matter-labs/zksync-era/issues/2245)) ([cb6a6c8](https://github.com/matter-labs/zksync-era/commit/cb6a6c88de54806d0f4ae4af7ea873a911605780))
+* Use info log level for crates named zksync_* by default ([#2296](https://github.com/matter-labs/zksync-era/issues/2296)) ([9303142](https://github.com/matter-labs/zksync-era/commit/9303142de5e6af3da69fa836a7e537287bdde4b0))
+* verification of L1Batch witness (BFT-471) - attempt 2 ([#2232](https://github.com/matter-labs/zksync-era/issues/2232)) ([dbcf3c6](https://github.com/matter-labs/zksync-era/commit/dbcf3c6d02a6bfb9197bf4278f296632b0fd7d66))
+* verification of L1Batch witness (BFT-471) ([#2019](https://github.com/matter-labs/zksync-era/issues/2019)) ([6cc5455](https://github.com/matter-labs/zksync-era/commit/6cc54555972804be4cd2ca118f0e425c490fbfca))
+* **vm-runner:** add basic metrics ([#2203](https://github.com/matter-labs/zksync-era/issues/2203)) ([dd154f3](https://github.com/matter-labs/zksync-era/commit/dd154f388c23ff67068a1053fec878e80ba9bd17))
+* **vm-runner:** add protective reads persistence flag for state keeper ([#2307](https://github.com/matter-labs/zksync-era/issues/2307)) ([36d2eb6](https://github.com/matter-labs/zksync-era/commit/36d2eb651a583293a5103dc990813e74e8532f52))
+* **vm-runner:** shadow protective reads using VM runner ([#2017](https://github.com/matter-labs/zksync-era/issues/2017)) ([1402dd0](https://github.com/matter-labs/zksync-era/commit/1402dd054e3248de55bcc6899bb58a2cfe900473))
+
+
+### Bug Fixes
+
+* **api:** Fix getting pending block ([#2186](https://github.com/matter-labs/zksync-era/issues/2186)) ([93315ba](https://github.com/matter-labs/zksync-era/commit/93315ba95c54bd0730c964998bfc0c64080b3c04))
+* **api:** Fix transaction methods for pruned transactions ([#2168](https://github.com/matter-labs/zksync-era/issues/2168)) ([00c4cca](https://github.com/matter-labs/zksync-era/commit/00c4cca1635e6cd17bbc74e7841f47ead7f8e445))
+* **config:** Fix object store ([#2183](https://github.com/matter-labs/zksync-era/issues/2183)) ([551cdc2](https://github.com/matter-labs/zksync-era/commit/551cdc2da38dbd2ca1f07e9a49f9f2745f21556a))
+* **config:** Split object stores ([#2187](https://github.com/matter-labs/zksync-era/issues/2187)) ([9bcdabc](https://github.com/matter-labs/zksync-era/commit/9bcdabcaa8462ae19da1688052a7a78fa4108298))
+* **db:** Fix `insert_proof_generation_details()` ([#2291](https://github.com/matter-labs/zksync-era/issues/2291)) ([c2412cf](https://github.com/matter-labs/zksync-era/commit/c2412cf2421448c706a08e3c8fda3b0af6aac497))
+* **db:** Optimize `get_l2_blocks_to_execute_for_l1_batch` ([#2199](https://github.com/matter-labs/zksync-era/issues/2199)) ([06ec5f3](https://github.com/matter-labs/zksync-era/commit/06ec5f3e6bb66025a3ec1e5b4d314c7ff1e116c7))
+* **en:** Fix reorg detection in presence of tree data fetcher ([#2197](https://github.com/matter-labs/zksync-era/issues/2197)) ([20da566](https://github.com/matter-labs/zksync-era/commit/20da5668a42a11cc0ea07f9d1a5d5c39e32ce3b4))
+* **en:** Fix transient error detection in consistency checker ([#2140](https://github.com/matter-labs/zksync-era/issues/2140)) ([38fdfe0](https://github.com/matter-labs/zksync-era/commit/38fdfe083f61f5aad11b5a0efb41215c674f3186))
+* **en:** Remove L1 client health check ([#2136](https://github.com/matter-labs/zksync-era/issues/2136)) ([49198f6](https://github.com/matter-labs/zksync-era/commit/49198f695a93d24a5e2d37a24b2c5e1b6c70b9c5))
+* **eth-sender:** Don't resend already sent transactions in the same block ([#2208](https://github.com/matter-labs/zksync-era/issues/2208)) ([3538e9c](https://github.com/matter-labs/zksync-era/commit/3538e9c346ef7bacf62fd76874d41548a4be46ea))
+* **eth-sender:** etter error handling in eth-sender ([#2163](https://github.com/matter-labs/zksync-era/issues/2163)) ([0cad504](https://github.com/matter-labs/zksync-era/commit/0cad504b1c40399a24b604c3454ae4ab98550ad6))
+* **node_framework:** Run gas adjuster task only if necessary ([#2266](https://github.com/matter-labs/zksync-era/issues/2266)) ([2dac846](https://github.com/matter-labs/zksync-era/commit/2dac8463376b5ca7cb3aeefab83b9220f3b2466a))
+* **object-store:** Consider more GCS errors transient ([#2246](https://github.com/matter-labs/zksync-era/issues/2246)) ([2f6cd41](https://github.com/matter-labs/zksync-era/commit/2f6cd41642d9c2680f17e5c1adf22ad8e1b0288a))
+* **prover_cli:** Remove outdated fix for circuit id in node wg ([#2248](https://github.com/matter-labs/zksync-era/issues/2248)) ([db8e71b](https://github.com/matter-labs/zksync-era/commit/db8e71b55393b3d0e419886b62712b61305ac030))
+* **prover:** Disallow state changes from successful ([#2233](https://github.com/matter-labs/zksync-era/issues/2233)) ([2488a76](https://github.com/matter-labs/zksync-era/commit/2488a767a362ea3b40a348ae9822bed77d4b8de9))
+* **pruning:** Check pruning in metadata calculator ([#2286](https://github.com/matter-labs/zksync-era/issues/2286)) ([7bd8f27](https://github.com/matter-labs/zksync-era/commit/7bd8f27e5171f37da3aa1d6c6abb06b9a291fbbf))
+* Treat 502s and 503s as transient for GCS OS ([#2202](https://github.com/matter-labs/zksync-era/issues/2202)) ([0a12c52](https://github.com/matter-labs/zksync-era/commit/0a12c5224b0b6b6d937311e6d6d81c26b03b1d9d))
+* **vm-runner:** add config value for the first processed batch ([#2158](https://github.com/matter-labs/zksync-era/issues/2158)) ([f666717](https://github.com/matter-labs/zksync-era/commit/f666717e01beb90ff878d1cdf060284b27faf680))
+* **vm-runner:** make `last_ready_batch` account for `first_processed_batch` ([#2238](https://github.com/matter-labs/zksync-era/issues/2238)) ([3889794](https://github.com/matter-labs/zksync-era/commit/38897947439db539920d97f2318b2133ddc40284))
+* **vm:** fix insertion to `decommitted_code_hashes` ([#2275](https://github.com/matter-labs/zksync-era/issues/2275)) ([15bb71e](https://github.com/matter-labs/zksync-era/commit/15bb71ec3ee66796e62cb7e61dec6e496e1f2774))
+* **vm:** Update `decommitted_code_hashes` in `prepare_to_decommit` ([#2253](https://github.com/matter-labs/zksync-era/issues/2253)) ([6c49a50](https://github.com/matter-labs/zksync-era/commit/6c49a50eb4374a06143e5bac130d0e0e74347597))
+
+
+### Performance Improvements
+
+* **db:** Improve storage switching for state keeper cache ([#2234](https://github.com/matter-labs/zksync-era/issues/2234)) ([7c8e24c](https://github.com/matter-labs/zksync-era/commit/7c8e24ce7d6e6d47359d5ae4ab1db4ddbd3e9441))
+* **db:** Try yet another storage log pruning approach ([#2268](https://github.com/matter-labs/zksync-era/issues/2268)) ([3ee34be](https://github.com/matter-labs/zksync-era/commit/3ee34be7e48fb4b7c5030a6422a0a9f8a8ebc35b))
+* **en:** Parallelize persistence and chunk processing during tree recovery ([#2050](https://github.com/matter-labs/zksync-era/issues/2050)) ([b08a667](https://github.com/matter-labs/zksync-era/commit/b08a667c819f8b3d222c237fc4447be6b75d334e))
+* **pruning:** Use more efficient query to delete past storage logs ([#2179](https://github.com/matter-labs/zksync-era/issues/2179)) ([4c18755](https://github.com/matter-labs/zksync-era/commit/4c18755876a42ee81840cadb365b3040194d0ae3))
+
+
+### Reverts
+
+* **pruning:** Revert pruning query ([#2220](https://github.com/matter-labs/zksync-era/issues/2220)) ([8427cdd](https://github.com/matter-labs/zksync-era/commit/8427cddcbd5ba13388e5b96fb988128f8dabe0f4))
+* verification of L1Batch witness (BFT-471) ([#2230](https://github.com/matter-labs/zksync-era/issues/2230)) ([227e101](https://github.com/matter-labs/zksync-era/commit/227e10180396fbb54a2e99cab775f13bc93745f3))
+
+## [24.7.0](https://github.com/matter-labs/zksync-era/compare/core-v24.6.0...core-v24.7.0) (2024-06-03)
+
+
+### Features
+
+* **node-framework:** Add reorg detector  ([#1551](https://github.com/matter-labs/zksync-era/issues/1551)) ([7c7d352](https://github.com/matter-labs/zksync-era/commit/7c7d352708aa64b55a9b33e273b1a16d3f1d168b))
+
+
+### Bug Fixes
+
+* **block-reverter:** Fix reverting snapshot files ([#2064](https://github.com/matter-labs/zksync-era/issues/2064)) ([17a7e78](https://github.com/matter-labs/zksync-era/commit/17a7e782d9e35eaf38acf920c2326d4037c7781e))
+* **env:** Do not print stacktrace for locate workspace ([#2111](https://github.com/matter-labs/zksync-era/issues/2111)) ([5f2677f](https://github.com/matter-labs/zksync-era/commit/5f2677f2c966f4dd23538a02ecd7fffe306bec7f))
+* **eth-watch:** make assert less strict ([#2129](https://github.com/matter-labs/zksync-era/issues/2129)) ([e9bab95](https://github.com/matter-labs/zksync-era/commit/e9bab95539af383c161b357a422d5c45f20f27aa))
+
+## [24.6.0](https://github.com/matter-labs/zksync-era/compare/core-v24.5.1...core-v24.6.0) (2024-06-03)
+
+
+### Features
+
+* **en:** Fetch old L1 batch hashes from L1 ([#2000](https://github.com/matter-labs/zksync-era/issues/2000)) ([dc5a918](https://github.com/matter-labs/zksync-era/commit/dc5a9188a44a51810c9b7609a0887090043507f2))
+* use semver for metrics, move constants to prover workspace ([#2098](https://github.com/matter-labs/zksync-era/issues/2098)) ([7a50a9f](https://github.com/matter-labs/zksync-era/commit/7a50a9f79e516ec150d1f30b9f1c781a5523375b))
+
+
+### Bug Fixes
+
+* **api:** correct default fee data in eth call ([#2072](https://github.com/matter-labs/zksync-era/issues/2072)) ([e71f6f9](https://github.com/matter-labs/zksync-era/commit/e71f6f96bda08f8330c643a31df4ef9e82c9afc2))
+
+## [24.5.1](https://github.com/matter-labs/zksync-era/compare/core-v24.5.0...core-v24.5.1) (2024-05-31)
+
+
+### Bug Fixes
+
+* **house-keeper:** Fix queue size queries ([#2106](https://github.com/matter-labs/zksync-era/issues/2106)) ([183502a](https://github.com/matter-labs/zksync-era/commit/183502a17eb47a747f50b6a9d38ab78de984f80e))
+
+## [24.5.0](https://github.com/matter-labs/zksync-era/compare/core-v24.4.0...core-v24.5.0) (2024-05-30)
+
+
+### Features
+
+* Add protocol_version label to WG jobs metric ([#2009](https://github.com/matter-labs/zksync-era/issues/2009)) ([e0a3393](https://github.com/matter-labs/zksync-era/commit/e0a33931f9bb9429eff362deaa1500fe914971c7))
+* **config:** remove zksync home ([#2022](https://github.com/matter-labs/zksync-era/issues/2022)) ([d08fe81](https://github.com/matter-labs/zksync-era/commit/d08fe81f4ec6c3aaeb5ad98351e44a63e5b100be))
+* **en:** Improve tree snapshot recovery ([#1938](https://github.com/matter-labs/zksync-era/issues/1938)) ([5bc8234](https://github.com/matter-labs/zksync-era/commit/5bc8234aae57c0d0f492b94860483a53d044b323))
+* Make house keeper emit correct protocol version ([#2062](https://github.com/matter-labs/zksync-era/issues/2062)) ([a58a7e8](https://github.com/matter-labs/zksync-era/commit/a58a7e8ec8599eb957e5693308b789e7ace5c126))
+* **node_framework:** Migrate main node to the framework ([#1997](https://github.com/matter-labs/zksync-era/issues/1997)) ([27a26cb](https://github.com/matter-labs/zksync-era/commit/27a26cbb955ee8dd59140386af90816a1a44ab99))
+* **node_framework:** Synchronize pools layer with logic in initialize_components ([#2079](https://github.com/matter-labs/zksync-era/issues/2079)) ([3202461](https://github.com/matter-labs/zksync-era/commit/3202461788052f0bf4a55738b9b59a13b6a83ca6))
+* Protocol semantic version ([#2059](https://github.com/matter-labs/zksync-era/issues/2059)) ([3984dcf](https://github.com/matter-labs/zksync-era/commit/3984dcfbdd890f0862c9c0f3e7757fb8b0c8184a))
+* **prover:** Adnotate prover queue metrics with protocol version ([#1893](https://github.com/matter-labs/zksync-era/issues/1893)) ([d1e1004](https://github.com/matter-labs/zksync-era/commit/d1e1004416b7e9db47e242ff68f01b5520834e94))
+* save writes needed for tree in state keeper ([#1965](https://github.com/matter-labs/zksync-era/issues/1965)) ([471af53](https://github.com/matter-labs/zksync-era/commit/471af539db6d965852360f8c0978744061a932eb))
+* **test:** Add filebased config support for integration tests ([#2043](https://github.com/matter-labs/zksync-era/issues/2043)) ([be3ded9](https://github.com/matter-labs/zksync-era/commit/be3ded97ede1caea69b4881b783c7b40861d183d))
+* **vm-runner:** implement VM runner main body ([#1955](https://github.com/matter-labs/zksync-era/issues/1955)) ([bf5b6c2](https://github.com/matter-labs/zksync-era/commit/bf5b6c2e5491b14920fd881388cbfdb6d7b4aa91))
+
+
+### Bug Fixes
+
+* **API:** polish web3 api  block-related types ([#1994](https://github.com/matter-labs/zksync-era/issues/1994)) ([6cd3c53](https://github.com/matter-labs/zksync-era/commit/6cd3c532190ee96a9ca56336d20837d249d6207e))
+* **en:** chunk factory deps  ([#2077](https://github.com/matter-labs/zksync-era/issues/2077)) ([4b9e6fa](https://github.com/matter-labs/zksync-era/commit/4b9e6faead8df7119f4617f4d4ec2f4ac348c174))
+* **en:** Fix recovery-related metrics ([#2014](https://github.com/matter-labs/zksync-era/issues/2014)) ([86355d6](https://github.com/matter-labs/zksync-era/commit/86355d647fca772a7c665a8534ab02e8a213cf7b))
+* **eth-watch:** Do not track for stm, only for diamond proxy ([#2080](https://github.com/matter-labs/zksync-era/issues/2080)) ([87adac9](https://github.com/matter-labs/zksync-era/commit/87adac9c4f5470e82e46eeef892442adb6948713))
+* fix metrics reporting wrong values ([#2065](https://github.com/matter-labs/zksync-era/issues/2065)) ([2ec010a](https://github.com/matter-labs/zksync-era/commit/2ec010aa15dc04f367fc7276ab01afcf211f57b4))
+* **loadtest:** resolve unit conversion error in loadtest metrics ([#1987](https://github.com/matter-labs/zksync-era/issues/1987)) ([b5870a0](https://github.com/matter-labs/zksync-era/commit/b5870a0b9c470ed38dfe4c67036139a3a1d7dddc))
+* **merkle-tree:** Fix incoherent Merkle tree view ([#2071](https://github.com/matter-labs/zksync-era/issues/2071)) ([2fc9a6c](https://github.com/matter-labs/zksync-era/commit/2fc9a6cdb659bd16694c568d16a5b76af063c730))
+* **metadata-calculator:** protective reads sort ([#2087](https://github.com/matter-labs/zksync-era/issues/2087)) ([160c13c](https://github.com/matter-labs/zksync-era/commit/160c13c576faaeb490309c2f5a10e4de1d90f7cc))
+* **node_framework:** Fix the connection pool size for the catchup task ([#2046](https://github.com/matter-labs/zksync-era/issues/2046)) ([c00a2eb](https://github.com/matter-labs/zksync-era/commit/c00a2eb21fe1670386364c7ced38f562471ed7f5))
+* **node_framework:** Use custom pool for commitiment generator ([#2076](https://github.com/matter-labs/zksync-era/issues/2076)) ([994df8f](https://github.com/matter-labs/zksync-era/commit/994df8f85cd65d032fb5ce991df89fdc319c24e2))
+* **protocol_version:** Add backward compatibility ([#2097](https://github.com/matter-labs/zksync-era/issues/2097)) ([391624b](https://github.com/matter-labs/zksync-era/commit/391624b01b5fb4bdf52b8826205e35839746732f))
+* **pruning:** Fix DB pruner responsiveness during shutdown ([#2058](https://github.com/matter-labs/zksync-era/issues/2058)) ([0a07312](https://github.com/matter-labs/zksync-era/commit/0a07312089833cd5da33009edd13ad253b263677))
+* **zk_toolbox:** Use both folders for loading contracts  ([#2030](https://github.com/matter-labs/zksync-era/issues/2030)) ([97c6d5c](https://github.com/matter-labs/zksync-era/commit/97c6d5c9c2d9dddf0b18391077c8828e5dc7042b))
+
+
+### Performance Improvements
+
+* **commitment-generator:** Run commitment generation for multiple batches in parallel ([#1984](https://github.com/matter-labs/zksync-era/issues/1984)) ([602bf67](https://github.com/matter-labs/zksync-era/commit/602bf6725e7590fc67d8b027e07e0767fec9408b))
+
+## [24.4.0](https://github.com/matter-labs/zksync-era/compare/core-v24.3.0...core-v24.4.0) (2024-05-21)
+
+
+### Features
+
+* **prover:** add GPU feature for compressor ([#1838](https://github.com/matter-labs/zksync-era/issues/1838)) ([e9a2213](https://github.com/matter-labs/zksync-era/commit/e9a2213985928cd3804a3855ccfde6a7d99da238))
+* **pruning:** remove manual vaccum; add migration configuring autovacuum ([#1983](https://github.com/matter-labs/zksync-era/issues/1983)) ([3d98072](https://github.com/matter-labs/zksync-era/commit/3d98072468b1f7dac653b4ff04bda66e2fc8185e))
+* **tests:** Move all env calls to one place in ts-tests ([#1968](https://github.com/matter-labs/zksync-era/issues/1968)) ([3300047](https://github.com/matter-labs/zksync-era/commit/33000475b47831fc3791dac338aae4d0e7db25b0))
+
+
+### Bug Fixes
+
+* Disallow non null updates for transactions ([#1951](https://github.com/matter-labs/zksync-era/issues/1951)) ([a603ac8](https://github.com/matter-labs/zksync-era/commit/a603ac8eaab112738e1c2336b0f537273ad58d85))
+* **en:** Minor node fixes ([#1978](https://github.com/matter-labs/zksync-era/issues/1978)) ([74144e8](https://github.com/matter-labs/zksync-era/commit/74144e8240f633a587f0cd68f4d136a7a68af7be))
+* **en:** run `MainNodeFeeParamsFetcher` in API component ([#1988](https://github.com/matter-labs/zksync-era/issues/1988)) ([b62677e](https://github.com/matter-labs/zksync-era/commit/b62677ea5f8f6bb57d6ad02139a938ccf943e06a))
+* **merkle-tree:** Fix tree API health check status ([#1973](https://github.com/matter-labs/zksync-era/issues/1973)) ([6235561](https://github.com/matter-labs/zksync-era/commit/623556112c40400244906e42c5f84a047dc6f26b))
+
+## [24.3.0](https://github.com/matter-labs/zksync-era/compare/core-v24.2.0...core-v24.3.0) (2024-05-16)
+
+
+### Features
+
+* Added support for making EN a (non-leader) consensus validator (BFT-426) ([#1905](https://github.com/matter-labs/zksync-era/issues/1905)) ([9973629](https://github.com/matter-labs/zksync-era/commit/9973629e35cec9af9eac81452631a2526dd336a8))
+* **configs:** Extract secrets to an additional config  ([#1956](https://github.com/matter-labs/zksync-era/issues/1956)) ([bab4d65](https://github.com/matter-labs/zksync-era/commit/bab4d6579828e484453c84df417550bbaf1013b6))
+* **en:** Fetch L1 batch root hashes from main node ([#1923](https://github.com/matter-labs/zksync-era/issues/1923)) ([72a3571](https://github.com/matter-labs/zksync-era/commit/72a357147391b6f7e6e1ee44bb2c22462316732b))
+* **eth-client:** Generalize RPC client ([#1898](https://github.com/matter-labs/zksync-era/issues/1898)) ([a4e099f](https://github.com/matter-labs/zksync-era/commit/a4e099fe961f329ff2d604d657862819732446b4))
+* **Prover CLI:** `requeue` cmd ([#1719](https://github.com/matter-labs/zksync-era/issues/1719)) ([f722df7](https://github.com/matter-labs/zksync-era/commit/f722df7c0ae429f43d047ff79e24bca39f81230c))
+* **Prover CLI:** `status batch --verbose` ([#1899](https://github.com/matter-labs/zksync-era/issues/1899)) ([cf80184](https://github.com/matter-labs/zksync-era/commit/cf80184941a1fc62c3a755b99571d370949d8566))
+* **pruning:** Vacuum freeze started daily ([#1929](https://github.com/matter-labs/zksync-era/issues/1929)) ([5c85e9f](https://github.com/matter-labs/zksync-era/commit/5c85e9fad350751c85cf6f2d1a9eb79d0e4503df))
+* Remove metrics crate ([#1902](https://github.com/matter-labs/zksync-era/issues/1902)) ([5f7bda7](https://github.com/matter-labs/zksync-era/commit/5f7bda78c3fef7f324f8cbeaed2d7d41b7169d16))
+* **state-keeper:** Parallel l2 block sealing ([#1801](https://github.com/matter-labs/zksync-era/issues/1801)) ([9b06dd8](https://github.com/matter-labs/zksync-era/commit/9b06dd848e85e20f2e94d2a0e858c3f207da5f47))
+* tee_verifier_input_producer ([#1860](https://github.com/matter-labs/zksync-era/issues/1860)) ([fea7f16](https://github.com/matter-labs/zksync-era/commit/fea7f165cfb96bf673353ef562fb5c06f3e49736))
+* **vm-runner:** implement output handler for VM runner ([#1856](https://github.com/matter-labs/zksync-era/issues/1856)) ([1e4aeb5](https://github.com/matter-labs/zksync-era/commit/1e4aeb57d36b347f9b1c7f2112b0af0471a6dbc9))
+
+
+### Bug Fixes
+
+* **basic_types:** bincode deserialization for `web3::Bytes` ([#1928](https://github.com/matter-labs/zksync-era/issues/1928)) ([406ec8c](https://github.com/matter-labs/zksync-era/commit/406ec8cb61ff2b7870ea0a1572e825133304048a))
+* **config:** Fix data-handler-config ([#1919](https://github.com/matter-labs/zksync-era/issues/1919)) ([b6bb041](https://github.com/matter-labs/zksync-era/commit/b6bb041693811813f05dee0587b678afdc1d97a1))
+* **en:** Delete old txs by (init_addr, nonce) ([#1942](https://github.com/matter-labs/zksync-era/issues/1942)) ([fa5f4a7](https://github.com/matter-labs/zksync-era/commit/fa5f4a7e442d4343ed112b448a035c6a0b8f1504))
+* **en:** Fix reorg detector logic for dealing with last L1 batch ([#1906](https://github.com/matter-labs/zksync-era/issues/1906)) ([3af5f5b](https://github.com/matter-labs/zksync-era/commit/3af5f5b3f663c8586cf15698eee168918333a966))
+* parentHash in websocket blocks subscription is shown as 0x0 ([#1946](https://github.com/matter-labs/zksync-era/issues/1946)) ([fc2efad](https://github.com/matter-labs/zksync-era/commit/fc2efad56e1a194b8945abf3fff1abfcd0b7da54))
+* **Prover CLI:** `status batch` bugs ([#1865](https://github.com/matter-labs/zksync-era/issues/1865)) ([09682f2](https://github.com/matter-labs/zksync-era/commit/09682f2951f5f62fa0942057e96f855d78bf67c8))
+* **utils:** bincode ser-/deserialization for `BytesToHexSerde` ([#1947](https://github.com/matter-labs/zksync-era/issues/1947)) ([a75b917](https://github.com/matter-labs/zksync-era/commit/a75b9174b73b1293f0b7f696daa6b21183fd7d19))
+
+## [24.2.0](https://github.com/matter-labs/zksync-era/compare/core-v24.1.0...core-v24.2.0) (2024-05-14)
+
+
+### Features
+
+* **api:** Add zeppelinos well-known slots ([#1892](https://github.com/matter-labs/zksync-era/issues/1892)) ([1c041cc](https://github.com/matter-labs/zksync-era/commit/1c041ccd4226f7f9c520814f3af8d00d6d8784c7))
+* **en:** Brush up EN observability config ([#1897](https://github.com/matter-labs/zksync-era/issues/1897)) ([086f768](https://github.com/matter-labs/zksync-era/commit/086f7683307b2b9c6a43cb8cf2c1a8a8874277a7))
+* **node_framework:** Add tree api server & client to the metadata calculator ([#1885](https://github.com/matter-labs/zksync-era/issues/1885)) ([6dda157](https://github.com/matter-labs/zksync-era/commit/6dda15773295c36d4a8ef56d4e84e4b944829922))
+
+
+### Bug Fixes
+
+* **core/prover:** Changes to support Validium ([#1910](https://github.com/matter-labs/zksync-era/issues/1910)) ([1cb0dc5](https://github.com/matter-labs/zksync-era/commit/1cb0dc5504d226c55217accca87f2fd75addc917))
+* **eth-client:** Fix call error detection ([#1890](https://github.com/matter-labs/zksync-era/issues/1890)) ([c22ce63](https://github.com/matter-labs/zksync-era/commit/c22ce639e08f78b5fd12f2ba7f1e419e8849b1ca))
+* **eth-client:** Make block params non-optional ([#1882](https://github.com/matter-labs/zksync-era/issues/1882)) ([3005862](https://github.com/matter-labs/zksync-era/commit/3005862be1ea7c40dea0ae9442b3299b15cf20ca))
+* **pruning:** Don't require metadata to exist for first L1 batches to be pruned ([#1850](https://github.com/matter-labs/zksync-era/issues/1850)) ([75c8565](https://github.com/matter-labs/zksync-era/commit/75c85654c4ac4638f3f0705485c95e72727880d4))
+* **pruning:** query optimization ([#1904](https://github.com/matter-labs/zksync-era/issues/1904)) ([9154390](https://github.com/matter-labs/zksync-era/commit/9154390ff1d0c2d66a4a811795afa66e6c3c742e))
+
 ## [24.1.0](https://github.com/matter-labs/zksync-era/compare/core-v24.0.0...core-v24.1.0) (2024-05-08)
 
 
diff --git a/core/bin/block_reverter/Cargo.toml b/core/bin/block_reverter/Cargo.toml
index 5f32f68acbd8..c9499d644fe9 100644
--- a/core/bin/block_reverter/Cargo.toml
+++ b/core/bin/block_reverter/Cargo.toml
@@ -12,12 +12,14 @@ publish = false
 
 [dependencies]
 zksync_config.workspace = true
+zksync_core_leftovers.workspace = true
 zksync_env_config.workspace = true
 zksync_dal.workspace = true
+zksync_protobuf_config.workspace = true
 zksync_object_store.workspace = true
 zksync_types.workspace = true
 zksync_block_reverter.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
diff --git a/core/bin/block_reverter/src/main.rs b/core/bin/block_reverter/src/main.rs
index 5bd15def73af..513de522aa40 100644
--- a/core/bin/block_reverter/src/main.rs
+++ b/core/bin/block_reverter/src/main.rs
@@ -1,19 +1,23 @@
-use std::env;
+use std::path::PathBuf;
 
 use anyhow::Context as _;
 use clap::{Parser, Subcommand};
 use tokio::io::{self, AsyncReadExt};
 use zksync_block_reverter::{
     eth_client::{
-        clients::{PKSigningClient, QueryClient},
+        clients::{Client, PKSigningClient},
         EthInterface,
     },
     BlockReverter, BlockReverterEthConfig, NodeRole,
 };
 use zksync_config::{
-    configs::{chain::NetworkConfig, ObservabilityConfig},
-    ContractsConfig, DBConfig, EthConfig, PostgresConfig,
+    configs::{
+        chain::NetworkConfig, wallets::Wallets, DatabaseSecrets, GeneralConfig, L1Secrets,
+        ObservabilityConfig,
+    },
+    ContractsConfig, DBConfig, EthConfig, GenesisConfig, PostgresConfig,
 };
+use zksync_core_leftovers::temp_config_store::decode_yaml_repr;
 use zksync_dal::{ConnectionPool, Core};
 use zksync_env_config::{object_store::SnapshotsObjectStoreConfig, FromEnv};
 use zksync_object_store::ObjectStoreFactory;
@@ -24,6 +28,21 @@ use zksync_types::{Address, L1BatchNumber};
 struct Cli {
     #[command(subcommand)]
     command: Command,
+    /// Path to yaml config. If set, it will be used instead of env vars
+    #[arg(long, global = true)]
+    config_path: Option<PathBuf>,
+    /// Path to yaml contracts config. If set, it will be used instead of env vars
+    #[arg(long, global = true)]
+    contracts_config_path: Option<PathBuf>,
+    /// Path to yaml secrets config. If set, it will be used instead of env vars
+    #[arg(long, global = true)]
+    secrets_path: Option<PathBuf>,
+    /// Path to yaml wallets config. If set, it will be used instead of env vars
+    #[arg(long, global = true)]
+    wallets_path: Option<PathBuf>,
+    /// Path to yaml genesis config. If set, it will be used instead of env vars
+    #[arg(long, global = true)]
+    genesis_path: Option<PathBuf>,
 }
 
 #[derive(Debug, Subcommand)]
@@ -69,6 +88,9 @@ enum Command {
         /// Flag that specifies if RocksDB with state keeper cache should be rolled back.
         #[arg(long)]
         rollback_sk_cache: bool,
+        /// Flag that specifies if snapshot files in GCS should be rolled back.
+        #[arg(long, requires = "rollback_postgres")]
+        rollback_snapshots: bool,
         /// Flag that allows to roll back already executed blocks. It's ultra dangerous and required only for fixing external nodes.
         #[arg(long)]
         allow_executed_block_reversion: bool,
@@ -81,15 +103,17 @@ enum Command {
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let command = Cli::parse().command;
+    let opts = Cli::parse();
     let observability_config =
         ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
 
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new()
+        .with_log_format(log_format)
+        .disable_default_logs(); // It's a CLI application, so we only need to show logs that were actually requested.
     if let Some(sentry_url) = observability_config.sentry_url {
         builder = builder
             .with_sentry_url(&sentry_url)
@@ -98,25 +122,103 @@ async fn main() -> anyhow::Result<()> {
     }
     let _guard = builder.build();
 
-    let eth_sender = EthConfig::from_env().context("EthConfig::from_env()")?;
-    let db_config = DBConfig::from_env().context("DBConfig::from_env()")?;
+    let general_config: Option<GeneralConfig> = if let Some(path) = opts.config_path {
+        let yaml = std::fs::read_to_string(&path).with_context(|| path.display().to_string())?;
+        let config =
+            decode_yaml_repr::<zksync_protobuf_config::proto::general::GeneralConfig>(&yaml)
+                .context("failed decoding general YAML config")?;
+        Some(config)
+    } else {
+        None
+    };
+    let wallets_config: Option<Wallets> = if let Some(path) = opts.wallets_path {
+        let yaml = std::fs::read_to_string(&path).with_context(|| path.display().to_string())?;
+        let config = decode_yaml_repr::<zksync_protobuf_config::proto::wallets::Wallets>(&yaml)
+            .context("failed decoding wallets YAML config")?;
+        Some(config)
+    } else {
+        None
+    };
+    let genesis_config: Option<GenesisConfig> = if let Some(path) = opts.genesis_path {
+        let yaml = std::fs::read_to_string(&path).with_context(|| path.display().to_string())?;
+        let config = decode_yaml_repr::<zksync_protobuf_config::proto::genesis::Genesis>(&yaml)
+            .context("failed decoding genesis YAML config")?;
+        Some(config)
+    } else {
+        None
+    };
+
+    let eth_sender = match &general_config {
+        Some(general_config) => general_config
+            .eth
+            .clone()
+            .context("Failed to find eth config")?,
+        None => EthConfig::from_env().context("EthConfig::from_env()")?,
+    };
+    let db_config = match &general_config {
+        Some(general_config) => general_config
+            .db_config
+            .clone()
+            .context("Failed to find eth config")?,
+        None => DBConfig::from_env().context("DBConfig::from_env()")?,
+    };
+    let contracts = match opts.contracts_config_path {
+        Some(path) => {
+            let yaml =
+                std::fs::read_to_string(&path).with_context(|| path.display().to_string())?;
+            decode_yaml_repr::<zksync_protobuf_config::proto::contracts::Contracts>(&yaml)
+                .context("failed decoding contracts YAML config")?
+        }
+        None => ContractsConfig::from_env().context("ContractsConfig::from_env()")?,
+    };
+    let secrets_config = if let Some(path) = opts.secrets_path {
+        let yaml = std::fs::read_to_string(&path).with_context(|| path.display().to_string())?;
+        let config = decode_yaml_repr::<zksync_protobuf_config::proto::secrets::Secrets>(&yaml)
+            .context("failed decoding secrets YAML config")?;
+        Some(config)
+    } else {
+        None
+    };
+
     let default_priority_fee_per_gas = eth_sender
         .gas_adjuster
         .context("gas_adjuster")?
         .default_priority_fee_per_gas;
-    let contracts = ContractsConfig::from_env().context("ContractsConfig::from_env()")?;
-    let network = NetworkConfig::from_env().context("NetworkConfig::from_env()")?;
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
-    let era_chain_id = env::var("CONTRACTS_ERA_CHAIN_ID")
-        .context("`CONTRACTS_ERA_CHAIN_ID` env variable is not set")?
-        .parse()
-        .map_err(|err| {
-            anyhow::anyhow!("failed parsing `CONTRACTS_ERA_CHAIN_ID` env variable: {err}")
-        })?;
-    let config = BlockReverterEthConfig::new(&eth_sender, &contracts, &network, era_chain_id)?;
+
+    let database_secrets = match &secrets_config {
+        Some(secrets_config) => secrets_config
+            .database
+            .clone()
+            .context("Failed to find database config")?,
+        None => DatabaseSecrets::from_env().context("DatabaseSecrets::from_env()")?,
+    };
+    let l1_secrets = match &secrets_config {
+        Some(secrets_config) => secrets_config
+            .l1
+            .clone()
+            .context("Failed to find l1 config")?,
+        None => L1Secrets::from_env().context("L1Secrets::from_env()")?,
+    };
+    let postgres_config = match &general_config {
+        Some(general_config) => general_config
+            .postgres_config
+            .clone()
+            .context("Failed to find postgres config")?,
+        None => PostgresConfig::from_env().context("PostgresConfig::from_env()")?,
+    };
+    let zksync_network_id = match &genesis_config {
+        Some(genesis_config) => genesis_config.l2_chain_id,
+        None => {
+            NetworkConfig::from_env()
+                .context("NetworkConfig::from_env()")?
+                .zksync_network_id
+        }
+    };
+
+    let config = BlockReverterEthConfig::new(&eth_sender, &contracts, zksync_network_id)?;
 
     let connection_pool = ConnectionPool::<Core>::builder(
-        postgres_config.master_url()?,
+        database_secrets.master_url()?,
         postgres_config.max_connections()?,
     )
     .build()
@@ -124,13 +226,14 @@ async fn main() -> anyhow::Result<()> {
     .context("failed to build a connection pool")?;
     let mut block_reverter = BlockReverter::new(NodeRole::Main, connection_pool);
 
-    match command {
+    match opts.command {
         Command::Display {
             json,
             operator_address,
         } => {
-            let eth_client =
-                QueryClient::new(eth_sender.web3_url.clone()).context("Ethereum client")?;
+            let eth_client = Client::http(l1_secrets.l1_rpc_url.clone())
+                .context("Ethereum client")?
+                .build();
 
             let suggested_values = block_reverter
                 .suggested_values(&eth_client, &config, operator_address)
@@ -146,15 +249,25 @@ async fn main() -> anyhow::Result<()> {
             priority_fee_per_gas,
             nonce,
         } => {
-            let eth_client =
-                QueryClient::new(eth_sender.web3_url.clone()).context("Ethereum client")?;
-            #[allow(deprecated)]
-            let reverter_private_key = eth_sender
-                .sender
-                .context("eth_sender_config")?
-                .private_key()
-                .context("eth_sender_config.private_key")?
-                .context("eth_sender_config.private_key is not set")?;
+            let eth_client = Client::http(l1_secrets.l1_rpc_url.clone())
+                .context("Ethereum client")?
+                .build();
+            let reverter_private_key = if let Some(wallets_config) = wallets_config {
+                wallets_config
+                    .eth_sender
+                    .unwrap()
+                    .operator
+                    .private_key()
+                    .to_owned()
+            } else {
+                #[allow(deprecated)]
+                eth_sender
+                    .sender
+                    .context("eth_sender_config")?
+                    .private_key()
+                    .context("eth_sender_config.private_key")?
+                    .context("eth_sender_config.private_key is not set")?
+            };
 
             let priority_fee_per_gas = priority_fee_per_gas.unwrap_or(default_priority_fee_per_gas);
             let l1_chain_id = eth_client
@@ -183,6 +296,7 @@ async fn main() -> anyhow::Result<()> {
             rollback_postgres,
             rollback_tree,
             rollback_sk_cache,
+            rollback_snapshots,
             allow_executed_block_reversion,
         } => {
             if !rollback_tree && rollback_postgres {
@@ -215,13 +329,15 @@ async fn main() -> anyhow::Result<()> {
 
             if rollback_postgres {
                 block_reverter.enable_rolling_back_postgres();
-                let object_store_config = SnapshotsObjectStoreConfig::from_env()
-                    .context("SnapshotsObjectStoreConfig::from_env()")?;
-                block_reverter.enable_rolling_back_snapshot_objects(
-                    ObjectStoreFactory::new(object_store_config.0)
-                        .create_store()
-                        .await,
-                );
+                if rollback_snapshots {
+                    let object_store_config = SnapshotsObjectStoreConfig::from_env()
+                        .context("SnapshotsObjectStoreConfig::from_env()")?;
+                    block_reverter.enable_rolling_back_snapshot_objects(
+                        ObjectStoreFactory::new(object_store_config.0)
+                            .create_store()
+                            .await?,
+                    );
+                }
             }
             if rollback_tree {
                 block_reverter.enable_rolling_back_merkle_tree(db_config.merkle_tree.path);
diff --git a/core/bin/contract-verifier/Cargo.toml b/core/bin/contract-verifier/Cargo.toml
index 49f22a17556f..c9c76f4edbf6 100644
--- a/core/bin/contract-verifier/Cargo.toml
+++ b/core/bin/contract-verifier/Cargo.toml
@@ -11,29 +11,17 @@ categories.workspace = true
 publish = false
 
 [dependencies]
-zksync_types.workspace = true
 zksync_dal.workspace = true
 zksync_env_config.workspace = true
 zksync_config.workspace = true
-zksync_contracts.workspace = true
+zksync_contract_verifier_lib.workspace = true
 zksync_queued_job_processor.workspace = true
 zksync_utils.workspace = true
-prometheus_exporter.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 
 anyhow.workspace = true
 tokio = { workspace = true, features = ["full"] }
 futures.workspace = true
 ctrlc.workspace = true
-thiserror.workspace = true
-chrono.workspace = true
-serde_json.workspace = true
-ethabi.workspace = true
-metrics.workspace = true
-hex.workspace = true
-serde = { workspace = true, features = ["derive"] }
 structopt.workspace = true
-lazy_static.workspace = true
-tempfile.workspace = true
-regex.workspace = true
 tracing.workspace = true
diff --git a/core/bin/contract-verifier/src/main.rs b/core/bin/contract-verifier/src/main.rs
index 01c0dc568af8..b93884e6edd0 100644
--- a/core/bin/contract-verifier/src/main.rs
+++ b/core/bin/contract-verifier/src/main.rs
@@ -2,31 +2,26 @@ use std::{cell::RefCell, time::Duration};
 
 use anyhow::Context as _;
 use futures::{channel::mpsc, executor::block_on, SinkExt, StreamExt};
-use prometheus_exporter::PrometheusExporterConfig;
+use structopt::StructOpt;
 use tokio::sync::watch;
 use zksync_config::{
     configs::{ObservabilityConfig, PrometheusConfig},
-    ApiConfig, ContractVerifierConfig, PostgresConfig,
+    ApiConfig, ContractVerifierConfig,
 };
+use zksync_contract_verifier_lib::ContractVerifier;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_env_config::FromEnv;
 use zksync_queued_job_processor::JobProcessor;
-use zksync_utils::wait_for_tasks::ManagedTasks;
-
-use crate::verifier::ContractVerifier;
-
-pub mod error;
-pub mod verifier;
-pub mod zksolc_utils;
-pub mod zkvyper_utils;
+use zksync_utils::{wait_for_tasks::ManagedTasks, workspace_dir_or_current_dir};
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 async fn update_compiler_versions(connection_pool: &ConnectionPool<Core>) {
     let mut storage = connection_pool.connection().await.unwrap();
     let mut transaction = storage.start_transaction().await.unwrap();
 
-    let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
+    let zksync_home = workspace_dir_or_current_dir();
 
-    let zksolc_path = format!("{}/etc/zksolc-bin/", zksync_home);
+    let zksolc_path = zksync_home.join("etc/zksolc-bin/");
     let zksolc_versions: Vec<String> = std::fs::read_dir(zksolc_path)
         .unwrap()
         .filter_map(|file| {
@@ -47,7 +42,7 @@ async fn update_compiler_versions(connection_pool: &ConnectionPool<Core>) {
         .await
         .unwrap();
 
-    let solc_path = format!("{}/etc/solc-bin/", zksync_home);
+    let solc_path = zksync_home.join("etc/solc-bin/");
     let solc_versions: Vec<String> = std::fs::read_dir(solc_path)
         .unwrap()
         .filter_map(|file| {
@@ -68,7 +63,7 @@ async fn update_compiler_versions(connection_pool: &ConnectionPool<Core>) {
         .await
         .unwrap();
 
-    let zkvyper_path = format!("{}/etc/zkvyper-bin/", zksync_home);
+    let zkvyper_path = zksync_home.join("etc/zkvyper-bin/");
     let zkvyper_versions: Vec<String> = std::fs::read_dir(zkvyper_path)
         .unwrap()
         .filter_map(|file| {
@@ -89,7 +84,7 @@ async fn update_compiler_versions(connection_pool: &ConnectionPool<Core>) {
         .await
         .unwrap();
 
-    let vyper_path = format!("{}/etc/vyper-bin/", zksync_home);
+    let vyper_path = zksync_home.join("etc/vyper-bin/");
     let vyper_versions: Vec<String> = std::fs::read_dir(vyper_path)
         .unwrap()
         .filter_map(|file| {
@@ -114,10 +109,10 @@ async fn update_compiler_versions(connection_pool: &ConnectionPool<Core>) {
     transaction.commit().await.unwrap();
 }
 
-use structopt::StructOpt;
+use zksync_config::configs::DatabaseSecrets;
 
 #[derive(StructOpt)]
-#[structopt(name = "zkSync contract code verifier", author = "Matter Labs")]
+#[structopt(name = "ZKsync contract code verifier", author = "Matter Labs")]
 struct Opt {
     /// Number of jobs to process. If None, runs indefinitely.
     #[structopt(long)]
@@ -133,9 +128,9 @@ async fn main() -> anyhow::Result<()> {
         listener_port: verifier_config.prometheus_port,
         ..ApiConfig::from_env().context("ApiConfig")?.prometheus
     };
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig")?;
+    let database_secrets = DatabaseSecrets::from_env().context("DatabaseSecrets")?;
     let pool = ConnectionPool::<Core>::singleton(
-        postgres_config
+        database_secrets
             .master_url()
             .context("Master DB URL is absent")?,
     )
@@ -145,11 +140,11 @@ async fn main() -> anyhow::Result<()> {
 
     let observability_config =
         ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(sentry_url) = &observability_config.sentry_url {
         builder = builder
             .with_sentry_url(sentry_url)
diff --git a/core/bin/external_node/Cargo.toml b/core/bin/external_node/Cargo.toml
index b496dfd72c73..06bc8c203373 100644
--- a/core/bin/external_node/Cargo.toml
+++ b/core/bin/external_node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_external_node"
-version = "24.1.0" # x-release-please-version
+version = "24.8.0" # x-release-please-version
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
@@ -11,7 +11,7 @@ categories.workspace = true
 publish = false
 
 [dependencies]
-zksync_core.workspace = true
+zksync_core_leftovers.workspace = true
 zksync_commitment_generator.workspace = true
 zksync_dal.workspace = true
 zksync_db_connection.workspace = true
@@ -21,12 +21,10 @@ zksync_eth_client.workspace = true
 zksync_storage.workspace = true
 zksync_utils.workspace = true
 zksync_state.workspace = true
-zksync_basic_types.workspace = true
 zksync_contracts.workspace = true
 zksync_l1_contract_interface.workspace = true
 zksync_snapshots_applier.workspace = true
 zksync_object_store.workspace = true
-prometheus_exporter.workspace = true
 zksync_health_check.workspace = true
 zksync_web3_decl.workspace = true
 zksync_types.workspace = true
@@ -36,7 +34,15 @@ zksync_node_genesis.workspace = true
 zksync_node_fee_model.workspace = true
 zksync_node_db_pruner.workspace = true
 zksync_eth_sender.workspace = true
-vlog.workspace = true
+zksync_state_keeper.workspace = true
+zksync_reorg_detector.workspace = true
+zksync_consistency_checker.workspace = true
+zksync_metadata_calculator.workspace = true
+zksync_node_sync.workspace = true
+zksync_node_api_server.workspace = true
+zksync_node_consensus.workspace = true
+zksync_node_framework.workspace = true
+zksync_vlog.workspace = true
 
 zksync_concurrency.workspace = true
 zksync_consensus_roles.workspace = true
diff --git a/core/bin/external_node/README.md b/core/bin/external_node/README.md
index d6fa78dbd3d3..335ceed7b719 100644
--- a/core/bin/external_node/README.md
+++ b/core/bin/external_node/README.md
@@ -1,4 +1,4 @@
-# zkSync External Node
+# ZKsync External Node
 
 This application is a read replica that can sync from the main node and serve the state locally.
 
diff --git a/core/bin/external_node/src/config/mod.rs b/core/bin/external_node/src/config/mod.rs
index d5bed56ec8fc..9c4e9657084f 100644
--- a/core/bin/external_node/src/config/mod.rs
+++ b/core/bin/external_node/src/config/mod.rs
@@ -1,47 +1,103 @@
 use std::{
     env,
+    ffi::OsString,
     num::{NonZeroU32, NonZeroU64, NonZeroUsize},
+    path::PathBuf,
     time::Duration,
 };
 
 use anyhow::Context;
 use serde::Deserialize;
-use zksync_basic_types::{Address, L1ChainId, L2ChainId};
 use zksync_config::{
     configs::{
         api::{MaxResponseSize, MaxResponseSizeOverrides},
-        chain::L1BatchCommitDataGeneratorMode,
         consensus::{ConsensusConfig, ConsensusSecrets},
+        en_config::ENConfig,
+        GeneralConfig, Secrets,
     },
     ObjectStoreConfig,
 };
-use zksync_core::{
-    api_server::{
-        tx_sender::TxSenderConfig,
-        web3::{state::InternalApiConfig, Namespace},
-    },
-    temp_config_store::decode_yaml_repr,
-};
+use zksync_core_leftovers::temp_config_store::{decode_yaml_repr, read_yaml_repr};
 #[cfg(test)]
 use zksync_dal::{ConnectionPool, Core};
+use zksync_metadata_calculator::MetadataCalculatorRecoveryConfig;
+use zksync_node_api_server::{
+    tx_sender::TxSenderConfig,
+    web3::{state::InternalApiConfig, Namespace},
+};
 use zksync_protobuf_config::proto;
 use zksync_snapshots_applier::SnapshotsApplierConfig;
-use zksync_types::{api::BridgeAddresses, url::SensitiveUrl, ETHEREUM_ADDRESS};
+use zksync_types::{
+    api::BridgeAddresses, commitment::L1BatchCommitmentMode, url::SensitiveUrl, Address,
+    L1BatchNumber, L1ChainId, L2ChainId, ETHEREUM_ADDRESS,
+};
 use zksync_web3_decl::{
-    client::BoxedL2Client,
+    client::{DynClient, L2},
     error::ClientRpcContext,
     jsonrpsee::{core::ClientError, types::error::ErrorCode},
     namespaces::{EnNamespaceClient, ZksNamespaceClient},
 };
 
+use crate::config::observability::ObservabilityENConfig;
+
 pub(crate) mod observability;
 #[cfg(test)]
 mod tests;
 
+macro_rules! load_optional_config_or_default {
+    ($config:expr, $($name:ident).+, $default:ident) => {
+        $config
+            .as_ref()
+            .map(|a| a.$($name).+.map(|a| a.try_into())).flatten().transpose()?
+            .unwrap_or_else(Self::$default)
+    };
+}
+
+macro_rules! load_config_or_default {
+    ($config:expr, $($name:ident).+, $default:ident) => {
+        $config
+            .as_ref()
+            .map(|a| a.$($name).+.clone().try_into()).transpose()?
+            .unwrap_or_else(Self::$default)
+    };
+}
+
+macro_rules! load_config {
+    ($config:expr, $($name:ident).+) => {
+        $config
+            .as_ref()
+            .map(|a| a.$($name).+.clone().map(|a| a.try_into())).flatten().transpose()?
+    };
+}
+
 const BYTES_IN_MEGABYTE: usize = 1_024 * 1_024;
 
+/// Encapsulation of configuration source with a mock implementation used in tests.
+trait ConfigurationSource: 'static {
+    type Vars<'a>: Iterator<Item = (OsString, OsString)> + 'a;
+
+    fn vars(&self) -> Self::Vars<'_>;
+
+    fn var(&self, name: &str) -> Option<String>;
+}
+
+#[derive(Debug)]
+struct Environment;
+
+impl ConfigurationSource for Environment {
+    type Vars<'a> = env::VarsOs;
+
+    fn vars(&self) -> Self::Vars<'_> {
+        env::vars_os()
+    }
+
+    fn var(&self, name: &str) -> Option<String> {
+        env::var(name).ok()
+    }
+}
+
 /// This part of the external node config is fetched directly from the main node.
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Deserialize)]
 pub(crate) struct RemoteENConfig {
     pub bridgehub_proxy_addr: Option<Address>,
     pub state_transition_proxy_addr: Option<Address>,
@@ -58,12 +114,12 @@ pub(crate) struct RemoteENConfig {
     pub l2_weth_bridge_addr: Option<Address>,
     pub l2_testnet_paymaster_addr: Option<Address>,
     pub base_token_addr: Address,
-    pub l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
     pub dummy_verifier: bool,
 }
 
 impl RemoteENConfig {
-    pub async fn fetch(client: &BoxedL2Client) -> anyhow::Result<Self> {
+    pub async fn fetch(client: &DynClient<L2>) -> anyhow::Result<Self> {
         let bridges = client
             .get_bridge_contracts()
             .rpc_context("get_bridge_contracts")
@@ -159,13 +215,13 @@ impl RemoteENConfig {
             l1_shared_bridge_proxy_addr: Some(Address::repeat_byte(5)),
             l1_weth_bridge_addr: None,
             l2_shared_bridge_addr: Some(Address::repeat_byte(6)),
-            l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode::Rollup,
+            l1_batch_commit_data_generator_mode: L1BatchCommitmentMode::Rollup,
             dummy_verifier: true,
         }
     }
 }
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Deserialize)]
 pub(crate) enum BlockFetcher {
     ServerAPI,
     Consensus,
@@ -174,7 +230,7 @@ pub(crate) enum BlockFetcher {
 /// This part of the external node config is completely optional to provide.
 /// It can tweak limits of the API, delay intervals of certain components, etc.
 /// If any of the fields are not provided, the default values will be used.
-#[derive(Debug, Clone, PartialEq, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub(crate) struct OptionalENConfig {
     // User-facing API limits
     /// Max possible limit of filters to be in the API state at once.
@@ -186,14 +242,15 @@ pub(crate) struct OptionalENConfig {
     /// Max possible limit of entities to be requested via API at once.
     #[serde(default = "OptionalENConfig::default_req_entities_limit")]
     pub req_entities_limit: usize,
-    /// Max possible size of an ABI encoded tx (in bytes).
-    #[serde(default = "OptionalENConfig::default_max_tx_size")]
-    pub max_tx_size: usize,
+    /// Max possible size of an ABI-encoded transaction supplied to `eth_sendRawTransaction`.
+    #[serde(
+        alias = "max_tx_size",
+        default = "OptionalENConfig::default_max_tx_size_bytes"
+    )]
+    pub max_tx_size_bytes: usize,
     /// Max number of cache misses during one VM execution. If the number of cache misses exceeds this value, the API server panics.
     /// This is a temporary solution to mitigate API request resulting in thousands of DB queries.
     pub vm_execution_cache_misses_limit: Option<usize>,
-    /// Note: Deprecated option, no longer in use. Left to display a warning in case someone used them.
-    pub transactions_per_sec_limit: Option<u32>,
     /// Limit for fee history block range.
     #[serde(default = "OptionalENConfig::default_fee_history_limit")]
     pub fee_history_limit: u64,
@@ -208,12 +265,12 @@ pub(crate) struct OptionalENConfig {
     max_response_body_size_overrides_mb: MaxResponseSizeOverrides,
 
     // Other API config settings
-    /// Interval between polling DB for pubsub (in ms).
+    /// Interval between polling DB for Web3 subscriptions.
     #[serde(
-        rename = "pubsub_polling_interval",
+        alias = "pubsub_polling_interval",
         default = "OptionalENConfig::default_polling_interval"
     )]
-    polling_interval: u64,
+    pubsub_polling_interval_ms: u64,
     /// Tx nonce: how far ahead from the committed nonce can it be.
     #[serde(default = "OptionalENConfig::default_max_nonce_ahead")]
     pub max_nonce_ahead: u32,
@@ -244,10 +301,13 @@ pub(crate) struct OptionalENConfig {
     #[serde(default)]
     pub filters_disabled: bool,
     /// Polling period for mempool cache update - how often the mempool cache is updated from the database.
-    /// In milliseconds. Default is 50 milliseconds.
-    #[serde(default = "OptionalENConfig::default_mempool_cache_update_interval")]
-    pub mempool_cache_update_interval: u64,
-    /// Maximum number of transactions to be stored in the mempool cache. Default is 10000.
+    /// Default is 50 milliseconds.
+    #[serde(
+        alias = "mempool_cache_update_interval",
+        default = "OptionalENConfig::default_mempool_cache_update_interval_ms"
+    )]
+    pub mempool_cache_update_interval_ms: u64,
+    /// Maximum number of transactions to be stored in the mempool cache.
     #[serde(default = "OptionalENConfig::default_mempool_cache_size")]
     pub mempool_cache_size: usize,
     /// Enables extended tracing of RPC calls. This may negatively impact performance for nodes under high load
@@ -264,26 +324,33 @@ pub(crate) struct OptionalENConfig {
     healthcheck_hard_time_limit_ms: Option<u64>,
 
     // Gas estimation config
-    /// The factor by which to scale the gasLimit
+    /// The factor by which to scale the gas limit.
     #[serde(default = "OptionalENConfig::default_estimate_gas_scale_factor")]
     pub estimate_gas_scale_factor: f64,
     /// The max possible number of gas that `eth_estimateGas` is allowed to overestimate.
     #[serde(default = "OptionalENConfig::default_estimate_gas_acceptable_overestimation")]
     pub estimate_gas_acceptable_overestimation: u32,
     /// The multiplier to use when suggesting gas price. Should be higher than one,
-    /// otherwise if the L1 prices soar, the suggested gas price won't be sufficient to be included in block
+    /// otherwise if the L1 prices soar, the suggested gas price won't be sufficient to be included in block.
     #[serde(default = "OptionalENConfig::default_gas_price_scale_factor")]
     pub gas_price_scale_factor: f64,
 
     // Merkle tree config
-    #[serde(default = "OptionalENConfig::default_metadata_calculator_delay")]
-    metadata_calculator_delay: u64,
-    /// Maximum number of L1 batches to be processed by the Merkle tree at a time.
+    /// Processing delay between processing L1 batches in the Merkle tree.
+    #[serde(
+        alias = "metadata_calculator_delay",
+        default = "OptionalENConfig::default_merkle_tree_processing_delay_ms"
+    )]
+    merkle_tree_processing_delay_ms: u64,
+    /// Maximum number of L1 batches to be processed by the Merkle tree at a time. L1 batches are processed in a bulk
+    /// only if they are readily available (i.e., mostly during node catch-up). Increasing this value reduces the number
+    /// of I/O operations at the cost of requiring more RAM (order of 100 MB / batch).
     #[serde(
         alias = "max_blocks_per_tree_batch",
-        default = "OptionalENConfig::default_max_l1_batches_per_tree_iter"
+        alias = "max_l1_batches_per_tree_iter",
+        default = "OptionalENConfig::default_merkle_tree_max_l1_batches_per_iter"
     )]
-    pub max_l1_batches_per_tree_iter: usize,
+    pub merkle_tree_max_l1_batches_per_iter: usize,
     /// Maximum number of files concurrently opened by Merkle tree RocksDB. Useful to fit into OS limits; can be used
     /// as a rudimentary way to control RAM usage of the tree.
     pub merkle_tree_max_open_files: Option<NonZeroU32>,
@@ -310,18 +377,20 @@ pub(crate) struct OptionalENConfig {
 
     // Postgres config (new parameters)
     /// Threshold in milliseconds for the DB connection lifetime to denote it as long-living and log its details.
+    /// If not specified, such logging will be disabled.
     database_long_connection_threshold_ms: Option<u64>,
-    /// Threshold in milliseconds to denote a DB query as "slow" and log its details.
+    /// Threshold in milliseconds to denote a DB query as "slow" and log its details. If not specified, such logging will be disabled.
     database_slow_query_threshold_ms: Option<u64>,
 
     // Other config settings
-    /// Port on which the Prometheus exporter server is listening.
-    pub prometheus_port: Option<u16>,
-    /// Capacity of the queue for asynchronous miniblock sealing. Once this many miniblocks are queued,
-    /// sealing will block until some of the miniblocks from the queue are processed.
+    /// Capacity of the queue for asynchronous L2 block sealing. Once this many L2 blocks are queued,
+    /// sealing will block until some of the L2 blocks from the queue are processed.
     /// 0 means that sealing is synchronous; this is mostly useful for performance comparison, testing etc.
-    #[serde(default = "OptionalENConfig::default_miniblock_seal_queue_capacity")]
-    pub miniblock_seal_queue_capacity: usize,
+    #[serde(
+        alias = "miniblock_seal_queue_capacity",
+        default = "OptionalENConfig::default_l2_block_seal_queue_capacity"
+    )]
+    pub l2_block_seal_queue_capacity: usize,
     /// Configures whether to persist protective reads when persisting L1 batches in the state keeper.
     /// Protective reads are never required by full nodes so far, not until such a node runs a full Merkle tree
     /// (presumably, to participate in L1 batch proving).
@@ -337,8 +406,8 @@ pub(crate) struct OptionalENConfig {
     #[serde(default = "OptionalENConfig::default_main_node_rate_limit_rps")]
     pub main_node_rate_limit_rps: NonZeroUsize,
 
-    #[serde(default = "OptionalENConfig::default_l1_batch_commit_data_generator_mode")]
-    pub l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+    #[serde(default)]
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
     /// Enables application-level snapshot recovery. Required to start a node that was recovered from a snapshot,
     /// or to initialize a node from a snapshot. Has no effect if a node that was initialized from a Postgres dump
     /// or was synced from genesis.
@@ -352,6 +421,9 @@ pub(crate) struct OptionalENConfig {
     #[serde(default = "OptionalENConfig::default_snapshots_recovery_postgres_max_concurrency")]
     pub snapshots_recovery_postgres_max_concurrency: NonZeroUsize,
 
+    #[serde(default)]
+    pub snapshots_recovery_object_store: Option<ObjectStoreConfig>,
+
     /// Enables pruning of the historical node state (Postgres and Merkle tree). The node will retain
     /// recent state and will continuously remove (prune) old enough parts of the state in the background.
     #[serde(default)]
@@ -367,12 +439,236 @@ pub(crate) struct OptionalENConfig {
     /// may be temporarily retained for other reasons; e.g., a batch cannot be pruned until it is executed on L1,
     /// which happens roughly 24 hours after its generation on the mainnet. Thus, in practice this value can specify
     /// the retention period greater than that implicitly imposed by other criteria (e.g., 7 or 30 days).
-    /// If set to 0, L1 batches will not be retained based on their timestamp. The default value is 1 hour.
+    /// If set to 0, L1 batches will not be retained based on their timestamp. The default value is 7 days.
     #[serde(default = "OptionalENConfig::default_pruning_data_retention_sec")]
     pruning_data_retention_sec: u64,
 }
 
 impl OptionalENConfig {
+    fn from_configs(general_config: &GeneralConfig, enconfig: &ENConfig) -> anyhow::Result<Self> {
+        let api_namespaces = load_config!(general_config.api_config, web3_json_rpc.api_namespaces)
+            .map(|a: Vec<String>| a.iter().map(|a| a.parse()).collect::<Result<_, _>>())
+            .transpose()?;
+
+        Ok(OptionalENConfig {
+            filters_limit: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.filters_limit,
+                default_filters_limit
+            ),
+            subscriptions_limit: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.subscriptions_limit,
+                default_subscriptions_limit
+            ),
+            req_entities_limit: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.req_entities_limit,
+                default_req_entities_limit
+            ),
+            max_tx_size_bytes: load_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.max_tx_size,
+                default_max_tx_size_bytes
+            ),
+            vm_execution_cache_misses_limit: load_config!(
+                general_config.api_config,
+                web3_json_rpc.vm_execution_cache_misses_limit
+            ),
+            fee_history_limit: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.fee_history_limit,
+                default_fee_history_limit
+            ),
+            max_batch_request_size: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.max_batch_request_size,
+                default_max_batch_request_size
+            ),
+            max_response_body_size_mb: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.max_response_body_size_mb,
+                default_max_response_body_size_mb
+            ),
+            max_response_body_size_overrides_mb: load_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.max_response_body_size_overrides_mb,
+                default_max_response_body_size_overrides_mb
+            ),
+            pubsub_polling_interval_ms: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.pubsub_polling_interval,
+                default_polling_interval
+            ),
+            max_nonce_ahead: load_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.max_nonce_ahead,
+                default_max_nonce_ahead
+            ),
+            vm_concurrency_limit: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.vm_concurrency_limit,
+                default_vm_concurrency_limit
+            ),
+            factory_deps_cache_size_mb: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.factory_deps_cache_size_mb,
+                default_factory_deps_cache_size_mb
+            ),
+            initial_writes_cache_size_mb: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.initial_writes_cache_size_mb,
+                default_initial_writes_cache_size_mb
+            ),
+            latest_values_cache_size_mb: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.latest_values_cache_size_mb,
+                default_latest_values_cache_size_mb
+            ),
+            filters_disabled: general_config
+                .api_config
+                .as_ref()
+                .map(|a| a.web3_json_rpc.filters_disabled)
+                .unwrap_or_default(),
+            mempool_cache_update_interval_ms: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.mempool_cache_update_interval,
+                default_mempool_cache_update_interval_ms
+            ),
+            mempool_cache_size: load_optional_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.mempool_cache_size,
+                default_mempool_cache_size
+            ),
+
+            healthcheck_slow_time_limit_ms: load_config!(
+                general_config.api_config,
+                healthcheck.slow_time_limit_ms
+            ),
+            healthcheck_hard_time_limit_ms: load_config!(
+                general_config.api_config,
+                healthcheck.hard_time_limit_ms
+            ),
+            estimate_gas_scale_factor: load_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.estimate_gas_scale_factor,
+                default_estimate_gas_scale_factor
+            ),
+            estimate_gas_acceptable_overestimation: load_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.estimate_gas_acceptable_overestimation,
+                default_estimate_gas_acceptable_overestimation
+            ),
+            gas_price_scale_factor: load_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.gas_price_scale_factor,
+                default_gas_price_scale_factor
+            ),
+            merkle_tree_max_l1_batches_per_iter: load_config_or_default!(
+                general_config.db_config,
+                merkle_tree.max_l1_batches_per_iter,
+                default_merkle_tree_max_l1_batches_per_iter
+            ),
+            merkle_tree_max_open_files: load_config!(
+                general_config.db_config,
+                experimental.state_keeper_db_max_open_files
+            ),
+            merkle_tree_multi_get_chunk_size: load_config_or_default!(
+                general_config.db_config,
+                merkle_tree.multi_get_chunk_size,
+                default_merkle_tree_multi_get_chunk_size
+            ),
+            merkle_tree_block_cache_size_mb: load_config_or_default!(
+                general_config.db_config,
+                merkle_tree.block_cache_size_mb,
+                default_merkle_tree_block_cache_size_mb
+            ),
+            merkle_tree_memtable_capacity_mb: load_config_or_default!(
+                general_config.db_config,
+                merkle_tree.memtable_capacity_mb,
+                default_merkle_tree_memtable_capacity_mb
+            ),
+            merkle_tree_stalled_writes_timeout_sec: load_config_or_default!(
+                general_config.db_config,
+                merkle_tree.stalled_writes_timeout_sec,
+                default_merkle_tree_stalled_writes_timeout_sec
+            ),
+            database_long_connection_threshold_ms: load_config!(
+                general_config.postgres_config,
+                long_connection_threshold_ms
+            ),
+            database_slow_query_threshold_ms: load_config!(
+                general_config.postgres_config,
+                slow_query_threshold_ms
+            ),
+            l2_block_seal_queue_capacity: load_config_or_default!(
+                general_config.state_keeper_config,
+                l2_block_seal_queue_capacity,
+                default_l2_block_seal_queue_capacity
+            ),
+            l1_batch_commit_data_generator_mode: enconfig.l1_batch_commit_data_generator_mode,
+            snapshots_recovery_enabled: general_config
+                .snapshot_recovery
+                .as_ref()
+                .map(|a| a.enabled)
+                .unwrap_or_default(),
+            snapshots_recovery_postgres_max_concurrency: load_optional_config_or_default!(
+                general_config.snapshot_recovery,
+                postgres.max_concurrency,
+                default_snapshots_recovery_postgres_max_concurrency
+            ),
+            pruning_enabled: general_config
+                .pruning
+                .as_ref()
+                .map(|a| a.enabled)
+                .unwrap_or_default(),
+            snapshots_recovery_object_store: load_config!(
+                general_config.snapshot_recovery,
+                object_store
+            ),
+            pruning_chunk_size: load_optional_config_or_default!(
+                general_config.pruning,
+                chunk_size,
+                default_pruning_chunk_size
+            ),
+            pruning_removal_delay_sec: load_optional_config_or_default!(
+                general_config.pruning,
+                removal_delay_sec,
+                default_pruning_removal_delay_sec
+            ),
+            pruning_data_retention_sec: load_optional_config_or_default!(
+                general_config.pruning,
+                data_retention_sec,
+                default_pruning_data_retention_sec
+            ),
+            protective_reads_persistence_enabled: general_config
+                .db_config
+                .as_ref()
+                .map(|a| a.experimental.protective_reads_persistence_enabled)
+                .unwrap_or(true),
+            merkle_tree_processing_delay_ms: load_config_or_default!(
+                general_config.db_config,
+                experimental.processing_delay_ms,
+                default_merkle_tree_processing_delay_ms
+            ),
+            merkle_tree_include_indices_and_filters_in_block_cache: general_config
+                .db_config
+                .as_ref()
+                .map(|a| a.experimental.include_indices_and_filters_in_block_cache)
+                .unwrap_or_default(),
+            extended_rpc_tracing: load_config_or_default!(
+                general_config.api_config,
+                web3_json_rpc.extended_api_tracing,
+                default_extended_api_tracing
+            ),
+            main_node_rate_limit_rps: enconfig
+                .main_node_rate_limit_rps
+                .unwrap_or_else(Self::default_main_node_rate_limit_rps),
+            api_namespaces,
+            contracts_diamond_proxy_addr: None,
+        })
+    }
+
     const fn default_filters_limit() -> usize {
         10_000
     }
@@ -385,7 +681,7 @@ impl OptionalENConfig {
         1_024
     }
 
-    const fn default_max_tx_size() -> usize {
+    const fn default_max_tx_size_bytes() -> usize {
         1_000_000
     }
 
@@ -409,11 +705,11 @@ impl OptionalENConfig {
         50
     }
 
-    const fn default_metadata_calculator_delay() -> u64 {
+    const fn default_merkle_tree_processing_delay_ms() -> u64 {
         100
     }
 
-    const fn default_max_l1_batches_per_tree_iter() -> usize {
+    const fn default_merkle_tree_max_l1_batches_per_iter() -> usize {
         20
     }
 
@@ -464,7 +760,11 @@ impl OptionalENConfig {
         10
     }
 
-    const fn default_miniblock_seal_queue_capacity() -> usize {
+    fn default_max_response_body_size_overrides_mb() -> MaxResponseSizeOverrides {
+        MaxResponseSizeOverrides::empty()
+    }
+
+    const fn default_l2_block_seal_queue_capacity() -> usize {
         10
     }
 
@@ -472,7 +772,7 @@ impl OptionalENConfig {
         true
     }
 
-    const fn default_mempool_cache_update_interval() -> u64 {
+    const fn default_mempool_cache_update_interval_ms() -> u64 {
         50
     }
 
@@ -488,10 +788,6 @@ impl OptionalENConfig {
         NonZeroUsize::new(100).unwrap()
     }
 
-    const fn default_l1_batch_commit_data_generator_mode() -> L1BatchCommitDataGeneratorMode {
-        L1BatchCommitDataGeneratorMode::Rollup
-    }
-
     fn default_snapshots_recovery_postgres_max_concurrency() -> NonZeroUsize {
         SnapshotsApplierConfig::default().max_concurrency
     }
@@ -505,21 +801,23 @@ impl OptionalENConfig {
     }
 
     fn default_pruning_data_retention_sec() -> u64 {
-        3_600 // 1 hour
+        3_600 * 24 * 7 // 7 days
     }
 
-    pub fn from_env() -> anyhow::Result<Self> {
-        envy::prefixed("EN_")
+    fn from_env() -> anyhow::Result<Self> {
+        let mut result: OptionalENConfig = envy::prefixed("EN_")
             .from_env()
-            .context("could not load external node config")
+            .context("could not load external node config")?;
+        result.snapshots_recovery_object_store = snapshot_recovery_object_store_config().ok();
+        Ok(result)
     }
 
     pub fn polling_interval(&self) -> Duration {
-        Duration::from_millis(self.polling_interval)
+        Duration::from_millis(self.pubsub_polling_interval_ms)
     }
 
-    pub fn metadata_calculator_delay(&self) -> Duration {
-        Duration::from_millis(self.metadata_calculator_delay)
+    pub fn merkle_tree_processing_delay(&self) -> Duration {
+        Duration::from_millis(self.merkle_tree_processing_delay_ms)
     }
 
     /// Returns the size of factory dependencies cache in bytes.
@@ -587,7 +885,7 @@ impl OptionalENConfig {
     }
 
     pub fn mempool_cache_update_interval(&self) -> Duration {
-        Duration::from_millis(self.mempool_cache_update_interval)
+        Duration::from_millis(self.mempool_cache_update_interval_ms)
     }
 
     pub fn pruning_removal_delay(&self) -> Duration {
@@ -606,12 +904,12 @@ impl OptionalENConfig {
 }
 
 /// This part of the external node config is required for its operation.
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Deserialize)]
 pub(crate) struct RequiredENConfig {
     /// L1 chain ID (e.g., 9 for Ethereum mainnet). This ID will be checked against the `eth_client_url` RPC provider on initialization
     /// to ensure that there's no mismatch between the expected and actual L1 network.
     pub l1_chain_id: L1ChainId,
-    /// L2 chain ID (e.g., 270 for zkSync Era mainnet). This ID will be checked against the `main_node_url` RPC provider on initialization
+    /// L2 chain ID (e.g., 270 for ZKsync Era mainnet). This ID will be checked against the `main_node_url` RPC provider on initialization
     /// to ensure that there's no mismatch between the expected and actual L2 network.
     pub l2_chain_id: L2ChainId,
 
@@ -632,12 +930,43 @@ pub(crate) struct RequiredENConfig {
 }
 
 impl RequiredENConfig {
-    pub fn from_env() -> anyhow::Result<Self> {
+    fn from_env() -> anyhow::Result<Self> {
         envy::prefixed("EN_")
             .from_env()
             .context("could not load external node config")
     }
 
+    fn from_configs(
+        general: &GeneralConfig,
+        en_config: &ENConfig,
+        secrets: &Secrets,
+    ) -> anyhow::Result<Self> {
+        let api_config = general
+            .api_config
+            .as_ref()
+            .context("Api config is required")?;
+        let db_config = general
+            .db_config
+            .as_ref()
+            .context("Database config is required")?;
+        Ok(RequiredENConfig {
+            l1_chain_id: en_config.l1_chain_id,
+            l2_chain_id: en_config.l2_chain_id,
+            http_port: api_config.web3_json_rpc.http_port,
+            ws_port: api_config.web3_json_rpc.ws_port,
+            healthcheck_port: api_config.healthcheck.port,
+            eth_client_url: secrets
+                .l1
+                .as_ref()
+                .context("L1 secrets are required")?
+                .l1_rpc_url
+                .clone(),
+            main_node_url: en_config.main_node_url.clone(),
+            state_cache_path: db_config.state_keeper_db_path.clone(),
+            merkle_tree_path: db_config.merkle_tree.path.clone(),
+        })
+    }
+
     #[cfg(test)]
     fn mock(temp_dir: &tempfile::TempDir) -> Self {
         Self {
@@ -664,14 +993,14 @@ impl RequiredENConfig {
 /// While also mandatory, it historically used different naming scheme for corresponding
 /// environment variables.
 /// Thus it is kept separately for backward compatibility and ease of deserialization.
-#[derive(Debug, Clone, Deserialize, PartialEq)]
+#[derive(Debug, Deserialize)]
 pub(crate) struct PostgresConfig {
     database_url: SensitiveUrl,
     pub max_connections: u32,
 }
 
 impl PostgresConfig {
-    pub fn from_env() -> anyhow::Result<Self> {
+    fn from_env() -> anyhow::Result<Self> {
         Ok(Self {
             database_url: env::var("DATABASE_URL")
                 .context("DATABASE_URL env variable is not set")?
@@ -699,7 +1028,7 @@ impl PostgresConfig {
 
 /// Experimental part of the external node config. All parameters in this group can change or disappear without notice.
 /// Eventually, parameters from this group generally end up in the optional group.
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub(crate) struct ExperimentalENConfig {
     // State keeper cache config
     /// Block cache capacity of the state keeper RocksDB cache. The default value is 128 MB.
@@ -708,6 +1037,32 @@ pub(crate) struct ExperimentalENConfig {
     /// Maximum number of files concurrently opened by state keeper cache RocksDB. Useful to fit into OS limits; can be used
     /// as a rudimentary way to control RAM usage of the cache.
     pub state_keeper_db_max_open_files: Option<NonZeroU32>,
+
+    // Snapshot recovery
+    /// L1 batch number of the snapshot to use during recovery. Specifying this parameter is mostly useful for testing.
+    pub snapshots_recovery_l1_batch: Option<L1BatchNumber>,
+    /// Enables dropping storage key preimages when recovering storage logs from a snapshot with version 0.
+    /// This is a temporary flag that will eventually be removed together with version 0 snapshot support.
+    #[serde(default)]
+    pub snapshots_recovery_drop_storage_key_preimages: bool,
+    /// Approximate chunk size (measured in the number of entries) to recover in a single iteration.
+    /// Reasonable values are order of 100,000 (meaning an iteration takes several seconds).
+    ///
+    /// **Important.** This value cannot be changed in the middle of tree recovery (i.e., if a node is stopped in the middle
+    /// of recovery and then restarted with a different config).
+    #[serde(default = "ExperimentalENConfig::default_snapshots_recovery_tree_chunk_size")]
+    pub snapshots_recovery_tree_chunk_size: u64,
+    /// Buffer capacity for parallel persistence operations. Should be reasonably small since larger buffer means more RAM usage;
+    /// buffer elements are persisted tree chunks. OTOH, small buffer can lead to persistence parallelization being inefficient.
+    ///
+    /// If not set, parallel persistence will be disabled.
+    #[serde(default)] // Temporarily use a conservative option (sequential recovery) as default
+    pub snapshots_recovery_tree_parallel_persistence_buffer: Option<NonZeroUsize>,
+
+    // Commitment generator
+    /// Maximum degree of parallelism during commitment generation, i.e., the maximum number of L1 batches being processed in parallel.
+    /// If not specified, commitment generator will use a value roughly equal to the number of CPU cores with some clamping applied.
+    pub commitment_generator_max_parallelism: Option<NonZeroU32>,
 }
 
 impl ExperimentalENConfig {
@@ -715,12 +1070,21 @@ impl ExperimentalENConfig {
         128
     }
 
+    fn default_snapshots_recovery_tree_chunk_size() -> u64 {
+        MetadataCalculatorRecoveryConfig::default().desired_chunk_size
+    }
+
     #[cfg(test)]
     fn mock() -> Self {
         Self {
             state_keeper_db_block_cache_capacity_mb:
                 Self::default_state_keeper_db_block_cache_capacity_mb(),
             state_keeper_db_max_open_files: None,
+            snapshots_recovery_l1_batch: None,
+            snapshots_recovery_drop_storage_key_preimages: false,
+            snapshots_recovery_tree_chunk_size: Self::default_snapshots_recovery_tree_chunk_size(),
+            snapshots_recovery_tree_parallel_persistence_buffer: None,
+            commitment_generator_max_parallelism: None,
         }
     }
 
@@ -728,6 +1092,38 @@ impl ExperimentalENConfig {
     pub fn state_keeper_db_block_cache_capacity(&self) -> usize {
         self.state_keeper_db_block_cache_capacity_mb * BYTES_IN_MEGABYTE
     }
+
+    pub fn from_configs(general_config: &GeneralConfig) -> anyhow::Result<Self> {
+        Ok(Self {
+            state_keeper_db_block_cache_capacity_mb: load_config_or_default!(
+                general_config.db_config,
+                experimental.state_keeper_db_block_cache_capacity_mb,
+                default_state_keeper_db_block_cache_capacity_mb
+            ),
+            state_keeper_db_max_open_files: load_config!(
+                general_config.db_config,
+                experimental.state_keeper_db_max_open_files
+            ),
+            snapshots_recovery_l1_batch: load_config!(general_config.snapshot_recovery, l1_batch),
+            snapshots_recovery_tree_chunk_size: load_optional_config_or_default!(
+                general_config.snapshot_recovery,
+                tree.chunk_size,
+                default_snapshots_recovery_tree_chunk_size
+            ),
+            snapshots_recovery_tree_parallel_persistence_buffer: load_config!(
+                general_config.snapshot_recovery,
+                tree.parallel_persistence_buffer
+            ),
+            snapshots_recovery_drop_storage_key_preimages: general_config
+                .snapshot_recovery
+                .as_ref()
+                .map_or(false, |config| config.drop_storage_key_preimages),
+            commitment_generator_max_parallelism: general_config
+                .commitment_generator
+                .as_ref()
+                .map(|a| a.max_parallelism),
+        })
+    }
 }
 
 pub(crate) fn read_consensus_secrets() -> anyhow::Result<Option<ConsensusSecrets>> {
@@ -736,7 +1132,8 @@ pub(crate) fn read_consensus_secrets() -> anyhow::Result<Option<ConsensusSecrets
     };
     let cfg = std::fs::read_to_string(&path).context(path)?;
     Ok(Some(
-        decode_yaml_repr::<proto::consensus::Secrets>(&cfg).context("failed decoding YAML")?,
+        decode_yaml_repr::<proto::secrets::ConsensusSecrets>(&cfg)
+            .context("failed decoding YAML")?,
     ))
 }
 
@@ -750,24 +1147,14 @@ pub(crate) fn read_consensus_config() -> anyhow::Result<Option<ConsensusConfig>>
     ))
 }
 
-/// Configuration for snapshot recovery. Loaded optionally, only if snapshot recovery is enabled.
-#[derive(Debug)]
-pub(crate) struct SnapshotsRecoveryConfig {
-    pub snapshots_object_store: ObjectStoreConfig,
+/// Configuration for snapshot recovery. Should be loaded optionally, only if snapshot recovery is enabled.
+pub(crate) fn snapshot_recovery_object_store_config() -> anyhow::Result<ObjectStoreConfig> {
+    envy::prefixed("EN_SNAPSHOTS_OBJECT_STORE_")
+        .from_env::<ObjectStoreConfig>()
+        .context("failed loading snapshot object store config from env variables")
 }
 
-impl SnapshotsRecoveryConfig {
-    pub fn new() -> anyhow::Result<Self> {
-        let snapshots_object_store = envy::prefixed("EN_SNAPSHOTS_OBJECT_STORE_")
-            .from_env::<ObjectStoreConfig>()
-            .context("failed loading snapshot object store config from env variables")?;
-        Ok(Self {
-            snapshots_object_store,
-        })
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Deserialize)]
+#[derive(Debug, Deserialize)]
 pub struct ApiComponentConfig {
     /// Address of the tree API used by this EN in case it does not have a
     /// local tree component running and in this case needs to send requests
@@ -775,60 +1162,150 @@ pub struct ApiComponentConfig {
     pub tree_api_remote_url: Option<String>,
 }
 
-#[derive(Debug, Clone, PartialEq, Deserialize)]
+impl ApiComponentConfig {
+    fn from_configs(general_config: &GeneralConfig) -> Self {
+        ApiComponentConfig {
+            tree_api_remote_url: general_config
+                .api_config
+                .as_ref()
+                .and_then(|a| a.web3_json_rpc.tree_api_url.clone()),
+        }
+    }
+}
+
+#[derive(Debug, Deserialize)]
 pub struct TreeComponentConfig {
     pub api_port: Option<u16>,
 }
 
+impl TreeComponentConfig {
+    fn from_configs(general_config: &GeneralConfig) -> Self {
+        let api_port = general_config
+            .api_config
+            .as_ref()
+            .map(|a| a.merkle_tree.port);
+        TreeComponentConfig { api_port }
+    }
+}
+
 /// External Node Config contains all the configuration required for the EN operation.
 /// It is split into three parts: required, optional and remote for easier navigation.
-#[derive(Debug, Clone)]
-pub(crate) struct ExternalNodeConfig {
+#[derive(Debug)]
+pub(crate) struct ExternalNodeConfig<R = RemoteENConfig> {
     pub required: RequiredENConfig,
     pub postgres: PostgresConfig,
     pub optional: OptionalENConfig,
-    pub remote: RemoteENConfig,
+    pub observability: ObservabilityENConfig,
     pub experimental: ExperimentalENConfig,
     pub consensus: Option<ConsensusConfig>,
     pub api_component: ApiComponentConfig,
     pub tree_component: TreeComponentConfig,
+    pub remote: R,
 }
 
-impl ExternalNodeConfig {
-    /// Loads config from the environment variables and fetches contracts addresses from the main node.
-    pub async fn new(
-        required: RequiredENConfig,
-        optional: OptionalENConfig,
-        main_node_client: &BoxedL2Client,
-    ) -> anyhow::Result<Self> {
-        let experimental = envy::prefixed("EN_EXPERIMENTAL_")
-            .from_env::<ExperimentalENConfig>()
-            .context("could not load external node config (experimental params)")?;
+impl ExternalNodeConfig<()> {
+    /// Parses the local part of node configuration from the environment.
+    pub fn new() -> anyhow::Result<Self> {
+        Ok(Self {
+            required: RequiredENConfig::from_env()?,
+            postgres: PostgresConfig::from_env()?,
+            optional: OptionalENConfig::from_env()?,
+            observability: ObservabilityENConfig::from_env()?,
+            experimental: envy::prefixed("EN_EXPERIMENTAL_")
+                .from_env::<ExperimentalENConfig>()
+                .context("could not load external node config (experimental params)")?,
+            consensus: read_consensus_config().context("read_consensus_config()")?,
+            api_component: envy::prefixed("EN_API_")
+                .from_env::<ApiComponentConfig>()
+                .context("could not load external node config (API component params)")?,
+            tree_component: envy::prefixed("EN_TREE_")
+                .from_env::<TreeComponentConfig>()
+                .context("could not load external node config (tree component params)")?,
+            remote: (),
+        })
+    }
 
-        let api_component_config = envy::prefixed("EN_API_")
-            .from_env::<ApiComponentConfig>()
-            .context("could not load external node config (API component params)")?;
-        let tree_component_config = envy::prefixed("EN_TREE_")
-            .from_env::<TreeComponentConfig>()
-            .context("could not load external node config (tree component params)")?;
+    pub fn from_files(
+        general_config_path: PathBuf,
+        external_node_config_path: PathBuf,
+        secrets_configs_path: PathBuf,
+        consensus_config_path: Option<PathBuf>,
+    ) -> anyhow::Result<Self> {
+        let general_config = read_yaml_repr::<proto::general::GeneralConfig>(general_config_path)
+            .context("failed decoding general YAML config")?;
+        let external_node_config =
+            read_yaml_repr::<proto::en::ExternalNode>(external_node_config_path)
+                .context("failed decoding external node YAML config")?;
+        let secrets_config = read_yaml_repr::<proto::secrets::Secrets>(secrets_configs_path)
+            .context("failed decoding secrets YAML config")?;
+
+        let consensus = consensus_config_path
+            .map(read_yaml_repr::<proto::consensus::Config>)
+            .transpose()
+            .context("failed decoding consensus YAML config")?;
+
+        let required = RequiredENConfig::from_configs(
+            &general_config,
+            &external_node_config,
+            &secrets_config,
+        )?;
+        let optional = OptionalENConfig::from_configs(&general_config, &external_node_config)?;
+        let postgres = PostgresConfig {
+            database_url: secrets_config
+                .database
+                .as_ref()
+                .context("DB secrets is required")?
+                .server_url
+                .clone()
+                .context("Server url is required")?,
+            max_connections: general_config
+                .postgres_config
+                .as_ref()
+                .context("Postgres config is required")?
+                .max_connections()?,
+        };
+        let observability = ObservabilityENConfig::from_configs(&general_config)?;
+        let experimental = ExperimentalENConfig::from_configs(&general_config)?;
 
-        let remote = RemoteENConfig::fetch(main_node_client)
-            .await
-            .context("Unable to fetch required config values from the main node")?;
+        let api_component = ApiComponentConfig::from_configs(&general_config);
+        let tree_component = TreeComponentConfig::from_configs(&general_config);
 
-        let postgres = PostgresConfig::from_env()?;
         Ok(Self {
-            remote,
-            postgres,
             required,
+            postgres,
             optional,
+            observability,
             experimental,
-            consensus: read_consensus_config().context("read_consensus_config()")?,
-            tree_component: tree_component_config,
-            api_component: api_component_config,
+            consensus,
+            api_component,
+            tree_component,
+            remote: (),
+        })
+    }
+
+    /// Fetches contracts addresses from the main node, completing the configuration.
+    pub async fn fetch_remote(
+        self,
+        main_node_client: &DynClient<L2>,
+    ) -> anyhow::Result<ExternalNodeConfig> {
+        let remote = RemoteENConfig::fetch(main_node_client)
+            .await
+            .context("Unable to fetch required config values from the main node")?;
+        Ok(ExternalNodeConfig {
+            required: self.required,
+            postgres: self.postgres,
+            optional: self.optional,
+            observability: self.observability,
+            experimental: self.experimental,
+            consensus: self.consensus,
+            tree_component: self.tree_component,
+            api_component: self.api_component,
+            remote,
         })
     }
+}
 
+impl ExternalNodeConfig {
     #[cfg(test)]
     pub(crate) fn mock(temp_dir: &tempfile::TempDir, test_pool: &ConnectionPool<Core>) -> Self {
         Self {
@@ -836,6 +1313,7 @@ impl ExternalNodeConfig {
             postgres: PostgresConfig::mock(test_pool),
             optional: OptionalENConfig::mock(),
             remote: RemoteENConfig::mock(),
+            observability: ObservabilityENConfig::default(),
             experimental: ExperimentalENConfig::mock(),
             consensus: None,
             api_component: ApiComponentConfig {
@@ -846,12 +1324,12 @@ impl ExternalNodeConfig {
     }
 }
 
-impl From<ExternalNodeConfig> for InternalApiConfig {
-    fn from(config: ExternalNodeConfig) -> Self {
+impl From<&ExternalNodeConfig> for InternalApiConfig {
+    fn from(config: &ExternalNodeConfig) -> Self {
         Self {
             l1_chain_id: config.required.l1_chain_id,
             l2_chain_id: config.required.l2_chain_id,
-            max_tx_size: config.optional.max_tx_size,
+            max_tx_size: config.optional.max_tx_size_bytes,
             estimate_gas_scale_factor: config.optional.estimate_gas_scale_factor,
             estimate_gas_acceptable_overestimation: config
                 .optional
@@ -879,8 +1357,8 @@ impl From<ExternalNodeConfig> for InternalApiConfig {
     }
 }
 
-impl From<ExternalNodeConfig> for TxSenderConfig {
-    fn from(config: ExternalNodeConfig) -> Self {
+impl From<&ExternalNodeConfig> for TxSenderConfig {
+    fn from(config: &ExternalNodeConfig) -> Self {
         Self {
             // Fee account address does not matter for the EN operation, since
             // actual fee distribution is handled my the main node.
diff --git a/core/bin/external_node/src/config/observability.rs b/core/bin/external_node/src/config/observability.rs
index 26cb6b0d225a..4dc310ee26c2 100644
--- a/core/bin/external_node/src/config/observability.rs
+++ b/core/bin/external_node/src/config/observability.rs
@@ -1,43 +1,142 @@
-use zksync_config::configs::ObservabilityConfig;
-
-pub fn observability_config_from_env() -> anyhow::Result<ObservabilityConfig> {
-    // The logic in this method mimics the historical logic of loading observability options
-    // This is left intact, since some of the existing deployments may rely on the this behavior.
-    let sentry_url = if let Ok(sentry_url) = std::env::var("MISC_SENTRY_URL") {
-        if sentry_url == "unset" {
-            None
-        } else {
-            Some(sentry_url)
+use std::{collections::HashMap, time::Duration};
+
+use anyhow::Context as _;
+use serde::Deserialize;
+use zksync_config::configs::GeneralConfig;
+use zksync_vlog::{prometheus::PrometheusExporterConfig, LogFormat};
+
+use super::{ConfigurationSource, Environment};
+
+/// Observability part of the node configuration.
+#[derive(Debug, Default, Deserialize)]
+pub(crate) struct ObservabilityENConfig {
+    /// Port to bind the Prometheus exporter server to. If not specified, the server will not be launched.
+    /// If the push gateway URL is specified, it will prevail.
+    pub prometheus_port: Option<u16>,
+    /// Prometheus push gateway to push metrics to. Overrides `prometheus_port`. A full URL must be specified
+    /// including `job_id` and other path segments; it will be used verbatim as the URL to push data to.
+    pub prometheus_pushgateway_url: Option<String>,
+    /// Interval between pushing metrics to the Prometheus push gateway.
+    #[serde(default = "ObservabilityENConfig::default_prometheus_push_interval_ms")]
+    pub prometheus_push_interval_ms: u64,
+    /// Sentry URL to send panics to.
+    pub sentry_url: Option<String>,
+    /// Environment to use when sending data to Sentry.
+    pub sentry_environment: Option<String>,
+    /// Log format to use: either `plain` (default) or `json`.
+    #[serde(default)]
+    pub log_format: LogFormat,
+    // Log directives in format that is used in `RUST_LOG`
+    pub log_directives: Option<String>,
+}
+
+impl ObservabilityENConfig {
+    const fn default_prometheus_push_interval_ms() -> u64 {
+        10_000
+    }
+
+    pub(super) fn from_env() -> envy::Result<Self> {
+        Self::new(&Environment)
+    }
+
+    pub(super) fn new(source: &impl ConfigurationSource) -> envy::Result<Self> {
+        const OBSOLETE_VAR_NAMES: &[(&str, &str)] = &[
+            ("MISC_SENTRY_URL", "EN_SENTRY_URL"),
+            ("MISC_LOG_FORMAT", "EN_LOG_FORMAT"),
+        ];
+
+        let en_vars = source.vars().filter_map(|(name, value)| {
+            let name = name.into_string().ok()?;
+            if !name.starts_with("EN_") {
+                return None;
+            }
+            Some((name, value.into_string().ok()?))
+        });
+        let mut vars: HashMap<_, _> = en_vars.collect();
+
+        for &(old_name, new_name) in OBSOLETE_VAR_NAMES {
+            if vars.contains_key(new_name) {
+                continue; // new name is set; it should prevail over the obsolete one.
+            }
+            if let Some(value) = source.var(old_name) {
+                vars.insert(new_name.to_owned(), value);
+            }
         }
-    } else {
-        None
-    };
-    let sentry_environment = std::env::var("EN_SENTRY_ENVIRONMENT").ok().or_else(|| {
-        let l1_network = std::env::var("CHAIN_ETH_NETWORK").ok();
-        let l2_network = std::env::var("CHAIN_ETH_ZKSYNC_NETWORK").ok();
-        match (l1_network, l2_network) {
-            (Some(l1_network), Some(l2_network)) => {
-                Some(format!("{} - {}", l1_network, l2_network))
+
+        envy::prefixed("EN_").from_iter(vars)
+    }
+
+    pub fn prometheus(&self) -> Option<PrometheusExporterConfig> {
+        match (self.prometheus_port, &self.prometheus_pushgateway_url) {
+            (_, Some(url)) => {
+                if self.prometheus_port.is_some() {
+                    tracing::info!("Both Prometheus port and push gateway URLs are specified; the push gateway URL will be used");
+                }
+                let push_interval = Duration::from_millis(self.prometheus_push_interval_ms);
+                Some(PrometheusExporterConfig::push(url.clone(), push_interval))
             }
-            _ => None,
+            (Some(port), None) => Some(PrometheusExporterConfig::pull(port)),
+            (None, None) => None,
         }
-    });
-    let log_format = if let Ok(log_format) = std::env::var("MISC_LOG_FORMAT") {
-        if log_format != "plain" && log_format != "json" {
-            anyhow::bail!("MISC_LOG_FORMAT has an unexpected value {}", log_format);
+    }
+
+    pub fn build_observability(&self) -> anyhow::Result<zksync_vlog::ObservabilityGuard> {
+        let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(self.log_format);
+        if let Some(log_directives) = self.log_directives.clone() {
+            builder = builder.with_log_directives(log_directives)
+        };
+        // Some legacy deployments use `unset` as an equivalent of `None`.
+        let sentry_url = self.sentry_url.as_deref().filter(|&url| url != "unset");
+        if let Some(sentry_url) = sentry_url {
+            builder = builder
+                .with_sentry_url(sentry_url)
+                .context("Invalid Sentry URL")?
+                .with_sentry_environment(self.sentry_environment.clone());
         }
-        log_format
-    } else {
-        "plain".to_string()
-    };
-    let log_directives = std::env::var("RUST_LOG").ok();
-
-    Ok(ObservabilityConfig {
-        sentry_url,
-        sentry_environment,
-        log_format,
-        opentelemetry: None,
-        sporadic_crypto_errors_substrs: vec![],
-        log_directives,
-    })
+        let guard = builder.build();
+
+        // Report whether sentry is running after the logging subsystem was initialized.
+        if let Some(sentry_url) = sentry_url {
+            tracing::info!("Sentry configured with URL: {sentry_url}");
+        } else {
+            tracing::info!("No sentry URL was provided");
+        }
+        Ok(guard)
+    }
+
+    pub(crate) fn from_configs(general_config: &GeneralConfig) -> anyhow::Result<Self> {
+        let (sentry_url, sentry_environment, log_format, log_directives) =
+            if let Some(observability) = general_config.observability.as_ref() {
+                (
+                    observability.sentry_url.clone(),
+                    observability.sentry_environment.clone(),
+                    observability
+                        .log_format
+                        .parse()
+                        .context("Invalid log format")?,
+                    observability.log_directives.clone(),
+                )
+            } else {
+                (None, None, LogFormat::default(), None)
+            };
+        let (prometheus_port, prometheus_pushgateway_url, prometheus_push_interval_ms) =
+            if let Some(prometheus) = general_config.prometheus_config.as_ref() {
+                (
+                    Some(prometheus.listener_port),
+                    Some(prometheus.pushgateway_url.clone()),
+                    prometheus.push_interval_ms.unwrap_or_default(),
+                )
+            } else {
+                (None, None, 0)
+            };
+        Ok(Self {
+            prometheus_port,
+            prometheus_pushgateway_url,
+            prometheus_push_interval_ms,
+            sentry_url,
+            sentry_environment,
+            log_format,
+            log_directives,
+        })
+    }
 }
diff --git a/core/bin/external_node/src/config/tests.rs b/core/bin/external_node/src/config/tests.rs
index 89c2f86d73ca..1b42b98a32a4 100644
--- a/core/bin/external_node/src/config/tests.rs
+++ b/core/bin/external_node/src/config/tests.rs
@@ -1,7 +1,71 @@
 //! Tests for EN configuration.
 
+use std::collections::HashMap;
+
+use assert_matches::assert_matches;
+
 use super::*;
 
+#[derive(Debug)]
+struct MockEnvironment(HashMap<&'static str, &'static str>);
+
+impl MockEnvironment {
+    pub fn new(vars: &[(&'static str, &'static str)]) -> Self {
+        Self(vars.iter().copied().collect())
+    }
+}
+
+impl ConfigurationSource for MockEnvironment {
+    type Vars<'a> = Box<dyn Iterator<Item = (OsString, OsString)> + 'a>;
+
+    fn vars(&self) -> Self::Vars<'_> {
+        Box::new(
+            self.0
+                .iter()
+                .map(|(&name, &value)| (OsString::from(name), OsString::from(value))),
+        )
+    }
+
+    fn var(&self, name: &str) -> Option<String> {
+        self.0.get(name).copied().map(str::to_owned)
+    }
+}
+
+#[test]
+fn parsing_observability_config() {
+    let mut env_vars = MockEnvironment::new(&[
+        ("EN_PROMETHEUS_PORT", "3322"),
+        ("MISC_SENTRY_URL", "https://example.com/"),
+        ("EN_SENTRY_ENVIRONMENT", "mainnet - mainnet2"),
+    ]);
+    let config = ObservabilityENConfig::new(&env_vars).unwrap();
+    assert_eq!(config.prometheus_port, Some(3322));
+    assert_eq!(config.sentry_url.unwrap(), "https://example.com/");
+    assert_eq!(config.sentry_environment.unwrap(), "mainnet - mainnet2");
+    assert_matches!(config.log_format, zksync_vlog::LogFormat::Plain);
+    assert_eq!(config.prometheus_push_interval_ms, 10_000);
+
+    env_vars.0.insert("MISC_LOG_FORMAT", "json");
+    let config = ObservabilityENConfig::new(&env_vars).unwrap();
+    assert_matches!(config.log_format, zksync_vlog::LogFormat::Json);
+
+    // If both the canonical and obsolete vars are specified, the canonical one should prevail.
+    env_vars.0.insert("EN_LOG_FORMAT", "plain");
+    env_vars
+        .0
+        .insert("EN_SENTRY_URL", "https://example.com/new");
+    let config = ObservabilityENConfig::new(&env_vars).unwrap();
+    assert_matches!(config.log_format, zksync_vlog::LogFormat::Plain);
+    assert_eq!(config.sentry_url.unwrap(), "https://example.com/new");
+}
+
+#[test]
+fn using_unset_sentry_url() {
+    let env_vars = MockEnvironment::new(&[("MISC_SENTRY_URL", "unset")]);
+    let config = ObservabilityENConfig::new(&env_vars).unwrap();
+    config.build_observability().unwrap();
+}
+
 #[test]
 fn parsing_optional_config_from_empty_env() {
     let config: OptionalENConfig = envy::prefixed("EN_").from_iter([]).unwrap();
@@ -9,9 +73,9 @@ fn parsing_optional_config_from_empty_env() {
     assert_eq!(config.subscriptions_limit, 10_000);
     assert_eq!(config.fee_history_limit, 1_024);
     assert_eq!(config.polling_interval(), Duration::from_millis(200));
-    assert_eq!(config.max_tx_size, 1_000_000);
+    assert_eq!(config.max_tx_size_bytes, 1_000_000);
     assert_eq!(
-        config.metadata_calculator_delay(),
+        config.merkle_tree_processing_delay(),
         Duration::from_millis(100)
     );
     assert_eq!(config.max_nonce_ahead, 50);
@@ -34,7 +98,7 @@ fn parsing_optional_config_from_empty_env() {
     );
     assert_eq!(
         config.l1_batch_commit_data_generator_mode,
-        L1BatchCommitDataGeneratorMode::Rollup
+        L1BatchCommitmentMode::Rollup
     );
 }
 
@@ -72,9 +136,9 @@ fn parsing_optional_config_from_env() {
     assert_eq!(config.subscriptions_limit, 20_000);
     assert_eq!(config.fee_history_limit, 1_000);
     assert_eq!(config.polling_interval(), Duration::from_millis(500));
-    assert_eq!(config.max_tx_size, BYTES_IN_MEGABYTE);
+    assert_eq!(config.max_tx_size_bytes, BYTES_IN_MEGABYTE);
     assert_eq!(
-        config.metadata_calculator_delay(),
+        config.merkle_tree_processing_delay(),
         Duration::from_millis(50)
     );
     assert_eq!(config.max_nonce_ahead, 100);
@@ -104,10 +168,29 @@ fn parsing_optional_config_from_env() {
     );
     assert_eq!(
         config.l1_batch_commit_data_generator_mode,
-        L1BatchCommitDataGeneratorMode::Validium
+        L1BatchCommitmentMode::Validium
     );
 }
 
+#[test]
+fn parsing_renamed_optional_parameters() {
+    let env_vars = [
+        ("EN_MAX_TX_SIZE_BYTES", "100000"),
+        ("EN_PUBSUB_POLLING_INTERVAL_MS", "250"),
+        ("EN_MEMPOOL_CACHE_UPDATE_INTERVAL_MS", "100"),
+        ("EN_MERKLE_TREE_MAX_L1_BATCHES_PER_ITER", "15"),
+    ];
+    let env_vars = env_vars
+        .into_iter()
+        .map(|(name, value)| (name.to_owned(), value.to_owned()));
+
+    let config: OptionalENConfig = envy::prefixed("EN_").from_iter(env_vars).unwrap();
+    assert_eq!(config.max_tx_size_bytes, 100_000);
+    assert_eq!(config.pubsub_polling_interval_ms, 250);
+    assert_eq!(config.mempool_cache_update_interval_ms, 100);
+    assert_eq!(config.merkle_tree_max_l1_batches_per_iter, 15);
+}
+
 #[test]
 fn parsing_experimental_config_from_empty_env() {
     let config: ExperimentalENConfig = envy::prefixed("EN_EXPERIMENTAL_").from_iter([]).unwrap();
diff --git a/core/bin/external_node/src/init.rs b/core/bin/external_node/src/init.rs
index fb8eee9bce06..28f9aa2c422b 100644
--- a/core/bin/external_node/src/init.rs
+++ b/core/bin/external_node/src/init.rs
@@ -3,16 +3,23 @@
 use std::time::Instant;
 
 use anyhow::Context as _;
-use zksync_basic_types::{L1BatchNumber, L2ChainId};
-use zksync_core::sync_layer::genesis::perform_genesis_if_needed;
+use zksync_config::ObjectStoreConfig;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_health_check::AppHealthCheck;
+use zksync_node_sync::genesis::perform_genesis_if_needed;
 use zksync_object_store::ObjectStoreFactory;
 use zksync_shared_metrics::{SnapshotRecoveryStage, APP_METRICS};
 use zksync_snapshots_applier::{SnapshotsApplierConfig, SnapshotsApplierTask};
-use zksync_web3_decl::client::BoxedL2Client;
+use zksync_types::{L1BatchNumber, L2ChainId};
+use zksync_web3_decl::client::{DynClient, L2};
 
-use crate::config::SnapshotsRecoveryConfig;
+#[derive(Debug)]
+pub(crate) struct SnapshotRecoveryConfig {
+    /// If not specified, the latest snapshot will be used.
+    pub snapshot_l1_batch_override: Option<L1BatchNumber>,
+    pub drop_storage_key_preimages: bool,
+    pub object_store_config: Option<ObjectStoreConfig>,
+}
 
 #[derive(Debug)]
 enum InitDecision {
@@ -24,10 +31,10 @@ enum InitDecision {
 
 pub(crate) async fn ensure_storage_initialized(
     pool: ConnectionPool<Core>,
-    main_node_client: BoxedL2Client,
+    main_node_client: Box<DynClient<L2>>,
     app_health: &AppHealthCheck,
     l2_chain_id: L2ChainId,
-    consider_snapshot_recovery: bool,
+    recovery_config: Option<SnapshotRecoveryConfig>,
 ) -> anyhow::Result<()> {
     let mut storage = pool.connection_tagged("en").await?;
     let genesis_l1_batch = storage
@@ -57,7 +64,7 @@ pub(crate) async fn ensure_storage_initialized(
         }
         (None, None) => {
             tracing::info!("Node has neither genesis L1 batch, nor snapshot recovery info");
-            if consider_snapshot_recovery {
+            if recovery_config.is_some() {
                 InitDecision::SnapshotRecovery
             } else {
                 InitDecision::Genesis
@@ -78,25 +85,37 @@ pub(crate) async fn ensure_storage_initialized(
             .context("performing genesis failed")?;
         }
         InitDecision::SnapshotRecovery => {
-            anyhow::ensure!(
-                consider_snapshot_recovery,
+            let recovery_config = recovery_config.context(
                 "Snapshot recovery is required to proceed, but it is not enabled. Enable by setting \
                  `EN_SNAPSHOTS_RECOVERY_ENABLED=true` env variable to the node binary, or use a Postgres dump for recovery"
-            );
+            )?;
 
             tracing::warn!("Proceeding with snapshot recovery. This is an experimental feature; use at your own risk");
-            let recovery_config = SnapshotsRecoveryConfig::new()?;
-            let blob_store = ObjectStoreFactory::new(recovery_config.snapshots_object_store)
+            let object_store_config = recovery_config.object_store_config.context(
+                "Snapshot object store must be presented if snapshot recovery is activated",
+            )?;
+            let object_store = ObjectStoreFactory::new(object_store_config)
                 .create_store()
-                .await;
+                .await?;
 
             let config = SnapshotsApplierConfig::default();
-            let snapshots_applier_task = SnapshotsApplierTask::new(
+            let mut snapshots_applier_task = SnapshotsApplierTask::new(
                 config,
                 pool,
                 Box::new(main_node_client.for_component("snapshot_recovery")),
-                blob_store,
+                object_store,
             );
+            if let Some(snapshot_l1_batch) = recovery_config.snapshot_l1_batch_override {
+                tracing::info!(
+                    "Using a specific snapshot with L1 batch #{snapshot_l1_batch}; this may not work \
+                     if the snapshot is too old (order of several weeks old) or non-existent"
+                );
+                snapshots_applier_task.set_snapshot_l1_batch(snapshot_l1_batch);
+            }
+            if recovery_config.drop_storage_key_preimages {
+                tracing::info!("Dropping storage key preimages for snapshot storage logs");
+                snapshots_applier_task.drop_storage_key_preimages();
+            }
             app_health.insert_component(snapshots_applier_task.health_check())?;
 
             let recovery_started_at = Instant::now();
diff --git a/core/bin/external_node/src/main.rs b/core/bin/external_node/src/main.rs
index dc9380940382..e3ee987a6e62 100644
--- a/core/bin/external_node/src/main.rs
+++ b/core/bin/external_node/src/main.rs
@@ -3,82 +3,70 @@ use std::{collections::HashSet, net::Ipv4Addr, str::FromStr, sync::Arc, time::Du
 use anyhow::Context as _;
 use clap::Parser;
 use metrics::EN_METRICS;
-use prometheus_exporter::PrometheusExporterConfig;
+use node_builder::ExternalNodeBuilder;
 use tokio::{
     sync::{oneshot, watch, RwLock},
     task::{self, JoinHandle},
 };
 use zksync_block_reverter::{BlockReverter, NodeRole};
 use zksync_commitment_generator::{
-    input_generation::{InputGenerator, RollupInputGenerator, ValidiumInputGenerator},
-    CommitmentGenerator,
+    validation_task::L1BatchCommitmentModeValidationTask, CommitmentGenerator,
 };
 use zksync_concurrency::{ctx, scope};
-use zksync_config::configs::{
-    api::MerkleTreeApiConfig, chain::L1BatchCommitDataGeneratorMode, database::MerkleTreeMode,
-};
-use zksync_core::{
-    api_server::{
-        execution_sandbox::VmConcurrencyLimiter,
-        healthcheck::HealthCheckHandle,
-        tree::{TreeApiClient, TreeApiHttpClient},
-        tx_sender::{proxy::TxProxy, ApiContracts, TxSenderBuilder},
-        web3::{mempool_cache::MempoolCache, ApiBuilder, Namespace},
-    },
-    consensus,
-    consistency_checker::ConsistencyChecker,
-    metadata_calculator::{MetadataCalculator, MetadataCalculatorConfig},
-    reorg_detector::{self, ReorgDetector},
-    setup_sigint_handler,
-    state_keeper::{
-        seal_criteria::NoopSealer, AsyncRocksdbCache, BatchExecutor, MainBatchExecutor,
-        OutputHandler, StateKeeperPersistence, ZkSyncStateKeeper,
-    },
-    sync_layer::{
-        batch_status_updater::BatchStatusUpdater, external_io::ExternalIO, ActionQueue, SyncState,
-    },
-    utils::ensure_l1_batch_commit_data_generation_mode,
-};
-use zksync_dal::{metrics::PostgresMetrics, ConnectionPool, Core, CoreDal};
+use zksync_config::configs::{api::MerkleTreeApiConfig, database::MerkleTreeMode};
+use zksync_consistency_checker::ConsistencyChecker;
+use zksync_core_leftovers::setup_sigint_handler;
+use zksync_dal::{metrics::PostgresMetrics, ConnectionPool, Core};
 use zksync_db_connection::{
     connection_pool::ConnectionPoolBuilder, healthcheck::ConnectionPoolHealthCheck,
 };
-use zksync_eth_client::{clients::QueryClient, EthInterface};
-use zksync_eth_sender::l1_batch_commit_data_generator::{
-    L1BatchCommitDataGenerator, RollupModeL1BatchCommitDataGenerator,
-    ValidiumModeL1BatchCommitDataGenerator,
-};
 use zksync_health_check::{AppHealthCheck, HealthStatus, ReactiveHealthCheck};
+use zksync_metadata_calculator::{
+    api_server::{TreeApiClient, TreeApiHttpClient},
+    MetadataCalculator, MetadataCalculatorConfig, MetadataCalculatorRecoveryConfig,
+};
+use zksync_node_api_server::{
+    execution_sandbox::VmConcurrencyLimiter,
+    healthcheck::HealthCheckHandle,
+    tx_sender::{proxy::TxProxy, ApiContracts, TxSenderBuilder},
+    web3::{mempool_cache::MempoolCache, ApiBuilder, Namespace},
+};
+use zksync_node_consensus as consensus;
 use zksync_node_db_pruner::{DbPruner, DbPrunerConfig};
 use zksync_node_fee_model::l1_gas_price::MainNodeFeeParamsFetcher;
+use zksync_node_sync::{
+    batch_status_updater::BatchStatusUpdater, external_io::ExternalIO,
+    tree_data_fetcher::TreeDataFetcher, validate_chain_ids_task::ValidateChainIdsTask, ActionQueue,
+    MainNodeHealthCheck, SyncState,
+};
+use zksync_reorg_detector::ReorgDetector;
+use zksync_shared_metrics::rustc::RUST_METRICS;
 use zksync_state::{PostgresStorageCaches, RocksdbStorageOptions};
+use zksync_state_keeper::{
+    seal_criteria::NoopSealer, AsyncRocksdbCache, BatchExecutor, MainBatchExecutor, OutputHandler,
+    StateKeeperPersistence, TreeWritesPersistence, ZkSyncStateKeeper,
+};
 use zksync_storage::RocksDB;
 use zksync_types::L2ChainId;
 use zksync_utils::wait_for_tasks::ManagedTasks;
 use zksync_web3_decl::{
-    client::{BoxedL2Client, L2Client},
+    client::{Client, DynClient, L1, L2},
     jsonrpsee,
     namespaces::EnNamespaceClient,
 };
 
 use crate::{
-    config::{
-        observability::observability_config_from_env, ExternalNodeConfig, OptionalENConfig,
-        RequiredENConfig,
-    },
-    helpers::{EthClientHealthCheck, MainNodeHealthCheck, ValidateChainIdsTask},
-    init::ensure_storage_initialized,
-    metrics::RUST_METRICS,
+    config::ExternalNodeConfig,
+    init::{ensure_storage_initialized, SnapshotRecoveryConfig},
 };
 
 mod config;
-mod helpers;
 mod init;
 mod metadata;
 mod metrics;
+mod node_builder;
 #[cfg(test)]
 mod tests;
-mod version_sync_task;
 
 /// Creates the state keeper configured to work in the external node mode.
 #[allow(clippy::too_many_arguments)]
@@ -87,7 +75,7 @@ async fn build_state_keeper(
     state_keeper_db_path: String,
     config: &ExternalNodeConfig,
     connection_pool: ConnectionPool<Core>,
-    main_node_client: BoxedL2Client,
+    main_node_client: Box<DynClient<L2>>,
     output_handler: OutputHandler,
     stop_receiver: watch::Receiver<bool>,
     chain_id: L2ChainId,
@@ -108,11 +96,8 @@ async fn build_state_keeper(
         stop_receiver_clone.changed().await?;
         result
     }));
-    let batch_executor_base: Box<dyn BatchExecutor> = Box::new(MainBatchExecutor::new(
-        Arc::new(storage_factory),
-        save_call_traces,
-        true,
-    ));
+    let batch_executor_base: Box<dyn BatchExecutor> =
+        Box::new(MainBatchExecutor::new(save_call_traces, true));
 
     let io = ExternalIO::new(
         connection_pool,
@@ -129,6 +114,7 @@ async fn build_state_keeper(
         batch_executor_base,
         output_handler,
         Arc::new(NoopSealer),
+        Arc::new(storage_factory),
     ))
 }
 
@@ -144,8 +130,8 @@ async fn run_tree(
         db_path: config.required.merkle_tree_path.clone(),
         max_open_files: config.optional.merkle_tree_max_open_files,
         mode: MerkleTreeMode::Lightweight,
-        delay_interval: config.optional.metadata_calculator_delay(),
-        max_l1_batches_per_iter: config.optional.max_l1_batches_per_tree_iter,
+        delay_interval: config.optional.merkle_tree_processing_delay(),
+        max_l1_batches_per_iter: config.optional.merkle_tree_max_l1_batches_per_iter,
         multi_get_chunk_size: config.optional.merkle_tree_multi_get_chunk_size,
         block_cache_capacity: config.optional.merkle_tree_block_cache_size(),
         include_indices_and_filters_in_block_cache: config
@@ -153,6 +139,13 @@ async fn run_tree(
             .merkle_tree_include_indices_and_filters_in_block_cache,
         memtable_capacity: config.optional.merkle_tree_memtable_capacity(),
         stalled_writes_timeout: config.optional.merkle_tree_stalled_writes_timeout(),
+        sealed_batches_have_protective_reads: config.optional.protective_reads_persistence_enabled,
+        recovery: MetadataCalculatorRecoveryConfig {
+            desired_chunk_size: config.experimental.snapshots_recovery_tree_chunk_size,
+            parallel_persistence_buffer: config
+                .experimental
+                .snapshots_recovery_tree_parallel_persistence_buffer,
+        },
     };
 
     let max_concurrency = config
@@ -192,13 +185,19 @@ async fn run_tree(
     if let Some(api_config) = api_config {
         let address = (Ipv4Addr::UNSPECIFIED, api_config.port).into();
         let tree_reader = metadata_calculator.tree_reader();
-        let stop_receiver = stop_receiver.clone();
+        let mut stop_receiver = stop_receiver.clone();
         task_futures.push(tokio::spawn(async move {
-            tree_reader
-                .wait()
-                .await
-                .run_api_server(address, stop_receiver)
-                .await
+            if let Some(reader) = tree_reader.wait().await {
+                reader.run_api_server(address, stop_receiver).await
+            } else {
+                // Tree is dropped before initialized, e.g. because the node is getting shut down.
+                // We don't want to treat this as an error since it could mask the real shutdown cause in logs etc.
+                tracing::warn!(
+                    "Tree is dropped before initialized, not starting the tree API server"
+                );
+                stop_receiver.changed().await?;
+                Ok(())
+            }
         }));
     }
 
@@ -212,12 +211,11 @@ async fn run_tree(
 async fn run_core(
     config: &ExternalNodeConfig,
     connection_pool: ConnectionPool<Core>,
-    main_node_client: BoxedL2Client,
-    eth_client: Box<dyn EthInterface>,
-    task_handles: &mut Vec<task::JoinHandle<anyhow::Result<()>>>,
+    main_node_client: Box<DynClient<L2>>,
+    eth_client: Box<DynClient<L1>>,
+    task_handles: &mut Vec<JoinHandle<anyhow::Result<()>>>,
     app_health: &AppHealthCheck,
     stop_receiver: watch::Receiver<bool>,
-    fee_params_fetcher: Arc<MainNodeFeeParamsFetcher>,
     singleton_pool_builder: &ConnectionPoolBuilder<Core>,
 ) -> anyhow::Result<SyncState> {
     // Create components.
@@ -231,7 +229,7 @@ async fn run_core(
             .remote
             .l2_shared_bridge_addr
             .expect("L2 shared bridge address is not set"),
-        config.optional.miniblock_seal_queue_capacity,
+        config.optional.l2_block_seal_queue_capacity,
     );
     task_handles.push(tokio::spawn(miniblock_sealer.run()));
 
@@ -242,9 +240,11 @@ async fn run_core(
         tracing::warn!("Disabling persisting protective reads; this should be safe, but is considered an experimental option at the moment");
         persistence = persistence.without_protective_reads();
     }
+    let tree_writes_persistence = TreeWritesPersistence::new(connection_pool.clone());
 
-    let output_handler =
-        OutputHandler::new(Box::new(persistence)).with_handler(Box::new(sync_state.clone()));
+    let output_handler = OutputHandler::new(Box::new(persistence))
+        .with_handler(Box::new(tree_writes_persistence))
+        .with_handler(Box::new(sync_state.clone()));
     let state_keeper = build_state_keeper(
         action_queue,
         config.required.state_cache_path.clone(),
@@ -286,7 +286,7 @@ async fn run_core(
             // but we only need to wait for stop signal once, and it will be propagated to all child contexts.
             let ctx = ctx::root();
             scope::run!(&ctx, |ctx, s| async move {
-                s.spawn_bg(consensus::era::run_fetcher(
+                s.spawn_bg(consensus::era::run_external_node(
                     ctx,
                     cfg,
                     pool,
@@ -322,8 +322,6 @@ async fn run_core(
     }
 
     let sk_handle = task::spawn(state_keeper.run());
-    let fee_params_fetcher_handle =
-        tokio::spawn(fee_params_fetcher.clone().run(stop_receiver.clone()));
     let remote_diamond_proxy_addr = config.remote.diamond_proxy_addr;
     let diamond_proxy_addr = if let Some(addr) = config.optional.contracts_diamond_proxy_addr {
         anyhow::ensure!(
@@ -340,26 +338,14 @@ async fn run_core(
         remote_diamond_proxy_addr
     };
 
-    ensure_l1_batch_commit_data_generation_mode(
-        config.optional.l1_batch_commit_data_generator_mode,
+    // Run validation asynchronously: the node starting shouldn't depend on Ethereum client availability,
+    // and the impact of a failed async check is reasonably low (the commitment mode is only used in consistency checker).
+    let validation_task = L1BatchCommitmentModeValidationTask::new(
         diamond_proxy_addr,
-        eth_client.as_ref(),
-    )
-    .await?;
-
-    let (l1_batch_commit_data_generator, input_generator): (
-        Arc<dyn L1BatchCommitDataGenerator>,
-        Box<dyn InputGenerator>,
-    ) = match config.optional.l1_batch_commit_data_generator_mode {
-        L1BatchCommitDataGeneratorMode::Rollup => (
-            Arc::new(RollupModeL1BatchCommitDataGenerator {}),
-            Box::new(RollupInputGenerator),
-        ),
-        L1BatchCommitDataGeneratorMode::Validium => (
-            Arc::new(ValidiumModeL1BatchCommitDataGenerator {}),
-            Box::new(ValidiumInputGenerator),
-        ),
-    };
+        config.optional.l1_batch_commit_data_generator_mode,
+        eth_client.clone(),
+    );
+    task_handles.push(tokio::spawn(validation_task.run(stop_receiver.clone())));
 
     let consistency_checker = ConsistencyChecker::new(
         eth_client,
@@ -368,7 +354,7 @@ async fn run_core(
             .build()
             .await
             .context("failed to build connection pool for ConsistencyChecker")?,
-        l1_batch_commit_data_generator,
+        config.optional.l1_batch_commit_data_generator_mode,
     )
     .context("cannot initialize consistency checker")?
     .with_diamond_proxy_addr(diamond_proxy_addr);
@@ -385,11 +371,13 @@ async fn run_core(
     );
     app_health.insert_component(batch_status_updater.health_check())?;
 
-    let commitment_generator_pool = singleton_pool_builder
-        .build()
-        .await
-        .context("failed to build a commitment_generator_pool")?;
-    let commitment_generator = CommitmentGenerator::new(commitment_generator_pool, input_generator);
+    let mut commitment_generator = CommitmentGenerator::new(
+        connection_pool.clone(),
+        config.optional.l1_batch_commit_data_generator_mode,
+    );
+    if let Some(parallelism) = config.experimental.commitment_generator_max_parallelism {
+        commitment_generator.set_max_parallelism(parallelism);
+    }
     app_health.insert_component(commitment_generator.health_check())?;
     let commitment_generator_handle = tokio::spawn(commitment_generator.run(stop_receiver.clone()));
 
@@ -397,7 +385,6 @@ async fn run_core(
 
     task_handles.extend([
         sk_handle,
-        fee_params_fetcher_handle,
         consistency_checker_handle,
         commitment_generator_handle,
         updater_handle,
@@ -415,7 +402,7 @@ async fn run_api(
     stop_receiver: watch::Receiver<bool>,
     sync_state: SyncState,
     tree_reader: Option<Arc<dyn TreeApiClient>>,
-    main_node_client: BoxedL2Client,
+    main_node_client: Box<DynClient<L2>>,
     singleton_pool_builder: &ConnectionPoolBuilder<Core>,
     fee_params_fetcher: Arc<MainNodeFeeParamsFetcher>,
     components: &HashSet<Component>,
@@ -447,20 +434,18 @@ async fn run_api(
         .build()
         .await
         .context("failed to build a proxy_cache_updater_pool")?;
-    task_handles.push(tokio::spawn(tx_proxy.run_account_nonce_sweeper(
-        proxy_cache_updater_pool.clone(),
-        stop_receiver.clone(),
-    )));
+    task_handles.push(tokio::spawn(
+        tx_proxy
+            .account_nonce_sweeper_task(proxy_cache_updater_pool.clone())
+            .run(stop_receiver.clone()),
+    ));
 
-    let tx_sender_builder = TxSenderBuilder::new(
-        config.clone().into(),
-        connection_pool.clone(),
-        Arc::new(tx_proxy),
-    );
+    let fee_params_fetcher_handle =
+        tokio::spawn(fee_params_fetcher.clone().run(stop_receiver.clone()));
+    task_handles.push(fee_params_fetcher_handle);
 
-    if config.optional.transactions_per_sec_limit.is_some() {
-        tracing::warn!("`transactions_per_sec_limit` option is deprecated and ignored");
-    };
+    let tx_sender_builder =
+        TxSenderBuilder::new(config.into(), connection_pool.clone(), Arc::new(tx_proxy));
 
     let max_concurrency = config.optional.vm_concurrency_limit;
     let (vm_concurrency_limiter, vm_barrier) = VmConcurrencyLimiter::new(max_concurrency);
@@ -510,10 +495,9 @@ async fn run_api(
         .build(
             fee_params_fetcher,
             Arc::new(vm_concurrency_limiter),
-            ApiContracts::load_from_disk(), // TODO (BFT-138): Allow to dynamically reload API contracts
+            ApiContracts::load_from_disk().await?, // TODO (BFT-138): Allow to dynamically reload API contracts
             storage_caches,
-        )
-        .await;
+        );
 
     let mempool_cache = MempoolCache::new(config.optional.mempool_cache_size);
     let mempool_cache_update_task = mempool_cache.update_task(
@@ -529,19 +513,18 @@ async fn run_api(
     let pruning_info_refresh_interval = config.optional.pruning_removal_delay() / 5;
 
     if components.contains(&Component::HttpApi) {
-        let mut builder =
-            ApiBuilder::jsonrpsee_backend(config.clone().into(), connection_pool.clone())
-                .http(config.required.http_port)
-                .with_filter_limit(config.optional.filters_limit)
-                .with_batch_request_size_limit(config.optional.max_batch_request_size)
-                .with_response_body_size_limit(config.optional.max_response_body_size())
-                .with_pruning_info_refresh_interval(pruning_info_refresh_interval)
-                .with_tx_sender(tx_sender.clone())
-                .with_vm_barrier(vm_barrier.clone())
-                .with_sync_state(sync_state.clone())
-                .with_mempool_cache(mempool_cache.clone())
-                .with_extended_tracing(config.optional.extended_rpc_tracing)
-                .enable_api_namespaces(config.optional.api_namespaces());
+        let mut builder = ApiBuilder::jsonrpsee_backend(config.into(), connection_pool.clone())
+            .http(config.required.http_port)
+            .with_filter_limit(config.optional.filters_limit)
+            .with_batch_request_size_limit(config.optional.max_batch_request_size)
+            .with_response_body_size_limit(config.optional.max_response_body_size())
+            .with_pruning_info_refresh_interval(pruning_info_refresh_interval)
+            .with_tx_sender(tx_sender.clone())
+            .with_vm_barrier(vm_barrier.clone())
+            .with_sync_state(sync_state.clone())
+            .with_mempool_cache(mempool_cache.clone())
+            .with_extended_tracing(config.optional.extended_rpc_tracing)
+            .enable_api_namespaces(config.optional.api_namespaces());
         if let Some(tree_reader) = &tree_reader {
             builder = builder.with_tree_api(tree_reader.clone());
         }
@@ -557,21 +540,20 @@ async fn run_api(
     }
 
     if components.contains(&Component::WsApi) {
-        let mut builder =
-            ApiBuilder::jsonrpsee_backend(config.clone().into(), connection_pool.clone())
-                .ws(config.required.ws_port)
-                .with_filter_limit(config.optional.filters_limit)
-                .with_subscriptions_limit(config.optional.subscriptions_limit)
-                .with_batch_request_size_limit(config.optional.max_batch_request_size)
-                .with_response_body_size_limit(config.optional.max_response_body_size())
-                .with_polling_interval(config.optional.polling_interval())
-                .with_pruning_info_refresh_interval(pruning_info_refresh_interval)
-                .with_tx_sender(tx_sender)
-                .with_vm_barrier(vm_barrier)
-                .with_sync_state(sync_state)
-                .with_mempool_cache(mempool_cache)
-                .with_extended_tracing(config.optional.extended_rpc_tracing)
-                .enable_api_namespaces(config.optional.api_namespaces());
+        let mut builder = ApiBuilder::jsonrpsee_backend(config.into(), connection_pool.clone())
+            .ws(config.required.ws_port)
+            .with_filter_limit(config.optional.filters_limit)
+            .with_subscriptions_limit(config.optional.subscriptions_limit)
+            .with_batch_request_size_limit(config.optional.max_batch_request_size)
+            .with_response_body_size_limit(config.optional.max_response_body_size())
+            .with_polling_interval(config.optional.polling_interval())
+            .with_pruning_info_refresh_interval(pruning_info_refresh_interval)
+            .with_tx_sender(tx_sender)
+            .with_vm_barrier(vm_barrier)
+            .with_sync_state(sync_state)
+            .with_mempool_cache(mempool_cache)
+            .with_extended_tracing(config.optional.extended_rpc_tracing)
+            .enable_api_namespaces(config.optional.api_namespaces());
         if let Some(tree_reader) = tree_reader {
             builder = builder.with_tree_api(tree_reader);
         }
@@ -594,8 +576,8 @@ async fn init_tasks(
     config: &ExternalNodeConfig,
     connection_pool: ConnectionPool<Core>,
     singleton_pool_builder: ConnectionPoolBuilder<Core>,
-    main_node_client: BoxedL2Client,
-    eth_client: Box<dyn EthInterface>,
+    main_node_client: Box<DynClient<L2>>,
+    eth_client: Box<DynClient<L1>>,
     task_handles: &mut Vec<JoinHandle<anyhow::Result<()>>>,
     app_health: &AppHealthCheck,
     stop_receiver: watch::Receiver<bool>,
@@ -647,7 +629,16 @@ async fn init_tasks(
         None
     };
 
-    let fee_params_fetcher = Arc::new(MainNodeFeeParamsFetcher::new(main_node_client.clone()));
+    if components.contains(&Component::TreeFetcher) {
+        tracing::warn!(
+            "Running tree data fetcher (allows a node to operate w/o a Merkle tree or w/o waiting the tree to catch up). \
+             This is an experimental feature; do not use unless you know what you're doing"
+        );
+        let fetcher = TreeDataFetcher::new(main_node_client.clone(), connection_pool.clone())
+            .with_l1_data(eth_client.clone(), config.remote.diamond_proxy_addr)?;
+        app_health.insert_component(fetcher.health_check())?;
+        task_handles.push(tokio::spawn(fetcher.run(stop_receiver.clone())));
+    }
 
     let sync_state = if components.contains(&Component::Core) {
         run_core(
@@ -658,7 +649,6 @@ async fn init_tasks(
             task_handles,
             app_health,
             stop_receiver.clone(),
-            fee_params_fetcher.clone(),
             &singleton_pool_builder,
         )
         .await?
@@ -675,6 +665,7 @@ async fn init_tasks(
     };
 
     if components.contains(&Component::HttpApi) || components.contains(&Component::WsApi) {
+        let fee_params_fetcher = Arc::new(MainNodeFeeParamsFetcher::new(main_node_client.clone()));
         run_api(
             task_handles,
             config,
@@ -691,29 +682,13 @@ async fn init_tasks(
         .await?;
     }
 
-    if let Some(port) = config.optional.prometheus_port {
-        let (prometheus_health_check, prometheus_health_updater) =
-            ReactiveHealthCheck::new("prometheus_exporter");
-        app_health.insert_component(prometheus_health_check)?;
-        task_handles.push(tokio::spawn(async move {
-            prometheus_health_updater.update(HealthStatus::Ready.into());
-            let result = PrometheusExporterConfig::pull(port)
-                .run(stop_receiver)
-                .await;
-            drop(prometheus_health_updater);
-            result
-        }));
-    }
-
     Ok(())
 }
 
 async fn shutdown_components(
-    stop_sender: watch::Sender<bool>,
     tasks: ManagedTasks,
     healthcheck_handle: HealthCheckHandle,
 ) -> anyhow::Result<()> {
-    stop_sender.send(true).ok();
     task::spawn_blocking(RocksDB::await_rocksdb_termination)
         .await
         .context("error waiting for RocksDB instances to drop")?;
@@ -723,13 +698,10 @@ async fn shutdown_components(
     Ok(())
 }
 
-/// External node for zkSync Era.
+/// External node for ZKsync Era.
 #[derive(Debug, Parser)]
 #[command(author = "Matter Labs", version)]
 struct Cli {
-    /// Revert the pending L1 batch and exit.
-    #[arg(long)]
-    revert_pending_l1_batch: bool,
     /// Enables consensus-based syncing instead of JSON-RPC based one. This is an experimental and incomplete feature;
     /// do not use unless you know what you're doing.
     #[arg(long)]
@@ -738,6 +710,25 @@ struct Cli {
     /// Comma-separated list of components to launch.
     #[arg(long, default_value = "all")]
     components: ComponentsToRun,
+    /// Path to the yaml config. If set, it will be used instead of env vars.
+    #[arg(
+        long,
+        requires = "secrets_path",
+        requires = "external_node_config_path"
+    )]
+    config_path: Option<std::path::PathBuf>,
+    /// Path to the yaml with secrets. If set, it will be used instead of env vars.
+    #[arg(long, requires = "config_path", requires = "external_node_config_path")]
+    secrets_path: Option<std::path::PathBuf>,
+    /// Path to the yaml with external node specific configuration. If set, it will be used instead of env vars.
+    #[arg(long, requires = "config_path", requires = "secrets_path")]
+    external_node_config_path: Option<std::path::PathBuf>,
+    /// Path to the yaml with consensus.
+    consensus_path: Option<std::path::PathBuf>,
+
+    /// Run the node using the node framework.
+    #[arg(long)]
+    use_node_framework: bool,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Hash, Eq)]
@@ -746,6 +737,7 @@ pub enum Component {
     WsApi,
     Tree,
     TreeApi,
+    TreeFetcher,
     Core,
 }
 
@@ -757,6 +749,7 @@ impl Component {
             "ws_api" => Ok(&[Component::WsApi]),
             "tree" => Ok(&[Component::Tree]),
             "tree_api" => Ok(&[Component::TreeApi]),
+            "tree_fetcher" => Ok(&[Component::TreeFetcher]),
             "core" => Ok(&[Component::Core]),
             "all" => Ok(&[
                 Component::HttpApi,
@@ -792,50 +785,61 @@ async fn main() -> anyhow::Result<()> {
     // Initial setup.
     let opt = Cli::parse();
 
-    let observability_config =
-        observability_config_from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
-        .log_format
-        .parse()
-        .context("Invalid log format")?;
-
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
-    if let Some(sentry_url) = &observability_config.sentry_url {
-        builder = builder
-            .with_sentry_url(sentry_url)
-            .expect("Invalid Sentry URL")
-            .with_sentry_environment(observability_config.sentry_environment);
-    }
-    let _guard = builder.build();
-
-    // Report whether sentry is running after the logging subsystem was initialized.
-    if let Some(sentry_url) = observability_config.sentry_url {
-        tracing::info!("Sentry configured with URL: {sentry_url}");
+    let mut config = if let Some(config_path) = opt.config_path.clone() {
+        let secrets_path = opt.secrets_path.clone().unwrap();
+        let external_node_config_path = opt.external_node_config_path.clone().unwrap();
+        ExternalNodeConfig::from_files(
+            config_path,
+            external_node_config_path,
+            secrets_path,
+            opt.consensus_path.clone(),
+        )?
     } else {
-        tracing::info!("No sentry URL was provided");
-    }
+        ExternalNodeConfig::new().context("Failed to load node configuration")?
+    };
 
-    let required_config = RequiredENConfig::from_env()?;
-    let optional_config = OptionalENConfig::from_env()?;
+    if !opt.enable_consensus {
+        config.consensus = None;
+    }
+    let _guard = config.observability.build_observability()?;
 
     // Build L1 and L2 clients.
-    let main_node_url = &required_config.main_node_url;
+    let main_node_url = &config.required.main_node_url;
     tracing::info!("Main node URL is: {main_node_url:?}");
-    let main_node_client = L2Client::http(main_node_url.clone())
-        .context("Failed creating JSON-RPC client for main node")?
-        .with_allowed_requests_per_second(optional_config.main_node_rate_limit_rps)
+    let main_node_client = Client::http(main_node_url.clone())
+        .context("failed creating JSON-RPC client for main node")?
+        .for_network(config.required.l2_chain_id.into())
+        .with_allowed_requests_per_second(config.optional.main_node_rate_limit_rps)
         .build();
-    let main_node_client = BoxedL2Client::new(main_node_client);
+    let main_node_client = Box::new(main_node_client) as Box<DynClient<L2>>;
 
-    let eth_client_url = &required_config.eth_client_url;
-    let eth_client = Box::new(QueryClient::new(eth_client_url.clone())?);
+    let eth_client_url = &config.required.eth_client_url;
+    let eth_client = Client::http(eth_client_url.clone())
+        .context("failed creating JSON-RPC client for Ethereum")?
+        .for_network(config.required.l1_chain_id.into())
+        .build();
+    let eth_client = Box::new(eth_client);
 
-    let mut config = ExternalNodeConfig::new(required_config, optional_config, &main_node_client)
+    let config = config
+        .fetch_remote(main_node_client.as_ref())
         .await
-        .context("Failed to load external node config")?;
-    if !opt.enable_consensus {
-        config.consensus = None;
+        .context("failed fetching remote part of node config from main node")?;
+
+    // If the node framework is used, run the node.
+    if opt.use_node_framework {
+        // We run the node from a different thread, since the current thread is in tokio context.
+        std::thread::spawn(move || {
+            let node =
+                ExternalNodeBuilder::new(config).build(opt.components.0.into_iter().collect())?;
+            node.run()?;
+            anyhow::Ok(())
+        })
+        .join()
+        .expect("Failed to run the node")?;
+
+        return Ok(());
     }
+
     if let Some(threshold) = config.optional.slow_query_threshold() {
         ConnectionPool::<Core>::global_config().set_slow_query_threshold(threshold)?;
     }
@@ -892,12 +896,13 @@ async fn run_node(
     config: &ExternalNodeConfig,
     connection_pool: ConnectionPool<Core>,
     singleton_pool_builder: ConnectionPoolBuilder<Core>,
-    main_node_client: BoxedL2Client,
-    eth_client: Box<dyn EthInterface>,
+    main_node_client: Box<DynClient<L2>>,
+    eth_client: Box<DynClient<L1>>,
 ) -> anyhow::Result<()> {
     tracing::warn!("The external node is in the alpha phase, and should be used with caution.");
     tracing::info!("Started the external node");
-    let (stop_sender, stop_receiver) = watch::channel(false);
+    let (stop_sender, mut stop_receiver) = watch::channel(false);
+    let stop_sender = Arc::new(stop_sender);
 
     let app_health = Arc::new(AppHealthCheck::new(
         config.optional.healthcheck_slow_time_limit(),
@@ -906,7 +911,6 @@ async fn run_node(
     app_health.insert_custom_component(Arc::new(MainNodeHealthCheck::from(
         main_node_client.clone(),
     )))?;
-    app_health.insert_custom_component(Arc::new(EthClientHealthCheck::from(eth_client.clone())))?;
     app_health.insert_custom_component(Arc::new(ConnectionPoolHealthCheck::new(
         connection_pool.clone(),
     )))?;
@@ -916,6 +920,24 @@ async fn run_node(
         ([0, 0, 0, 0], config.required.healthcheck_port).into(),
         app_health.clone(),
     );
+    // Start exporting metrics at the very start so that e.g., snapshot recovery metrics are timely reported.
+    let prometheus_task = if let Some(prometheus) = config.observability.prometheus() {
+        tracing::info!("Starting Prometheus exporter with configuration: {prometheus:?}");
+
+        let (prometheus_health_check, prometheus_health_updater) =
+            ReactiveHealthCheck::new("prometheus_exporter");
+        app_health.insert_component(prometheus_health_check)?;
+        let stop_receiver_for_exporter = stop_receiver.clone();
+        Some(tokio::spawn(async move {
+            prometheus_health_updater.update(HealthStatus::Ready.into());
+            let result = prometheus.run(stop_receiver_for_exporter).await;
+            drop(prometheus_health_updater);
+            result
+        }))
+    } else {
+        None
+    };
+
     // Start scraping Postgres metrics before store initialization as well.
     let pool_for_metrics = singleton_pool_builder.build().await?;
     let mut stop_receiver_for_metrics = stop_receiver.clone();
@@ -939,31 +961,40 @@ async fn run_node(
     );
     let validate_chain_ids_task = tokio::spawn(validate_chain_ids_task.run(stop_receiver.clone()));
 
-    let version_sync_task_pool = connection_pool.clone();
-    let version_sync_task_main_node_client = main_node_client.clone();
-    let mut stop_receiver_for_version_sync = stop_receiver.clone();
-    let version_sync_task = tokio::spawn(async move {
-        version_sync_task::sync_versions(
-            version_sync_task_pool,
-            version_sync_task_main_node_client,
-        )
-        .await?;
-
-        stop_receiver_for_version_sync.changed().await.ok();
-        Ok(())
-    });
-    let mut task_handles = vec![metrics_task, validate_chain_ids_task, version_sync_task];
+    let mut task_handles = vec![metrics_task, validate_chain_ids_task];
+    task_handles.extend(prometheus_task);
 
     // Make sure that the node storage is initialized either via genesis or snapshot recovery.
+    let recovery_config =
+        config
+            .optional
+            .snapshots_recovery_enabled
+            .then_some(SnapshotRecoveryConfig {
+                snapshot_l1_batch_override: config.experimental.snapshots_recovery_l1_batch,
+                drop_storage_key_preimages: config
+                    .experimental
+                    .snapshots_recovery_drop_storage_key_preimages,
+                object_store_config: config.optional.snapshots_recovery_object_store.clone(),
+            });
     ensure_storage_initialized(
         connection_pool.clone(),
         main_node_client.clone(),
         &app_health,
         config.required.l2_chain_id,
-        config.optional.snapshots_recovery_enabled,
+        recovery_config,
     )
     .await?;
     let sigint_receiver = env.setup_sigint_handler();
+    // Spawn reacting to signals in a separate task so that the node is responsive to signals right away
+    // (e.g., during the initial reorg detection).
+    tokio::spawn({
+        let stop_sender = stop_sender.clone();
+        async move {
+            sigint_receiver.await.ok();
+            tracing::info!("Stop signal received, shutting down");
+            stop_sender.send_replace(true);
+        }
+    });
 
     // Revert the storage if needed.
     let mut reverter = BlockReverter::new(NodeRole::External, connection_pool.clone());
@@ -979,29 +1010,22 @@ async fn run_node(
     // the node lifecycle, the node will exit the same way as it does with any other critical error,
     // and would restart. Then, on the 2nd launch reorg would be detected here, then processed and the node
     // will be able to operate normally afterwards.
-    match reorg_detector.check_consistency().await {
-        Ok(()) => {}
-        Err(reorg_detector::Error::ReorgDetected(last_correct_l1_batch)) => {
+    match reorg_detector.run_once(stop_receiver.clone()).await {
+        Ok(()) if *stop_receiver.borrow() => {
+            tracing::info!("Stop signal received during initial reorg detection; shutting down");
+            healthcheck_handle.stop().await;
+            return Ok(());
+        }
+        Ok(()) => {
+            tracing::info!("Successfully checked no reorg compared to the main node");
+        }
+        Err(zksync_reorg_detector::Error::ReorgDetected(last_correct_l1_batch)) => {
             tracing::info!("Reverting to l1 batch number {last_correct_l1_batch}");
             reverter.roll_back(last_correct_l1_batch).await?;
             tracing::info!("Revert successfully completed");
         }
         Err(err) => return Err(err).context("reorg_detector.check_consistency()"),
     }
-    if opt.revert_pending_l1_batch {
-        tracing::info!("Reverting pending L1 batch");
-        let mut connection = connection_pool.connection().await?;
-        let sealed_l1_batch_number = connection
-            .blocks_dal()
-            .get_sealed_l1_batch_number()
-            .await?
-            .context("Cannot revert pending L1 batch since there are no L1 batches in Postgres")?;
-        drop(connection);
-
-        tracing::info!("Reverting to l1 batch number {sealed_l1_batch_number}");
-        reverter.roll_back(sealed_l1_batch_number).await?;
-        tracing::info!("Revert successfully completed");
-    }
 
     app_health.insert_component(reorg_detector.health_check().clone())?;
     task_handles.push(tokio::spawn({
@@ -1032,15 +1056,17 @@ async fn run_node(
 
     let mut tasks = ManagedTasks::new(task_handles);
     tokio::select! {
-        _ = tasks.wait_single() => {},
-        _ = sigint_receiver => {
-            tracing::info!("Stop signal received, shutting down");
-        },
-    };
+        // We don't want to log unnecessary warnings in `tasks.wait_single()` if we have received a stop signal.
+        biased;
+
+        _ = stop_receiver.changed() => {},
+        () = tasks.wait_single() => {},
+    }
 
     // Reaching this point means that either some actor exited unexpectedly or we received a stop signal.
-    // Broadcast the stop signal to all actors and exit.
-    shutdown_components(stop_sender, tasks, healthcheck_handle).await?;
+    // Broadcast the stop signal (in case it wasn't broadcast previously) to all actors and exit.
+    stop_sender.send_replace(true);
+    shutdown_components(tasks, healthcheck_handle).await?;
     tracing::info!("Stopped");
     Ok(())
 }
diff --git a/core/bin/external_node/src/metadata.rs b/core/bin/external_node/src/metadata.rs
index ce454711a97d..73bc4b7b0626 100644
--- a/core/bin/external_node/src/metadata.rs
+++ b/core/bin/external_node/src/metadata.rs
@@ -1,22 +1,3 @@
 //! Metadata information about the external node.
 
-use vise::EncodeLabelSet;
-
-pub(crate) use self::values::RUSTC_METADATA;
-
-mod values {
-    use super::RustcMetadata;
-    include!(concat!(env!("OUT_DIR"), "/metadata_values.rs"));
-}
-
-#[derive(Debug, EncodeLabelSet)]
-pub(crate) struct RustcMetadata {
-    pub version: &'static str,
-    pub commit_hash: Option<&'static str>,
-    pub commit_date: Option<&'static str>,
-    pub channel: &'static str,
-    pub host: &'static str,
-    pub llvm: Option<&'static str>,
-}
-
 pub(crate) const SERVER_VERSION: &str = env!("CARGO_PKG_VERSION");
diff --git a/core/bin/external_node/src/metrics.rs b/core/bin/external_node/src/metrics.rs
index 08397f824f50..ca4495180226 100644
--- a/core/bin/external_node/src/metrics.rs
+++ b/core/bin/external_node/src/metrics.rs
@@ -4,10 +4,7 @@ use tokio::sync::watch;
 use vise::{EncodeLabelSet, Gauge, Info, Metrics};
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 
-use crate::{
-    config::ExternalNodeConfig,
-    metadata::{RustcMetadata, RUSTC_METADATA, SERVER_VERSION},
-};
+use crate::{config::ExternalNodeConfig, metadata::SERVER_VERSION};
 
 /// Immutable EN parameters that affect multiple components.
 #[derive(Debug, Clone, Copy, EncodeLabelSet)]
@@ -74,20 +71,3 @@ impl ExternalNodeMetrics {
 
 #[vise::register]
 pub(crate) static EN_METRICS: vise::Global<ExternalNodeMetrics> = vise::Global::new();
-
-#[derive(Debug, Metrics)]
-#[metrics(prefix = "rust")]
-pub(crate) struct RustMetrics {
-    /// General information about the Rust compiler.
-    info: Info<RustcMetadata>,
-}
-
-impl RustMetrics {
-    pub fn initialize(&self) {
-        tracing::info!("Metadata for rustc that this EN was compiled with: {RUSTC_METADATA:?}");
-        self.info.set(RUSTC_METADATA).ok();
-    }
-}
-
-#[vise::register]
-pub(crate) static RUST_METRICS: vise::Global<RustMetrics> = vise::Global::new();
diff --git a/core/bin/external_node/src/node_builder.rs b/core/bin/external_node/src/node_builder.rs
new file mode 100644
index 000000000000..cfe8f1ea7c01
--- /dev/null
+++ b/core/bin/external_node/src/node_builder.rs
@@ -0,0 +1,512 @@
+//! This module provides a "builder" for the external node,
+//! as well as an interface to run the node with the specified components.
+
+use anyhow::Context as _;
+use zksync_config::{
+    configs::{
+        api::{HealthCheckConfig, MerkleTreeApiConfig},
+        database::MerkleTreeMode,
+        DatabaseSecrets,
+    },
+    PostgresConfig,
+};
+use zksync_metadata_calculator::{MetadataCalculatorConfig, MetadataCalculatorRecoveryConfig};
+use zksync_node_api_server::{tx_sender::ApiContracts, web3::Namespace};
+use zksync_node_framework::{
+    implementations::layers::{
+        batch_status_updater::BatchStatusUpdaterLayer,
+        commitment_generator::CommitmentGeneratorLayer,
+        consensus::{ConsensusLayer, Mode},
+        consistency_checker::ConsistencyCheckerLayer,
+        healtcheck_server::HealthCheckLayer,
+        l1_batch_commitment_mode_validation::L1BatchCommitmentModeValidationLayer,
+        main_node_client::MainNodeClientLayer,
+        main_node_fee_params_fetcher::MainNodeFeeParamsFetcherLayer,
+        metadata_calculator::MetadataCalculatorLayer,
+        pools_layer::PoolsLayerBuilder,
+        postgres_metrics::PostgresMetricsLayer,
+        prometheus_exporter::PrometheusExporterLayer,
+        pruning::PruningLayer,
+        query_eth_client::QueryEthClientLayer,
+        sigint::SigintHandlerLayer,
+        state_keeper::{
+            external_io::ExternalIOLayer, main_batch_executor::MainBatchExecutorLayer,
+            output_handler::OutputHandlerLayer, StateKeeperLayer,
+        },
+        sync_state_updater::SyncStateUpdaterLayer,
+        tree_data_fetcher::TreeDataFetcherLayer,
+        validate_chain_ids::ValidateChainIdsLayer,
+        web3_api::{
+            caches::MempoolCacheLayer,
+            server::{Web3ServerLayer, Web3ServerOptionalConfig},
+            tree_api_client::TreeApiClientLayer,
+            tx_sender::{PostgresStorageCachesConfig, TxSenderLayer},
+            tx_sink::TxSinkLayer,
+        },
+    },
+    service::{ZkStackService, ZkStackServiceBuilder},
+};
+use zksync_state::RocksdbStorageOptions;
+
+use crate::{
+    config::{self, ExternalNodeConfig},
+    Component,
+};
+
+/// Builder for the external node.
+#[derive(Debug)]
+pub(crate) struct ExternalNodeBuilder {
+    node: ZkStackServiceBuilder,
+    config: ExternalNodeConfig,
+}
+
+impl ExternalNodeBuilder {
+    pub fn new(config: ExternalNodeConfig) -> Self {
+        Self {
+            node: ZkStackServiceBuilder::new(),
+            config,
+        }
+    }
+
+    fn add_sigint_handler_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(SigintHandlerLayer);
+        Ok(self)
+    }
+
+    fn add_pools_layer(mut self) -> anyhow::Result<Self> {
+        // Note: the EN config doesn't currently support specifying configuration for replicas,
+        // so we reuse the master configuration for that purpose.
+        // Settings unconditionally set to `None` are either not supported by the EN configuration layer
+        // or are not used in the context of the external node.
+        let config = PostgresConfig {
+            max_connections: Some(self.config.postgres.max_connections),
+            max_connections_master: Some(self.config.postgres.max_connections),
+            acquire_timeout_sec: None,
+            statement_timeout_sec: None,
+            long_connection_threshold_ms: None,
+            slow_query_threshold_ms: self
+                .config
+                .optional
+                .slow_query_threshold()
+                .map(|d| d.as_millis() as u64),
+            test_server_url: None,
+            test_prover_url: None,
+        };
+        let secrets = DatabaseSecrets {
+            server_url: Some(self.config.postgres.database_url()),
+            server_replica_url: Some(self.config.postgres.database_url()),
+            prover_url: None,
+        };
+        let pools_layer = PoolsLayerBuilder::empty(config, secrets)
+            .with_master(true)
+            .with_replica(true)
+            .build();
+        self.node.add_layer(pools_layer);
+        Ok(self)
+    }
+
+    fn add_postgres_metrics_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(PostgresMetricsLayer);
+        Ok(self)
+    }
+
+    fn add_main_node_client_layer(mut self) -> anyhow::Result<Self> {
+        let layer = MainNodeClientLayer::new(
+            self.config.required.main_node_url.clone(),
+            self.config.optional.main_node_rate_limit_rps,
+            self.config.required.l2_chain_id,
+        );
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_healthcheck_layer(mut self) -> anyhow::Result<Self> {
+        let healthcheck_config = HealthCheckConfig {
+            port: self.config.required.healthcheck_port,
+            slow_time_limit_ms: self
+                .config
+                .optional
+                .healthcheck_slow_time_limit()
+                .map(|d| d.as_millis() as u64),
+            hard_time_limit_ms: self
+                .config
+                .optional
+                .healthcheck_hard_time_limit()
+                .map(|d| d.as_millis() as u64),
+        };
+        self.node.add_layer(HealthCheckLayer(healthcheck_config));
+        Ok(self)
+    }
+
+    fn add_prometheus_exporter_layer(mut self) -> anyhow::Result<Self> {
+        if let Some(prom_config) = self.config.observability.prometheus() {
+            self.node.add_layer(PrometheusExporterLayer(prom_config));
+        } else {
+            tracing::info!("No configuration for prometheus exporter, skipping");
+        }
+        Ok(self)
+    }
+
+    fn add_query_eth_client_layer(mut self) -> anyhow::Result<Self> {
+        let query_eth_client_layer = QueryEthClientLayer::new(
+            self.config.required.l1_chain_id,
+            self.config.required.eth_client_url.clone(),
+        );
+        self.node.add_layer(query_eth_client_layer);
+        Ok(self)
+    }
+
+    fn add_state_keeper_layer(mut self) -> anyhow::Result<Self> {
+        // While optional bytecode compression may be disabled on the main node, there are batches where
+        // optional bytecode compression was enabled. To process these batches (and also for the case where
+        // compression will become optional on the sequencer again), EN has to allow txs without bytecode
+        // compression.
+        const OPTIONAL_BYTECODE_COMPRESSION: bool = true;
+
+        let persistence_layer = OutputHandlerLayer::new(
+            self.config
+                .remote
+                .l2_shared_bridge_addr
+                .expect("L2 shared bridge address is not set"),
+            self.config.optional.l2_block_seal_queue_capacity,
+        )
+        .with_pre_insert_txs(true) // EN requires txs to be pre-inserted.
+        .with_protective_reads_persistence_enabled(
+            self.config.optional.protective_reads_persistence_enabled,
+        );
+
+        let io_layer = ExternalIOLayer::new(self.config.required.l2_chain_id);
+
+        // We only need call traces on the external node if the `debug_` namespace is enabled.
+        let save_call_traces = self
+            .config
+            .optional
+            .api_namespaces()
+            .contains(&Namespace::Debug);
+        let main_node_batch_executor_builder_layer =
+            MainBatchExecutorLayer::new(save_call_traces, OPTIONAL_BYTECODE_COMPRESSION);
+
+        let rocksdb_options = RocksdbStorageOptions {
+            block_cache_capacity: self
+                .config
+                .experimental
+                .state_keeper_db_block_cache_capacity(),
+            max_open_files: self.config.experimental.state_keeper_db_max_open_files,
+        };
+        let state_keeper_layer = StateKeeperLayer::new(
+            self.config.required.state_cache_path.clone(),
+            rocksdb_options,
+        );
+        self.node
+            .add_layer(persistence_layer)
+            .add_layer(io_layer)
+            .add_layer(main_node_batch_executor_builder_layer)
+            .add_layer(state_keeper_layer);
+        Ok(self)
+    }
+
+    fn add_consensus_layer(mut self) -> anyhow::Result<Self> {
+        let config = self.config.consensus.clone();
+        let secrets =
+            config::read_consensus_secrets().context("config::read_consensus_secrets()")?;
+        let layer = ConsensusLayer {
+            mode: Mode::External,
+            config,
+            secrets,
+        };
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_pruning_layer(mut self) -> anyhow::Result<Self> {
+        if self.config.optional.pruning_enabled {
+            let layer = PruningLayer::new(
+                self.config.optional.pruning_removal_delay(),
+                self.config.optional.pruning_chunk_size,
+                self.config.optional.pruning_data_retention(),
+            );
+            self.node.add_layer(layer);
+        } else {
+            tracing::info!("Pruning is disabled");
+        }
+        Ok(self)
+    }
+
+    fn add_l1_batch_commitment_mode_validation_layer(mut self) -> anyhow::Result<Self> {
+        let layer = L1BatchCommitmentModeValidationLayer::new(
+            self.config.remote.diamond_proxy_addr,
+            self.config.optional.l1_batch_commit_data_generator_mode,
+        );
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_validate_chain_ids_layer(mut self) -> anyhow::Result<Self> {
+        let layer = ValidateChainIdsLayer::new(
+            self.config.required.l1_chain_id,
+            self.config.required.l2_chain_id,
+        );
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_consistency_checker_layer(mut self) -> anyhow::Result<Self> {
+        let max_batches_to_recheck = 10; // TODO (BFT-97): Make it a part of a proper EN config
+        let layer = ConsistencyCheckerLayer::new(
+            self.config.remote.diamond_proxy_addr,
+            max_batches_to_recheck,
+            self.config.optional.l1_batch_commit_data_generator_mode,
+        );
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_commitment_generator_layer(mut self) -> anyhow::Result<Self> {
+        let layer =
+            CommitmentGeneratorLayer::new(self.config.optional.l1_batch_commit_data_generator_mode)
+                .with_max_parallelism(
+                    self.config
+                        .experimental
+                        .commitment_generator_max_parallelism,
+                );
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_batch_status_updater_layer(mut self) -> anyhow::Result<Self> {
+        let layer = BatchStatusUpdaterLayer;
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_tree_data_fetcher_layer(mut self) -> anyhow::Result<Self> {
+        let layer = TreeDataFetcherLayer::new(self.config.remote.diamond_proxy_addr);
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_sync_state_updater_layer(mut self) -> anyhow::Result<Self> {
+        // This layer may be used as a fallback for EN API if API server runs without the core component.
+        self.node.add_layer(SyncStateUpdaterLayer);
+        Ok(self)
+    }
+
+    fn add_metadata_calculator_layer(mut self, with_tree_api: bool) -> anyhow::Result<Self> {
+        let metadata_calculator_config = MetadataCalculatorConfig {
+            db_path: self.config.required.merkle_tree_path.clone(),
+            max_open_files: self.config.optional.merkle_tree_max_open_files,
+            mode: MerkleTreeMode::Lightweight,
+            delay_interval: self.config.optional.merkle_tree_processing_delay(),
+            max_l1_batches_per_iter: self.config.optional.merkle_tree_max_l1_batches_per_iter,
+            multi_get_chunk_size: self.config.optional.merkle_tree_multi_get_chunk_size,
+            block_cache_capacity: self.config.optional.merkle_tree_block_cache_size(),
+            include_indices_and_filters_in_block_cache: self
+                .config
+                .optional
+                .merkle_tree_include_indices_and_filters_in_block_cache,
+            memtable_capacity: self.config.optional.merkle_tree_memtable_capacity(),
+            stalled_writes_timeout: self.config.optional.merkle_tree_stalled_writes_timeout(),
+            sealed_batches_have_protective_reads: self
+                .config
+                .optional
+                .protective_reads_persistence_enabled,
+            recovery: MetadataCalculatorRecoveryConfig {
+                desired_chunk_size: self.config.experimental.snapshots_recovery_tree_chunk_size,
+                parallel_persistence_buffer: self
+                    .config
+                    .experimental
+                    .snapshots_recovery_tree_parallel_persistence_buffer,
+            },
+        };
+
+        // Configure basic tree layer.
+        let mut layer = MetadataCalculatorLayer::new(metadata_calculator_config);
+
+        // Add tree API if needed.
+        if with_tree_api {
+            let merkle_tree_api_config = MerkleTreeApiConfig {
+                port: self
+                    .config
+                    .tree_component
+                    .api_port
+                    .context("should contain tree api port")?,
+            };
+            layer = layer.with_tree_api_config(merkle_tree_api_config);
+        }
+
+        // Add tree pruning if needed.
+        if self.config.optional.pruning_enabled {
+            layer = layer.with_pruning_config(self.config.optional.pruning_removal_delay());
+        }
+
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_tx_sender_layer(mut self) -> anyhow::Result<Self> {
+        let postgres_storage_config = PostgresStorageCachesConfig {
+            factory_deps_cache_size: self.config.optional.factory_deps_cache_size() as u64,
+            initial_writes_cache_size: self.config.optional.initial_writes_cache_size() as u64,
+            latest_values_cache_size: self.config.optional.latest_values_cache_size() as u64,
+        };
+        let max_vm_concurrency = self.config.optional.vm_concurrency_limit;
+        let api_contracts = ApiContracts::load_from_disk_blocking(); // TODO (BFT-138): Allow to dynamically reload API contracts;
+        let tx_sender_layer = TxSenderLayer::new(
+            (&self.config).into(),
+            postgres_storage_config,
+            max_vm_concurrency,
+            api_contracts,
+        )
+        .with_whitelisted_tokens_for_aa_cache(true);
+
+        self.node.add_layer(TxSinkLayer::ProxySink);
+        self.node.add_layer(tx_sender_layer);
+        Ok(self)
+    }
+
+    fn add_mempool_cache_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(MempoolCacheLayer::new(
+            self.config.optional.mempool_cache_size,
+            self.config.optional.mempool_cache_update_interval(),
+        ));
+        Ok(self)
+    }
+
+    fn add_tree_api_client_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(TreeApiClientLayer::http(
+            self.config.api_component.tree_api_remote_url.clone(),
+        ));
+        Ok(self)
+    }
+
+    fn add_main_node_fee_params_fetcher_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(MainNodeFeeParamsFetcherLayer);
+        Ok(self)
+    }
+
+    fn web3_api_optional_config(&self) -> Web3ServerOptionalConfig {
+        // The refresh interval should be several times lower than the pruning removal delay, so that
+        // soft-pruning will timely propagate to the API server.
+        let pruning_info_refresh_interval = self.config.optional.pruning_removal_delay() / 5;
+
+        Web3ServerOptionalConfig {
+            namespaces: Some(self.config.optional.api_namespaces()),
+            filters_limit: Some(self.config.optional.filters_limit),
+            subscriptions_limit: Some(self.config.optional.filters_limit),
+            batch_request_size_limit: Some(self.config.optional.max_batch_request_size),
+            response_body_size_limit: Some(self.config.optional.max_response_body_size()),
+            with_extended_tracing: self.config.optional.extended_rpc_tracing,
+            pruning_info_refresh_interval: Some(pruning_info_refresh_interval),
+            websocket_requests_per_minute_limit: None, // To be set by WS server layer method if required.
+            replication_lag_limit: None,               // TODO: Support replication lag limit
+        }
+    }
+
+    fn add_http_web3_api_layer(mut self) -> anyhow::Result<Self> {
+        let optional_config = self.web3_api_optional_config();
+        self.node.add_layer(Web3ServerLayer::http(
+            self.config.required.http_port,
+            (&self.config).into(),
+            optional_config,
+        ));
+
+        Ok(self)
+    }
+
+    fn add_ws_web3_api_layer(mut self) -> anyhow::Result<Self> {
+        // TODO: Support websocket requests per minute limit
+        let optional_config = self.web3_api_optional_config();
+        self.node.add_layer(Web3ServerLayer::ws(
+            self.config.required.ws_port,
+            (&self.config).into(),
+            optional_config,
+        ));
+
+        Ok(self)
+    }
+
+    pub fn build(mut self, mut components: Vec<Component>) -> anyhow::Result<ZkStackService> {
+        // Add "base" layers
+        self = self
+            .add_sigint_handler_layer()?
+            .add_healthcheck_layer()?
+            .add_prometheus_exporter_layer()?
+            .add_pools_layer()?
+            .add_main_node_client_layer()?
+            .add_query_eth_client_layer()?;
+
+        // Add preconditions for all the components.
+        self = self
+            .add_l1_batch_commitment_mode_validation_layer()?
+            .add_validate_chain_ids_layer()?;
+
+        // Sort the components, so that the components they may depend on each other are added in the correct order.
+        components.sort_unstable_by_key(|component| match component {
+            // API consumes the resources provided by other layers (multiple ones), so it has to come the last.
+            Component::HttpApi | Component::WsApi => 1,
+            // Default priority.
+            _ => 0,
+        });
+
+        for component in &components {
+            match component {
+                Component::HttpApi => {
+                    self = self
+                        .add_sync_state_updater_layer()?
+                        .add_mempool_cache_layer()?
+                        .add_tree_api_client_layer()?
+                        .add_main_node_fee_params_fetcher_layer()?
+                        .add_tx_sender_layer()?
+                        .add_http_web3_api_layer()?;
+                }
+                Component::WsApi => {
+                    self = self
+                        .add_sync_state_updater_layer()?
+                        .add_mempool_cache_layer()?
+                        .add_tree_api_client_layer()?
+                        .add_main_node_fee_params_fetcher_layer()?
+                        .add_tx_sender_layer()?
+                        .add_ws_web3_api_layer()?;
+                }
+                Component::Tree => {
+                    // Right now, distributed mode for EN is not fully supported, e.g. there are some
+                    // issues with reorg detection and snapshot recovery.
+                    // So we require the core component to be present, e.g. forcing the EN to run in a monolithic mode.
+                    anyhow::ensure!(
+                        components.contains(&Component::Core),
+                        "Tree must run on the same machine as Core"
+                    );
+                    let with_tree_api = components.contains(&Component::TreeApi);
+                    self = self.add_metadata_calculator_layer(with_tree_api)?;
+                }
+                Component::TreeApi => {
+                    anyhow::ensure!(
+                        components.contains(&Component::Tree),
+                        "Merkle tree API cannot be started without a tree component"
+                    );
+                    // Do nothing, will be handled by the `Tree` component.
+                }
+                Component::TreeFetcher => {
+                    self = self.add_tree_data_fetcher_layer()?;
+                }
+                Component::Core => {
+                    // Core is a singleton & mandatory component,
+                    // so until we have a dedicated component for "auxiliary" tasks,
+                    // it's responsible for things like metrics.
+                    self = self.add_postgres_metrics_layer()?;
+
+                    // Main tasks
+                    self = self
+                        .add_state_keeper_layer()?
+                        .add_consensus_layer()?
+                        .add_pruning_layer()?
+                        .add_consistency_checker_layer()?
+                        .add_commitment_generator_layer()?
+                        .add_batch_status_updater_layer()?;
+                }
+            }
+        }
+
+        Ok(self.node.build()?)
+    }
+}
diff --git a/core/bin/external_node/src/tests.rs b/core/bin/external_node/src/tests.rs
index a89621b116c7..6d3e8f278f32 100644
--- a/core/bin/external_node/src/tests.rs
+++ b/core/bin/external_node/src/tests.rs
@@ -2,11 +2,17 @@
 
 use assert_matches::assert_matches;
 use test_casing::test_casing;
-use zksync_basic_types::protocol_version::ProtocolVersionId;
+use zksync_dal::CoreDal;
 use zksync_eth_client::clients::MockEthereum;
 use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
-use zksync_types::{api, ethabi, fee_model::FeeParams, L1BatchNumber, L2BlockNumber, H256, U64};
-use zksync_web3_decl::client::{BoxedL2Client, MockL2Client};
+use zksync_types::{
+    api, ethabi, fee_model::FeeParams, Address, L1BatchNumber, L2BlockNumber, ProtocolVersionId,
+    H256, U64,
+};
+use zksync_web3_decl::{
+    client::{MockClient, L1},
+    jsonrpsee::core::ClientError,
+};
 
 use super::*;
 
@@ -28,6 +34,7 @@ fn block_details_base(hash: H256) -> api::BlockDetailsBase {
         executed_at: None,
         l1_gas_price: 0,
         l2_fair_gas_price: 0,
+        fair_pubdata_price: None,
         base_system_contracts_hashes: Default::default(),
     }
 }
@@ -94,11 +101,39 @@ fn expected_health_components(components: &ComponentsToRun) -> Vec<&'static str>
     output
 }
 
+fn mock_eth_client(diamond_proxy_addr: Address) -> MockClient<L1> {
+    let mock = MockEthereum::builder().with_call_handler(move |call, _| {
+        tracing::info!("L1 call: {call:?}");
+        if call.to == Some(diamond_proxy_addr) {
+            let packed_semver = ProtocolVersionId::latest().into_packed_semver_with_patch(0);
+            let call_signature = &call.data.as_ref().unwrap().0[..4];
+            let contract = zksync_contracts::hyperchain_contract();
+            let pricing_mode_sig = contract
+                .function("getPubdataPricingMode")
+                .unwrap()
+                .short_signature();
+            let protocol_version_sig = contract
+                .function("getProtocolVersion")
+                .unwrap()
+                .short_signature();
+            match call_signature {
+                sig if sig == pricing_mode_sig => {
+                    return ethabi::Token::Uint(0.into()); // "rollup" mode encoding
+                }
+                sig if sig == protocol_version_sig => return ethabi::Token::Uint(packed_semver),
+                _ => { /* unknown call; panic below */ }
+            }
+        }
+        panic!("Unexpected L1 call: {call:?}");
+    });
+    mock.build().into_client()
+}
+
 #[test_casing(5, ["all", "core", "api", "tree", "tree,tree_api"])]
 #[tokio::test]
 #[tracing::instrument] // Add args to the test logs
 async fn external_node_basics(components_str: &'static str) {
-    let _guard = vlog::ObservabilityBuilder::new().build(); // Enable logging to simplify debugging
+    let _guard = zksync_vlog::ObservabilityBuilder::new().build(); // Enable logging to simplify debugging
     let temp_dir = tempfile::TempDir::new().unwrap();
 
     // Simplest case to mock: the EN already has a genesis L1 batch / L2 block, and it's the only L1 batch / L2 block
@@ -120,9 +155,13 @@ async fn external_node_basics(components_str: &'static str) {
     let components: ComponentsToRun = components_str.parse().unwrap();
     let expected_health_components = expected_health_components(&components);
     let opt = Cli {
-        revert_pending_l1_batch: false,
         enable_consensus: false,
         components,
+        config_path: None,
+        secrets_path: None,
+        external_node_config_path: None,
+        consensus_path: None,
+        use_node_framework: false,
     };
     let mut config = ExternalNodeConfig::mock(&temp_dir, &connection_pool);
     if opt.components.0.contains(&Component::TreeApi) {
@@ -131,67 +170,33 @@ async fn external_node_basics(components_str: &'static str) {
 
     let diamond_proxy_addr = config.remote.diamond_proxy_addr;
 
-    let l2_client = MockL2Client::new(move |method, params| {
-        tracing::info!("Called L2 client: {method}({params:?})");
-        match method {
-            "eth_chainId" => Ok(serde_json::json!(U64::from(270))),
-            "zks_L1ChainId" => Ok(serde_json::json!(U64::from(9))),
-
-            "zks_L1BatchNumber" => Ok(serde_json::json!("0x0")),
-            "zks_getL1BatchDetails" => {
-                let (number,): (L1BatchNumber,) = serde_json::from_value(params)?;
-                assert_eq!(number, L1BatchNumber(0));
-                Ok(serde_json::to_value(api::L1BatchDetails {
-                    number: L1BatchNumber(0),
-                    base: block_details_base(genesis_params.root_hash),
-                })?)
-            }
-            "eth_blockNumber" => Ok(serde_json::json!("0x0")),
-            "eth_getBlockByNumber" => {
-                let (number, _): (api::BlockNumber, bool) = serde_json::from_value(params)?;
+    let l2_client = MockClient::builder(L2::default())
+        .method("eth_chainId", || Ok(U64::from(270)))
+        .method("zks_L1ChainId", || Ok(U64::from(9)))
+        .method("zks_L1BatchNumber", || Ok(U64::from(0)))
+        .method("zks_getL1BatchDetails", move |number: L1BatchNumber| {
+            assert_eq!(number, L1BatchNumber(0));
+            Ok(api::L1BatchDetails {
+                number: L1BatchNumber(0),
+                base: block_details_base(genesis_params.root_hash),
+            })
+        })
+        .method("eth_blockNumber", || Ok(U64::from(0)))
+        .method(
+            "eth_getBlockByNumber",
+            move |number: api::BlockNumber, _with_txs: bool| {
                 assert_eq!(number, api::BlockNumber::Number(0.into()));
-                Ok(serde_json::to_value(
-                    api::Block::<api::TransactionVariant> {
-                        hash: genesis_l2_block.hash,
-                        ..api::Block::default()
-                    },
-                )?)
-            }
-
-            "zks_getFeeParams" => Ok(serde_json::to_value(FeeParams::sensible_v1_default())?),
-            "en_whitelistedTokensForAA" => Ok(serde_json::json!([])),
-
-            _ => panic!("Unexpected call: {method}({params:?})"),
-        }
-    });
-    let l2_client = BoxedL2Client::new(l2_client);
-
-    let eth_client = MockEthereum::default().with_call_handler(move |call, _| {
-        tracing::info!("L1 call: {call:?}");
-        if call.to == Some(diamond_proxy_addr) {
-            let call_signature = &call.data.as_ref().unwrap().0[..4];
-            let contract = zksync_contracts::hyperchain_contract();
-            let pricing_mode_sig = contract
-                .function("getPubdataPricingMode")
-                .unwrap()
-                .short_signature();
-            let protocol_version_sig = contract
-                .function("getProtocolVersion")
-                .unwrap()
-                .short_signature();
-            match call_signature {
-                sig if sig == pricing_mode_sig => {
-                    return ethabi::Token::Uint(0.into()); // "rollup" mode encoding
-                }
-                sig if sig == protocol_version_sig => {
-                    return ethabi::Token::Uint((ProtocolVersionId::latest() as u16).into())
-                }
-                _ => { /* unknown call; panic below */ }
-            }
-        }
-        panic!("Unexpected L1 call: {call:?}");
-    });
-    let eth_client = Box::new(eth_client);
+                Ok(api::Block::<api::TransactionVariant> {
+                    hash: genesis_l2_block.hash,
+                    ..api::Block::default()
+                })
+            },
+        )
+        .method("zks_getFeeParams", || Ok(FeeParams::sensible_v1_default()))
+        .method("en_whitelistedTokensForAA", || Ok([] as [Address; 0]))
+        .build();
+    let l2_client = Box::new(l2_client);
+    let eth_client = Box::new(mock_eth_client(diamond_proxy_addr));
 
     let (env, env_handles) = TestEnvironment::new();
     let node_handle = tokio::spawn(async move {
@@ -248,3 +253,69 @@ async fn external_node_basics(components_str: &'static str) {
         assert_matches!(component_health.status(), HealthStatus::ShutDown);
     }
 }
+
+#[tokio::test]
+async fn node_reacts_to_stop_signal_during_initial_reorg_detection() {
+    let _guard = zksync_vlog::ObservabilityBuilder::new().build(); // Enable logging to simplify debugging
+    let temp_dir = tempfile::TempDir::new().unwrap();
+
+    let connection_pool = ConnectionPool::test_pool().await;
+    let singleton_pool_builder = ConnectionPool::singleton(connection_pool.database_url().clone());
+    let mut storage = connection_pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+    drop(storage);
+
+    let opt = Cli {
+        enable_consensus: false,
+        components: "core".parse().unwrap(),
+        config_path: None,
+        secrets_path: None,
+        external_node_config_path: None,
+        consensus_path: None,
+        use_node_framework: false,
+    };
+    let mut config = ExternalNodeConfig::mock(&temp_dir, &connection_pool);
+    if opt.components.0.contains(&Component::TreeApi) {
+        config.tree_component.api_port = Some(0);
+    }
+
+    let l2_client = MockClient::builder(L2::default())
+        .method("eth_chainId", || Ok(U64::from(270)))
+        .method("zks_L1ChainId", || Ok(U64::from(9)))
+        .method("zks_L1BatchNumber", || {
+            Err::<(), _>(ClientError::RequestTimeout)
+        })
+        .method("eth_blockNumber", || {
+            Err::<(), _>(ClientError::RequestTimeout)
+        })
+        .method("zks_getFeeParams", || Ok(FeeParams::sensible_v1_default()))
+        .method("en_whitelistedTokensForAA", || Ok([] as [Address; 0]))
+        .build();
+    let l2_client = Box::new(l2_client);
+    let diamond_proxy_addr = config.remote.diamond_proxy_addr;
+    let eth_client = Box::new(mock_eth_client(diamond_proxy_addr));
+
+    let (env, env_handles) = TestEnvironment::new();
+    let mut node_handle = tokio::spawn(async move {
+        run_node(
+            env,
+            &opt,
+            &config,
+            connection_pool,
+            singleton_pool_builder,
+            l2_client,
+            eth_client,
+        )
+        .await
+    });
+
+    // Check that the node doesn't stop on its own.
+    let timeout_result = tokio::time::timeout(Duration::from_millis(50), &mut node_handle).await;
+    assert_matches!(timeout_result, Err(tokio::time::error::Elapsed { .. }));
+
+    // Send a stop signal and check that the node reacts to it.
+    env_handles.sigint_sender.send(()).unwrap();
+    node_handle.await.unwrap().unwrap();
+}
diff --git a/core/bin/external_node/src/version_sync_task.rs b/core/bin/external_node/src/version_sync_task.rs
deleted file mode 100644
index 01926cad373b..000000000000
--- a/core/bin/external_node/src/version_sync_task.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use std::cmp::Ordering;
-
-use anyhow::Context;
-use zksync_basic_types::{L1BatchNumber, L2BlockNumber};
-use zksync_dal::{ConnectionPool, Core, CoreDal};
-use zksync_types::ProtocolVersionId;
-use zksync_web3_decl::{
-    client::BoxedL2Client,
-    namespaces::{EnNamespaceClient, ZksNamespaceClient},
-};
-
-pub async fn get_l1_batch_remote_protocol_version(
-    main_node_client: &BoxedL2Client,
-    l1_batch_number: L1BatchNumber,
-) -> anyhow::Result<Option<ProtocolVersionId>> {
-    let Some((miniblock, _)) = main_node_client.get_l2_block_range(l1_batch_number).await? else {
-        return Ok(None);
-    };
-    let sync_block = main_node_client
-        .sync_l2_block(L2BlockNumber(miniblock.as_u32()), false)
-        .await?;
-    Ok(sync_block.map(|b| b.protocol_version))
-}
-
-// Synchronizes protocol version in `l1_batches` and `miniblocks` tables between EN and main node.
-pub async fn sync_versions(
-    connection_pool: ConnectionPool<Core>,
-    main_node_client: BoxedL2Client,
-) -> anyhow::Result<()> {
-    tracing::info!("Starting syncing protocol version of blocks");
-
-    let mut connection = connection_pool.connection().await?;
-
-    // Load the first local batch number with version 22.
-    let Some(local_first_v22_l1_batch) = connection
-        .blocks_dal()
-        .get_first_l1_batch_number_for_version(ProtocolVersionId::Version22)
-        .await?
-    else {
-        return Ok(());
-    };
-    tracing::info!("First local v22 batch is #{local_first_v22_l1_batch}");
-
-    // Find the first remote batch with version 22, assuming it's less than or equal than local one.
-    // Uses binary search.
-    let mut left_bound = L1BatchNumber(0);
-    let mut right_bound = local_first_v22_l1_batch;
-    let snapshot_recovery = connection
-        .snapshot_recovery_dal()
-        .get_applied_snapshot_status()
-        .await?;
-    if let Some(snapshot_recovery) = snapshot_recovery {
-        left_bound = L1BatchNumber(snapshot_recovery.l1_batch_number.0 + 1)
-    }
-
-    let right_bound_remote_version =
-        get_l1_batch_remote_protocol_version(&main_node_client, right_bound).await?;
-    if right_bound_remote_version != Some(ProtocolVersionId::Version22) {
-        anyhow::bail!("Remote protocol versions should be v22 for the first local v22 batch, got {right_bound_remote_version:?}");
-    }
-
-    while left_bound < right_bound {
-        let mid_batch = L1BatchNumber((left_bound.0 + right_bound.0) / 2);
-        let (mid_miniblock, _) = connection
-            .blocks_dal()
-            .get_l2_block_range_of_l1_batch(mid_batch)
-            .await?
-            .with_context(|| {
-                format!("Postgres is inconsistent: missing miniblocks for L1 batch #{mid_batch}")
-            })?;
-        let mid_protocol_version = main_node_client
-            .sync_l2_block(mid_miniblock, false)
-            .await?
-            .with_context(|| format!("Main node missing data about miniblock #{mid_miniblock}"))?
-            .protocol_version;
-
-        match mid_protocol_version.cmp(&ProtocolVersionId::Version22) {
-            Ordering::Less => {
-                left_bound = mid_batch + 1;
-            }
-            Ordering::Equal => {
-                right_bound = mid_batch;
-            }
-            Ordering::Greater => {
-                anyhow::bail!("Unexpected remote protocol version: {mid_protocol_version:?} for miniblock #{mid_miniblock}");
-            }
-        }
-    }
-
-    let remote_first_v22_l1_batch = left_bound;
-    let (remote_first_v22_miniblock, _) = connection
-        .blocks_dal()
-        .get_l2_block_range_of_l1_batch(remote_first_v22_l1_batch)
-        .await?
-        .with_context(|| {
-            format!("Postgres is inconsistent: missing miniblocks for L1 batch #{remote_first_v22_l1_batch}")
-        })?;
-
-    let mut transaction = connection.start_transaction().await?;
-
-    tracing::info!(
-        "Setting version 22 for batches {remote_first_v22_l1_batch}..={local_first_v22_l1_batch}"
-    );
-    transaction
-        .blocks_dal()
-        .reset_protocol_version_for_l1_batches(
-            remote_first_v22_l1_batch..=local_first_v22_l1_batch,
-            ProtocolVersionId::Version22,
-        )
-        .await?;
-
-    let (local_first_v22_miniblock, _) = transaction
-        .blocks_dal()
-        .get_l2_block_range_of_l1_batch(local_first_v22_l1_batch)
-        .await?
-        .with_context(|| {
-            format!("Postgres is inconsistent: missing miniblocks for L1 batch #{local_first_v22_l1_batch}")
-        })?;
-
-    tracing::info!("Setting version 22 for miniblocks {remote_first_v22_miniblock}..={local_first_v22_miniblock}");
-    transaction
-        .blocks_dal()
-        .reset_protocol_version_for_l2_blocks(
-            remote_first_v22_miniblock..=local_first_v22_miniblock,
-            ProtocolVersionId::Version22,
-        )
-        .await?;
-
-    transaction.commit().await?;
-
-    Ok(())
-}
diff --git a/core/bin/genesis_generator/Cargo.toml b/core/bin/genesis_generator/Cargo.toml
index 8b91505abf09..e6ac400c0ff0 100644
--- a/core/bin/genesis_generator/Cargo.toml
+++ b/core/bin/genesis_generator/Cargo.toml
@@ -17,7 +17,7 @@ zksync_env_config.workspace = true
 zksync_protobuf_config.workspace = true
 zksync_utils.workspace = true
 zksync_types.workspace = true
-zksync_core.workspace = true
+zksync_core_leftovers.workspace = true
 zksync_dal.workspace = true
 zksync_contracts.workspace = true
 zksync_protobuf.workspace = true
diff --git a/core/bin/genesis_generator/src/main.rs b/core/bin/genesis_generator/src/main.rs
index dfad2bd13333..abdd6091ed73 100644
--- a/core/bin/genesis_generator/src/main.rs
+++ b/core/bin/genesis_generator/src/main.rs
@@ -7,9 +7,9 @@ use std::fs;
 use anyhow::Context as _;
 use clap::Parser;
 use serde_yaml::Serializer;
-use zksync_config::{GenesisConfig, PostgresConfig};
+use zksync_config::{configs::DatabaseSecrets, GenesisConfig};
 use zksync_contracts::BaseSystemContracts;
-use zksync_core::temp_config_store::decode_yaml_repr;
+use zksync_core_leftovers::temp_config_store::decode_yaml_repr;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_env_config::FromEnv;
 use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
@@ -18,7 +18,9 @@ use zksync_protobuf::{
     ProtoRepr,
 };
 use zksync_protobuf_config::proto::genesis::Genesis;
-use zksync_types::{url::SensitiveUrl, ProtocolVersionId};
+use zksync_types::{
+    protocol_version::ProtocolSemanticVersion, url::SensitiveUrl, ProtocolVersionId,
+};
 
 const DEFAULT_GENESIS_FILE_PATH: &str = "./etc/env/file_based/genesis.yaml";
 
@@ -35,24 +37,21 @@ struct Cli {
 async fn main() -> anyhow::Result<()> {
     let opt = Cli::parse();
 
-    let postgres_config = match opt.config_path {
-        None => PostgresConfig::from_env()?,
+    let database_secrets = match opt.config_path {
+        None => DatabaseSecrets::from_env()?,
         Some(path) => {
             let yaml =
                 std::fs::read_to_string(&path).with_context(|| path.display().to_string())?;
-            let config =
-                decode_yaml_repr::<zksync_protobuf_config::proto::general::GeneralConfig>(&yaml)
-                    .context("failed decoding general YAML config")?;
-            config
-                .postgres_config
-                .context("Postgres config must exist")?
+            let config = decode_yaml_repr::<zksync_protobuf_config::proto::secrets::Secrets>(&yaml)
+                .context("failed decoding general YAML config")?;
+            config.database.context("Database secrets must exist")?
         }
     };
 
     let yaml = std::fs::read_to_string(DEFAULT_GENESIS_FILE_PATH)
         .with_context(|| DEFAULT_GENESIS_FILE_PATH.to_string())?;
     let original_genesis = decode_yaml_repr::<Genesis>(&yaml)?;
-    let db_url = postgres_config.master_url()?;
+    let db_url = database_secrets.master_url()?;
     let new_genesis = generate_new_config(db_url, original_genesis.clone()).await?;
     if opt.check {
         assert_eq!(&original_genesis, &new_genesis);
@@ -83,7 +82,10 @@ async fn generate_new_config(
 
     let base_system_contracts = BaseSystemContracts::load_from_disk().hashes();
     let mut updated_genesis = GenesisConfig {
-        protocol_version: Some(ProtocolVersionId::latest() as u16),
+        protocol_version: Some(ProtocolSemanticVersion {
+            minor: ProtocolVersionId::latest(),
+            patch: 0.into(), // genesis generator proposes some new valid config, so patch 0 works here.
+        }),
         genesis_root_hash: None,
         rollup_last_leaf_index: None,
         genesis_commitment: None,
diff --git a/core/bin/merkle_tree_consistency_checker/Cargo.toml b/core/bin/merkle_tree_consistency_checker/Cargo.toml
index 75fa4fc10be1..9d13a2b0d199 100644
--- a/core/bin/merkle_tree_consistency_checker/Cargo.toml
+++ b/core/bin/merkle_tree_consistency_checker/Cargo.toml
@@ -16,7 +16,7 @@ zksync_env_config.workspace = true
 zksync_merkle_tree.workspace = true
 zksync_types.workspace = true
 zksync_storage.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
diff --git a/core/bin/merkle_tree_consistency_checker/src/main.rs b/core/bin/merkle_tree_consistency_checker/src/main.rs
index 1f3dc6df69c5..f8584653681f 100644
--- a/core/bin/merkle_tree_consistency_checker/src/main.rs
+++ b/core/bin/merkle_tree_consistency_checker/src/main.rs
@@ -23,12 +23,14 @@ struct Cli {
 }
 
 impl Cli {
-    fn run(self, config: &DBConfig) {
+    fn run(self, config: &DBConfig) -> anyhow::Result<()> {
         let db_path = &config.merkle_tree.path;
         tracing::info!("Verifying consistency of Merkle tree at {db_path}");
         let start = Instant::now();
-        let db = RocksDB::new(Path::new(db_path)).unwrap();
-        let tree = ZkSyncTree::new_lightweight(db.into());
+        let db =
+            RocksDB::new(Path::new(db_path)).context("failed initializing Merkle tree RocksDB")?;
+        let tree =
+            ZkSyncTree::new_lightweight(db.into()).context("cannot initialize Merkle tree")?;
 
         let l1_batch_number = if let Some(number) = self.l1_batch {
             L1BatchNumber(number)
@@ -36,25 +38,27 @@ impl Cli {
             let next_number = tree.next_l1_batch_number();
             if next_number == L1BatchNumber(0) {
                 tracing::info!("Merkle tree is empty, skipping");
-                return;
+                return Ok(());
             }
             next_number - 1
         };
 
         tracing::info!("L1 batch number to check: {l1_batch_number}");
-        tree.verify_consistency(l1_batch_number);
+        tree.verify_consistency(l1_batch_number)
+            .context("Merkle tree is inconsistent")?;
         tracing::info!("Merkle tree verified in {:?}", start.elapsed());
+        Ok(())
     }
 }
 
 fn main() -> anyhow::Result<()> {
     let observability_config =
         ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(sentry_url) = observability_config.sentry_url {
         builder = builder
             .with_sentry_url(&sentry_url)
@@ -64,6 +68,5 @@ fn main() -> anyhow::Result<()> {
     let _guard = builder.build();
 
     let db_config = DBConfig::from_env().context("DBConfig::from_env()")?;
-    Cli::parse().run(&db_config);
-    Ok(())
+    Cli::parse().run(&db_config)
 }
diff --git a/core/bin/snapshots_creator/Cargo.toml b/core/bin/snapshots_creator/Cargo.toml
index 4fe88a64db49..1c6f6ceeaf28 100644
--- a/core/bin/snapshots_creator/Cargo.toml
+++ b/core/bin/snapshots_creator/Cargo.toml
@@ -12,13 +12,12 @@ publish = false
 
 [dependencies]
 vise.workspace = true
-prometheus_exporter.workspace = true
 zksync_config.workspace = true
 zksync_dal.workspace = true
 zksync_env_config.workspace = true
 zksync_types.workspace = true
 zksync_object_store.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 
 anyhow.workspace = true
 tokio = { workspace = true, features = ["full"] }
diff --git a/core/bin/snapshots_creator/README.md b/core/bin/snapshots_creator/README.md
index 481e01551d5a..26ebbb6d652a 100644
--- a/core/bin/snapshots_creator/README.md
+++ b/core/bin/snapshots_creator/README.md
@@ -44,16 +44,16 @@ filesystem, or Google Cloud Storage (GCS). Beware that for end-to-end testing of
 the main node configuration must be reflected in the external node configuration.
 
 Creating a snapshot is a part of the [snapshot recovery integration test]. You can run the test using
-`yarn snapshot-recovery-test snapshot-recovery-test`. It requires the main node to be launched with a command like
+`yarn recovery-test snapshot-recovery-test`. It requires the main node to be launched with a command like
 `zk server --components api,tree,eth,state_keeper,commitment_generator`.
 
 ## Snapshots format
 
 Each snapshot consists of three types of data (see [`snapshots.rs`] for exact definitions):
 
-- **Header:** Includes basic information, such as the miniblock / L1 batch of the snapshot, miniblock / L1 batch
-  timestamps, miniblock hash and L1 batch root hash. Returned by the methods in the `snapshots` namespace of the
-  JSON-RPC API of the main node.
+- **Header:** Includes basic information, such as the L2 block / L1 batch of the snapshot, L2 block / L1 batch
+  timestamps, L2 block hash and L1 batch root hash. Returned by the methods in the `snapshots` namespace of the JSON-RPC
+  API of the main node.
 - **Storage log chunks:** Latest values for all VM storage slots ever written to at the time the snapshot is made.
   Besides key–value pairs, each storage log record also contains the L1 batch number of its initial write and its
   enumeration index; both are used to restore the contents of the `initial_writes` table. Chunking storage logs is
@@ -64,6 +64,16 @@ Each snapshot consists of three types of data (see [`snapshots.rs`] for exact de
 - **Factory dependencies:** All bytecodes deployed on L2 at the time the snapshot is made. Stored as a single gzipped
   Protobuf message in an object store.
 
+### Versioning
+
+There are currently 2 versions of the snapshot format which differ in how keys are mentioned in storage logs.
+
+- Version 0 includes key preimages (EVM-compatible keys), i.e. address / contract slot tuples.
+- Version 1 includes only hashed keys as used in Era ZKP circuits and in the Merkle tree. Besides reducing the snapshot
+  size (with the change, keys occupy 32 bytes instead of 52), this allows to unify snapshot recovery with recovery from
+  L1 data. Having only hashed keys for snapshot storage logs is safe; key preimages are only required for a couple of
+  components to sort keys in a batch, but these cases only require preimages for L1 batches locally executed on a node.
+
 [`snapshots.rs`]: ../../lib/types/src/snapshots.rs
 [object store]: ../../lib/object_store
-[snapshot recovery integration test]: ../../tests/snapshot-recovery-test/tests/snapshot-recovery.test.ts
+[snapshot recovery integration test]: ../../tests/recovery-test/tests/snapshot-recovery.test.ts
diff --git a/core/bin/snapshots_creator/src/creator.rs b/core/bin/snapshots_creator/src/creator.rs
index 597f6168b93a..18212a7d2055 100644
--- a/core/bin/snapshots_creator/src/creator.rs
+++ b/core/bin/snapshots_creator/src/creator.rs
@@ -1,16 +1,17 @@
 //! [`SnapshotCreator`] and tightly related types.
 
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
 
 use anyhow::Context as _;
 use tokio::sync::Semaphore;
 use zksync_config::SnapshotsCreatorConfig;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal, DalResult};
-use zksync_object_store::ObjectStore;
+use zksync_object_store::{ObjectStore, StoredObject};
 use zksync_types::{
     snapshots::{
         uniform_hashed_keys_chunk, SnapshotFactoryDependencies, SnapshotFactoryDependency,
-        SnapshotMetadata, SnapshotStorageLogsChunk, SnapshotStorageLogsStorageKey, SnapshotVersion,
+        SnapshotMetadata, SnapshotStorageLog, SnapshotStorageLogsChunk,
+        SnapshotStorageLogsStorageKey, SnapshotVersion,
     },
     L1BatchNumber, L2BlockNumber,
 };
@@ -22,6 +23,7 @@ use crate::tests::HandleEvent;
 /// Encapsulates progress of creating a particular storage snapshot.
 #[derive(Debug)]
 struct SnapshotProgress {
+    version: SnapshotVersion,
     l1_batch_number: L1BatchNumber,
     /// `true` if the snapshot is new (i.e., its progress is not recovered from Postgres).
     is_new_snapshot: bool,
@@ -30,8 +32,9 @@ struct SnapshotProgress {
 }
 
 impl SnapshotProgress {
-    fn new(l1_batch_number: L1BatchNumber, chunk_count: u64) -> Self {
+    fn new(version: SnapshotVersion, l1_batch_number: L1BatchNumber, chunk_count: u64) -> Self {
         Self {
+            version,
             l1_batch_number,
             is_new_snapshot: true,
             chunk_count,
@@ -48,6 +51,7 @@ impl SnapshotProgress {
             .collect();
 
         Self {
+            version: snapshot.version,
             l1_batch_number: snapshot.l1_batch_number,
             is_new_snapshot: false,
             chunk_count: snapshot.storage_logs_filepaths.len() as u64,
@@ -76,11 +80,13 @@ impl SnapshotCreator {
     async fn process_storage_logs_single_chunk(
         &self,
         semaphore: &Semaphore,
+        progress: &SnapshotProgress,
         l2_block_number: L2BlockNumber,
-        l1_batch_number: L1BatchNumber,
         chunk_id: u64,
-        chunk_count: u64,
     ) -> anyhow::Result<()> {
+        let chunk_count = progress.chunk_count;
+        let l1_batch_number = progress.l1_batch_number;
+
         let _permit = semaphore.acquire().await?;
         #[cfg(test)]
         if self.event_listener.on_chunk_started().should_exit() {
@@ -92,35 +98,45 @@ impl SnapshotCreator {
 
         let latency =
             METRICS.storage_logs_processing_duration[&StorageChunkStage::LoadFromPostgres].start();
-        let logs = conn
-            .snapshots_creator_dal()
-            .get_storage_logs_chunk(l2_block_number, l1_batch_number, hashed_keys_range)
-            .await
-            .context("Error fetching storage logs count")?;
-        drop(conn);
-        let latency = latency.observe();
-        tracing::info!(
-            "Loaded chunk {chunk_id} ({} logs) from Postgres in {latency:?}",
-            logs.len()
-        );
-
-        let latency =
-            METRICS.storage_logs_processing_duration[&StorageChunkStage::SaveToGcs].start();
-        let storage_logs_chunk = SnapshotStorageLogsChunk { storage_logs: logs };
-        let key = SnapshotStorageLogsStorageKey {
-            l1_batch_number,
-            chunk_id,
+        let (output_filepath, latency) = match progress.version {
+            SnapshotVersion::Version0 => {
+                #[allow(deprecated)] // support of version 0 snapshots will be removed eventually
+                let logs = conn
+                    .snapshots_creator_dal()
+                    .get_storage_logs_chunk_with_key_preimages(
+                        l2_block_number,
+                        l1_batch_number,
+                        hashed_keys_range,
+                    )
+                    .await
+                    .context("error fetching storage logs")?;
+                drop(conn);
+
+                let latency = latency.observe();
+                tracing::info!(
+                    "Loaded chunk {chunk_id} ({} logs) from Postgres in {latency:?}",
+                    logs.len()
+                );
+                self.store_storage_logs_chunk(l1_batch_number, chunk_id, logs)
+                    .await?
+            }
+            SnapshotVersion::Version1 => {
+                let logs = conn
+                    .snapshots_creator_dal()
+                    .get_storage_logs_chunk(l2_block_number, l1_batch_number, hashed_keys_range)
+                    .await
+                    .context("error fetching storage logs")?;
+                drop(conn);
+
+                let latency = latency.observe();
+                tracing::info!(
+                    "Loaded chunk {chunk_id} ({} logs) from Postgres in {latency:?}",
+                    logs.len()
+                );
+                self.store_storage_logs_chunk(l1_batch_number, chunk_id, logs)
+                    .await?
+            }
         };
-        let filename = self
-            .blob_store
-            .put(key, &storage_logs_chunk)
-            .await
-            .context("Error storing storage logs chunk in blob store")?;
-        let output_filepath_prefix = self
-            .blob_store
-            .get_storage_prefix::<SnapshotStorageLogsChunk>();
-        let output_filepath = format!("{output_filepath_prefix}/{filename}");
-        let latency = latency.observe();
 
         let mut master_conn = self
             .master_pool
@@ -141,6 +157,35 @@ impl SnapshotCreator {
         Ok(())
     }
 
+    async fn store_storage_logs_chunk<K>(
+        &self,
+        l1_batch_number: L1BatchNumber,
+        chunk_id: u64,
+        logs: Vec<SnapshotStorageLog<K>>,
+    ) -> anyhow::Result<(String, Duration)>
+    where
+        for<'a> SnapshotStorageLogsChunk<K>: StoredObject<Key<'a> = SnapshotStorageLogsStorageKey>,
+    {
+        let latency =
+            METRICS.storage_logs_processing_duration[&StorageChunkStage::SaveToGcs].start();
+        let storage_logs_chunk = SnapshotStorageLogsChunk { storage_logs: logs };
+        let key = SnapshotStorageLogsStorageKey {
+            l1_batch_number,
+            chunk_id,
+        };
+        let filename = self
+            .blob_store
+            .put(key, &storage_logs_chunk)
+            .await
+            .context("Error storing storage logs chunk in blob store")?;
+        let output_filepath_prefix = self
+            .blob_store
+            .get_storage_prefix::<SnapshotStorageLogsChunk<K>>();
+        let output_filepath = format!("{output_filepath_prefix}/{filename}");
+        let latency = latency.observe();
+        Ok((output_filepath, latency))
+    }
+
     async fn process_factory_deps(
         &self,
         l2_block_number: L2BlockNumber,
@@ -190,18 +235,12 @@ impl SnapshotCreator {
     /// Returns `Ok(None)` if the created snapshot would coincide with `latest_snapshot`.
     async fn initialize_snapshot_progress(
         config: &SnapshotsCreatorConfig,
+        l1_batch_number: L1BatchNumber,
         min_chunk_count: u64,
-        latest_snapshot: Option<&SnapshotMetadata>,
         conn: &mut Connection<'_, Core>,
     ) -> anyhow::Result<Option<SnapshotProgress>> {
-        // We subtract 1 so that after restore, EN node has at least one L1 batch to fetch.
-        let sealed_l1_batch_number = conn.blocks_dal().get_sealed_l1_batch_number().await?;
-        let sealed_l1_batch_number = sealed_l1_batch_number.context("No L1 batches in Postgres")?;
-        anyhow::ensure!(
-            sealed_l1_batch_number != L1BatchNumber(0),
-            "Cannot create snapshot when only the genesis L1 batch is present in Postgres"
-        );
-        let l1_batch_number = sealed_l1_batch_number - 1;
+        let snapshot_version = SnapshotVersion::try_from(config.version)
+            .context("invalid snapshot version specified in config")?;
 
         // Sanity check: the selected L1 batch should have Merkle tree data; otherwise, it could be impossible
         // to recover from the generated snapshot.
@@ -215,15 +254,6 @@ impl SnapshotCreator {
                 )
             })?;
 
-        let latest_snapshot_l1_batch_number =
-            latest_snapshot.map(|snapshot| snapshot.l1_batch_number);
-        if latest_snapshot_l1_batch_number == Some(l1_batch_number) {
-            tracing::info!(
-                "Snapshot at expected L1 batch #{l1_batch_number} is already created; exiting"
-            );
-            return Ok(None);
-        }
-
         let distinct_storage_logs_keys_count = conn
             .snapshots_creator_dal()
             .get_distinct_storage_logs_keys_count(l1_batch_number)
@@ -238,7 +268,11 @@ impl SnapshotCreator {
             "Selected storage logs chunking for L1 batch {l1_batch_number}: \
             {chunk_count} chunks of expected size {chunk_size}"
         );
-        Ok(Some(SnapshotProgress::new(l1_batch_number, chunk_count)))
+        Ok(Some(SnapshotProgress::new(
+            snapshot_version,
+            l1_batch_number,
+            chunk_count,
+        )))
     }
 
     /// Returns `Ok(None)` if a snapshot should not be created / resumed.
@@ -251,25 +285,59 @@ impl SnapshotCreator {
             .master_pool
             .connection_tagged("snapshots_creator")
             .await?;
-        let latest_snapshot = master_conn
+
+        let sealed_l1_batch_number = master_conn
+            .blocks_dal()
+            .get_sealed_l1_batch_number()
+            .await?;
+        let sealed_l1_batch_number = sealed_l1_batch_number.context("No L1 batches in Postgres")?;
+        let requested_l1_batch_number = if let Some(l1_batch_number) = config.l1_batch_number {
+            anyhow::ensure!(
+                l1_batch_number <= sealed_l1_batch_number,
+                "Requested a snapshot for L1 batch #{l1_batch_number} that doesn't exist in Postgres (latest L1 batch: {sealed_l1_batch_number})"
+            );
+            l1_batch_number
+        } else {
+            // We subtract 1 so that after restore, EN node has at least one L1 batch to fetch.
+            anyhow::ensure!(
+                sealed_l1_batch_number != L1BatchNumber(0),
+                "Cannot create snapshot when only the genesis L1 batch is present in Postgres"
+            );
+            sealed_l1_batch_number - 1
+        };
+
+        let existing_snapshot = master_conn
             .snapshots_dal()
-            .get_newest_snapshot_metadata()
+            .get_snapshot_metadata(requested_l1_batch_number)
             .await?;
         drop(master_conn);
 
-        let pending_snapshot = latest_snapshot
-            .as_ref()
-            .filter(|snapshot| !snapshot.is_complete());
-        if let Some(snapshot) = pending_snapshot {
-            Ok(Some(SnapshotProgress::from_existing_snapshot(snapshot)))
-        } else {
-            Self::initialize_snapshot_progress(
-                config,
-                min_chunk_count,
-                latest_snapshot.as_ref(),
-                &mut self.connect_to_replica().await?,
-            )
-            .await
+        match existing_snapshot {
+            Some(snapshot) if snapshot.is_complete() => {
+                tracing::info!("Snapshot for the requested L1 batch is complete: {snapshot:?}");
+                Ok(None)
+            }
+            Some(snapshot) if config.l1_batch_number.is_some() => {
+                Ok(Some(SnapshotProgress::from_existing_snapshot(&snapshot)))
+            }
+            Some(snapshot) => {
+                // Unless creating a snapshot for a specific L1 batch is requested, we never continue an existing snapshot, even if it's incomplete.
+                // This it to make running multiple snapshot creator instances in parallel easier to reason about.
+                tracing::warn!(
+                    "Snapshot at expected L1 batch #{requested_l1_batch_number} exists, but is incomplete: {snapshot:?}. If you need to resume creating it, \
+                     specify the L1 batch number in the snapshot creator config"
+                );
+                Ok(None)
+            }
+            None => {
+                Self::initialize_snapshot_progress(
+                    config,
+                    requested_l1_batch_number,
+                    min_chunk_count,
+                    &mut self.connect_to_replica().await?,
+                )
+                .await
+            }
         }
     }
 
@@ -319,7 +387,7 @@ impl SnapshotCreator {
             master_conn
                 .snapshots_dal()
                 .add_snapshot(
-                    SnapshotVersion::Version0,
+                    progress.version,
                     progress.l1_batch_number,
                     progress.chunk_count,
                     &factory_deps_output_file,
@@ -331,15 +399,18 @@ impl SnapshotCreator {
             .storage_logs_chunks_left_to_process
             .set(progress.remaining_chunk_ids.len());
         let semaphore = Semaphore::new(config.concurrent_queries_count as usize);
-        let tasks = progress.remaining_chunk_ids.into_iter().map(|chunk_id| {
-            self.process_storage_logs_single_chunk(
-                &semaphore,
-                last_l2_block_number_in_batch,
-                progress.l1_batch_number,
-                chunk_id,
-                progress.chunk_count,
-            )
-        });
+        let tasks = progress
+            .remaining_chunk_ids
+            .iter()
+            .copied()
+            .map(|chunk_id| {
+                self.process_storage_logs_single_chunk(
+                    &semaphore,
+                    &progress,
+                    last_l2_block_number_in_batch,
+                    chunk_id,
+                )
+            });
         futures::future::try_join_all(tasks).await?;
 
         METRICS
diff --git a/core/bin/snapshots_creator/src/main.rs b/core/bin/snapshots_creator/src/main.rs
index fabc2c3b1cea..41775ff6f6ae 100644
--- a/core/bin/snapshots_creator/src/main.rs
+++ b/core/bin/snapshots_creator/src/main.rs
@@ -10,15 +10,15 @@
 //! at a time).
 
 use anyhow::Context as _;
-use prometheus_exporter::PrometheusExporterConfig;
 use tokio::{sync::watch, task::JoinHandle};
 use zksync_config::{
-    configs::{ObservabilityConfig, PrometheusConfig},
-    PostgresConfig, SnapshotsCreatorConfig,
+    configs::{DatabaseSecrets, ObservabilityConfig, PrometheusConfig},
+    SnapshotsCreatorConfig,
 };
 use zksync_dal::{ConnectionPool, Core};
 use zksync_env_config::{object_store::SnapshotsObjectStoreConfig, FromEnv};
 use zksync_object_store::ObjectStoreFactory;
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 use crate::creator::SnapshotCreator;
 
@@ -55,13 +55,13 @@ async fn main() -> anyhow::Result<()> {
 
     let observability_config =
         ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
 
     let prometheus_exporter_task = maybe_enable_prometheus_metrics(stop_receiver).await?;
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(sentry_url) = observability_config.sentry_url {
         builder = builder
             .with_sentry_url(&sentry_url)
@@ -75,20 +75,20 @@ async fn main() -> anyhow::Result<()> {
         SnapshotsObjectStoreConfig::from_env().context("SnapshotsObjectStoreConfig::from_env()")?;
     let blob_store = ObjectStoreFactory::new(object_store_config.0)
         .create_store()
-        .await;
+        .await?;
 
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig")?;
+    let database_secrets = DatabaseSecrets::from_env().context("DatabaseSecrets")?;
     let creator_config =
         SnapshotsCreatorConfig::from_env().context("SnapshotsCreatorConfig::from_env")?;
 
     let replica_pool = ConnectionPool::<Core>::builder(
-        postgres_config.replica_url()?,
+        database_secrets.replica_url()?,
         creator_config.concurrent_queries_count,
     )
     .build()
     .await?;
 
-    let master_pool = ConnectionPool::<Core>::singleton(postgres_config.master_url()?)
+    let master_pool = ConnectionPool::<Core>::singleton(database_secrets.master_url()?)
         .build()
         .await?;
 
diff --git a/core/bin/snapshots_creator/src/tests.rs b/core/bin/snapshots_creator/src/tests.rs
index d359afd79bd7..1c26f1081598 100644
--- a/core/bin/snapshots_creator/src/tests.rs
+++ b/core/bin/snapshots_creator/src/tests.rs
@@ -11,7 +11,7 @@ use std::{
 
 use rand::{thread_rng, Rng};
 use zksync_dal::{Connection, CoreDal};
-use zksync_object_store::ObjectStore;
+use zksync_object_store::{MockObjectStore, ObjectStore};
 use zksync_types::{
     block::{L1BatchHeader, L1BatchTreeData, L2BlockHeader},
     snapshots::{
@@ -25,14 +25,15 @@ use zksync_types::{
 use super::*;
 
 const TEST_CONFIG: SnapshotsCreatorConfig = SnapshotsCreatorConfig {
+    version: 1,
+    l1_batch_number: None,
     storage_logs_chunk_size: 1_000_000,
     concurrent_queries_count: 10,
     object_store: None,
 };
 const SEQUENTIAL_TEST_CONFIG: SnapshotsCreatorConfig = SnapshotsCreatorConfig {
-    storage_logs_chunk_size: 1_000_000,
     concurrent_queries_count: 1,
-    object_store: None,
+    ..TEST_CONFIG
 };
 
 #[derive(Debug)]
@@ -159,7 +160,7 @@ async fn create_l2_block(
         .await
         .unwrap();
     conn.storage_logs_dal()
-        .insert_storage_logs(l2_block_number, &[(H256::zero(), block_logs)])
+        .insert_storage_logs(l2_block_number, &block_logs)
         .await
         .unwrap();
 }
@@ -181,6 +182,7 @@ async fn create_l1_batch(
 
     let mut written_keys: Vec<_> = logs_for_initial_writes.iter().map(|log| log.key).collect();
     written_keys.sort_unstable();
+    let written_keys: Vec<_> = written_keys.iter().map(StorageKey::hashed_key).collect();
     conn.storage_logs_dedup_dal()
         .insert_initial_writes(l1_batch_number, &written_keys)
         .await
@@ -241,7 +243,7 @@ async fn prepare_postgres(
                 let (l1_batch_number_of_initial_write, enumeration_index) =
                     expected_l1_batches_and_indices[&log.key.hashed_key()];
                 SnapshotStorageLog {
-                    key: log.key,
+                    key: log.key.hashed_key(),
                     value: log.value,
                     l1_batch_number_of_initial_write,
                     enumeration_index,
@@ -257,8 +259,7 @@ async fn prepare_postgres(
 async fn persisting_snapshot_metadata() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut rng = thread_rng();
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    let object_store = MockObjectStore::arc();
 
     // Insert some data to Postgres.
     let mut conn = pool.connection().await.unwrap();
@@ -306,18 +307,16 @@ async fn persisting_snapshot_metadata() {
 async fn persisting_snapshot_factory_deps() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut rng = thread_rng();
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    let object_store = MockObjectStore::arc();
     let mut conn = pool.connection().await.unwrap();
     let expected_outputs = prepare_postgres(&mut rng, &mut conn, 10).await;
 
-    SnapshotCreator::for_tests(object_store, pool.clone())
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
         .run(TEST_CONFIG, MIN_CHUNK_COUNT)
         .await
         .unwrap();
     let snapshot_l1_batch_number = L1BatchNumber(8);
 
-    let object_store = object_store_factory.create_store().await;
     let SnapshotFactoryDependencies { factory_deps } =
         object_store.get(snapshot_l1_batch_number).await.unwrap();
     let actual_deps: HashSet<_> = factory_deps.into_iter().collect();
@@ -328,21 +327,42 @@ async fn persisting_snapshot_factory_deps() {
 async fn persisting_snapshot_logs() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut rng = thread_rng();
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    let object_store = MockObjectStore::arc();
     let mut conn = pool.connection().await.unwrap();
     let expected_outputs = prepare_postgres(&mut rng, &mut conn, 10).await;
 
-    SnapshotCreator::for_tests(object_store, pool.clone())
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
         .run(TEST_CONFIG, MIN_CHUNK_COUNT)
         .await
         .unwrap();
     let snapshot_l1_batch_number = L1BatchNumber(8);
 
-    let object_store = object_store_factory.create_store().await;
     assert_storage_logs(&*object_store, snapshot_l1_batch_number, &expected_outputs).await;
 }
 
+#[tokio::test]
+async fn persisting_snapshot_logs_with_specified_l1_batch() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut rng = thread_rng();
+    let object_store = MockObjectStore::arc();
+    let mut conn = pool.connection().await.unwrap();
+    let expected_outputs = prepare_postgres(&mut rng, &mut conn, 10).await;
+
+    // L1 batch numbers are intentionally not ordered
+    for snapshot_l1_batch_number in [7, 1, 4, 6] {
+        let snapshot_l1_batch_number = L1BatchNumber(snapshot_l1_batch_number);
+        let mut config = TEST_CONFIG;
+        config.l1_batch_number = Some(snapshot_l1_batch_number);
+
+        SnapshotCreator::for_tests(object_store.clone(), pool.clone())
+            .run(config, MIN_CHUNK_COUNT)
+            .await
+            .unwrap();
+
+        assert_storage_logs(&*object_store, snapshot_l1_batch_number, &expected_outputs).await;
+    }
+}
+
 async fn assert_storage_logs(
     object_store: &dyn ObjectStore,
     snapshot_l1_batch_number: L1BatchNumber,
@@ -355,7 +375,56 @@ async fn assert_storage_logs(
             chunk_id,
         };
         let chunk: SnapshotStorageLogsChunk = object_store.get(key).await.unwrap();
-        actual_logs.extend(chunk.storage_logs.into_iter());
+        actual_logs.extend(chunk.storage_logs);
+    }
+    let expected_logs: HashSet<_> = expected_outputs
+        .storage_logs
+        .iter()
+        .filter(|log| log.l1_batch_number_of_initial_write <= snapshot_l1_batch_number)
+        .cloned()
+        .collect();
+    assert_eq!(actual_logs, expected_logs);
+}
+
+#[tokio::test]
+async fn persisting_snapshot_logs_for_v0_snapshot() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut rng = thread_rng();
+    let object_store = MockObjectStore::arc();
+    let mut conn = pool.connection().await.unwrap();
+    let expected_outputs = prepare_postgres(&mut rng, &mut conn, 10).await;
+
+    let config = SnapshotsCreatorConfig {
+        version: 0,
+        ..TEST_CONFIG
+    };
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
+        .run(config, MIN_CHUNK_COUNT)
+        .await
+        .unwrap();
+    let snapshot_l1_batch_number = L1BatchNumber(8);
+
+    // Logs must be compatible with version 1 `SnapshotStorageLog` format
+    assert_storage_logs(&*object_store, snapshot_l1_batch_number, &expected_outputs).await;
+
+    // ...and must be compatible with version 0 format as well
+    let mut actual_logs = HashSet::new();
+    for chunk_id in 0..MIN_CHUNK_COUNT {
+        let key = SnapshotStorageLogsStorageKey {
+            l1_batch_number: snapshot_l1_batch_number,
+            chunk_id,
+        };
+        let chunk: SnapshotStorageLogsChunk<StorageKey> = object_store.get(key).await.unwrap();
+        let logs_with_hashed_key = chunk
+            .storage_logs
+            .into_iter()
+            .map(|log| SnapshotStorageLog {
+                key: log.key.hashed_key(),
+                value: log.value,
+                l1_batch_number_of_initial_write: log.l1_batch_number_of_initial_write,
+                enumeration_index: log.enumeration_index,
+            });
+        actual_logs.extend(logs_with_hashed_key);
     }
     assert_eq!(actual_logs, expected_outputs.storage_logs);
 }
@@ -364,12 +433,11 @@ async fn assert_storage_logs(
 async fn recovery_workflow() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut rng = thread_rng();
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    let object_store = MockObjectStore::arc();
     let mut conn = pool.connection().await.unwrap();
     let expected_outputs = prepare_postgres(&mut rng, &mut conn, 10).await;
 
-    SnapshotCreator::for_tests(object_store, pool.clone())
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
         .stop_after_chunk_count(0)
         .run(SEQUENTIAL_TEST_CONFIG, MIN_CHUNK_COUNT)
         .await
@@ -387,18 +455,41 @@ async fn recovery_workflow() {
         .iter()
         .all(Option::is_none));
 
-    let object_store = object_store_factory.create_store().await;
     let SnapshotFactoryDependencies { factory_deps } =
         object_store.get(snapshot_l1_batch_number).await.unwrap();
     let actual_deps: HashSet<_> = factory_deps.into_iter().collect();
     assert_eq!(actual_deps, expected_outputs.deps);
 
-    // Process 2 storage log chunks, then stop.
-    SnapshotCreator::for_tests(object_store, pool.clone())
+    // Check that the creator does nothing unless it's requested to create a new snapshot.
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
         .stop_after_chunk_count(2)
         .run(SEQUENTIAL_TEST_CONFIG, MIN_CHUNK_COUNT)
         .await
         .unwrap();
+    let snapshot_metadata = conn
+        .snapshots_dal()
+        .get_snapshot_metadata(snapshot_l1_batch_number)
+        .await
+        .unwrap()
+        .expect("No snapshot metadata");
+    assert!(
+        snapshot_metadata
+            .storage_logs_filepaths
+            .iter()
+            .all(Option::is_none),
+        "{snapshot_metadata:?}"
+    );
+
+    // Process 2 storage log chunks, then stop.
+    let recovery_config = SnapshotsCreatorConfig {
+        l1_batch_number: Some(snapshot_l1_batch_number),
+        ..SEQUENTIAL_TEST_CONFIG
+    };
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
+        .stop_after_chunk_count(2)
+        .run(recovery_config.clone(), MIN_CHUNK_COUNT)
+        .await
+        .unwrap();
 
     let snapshot_metadata = conn
         .snapshots_dal()
@@ -416,13 +507,11 @@ async fn recovery_workflow() {
     );
 
     // Process the remaining chunks.
-    let object_store = object_store_factory.create_store().await;
-    SnapshotCreator::for_tests(object_store, pool.clone())
-        .run(SEQUENTIAL_TEST_CONFIG, MIN_CHUNK_COUNT)
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
+        .run(recovery_config, MIN_CHUNK_COUNT)
         .await
         .unwrap();
 
-    let object_store = object_store_factory.create_store().await;
     assert_storage_logs(&*object_store, snapshot_l1_batch_number, &expected_outputs).await;
 }
 
@@ -430,18 +519,21 @@ async fn recovery_workflow() {
 async fn recovery_workflow_with_varying_chunk_size() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut rng = thread_rng();
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    let object_store = MockObjectStore::arc();
     let mut conn = pool.connection().await.unwrap();
     let expected_outputs = prepare_postgres(&mut rng, &mut conn, 10).await;
 
-    SnapshotCreator::for_tests(object_store, pool.clone())
+    // Specifying the snapshot L1 batch right away should work fine.
+    let snapshot_l1_batch_number = L1BatchNumber(8);
+    let mut config = SEQUENTIAL_TEST_CONFIG;
+    config.l1_batch_number = Some(snapshot_l1_batch_number);
+
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
         .stop_after_chunk_count(2)
-        .run(SEQUENTIAL_TEST_CONFIG, MIN_CHUNK_COUNT)
+        .run(config.clone(), MIN_CHUNK_COUNT)
         .await
         .unwrap();
 
-    let snapshot_l1_batch_number = L1BatchNumber(8);
     let snapshot_metadata = conn
         .snapshots_dal()
         .get_snapshot_metadata(snapshot_l1_batch_number)
@@ -457,16 +549,24 @@ async fn recovery_workflow_with_varying_chunk_size() {
         2
     );
 
-    let config_with_other_size = SnapshotsCreatorConfig {
-        storage_logs_chunk_size: 1, // << should be ignored
-        ..SEQUENTIAL_TEST_CONFIG
-    };
-    let object_store = object_store_factory.create_store().await;
-    SnapshotCreator::for_tests(object_store, pool.clone())
-        .run(config_with_other_size, MIN_CHUNK_COUNT)
+    config.storage_logs_chunk_size = 1;
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
+        .run(config, MIN_CHUNK_COUNT)
         .await
         .unwrap();
 
-    let object_store = object_store_factory.create_store().await;
     assert_storage_logs(&*object_store, snapshot_l1_batch_number, &expected_outputs).await;
 }
+
+#[tokio::test]
+async fn creator_fails_if_specified_l1_batch_is_missing() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let object_store = MockObjectStore::arc();
+
+    let mut config = SEQUENTIAL_TEST_CONFIG;
+    config.l1_batch_number = Some(L1BatchNumber(20));
+    SnapshotCreator::for_tests(object_store.clone(), pool.clone())
+        .run(config, MIN_CHUNK_COUNT)
+        .await
+        .unwrap_err();
+}
diff --git a/core/bin/system-constants-generator/Cargo.toml b/core/bin/system-constants-generator/Cargo.toml
index 4dc4c507c07b..6f52ed28b2d4 100644
--- a/core/bin/system-constants-generator/Cargo.toml
+++ b/core/bin/system-constants-generator/Cargo.toml
@@ -15,7 +15,7 @@ zksync_state.workspace = true
 zksync_types.workspace = true
 zksync_utils.workspace = true
 zksync_contracts.workspace = true
-multivm.workspace = true
+zksync_multivm.workspace = true
 
 codegen.workspace = true
 serde.workspace = true
diff --git a/core/bin/system-constants-generator/src/intrinsic_costs.rs b/core/bin/system-constants-generator/src/intrinsic_costs.rs
index 4f5e988e7b1a..f50cd9eb3a22 100644
--- a/core/bin/system-constants-generator/src/intrinsic_costs.rs
+++ b/core/bin/system-constants-generator/src/intrinsic_costs.rs
@@ -4,7 +4,7 @@
 //! as well as contracts/SystemConfig.json
 //!
 
-use multivm::utils::get_bootloader_encoding_space;
+use zksync_multivm::utils::get_bootloader_encoding_space;
 use zksync_types::{ethabi::Address, IntrinsicSystemGasConstants, ProtocolVersionId, U256};
 
 use crate::utils::{
@@ -74,7 +74,7 @@ pub(crate) fn l2_gas_constants() -> IntrinsicSystemGasConstants {
                 0,
                 Some(U256::zero()),
                 None,
-                None,
+                vec![],
             )
             .into(),
         ],
@@ -99,7 +99,7 @@ pub(crate) fn l2_gas_constants() -> IntrinsicSystemGasConstants {
             0,
             Some(U256::zero()),
             Some(vec![0u8; DELTA_IN_TX_SIZE]),
-            None,
+            vec![],
         )
         .into()],
         true,
@@ -117,7 +117,7 @@ pub(crate) fn l2_gas_constants() -> IntrinsicSystemGasConstants {
             0,
             Some(U256::zero()),
             None,
-            Some(vec![vec![0u8; 32]]),
+            vec![vec![0u8; 32]],
         )
         .into()],
         true,
diff --git a/core/bin/system-constants-generator/src/main.rs b/core/bin/system-constants-generator/src/main.rs
index 548d4c9a0ce1..7ada47302248 100644
--- a/core/bin/system-constants-generator/src/main.rs
+++ b/core/bin/system-constants-generator/src/main.rs
@@ -1,7 +1,8 @@
 use std::fs;
 
 use codegen::{Block, Scope};
-use multivm::{
+use serde::{Deserialize, Serialize};
+use zksync_multivm::{
     utils::{get_bootloader_encoding_space, get_bootloader_max_txs_in_batch},
     vm_latest::constants::MAX_VM_PUBDATA_PER_BATCH,
     zk_evm_latest::zkevm_opcode_defs::{
@@ -12,11 +13,11 @@ use multivm::{
         system_params::MAX_TX_ERGS_LIMIT,
     },
 };
-use serde::{Deserialize, Serialize};
 use zksync_types::{
     IntrinsicSystemGasConstants, ProtocolVersionId, GUARANTEED_PUBDATA_IN_TX,
     L1_GAS_PER_PUBDATA_BYTE, MAX_NEW_FACTORY_DEPS, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE,
 };
+use zksync_utils::workspace_dir_or_current_dir;
 
 // For configs we will use the default value of `800_000` to represent the rough amount of L1 gas
 // needed to cover the batch expenses.
@@ -209,8 +210,8 @@ fn generate_rust_fee_constants(intrinsic_gas_constants: &IntrinsicSystemGasConst
 }
 
 fn save_file(path_in_repo: &str, content: String) {
-    let zksync_home = std::env::var("ZKSYNC_HOME").expect("No ZKSYNC_HOME env var");
-    let fee_constants_path = format!("{zksync_home}/{path_in_repo}");
+    let zksync_home = workspace_dir_or_current_dir();
+    let fee_constants_path = zksync_home.join(path_in_repo);
 
     fs::write(fee_constants_path, content)
         .unwrap_or_else(|_| panic!("Failed to write to {}", path_in_repo));
diff --git a/core/bin/system-constants-generator/src/utils.rs b/core/bin/system-constants-generator/src/utils.rs
index d6f1ea85efff..a56c85a7d5b6 100644
--- a/core/bin/system-constants-generator/src/utils.rs
+++ b/core/bin/system-constants-generator/src/utils.rs
@@ -1,6 +1,11 @@
 use std::{cell::RefCell, rc::Rc};
 
-use multivm::{
+use once_cell::sync::Lazy;
+use zksync_contracts::{
+    load_sys_contract, read_bootloader_code, read_sys_contract_bytecode, read_zbin_bytecode,
+    BaseSystemContracts, ContractLanguage, SystemContractCode,
+};
+use zksync_multivm::{
     interface::{
         dyn_tracers::vm_1_5_0::DynTracer, tracer::VmExecutionStopReason, L1BatchEnv, L2BlockEnv,
         SystemEnv, TxExecutionMode, VmExecutionMode, VmInterface,
@@ -12,11 +17,6 @@ use multivm::{
     },
     zk_evm_latest::aux_structures::Timestamp,
 };
-use once_cell::sync::Lazy;
-use zksync_contracts::{
-    load_sys_contract, read_bootloader_code, read_sys_contract_bytecode, read_zbin_bytecode,
-    BaseSystemContracts, ContractLanguage, SystemContractCode,
-};
 use zksync_state::{InMemoryStorage, StorageView, WriteStorage};
 use zksync_types::{
     block::L2BlockHasher, ethabi::Token, fee::Fee, fee_model::BatchFeeInput, l1::L1Tx, l2::L2Tx,
@@ -99,7 +99,7 @@ pub(super) fn get_l2_tx(
         U256::from(0),
         L2ChainId::from(270),
         signer,
-        None,
+        vec![],
         Default::default(),
     )
     .unwrap()
@@ -128,7 +128,7 @@ pub(super) fn get_l1_tx(
     pubdata_price: u32,
     custom_gas_limit: Option<U256>,
     custom_calldata: Option<Vec<u8>>,
-    factory_deps: Option<Vec<Vec<u8>>>,
+    factory_deps: Vec<Vec<u8>>,
 ) -> L1Tx {
     L1Tx {
         execute: Execute {
@@ -157,10 +157,10 @@ pub(super) fn get_l1_txs(number_of_txs: usize) -> (Vec<Transaction>, Vec<Transac
         let contract_address = Address::random();
 
         txs_without_pubdata_price
-            .push(get_l1_tx(id as u64, sender, contract_address, 0, None, None, None).into());
+            .push(get_l1_tx(id as u64, sender, contract_address, 0, None, None, vec![]).into());
 
         txs_with_pubdata_price
-            .push(get_l1_tx(id as u64, sender, contract_address, 1, None, None, None).into());
+            .push(get_l1_tx(id as u64, sender, contract_address, 1, None, None, vec![]).into());
     }
 
     (txs_with_pubdata_price, txs_without_pubdata_price)
diff --git a/core/bin/verified_sources_fetcher/src/main.rs b/core/bin/verified_sources_fetcher/src/main.rs
index cff20b8d859d..51ec8e9de7d6 100644
--- a/core/bin/verified_sources_fetcher/src/main.rs
+++ b/core/bin/verified_sources_fetcher/src/main.rs
@@ -1,13 +1,13 @@
 use std::io::Write;
 
-use zksync_config::PostgresConfig;
+use zksync_config::configs::DatabaseSecrets;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_env_config::FromEnv;
 use zksync_types::contract_verification_api::SourceCodeData;
 
 #[tokio::main]
 async fn main() {
-    let config = PostgresConfig::from_env().unwrap();
+    let config = DatabaseSecrets::from_env().unwrap();
     let pool = ConnectionPool::<Core>::singleton(config.replica_url().unwrap())
         .build()
         .await
diff --git a/core/bin/zksync_server/Cargo.toml b/core/bin/zksync_server/Cargo.toml
index deef059dc960..d9b8b530247d 100644
--- a/core/bin/zksync_server/Cargo.toml
+++ b/core/bin/zksync_server/Cargo.toml
@@ -18,15 +18,16 @@ zksync_protobuf_config.workspace = true
 zksync_storage.workspace = true
 zksync_utils.workspace = true
 zksync_types.workspace = true
-zksync_core.workspace = true
+zksync_core_leftovers.workspace = true
 zksync_node_genesis.workspace = true
+zksync_default_da_clients.workspace = true
 
 # Consensus dependenices
 zksync_consensus_crypto.workspace = true
 zksync_consensus_roles.workspace = true
 zksync_consensus_executor.workspace = true
 zksync_concurrency.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
@@ -35,5 +36,9 @@ tokio = { workspace = true, features = ["full"] }
 tracing.workspace = true
 futures.workspace = true
 
+zksync_node_framework.workspace = true
+zksync_metadata_calculator.workspace = true
+zksync_node_api_server.workspace = true
+
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator.workspace = true
diff --git a/core/bin/zksync_server/src/config.rs b/core/bin/zksync_server/src/config.rs
index fadcced7942d..8c865b61d5be 100644
--- a/core/bin/zksync_server/src/config.rs
+++ b/core/bin/zksync_server/src/config.rs
@@ -1,6 +1,6 @@
 use anyhow::Context as _;
 use zksync_config::configs::consensus::{ConsensusConfig, ConsensusSecrets};
-use zksync_core::temp_config_store::decode_yaml_repr;
+use zksync_core_leftovers::temp_config_store::decode_yaml_repr;
 use zksync_protobuf_config::proto;
 
 pub(crate) fn read_consensus_secrets() -> anyhow::Result<Option<ConsensusSecrets>> {
@@ -10,7 +10,8 @@ pub(crate) fn read_consensus_secrets() -> anyhow::Result<Option<ConsensusSecrets
     };
     let secrets = std::fs::read_to_string(&path).context(path)?;
     Ok(Some(
-        decode_yaml_repr::<proto::consensus::Secrets>(&secrets).context("failed decoding YAML")?,
+        decode_yaml_repr::<proto::secrets::ConsensusSecrets>(&secrets)
+            .context("failed decoding YAML")?,
     ))
 }
 
diff --git a/core/bin/zksync_server/src/main.rs b/core/bin/zksync_server/src/main.rs
index d9a3246a0786..51fce8e2d8d3 100644
--- a/core/bin/zksync_server/src/main.rs
+++ b/core/bin/zksync_server/src/main.rs
@@ -1,4 +1,4 @@
-use std::{str::FromStr, time::Duration};
+use std::str::FromStr;
 
 use anyhow::Context as _;
 use clap::Parser;
@@ -11,30 +11,33 @@ use zksync_config::{
         },
         fri_prover_group::FriProverGroupConfig,
         house_keeper::HouseKeeperConfig,
-        ContractsConfig, FriProofCompressorConfig, FriProverConfig, FriProverGatewayConfig,
-        FriWitnessGeneratorConfig, FriWitnessVectorGeneratorConfig, ObservabilityConfig,
-        PrometheusConfig, ProofDataHandlerConfig,
+        ContractsConfig, DatabaseSecrets, FriProofCompressorConfig, FriProverConfig,
+        FriProverGatewayConfig, FriWitnessGeneratorConfig, FriWitnessVectorGeneratorConfig,
+        L1Secrets, ObservabilityConfig, PrometheusConfig, ProofDataHandlerConfig,
+        ProtectiveReadsWriterConfig, Secrets,
     },
-    ApiConfig, ContractVerifierConfig, DBConfig, EthConfig, EthWatchConfig, GasAdjusterConfig,
-    GenesisConfig, ObjectStoreConfig, PostgresConfig, SnapshotsCreatorConfig,
+    ApiConfig, BaseTokenAdjusterConfig, ContractVerifierConfig, DADispatcherConfig, DBConfig,
+    EthConfig, EthWatchConfig, GasAdjusterConfig, GenesisConfig, ObjectStoreConfig, PostgresConfig,
+    SnapshotsCreatorConfig,
 };
-use zksync_core::{
-    genesis_init, initialize_components, is_genesis_needed, setup_sigint_handler,
-    temp_config_store::{decode_yaml, decode_yaml_repr, Secrets, TempConfigStore},
+use zksync_core_leftovers::{
+    genesis_init, is_genesis_needed,
+    temp_config_store::{decode_yaml_repr, TempConfigStore},
     Component, Components,
 };
 use zksync_env_config::FromEnv;
-use zksync_eth_client::clients::QueryClient;
-use zksync_storage::RocksDB;
-use zksync_utils::wait_for_tasks::ManagedTasks;
+use zksync_eth_client::clients::Client;
+
+use crate::node_builder::MainNodeBuilder;
 
 mod config;
+mod node_builder;
 
 #[cfg(not(target_env = "msvc"))]
 #[global_allocator]
 static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 #[derive(Debug, Parser)]
-#[command(author = "Matter Labs", version, about = "zkSync operator node", long_about = None)]
+#[command(author = "Matter Labs", version, about = "ZKsync operator node", long_about = None)]
 struct Cli {
     /// Generate genesis block for the first contract deployment using temporary DB.
     #[arg(long)]
@@ -45,7 +48,7 @@ struct Cli {
     /// Comma-separated list of components to launch.
     #[arg(
         long,
-        default_value = "api,tree,eth,state_keeper,housekeeper,commitment_generator"
+        default_value = "api,tree,eth,state_keeper,housekeeper,tee_verifier_input_producer,commitment_generator,da_dispatcher,base_token_ratio_persister"
     )]
     components: ComponentsToRun,
     /// Path to the yaml config. If set, it will be used instead of env vars.
@@ -63,6 +66,10 @@ struct Cli {
     /// Path to the yaml with genesis. If set, it will be used instead of env vars.
     #[arg(long)]
     genesis_path: Option<std::path::PathBuf>,
+    /// Used to enable node framework.
+    /// Now the node framework is used by default and this argument is left for backward compatibility.
+    #[arg(long)]
+    use_node_framework: bool,
 }
 
 #[derive(Debug, Clone)]
@@ -81,10 +88,8 @@ impl FromStr for ComponentsToRun {
     }
 }
 
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
+fn main() -> anyhow::Result<()> {
     let opt = Cli::parse();
-    let sigint_receiver = setup_sigint_handler();
 
     // Load env config and use it if file config is not provided
     let tmp_config = load_env_config()?;
@@ -104,12 +109,12 @@ async fn main() -> anyhow::Result<()> {
         .clone()
         .context("observability config")?;
 
-    let log_format: vlog::LogFormat = observability_config
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
 
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(log_directives) = observability_config.log_directives {
         builder = builder.with_log_directives(log_directives);
     }
@@ -143,10 +148,13 @@ async fn main() -> anyhow::Result<()> {
         Some(path) => {
             let yaml =
                 std::fs::read_to_string(&path).with_context(|| path.display().to_string())?;
-            decode_yaml(&yaml).context("failed decoding secrets YAML config")?
+            decode_yaml_repr::<zksync_protobuf_config::proto::secrets::Secrets>(&yaml)
+                .context("failed decoding secrets YAML config")?
         }
         None => Secrets {
             consensus: config::read_consensus_secrets().context("read_consensus_secrets()")?,
+            database: DatabaseSecrets::from_env().ok(),
+            l1: L1Secrets::from_env().ok(),
         },
     };
 
@@ -172,30 +180,10 @@ async fn main() -> anyhow::Result<()> {
         }
     };
 
-    let postgres_config = configs.postgres_config.clone().context("PostgresConfig")?;
-
-    if opt.genesis || is_genesis_needed(&postgres_config).await {
-        genesis_init(genesis.clone(), &postgres_config)
-            .await
-            .context("genesis_init")?;
-
-        if let Some(ecosystem_contracts) = &contracts_config.ecosystem_contracts {
-            let eth_config = configs.eth.as_ref().context("eth config")?;
-            let query_client =
-                QueryClient::new(eth_config.web3_url.clone()).context("Ethereum client")?;
-            zksync_node_genesis::save_set_chain_id_tx(
-                &query_client,
-                contracts_config.diamond_proxy_addr,
-                ecosystem_contracts.state_transition_proxy_addr,
-                &postgres_config,
-            )
-            .await
-            .context("Failed to save SetChainId upgrade transaction")?;
-        }
-
-        if opt.genesis {
-            return Ok(());
-        }
+    run_genesis_if_needed(opt.genesis, &genesis, &contracts_config, &secrets)?;
+    if opt.genesis {
+        // If genesis is requested, we don't need to run the node.
+        return Ok(());
     }
 
     let components = if opt.rebuild_tree {
@@ -204,44 +192,53 @@ async fn main() -> anyhow::Result<()> {
         opt.components.0
     };
 
-    // Run core actors.
-    let (core_task_handles, stop_sender, health_check_handle) = initialize_components(
-        &configs,
-        &wallets,
-        &genesis,
-        &contracts_config,
-        &components,
-        &secrets,
+    let node = MainNodeBuilder::new(
+        configs,
+        wallets,
+        genesis,
+        contracts_config,
+        secrets,
         consensus,
     )
-    .await
-    .context("Unable to start Core actors")?;
-
-    tracing::info!("Running {} core task handlers", core_task_handles.len());
+    .build(components)?;
+    node.run()?;
+    Ok(())
+}
 
-    let mut tasks = ManagedTasks::new(core_task_handles);
-    tokio::select! {
-        _ = tasks.wait_single() => {},
-        _ = sigint_receiver => {
-            tracing::info!("Stop signal received, shutting down");
-        },
-    }
+fn run_genesis_if_needed(
+    force_genesis: bool,
+    genesis: &GenesisConfig,
+    contracts_config: &ContractsConfig,
+    secrets: &Secrets,
+) -> anyhow::Result<()> {
+    let tokio_runtime = tokio::runtime::Builder::new_multi_thread()
+        .enable_all()
+        .build()?;
+    tokio_runtime.block_on(async move {
+        let database_secrets = secrets.database.clone().context("DatabaseSecrets")?;
+        if force_genesis || is_genesis_needed(&database_secrets).await {
+            genesis_init(genesis.clone(), &database_secrets)
+                .await
+                .context("genesis_init")?;
 
-    stop_sender.send(true).ok();
-    tokio::task::spawn_blocking(RocksDB::await_rocksdb_termination)
-        .await
-        .context("error waiting for RocksDB instances to drop")?;
-    let complete_timeout =
-        if components.contains(&Component::HttpApi) || components.contains(&Component::WsApi) {
-            // Increase timeout because of complicated graceful shutdown procedure for API servers.
-            Duration::from_secs(30)
-        } else {
-            Duration::from_secs(5)
-        };
-    tasks.complete(complete_timeout).await;
-    health_check_handle.stop().await;
-    tracing::info!("Stopped");
-    Ok(())
+            if let Some(ecosystem_contracts) = &contracts_config.ecosystem_contracts {
+                let l1_secrets = secrets.l1.as_ref().context("l1_screts")?;
+                let query_client = Client::http(l1_secrets.l1_rpc_url.clone())
+                    .context("Ethereum client")?
+                    .for_network(genesis.l1_chain_id.into())
+                    .build();
+                zksync_node_genesis::save_set_chain_id_tx(
+                    &query_client,
+                    contracts_config.diamond_proxy_addr,
+                    ecosystem_contracts.state_transition_proxy_addr,
+                    &database_secrets,
+                )
+                .await
+                .context("Failed to save SetChainId upgrade transaction")?;
+            }
+        }
+        Ok(())
+    })
 }
 
 fn load_env_config() -> anyhow::Result<TempConfigStore> {
@@ -258,9 +255,7 @@ fn load_env_config() -> anyhow::Result<TempConfigStore> {
         state_keeper_config: StateKeeperConfig::from_env().ok(),
         house_keeper_config: HouseKeeperConfig::from_env().ok(),
         fri_proof_compressor_config: FriProofCompressorConfig::from_env().ok(),
-        fri_prover_config: FriProverConfig::from_env()
-            .context("fri_prover_config")
-            .ok(),
+        fri_prover_config: FriProverConfig::from_env().ok(),
         fri_prover_group_config: FriProverGroupConfig::from_env().ok(),
         fri_prover_gateway_config: FriProverGatewayConfig::from_env().ok(),
         fri_witness_vector_generator: FriWitnessVectorGeneratorConfig::from_env().ok(),
@@ -272,8 +267,14 @@ fn load_env_config() -> anyhow::Result<TempConfigStore> {
         eth_sender_config: EthConfig::from_env().ok(),
         eth_watch_config: EthWatchConfig::from_env().ok(),
         gas_adjuster_config: GasAdjusterConfig::from_env().ok(),
-        object_store_config: ObjectStoreConfig::from_env().ok(),
         observability: ObservabilityConfig::from_env().ok(),
         snapshot_creator: SnapshotsCreatorConfig::from_env().ok(),
+        da_dispatcher_config: DADispatcherConfig::from_env().ok(),
+        protective_reads_writer_config: ProtectiveReadsWriterConfig::from_env().ok(),
+        core_object_store: ObjectStoreConfig::from_env().ok(),
+        base_token_adjuster_config: BaseTokenAdjusterConfig::from_env().ok(),
+        commitment_generator: None,
+        pruning: None,
+        snapshot_recovery: None,
     })
 }
diff --git a/core/bin/zksync_server/src/node_builder.rs b/core/bin/zksync_server/src/node_builder.rs
new file mode 100644
index 000000000000..d33abdbbf199
--- /dev/null
+++ b/core/bin/zksync_server/src/node_builder.rs
@@ -0,0 +1,611 @@
+//! This module provides a "builder" for the main node,
+//! as well as an interface to run the node with the specified components.
+
+use anyhow::Context;
+use zksync_config::{
+    configs::{
+        consensus::ConsensusConfig, eth_sender::PubdataSendingMode, wallets::Wallets,
+        GeneralConfig, Secrets,
+    },
+    ContractsConfig, GenesisConfig,
+};
+use zksync_core_leftovers::Component;
+use zksync_default_da_clients::{
+    no_da::wiring_layer::NoDAClientWiringLayer,
+    object_store::{config::DAObjectStoreConfig, wiring_layer::ObjectStorageClientWiringLayer},
+};
+use zksync_metadata_calculator::MetadataCalculatorConfig;
+use zksync_node_api_server::{
+    tx_sender::{ApiContracts, TxSenderConfig},
+    web3::{state::InternalApiConfig, Namespace},
+};
+use zksync_node_framework::{
+    implementations::layers::{
+        base_token_ratio_persister::BaseTokenRatioPersisterLayer,
+        base_token_ratio_provider::BaseTokenRatioProviderLayer,
+        circuit_breaker_checker::CircuitBreakerCheckerLayer,
+        commitment_generator::CommitmentGeneratorLayer,
+        consensus::{ConsensusLayer, Mode as ConsensusMode},
+        contract_verification_api::ContractVerificationApiLayer,
+        da_dispatcher::DataAvailabilityDispatcherLayer,
+        eth_sender::{EthTxAggregatorLayer, EthTxManagerLayer},
+        eth_watch::EthWatchLayer,
+        healtcheck_server::HealthCheckLayer,
+        house_keeper::HouseKeeperLayer,
+        l1_batch_commitment_mode_validation::L1BatchCommitmentModeValidationLayer,
+        l1_gas::SequencerL1GasLayer,
+        metadata_calculator::MetadataCalculatorLayer,
+        object_store::ObjectStoreLayer,
+        pk_signing_eth_client::PKSigningEthClientLayer,
+        pools_layer::PoolsLayerBuilder,
+        postgres_metrics::PostgresMetricsLayer,
+        prometheus_exporter::PrometheusExporterLayer,
+        proof_data_handler::ProofDataHandlerLayer,
+        query_eth_client::QueryEthClientLayer,
+        sigint::SigintHandlerLayer,
+        state_keeper::{
+            main_batch_executor::MainBatchExecutorLayer, mempool_io::MempoolIOLayer,
+            output_handler::OutputHandlerLayer, RocksdbStorageOptions, StateKeeperLayer,
+        },
+        tee_verifier_input_producer::TeeVerifierInputProducerLayer,
+        vm_runner::protective_reads::ProtectiveReadsWriterLayer,
+        web3_api::{
+            caches::MempoolCacheLayer,
+            server::{Web3ServerLayer, Web3ServerOptionalConfig},
+            tree_api_client::TreeApiClientLayer,
+            tx_sender::{PostgresStorageCachesConfig, TxSenderLayer},
+            tx_sink::TxSinkLayer,
+        },
+    },
+    service::{ZkStackService, ZkStackServiceBuilder},
+};
+use zksync_types::SHARED_BRIDGE_ETHER_TOKEN_ADDRESS;
+use zksync_vlog::prometheus::PrometheusExporterConfig;
+
+/// Macro that looks into a path to fetch an optional config,
+/// and clones it into a variable.
+macro_rules! try_load_config {
+    ($path:expr) => {
+        $path.as_ref().context(stringify!($path))?.clone()
+    };
+}
+
+pub struct MainNodeBuilder {
+    node: ZkStackServiceBuilder,
+    configs: GeneralConfig,
+    wallets: Wallets,
+    genesis_config: GenesisConfig,
+    contracts_config: ContractsConfig,
+    secrets: Secrets,
+    consensus_config: Option<ConsensusConfig>,
+}
+
+impl MainNodeBuilder {
+    pub fn new(
+        configs: GeneralConfig,
+        wallets: Wallets,
+        genesis_config: GenesisConfig,
+        contracts_config: ContractsConfig,
+        secrets: Secrets,
+        consensus_config: Option<ConsensusConfig>,
+    ) -> Self {
+        Self {
+            node: ZkStackServiceBuilder::new(),
+            configs,
+            wallets,
+            genesis_config,
+            contracts_config,
+            secrets,
+            consensus_config,
+        }
+    }
+
+    fn add_sigint_handler_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(SigintHandlerLayer);
+        Ok(self)
+    }
+
+    fn add_pools_layer(mut self) -> anyhow::Result<Self> {
+        let config = try_load_config!(self.configs.postgres_config);
+        let secrets = try_load_config!(self.secrets.database);
+        let pools_layer = PoolsLayerBuilder::empty(config, secrets)
+            .with_master(true)
+            .with_replica(true)
+            .with_prover(true) // Used by house keeper.
+            .build();
+        self.node.add_layer(pools_layer);
+        Ok(self)
+    }
+
+    fn add_prometheus_exporter_layer(mut self) -> anyhow::Result<Self> {
+        let prom_config = try_load_config!(self.configs.prometheus_config);
+        let prom_config = PrometheusExporterConfig::pull(prom_config.listener_port);
+        self.node.add_layer(PrometheusExporterLayer(prom_config));
+        Ok(self)
+    }
+
+    fn add_postgres_metrics_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(PostgresMetricsLayer);
+        Ok(self)
+    }
+
+    fn add_pk_signing_client_layer(mut self) -> anyhow::Result<Self> {
+        let eth_config = try_load_config!(self.configs.eth);
+        let wallets = try_load_config!(self.wallets.eth_sender);
+        self.node.add_layer(PKSigningEthClientLayer::new(
+            eth_config,
+            self.contracts_config.clone(),
+            self.genesis_config.l1_chain_id,
+            wallets,
+        ));
+        Ok(self)
+    }
+
+    fn add_query_eth_client_layer(mut self) -> anyhow::Result<Self> {
+        let genesis = self.genesis_config.clone();
+        let eth_config = try_load_config!(self.secrets.l1);
+        let query_eth_client_layer =
+            QueryEthClientLayer::new(genesis.l1_chain_id, eth_config.l1_rpc_url);
+        self.node.add_layer(query_eth_client_layer);
+        Ok(self)
+    }
+
+    fn add_sequencer_l1_gas_layer(mut self) -> anyhow::Result<Self> {
+        // Ensure the BaseTokenRatioProviderResource is inserted if the base token is not ETH.
+        if self.contracts_config.base_token_addr != Some(SHARED_BRIDGE_ETHER_TOKEN_ADDRESS) {
+            self.node.add_layer(BaseTokenRatioProviderLayer {});
+        }
+
+        let gas_adjuster_config = try_load_config!(self.configs.eth)
+            .gas_adjuster
+            .context("Gas adjuster")?;
+        let state_keeper_config = try_load_config!(self.configs.state_keeper_config);
+        let eth_sender_config = try_load_config!(self.configs.eth);
+        let sequencer_l1_gas_layer = SequencerL1GasLayer::new(
+            gas_adjuster_config,
+            self.genesis_config.clone(),
+            state_keeper_config,
+            try_load_config!(eth_sender_config.sender).pubdata_sending_mode,
+        );
+        self.node.add_layer(sequencer_l1_gas_layer);
+        Ok(self)
+    }
+
+    fn add_object_store_layer(mut self) -> anyhow::Result<Self> {
+        let object_store_config = try_load_config!(self.configs.core_object_store);
+        self.node
+            .add_layer(ObjectStoreLayer::new(object_store_config));
+        Ok(self)
+    }
+
+    fn add_l1_batch_commitment_mode_validation_layer(mut self) -> anyhow::Result<Self> {
+        let layer = L1BatchCommitmentModeValidationLayer::new(
+            self.contracts_config.diamond_proxy_addr,
+            self.genesis_config.l1_batch_commit_data_generator_mode,
+        );
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_metadata_calculator_layer(mut self, with_tree_api: bool) -> anyhow::Result<Self> {
+        let merkle_tree_env_config = try_load_config!(self.configs.db_config).merkle_tree;
+        let operations_manager_env_config =
+            try_load_config!(self.configs.operations_manager_config);
+        let state_keeper_env_config = try_load_config!(self.configs.state_keeper_config);
+        let metadata_calculator_config = MetadataCalculatorConfig::for_main_node(
+            &merkle_tree_env_config,
+            &operations_manager_env_config,
+            &state_keeper_env_config,
+        );
+        let mut layer = MetadataCalculatorLayer::new(metadata_calculator_config);
+        if with_tree_api {
+            let merkle_tree_api_config = try_load_config!(self.configs.api_config).merkle_tree;
+            layer = layer.with_tree_api_config(merkle_tree_api_config);
+        }
+        self.node.add_layer(layer);
+        Ok(self)
+    }
+
+    fn add_state_keeper_layer(mut self) -> anyhow::Result<Self> {
+        // Bytecode compression is currently mandatory for the transactions processed by the sequencer.
+        const OPTIONAL_BYTECODE_COMPRESSION: bool = false;
+
+        let wallets = self.wallets.clone();
+        let sk_config = try_load_config!(self.configs.state_keeper_config);
+        let persistence_layer = OutputHandlerLayer::new(
+            self.contracts_config
+                .l2_shared_bridge_addr
+                .context("L2 shared bridge address")?,
+            sk_config.l2_block_seal_queue_capacity,
+        )
+        .with_protective_reads_persistence_enabled(sk_config.protective_reads_persistence_enabled);
+        let mempool_io_layer = MempoolIOLayer::new(
+            self.genesis_config.l2_chain_id,
+            sk_config.clone(),
+            try_load_config!(self.configs.mempool_config),
+            try_load_config!(wallets.state_keeper),
+        );
+        let db_config = try_load_config!(self.configs.db_config);
+        let main_node_batch_executor_builder_layer =
+            MainBatchExecutorLayer::new(sk_config.save_call_traces, OPTIONAL_BYTECODE_COMPRESSION);
+
+        let rocksdb_options = RocksdbStorageOptions {
+            block_cache_capacity: db_config
+                .experimental
+                .state_keeper_db_block_cache_capacity(),
+            max_open_files: db_config.experimental.state_keeper_db_max_open_files,
+        };
+        let state_keeper_layer =
+            StateKeeperLayer::new(db_config.state_keeper_db_path, rocksdb_options);
+        self.node
+            .add_layer(persistence_layer)
+            .add_layer(mempool_io_layer)
+            .add_layer(main_node_batch_executor_builder_layer)
+            .add_layer(state_keeper_layer);
+        Ok(self)
+    }
+
+    fn add_eth_watch_layer(mut self) -> anyhow::Result<Self> {
+        let eth_config = try_load_config!(self.configs.eth);
+        self.node.add_layer(EthWatchLayer::new(
+            try_load_config!(eth_config.watcher),
+            self.contracts_config.clone(),
+        ));
+        Ok(self)
+    }
+
+    fn add_proof_data_handler_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(ProofDataHandlerLayer::new(
+            try_load_config!(self.configs.proof_data_handler_config),
+            self.genesis_config.l1_batch_commit_data_generator_mode,
+        ));
+        Ok(self)
+    }
+
+    fn add_healthcheck_layer(mut self) -> anyhow::Result<Self> {
+        let healthcheck_config = try_load_config!(self.configs.api_config).healthcheck;
+        self.node.add_layer(HealthCheckLayer(healthcheck_config));
+        Ok(self)
+    }
+
+    fn add_tx_sender_layer(mut self) -> anyhow::Result<Self> {
+        let sk_config = try_load_config!(self.configs.state_keeper_config);
+        let rpc_config = try_load_config!(self.configs.api_config).web3_json_rpc;
+        let postgres_storage_caches_config = PostgresStorageCachesConfig {
+            factory_deps_cache_size: rpc_config.factory_deps_cache_size() as u64,
+            initial_writes_cache_size: rpc_config.initial_writes_cache_size() as u64,
+            latest_values_cache_size: rpc_config.latest_values_cache_size() as u64,
+        };
+
+        // On main node we always use master pool sink.
+        self.node.add_layer(TxSinkLayer::MasterPoolSink);
+        self.node.add_layer(TxSenderLayer::new(
+            TxSenderConfig::new(
+                &sk_config,
+                &rpc_config,
+                try_load_config!(self.wallets.state_keeper)
+                    .fee_account
+                    .address(),
+                self.genesis_config.l2_chain_id,
+            ),
+            postgres_storage_caches_config,
+            rpc_config.vm_concurrency_limit(),
+            ApiContracts::load_from_disk_blocking(), // TODO (BFT-138): Allow to dynamically reload API contracts
+        ));
+        Ok(self)
+    }
+
+    fn add_api_caches_layer(mut self) -> anyhow::Result<Self> {
+        let rpc_config = try_load_config!(self.configs.api_config).web3_json_rpc;
+        self.node.add_layer(MempoolCacheLayer::new(
+            rpc_config.mempool_cache_size(),
+            rpc_config.mempool_cache_update_interval(),
+        ));
+        Ok(self)
+    }
+
+    fn add_tree_api_client_layer(mut self) -> anyhow::Result<Self> {
+        let rpc_config = try_load_config!(self.configs.api_config).web3_json_rpc;
+        self.node
+            .add_layer(TreeApiClientLayer::http(rpc_config.tree_api_url));
+        Ok(self)
+    }
+
+    fn add_http_web3_api_layer(mut self) -> anyhow::Result<Self> {
+        let rpc_config = try_load_config!(self.configs.api_config).web3_json_rpc;
+        let state_keeper_config = try_load_config!(self.configs.state_keeper_config);
+        let with_debug_namespace = state_keeper_config.save_call_traces;
+
+        let mut namespaces = Namespace::DEFAULT.to_vec();
+        if with_debug_namespace {
+            namespaces.push(Namespace::Debug)
+        }
+        namespaces.push(Namespace::Snapshots);
+
+        let optional_config = Web3ServerOptionalConfig {
+            namespaces: Some(namespaces),
+            filters_limit: Some(rpc_config.filters_limit()),
+            subscriptions_limit: Some(rpc_config.subscriptions_limit()),
+            batch_request_size_limit: Some(rpc_config.max_batch_request_size()),
+            response_body_size_limit: Some(rpc_config.max_response_body_size()),
+            ..Default::default()
+        };
+        self.node.add_layer(Web3ServerLayer::http(
+            rpc_config.http_port,
+            InternalApiConfig::new(&rpc_config, &self.contracts_config, &self.genesis_config),
+            optional_config,
+        ));
+
+        Ok(self)
+    }
+
+    fn add_ws_web3_api_layer(mut self) -> anyhow::Result<Self> {
+        let rpc_config = try_load_config!(self.configs.api_config).web3_json_rpc;
+        let state_keeper_config = try_load_config!(self.configs.state_keeper_config);
+        let circuit_breaker_config = try_load_config!(self.configs.circuit_breaker_config);
+        let with_debug_namespace = state_keeper_config.save_call_traces;
+
+        let mut namespaces = if let Some(namespaces) = &rpc_config.api_namespaces {
+            namespaces
+                .iter()
+                .map(|a| a.parse())
+                .collect::<Result<_, _>>()?
+        } else {
+            Namespace::DEFAULT.to_vec()
+        };
+        if with_debug_namespace {
+            namespaces.push(Namespace::Debug)
+        }
+        namespaces.push(Namespace::Snapshots);
+
+        let optional_config = Web3ServerOptionalConfig {
+            namespaces: Some(namespaces),
+            filters_limit: Some(rpc_config.filters_limit()),
+            subscriptions_limit: Some(rpc_config.subscriptions_limit()),
+            batch_request_size_limit: Some(rpc_config.max_batch_request_size()),
+            response_body_size_limit: Some(rpc_config.max_response_body_size()),
+            websocket_requests_per_minute_limit: Some(
+                rpc_config.websocket_requests_per_minute_limit(),
+            ),
+            replication_lag_limit: circuit_breaker_config.replication_lag_limit(),
+            with_extended_tracing: rpc_config.extended_api_tracing,
+            ..Default::default()
+        };
+        self.node.add_layer(Web3ServerLayer::ws(
+            rpc_config.ws_port,
+            InternalApiConfig::new(&rpc_config, &self.contracts_config, &self.genesis_config),
+            optional_config,
+        ));
+
+        Ok(self)
+    }
+
+    fn add_eth_tx_manager_layer(mut self) -> anyhow::Result<Self> {
+        let eth_sender_config = try_load_config!(self.configs.eth);
+
+        self.node
+            .add_layer(EthTxManagerLayer::new(eth_sender_config));
+
+        Ok(self)
+    }
+
+    fn add_eth_tx_aggregator_layer(mut self) -> anyhow::Result<Self> {
+        let eth_sender_config = try_load_config!(self.configs.eth);
+
+        self.node.add_layer(EthTxAggregatorLayer::new(
+            eth_sender_config,
+            self.contracts_config.clone(),
+            self.genesis_config.l2_chain_id,
+            self.genesis_config.l1_batch_commit_data_generator_mode,
+        ));
+
+        Ok(self)
+    }
+
+    fn add_house_keeper_layer(mut self) -> anyhow::Result<Self> {
+        let house_keeper_config = try_load_config!(self.configs.house_keeper_config);
+        let fri_prover_config = try_load_config!(self.configs.prover_config);
+        let fri_witness_generator_config = try_load_config!(self.configs.witness_generator);
+        let fri_prover_group_config = try_load_config!(self.configs.prover_group_config);
+        let fri_proof_compressor_config = try_load_config!(self.configs.proof_compressor_config);
+
+        self.node.add_layer(HouseKeeperLayer::new(
+            house_keeper_config,
+            fri_prover_config,
+            fri_witness_generator_config,
+            fri_prover_group_config,
+            fri_proof_compressor_config,
+        ));
+
+        Ok(self)
+    }
+
+    fn add_commitment_generator_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(CommitmentGeneratorLayer::new(
+            self.genesis_config.l1_batch_commit_data_generator_mode,
+        ));
+
+        Ok(self)
+    }
+
+    fn add_circuit_breaker_checker_layer(mut self) -> anyhow::Result<Self> {
+        let circuit_breaker_config = try_load_config!(self.configs.circuit_breaker_config);
+        self.node
+            .add_layer(CircuitBreakerCheckerLayer(circuit_breaker_config));
+
+        Ok(self)
+    }
+
+    fn add_contract_verification_api_layer(mut self) -> anyhow::Result<Self> {
+        let config = try_load_config!(self.configs.contract_verifier);
+        self.node.add_layer(ContractVerificationApiLayer(config));
+        Ok(self)
+    }
+
+    fn add_consensus_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(ConsensusLayer {
+            mode: ConsensusMode::Main,
+            config: self.consensus_config.clone(),
+            secrets: self.secrets.consensus.clone(),
+        });
+
+        Ok(self)
+    }
+
+    fn add_tee_verifier_input_producer_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(TeeVerifierInputProducerLayer::new(
+            self.genesis_config.l2_chain_id,
+        ));
+
+        Ok(self)
+    }
+
+    fn add_no_da_client_layer(mut self) -> anyhow::Result<Self> {
+        self.node.add_layer(NoDAClientWiringLayer);
+        Ok(self)
+    }
+
+    #[allow(dead_code)]
+    fn add_object_storage_da_client_layer(mut self) -> anyhow::Result<Self> {
+        let object_store_config = DAObjectStoreConfig::from_env()?;
+        self.node
+            .add_layer(ObjectStorageClientWiringLayer::new(object_store_config.0));
+        Ok(self)
+    }
+
+    fn add_da_dispatcher_layer(mut self) -> anyhow::Result<Self> {
+        let eth_sender_config = try_load_config!(self.configs.eth);
+        if let Some(sender_config) = eth_sender_config.sender {
+            if sender_config.pubdata_sending_mode != PubdataSendingMode::Custom {
+                tracing::warn!("DA dispatcher is enabled, but the pubdata sending mode is not `Custom`. DA dispatcher will not be started.");
+                return Ok(self);
+            }
+        }
+
+        let state_keeper_config = try_load_config!(self.configs.state_keeper_config);
+        let da_config = try_load_config!(self.configs.da_dispatcher_config);
+        self.node.add_layer(DataAvailabilityDispatcherLayer::new(
+            state_keeper_config,
+            da_config,
+        ));
+
+        Ok(self)
+    }
+
+    fn add_vm_runner_protective_reads_layer(mut self) -> anyhow::Result<Self> {
+        let protective_reads_writer_config =
+            try_load_config!(self.configs.protective_reads_writer_config);
+        self.node.add_layer(ProtectiveReadsWriterLayer::new(
+            protective_reads_writer_config,
+            self.genesis_config.l2_chain_id,
+        ));
+
+        Ok(self)
+    }
+
+    fn add_base_token_ratio_persister_layer(mut self) -> anyhow::Result<Self> {
+        let config = try_load_config!(self.configs.base_token_adjuster);
+        self.node
+            .add_layer(BaseTokenRatioPersisterLayer::new(config));
+
+        Ok(self)
+    }
+
+    pub fn build(mut self, mut components: Vec<Component>) -> anyhow::Result<ZkStackService> {
+        // Add "base" layers (resources and helper tasks).
+        self = self
+            .add_sigint_handler_layer()?
+            .add_pools_layer()?
+            .add_object_store_layer()?
+            .add_circuit_breaker_checker_layer()?
+            .add_healthcheck_layer()?
+            .add_prometheus_exporter_layer()?
+            .add_query_eth_client_layer()?
+            .add_sequencer_l1_gas_layer()?
+            .add_l1_batch_commitment_mode_validation_layer()?;
+
+        // Sort the components, so that the components they may depend on each other are added in the correct order.
+        components.sort_unstable_by_key(|component| match component {
+            // API consumes the resources provided by other layers (multiple ones), so it has to come the last.
+            Component::HttpApi | Component::WsApi => 1,
+            // Default priority.
+            _ => 0,
+        });
+
+        // Add "component-specific" layers.
+        // Note that the layers are added only once, so it's fine to add the same layer multiple times.
+        for component in &components {
+            match component {
+                Component::HttpApi => {
+                    self = self
+                        .add_tx_sender_layer()?
+                        .add_tree_api_client_layer()?
+                        .add_api_caches_layer()?
+                        .add_http_web3_api_layer()?;
+                }
+                Component::WsApi => {
+                    self = self
+                        .add_tx_sender_layer()?
+                        .add_tree_api_client_layer()?
+                        .add_api_caches_layer()?
+                        .add_ws_web3_api_layer()?;
+                }
+                Component::ContractVerificationApi => {
+                    self = self.add_contract_verification_api_layer()?;
+                }
+                Component::Tree => {
+                    let with_tree_api = components.contains(&Component::TreeApi);
+                    self = self.add_metadata_calculator_layer(with_tree_api)?;
+                }
+                Component::TreeApi => {
+                    anyhow::ensure!(
+                        components.contains(&Component::Tree),
+                        "Merkle tree API cannot be started without a tree component"
+                    );
+                    // Do nothing, will be handled by the `Tree` component.
+                }
+                Component::EthWatcher => {
+                    self = self.add_eth_watch_layer()?;
+                }
+                Component::EthTxAggregator => {
+                    self = self
+                        .add_pk_signing_client_layer()?
+                        .add_eth_tx_aggregator_layer()?;
+                }
+                Component::EthTxManager => {
+                    self = self.add_eth_tx_manager_layer()?;
+                }
+                Component::StateKeeper => {
+                    self = self.add_state_keeper_layer()?;
+                }
+                Component::TeeVerifierInputProducer => {
+                    self = self.add_tee_verifier_input_producer_layer()?;
+                }
+                Component::Housekeeper => {
+                    self = self
+                        .add_house_keeper_layer()?
+                        .add_postgres_metrics_layer()?;
+                }
+                Component::ProofDataHandler => {
+                    self = self.add_proof_data_handler_layer()?;
+                }
+                Component::Consensus => {
+                    self = self.add_consensus_layer()?;
+                }
+                Component::CommitmentGenerator => {
+                    self = self.add_commitment_generator_layer()?;
+                }
+                Component::DADispatcher => {
+                    self = self.add_no_da_client_layer()?.add_da_dispatcher_layer()?;
+                }
+                Component::VmRunnerProtectiveReads => {
+                    self = self.add_vm_runner_protective_reads_layer()?;
+                }
+                Component::BaseTokenRatioPersister => {
+                    self = self.add_base_token_ratio_persister_layer()?;
+                }
+            }
+        }
+        Ok(self.node.build()?)
+    }
+}
diff --git a/core/bin/zksync_tee_prover/Cargo.toml b/core/bin/zksync_tee_prover/Cargo.toml
new file mode 100644
index 000000000000..f225c8a785e0
--- /dev/null
+++ b/core/bin/zksync_tee_prover/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "zksync_tee_prover"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+async-trait.workspace = true
+reqwest.workspace = true
+secp256k1.workspace = true
+serde = { workspace = true, features = ["derive"] }
+thiserror.workspace = true
+tokio = { workspace = true, features = ["full"] }
+tracing.workspace = true
+url.workspace = true
+zksync_basic_types.workspace = true
+zksync_config.workspace = true
+zksync_env_config.workspace = true
+zksync_node_framework.workspace = true
+zksync_prover_interface.workspace = true
+zksync_tee_verifier.workspace = true
+zksync_types.workspace = true
+zksync_vlog.workspace = true
diff --git a/core/bin/zksync_tee_prover/src/api_client.rs b/core/bin/zksync_tee_prover/src/api_client.rs
new file mode 100644
index 000000000000..2507d9b54fb1
--- /dev/null
+++ b/core/bin/zksync_tee_prover/src/api_client.rs
@@ -0,0 +1,111 @@
+use reqwest::Client;
+use secp256k1::{ecdsa::Signature, PublicKey};
+use serde::{de::DeserializeOwned, Serialize};
+use url::Url;
+use zksync_basic_types::H256;
+use zksync_prover_interface::{
+    api::{
+        RegisterTeeAttestationRequest, RegisterTeeAttestationResponse, SubmitTeeProofRequest,
+        SubmitTeeProofResponse, TeeProofGenerationDataRequest, TeeProofGenerationDataResponse,
+    },
+    inputs::TeeVerifierInput,
+    outputs::L1BatchTeeProofForL1,
+};
+use zksync_types::{tee_types::TeeType, L1BatchNumber};
+
+use crate::error::TeeProverError;
+
+/// Implementation of the API client for the proof data handler, run by
+/// [`zksync_proof_data_handler::run_server`].
+#[derive(Debug)]
+pub(crate) struct TeeApiClient {
+    api_base_url: Url,
+    http_client: Client,
+}
+
+impl TeeApiClient {
+    pub fn new(api_base_url: Url) -> Self {
+        TeeApiClient {
+            api_base_url,
+            http_client: Client::new(),
+        }
+    }
+
+    async fn post<Req, Resp, S>(&self, endpoint: S, request: Req) -> Result<Resp, reqwest::Error>
+    where
+        Req: Serialize + std::fmt::Debug,
+        Resp: DeserializeOwned,
+        S: AsRef<str>,
+    {
+        let url = self.api_base_url.join(endpoint.as_ref()).unwrap();
+
+        tracing::trace!("Sending POST request to {}: {:?}", url, request);
+
+        self.http_client
+            .post(url)
+            .json(&request)
+            .send()
+            .await?
+            .error_for_status()?
+            .json::<Resp>()
+            .await
+    }
+
+    /// Registers the attestation quote with the TEE prover interface API, effectively proving that
+    /// the private key associated with the given public key was used to sign the root hash within a
+    /// trusted execution environment.
+    pub async fn register_attestation(
+        &self,
+        attestation_quote_bytes: Vec<u8>,
+        public_key: &PublicKey,
+    ) -> Result<(), TeeProverError> {
+        let request = RegisterTeeAttestationRequest {
+            attestation: attestation_quote_bytes,
+            pubkey: public_key.serialize().to_vec(),
+        };
+        self.post::<_, RegisterTeeAttestationResponse, _>("/tee/register_attestation", request)
+            .await?;
+        tracing::info!(
+            "Attestation quote was successfully registered for the public key {}",
+            public_key
+        );
+        Ok(())
+    }
+
+    /// Fetches the next job for the TEE prover to process, verifying and signing it if the
+    /// verification is successful.
+    pub async fn get_job(&self) -> Result<Option<Box<TeeVerifierInput>>, TeeProverError> {
+        let request = TeeProofGenerationDataRequest {};
+        let response = self
+            .post::<_, TeeProofGenerationDataResponse, _>("/tee/proof_inputs", request)
+            .await?;
+        Ok(response.0)
+    }
+
+    /// Submits the successfully verified proof to the TEE prover interface API.
+    pub async fn submit_proof(
+        &self,
+        batch_number: L1BatchNumber,
+        signature: Signature,
+        pubkey: &PublicKey,
+        root_hash: H256,
+        tee_type: TeeType,
+    ) -> Result<(), TeeProverError> {
+        let request = SubmitTeeProofRequest(Box::new(L1BatchTeeProofForL1 {
+            signature: signature.serialize_compact().into(),
+            pubkey: pubkey.serialize().into(),
+            proof: root_hash.as_bytes().into(),
+            tee_type,
+        }));
+        self.post::<_, SubmitTeeProofResponse, _>(
+            format!("/tee/submit_proofs/{batch_number}").as_str(),
+            request,
+        )
+        .await?;
+        tracing::info!(
+            "Proof submitted successfully for batch number {}",
+            batch_number
+        );
+        Ok(())
+    }
+}
diff --git a/core/bin/zksync_tee_prover/src/config.rs b/core/bin/zksync_tee_prover/src/config.rs
new file mode 100644
index 000000000000..2a77c3752180
--- /dev/null
+++ b/core/bin/zksync_tee_prover/src/config.rs
@@ -0,0 +1,39 @@
+use std::path::PathBuf;
+
+use secp256k1::SecretKey;
+use url::Url;
+use zksync_env_config::FromEnv;
+use zksync_types::tee_types::TeeType;
+
+/// Configuration for the TEE prover.
+#[derive(Debug)]
+pub(crate) struct TeeProverConfig {
+    /// The private key used to sign the proofs.
+    pub signing_key: SecretKey,
+    /// The path to the file containing the TEE quote.
+    pub attestation_quote_file_path: PathBuf,
+    /// Attestation quote file.
+    pub tee_type: TeeType,
+    /// TEE proof data handler API.
+    pub api_url: Url,
+}
+
+impl FromEnv for TeeProverConfig {
+    /// Constructs the TEE Prover configuration from environment variables.
+    ///
+    /// Example usage of environment variables for tests:
+    /// ```
+    /// export TEE_SIGNING_KEY="b50b38c8d396c88728fc032ece558ebda96907a0b1a9340289715eef7bf29deb"
+    /// export TEE_QUOTE_FILE="/tmp/test"  # run `echo test > /tmp/test` beforehand
+    /// export TEE_TYPE="sgx"
+    /// export TEE_API_URL="http://127.0.0.1:3320"
+    /// ```
+    fn from_env() -> anyhow::Result<Self> {
+        Ok(Self {
+            signing_key: std::env::var("TEE_SIGNING_KEY")?.parse()?,
+            attestation_quote_file_path: std::env::var("TEE_QUOTE_FILE")?.parse()?,
+            tee_type: std::env::var("TEE_TYPE")?.parse()?,
+            api_url: std::env::var("TEE_API_URL")?.parse()?,
+        })
+    }
+}
diff --git a/core/bin/zksync_tee_prover/src/error.rs b/core/bin/zksync_tee_prover/src/error.rs
new file mode 100644
index 000000000000..bd60a772948a
--- /dev/null
+++ b/core/bin/zksync_tee_prover/src/error.rs
@@ -0,0 +1,47 @@
+use std::{error::Error as StdError, io};
+
+use reqwest::StatusCode;
+
+#[derive(Debug, thiserror::Error)]
+pub(crate) enum TeeProverError {
+    #[error(transparent)]
+    Request(#[from] reqwest::Error),
+    #[error(transparent)]
+    Verification(anyhow::Error),
+}
+
+impl TeeProverError {
+    pub fn is_transient(&self) -> bool {
+        match self {
+            Self::Request(err) => is_transient_http_error(err),
+            _ => false,
+        }
+    }
+}
+
+fn is_transient_http_error(err: &reqwest::Error) -> bool {
+    err.is_timeout()
+            || err.is_connect()
+            // Not all request errors are logically transient, but a significant part of them are (e.g.,
+            // `hyper` protocol-level errors), and it's safer to consider an error transient.
+            || err.is_request()
+            || has_transient_io_source(err)
+            || err.status() == Some(StatusCode::BAD_GATEWAY)
+            || err.status() == Some(StatusCode::SERVICE_UNAVAILABLE)
+}
+
+fn has_transient_io_source(err: &(dyn StdError + 'static)) -> bool {
+    // We treat any I/O errors as transient. This isn't always true, but frequently occurring I/O errors
+    // (e.g., "connection reset by peer") *are* transient, and treating an error as transient is a safer option,
+    // even if it can lead to unnecessary retries.
+    get_source::<io::Error>(err).is_some()
+}
+
+fn get_source<'a, T: StdError + 'static>(mut err: &'a (dyn StdError + 'static)) -> Option<&'a T> {
+    loop {
+        if let Some(err) = err.downcast_ref::<T>() {
+            return Some(err);
+        }
+        err = err.source()?;
+    }
+}
diff --git a/core/bin/zksync_tee_prover/src/main.rs b/core/bin/zksync_tee_prover/src/main.rs
new file mode 100644
index 000000000000..30d4b9a98002
--- /dev/null
+++ b/core/bin/zksync_tee_prover/src/main.rs
@@ -0,0 +1,56 @@
+use anyhow::Context as _;
+use config::TeeProverConfig;
+use tee_prover::TeeProverLayer;
+use zksync_config::configs::ObservabilityConfig;
+use zksync_env_config::FromEnv;
+use zksync_node_framework::{
+    implementations::layers::sigint::SigintHandlerLayer, service::ZkStackServiceBuilder,
+};
+
+mod api_client;
+mod config;
+mod error;
+mod tee_prover;
+
+/// This application serves as a TEE verifier, a.k.a. a TEE prover.
+///
+/// - It's an application that retrieves data about batches executed by the sequencer and verifies
+///   them in the TEE.
+/// - It's a stateless application, e.g. it interacts with the sequencer via API and does not have
+///   any kind of persistent state.
+/// - It submits proofs for proven batches back to the sequencer.
+/// - When the application starts, it registers the attestation on the sequencer, and then runs in a
+///   loop, polling the sequencer for new jobs (batches), verifying them, and submitting generated
+///   proofs back.
+fn main() -> anyhow::Result<()> {
+    let observability_config =
+        ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
+    let log_format: zksync_vlog::LogFormat = observability_config
+        .log_format
+        .parse()
+        .context("Invalid log format")?;
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    if let Some(sentry_url) = observability_config.sentry_url {
+        builder = builder
+            .with_sentry_url(&sentry_url)
+            .context("Invalid Sentry URL")?
+            .with_sentry_environment(observability_config.sentry_environment);
+    }
+    let _guard = builder.build();
+
+    let tee_prover_config = TeeProverConfig::from_env()?;
+    let attestation_quote_bytes = std::fs::read(tee_prover_config.attestation_quote_file_path)?;
+
+    ZkStackServiceBuilder::new()
+        .add_layer(SigintHandlerLayer)
+        .add_layer(TeeProverLayer::new(
+            tee_prover_config.api_url,
+            tee_prover_config.signing_key,
+            attestation_quote_bytes,
+            tee_prover_config.tee_type,
+        ))
+        .build()?
+        .run()?;
+
+    Ok(())
+}
diff --git a/core/bin/zksync_tee_prover/src/tee_prover.rs b/core/bin/zksync_tee_prover/src/tee_prover.rs
new file mode 100644
index 000000000000..b7a7f6f743e0
--- /dev/null
+++ b/core/bin/zksync_tee_prover/src/tee_prover.rs
@@ -0,0 +1,188 @@
+use std::time::Duration;
+
+use secp256k1::{ecdsa::Signature, Message, PublicKey, Secp256k1, SecretKey};
+use url::Url;
+use zksync_basic_types::H256;
+use zksync_node_framework::{
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+use zksync_prover_interface::inputs::TeeVerifierInput;
+use zksync_tee_verifier::Verify;
+use zksync_types::{tee_types::TeeType, L1BatchNumber};
+
+use crate::{api_client::TeeApiClient, error::TeeProverError};
+
+/// Wiring layer for `TeeProver`
+///
+/// ## Requests resources
+///
+/// no resources requested
+///
+/// ## Adds tasks
+///
+/// - `TeeProver`
+#[derive(Debug)]
+pub struct TeeProverLayer {
+    api_url: Url,
+    signing_key: SecretKey,
+    attestation_quote_bytes: Vec<u8>,
+    tee_type: TeeType,
+}
+
+impl TeeProverLayer {
+    pub fn new(
+        api_url: Url,
+        signing_key: SecretKey,
+        attestation_quote_bytes: Vec<u8>,
+        tee_type: TeeType,
+    ) -> Self {
+        Self {
+            api_url,
+            signing_key,
+            attestation_quote_bytes,
+            tee_type,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for TeeProverLayer {
+    fn layer_name(&self) -> &'static str {
+        "tee_prover_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let tee_prover_task = TeeProver {
+            config: Default::default(),
+            signing_key: self.signing_key,
+            public_key: self.signing_key.public_key(&Secp256k1::new()),
+            attestation_quote_bytes: self.attestation_quote_bytes,
+            tee_type: self.tee_type,
+            api_client: TeeApiClient::new(self.api_url),
+        };
+        context.add_task(tee_prover_task);
+        Ok(())
+    }
+}
+
+struct TeeProver {
+    config: TeeProverConfig,
+    signing_key: SecretKey,
+    public_key: PublicKey,
+    attestation_quote_bytes: Vec<u8>,
+    tee_type: TeeType,
+    api_client: TeeApiClient,
+}
+
+impl TeeProver {
+    fn verify(
+        &self,
+        tvi: TeeVerifierInput,
+    ) -> Result<(Signature, L1BatchNumber, H256), TeeProverError> {
+        match tvi {
+            TeeVerifierInput::V1(tvi) => {
+                let verification_result = tvi.verify().map_err(TeeProverError::Verification)?;
+                let root_hash_bytes = verification_result.value_hash.as_bytes();
+                let batch_number = verification_result.batch_number;
+                let msg_to_sign = Message::from_slice(root_hash_bytes)
+                    .map_err(|e| TeeProverError::Verification(e.into()))?;
+                let signature = self.signing_key.sign_ecdsa(msg_to_sign);
+                Ok((signature, batch_number, verification_result.value_hash))
+            }
+            _ => Err(TeeProverError::Verification(anyhow::anyhow!(
+                "Only TeeVerifierInput::V1 verification supported."
+            ))),
+        }
+    }
+
+    async fn step(&self) -> Result<(), TeeProverError> {
+        match self.api_client.get_job().await? {
+            Some(job) => {
+                let (signature, batch_number, root_hash) = self.verify(*job)?;
+                self.api_client
+                    .submit_proof(
+                        batch_number,
+                        signature,
+                        &self.public_key,
+                        root_hash,
+                        self.tee_type,
+                    )
+                    .await?;
+            }
+            None => tracing::trace!("There are currently no pending batches to be proven"),
+        }
+        Ok(())
+    }
+}
+
+/// TEE prover configuration options.
+#[derive(Debug, Clone)]
+pub struct TeeProverConfig {
+    /// Number of retries for transient errors before giving up on recovery (i.e., returning an error
+    /// from [`Self::run()`]).
+    pub max_retries: usize,
+    /// Initial back-off interval when retrying recovery on a transient error. Each subsequent retry interval
+    /// will be multiplied by [`Self.retry_backoff_multiplier`].
+    pub initial_retry_backoff: Duration,
+    pub retry_backoff_multiplier: f32,
+    pub max_backoff: Duration,
+}
+
+impl Default for TeeProverConfig {
+    fn default() -> Self {
+        Self {
+            max_retries: 5,
+            initial_retry_backoff: Duration::from_secs(1),
+            retry_backoff_multiplier: 2.0,
+            max_backoff: Duration::from_secs(128),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for TeeProver {
+    fn id(&self) -> TaskId {
+        "tee_prover".into()
+    }
+
+    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        tracing::info!("Starting the task {}", self.id());
+
+        self.api_client
+            .register_attestation(self.attestation_quote_bytes.clone(), &self.public_key)
+            .await?;
+
+        let mut retries = 1;
+        let mut backoff = self.config.initial_retry_backoff;
+
+        loop {
+            if *stop_receiver.0.borrow() {
+                tracing::info!("Stop signal received, shutting down TEE Prover component");
+                return Ok(());
+            }
+            let result = self.step().await;
+            match result {
+                Ok(()) => {
+                    retries = 1;
+                    backoff = self.config.initial_retry_backoff;
+                }
+                Err(err) => {
+                    if !err.is_transient() || retries > self.config.max_retries {
+                        return Err(err.into());
+                    }
+                    retries += 1;
+                    tracing::warn!(%err, "Failed TEE prover step function {retries}/{}, retrying in {} milliseconds.", self.config.max_retries, backoff.as_millis());
+                    tokio::time::timeout(backoff, stop_receiver.0.changed())
+                        .await
+                        .ok();
+                    backoff = std::cmp::min(
+                        backoff.mul_f32(self.config.retry_backoff_multiplier),
+                        self.config.max_backoff,
+                    );
+                }
+            }
+        }
+    }
+}
diff --git a/core/lib/basic_types/Cargo.toml b/core/lib/basic_types/Cargo.toml
index 918aa41cad02..937006bb2578 100644
--- a/core/lib/basic_types/Cargo.toml
+++ b/core/lib/basic_types/Cargo.toml
@@ -21,6 +21,7 @@ strum = { workspace = true, features = ["derive"] }
 num_enum.workspace = true
 anyhow.workspace = true
 url = { workspace = true, features = ["serde"] }
+serde_with.workspace = true
 
 [dev-dependencies]
 bincode.workspace = true
diff --git a/core/lib/basic_types/src/basic_fri_types.rs b/core/lib/basic_types/src/basic_fri_types.rs
index fc6818e773f0..a1563ff7e590 100644
--- a/core/lib/basic_types/src/basic_fri_types.rs
+++ b/core/lib/basic_types/src/basic_fri_types.rs
@@ -6,6 +6,8 @@ use std::{convert::TryFrom, str::FromStr};
 
 use serde::{Deserialize, Serialize};
 
+use crate::protocol_version::{ProtocolSemanticVersion, ProtocolVersionId, VersionPatch};
+
 const BLOB_CHUNK_SIZE: usize = 31;
 const ELEMENTS_PER_4844_BLOCK: usize = 4096;
 pub const MAX_4844_BLOBS_PER_BLOCK: usize = 16;
@@ -24,10 +26,16 @@ type Eip4844BlobsInner = [Option<Blob>; MAX_4844_BLOBS_PER_BLOCK];
 /// Current invariants:
 ///   - there are between [1, 16] blobs
 ///   - all blobs are of the same size [`EIP_4844_BLOB_SIZE`]
+///   - there may be no blobs in case of Validium
 /// Creating a structure violating these constraints will panic.
 ///
 /// Note: blobs are padded to fit the correct size.
-#[derive(Debug, Serialize, Deserialize, Clone)]
+// TODO: PLA-932
+/// Note 2: this becomes a rather leaky abstraction.
+/// It will be reworked once `BWIP` is introduced.
+/// Provers shouldn't need to decide between loading data from database or making it empty.
+/// Data should just be available
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 pub struct Eip4844Blobs {
     blobs: Eip4844BlobsInner,
 }
@@ -39,23 +47,27 @@ impl Eip4844Blobs {
 }
 
 impl Eip4844Blobs {
+    pub fn empty() -> Self {
+        Self {
+            blobs: Default::default(),
+        }
+    }
+
     pub fn encode(self) -> Vec<u8> {
         self.blobs().into_iter().flatten().flatten().collect()
     }
 
     pub fn decode(blobs: &[u8]) -> anyhow::Result<Self> {
+        // Validium case
+        if blobs.is_empty() {
+            return Ok(Self::empty());
+        }
         let mut chunks: Vec<Blob> = blobs
             .chunks(EIP_4844_BLOB_SIZE)
             .map(|chunk| chunk.into())
             .collect();
-
-        if let Some(last_chunk) = chunks.last_mut() {
-            last_chunk.resize(EIP_4844_BLOB_SIZE, 0u8);
-        } else {
-            return Err(anyhow::anyhow!(
-                "cannot create Eip4844Blobs, received empty pubdata"
-            ));
-        }
+        // Unwrapping here is safe because of check on first line of the function.
+        chunks.last_mut().unwrap().resize(EIP_4844_BLOB_SIZE, 0u8);
 
         if chunks.len() > MAX_4844_BLOBS_PER_BLOCK {
             return Err(anyhow::anyhow!(
@@ -174,6 +186,23 @@ impl TryFrom<i32> for AggregationRound {
     }
 }
 
+#[derive(Debug, Deserialize, Serialize, Clone, PartialEq, Eq, Hash)]
+pub struct JobIdentifiers {
+    pub circuit_id: u8,
+    pub aggregation_round: u8,
+    pub protocol_version: u16,
+    pub protocol_version_patch: u32,
+}
+
+impl JobIdentifiers {
+    pub fn get_semantic_protocol_version(&self) -> ProtocolSemanticVersion {
+        ProtocolSemanticVersion::new(
+            ProtocolVersionId::try_from(self.protocol_version).unwrap(),
+            VersionPatch(self.protocol_version_patch),
+        )
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -181,15 +210,8 @@ mod tests {
     #[test]
     fn test_eip_4844_blobs_empty_pubdata() {
         let payload = vec![];
-        match Eip4844Blobs::decode(&payload) {
-            Ok(_) => panic!("expected error, got Ok"),
-            Err(e) => {
-                assert_eq!(
-                    e.to_string(),
-                    "cannot create Eip4844Blobs, received empty pubdata"
-                );
-            }
-        }
+        let blobs = Eip4844Blobs::decode(&payload).unwrap();
+        assert_eq!(blobs, Eip4844Blobs::empty());
     }
 
     #[test]
diff --git a/core/lib/basic_types/src/commitment.rs b/core/lib/basic_types/src/commitment.rs
new file mode 100644
index 000000000000..873dff2313a2
--- /dev/null
+++ b/core/lib/basic_types/src/commitment.rs
@@ -0,0 +1,42 @@
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    ethabi,
+    web3::contract::{Detokenize, Error as ContractError},
+    U256,
+};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
+pub enum L1BatchCommitmentMode {
+    #[default]
+    Rollup,
+    Validium,
+}
+
+// The cases are extracted from the `PubdataPricingMode` enum in the L1 contracts,
+// And knowing that, in Ethereum, the response is the index of the enum case.
+// 0 corresponds to Rollup case,
+// 1 corresponds to Validium case,
+// Other values are incorrect.
+impl Detokenize for L1BatchCommitmentMode {
+    fn from_tokens(tokens: Vec<ethabi::Token>) -> Result<Self, ContractError> {
+        fn error(tokens: &[ethabi::Token]) -> ContractError {
+            ContractError::InvalidOutputType(format!(
+                "L1BatchCommitDataGeneratorMode::from_tokens: {tokens:?}"
+            ))
+        }
+
+        match tokens.as_slice() {
+            [ethabi::Token::Uint(enum_value)] => {
+                if enum_value == &U256::zero() {
+                    Ok(L1BatchCommitmentMode::Rollup)
+                } else if enum_value == &U256::one() {
+                    Ok(L1BatchCommitmentMode::Validium)
+                } else {
+                    Err(error(&tokens))
+                }
+            }
+            _ => Err(error(&tokens)),
+        }
+    }
+}
diff --git a/core/lib/basic_types/src/lib.rs b/core/lib/basic_types/src/lib.rs
index d30418bfc339..21e90f4bad77 100644
--- a/core/lib/basic_types/src/lib.rs
+++ b/core/lib/basic_types/src/lib.rs
@@ -1,4 +1,4 @@
-//! The declaration of the most primitive types used in zkSync network.
+//! The declaration of the most primitive types used in ZKsync network.
 //!
 //! Most of them are just re-exported from the `web3` crate.
 
@@ -22,9 +22,11 @@ use serde::{de, Deserialize, Deserializer, Serialize};
 #[macro_use]
 mod macros;
 pub mod basic_fri_types;
+pub mod commitment;
 pub mod network;
 pub mod protocol_version;
 pub mod prover_dal;
+pub mod tee_types;
 pub mod url;
 pub mod vm_version;
 pub mod web3;
@@ -85,7 +87,7 @@ impl TryFrom<U256> for AccountTreeId {
     }
 }
 
-/// ChainId in the zkSync network.
+/// ChainId in the ZKsync network.
 #[derive(Copy, Clone, Debug, Serialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct L2ChainId(u64);
 
@@ -182,13 +184,13 @@ impl From<u32> for L2ChainId {
 }
 
 basic_type!(
-    /// zkSync network block sequential index.
+    /// ZKsync network block sequential index.
     L2BlockNumber,
     u32
 );
 
 basic_type!(
-    /// zkSync L1 batch sequential index.
+    /// ZKsync L1 batch sequential index.
     L1BatchNumber,
     u32
 );
@@ -200,13 +202,13 @@ basic_type!(
 );
 
 basic_type!(
-    /// zkSync account nonce.
+    /// ZKsync account nonce.
     Nonce,
     u32
 );
 
 basic_type!(
-    /// Unique identifier of the priority operation in the zkSync network.
+    /// Unique identifier of the priority operation in the ZKsync network.
     PriorityOpId,
     u64
 );
diff --git a/core/lib/basic_types/src/network.rs b/core/lib/basic_types/src/network.rs
index 5f4683aeb672..cfa82e8c8464 100644
--- a/core/lib/basic_types/src/network.rs
+++ b/core/lib/basic_types/src/network.rs
@@ -1,4 +1,4 @@
-//! The network where the zkSync resides.
+//! The network where the ZKsync resides.
 //!
 
 // Built-in uses
@@ -12,7 +12,7 @@ use crate::L1ChainId;
 
 // Local uses
 
-/// Network to be used for a zkSync client.
+/// Network to be used for a ZKsync client.
 #[derive(Debug, Serialize, Deserialize, Clone, Copy, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub enum Network {
diff --git a/core/lib/basic_types/src/protocol_version.rs b/core/lib/basic_types/src/protocol_version.rs
index b5d15e6cbc70..f0d12436e3b8 100644
--- a/core/lib/basic_types/src/protocol_version.rs
+++ b/core/lib/basic_types/src/protocol_version.rs
@@ -1,7 +1,14 @@
-use std::convert::{TryFrom, TryInto};
+use std::{
+    convert::{TryFrom, TryInto},
+    fmt,
+    num::ParseIntError,
+    ops::{Add, Deref, DerefMut, Sub},
+    str::FromStr,
+};
 
 use num_enum::TryFromPrimitive;
 use serde::{Deserialize, Serialize};
+use serde_with::{DeserializeFromStr, SerializeDisplay};
 
 use crate::{
     ethabi::Token,
@@ -10,6 +17,14 @@ use crate::{
     H256, U256,
 };
 
+pub const PACKED_SEMVER_MINOR_OFFSET: u32 = 32;
+pub const PACKED_SEMVER_MINOR_MASK: u32 = 0xFFFF;
+
+/// `ProtocolVersionId` is a unique identifier of the protocol version.
+/// Note, that it is an identifier of the `minor` semver version of the protocol, with
+/// the `major` version being `0`. Also, the protocol version on the contracts may contain
+/// potential minor versions, that may have different contract behavior (e.g. Verifier), but it should not
+/// impact the users.
 #[repr(u16)]
 #[derive(
     Debug,
@@ -56,16 +71,23 @@ pub enum ProtocolVersionId {
 }
 
 impl ProtocolVersionId {
-    pub fn latest() -> Self {
+    pub const fn latest() -> Self {
         Self::Version24
     }
 
-    pub fn current_prover_version() -> Self {
-        Self::Version24
+    pub const fn next() -> Self {
+        Self::Version25
     }
 
-    pub fn next() -> Self {
-        Self::Version25
+    pub fn try_from_packed_semver(packed_semver: U256) -> Result<Self, String> {
+        ProtocolSemanticVersion::try_from_packed(packed_semver).map(|p| p.minor)
+    }
+
+    pub fn into_packed_semver_with_patch(self, patch: usize) -> U256 {
+        let minor = U256::from(self as u16);
+        let patch = U256::from(patch as u32);
+
+        (minor << U256::from(PACKED_SEMVER_MINOR_OFFSET)) | patch
     }
 
     /// Returns VM version to be used by API for this protocol version.
@@ -158,6 +180,12 @@ impl Default for ProtocolVersionId {
     }
 }
 
+impl fmt::Display for ProtocolVersionId {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", *self as u16)
+    }
+}
+
 impl TryFrom<U256> for ProtocolVersionId {
     type Error = String;
 
@@ -246,3 +274,125 @@ impl From<ProtocolVersionId> for VmVersion {
         }
     }
 }
+
+basic_type!(
+    /// Patch part of semantic protocol version.
+    VersionPatch,
+    u32
+);
+
+/// Semantic protocol version.
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, SerializeDisplay, DeserializeFromStr, Hash, PartialOrd, Ord,
+)]
+pub struct ProtocolSemanticVersion {
+    pub minor: ProtocolVersionId,
+    pub patch: VersionPatch,
+}
+
+impl ProtocolSemanticVersion {
+    const MAJOR_VERSION: u8 = 0;
+
+    pub fn new(minor: ProtocolVersionId, patch: VersionPatch) -> Self {
+        Self { minor, patch }
+    }
+
+    pub fn try_from_packed(packed: U256) -> Result<Self, String> {
+        let minor = ((packed >> U256::from(PACKED_SEMVER_MINOR_OFFSET))
+            & U256::from(PACKED_SEMVER_MINOR_MASK))
+        .try_into()?;
+        let patch = packed.0[0] as u32;
+
+        Ok(Self {
+            minor,
+            patch: VersionPatch(patch),
+        })
+    }
+
+    pub fn pack(&self) -> U256 {
+        (U256::from(self.minor as u16) << U256::from(PACKED_SEMVER_MINOR_OFFSET))
+            | U256::from(self.patch.0)
+    }
+}
+
+impl fmt::Display for ProtocolSemanticVersion {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}.{}.{}",
+            Self::MAJOR_VERSION,
+            self.minor as u16,
+            self.patch
+        )
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ParseProtocolSemanticVersionError {
+    #[error("invalid format")]
+    InvalidFormat,
+    #[error("non zero major version")]
+    NonZeroMajorVersion,
+    #[error("{0}")]
+    ParseIntError(ParseIntError),
+}
+
+impl FromStr for ProtocolSemanticVersion {
+    type Err = ParseProtocolSemanticVersionError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let parts: Vec<&str> = s.split('.').collect();
+        if parts.len() != 3 {
+            return Err(ParseProtocolSemanticVersionError::InvalidFormat);
+        }
+
+        let major = parts[0]
+            .parse::<u16>()
+            .map_err(ParseProtocolSemanticVersionError::ParseIntError)?;
+        if major != 0 {
+            return Err(ParseProtocolSemanticVersionError::NonZeroMajorVersion);
+        }
+
+        let minor = parts[1]
+            .parse::<u16>()
+            .map_err(ParseProtocolSemanticVersionError::ParseIntError)?;
+        let minor = ProtocolVersionId::try_from(minor)
+            .map_err(|_| ParseProtocolSemanticVersionError::InvalidFormat)?;
+
+        let patch = parts[2]
+            .parse::<u32>()
+            .map_err(ParseProtocolSemanticVersionError::ParseIntError)?;
+
+        Ok(ProtocolSemanticVersion {
+            minor,
+            patch: patch.into(),
+        })
+    }
+}
+
+impl Default for ProtocolSemanticVersion {
+    fn default() -> Self {
+        Self {
+            minor: Default::default(),
+            patch: 0.into(),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_protocol_version_packing() {
+        let version = ProtocolSemanticVersion {
+            minor: ProtocolVersionId::latest(),
+            patch: 10.into(),
+        };
+
+        let packed = version.pack();
+        let unpacked = ProtocolSemanticVersion::try_from_packed(packed).unwrap();
+
+        assert_eq!(version, unpacked);
+    }
+}
diff --git a/core/lib/basic_types/src/prover_dal.rs b/core/lib/basic_types/src/prover_dal.rs
index dc106da18a7b..3215e7095e60 100644
--- a/core/lib/basic_types/src/prover_dal.rs
+++ b/core/lib/basic_types/src/prover_dal.rs
@@ -10,10 +10,6 @@ use crate::{
     L1BatchNumber,
 };
 
-// This currently lives in `zksync_prover_types` -- we don't want a dependency between prover types (`zkevm_test_harness`) and DAL.
-// This will be gone as part of 1.5.0, when EIP4844 becomes normal jobs, rather than special cased ones.
-pub const EIP_4844_CIRCUIT_ID: u8 = 255;
-
 #[derive(Debug, Clone)]
 pub struct FriProverJobMetadata {
     pub id: u32,
@@ -26,15 +22,21 @@ pub struct FriProverJobMetadata {
 }
 
 #[derive(Debug, Clone, Copy, Default)]
-pub struct JobCountStatistics {
+pub struct ExtendedJobCountStatistics {
     pub queued: usize,
     pub in_progress: usize,
     pub failed: usize,
     pub successful: usize,
 }
 
-impl Add for JobCountStatistics {
-    type Output = JobCountStatistics;
+#[derive(Debug, Clone, Copy, Default)]
+pub struct JobCountStatistics {
+    pub queued: usize,
+    pub in_progress: usize,
+}
+
+impl Add for ExtendedJobCountStatistics {
+    type Output = ExtendedJobCountStatistics;
 
     fn add(self, rhs: Self) -> Self::Output {
         Self {
@@ -51,6 +53,7 @@ pub struct StuckJobs {
     pub id: u64,
     pub status: String,
     pub attempts: u64,
+    pub circuit_id: Option<u32>,
 }
 
 // TODO (PLA-774): Redundant structure, should be replaced with `std::net::SocketAddr`.
@@ -98,13 +101,13 @@ pub struct JobPosition {
     pub sequence_number: usize,
 }
 
-#[derive(Debug, Default, PartialEq)]
+#[derive(Debug, Default, PartialEq, Clone)]
 pub struct ProverJobStatusFailed {
     pub started_at: DateTime<Utc>,
     pub error: String,
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Clone)]
 pub struct ProverJobStatusSuccessful {
     pub started_at: DateTime<Utc>,
     pub time_taken: Duration,
@@ -119,7 +122,7 @@ impl Default for ProverJobStatusSuccessful {
     }
 }
 
-#[derive(Debug, Default, PartialEq)]
+#[derive(Debug, Default, PartialEq, Clone)]
 pub struct ProverJobStatusInProgress {
     pub started_at: DateTime<Utc>,
 }
@@ -145,7 +148,7 @@ pub struct WitnessJobStatusFailed {
     pub error: String,
 }
 
-#[derive(Debug, strum::Display, strum::EnumString, strum::AsRefStr, PartialEq)]
+#[derive(Debug, strum::Display, strum::EnumString, strum::AsRefStr, PartialEq, Clone)]
 pub enum ProverJobStatus {
     #[strum(serialize = "queued")]
     Queued,
@@ -159,6 +162,8 @@ pub enum ProverJobStatus {
     Skipped,
     #[strum(serialize = "ignored")]
     Ignored,
+    #[strum(serialize = "in_gpu_proof")]
+    InGPUProof,
 }
 
 #[derive(Debug, Clone, strum::Display, strum::EnumString, strum::AsRefStr)]
@@ -235,6 +240,7 @@ impl FromStr for GpuProverInstanceStatus {
     }
 }
 
+#[derive(Debug, Clone)]
 pub struct ProverJobFriInfo {
     pub id: u32,
     pub l1_batch_number: L1BatchNumber,
@@ -257,6 +263,7 @@ pub struct ProverJobFriInfo {
     pub picked_by: Option<String>,
 }
 
+#[derive(Debug, Clone)]
 pub struct BasicWitnessGeneratorJobInfo {
     pub l1_batch_number: L1BatchNumber,
     pub merkle_tree_paths_blob_url: Option<String>,
@@ -273,6 +280,7 @@ pub struct BasicWitnessGeneratorJobInfo {
     pub eip_4844_blobs: Option<Eip4844Blobs>,
 }
 
+#[derive(Debug, Clone)]
 pub struct LeafWitnessGeneratorJobInfo {
     pub id: u32,
     pub l1_batch_number: L1BatchNumber,
@@ -291,6 +299,7 @@ pub struct LeafWitnessGeneratorJobInfo {
     pub picked_by: Option<String>,
 }
 
+#[derive(Debug, Clone)]
 pub struct NodeWitnessGeneratorJobInfo {
     pub id: u32,
     pub l1_batch_number: L1BatchNumber,
@@ -309,6 +318,22 @@ pub struct NodeWitnessGeneratorJobInfo {
     pub picked_by: Option<String>,
 }
 
+#[derive(Debug, Clone)]
+pub struct RecursionTipWitnessGeneratorJobInfo {
+    pub l1_batch_number: L1BatchNumber,
+    pub status: WitnessJobStatus,
+    pub attempts: u32,
+    pub processing_started_at: Option<NaiveDateTime>,
+    pub time_taken: Option<NaiveTime>,
+    pub error: Option<String>,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+    pub number_of_final_node_jobs: i32,
+    pub protocol_version: Option<i32>,
+    pub picked_by: Option<String>,
+}
+
+#[derive(Debug, Clone)]
 pub struct SchedulerWitnessGeneratorJobInfo {
     pub l1_batch_number: L1BatchNumber,
     pub scheduler_partial_input_blob_url: String,
@@ -323,7 +348,7 @@ pub struct SchedulerWitnessGeneratorJobInfo {
     pub picked_by: Option<String>,
 }
 
-#[derive(Debug, EnumString, Display)]
+#[derive(Debug, EnumString, Display, Clone)]
 pub enum ProofCompressionJobStatus {
     #[strum(serialize = "queued")]
     Queued,
@@ -339,6 +364,7 @@ pub enum ProofCompressionJobStatus {
     Skipped,
 }
 
+#[derive(Debug, Clone)]
 pub struct ProofCompressionJobInfo {
     pub l1_batch_number: L1BatchNumber,
     pub attempts: u32,
@@ -352,3 +378,12 @@ pub struct ProofCompressionJobInfo {
     pub time_taken: Option<NaiveTime>,
     pub picked_by: Option<String>,
 }
+
+// Used for transferring information about L1 Batches from DAL to public interfaces (currently prover_cli stats).
+/// DTO containing information about L1 Batch Proof.
+#[derive(Debug, Clone)]
+pub struct ProofGenerationTime {
+    pub l1_batch_number: L1BatchNumber,
+    pub time_taken: NaiveTime,
+    pub created_at: NaiveDateTime,
+}
diff --git a/core/lib/basic_types/src/tee_types.rs b/core/lib/basic_types/src/tee_types.rs
new file mode 100644
index 000000000000..c9be9b6e99d8
--- /dev/null
+++ b/core/lib/basic_types/src/tee_types.rs
@@ -0,0 +1,9 @@
+use serde::{Deserialize, Serialize};
+use strum::{Display, EnumString};
+
+#[derive(Debug, Clone, Copy, PartialEq, EnumString, Display, Serialize, Deserialize)]
+#[non_exhaustive]
+pub enum TeeType {
+    #[strum(serialize = "sgx")]
+    Sgx,
+}
diff --git a/core/lib/basic_types/src/web3/mod.rs b/core/lib/basic_types/src/web3/mod.rs
index be785040d2dd..cfeeaa533b36 100644
--- a/core/lib/basic_types/src/web3/mod.rs
+++ b/core/lib/basic_types/src/web3/mod.rs
@@ -61,9 +61,13 @@ impl Serialize for Bytes {
     where
         S: Serializer,
     {
-        let mut serialized = "0x".to_owned();
-        serialized.push_str(&hex::encode(&self.0));
-        serializer.serialize_str(serialized.as_ref())
+        if serializer.is_human_readable() {
+            let mut serialized = "0x".to_owned();
+            serialized.push_str(&hex::encode(&self.0));
+            serializer.serialize_str(serialized.as_ref())
+        } else {
+            self.0.serialize(serializer)
+        }
     }
 }
 
@@ -72,7 +76,11 @@ impl<'a> Deserialize<'a> for Bytes {
     where
         D: Deserializer<'a>,
     {
-        deserializer.deserialize_identifier(BytesVisitor)
+        if deserializer.is_human_readable() {
+            deserializer.deserialize_identifier(BytesVisitor)
+        } else {
+            Vec::<u8>::deserialize(deserializer).map(Bytes)
+        }
     }
 }
 
@@ -111,35 +119,55 @@ impl<'a> Visitor<'a> for BytesVisitor {
     {
         self.visit_str(value.as_ref())
     }
+
+    fn visit_bytes<E>(self, value: &[u8]) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(Bytes(value.to_vec()))
+    }
+
+    fn visit_byte_buf<E>(self, value: Vec<u8>) -> Result<Self::Value, E>
+    where
+        E: Error,
+    {
+        Ok(Bytes(value))
+    }
 }
 
 // `Log`: from `web3::types::log`
 
 /// Filter
-#[derive(Default, Debug, PartialEq, Clone, Serialize)]
+#[derive(Default, Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct Filter {
     /// From Block
     #[serde(rename = "fromBlock", skip_serializing_if = "Option::is_none")]
-    from_block: Option<BlockNumber>,
+    pub from_block: Option<BlockNumber>,
     /// To Block
     #[serde(rename = "toBlock", skip_serializing_if = "Option::is_none")]
-    to_block: Option<BlockNumber>,
+    pub to_block: Option<BlockNumber>,
     /// Block Hash
     #[serde(rename = "blockHash", skip_serializing_if = "Option::is_none")]
-    block_hash: Option<H256>,
+    pub block_hash: Option<H256>,
     /// Address
     #[serde(skip_serializing_if = "Option::is_none")]
-    address: Option<ValueOrArray<H160>>,
+    pub address: Option<ValueOrArray<H160>>,
     /// Topics
     #[serde(skip_serializing_if = "Option::is_none")]
-    topics: Option<Vec<Option<ValueOrArray<H256>>>>,
+    pub topics: Option<Vec<Option<ValueOrArray<H256>>>>,
     /// Limit
     #[serde(skip_serializing_if = "Option::is_none")]
-    limit: Option<usize>,
+    pub limit: Option<usize>,
 }
 
 #[derive(Default, Debug, PartialEq, Clone)]
-struct ValueOrArray<T>(Vec<T>);
+pub struct ValueOrArray<T>(Vec<T>);
+
+impl<T> ValueOrArray<T> {
+    pub fn flatten(self) -> Vec<T> {
+        self.0
+    }
+}
 
 impl<T> Serialize for ValueOrArray<T>
 where
@@ -157,6 +185,25 @@ where
     }
 }
 
+impl<'de, T> Deserialize<'de> for ValueOrArray<T>
+where
+    T: Deserialize<'de>,
+{
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        #[derive(Deserialize)]
+        #[serde(untagged)]
+        enum Repr<T> {
+            Single(T),
+            Sequence(Vec<T>),
+        }
+
+        Ok(match Repr::<T>::deserialize(deserializer)? {
+            Repr::Single(element) => Self(vec![element]),
+            Repr::Sequence(elements) => Self(elements),
+        })
+    }
+}
+
 // Filter Builder
 #[derive(Default, Clone)]
 pub struct FilterBuilder {
@@ -249,7 +296,7 @@ fn topic_to_option<T>(topic: ethabi::Topic<T>) -> Option<Vec<T>> {
 }
 
 /// A log produced by a transaction.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)]
 pub struct Log {
     /// H160
     pub address: H160,
@@ -454,6 +501,28 @@ impl Serialize for BlockId {
     }
 }
 
+impl<'de> Deserialize<'de> for BlockId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        #[derive(Deserialize)]
+        #[serde(untagged)]
+        enum BlockIdRepresentation {
+            Number(BlockNumber),
+            Hash {
+                #[serde(rename = "blockHash")]
+                block_hash: H256,
+            },
+        }
+
+        Ok(match BlockIdRepresentation::deserialize(deserializer)? {
+            BlockIdRepresentation::Number(number) => Self::Number(number),
+            BlockIdRepresentation::Hash { block_hash } => Self::Hash(block_hash),
+        })
+    }
+}
+
 impl From<U64> for BlockId {
     fn from(num: U64) -> Self {
         BlockNumber::Number(num).into()
@@ -758,6 +827,7 @@ pub enum TransactionCondition {
 }
 
 // `FeeHistory`: from `web3::types::fee_history`
+// Adapted to support blobs.
 
 /// The fee history type returned from `eth_feeHistory` call.
 #[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
@@ -765,14 +835,25 @@ pub enum TransactionCondition {
 pub struct FeeHistory {
     /// Lowest number block of the returned range.
     pub oldest_block: BlockNumber,
-    /// A vector of block base fees per gas. This includes the next block after the newest of the returned range, because this value can be derived from the newest block. Zeroes are returned for pre-EIP-1559 blocks.
+    /// A vector of block base fees per gas. This includes the next block after the newest of the returned range,
+    /// because this value can be derived from the newest block. Zeroes are returned for pre-EIP-1559 blocks.
     #[serde(default)] // some node implementations skip empty lists
     pub base_fee_per_gas: Vec<U256>,
     /// A vector of block gas used ratios. These are calculated as the ratio of gas used and gas limit.
     #[serde(default)] // some node implementations skip empty lists
     pub gas_used_ratio: Vec<f64>,
-    /// A vector of effective priority fee per gas data points from a single block. All zeroes are returned if the block is empty. Returned only if requested.
+    /// A vector of effective priority fee per gas data points from a single block. All zeroes are returned if
+    /// the block is empty. Returned only if requested.
     pub reward: Option<Vec<Vec<U256>>>,
+    /// An array of base fees per blob gas for blocks. This includes the next block following the newest in the
+    /// returned range, as this value can be derived from the latest block. For blocks before EIP-4844, zeroes
+    /// are returned.
+    #[serde(default)] // some node implementations skip empty lists
+    pub base_fee_per_blob_gas: Vec<U256>,
+    /// An array showing the ratios of blob gas used in blocks. These ratios are calculated by dividing blobGasUsed
+    /// by the maximum blob gas per block.
+    #[serde(default)] // some node implementations skip empty lists
+    pub blob_gas_used_ratio: Vec<f64>,
 }
 
 // `SyncInfo`, `SyncState`: from `web3::types::sync_state`
@@ -798,6 +879,28 @@ pub enum SyncState {
     NotSyncing,
 }
 
+// Sync info from subscription has a different key format
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+struct SubscriptionSyncInfo {
+    /// The block at which import began.
+    pub starting_block: U256,
+    /// The highest currently synced block.
+    pub current_block: U256,
+    /// The estimated highest block.
+    pub highest_block: U256,
+}
+
+impl From<SubscriptionSyncInfo> for SyncInfo {
+    fn from(s: SubscriptionSyncInfo) -> Self {
+        Self {
+            starting_block: s.starting_block,
+            current_block: s.current_block,
+            highest_block: s.highest_block,
+        }
+    }
+}
+
 // The `eth_syncing` method returns either `false` or an instance of the sync info object.
 // This doesn't play particularly well with the features exposed by `serde_derive`,
 // so we use the custom impls below to ensure proper behavior.
@@ -806,28 +909,6 @@ impl<'de> Deserialize<'de> for SyncState {
     where
         D: Deserializer<'de>,
     {
-        // Sync info from subscription has a different key format
-        #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-        #[serde(rename_all = "PascalCase")]
-        struct SubscriptionSyncInfo {
-            /// The block at which import began.
-            pub starting_block: U256,
-            /// The highest currently synced block.
-            pub current_block: U256,
-            /// The estimated highest block.
-            pub highest_block: U256,
-        }
-
-        impl From<SubscriptionSyncInfo> for SyncInfo {
-            fn from(s: SubscriptionSyncInfo) -> Self {
-                Self {
-                    starting_block: s.starting_block,
-                    current_block: s.current_block,
-                    highest_block: s.highest_block,
-                }
-            }
-        }
-
         #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
         struct SubscriptionSyncState {
             pub syncing: bool,
diff --git a/core/lib/basic_types/src/web3/tests.rs b/core/lib/basic_types/src/web3/tests.rs
index e7c0a0d048a7..7f85bf12eb80 100644
--- a/core/lib/basic_types/src/web3/tests.rs
+++ b/core/lib/basic_types/src/web3/tests.rs
@@ -1,5 +1,26 @@
 use super::*;
 
+#[test]
+fn block_id_can_be_deserialized() {
+    let block_id: BlockId = serde_json::from_str("\"latest\"").unwrap();
+    assert_eq!(block_id, BlockId::Number(BlockNumber::Latest));
+    let block_id: BlockId = serde_json::from_str("\"pending\"").unwrap();
+    assert_eq!(block_id, BlockId::Number(BlockNumber::Pending));
+    let block_id: BlockId = serde_json::from_str("\"earliest\"").unwrap();
+    assert_eq!(block_id, BlockId::Number(BlockNumber::Earliest));
+    let block_id: BlockId = serde_json::from_str("\"0x12\"").unwrap();
+    assert_eq!(
+        block_id,
+        BlockId::Number(BlockNumber::Number(U64::from(0x12)))
+    );
+
+    let block_id: BlockId = serde_json::from_str(
+        r#"{ "blockHash": "0x4242424242424242424242424242424242424242424242424242424242424242" }"#,
+    )
+    .unwrap();
+    assert_eq!(block_id, BlockId::Hash(H256::repeat_byte(0x42)));
+}
+
 #[test]
 fn block_can_be_deserialized() {
     let post_dencun = r#"
@@ -83,3 +104,27 @@ fn block_can_be_deserialized() {
     let block: Block<H256> = serde_json::from_str(pre_dencun).unwrap();
     assert!(block.excess_blob_gas.is_none());
 }
+
+#[test]
+fn test_bytes_serde_bincode() {
+    let original = Bytes(vec![0, 1, 2, 3, 4]);
+    let encoded: Vec<u8> = bincode::serialize(&original).unwrap();
+    let decoded: Bytes = bincode::deserialize(&encoded).unwrap();
+    assert_eq!(original, decoded);
+}
+
+#[test]
+fn test_bytes_serde_bincode_snapshot() {
+    let original = Bytes(vec![0, 1, 2, 3, 4]);
+    let encoded: Vec<u8> = vec![5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4];
+    let decoded: Bytes = bincode::deserialize(&encoded).unwrap();
+    assert_eq!(original, decoded);
+}
+
+#[test]
+fn test_bytes_serde_json() {
+    let original = Bytes(vec![0, 1, 2, 3, 4]);
+    let encoded = serde_json::to_string(&original).unwrap();
+    let decoded: Bytes = serde_json::from_str(&encoded).unwrap();
+    assert_eq!(original, decoded);
+}
diff --git a/core/lib/config/Cargo.toml b/core/lib/config/Cargo.toml
index 29c493d76cce..2e1da7d0f3a2 100644
--- a/core/lib/config/Cargo.toml
+++ b/core/lib/config/Cargo.toml
@@ -13,8 +13,9 @@ categories.workspace = true
 zksync_basic_types.workspace = true
 zksync_crypto_primitives.workspace = true
 zksync_consensus_utils.workspace = true
+zksync_concurrency.workspace = true
 
 anyhow.workspace = true
 rand.workspace = true
+secrecy.workspace = true
 serde = { workspace = true, features = ["derive"] }
-url.workspace = true
diff --git a/core/lib/config/src/configs/api.rs b/core/lib/config/src/configs/api.rs
index 3b33ef43343f..e039ab10116a 100644
--- a/core/lib/config/src/configs/api.rs
+++ b/core/lib/config/src/configs/api.rs
@@ -213,6 +213,13 @@ pub struct Web3JsonRpcConfig {
     /// (additionally to natively bridged tokens).
     #[serde(default)]
     pub whitelisted_tokens_for_aa: Vec<Address>,
+    /// Enabled JSON RPC API namespaces. If not set, all namespaces will be available
+    #[serde(default)]
+    pub api_namespaces: Option<Vec<String>>,
+    /// Enables extended tracing of RPC calls. This may negatively impact performance for nodes under high load
+    /// (hundreds or thousands RPS).
+    #[serde(default)]
+    pub extended_api_tracing: bool,
 }
 
 impl Web3JsonRpcConfig {
@@ -251,6 +258,8 @@ impl Web3JsonRpcConfig {
             mempool_cache_size: Default::default(),
             tree_api_url: None,
             whitelisted_tokens_for_aa: Default::default(),
+            api_namespaces: None,
+            extended_api_tracing: false,
         }
     }
 
diff --git a/core/lib/config/src/configs/base_token_adjuster.rs b/core/lib/config/src/configs/base_token_adjuster.rs
new file mode 100644
index 000000000000..11d669429e05
--- /dev/null
+++ b/core/lib/config/src/configs/base_token_adjuster.rs
@@ -0,0 +1,31 @@
+use std::time::Duration;
+
+use serde::Deserialize;
+
+/// By default the ratio persister will run every 30 seconds.
+pub const DEFAULT_INTERVAL_MS: u64 = 30_000;
+
+#[derive(Debug, Clone, PartialEq, Deserialize)]
+pub struct BaseTokenAdjusterConfig {
+    /// How often to spark a new cycle of the ratio persister to fetch external prices and persis ratios.
+    #[serde(default = "BaseTokenAdjusterConfig::default_interval")]
+    pub price_polling_interval_ms: u64,
+}
+
+impl Default for BaseTokenAdjusterConfig {
+    fn default() -> Self {
+        Self {
+            price_polling_interval_ms: Self::default_interval(),
+        }
+    }
+}
+
+impl BaseTokenAdjusterConfig {
+    fn default_interval() -> u64 {
+        DEFAULT_INTERVAL_MS
+    }
+
+    pub fn price_polling_interval(&self) -> Duration {
+        Duration::from_millis(self.price_polling_interval_ms)
+    }
+}
diff --git a/core/lib/config/src/configs/chain.rs b/core/lib/config/src/configs/chain.rs
index 79d5c5fe880d..53884c4a7227 100644
--- a/core/lib/config/src/configs/chain.rs
+++ b/core/lib/config/src/configs/chain.rs
@@ -1,22 +1,19 @@
 use std::{str::FromStr, time::Duration};
 
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use zksync_basic_types::{
-    ethabi,
-    network::Network,
-    web3::contract::{Detokenize, Error as Web3ContractError},
-    Address, L2ChainId, H256, U256,
+    commitment::L1BatchCommitmentMode, network::Network, Address, L2ChainId, H256,
 };
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 pub struct NetworkConfig {
     /// Name of the used Ethereum network, e.g. `localhost` or `rinkeby`.
     pub network: Network,
-    /// Name of current zkSync network
+    /// Name of current ZKsync network
     /// Used for Sentry environment
     pub zksync_network: String,
-    /// ID of current zkSync network treated as ETH network ID.
-    /// Used to distinguish zkSync from other Web3-capable networks.
+    /// ID of current ZKsync network treated as ETH network ID.
+    /// Used to distinguish ZKsync from other Web3-capable networks.
     pub zksync_network_id: L2ChainId,
 }
 
@@ -32,10 +29,10 @@ impl NetworkConfig {
 }
 
 /// An enum that represents the version of the fee model to use.
-///  - `V1`, the first model that was used in zkSync Era. In this fee model, the pubdata price must be pegged to the L1 gas price.
+///  - `V1`, the first model that was used in ZKsync Era. In this fee model, the pubdata price must be pegged to the L1 gas price.
 ///  Also, the fair L2 gas price is expected to only include the proving/computation price for the operator and not the costs that come from
 ///  processing the batch on L1.
-///  - `V2`, the second model that was used in zkSync Era. There the pubdata price might be independent from the L1 gas price. Also,
+///  - `V2`, the second model that was used in ZKsync Era. There the pubdata price might be independent from the L1 gas price. Also,
 ///  The fair L2 gas price is expected to both the proving/computation price for the operator and the costs that come from
 ///  processing the batch on L1.
 #[derive(Debug, Clone, Copy, Deserialize, PartialEq, Eq)]
@@ -50,40 +47,6 @@ impl Default for FeeModelVersion {
     }
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq, Default)]
-pub enum L1BatchCommitDataGeneratorMode {
-    #[default]
-    Rollup,
-    Validium,
-}
-
-// The cases are extracted from the `PubdataPricingMode` enum in the L1 contracts,
-// And knowing that, in Ethereum, the response is the index of the enum case.
-// 0 corresponds to Rollup case,
-// 1 corresponds to Validium case,
-// Other values are incorrect.
-impl Detokenize for L1BatchCommitDataGeneratorMode {
-    fn from_tokens(tokens: Vec<ethabi::Token>) -> Result<Self, Web3ContractError> {
-        fn error(tokens: &[ethabi::Token]) -> Web3ContractError {
-            let message = format!("L1BatchCommitDataGeneratorMode::from_tokens: {tokens:?}");
-            Web3ContractError::InvalidOutputType(message)
-        }
-
-        match tokens.as_slice() {
-            [ethabi::Token::Uint(enum_value)] => {
-                if enum_value == &U256::zero() {
-                    Ok(L1BatchCommitDataGeneratorMode::Rollup)
-                } else if enum_value == &U256::one() {
-                    Ok(L1BatchCommitDataGeneratorMode::Validium)
-                } else {
-                    Err(error(&tokens))
-                }
-            }
-            _ => Err(error(&tokens)),
-        }
-    }
-}
-
 #[derive(Debug, Deserialize, Clone, PartialEq, Default)]
 pub struct StateKeeperConfig {
     /// The max number of slots for txs in a block before it should be sealed by the slots sealer.
@@ -142,7 +105,12 @@ pub struct StateKeeperConfig {
     pub batch_overhead_l1_gas: u64,
     /// The maximum amount of gas that can be used by the batch. This value is derived from the circuits limitation per batch.
     pub max_gas_per_batch: u64,
-    /// The maximum amount of pubdata that can be used by the batch. Note that if the calldata is used as pubdata, this variable should not exceed 128kb.
+    /// The maximum amount of pubdata that can be used by the batch.
+    /// This variable should not exceed:
+    /// - 128kb for calldata-based rollups
+    /// - 120kb * n, where `n` is a number of blobs for blob-based rollups
+    /// - the DA layer's blob size limit for the DA layer-based validiums
+    /// - 100 MB for the object store-based or no-da validiums
     pub max_pubdata_per_batch: u64,
 
     /// The version of the fee model to use.
@@ -157,6 +125,12 @@ pub struct StateKeeperConfig {
     /// the recursion layers' circuits.
     pub max_circuits_per_batch: usize,
 
+    /// Configures whether to persist protective reads when persisting L1 batches in the state keeper.
+    /// Protective reads can be written asynchronously in VM runner instead.
+    /// By default, set to `true` as a temporary safety measure.
+    #[serde(default = "StateKeeperConfig::default_protective_reads_persistence_enabled")]
+    pub protective_reads_persistence_enabled: bool,
+
     // Base system contract hashes, required only for generating genesis config.
     // #PLA-811
     #[deprecated(note = "Use GenesisConfig::bootloader_hash instead")]
@@ -165,10 +139,14 @@ pub struct StateKeeperConfig {
     pub default_aa_hash: Option<H256>,
     #[deprecated(note = "Use GenesisConfig::l1_batch_commit_data_generator_mode instead")]
     #[serde(default)]
-    pub l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
 }
 
 impl StateKeeperConfig {
+    fn default_protective_reads_persistence_enabled() -> bool {
+        true
+    }
+
     /// Creates a config object suitable for use in unit tests.
     /// Values mostly repeat the values used in the localhost environment.
     pub fn for_tests() -> Self {
@@ -200,9 +178,10 @@ impl StateKeeperConfig {
             validation_computational_gas_limit: 300000,
             save_call_traces: true,
             max_circuits_per_batch: 24100,
+            protective_reads_persistence_enabled: true,
             bootloader_hash: None,
             default_aa_hash: None,
-            l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode::Rollup,
+            l1_batch_commit_data_generator_mode: L1BatchCommitmentMode::Rollup,
         }
     }
 }
diff --git a/core/lib/config/src/configs/commitment_generator.rs b/core/lib/config/src/configs/commitment_generator.rs
new file mode 100644
index 000000000000..9ec4d805b8fe
--- /dev/null
+++ b/core/lib/config/src/configs/commitment_generator.rs
@@ -0,0 +1,10 @@
+use std::num::NonZeroU32;
+
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize, Clone, PartialEq)]
+pub struct CommitmentGeneratorConfig {
+    /// Maximum degree of parallelism during commitment generation, i.e., the maximum number of L1 batches being processed in parallel.
+    /// If not specified, commitment generator will use a value roughly equal to the number of CPU cores with some clamping applied.
+    pub max_parallelism: NonZeroU32,
+}
diff --git a/core/lib/config/src/configs/consensus.rs b/core/lib/config/src/configs/consensus.rs
index 2033360e406a..433b05c954cf 100644
--- a/core/lib/config/src/configs/consensus.rs
+++ b/core/lib/config/src/configs/consensus.rs
@@ -1,40 +1,87 @@
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fmt,
-};
+use std::collections::{BTreeMap, BTreeSet};
 
-/// Public key of the validator (consensus participant) of the form "validator:public:<signature scheme>:<hex encoded key material>"
+use secrecy::{ExposeSecret as _, Secret};
+use zksync_basic_types::L2ChainId;
+use zksync_concurrency::{limiter, time};
+
+/// `zksync_consensus_crypto::TextFmt` representation of `zksync_consensus_roles::validator::PublicKey`.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct ValidatorPublicKey(pub String);
 
-// Secret key of the validator (consensus participant) of the form "validator:secret:<signature scheme>:<hex encoded key material>"
-#[derive(PartialEq)]
-pub struct ValidatorSecretKey(pub String);
+/// `zksync_consensus_crypto::TextFmt` representation of `zksync_consensus_roles::validator::SecretKey`.
+#[derive(Debug, Clone)]
+pub struct ValidatorSecretKey(pub Secret<String>);
 
-/// Public key of the node (gossip network participant) of the form "node:public:<signature scheme>:<hex encoded key material>"
+/// `zksync_consensus_crypto::TextFmt` representation of `zksync_consensus_roles::node::PublicKey`.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct NodePublicKey(pub String);
 
-// Secret key of the node (gossip network participant) of the form "node:secret:<signature scheme>:<hex encoded key material>"
-#[derive(PartialEq)]
-pub struct NodeSecretKey(pub String);
+/// `zksync_consensus_crypto::TextFmt` representation of `zksync_consensus_roles::node::SecretKey`.
+#[derive(Debug, Clone)]
+pub struct NodeSecretKey(pub Secret<String>);
 
-impl fmt::Debug for ValidatorSecretKey {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str("<redacted>")
+impl PartialEq for ValidatorSecretKey {
+    fn eq(&self, other: &Self) -> bool {
+        self.0.expose_secret().eq(other.0.expose_secret())
     }
 }
 
-impl fmt::Debug for NodeSecretKey {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        fmt.write_str("<redacted>")
+impl PartialEq for NodeSecretKey {
+    fn eq(&self, other: &Self) -> bool {
+        self.0.expose_secret().eq(other.0.expose_secret())
     }
 }
 
-/// Network address in the `<domain/ip>:port` format.
+/// Copy-paste of `zksync_consensus_roles::validator::WeightedValidator`.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct WeightedValidator {
+    /// Validator key
+    pub key: ValidatorPublicKey,
+    /// Validator weight inside the Committee.
+    pub weight: u64,
+}
+
+/// Copy-paste of `zksync_concurrency::net::Host`.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Host(pub String);
 
+/// Copy-paste of `zksync_consensus_roles::validator::ProtocolVersion`.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct ProtocolVersion(pub u32);
+
+/// Consensus genesis specification.
+/// It is a digest of the `validator::Genesis`,
+/// which allows to initialize genesis (if not present)
+/// decide whether a hard fork is necessary (if present).
+#[derive(Clone, Debug, PartialEq)]
+pub struct GenesisSpec {
+    /// Chain ID.
+    pub chain_id: L2ChainId,
+    /// Consensus protocol version.
+    pub protocol_version: ProtocolVersion,
+    /// The validator committee. Represents `zksync_consensus_roles::validator::Committee`.
+    pub validators: Vec<WeightedValidator>,
+    /// Leader of the committee. Represents
+    /// `zksync_consensus_roles::validator::LeaderSelectionMode::Sticky`.
+    pub leader: ValidatorPublicKey,
+}
+
+#[derive(Clone, Debug, PartialEq, Default)]
+pub struct RpcConfig {
+    /// Max number of blocks that can be send from/to each peer.
+    /// Defaults to 10 blocks/s/connection.
+    pub get_block_rate: Option<limiter::Rate>,
+}
+
+impl RpcConfig {
+    pub fn get_block_rate(&self) -> limiter::Rate {
+        self.get_block_rate.unwrap_or(limiter::Rate {
+            burst: 10,
+            refresh: time::Duration::milliseconds(100),
+        })
+    }
+}
+
 /// Config (shared between main node and external node).
 #[derive(Clone, Debug, PartialEq)]
 pub struct ConsensusConfig {
@@ -56,10 +103,24 @@ pub struct ConsensusConfig {
     /// Outbound gossip connections that the node should actively try to
     /// establish and maintain.
     pub gossip_static_outbound: BTreeMap<NodePublicKey, Host>,
+
+    /// MAIN NODE ONLY: consensus genesis specification.
+    /// Used to (re)initialize genesis if needed.
+    /// External nodes fetch the genesis from the main node.
+    pub genesis_spec: Option<GenesisSpec>,
+
+    /// Rate limiting configuration for the p2p RPCs.
+    pub rpc: Option<RpcConfig>,
+}
+
+impl ConsensusConfig {
+    pub fn rpc(&self) -> RpcConfig {
+        self.rpc.clone().unwrap_or_default()
+    }
 }
 
 /// Secrets need for consensus.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct ConsensusSecrets {
     pub validator_key: Option<ValidatorSecretKey>,
     pub node_key: Option<NodeSecretKey>,
diff --git a/core/lib/config/src/configs/contracts.rs b/core/lib/config/src/configs/contracts.rs
index f9bfcc7696b1..1ab032869e37 100644
--- a/core/lib/config/src/configs/contracts.rs
+++ b/core/lib/config/src/configs/contracts.rs
@@ -37,6 +37,7 @@ pub struct ContractsConfig {
     pub l2_testnet_paymaster_addr: Option<Address>,
     pub l1_multicall3_addr: Address,
     pub ecosystem_contracts: Option<EcosystemContracts>,
+    // Used by the RPC API and by the node builder in wiring the BaseTokenRatioProvider layer.
     pub base_token_addr: Option<Address>,
 }
 
diff --git a/core/lib/config/src/configs/da_dispatcher.rs b/core/lib/config/src/configs/da_dispatcher.rs
new file mode 100644
index 000000000000..303a2c0b54c1
--- /dev/null
+++ b/core/lib/config/src/configs/da_dispatcher.rs
@@ -0,0 +1,43 @@
+use std::time::Duration;
+
+use serde::Deserialize;
+
+pub const DEFAULT_POLLING_INTERVAL_MS: u32 = 5000;
+pub const DEFAULT_MAX_ROWS_TO_DISPATCH: u32 = 100;
+pub const DEFAULT_MAX_RETRIES: u16 = 5;
+
+#[derive(Debug, Clone, PartialEq, Deserialize)]
+pub struct DADispatcherConfig {
+    /// The interval between the `da_dispatcher's` iterations.
+    pub polling_interval_ms: Option<u32>,
+    /// The maximum number of rows to query from the database in a single query.
+    pub max_rows_to_dispatch: Option<u32>,
+    /// The maximum number of retries for the dispatch of a blob.
+    pub max_retries: Option<u16>,
+}
+
+impl DADispatcherConfig {
+    pub fn for_tests() -> Self {
+        Self {
+            polling_interval_ms: Some(DEFAULT_POLLING_INTERVAL_MS),
+            max_rows_to_dispatch: Some(DEFAULT_MAX_ROWS_TO_DISPATCH),
+            max_retries: Some(DEFAULT_MAX_RETRIES),
+        }
+    }
+
+    pub fn polling_interval(&self) -> Duration {
+        match self.polling_interval_ms {
+            Some(interval) => Duration::from_millis(interval as u64),
+            None => Duration::from_millis(DEFAULT_POLLING_INTERVAL_MS as u64),
+        }
+    }
+
+    pub fn max_rows_to_dispatch(&self) -> u32 {
+        self.max_rows_to_dispatch
+            .unwrap_or(DEFAULT_MAX_ROWS_TO_DISPATCH)
+    }
+
+    pub fn max_retries(&self) -> u16 {
+        self.max_retries.unwrap_or(DEFAULT_MAX_RETRIES)
+    }
+}
diff --git a/core/lib/config/src/configs/database.rs b/core/lib/config/src/configs/database.rs
index 0e5a459d1e47..b4866a0f40c5 100644
--- a/core/lib/config/src/configs/database.rs
+++ b/core/lib/config/src/configs/database.rs
@@ -2,7 +2,6 @@ use std::time::Duration;
 
 use anyhow::Context as _;
 use serde::{Deserialize, Serialize};
-use zksync_basic_types::url::SensitiveUrl;
 
 use crate::configs::ExperimentalDBConfig;
 
@@ -131,12 +130,6 @@ impl DBConfig {
 /// and any component may have overrides.
 #[derive(Debug, Clone, PartialEq)]
 pub struct PostgresConfig {
-    /// URL for the main (sequencer) database.
-    pub master_url: Option<SensitiveUrl>,
-    /// URL for the replica database.
-    pub replica_url: Option<SensitiveUrl>,
-    /// URL for the prover database.
-    pub prover_url: Option<SensitiveUrl>,
     /// Maximum size of the connection pool.
     pub max_connections: Option<u32>,
     /// Maximum size of the connection pool to master DB.
@@ -157,21 +150,6 @@ pub struct PostgresConfig {
 }
 
 impl PostgresConfig {
-    /// Returns a copy of the master database URL as a `Result` to simplify error propagation.
-    pub fn master_url(&self) -> anyhow::Result<SensitiveUrl> {
-        self.master_url.clone().context("Master DB URL is absent")
-    }
-
-    /// Returns a copy of the replica database URL as a `Result` to simplify error propagation.
-    pub fn replica_url(&self) -> anyhow::Result<SensitiveUrl> {
-        self.replica_url.clone().context("Replica DB URL is absent")
-    }
-
-    /// Returns a copy of the prover database URL as a `Result` to simplify error propagation.
-    pub fn prover_url(&self) -> anyhow::Result<SensitiveUrl> {
-        self.prover_url.clone().context("Prover DB URL is absent")
-    }
-
     /// Returns the maximum size of the connection pool as a `Result` to simplify error propagation.
     pub fn max_connections(&self) -> anyhow::Result<u32> {
         self.max_connections.context("Max connections is absent")
diff --git a/core/lib/config/src/configs/en_config.rs b/core/lib/config/src/configs/en_config.rs
new file mode 100644
index 000000000000..32dc5b7c7b49
--- /dev/null
+++ b/core/lib/config/src/configs/en_config.rs
@@ -0,0 +1,19 @@
+use std::num::NonZeroUsize;
+
+use serde::Deserialize;
+use zksync_basic_types::{
+    commitment::L1BatchCommitmentMode, url::SensitiveUrl, L1ChainId, L2ChainId,
+};
+
+/// Temporary config for initializing external node, will be completely replaced by consensus config later
+#[derive(Debug, Clone, PartialEq, Deserialize)]
+pub struct ENConfig {
+    // Genesis
+    pub l2_chain_id: L2ChainId,
+    pub l1_chain_id: L1ChainId,
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
+
+    // Main node configuration
+    pub main_node_url: SensitiveUrl,
+    pub main_node_rate_limit_rps: Option<NonZeroUsize>,
+}
diff --git a/core/lib/config/src/configs/eth_sender.rs b/core/lib/config/src/configs/eth_sender.rs
index a7dce1959810..c0e14dd68a87 100644
--- a/core/lib/config/src/configs/eth_sender.rs
+++ b/core/lib/config/src/configs/eth_sender.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use anyhow::Context as _;
 use serde::Deserialize;
-use zksync_basic_types::{url::SensitiveUrl, H256};
+use zksync_basic_types::H256;
 use zksync_crypto_primitives::K256PrivateKey;
 
 use crate::EthWatchConfig;
@@ -15,7 +15,6 @@ pub struct EthConfig {
     /// Options related to the `GasAdjuster` submodule.
     pub gas_adjuster: Option<GasAdjusterConfig>,
     pub watcher: Option<EthWatchConfig>,
-    pub web3_url: SensitiveUrl,
 }
 
 impl EthConfig {
@@ -40,7 +39,6 @@ impl EthConfig {
                 timestamp_criteria_max_allowed_lag: 30,
                 l1_batch_min_age_before_execute_seconds: None,
                 max_acceptable_priority_fee_in_gwei: 100000000000,
-                proof_loading_mode: ProofLoadingMode::OldProofFromDb,
                 pubdata_sending_mode: PubdataSendingMode::Calldata,
             }),
             gas_adjuster: Some(GasAdjusterConfig {
@@ -61,7 +59,6 @@ impl EthConfig {
                 confirmations_for_eth_event: None,
                 eth_node_poll_interval: 0,
             }),
-            web3_url: "localhost:8545".parse().unwrap(),
         }
     }
 }
@@ -84,6 +81,7 @@ pub enum PubdataSendingMode {
     #[default]
     Calldata,
     Blobs,
+    Custom,
 }
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
@@ -117,10 +115,7 @@ pub struct SenderConfig {
     // Max acceptable fee for sending tx it acts as a safeguard to prevent sending tx with very high fees.
     pub max_acceptable_priority_fee_in_gwei: u64,
 
-    /// The mode in which proofs are loaded, either from DB/GCS for FRI/Old proof.
-    pub proof_loading_mode: ProofLoadingMode,
-
-    /// The mode in which we send pubdata, either Calldata or Blobs
+    /// The mode in which we send pubdata: Calldata, Blobs or Custom (DA layers, Object Store, etc.)
     pub pubdata_sending_mode: PubdataSendingMode,
 }
 
@@ -158,7 +153,7 @@ impl SenderConfig {
     }
 }
 
-#[derive(Debug, Deserialize, Copy, Clone, PartialEq)]
+#[derive(Debug, Deserialize, Copy, Clone, PartialEq, Default)]
 pub struct GasAdjusterConfig {
     /// Priority Fee to be used by GasAdjuster
     pub default_priority_fee_per_gas: u64,
diff --git a/core/lib/config/src/configs/experimental.rs b/core/lib/config/src/configs/experimental.rs
index ad0ef5a4d5b8..e362715d3d4a 100644
--- a/core/lib/config/src/configs/experimental.rs
+++ b/core/lib/config/src/configs/experimental.rs
@@ -12,6 +12,21 @@ pub struct ExperimentalDBConfig {
     /// Maximum number of files concurrently opened by state keeper cache RocksDB. Useful to fit into OS limits; can be used
     /// as a rudimentary way to control RAM usage of the cache.
     pub state_keeper_db_max_open_files: Option<NonZeroU32>,
+    /// Configures whether to persist protective reads when persisting L1 batches in the state keeper.
+    /// Protective reads are never required by full nodes so far, not until such a node runs a full Merkle tree
+    /// (presumably, to participate in L1 batch proving).
+    /// By default, set to `true` as a temporary safety measure.
+    #[serde(default = "ExperimentalDBConfig::default_protective_reads_persistence_enabled")]
+    pub protective_reads_persistence_enabled: bool,
+    // Merkle tree config
+    /// Processing delay between processing L1 batches in the Merkle tree.
+    #[serde(default = "ExperimentalDBConfig::default_merkle_tree_processing_delay_ms")]
+    pub processing_delay_ms: u64,
+    /// If specified, RocksDB indices and Bloom filters will be managed by the block cache, rather than
+    /// being loaded entirely into RAM on the RocksDB initialization. The block cache capacity should be increased
+    /// correspondingly; otherwise, RocksDB performance can significantly degrade.
+    #[serde(default)]
+    pub include_indices_and_filters_in_block_cache: bool,
 }
 
 impl Default for ExperimentalDBConfig {
@@ -20,6 +35,10 @@ impl Default for ExperimentalDBConfig {
             state_keeper_db_block_cache_capacity_mb:
                 Self::default_state_keeper_db_block_cache_capacity_mb(),
             state_keeper_db_max_open_files: None,
+            protective_reads_persistence_enabled:
+                Self::default_protective_reads_persistence_enabled(),
+            processing_delay_ms: Self::default_merkle_tree_processing_delay_ms(),
+            include_indices_and_filters_in_block_cache: false,
         }
     }
 }
@@ -32,4 +51,12 @@ impl ExperimentalDBConfig {
     pub fn state_keeper_db_block_cache_capacity(&self) -> usize {
         self.state_keeper_db_block_cache_capacity_mb * super::BYTES_IN_MEGABYTE
     }
+
+    const fn default_protective_reads_persistence_enabled() -> bool {
+        true
+    }
+
+    const fn default_merkle_tree_processing_delay_ms() -> u64 {
+        100
+    }
 }
diff --git a/core/lib/config/src/configs/fri_proof_compressor.rs b/core/lib/config/src/configs/fri_proof_compressor.rs
index 4b4e062dee28..0fceac509aca 100644
--- a/core/lib/config/src/configs/fri_proof_compressor.rs
+++ b/core/lib/config/src/configs/fri_proof_compressor.rs
@@ -20,7 +20,7 @@ pub struct FriProofCompressorConfig {
 
     /// Path to universal setup key file
     pub universal_setup_path: String,
-    /// https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
+    /// https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^24.key
     pub universal_setup_download_url: String,
 
     // Whether to verify wrapper proof or not.
diff --git a/core/lib/config/src/configs/fri_prover.rs b/core/lib/config/src/configs/fri_prover.rs
index b19d72e40b8d..99e3d354536e 100644
--- a/core/lib/config/src/configs/fri_prover.rs
+++ b/core/lib/config/src/configs/fri_prover.rs
@@ -26,7 +26,8 @@ pub struct FriProverConfig {
 
     // whether to write to public GCS bucket for https://github.com/matter-labs/era-boojum-validator-cli
     pub shall_save_to_public_bucket: bool,
-    pub object_store: Option<ObjectStoreConfig>,
+    pub prover_object_store: Option<ObjectStoreConfig>,
+    pub public_object_store: Option<ObjectStoreConfig>,
 }
 
 impl FriProverConfig {
diff --git a/core/lib/config/src/configs/general.rs b/core/lib/config/src/configs/general.rs
index 69d68508a035..b7b501364c65 100644
--- a/core/lib/config/src/configs/general.rs
+++ b/core/lib/config/src/configs/general.rs
@@ -1,13 +1,19 @@
 use crate::{
     configs::{
+        base_token_adjuster::BaseTokenAdjusterConfig,
         chain::{CircuitBreakerConfig, MempoolConfig, OperationsManagerConfig, StateKeeperConfig},
+        da_dispatcher::DADispatcherConfig,
         fri_prover_group::FriProverGroupConfig,
         house_keeper::HouseKeeperConfig,
-        FriProofCompressorConfig, FriProverConfig, FriProverGatewayConfig,
-        FriWitnessGeneratorConfig, FriWitnessVectorGeneratorConfig, ObservabilityConfig,
-        PrometheusConfig, ProofDataHandlerConfig,
+        pruning::PruningConfig,
+        snapshot_recovery::SnapshotRecoveryConfig,
+        vm_runner::ProtectiveReadsWriterConfig,
+        CommitmentGeneratorConfig, FriProofCompressorConfig, FriProverConfig,
+        FriProverGatewayConfig, FriWitnessGeneratorConfig, FriWitnessVectorGeneratorConfig,
+        ObservabilityConfig, PrometheusConfig, ProofDataHandlerConfig,
     },
-    ApiConfig, ContractVerifierConfig, DBConfig, EthConfig, PostgresConfig, SnapshotsCreatorConfig,
+    ApiConfig, ContractVerifierConfig, DBConfig, EthConfig, ObjectStoreConfig, PostgresConfig,
+    SnapshotsCreatorConfig,
 };
 
 #[derive(Debug)]
@@ -32,4 +38,11 @@ pub struct GeneralConfig {
     pub eth: Option<EthConfig>,
     pub snapshot_creator: Option<SnapshotsCreatorConfig>,
     pub observability: Option<ObservabilityConfig>,
+    pub da_dispatcher_config: Option<DADispatcherConfig>,
+    pub protective_reads_writer_config: Option<ProtectiveReadsWriterConfig>,
+    pub commitment_generator: Option<CommitmentGeneratorConfig>,
+    pub snapshot_recovery: Option<SnapshotRecoveryConfig>,
+    pub pruning: Option<PruningConfig>,
+    pub core_object_store: Option<ObjectStoreConfig>,
+    pub base_token_adjuster: Option<BaseTokenAdjusterConfig>,
 }
diff --git a/core/lib/config/src/configs/genesis.rs b/core/lib/config/src/configs/genesis.rs
index 73ce2a7d5030..0f4d39732f9c 100644
--- a/core/lib/config/src/configs/genesis.rs
+++ b/core/lib/config/src/configs/genesis.rs
@@ -1,7 +1,9 @@
 use serde::{Deserialize, Serialize};
-use zksync_basic_types::{Address, L1ChainId, L2ChainId, H256};
-
-use crate::configs::chain::L1BatchCommitDataGeneratorMode;
+use zksync_basic_types::{
+    commitment::L1BatchCommitmentMode,
+    protocol_version::{ProtocolSemanticVersion, ProtocolVersionId},
+    Address, L1ChainId, L2ChainId, H256,
+};
 
 /// This config represents the genesis state of the chain.
 /// Each chain has this config immutable and we update it only during the protocol upgrade
@@ -9,7 +11,7 @@ use crate::configs::chain::L1BatchCommitDataGeneratorMode;
 pub struct GenesisConfig {
     // TODO make fields non optional, once we fully moved to file based configs.
     // Now for backward compatibility we keep it optional
-    pub protocol_version: Option<u16>,
+    pub protocol_version: Option<ProtocolSemanticVersion>,
     pub genesis_root_hash: Option<H256>,
     pub rollup_last_leaf_index: Option<u64>,
     pub genesis_commitment: Option<H256>,
@@ -23,7 +25,7 @@ pub struct GenesisConfig {
     pub recursion_scheduler_level_vk_hash: H256,
     pub fee_account: Address,
     pub dummy_verifier: bool,
-    pub l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
 }
 
 impl GenesisConfig {
@@ -40,10 +42,13 @@ impl GenesisConfig {
             bootloader_hash: Default::default(),
             default_aa_hash: Default::default(),
             l1_chain_id: L1ChainId(9),
-            protocol_version: Some(22),
+            protocol_version: Some(ProtocolSemanticVersion {
+                minor: ProtocolVersionId::latest(),
+                patch: 0.into(),
+            }),
             l2_chain_id: L2ChainId::default(),
             dummy_verifier: false,
-            l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode::Rollup,
+            l1_batch_commit_data_generator_mode: L1BatchCommitmentMode::Rollup,
         }
     }
 }
diff --git a/core/lib/config/src/configs/mod.rs b/core/lib/config/src/configs/mod.rs
index 2460fa04f920..0e8730ac9141 100644
--- a/core/lib/config/src/configs/mod.rs
+++ b/core/lib/config/src/configs/mod.rs
@@ -1,8 +1,11 @@
 // Public re-exports
 pub use self::{
     api::ApiConfig,
+    base_token_adjuster::BaseTokenAdjusterConfig,
+    commitment_generator::CommitmentGeneratorConfig,
     contract_verifier::ContractVerifierConfig,
     contracts::{ContractsConfig, EcosystemContracts},
+    da_dispatcher::DADispatcherConfig,
     database::{DBConfig, PostgresConfig},
     eth_sender::{EthConfig, GasAdjusterConfig},
     eth_watch::EthWatchConfig,
@@ -17,16 +20,24 @@ pub use self::{
     object_store::ObjectStoreConfig,
     observability::{ObservabilityConfig, OpentelemetryConfig},
     proof_data_handler::ProofDataHandlerConfig,
+    pruning::PruningConfig,
+    secrets::{DatabaseSecrets, L1Secrets, Secrets},
+    snapshot_recovery::SnapshotRecoveryConfig,
     snapshots_creator::SnapshotsCreatorConfig,
     utils::PrometheusConfig,
+    vm_runner::ProtectiveReadsWriterConfig,
 };
 
 pub mod api;
+pub mod base_token_adjuster;
 pub mod chain;
+mod commitment_generator;
 pub mod consensus;
 pub mod contract_verifier;
 pub mod contracts;
+pub mod da_dispatcher;
 pub mod database;
+pub mod en_config;
 pub mod eth_sender;
 pub mod eth_watch;
 mod experimental;
@@ -42,8 +53,12 @@ pub mod house_keeper;
 pub mod object_store;
 pub mod observability;
 pub mod proof_data_handler;
+pub mod pruning;
+pub mod secrets;
+pub mod snapshot_recovery;
 pub mod snapshots_creator;
 pub mod utils;
+pub mod vm_runner;
 pub mod wallets;
 
 const BYTES_IN_MEGABYTE: usize = 1_024 * 1_024;
diff --git a/core/lib/config/src/configs/object_store.rs b/core/lib/config/src/configs/object_store.rs
index e5c709fbf545..b9bbb5f7a542 100644
--- a/core/lib/config/src/configs/object_store.rs
+++ b/core/lib/config/src/configs/object_store.rs
@@ -7,6 +7,15 @@ pub struct ObjectStoreConfig {
     pub mode: ObjectStoreMode,
     #[serde(default = "ObjectStoreConfig::default_max_retries")]
     pub max_retries: u16,
+    /// Path to local directory that will be used to mirror store objects locally. If not specified, no mirroring will be used.
+    /// The directory layout is identical to [`ObjectStoreMode::FileBacked`].
+    ///
+    /// Mirroring is primarily useful for local development and testing; it might not provide substantial performance benefits
+    /// if the Internet connection used by the app is fast enough.
+    ///
+    /// **Important.** Mirroring logic assumes that objects in the underlying store are immutable. If this is not the case,
+    /// the mirrored objects may become stale.
+    pub local_mirror_path: Option<String>,
 }
 
 impl ObjectStoreConfig {
diff --git a/core/lib/config/src/configs/observability.rs b/core/lib/config/src/configs/observability.rs
index 44d74ef1025f..96754e61e897 100644
--- a/core/lib/config/src/configs/observability.rs
+++ b/core/lib/config/src/configs/observability.rs
@@ -11,7 +11,6 @@ pub struct ObservabilityConfig {
     /// Format of the logs as expected by the `vlog` crate.
     /// Currently must be either `plain` or `json`.
     pub log_format: String,
-    pub sporadic_crypto_errors_substrs: Vec<String>,
     // Log directives in format that is used in `RUST_LOG`
     pub log_directives: Option<String>,
 }
diff --git a/core/lib/config/src/configs/proof_data_handler.rs b/core/lib/config/src/configs/proof_data_handler.rs
index 06d672b40d78..de7f6969b05f 100644
--- a/core/lib/config/src/configs/proof_data_handler.rs
+++ b/core/lib/config/src/configs/proof_data_handler.rs
@@ -6,6 +6,7 @@ use serde::Deserialize;
 pub struct ProofDataHandlerConfig {
     pub http_port: u16,
     pub proof_generation_timeout_in_secs: u16,
+    pub tee_support: bool,
 }
 
 impl ProofDataHandlerConfig {
diff --git a/core/lib/config/src/configs/pruning.rs b/core/lib/config/src/configs/pruning.rs
new file mode 100644
index 000000000000..d2a5b0e5e9df
--- /dev/null
+++ b/core/lib/config/src/configs/pruning.rs
@@ -0,0 +1,19 @@
+use std::num::NonZeroU64;
+
+use serde::Deserialize;
+
+#[derive(Debug, Clone, PartialEq, Deserialize)]
+pub struct PruningConfig {
+    pub enabled: bool,
+    /// Number of L1 batches pruned at a time.
+    pub chunk_size: Option<u32>,
+    /// Delta between soft- and hard-removing data from Postgres. Should be reasonably large (order of 60 seconds).
+    /// The default value is 60 seconds.
+    pub removal_delay_sec: Option<NonZeroU64>,
+    /// If set, L1 batches will be pruned after the batch timestamp is this old (in seconds). Note that an L1 batch
+    /// may be temporarily retained for other reasons; e.g., a batch cannot be pruned until it is executed on L1,
+    /// which happens roughly 24 hours after its generation on the mainnet. Thus, in practice this value can specify
+    /// the retention period greater than that implicitly imposed by other criteria (e.g., 7 or 30 days).
+    /// If set to 0, L1 batches will not be retained based on their timestamp. The default value is 1 hour.
+    pub data_retention_sec: Option<u64>,
+}
diff --git a/core/lib/config/src/configs/secrets.rs b/core/lib/config/src/configs/secrets.rs
new file mode 100644
index 000000000000..02bb52e00718
--- /dev/null
+++ b/core/lib/config/src/configs/secrets.rs
@@ -0,0 +1,42 @@
+use anyhow::Context;
+use zksync_basic_types::url::SensitiveUrl;
+
+use crate::configs::consensus::ConsensusSecrets;
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct DatabaseSecrets {
+    pub server_url: Option<SensitiveUrl>,
+    pub prover_url: Option<SensitiveUrl>,
+    pub server_replica_url: Option<SensitiveUrl>,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct L1Secrets {
+    pub l1_rpc_url: SensitiveUrl,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct Secrets {
+    pub consensus: Option<ConsensusSecrets>,
+    pub database: Option<DatabaseSecrets>,
+    pub l1: Option<L1Secrets>,
+}
+
+impl DatabaseSecrets {
+    /// Returns a copy of the master database URL as a `Result` to simplify error propagation.
+    pub fn master_url(&self) -> anyhow::Result<SensitiveUrl> {
+        self.server_url.clone().context("Master DB URL is absent")
+    }
+
+    /// Returns a copy of the replica database URL as a `Result` to simplify error propagation.
+    pub fn replica_url(&self) -> anyhow::Result<SensitiveUrl> {
+        self.server_replica_url
+            .clone()
+            .context("Replica DB URL is absent")
+    }
+
+    /// Returns a copy of the prover database URL as a `Result` to simplify error propagation.
+    pub fn prover_url(&self) -> anyhow::Result<SensitiveUrl> {
+        self.prover_url.clone().context("Prover DB URL is absent")
+    }
+}
diff --git a/core/lib/config/src/configs/snapshot_recovery.rs b/core/lib/config/src/configs/snapshot_recovery.rs
new file mode 100644
index 000000000000..c1d5ea6e3ac6
--- /dev/null
+++ b/core/lib/config/src/configs/snapshot_recovery.rs
@@ -0,0 +1,48 @@
+use std::num::NonZeroUsize;
+
+use serde::Deserialize;
+use zksync_basic_types::L1BatchNumber;
+
+use crate::ObjectStoreConfig;
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Default)]
+pub struct TreeRecoveryConfig {
+    /// Approximate chunk size (measured in the number of entries) to recover in a single iteration.
+    /// Reasonable values are order of 100,000 (meaning an iteration takes several seconds).
+    ///
+    /// **Important.** This value cannot be changed in the middle of tree recovery (i.e., if a node is stopped in the middle
+    /// of recovery and then restarted with a different config).
+    pub chunk_size: Option<u64>,
+    /// Buffer capacity for parallel persistence operations. Should be reasonably small since larger buffer means more RAM usage;
+    /// buffer elements are persisted tree chunks. OTOH, small buffer can lead to persistence parallelization being inefficient.
+    ///
+    /// If not set, parallel persistence will be disabled.
+    pub parallel_persistence_buffer: Option<NonZeroUsize>,
+}
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Default)]
+pub struct PostgresRecoveryConfig {
+    /// Maximum concurrency factor for the concurrent parts of snapshot recovery for Postgres. It may be useful to
+    /// reduce this factor to about 5 if snapshot recovery overloads I/O capacity of the node. Conversely,
+    /// if I/O capacity of your infra is high, you may increase concurrency to speed up Postgres recovery.
+    pub max_concurrency: Option<NonZeroUsize>,
+}
+
+#[derive(Debug, Clone, PartialEq, Deserialize)]
+pub struct SnapshotRecoveryConfig {
+    /// Enables application-level snapshot recovery. Required to start a node that was recovered from a snapshot,
+    /// or to initialize a node from a snapshot. Has no effect if a node that was initialized from a Postgres dump
+    /// or was synced from genesis.
+    ///
+    /// This is an experimental and incomplete feature; do not use unless you know what you're doing.
+    pub enabled: bool,
+    /// L1 batch number of the snapshot to use during recovery. Specifying this parameter is mostly useful for testing.
+    pub l1_batch: Option<L1BatchNumber>,
+    /// Enables dropping storage key preimages when recovering storage logs from a snapshot with version 0.
+    /// This is a temporary flag that will eventually be removed together with version 0 snapshot support.
+    #[serde(default)]
+    pub drop_storage_key_preimages: bool,
+    pub tree: TreeRecoveryConfig,
+    pub postgres: PostgresRecoveryConfig,
+    pub object_store: Option<ObjectStoreConfig>,
+}
diff --git a/core/lib/config/src/configs/snapshots_creator.rs b/core/lib/config/src/configs/snapshots_creator.rs
index 7d297f607803..c7dc39e41ef5 100644
--- a/core/lib/config/src/configs/snapshots_creator.rs
+++ b/core/lib/config/src/configs/snapshots_creator.rs
@@ -1,21 +1,34 @@
 use serde::Deserialize;
+use zksync_basic_types::L1BatchNumber;
 
 use crate::ObjectStoreConfig;
 
 #[derive(Debug, Clone, PartialEq, Deserialize)]
 pub struct SnapshotsCreatorConfig {
-    #[serde(default = "snapshots_creator_storage_logs_chunk_size_default")]
+    /// Version of snapshots to create.
+    // Raw integer version is used because `SnapshotVersion` is defined in `zksync_types` crate.
+    #[serde(default)]
+    pub version: u16,
+    /// L1 batch number to create the snapshot for. If not specified, a snapshot will be created
+    /// for the current penultimate L1 batch.
+    ///
+    /// - If a snapshot with this L1 batch already exists and is complete, the creator will do nothing.
+    /// - If a snapshot with this L1 batch exists and is incomplete, the creator will continue creating it,
+    ///   regardless of whether the specified snapshot `version` matches.
+    pub l1_batch_number: Option<L1BatchNumber>,
+    #[serde(default = "SnapshotsCreatorConfig::storage_logs_chunk_size_default")]
     pub storage_logs_chunk_size: u64,
-
-    #[serde(default = "snapshots_creator_concurrent_queries_count")]
+    #[serde(default = "SnapshotsCreatorConfig::concurrent_queries_count")]
     pub concurrent_queries_count: u32,
     pub object_store: Option<ObjectStoreConfig>,
 }
 
-fn snapshots_creator_storage_logs_chunk_size_default() -> u64 {
-    1_000_000
-}
+impl SnapshotsCreatorConfig {
+    const fn storage_logs_chunk_size_default() -> u64 {
+        1_000_000
+    }
 
-fn snapshots_creator_concurrent_queries_count() -> u32 {
-    25
+    const fn concurrent_queries_count() -> u32 {
+        25
+    }
 }
diff --git a/core/lib/config/src/configs/vm_runner.rs b/core/lib/config/src/configs/vm_runner.rs
new file mode 100644
index 000000000000..eb3d4a9d4b24
--- /dev/null
+++ b/core/lib/config/src/configs/vm_runner.rs
@@ -0,0 +1,19 @@
+use serde::Deserialize;
+use zksync_basic_types::L1BatchNumber;
+
+#[derive(Debug, Deserialize, Clone, PartialEq, Default)]
+pub struct ProtectiveReadsWriterConfig {
+    /// Path to the RocksDB data directory that serves state cache.
+    #[serde(default = "ProtectiveReadsWriterConfig::default_db_path")]
+    pub db_path: String,
+    /// How many max batches should be processed at the same time.
+    pub window_size: u32,
+    /// All batches before this one (inclusive) are always considered to be processed.
+    pub first_processed_batch: L1BatchNumber,
+}
+
+impl ProtectiveReadsWriterConfig {
+    fn default_db_path() -> String {
+        "./db/protective_reads_writer".to_owned()
+    }
+}
diff --git a/core/lib/config/src/configs/wallets.rs b/core/lib/config/src/configs/wallets.rs
index 678adb674f14..7b74cd441166 100644
--- a/core/lib/config/src/configs/wallets.rs
+++ b/core/lib/config/src/configs/wallets.rs
@@ -1,7 +1,7 @@
 use zksync_basic_types::{Address, H160, H256};
 use zksync_crypto_primitives::K256PrivateKey;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct AddressWallet {
     address: Address,
 }
@@ -16,7 +16,7 @@ impl AddressWallet {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Wallet {
     address: Address,
     private_key: K256PrivateKey,
@@ -58,18 +58,18 @@ impl Wallet {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct EthSender {
     pub operator: Wallet,
     pub blob_operator: Option<Wallet>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct StateKeeper {
     pub fee_account: AddressWallet,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Wallets {
     pub eth_sender: Option<EthSender>,
     pub state_keeper: Option<StateKeeper>,
diff --git a/core/lib/config/src/lib.rs b/core/lib/config/src/lib.rs
index 66656e60b702..91b5c6d480e3 100644
--- a/core/lib/config/src/lib.rs
+++ b/core/lib/config/src/lib.rs
@@ -1,8 +1,9 @@
 #![allow(clippy::upper_case_acronyms, clippy::derive_partial_eq_without_eq)]
 
 pub use crate::configs::{
-    ApiConfig, ContractVerifierConfig, ContractsConfig, DBConfig, EthConfig, EthWatchConfig,
-    GasAdjusterConfig, GenesisConfig, ObjectStoreConfig, PostgresConfig, SnapshotsCreatorConfig,
+    ApiConfig, BaseTokenAdjusterConfig, ContractVerifierConfig, ContractsConfig,
+    DADispatcherConfig, DBConfig, EthConfig, EthWatchConfig, GasAdjusterConfig, GenesisConfig,
+    ObjectStoreConfig, PostgresConfig, SnapshotsCreatorConfig,
 };
 
 pub mod configs;
diff --git a/core/lib/config/src/testonly.rs b/core/lib/config/src/testonly.rs
index 968d940f29c1..42f24fb2d467 100644
--- a/core/lib/config/src/testonly.rs
+++ b/core/lib/config/src/testonly.rs
@@ -2,9 +2,14 @@ use std::num::NonZeroUsize;
 
 use rand::{distributions::Distribution, Rng};
 use zksync_basic_types::{
-    basic_fri_types::CircuitIdRoundTuple, network::Network, L1ChainId, L2ChainId,
+    basic_fri_types::CircuitIdRoundTuple,
+    commitment::L1BatchCommitmentMode,
+    network::Network,
+    protocol_version::{ProtocolSemanticVersion, ProtocolVersionId, VersionPatch},
+    L1BatchNumber, L1ChainId, L2ChainId,
 };
 use zksync_consensus_utils::EncodeDist;
+use zksync_crypto_primitives::K256PrivateKey;
 
 use crate::configs::{self, eth_sender::PubdataSendingMode};
 
@@ -93,6 +98,9 @@ impl Distribution<configs::api::Web3JsonRpcConfig> for EncodeDist {
             mempool_cache_update_interval: self.sample(rng),
             mempool_cache_size: self.sample(rng),
             whitelisted_tokens_for_aa: self.sample_range(rng).map(|_| rng.gen()).collect(),
+            api_namespaces: self
+                .sample_opt(|| self.sample_range(rng).map(|_| self.sample(rng)).collect()),
+            extended_api_tracing: self.sample(rng),
         }
     }
 }
@@ -144,19 +152,6 @@ impl Distribution<configs::chain::NetworkConfig> for EncodeDist {
     }
 }
 
-impl Distribution<configs::chain::L1BatchCommitDataGeneratorMode> for EncodeDist {
-    fn sample<R: Rng + ?Sized>(
-        &self,
-        rng: &mut R,
-    ) -> configs::chain::L1BatchCommitDataGeneratorMode {
-        type T = configs::chain::L1BatchCommitDataGeneratorMode;
-        match rng.gen_range(0..2) {
-            0 => T::Rollup,
-            _ => T::Validium,
-        }
-    }
-}
-
 impl Distribution<configs::chain::StateKeeperConfig> for EncodeDist {
     #[allow(deprecated)]
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::chain::StateKeeperConfig {
@@ -184,6 +179,7 @@ impl Distribution<configs::chain::StateKeeperConfig> for EncodeDist {
             validation_computational_gas_limit: self.sample(rng),
             save_call_traces: self.sample(rng),
             max_circuits_per_batch: self.sample(rng),
+            protective_reads_persistence_enabled: self.sample(rng),
             // These values are not involved into files serialization skip them
             fee_account_addr: None,
             bootloader_hash: None,
@@ -289,6 +285,9 @@ impl Distribution<configs::ExperimentalDBConfig> for EncodeDist {
         configs::ExperimentalDBConfig {
             state_keeper_db_block_cache_capacity_mb: self.sample(rng),
             state_keeper_db_max_open_files: self.sample(rng),
+            protective_reads_persistence_enabled: self.sample(rng),
+            processing_delay_ms: self.sample(rng),
+            include_indices_and_filters_in_block_cache: self.sample(rng),
         }
     }
 }
@@ -306,9 +305,6 @@ impl Distribution<configs::database::DBConfig> for EncodeDist {
 impl Distribution<configs::database::PostgresConfig> for EncodeDist {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::database::PostgresConfig {
         configs::database::PostgresConfig {
-            master_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
-            replica_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
-            prover_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
             max_connections: self.sample(rng),
             max_connections_master: self.sample(rng),
             acquire_timeout_sec: self.sample(rng),
@@ -327,7 +323,6 @@ impl Distribution<configs::EthConfig> for EncodeDist {
             sender: self.sample(rng),
             gas_adjuster: self.sample(rng),
             watcher: self.sample(rng),
-            web3_url: format!("localhost:{}", rng.gen::<u16>()).parse().unwrap(),
         }
     }
 }
@@ -356,9 +351,10 @@ impl Distribution<configs::eth_sender::ProofLoadingMode> for EncodeDist {
 impl Distribution<configs::eth_sender::PubdataSendingMode> for EncodeDist {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::eth_sender::PubdataSendingMode {
         type T = configs::eth_sender::PubdataSendingMode;
-        match rng.gen_range(0..2) {
+        match rng.gen_range(0..3) {
             0 => T::Calldata,
-            _ => T::Blobs,
+            1 => T::Blobs,
+            _ => T::Custom,
         }
     }
 }
@@ -382,7 +378,6 @@ impl Distribution<configs::eth_sender::SenderConfig> for EncodeDist {
             timestamp_criteria_max_allowed_lag: self.sample(rng),
             l1_batch_min_age_before_execute_seconds: self.sample(rng),
             max_acceptable_priority_fee_in_gwei: self.sample(rng),
-            proof_loading_mode: self.sample(rng),
             pubdata_sending_mode: PubdataSendingMode::Calldata,
         }
     }
@@ -456,7 +451,8 @@ impl Distribution<configs::FriProverConfig> for EncodeDist {
             zone_read_url: self.sample(rng),
             shall_save_to_public_bucket: self.sample(rng),
             availability_check_interval_in_secs: self.sample(rng),
-            object_store: self.sample(rng),
+            prover_object_store: self.sample(rng),
+            public_object_store: self.sample(rng),
         }
     }
 }
@@ -629,6 +625,7 @@ impl Distribution<configs::ObjectStoreConfig> for EncodeDist {
         configs::ObjectStoreConfig {
             mode: self.sample(rng),
             max_retries: self.sample(rng),
+            local_mirror_path: self.sample(rng),
         }
     }
 }
@@ -638,6 +635,7 @@ impl Distribution<configs::ProofDataHandlerConfig> for EncodeDist {
         configs::ProofDataHandlerConfig {
             http_port: self.sample(rng),
             proof_generation_timeout_in_secs: self.sample(rng),
+            tee_support: self.sample(rng),
         }
     }
 }
@@ -645,6 +643,8 @@ impl Distribution<configs::ProofDataHandlerConfig> for EncodeDist {
 impl Distribution<configs::SnapshotsCreatorConfig> for EncodeDist {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::SnapshotsCreatorConfig {
         configs::SnapshotsCreatorConfig {
+            l1_batch_number: self.sample_opt(|| L1BatchNumber(rng.gen())),
+            version: if rng.gen() { 0 } else { 1 },
             storage_logs_chunk_size: self.sample(rng),
             concurrent_queries_count: self.sample(rng),
             object_store: self.sample(rng),
@@ -659,7 +659,6 @@ impl Distribution<configs::ObservabilityConfig> for EncodeDist {
             sentry_environment: self.sample(rng),
             log_format: self.sample(rng),
             opentelemetry: self.sample(rng),
-            sporadic_crypto_errors_substrs: self.sample_collect(rng),
             log_directives: self.sample(rng),
         }
     }
@@ -677,12 +676,18 @@ impl Distribution<configs::OpentelemetryConfig> for EncodeDist {
 impl Distribution<configs::GenesisConfig> for EncodeDist {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::GenesisConfig {
         configs::GenesisConfig {
-            protocol_version: self.sample(rng),
-            genesis_root_hash: rng.gen(),
-            rollup_last_leaf_index: self.sample(rng),
-            genesis_commitment: rng.gen(),
-            bootloader_hash: rng.gen(),
-            default_aa_hash: rng.gen(),
+            protocol_version: Some(ProtocolSemanticVersion {
+                minor: ProtocolVersionId::try_from(
+                    rng.gen_range(0..(ProtocolVersionId::latest() as u16)),
+                )
+                .unwrap(),
+                patch: VersionPatch(rng.gen()),
+            }),
+            genesis_root_hash: Some(rng.gen()),
+            rollup_last_leaf_index: Some(self.sample(rng)),
+            genesis_commitment: Some(rng.gen()),
+            bootloader_hash: Some(rng.gen()),
+            default_aa_hash: Some(rng.gen()),
             fee_account: rng.gen(),
             l1_chain_id: L1ChainId(self.sample(rng)),
             l2_chain_id: L2ChainId::default(),
@@ -691,7 +696,10 @@ impl Distribution<configs::GenesisConfig> for EncodeDist {
             recursion_scheduler_level_vk_hash: rng.gen(),
             recursion_circuits_set_vks_hash: rng.gen(),
             dummy_verifier: rng.gen(),
-            l1_batch_commit_data_generator_mode: self.sample(rng),
+            l1_batch_commit_data_generator_mode: match rng.gen_range(0..2) {
+                0 => L1BatchCommitmentMode::Rollup,
+                _ => L1BatchCommitmentMode::Validium,
+            },
         }
     }
 }
@@ -706,6 +714,28 @@ impl Distribution<configs::EcosystemContracts> for EncodeDist {
     }
 }
 
+impl Distribution<configs::consensus::WeightedValidator> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::consensus::WeightedValidator {
+        use configs::consensus::{ValidatorPublicKey, WeightedValidator};
+        WeightedValidator {
+            key: ValidatorPublicKey(self.sample(rng)),
+            weight: self.sample(rng),
+        }
+    }
+}
+
+impl Distribution<configs::consensus::GenesisSpec> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::consensus::GenesisSpec {
+        use configs::consensus::{GenesisSpec, ProtocolVersion, ValidatorPublicKey};
+        GenesisSpec {
+            chain_id: L2ChainId::default(),
+            protocol_version: ProtocolVersion(self.sample(rng)),
+            validators: self.sample_collect(rng),
+            leader: ValidatorPublicKey(self.sample(rng)),
+        }
+    }
+}
+
 impl Distribution<configs::consensus::ConsensusConfig> for EncodeDist {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::consensus::ConsensusConfig {
         use configs::consensus::{ConsensusConfig, Host, NodePublicKey};
@@ -722,6 +752,16 @@ impl Distribution<configs::consensus::ConsensusConfig> for EncodeDist {
                 .sample_range(rng)
                 .map(|_| (NodePublicKey(self.sample(rng)), Host(self.sample(rng))))
                 .collect(),
+            genesis_spec: self.sample(rng),
+            rpc: self.sample(rng),
+        }
+    }
+}
+
+impl Distribution<configs::consensus::RpcConfig> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::consensus::RpcConfig {
+        configs::consensus::RpcConfig {
+            get_block_rate: self.sample(rng),
         }
     }
 }
@@ -730,8 +770,92 @@ impl Distribution<configs::consensus::ConsensusSecrets> for EncodeDist {
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::consensus::ConsensusSecrets {
         use configs::consensus::{ConsensusSecrets, NodeSecretKey, ValidatorSecretKey};
         ConsensusSecrets {
-            validator_key: self.sample_opt(|| ValidatorSecretKey(self.sample(rng))),
-            node_key: self.sample_opt(|| NodeSecretKey(self.sample(rng))),
+            validator_key: self.sample_opt(|| ValidatorSecretKey(String::into(self.sample(rng)))),
+            node_key: self.sample_opt(|| NodeSecretKey(String::into(self.sample(rng)))),
+        }
+    }
+}
+
+impl Distribution<configs::secrets::L1Secrets> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::secrets::L1Secrets {
+        use configs::secrets::L1Secrets;
+        L1Secrets {
+            l1_rpc_url: format!("localhost:{}", rng.gen::<u16>()).parse().unwrap(),
+        }
+    }
+}
+
+impl Distribution<configs::secrets::DatabaseSecrets> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::secrets::DatabaseSecrets {
+        use configs::secrets::DatabaseSecrets;
+        DatabaseSecrets {
+            server_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
+            server_replica_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
+            prover_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
+        }
+    }
+}
+
+impl Distribution<configs::secrets::Secrets> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::secrets::Secrets {
+        use configs::secrets::Secrets;
+        Secrets {
+            consensus: self.sample_opt(|| self.sample(rng)),
+            database: self.sample_opt(|| self.sample(rng)),
+            l1: self.sample_opt(|| self.sample(rng)),
+        }
+    }
+}
+
+impl Distribution<configs::wallets::Wallet> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::wallets::Wallet {
+        configs::wallets::Wallet::new(K256PrivateKey::from_bytes(rng.gen()).unwrap())
+    }
+}
+
+impl Distribution<configs::wallets::AddressWallet> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::wallets::AddressWallet {
+        configs::wallets::AddressWallet::from_address(rng.gen())
+    }
+}
+
+impl Distribution<configs::wallets::StateKeeper> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::wallets::StateKeeper {
+        configs::wallets::StateKeeper {
+            fee_account: self.sample(rng),
+        }
+    }
+}
+
+impl Distribution<configs::wallets::EthSender> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::wallets::EthSender {
+        configs::wallets::EthSender {
+            operator: self.sample(rng),
+            blob_operator: self.sample_opt(|| self.sample(rng)),
+        }
+    }
+}
+
+impl Distribution<configs::wallets::Wallets> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::wallets::Wallets {
+        configs::wallets::Wallets {
+            state_keeper: self.sample_opt(|| self.sample(rng)),
+            eth_sender: self.sample_opt(|| self.sample(rng)),
+        }
+    }
+}
+
+impl Distribution<configs::en_config::ENConfig> for EncodeDist {
+    fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> configs::en_config::ENConfig {
+        configs::en_config::ENConfig {
+            l2_chain_id: L2ChainId::default(),
+            l1_chain_id: L1ChainId(rng.gen()),
+            main_node_url: format!("localhost:{}", rng.gen::<u16>()).parse().unwrap(),
+            l1_batch_commit_data_generator_mode: match rng.gen_range(0..2) {
+                0 => L1BatchCommitmentMode::Rollup,
+                _ => L1BatchCommitmentMode::Validium,
+            },
+            main_node_rate_limit_rps: self.sample_opt(|| rng.gen()),
         }
     }
 }
diff --git a/core/lib/contract_verifier/Cargo.toml b/core/lib/contract_verifier/Cargo.toml
new file mode 100644
index 000000000000..ea84024cba98
--- /dev/null
+++ b/core/lib/contract_verifier/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "zksync_contract_verifier_lib"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_types.workspace = true
+zksync_dal.workspace = true
+zksync_env_config.workspace = true
+zksync_config.workspace = true
+zksync_contracts.workspace = true
+zksync_queued_job_processor.workspace = true
+zksync_utils.workspace = true
+
+anyhow.workspace = true
+tokio = { workspace = true, features = ["full"] }
+thiserror.workspace = true
+chrono.workspace = true
+serde_json.workspace = true
+ethabi.workspace = true
+vise.workspace = true
+hex.workspace = true
+serde = { workspace = true, features = ["derive"] }
+lazy_static.workspace = true
+tempfile.workspace = true
+regex.workspace = true
+tracing.workspace = true
+semver.workspace = true
diff --git a/core/bin/contract-verifier/src/error.rs b/core/lib/contract_verifier/src/error.rs
similarity index 100%
rename from core/bin/contract-verifier/src/error.rs
rename to core/lib/contract_verifier/src/error.rs
diff --git a/core/bin/contract-verifier/src/verifier.rs b/core/lib/contract_verifier/src/lib.rs
similarity index 96%
rename from core/bin/contract-verifier/src/verifier.rs
rename to core/lib/contract_verifier/src/lib.rs
index 055a808b0ecd..224d4b292347 100644
--- a/core/bin/contract-verifier/src/verifier.rs
+++ b/core/lib/contract_verifier/src/lib.rs
@@ -1,6 +1,5 @@
 use std::{
     collections::HashMap,
-    env,
     path::Path,
     time::{Duration, Instant},
 };
@@ -22,17 +21,28 @@ use zksync_types::{
     },
     Address,
 };
+use zksync_utils::workspace_dir_or_current_dir;
 
 use crate::{
     error::ContractVerifierError,
+    metrics::API_CONTRACT_VERIFIER_METRICS,
     zksolc_utils::{Optimizer, Settings, Source, StandardJson, ZkSolc, ZkSolcInput, ZkSolcOutput},
     zkvyper_utils::{ZkVyper, ZkVyperInput},
 };
 
+pub mod error;
+mod metrics;
+mod zksolc_utils;
+mod zkvyper_utils;
+
 lazy_static! {
     static ref DEPLOYER_CONTRACT: Contract = zksync_contracts::deployer_contract();
 }
 
+fn home_path() -> &'static Path {
+    workspace_dir_or_current_dir()
+}
+
 #[derive(Debug)]
 enum ConstructorArgs {
     Check(Vec<u8>),
@@ -119,8 +129,7 @@ impl ContractVerifier {
             };
         let input = Self::build_zksolc_input(request.clone(), file_name.clone())?;
 
-        let zksync_home = env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
-        let zksolc_path = Path::new(&zksync_home)
+        let zksolc_path = Path::new(&home_path())
             .join("etc")
             .join("zksolc-bin")
             .join(request.req.compiler_versions.zk_compiler_version())
@@ -132,7 +141,7 @@ impl ContractVerifier {
             ));
         }
 
-        let solc_path = Path::new(&zksync_home)
+        let solc_path = Path::new(&home_path())
             .join("etc")
             .join("solc-bin")
             .join(request.req.compiler_versions.compiler_version())
@@ -144,7 +153,11 @@ impl ContractVerifier {
             ));
         }
 
-        let zksolc = ZkSolc::new(zksolc_path, solc_path);
+        let zksolc = ZkSolc::new(
+            zksolc_path,
+            solc_path,
+            request.req.compiler_versions.zk_compiler_version(),
+        );
 
         let output = time::timeout(config.compilation_timeout(), zksolc.async_compile(input))
             .await
@@ -218,8 +231,7 @@ impl ContractVerifier {
             };
         let input = Self::build_zkvyper_input(request.clone())?;
 
-        let zksync_home = env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
-        let zkvyper_path = Path::new(&zksync_home)
+        let zkvyper_path = Path::new(&home_path())
             .join("etc")
             .join("zkvyper-bin")
             .join(request.req.compiler_versions.zk_compiler_version())
@@ -231,7 +243,7 @@ impl ContractVerifier {
             ));
         }
 
-        let vyper_path = Path::new(&zksync_home)
+        let vyper_path = Path::new(&home_path())
             .join("etc")
             .join("vyper-bin")
             .join(request.req.compiler_versions.compiler_version())
@@ -271,7 +283,7 @@ impl ContractVerifier {
         Err(ContractVerifierError::MissingContract(contract_name))
     }
 
-    async fn compile(
+    pub async fn compile(
         request: VerificationRequest,
         config: ContractVerifierConfig,
     ) -> Result<CompilationArtifacts, ContractVerifierError> {
@@ -523,10 +535,9 @@ impl JobProcessor for ContractVerifier {
             let verification_result = Self::verify(&mut connection, job, config).await;
             Self::process_result(&mut connection, job_id, verification_result).await;
 
-            metrics::histogram!(
-                "api.contract_verifier.request_processing_time",
-                started_at.elapsed()
-            );
+            API_CONTRACT_VERIFIER_METRICS
+                .request_processing_time
+                .observe(started_at.elapsed());
             Ok(())
         })
     }
diff --git a/core/lib/contract_verifier/src/metrics.rs b/core/lib/contract_verifier/src/metrics.rs
new file mode 100644
index 000000000000..fd98f51cd560
--- /dev/null
+++ b/core/lib/contract_verifier/src/metrics.rs
@@ -0,0 +1,14 @@
+use std::time::Duration;
+
+use vise::{Buckets, Histogram, Metrics};
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "api_contract_verifier")]
+pub(crate) struct ApiContractVerifierMetrics {
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub request_processing_time: Histogram<Duration>,
+}
+
+#[vise::register]
+pub(crate) static API_CONTRACT_VERIFIER_METRICS: vise::Global<ApiContractVerifierMetrics> =
+    vise::Global::new();
diff --git a/core/bin/contract-verifier/src/zksolc_utils.rs b/core/lib/contract_verifier/src/zksolc_utils.rs
similarity index 67%
rename from core/bin/contract-verifier/src/zksolc_utils.rs
rename to core/lib/contract_verifier/src/zksolc_utils.rs
index 791d5ee5b6cc..08004632bcec 100644
--- a/core/bin/contract-verifier/src/zksolc_utils.rs
+++ b/core/lib/contract_verifier/src/zksolc_utils.rs
@@ -1,5 +1,6 @@
 use std::{collections::HashMap, io::Write, path::PathBuf, process::Stdio};
 
+use semver::Version;
 use serde::{Deserialize, Serialize};
 
 use crate::error::ContractVerifierError;
@@ -74,28 +75,22 @@ impl Default for Optimizer {
     }
 }
 
-impl Optimizer {
-    ///
-    /// A shortcut constructor.
-    ///
-    pub fn new(enabled: bool) -> Self {
-        Self {
-            enabled,
-            mode: None,
-        }
-    }
-}
-
 pub struct ZkSolc {
     zksolc_path: PathBuf,
     solc_path: PathBuf,
+    zksolc_version: String,
 }
 
 impl ZkSolc {
-    pub fn new(zksolc_path: impl Into<PathBuf>, solc_path: impl Into<PathBuf>) -> Self {
+    pub fn new(
+        zksolc_path: impl Into<PathBuf>,
+        solc_path: impl Into<PathBuf>,
+        zksolc_version: String,
+    ) -> Self {
         ZkSolc {
             zksolc_path: zksolc_path.into(),
             solc_path: solc_path.into(),
+            zksolc_version,
         }
     }
 
@@ -105,26 +100,36 @@ impl ZkSolc {
     ) -> Result<ZkSolcOutput, ContractVerifierError> {
         use tokio::io::AsyncWriteExt;
         let mut command = tokio::process::Command::new(&self.zksolc_path);
+        command.stdout(Stdio::piped()).stderr(Stdio::piped());
+
         match &input {
             ZkSolcInput::StandardJson(input) => {
-                if input.settings.is_system {
-                    command.arg("--system-mode");
-                }
-                if input.settings.force_evmla {
-                    command.arg("--force-evmla");
+                if !self.is_post_1_5_0() {
+                    if input.settings.is_system {
+                        command.arg("--system-mode");
+                    }
+                    if input.settings.force_evmla {
+                        command.arg("--force-evmla");
+                    }
                 }
+
+                command.arg("--solc").arg(self.solc_path.to_str().unwrap());
             }
             ZkSolcInput::YulSingleFile { is_system, .. } => {
-                if *is_system {
-                    command.arg("--system-mode");
+                if self.is_post_1_5_0() {
+                    if *is_system {
+                        command.arg("--enable-eravm-extensions");
+                    } else {
+                        command.arg("--solc").arg(self.solc_path.to_str().unwrap());
+                    }
+                } else {
+                    if *is_system {
+                        command.arg("--system-mode");
+                    }
+                    command.arg("--solc").arg(self.solc_path.to_str().unwrap());
                 }
             }
         }
-        command
-            .arg("--solc")
-            .arg(self.solc_path.to_str().unwrap())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::piped());
         match input {
             ZkSolcInput::StandardJson(input) => {
                 let mut child = command
@@ -193,4 +198,53 @@ impl ZkSolc {
             }
         }
     }
+
+    pub fn is_post_1_5_0(&self) -> bool {
+        // Special case
+        if &self.zksolc_version == "vm-1.5.0-a167aa3" {
+            false
+        } else if let Some(version) = self.zksolc_version.strip_prefix("v") {
+            if let Ok(semver) = Version::parse(version) {
+                let target = Version::new(1, 5, 0);
+                semver >= target
+            } else {
+                true
+            }
+        } else {
+            true
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::zksolc_utils::ZkSolc;
+
+    #[test]
+    fn check_is_post_1_5_0() {
+        // Special case.
+        let mut zksolc = ZkSolc::new(".", ".", "vm-1.5.0-a167aa3".to_string());
+        assert!(!zksolc.is_post_1_5_0(), "vm-1.5.0-a167aa3");
+
+        zksolc.zksolc_version = "v1.5.0".to_string();
+        assert!(zksolc.is_post_1_5_0(), "v1.5.0");
+
+        zksolc.zksolc_version = "v1.5.1".to_string();
+        assert!(zksolc.is_post_1_5_0(), "v1.5.1");
+
+        zksolc.zksolc_version = "v1.10.1".to_string();
+        assert!(zksolc.is_post_1_5_0(), "v1.10.1");
+
+        zksolc.zksolc_version = "v2.0.0".to_string();
+        assert!(zksolc.is_post_1_5_0(), "v2.0.0");
+
+        zksolc.zksolc_version = "v1.4.15".to_string();
+        assert!(!zksolc.is_post_1_5_0(), "v1.4.15");
+
+        zksolc.zksolc_version = "v1.3.21".to_string();
+        assert!(!zksolc.is_post_1_5_0(), "v1.3.21");
+
+        zksolc.zksolc_version = "v0.5.1".to_string();
+        assert!(!zksolc.is_post_1_5_0(), "v0.5.1");
+    }
 }
diff --git a/core/bin/contract-verifier/src/zkvyper_utils.rs b/core/lib/contract_verifier/src/zkvyper_utils.rs
similarity index 100%
rename from core/bin/contract-verifier/src/zkvyper_utils.rs
rename to core/lib/contract_verifier/src/zkvyper_utils.rs
diff --git a/core/lib/contracts/src/lib.rs b/core/lib/contracts/src/lib.rs
index 19b042d2bd0b..3374631a1814 100644
--- a/core/lib/contracts/src/lib.rs
+++ b/core/lib/contracts/src/lib.rs
@@ -1,11 +1,12 @@
 //! Set of utility functions to read contracts both in Yul and Sol format.
 //!
-//! Careful: some of the methods are reading the contracts based on the ZKSYNC_HOME environment variable.
+//! Careful: some of the methods are reading the contracts based on the workspace environment variable.
 
 #![allow(clippy::derive_partial_eq_without_eq)]
 
 use std::{
     fs::{self, File},
+    io::BufReader,
     path::{Path, PathBuf},
 };
 
@@ -15,7 +16,7 @@ use ethabi::{
 };
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
-use zksync_utils::{bytecode::hash_bytecode, bytes_to_be_words};
+use zksync_utils::{bytecode::hash_bytecode, bytes_to_be_words, workspace_dir_or_current_dir};
 
 pub mod test_contracts;
 
@@ -25,40 +26,53 @@ pub enum ContractLanguage {
     Yul,
 }
 
-const BRIDGEHUB_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/contracts/bridgehub/IBridgehub.sol/IBridgehub.json";
-const STATE_TRANSITION_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/contracts/state-transition/IStateTransitionManager.sol/IStateTransitionManager.json";
-const ZKSYNC_HYPERCHAIN_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol/IZkSyncHyperchain.json";
-const DIAMOND_INIT_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/contracts/state-transition/chain-interfaces/IDiamondInit.sol/IDiamondInit.json";
-const GOVERNANCE_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/contracts/governance/IGovernance.sol/IGovernance.json";
-const MULTICALL3_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/contracts/dev-contracts/Multicall3.sol/Multicall3.json";
-const VERIFIER_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/contracts/state-transition/Verifier.sol/Verifier.json";
+/// During the transition period we have to support both paths for contracts artifacts
+/// One for forge and another for hardhat.
+/// Meanwhile, hardhat has one more intermediate folder. That's why, we have to represent each contract
+/// by two constants, intermediate folder and actual contract name. For Forge we use only second part
+const HARDHAT_PATH_PREFIX: &str = "contracts/l1-contracts/artifacts/contracts";
+const FORGE_PATH_PREFIX: &str = "contracts/l1-contracts/out";
+
+const BRIDGEHUB_CONTRACT_FILE: (&str, &str) = ("bridgehub", "IBridgehub.sol/IBridgehub.json");
+const STATE_TRANSITION_CONTRACT_FILE: (&str, &str) = (
+    "state-transition",
+    "IStateTransitionManager.sol/IStateTransitionManager.json",
+);
+const ZKSYNC_HYPERCHAIN_CONTRACT_FILE: (&str, &str) = (
+    "state-transition/",
+    "chain-interfaces/IZkSyncHyperchain.sol/IZkSyncHyperchain.json",
+);
+const DIAMOND_INIT_CONTRACT_FILE: (&str, &str) = (
+    "state-transition",
+    "chain-interfaces/IDiamondInit.sol/IDiamondInit.json",
+);
+const GOVERNANCE_CONTRACT_FILE: (&str, &str) = ("governance", "IGovernance.sol/IGovernance.json");
+const MULTICALL3_CONTRACT_FILE: (&str, &str) = ("dev-contracts", "Multicall3.sol/Multicall3.json");
+const VERIFIER_CONTRACT_FILE: (&str, &str) = ("state-transition", "Verifier.sol/Verifier.json");
 const _IERC20_CONTRACT_FILE: &str =
     "contracts/l1-contracts/artifacts/contracts/common/interfaces/IERC20.sol/IERC20.json";
-const _FAIL_ON_RECEIVE_CONTRACT_FILE: &str =
+const _FAIL_ON_RECEIVE_CONTRACT_FILE:  &str  =
     "contracts/l1-contracts/artifacts/contracts/zksync/dev-contracts/FailOnReceive.sol/FailOnReceive.json";
 const LOADNEXT_CONTRACT_FILE: &str =
     "etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/LoadnextContract.json";
 const LOADNEXT_SIMPLE_CONTRACT_FILE: &str =
     "etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/Foo.json";
 
-fn read_file_to_json_value(path: impl AsRef<Path>) -> serde_json::Value {
-    let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
+fn home_path() -> &'static Path {
+    workspace_dir_or_current_dir()
+}
+
+fn read_file_to_json_value(path: impl AsRef<Path> + std::fmt::Debug) -> serde_json::Value {
+    let zksync_home = home_path();
     let path = Path::new(&zksync_home).join(path);
-    serde_json::from_reader(
-        File::open(&path).unwrap_or_else(|e| panic!("Failed to open file {:?}: {}", path, e)),
-    )
-    .unwrap_or_else(|e| panic!("Failed to parse file {:?}: {}", path, e))
+    let file =
+        File::open(&path).unwrap_or_else(|e| panic!("Failed to open file {:?}: {}", path, e));
+    serde_json::from_reader(BufReader::new(file))
+        .unwrap_or_else(|e| panic!("Failed to parse file {:?}: {}", path, e))
 }
 
 fn load_contract_if_present<P: AsRef<Path> + std::fmt::Debug>(path: P) -> Option<Contract> {
-    let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
+    let zksync_home = home_path();
     let path = Path::new(&zksync_home).join(path);
     path.exists().then(|| {
         serde_json::from_value(read_file_to_json_value(&path)["abi"].take())
@@ -66,6 +80,26 @@ fn load_contract_if_present<P: AsRef<Path> + std::fmt::Debug>(path: P) -> Option
     })
 }
 
+fn load_contract_for_hardhat(path: (&str, &str)) -> Option<Contract> {
+    let path = Path::new(HARDHAT_PATH_PREFIX).join(path.0).join(path.1);
+    load_contract_if_present(path)
+}
+
+fn load_contract_for_forge(file_path: &str) -> Option<Contract> {
+    let path = Path::new(FORGE_PATH_PREFIX).join(file_path);
+    load_contract_if_present(path)
+}
+
+fn load_contract_for_both_compilers(path: (&str, &str)) -> Contract {
+    if let Some(contract) = load_contract_for_forge(path.1) {
+        return contract;
+    };
+
+    load_contract_for_hardhat(path).unwrap_or_else(|| {
+        panic!("Failed to load contract from {:?}", path);
+    })
+}
+
 pub fn load_contract<P: AsRef<Path> + std::fmt::Debug>(path: P) -> Contract {
     load_contract_if_present(&path).unwrap_or_else(|| {
         panic!("Failed to load contract from {:?}", path);
@@ -79,7 +113,7 @@ pub fn load_sys_contract(contract_name: &str) -> Contract {
     ))
 }
 
-pub fn read_contract_abi(path: impl AsRef<Path>) -> String {
+pub fn read_contract_abi(path: impl AsRef<Path> + std::fmt::Debug) -> String {
     read_file_to_json_value(path)["abi"]
         .as_str()
         .expect("Failed to parse abi")
@@ -87,31 +121,31 @@ pub fn read_contract_abi(path: impl AsRef<Path>) -> String {
 }
 
 pub fn bridgehub_contract() -> Contract {
-    load_contract(BRIDGEHUB_CONTRACT_FILE)
+    load_contract_for_both_compilers(BRIDGEHUB_CONTRACT_FILE)
 }
 
 pub fn governance_contract() -> Contract {
-    load_contract_if_present(GOVERNANCE_CONTRACT_FILE).expect("Governance contract not found")
+    load_contract_for_both_compilers(GOVERNANCE_CONTRACT_FILE)
 }
 
 pub fn state_transition_manager_contract() -> Contract {
-    load_contract(STATE_TRANSITION_CONTRACT_FILE)
+    load_contract_for_both_compilers(STATE_TRANSITION_CONTRACT_FILE)
 }
 
 pub fn hyperchain_contract() -> Contract {
-    load_contract(ZKSYNC_HYPERCHAIN_CONTRACT_FILE)
+    load_contract_for_both_compilers(ZKSYNC_HYPERCHAIN_CONTRACT_FILE)
 }
 
 pub fn diamond_init_contract() -> Contract {
-    load_contract(DIAMOND_INIT_CONTRACT_FILE)
+    load_contract_for_both_compilers(DIAMOND_INIT_CONTRACT_FILE)
 }
 
 pub fn multicall_contract() -> Contract {
-    load_contract(MULTICALL3_CONTRACT_FILE)
+    load_contract_for_both_compilers(MULTICALL3_CONTRACT_FILE)
 }
 
 pub fn verifier_contract() -> Contract {
-    load_contract(VERIFIER_CONTRACT_FILE)
+    load_contract_for_both_compilers(VERIFIER_CONTRACT_FILE)
 }
 
 #[derive(Debug, Clone)]
@@ -149,6 +183,11 @@ pub fn l1_messenger_contract() -> Contract {
     load_sys_contract("L1Messenger")
 }
 
+/// Reads bytecode from the path RELATIVE to the Cargo workspace location.
+pub fn read_bytecode(relative_path: impl AsRef<Path> + std::fmt::Debug) -> Vec<u8> {
+    read_bytecode_from_path(relative_path)
+}
+
 pub fn eth_contract() -> Contract {
     load_sys_contract("L2BaseToken")
 }
@@ -157,16 +196,9 @@ pub fn known_codes_contract() -> Contract {
     load_sys_contract("KnownCodesStorage")
 }
 
-/// Reads bytecode from the path RELATIVE to the ZKSYNC_HOME environment variable.
-pub fn read_bytecode(relative_path: impl AsRef<Path>) -> Vec<u8> {
-    let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
-    let artifact_path = Path::new(&zksync_home).join(relative_path);
-    read_bytecode_from_path(artifact_path)
-}
-
 /// Reads bytecode from a given path.
-fn read_bytecode_from_path(artifact_path: PathBuf) -> Vec<u8> {
-    let artifact = read_file_to_json_value(artifact_path.clone());
+fn read_bytecode_from_path(artifact_path: impl AsRef<Path> + std::fmt::Debug) -> Vec<u8> {
+    let artifact = read_file_to_json_value(&artifact_path);
 
     let bytecode = artifact["bytecode"]
         .as_str()
@@ -187,19 +219,17 @@ static DEFAULT_SYSTEM_CONTRACTS_REPO: Lazy<SystemContractsRepo> =
 
 /// Structure representing a system contract repository - that allows
 /// fetching contracts that are located there.
-/// As most of the static methods in this file, is loading data based on ZKSYNC_HOME environment variable.
+/// As most of the static methods in this file, is loading data based on the Cargo workspace location.
 pub struct SystemContractsRepo {
     // Path to the root of the system contracts repository.
     pub root: PathBuf,
 }
 
 impl SystemContractsRepo {
-    /// Returns the default system contracts repository with directory based on the ZKSYNC_HOME environment variable.
+    /// Returns the default system contracts repository with directory based on the Cargo workspace location.
     pub fn from_env() -> Self {
-        let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
-        let zksync_home = PathBuf::from(zksync_home);
         SystemContractsRepo {
-            root: zksync_home.join("contracts/system-contracts"),
+            root: home_path().join("contracts/system-contracts"),
         }
     }
 
@@ -237,10 +267,9 @@ fn read_playground_batch_bootloader_bytecode() -> Vec<u8> {
     read_bootloader_code("playground_batch")
 }
 
-/// Reads zbin bytecode from a given path, relative to ZKSYNC_HOME.
+/// Reads zbin bytecode from a given path, relative to workspace location.
 pub fn read_zbin_bytecode(relative_zbin_path: impl AsRef<Path>) -> Vec<u8> {
-    let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
-    let bytecode_path = Path::new(&zksync_home).join(relative_zbin_path);
+    let bytecode_path = Path::new(&home_path()).join(relative_zbin_path);
     read_zbin_bytecode_from_path(bytecode_path)
 }
 
@@ -250,13 +279,13 @@ fn read_zbin_bytecode_from_path(bytecode_path: PathBuf) -> Vec<u8> {
         .unwrap_or_else(|err| panic!("Can't read .zbin bytecode at {:?}: {}", bytecode_path, err))
 }
 /// Hash of code and code which consists of 32 bytes words
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SystemContractCode {
     pub code: Vec<U256>,
     pub hash: H256,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct BaseSystemContracts {
     pub bootloader: SystemContractCode,
     pub default_aa: SystemContractCode,
@@ -563,7 +592,8 @@ pub static PRE_BOOJUM_COMMIT_FUNCTION: Lazy<Function> = Lazy::new(|| {
 });
 
 pub static SET_CHAIN_ID_EVENT: Lazy<Event> = Lazy::new(|| {
-    let abi = r#"{
+    let abi = r#"
+    {
       "anonymous": false,
       "inputs": [
         {
@@ -653,3 +683,124 @@ pub static SET_CHAIN_ID_EVENT: Lazy<Event> = Lazy::new(|| {
     }"#;
     serde_json::from_str(abi).unwrap()
 });
+
+// The function that was used in the pre-v23 versions of the contract to upgrade the diamond proxy.
+pub static ADMIN_EXECUTE_UPGRADE_FUNCTION: Lazy<Function> = Lazy::new(|| {
+    let abi = r#"
+    {
+        "inputs": [
+          {
+            "components": [
+              {
+                "components": [
+                  {
+                    "internalType": "address",
+                    "name": "facet",
+                    "type": "address"
+                  },
+                  {
+                    "internalType": "enum Diamond.Action",
+                    "name": "action",
+                    "type": "uint8"
+                  },
+                  {
+                    "internalType": "bool",
+                    "name": "isFreezable",
+                    "type": "bool"
+                  },
+                  {
+                    "internalType": "bytes4[]",
+                    "name": "selectors",
+                    "type": "bytes4[]"
+                  }
+                ],
+                "internalType": "struct Diamond.FacetCut[]",
+                "name": "facetCuts",
+                "type": "tuple[]"
+              },
+              {
+                "internalType": "address",
+                "name": "initAddress",
+                "type": "address"
+              },
+              {
+                "internalType": "bytes",
+                "name": "initCalldata",
+                "type": "bytes"
+              }
+            ],
+            "internalType": "struct Diamond.DiamondCutData",
+            "name": "_diamondCut",
+            "type": "tuple"
+          }
+        ],
+        "name": "executeUpgrade",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }"#;
+    serde_json::from_str(abi).unwrap()
+});
+
+// The function that is used in post-v23 chains to upgrade the chain
+pub static ADMIN_UPGRADE_CHAIN_FROM_VERSION_FUNCTION: Lazy<Function> = Lazy::new(|| {
+    let abi = r#"
+    {
+        "inputs": [
+          {
+            "internalType": "uint256",
+            "name": "_oldProtocolVersion",
+            "type": "uint256"
+          },
+          {
+            "components": [
+              {
+                "components": [
+                  {
+                    "internalType": "address",
+                    "name": "facet",
+                    "type": "address"
+                  },
+                  {
+                    "internalType": "enum Diamond.Action",
+                    "name": "action",
+                    "type": "uint8"
+                  },
+                  {
+                    "internalType": "bool",
+                    "name": "isFreezable",
+                    "type": "bool"
+                  },
+                  {
+                    "internalType": "bytes4[]",
+                    "name": "selectors",
+                    "type": "bytes4[]"
+                  }
+                ],
+                "internalType": "struct Diamond.FacetCut[]",
+                "name": "facetCuts",
+                "type": "tuple[]"
+              },
+              {
+                "internalType": "address",
+                "name": "initAddress",
+                "type": "address"
+              },
+              {
+                "internalType": "bytes",
+                "name": "initCalldata",
+                "type": "bytes"
+              }
+            ],
+            "internalType": "struct Diamond.DiamondCutData",
+            "name": "_diamondCut",
+            "type": "tuple"
+          }
+        ],
+        "name": "upgradeChainFromVersion",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }"#;
+    serde_json::from_str(abi).unwrap()
+});
diff --git a/core/lib/crypto/README.md b/core/lib/crypto/README.md
index e224b2732d34..38b5a306a9bd 100644
--- a/core/lib/crypto/README.md
+++ b/core/lib/crypto/README.md
@@ -1,10 +1,10 @@
-# zkSync crypto. Essential cryptography primitives for the zkSync network
+# ZKsync crypto. Essential cryptography primitives for the ZKsync network
 
-`zksync_crypto` is a crate containing essential zkSync cryptographic primitives, such as private keys and hashers.
+`zksync_crypto` is a crate containing essential ZKsync cryptographic primitives, such as private keys and hashers.
 
 ## License
 
-`zksync_crypto` is a part of zkSync stack, which is distributed under the terms of both the MIT license and the Apache
+`zksync_crypto` is a part of ZKsync stack, which is distributed under the terms of both the MIT license and the Apache
 License (Version 2.0).
 
 See [LICENSE-APACHE](../../../LICENSE-APACHE), [LICENSE-MIT](../../../LICENSE-MIT) for details.
diff --git a/core/lib/crypto_primitives/src/ecdsa_signature.rs b/core/lib/crypto_primitives/src/ecdsa_signature.rs
index 026e42307dc6..a994e0f3c134 100644
--- a/core/lib/crypto_primitives/src/ecdsa_signature.rs
+++ b/core/lib/crypto_primitives/src/ecdsa_signature.rs
@@ -43,7 +43,7 @@ type Public = H512;
 ///
 /// Provides a safe to use `Debug` implementation (outputting the address corresponding to the key).
 /// The key is zeroized on drop.
-#[derive(Clone)]
+#[derive(Clone, PartialEq)]
 pub struct K256PrivateKey(SecretKey);
 
 impl fmt::Debug for K256PrivateKey {
diff --git a/core/lib/crypto_primitives/src/eip712_signature/struct_builder.rs b/core/lib/crypto_primitives/src/eip712_signature/struct_builder.rs
index 74bf13c91e88..655e2d2d9333 100644
--- a/core/lib/crypto_primitives/src/eip712_signature/struct_builder.rs
+++ b/core/lib/crypto_primitives/src/eip712_signature/struct_builder.rs
@@ -61,13 +61,13 @@ impl OuterTypeBuilder {
         let mut result = BTreeMap::new();
 
         while let Some(front_element) = self.inner_members_queue.pop_front() {
-            if result.get(&front_element.member_type).is_some() {
+            if result.contains_key(&front_element.member_type) {
                 continue;
             }
 
             result.insert(front_element.member_type.clone(), front_element.clone());
             for inner_member in front_element.inner_members {
-                if inner_member.is_reference_type && result.get(&inner_member.member_type).is_none()
+                if inner_member.is_reference_type && !result.contains_key(&inner_member.member_type)
                 {
                     self.inner_members_queue.push_back(inner_member);
                 }
diff --git a/core/lib/crypto_primitives/src/eip712_signature/typed_structure.rs b/core/lib/crypto_primitives/src/eip712_signature/typed_structure.rs
index 8b7383648978..a08273c0a037 100644
--- a/core/lib/crypto_primitives/src/eip712_signature/typed_structure.rs
+++ b/core/lib/crypto_primitives/src/eip712_signature/typed_structure.rs
@@ -100,7 +100,7 @@ impl<TypedStructure: EIP712TypedStructure> StructMember for TypedStructure {
 }
 
 /// Interface for defining the structure for the EIP712 signature.
-pub trait EIP712TypedStructure: Serialize {
+pub trait EIP712TypedStructure {
     const TYPE_NAME: &'static str;
 
     fn build_structure<BUILDER: StructBuilder>(&self, builder: &mut BUILDER);
@@ -160,7 +160,7 @@ impl Eip712Domain {
     pub const NAME: &'static str = "zkSync";
     /// Version of the protocol. While there may be `2.x` releases, the minor release version bump
     /// should not be breaking, meaning that clients from the `2.x-1` version should be able to communicate
-    /// with zkSync server. Thus `VERSION` corresponds to the major version only.
+    /// with ZKsync server. Thus `VERSION` corresponds to the major version only.
     pub const VERSION: &'static str = "2";
 
     pub fn new(chain_id: L2ChainId) -> Self {
diff --git a/core/lib/crypto_primitives/src/eip712_signature/utils.rs b/core/lib/crypto_primitives/src/eip712_signature/utils.rs
index 743d646ec581..526bb3b6b229 100644
--- a/core/lib/crypto_primitives/src/eip712_signature/utils.rs
+++ b/core/lib/crypto_primitives/src/eip712_signature/utils.rs
@@ -4,7 +4,7 @@ use crate::eip712_signature::typed_structure::{EIP712TypedStructure, Eip712Domai
 
 /// Formats the data that needs to be signed in json according to the standard eip-712.
 /// Compatible with `eth_signTypedData` RPC call.
-pub fn get_eip712_json<T: EIP712TypedStructure>(
+pub fn get_eip712_json<T: EIP712TypedStructure + serde::Serialize>(
     eip712_domain: &Eip712Domain,
     typed_struct: &T,
 ) -> Value {
diff --git a/core/lib/prometheus_exporter/Cargo.toml b/core/lib/da_client/Cargo.toml
similarity index 51%
rename from core/lib/prometheus_exporter/Cargo.toml
rename to core/lib/da_client/Cargo.toml
index 3158aeb73da0..da118058eab5 100644
--- a/core/lib/prometheus_exporter/Cargo.toml
+++ b/core/lib/da_client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "prometheus_exporter"
-version = "0.1.0"
+name = "zksync_da_client"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
@@ -10,10 +10,10 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
+serde = { workspace = true, features = ["derive"] }
+tracing.workspace = true
+async-trait.workspace = true
 anyhow.workspace = true
-metrics.workspace = true
-metrics-exporter-prometheus.workspace = true
-tokio.workspace = true
-vise.workspace = true
 
-vise-exporter = { workspace = true, features = ["legacy"] }
+zksync_config.workspace = true
+zksync_types.workspace = true
diff --git a/core/lib/da_client/README.md b/core/lib/da_client/README.md
new file mode 100644
index 000000000000..9c890498467d
--- /dev/null
+++ b/core/lib/da_client/README.md
@@ -0,0 +1,16 @@
+# Data Availability Client
+
+This crate contains a trait that has to be implemented by all the DA clients.
+
+## Overview
+
+This trait assumes that every implementation follows these logical assumptions:
+
+- The DA client is only serving as a connector between the ZK chain's sequencer and the DA layer.
+- The DA client is not supposed to be a standalone application, but rather a library that is used by the
+  `da_dispatcher`.
+- The logic of the retries is implemented in the `da_dispatcher`, not in the DA clients.
+- The `dispatch_blob` is supposed to be idempotent, and work correctly even if called multiple times with the same
+  params.
+- The `get_inclusion_data` has to return the data only when the state roots are relayed to the L1 verification contract
+  (if the DA solution has one).
diff --git a/core/lib/da_client/src/lib.rs b/core/lib/da_client/src/lib.rs
new file mode 100644
index 000000000000..7e4a2643a259
--- /dev/null
+++ b/core/lib/da_client/src/lib.rs
@@ -0,0 +1,32 @@
+pub mod types;
+
+use std::fmt;
+
+use async_trait::async_trait;
+use types::{DAError, DispatchResponse, InclusionData};
+
+/// Trait that defines the interface for the data availability layer clients.
+#[async_trait]
+pub trait DataAvailabilityClient: Sync + Send + fmt::Debug {
+    /// Dispatches a blob to the data availability layer.
+    async fn dispatch_blob(
+        &self,
+        batch_number: u32,
+        data: Vec<u8>,
+    ) -> Result<DispatchResponse, DAError>;
+
+    /// Fetches the inclusion data for a given blob_id.
+    async fn get_inclusion_data(&self, blob_id: &str) -> Result<Option<InclusionData>, DAError>;
+
+    /// Clones the client and wraps it in a Box.
+    fn clone_boxed(&self) -> Box<dyn DataAvailabilityClient>;
+
+    /// Returns the maximum size of the blob (in bytes) that can be dispatched. None means no limit.
+    fn blob_size_limit(&self) -> Option<usize>;
+}
+
+impl Clone for Box<dyn DataAvailabilityClient> {
+    fn clone(&self) -> Box<dyn DataAvailabilityClient> {
+        self.clone_boxed()
+    }
+}
diff --git a/core/lib/da_client/src/types.rs b/core/lib/da_client/src/types.rs
new file mode 100644
index 000000000000..e339111bb51a
--- /dev/null
+++ b/core/lib/da_client/src/types.rs
@@ -0,0 +1,44 @@
+use std::{error, fmt::Display};
+
+use serde::Serialize;
+
+/// `DAError` is the error type returned by the DA clients.
+#[derive(Debug)]
+pub struct DAError {
+    pub error: anyhow::Error,
+    pub is_transient: bool,
+}
+
+impl DAError {
+    pub fn is_transient(&self) -> bool {
+        self.is_transient
+    }
+}
+
+impl Display for DAError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let kind = if self.is_transient {
+            "transient"
+        } else {
+            "fatal"
+        };
+        write!(f, "{kind} data availability client error: {}", self.error)
+    }
+}
+
+impl error::Error for DAError {}
+
+/// `DispatchResponse` is the response received from the DA layer after dispatching a blob.
+#[derive(Default)]
+pub struct DispatchResponse {
+    /// The blob_id is needed to fetch the inclusion data.
+    pub blob_id: String,
+}
+
+/// `InclusionData` is the data needed to verify on L1 that a blob is included in the DA layer.
+#[derive(Default, Serialize)]
+pub struct InclusionData {
+    /// The inclusion data serialized by the DA client. Serialization is done in a way that allows
+    /// the deserialization of the data in Solidity contracts.
+    pub data: Vec<u8>,
+}
diff --git a/core/lib/dal/.sqlx/query-015350f8d729ef490553550a68f07703b2581dda4fe3c00be6c5422c78980c4b.json b/core/lib/dal/.sqlx/query-015350f8d729ef490553550a68f07703b2581dda4fe3c00be6c5422c78980c4b.json
deleted file mode 100644
index d8495583ba97..000000000000
--- a/core/lib/dal/.sqlx/query-015350f8d729ef490553550a68f07703b2581dda4fe3c00be6c5422c78980c4b.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                MAX(id) AS \"max?\"\n            FROM\n                protocol_versions\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "max?",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "015350f8d729ef490553550a68f07703b2581dda4fe3c00be6c5422c78980c4b"
-}
diff --git a/core/lib/dal/.sqlx/query-01cc22f19b61145b0dbed96ec84ae1cee8eeca1c74529adee78157dcf8930c44.json b/core/lib/dal/.sqlx/query-01cc22f19b61145b0dbed96ec84ae1cee8eeca1c74529adee78157dcf8930c44.json
new file mode 100644
index 000000000000..d8af3cae95b9
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-01cc22f19b61145b0dbed96ec84ae1cee8eeca1c74529adee78157dcf8930c44.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                    SELECT COALESCE(\n                        (\n                            SELECT MAX(number) FROM miniblocks\n                            WHERE l1_batch_number = (\n                                SELECT number FROM l1_batches\n                                JOIN eth_txs ON\n                                    l1_batches.eth_commit_tx_id = eth_txs.id\n                                WHERE\n                                    eth_txs.confirmed_eth_tx_history_id IS NOT NULL\n                                ORDER BY number DESC LIMIT 1\n                            )\n                        ),\n                        0\n                    ) AS number\n                    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "01cc22f19b61145b0dbed96ec84ae1cee8eeca1c74529adee78157dcf8930c44"
+}
diff --git a/core/lib/dal/.sqlx/query-0385576f1fb3836fc04a6cde3e92c03e1de8292eb0ea1e026ba1b32a3745c261.json b/core/lib/dal/.sqlx/query-0385576f1fb3836fc04a6cde3e92c03e1de8292eb0ea1e026ba1b32a3745c261.json
new file mode 100644
index 000000000000..a98cbb18034a
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0385576f1fb3836fc04a6cde3e92c03e1de8292eb0ea1e026ba1b32a3745c261.json
@@ -0,0 +1,49 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                storage_logs.hashed_key AS \"hashed_key!\",\n                storage_logs.value AS \"value!\",\n                storage_logs.miniblock_number AS \"miniblock_number!\",\n                initial_writes.l1_batch_number AS \"l1_batch_number!\",\n                initial_writes.index\n            FROM\n                (\n                    SELECT\n                        hashed_key,\n                        MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op\n                    FROM\n                        storage_logs\n                    WHERE\n                        miniblock_number <= $1\n                        AND hashed_key >= $3\n                        AND hashed_key <= $4\n                    GROUP BY\n                        hashed_key\n                    ORDER BY\n                        hashed_key\n                ) AS keys\n                INNER JOIN storage_logs ON keys.hashed_key = storage_logs.hashed_key\n                AND storage_logs.miniblock_number = keys.op[1]\n                AND storage_logs.operation_number = keys.op[2]\n                INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key\n            WHERE\n                initial_writes.l1_batch_number <= $2\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "hashed_key!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 1,
+        "name": "value!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 2,
+        "name": "miniblock_number!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "l1_batch_number!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 4,
+        "name": "index",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        "Bytea",
+        "Bytea"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "0385576f1fb3836fc04a6cde3e92c03e1de8292eb0ea1e026ba1b32a3745c261"
+}
diff --git a/core/lib/dal/.sqlx/query-70137d0b3cdcbbf6d85c9d0a5408490e9dd1108a34b97b0efd54d19b678fb598.json b/core/lib/dal/.sqlx/query-05b0050aa9d2944542abbcef31af3fe8d35800340d1c6e9d02c15226b699c93b.json
similarity index 68%
rename from core/lib/dal/.sqlx/query-70137d0b3cdcbbf6d85c9d0a5408490e9dd1108a34b97b0efd54d19b678fb598.json
rename to core/lib/dal/.sqlx/query-05b0050aa9d2944542abbcef31af3fe8d35800340d1c6e9d02c15226b699c93b.json
index ccc3f333e02f..b577e7535eb0 100644
--- a/core/lib/dal/.sqlx/query-70137d0b3cdcbbf6d85c9d0a5408490e9dd1108a34b97b0efd54d19b678fb598.json
+++ b/core/lib/dal/.sqlx/query-05b0050aa9d2944542abbcef31af3fe8d35800340d1c6e9d02c15226b699c93b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                eth_prove_tx_id,\n                eth_commit_tx_id,\n                eth_execute_tx_id,\n                l2_to_l1_logs,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                system_logs,\n                compressed_state_diffs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            WHERE\n                number = $1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            WHERE\n                eth_commit_tx_id IS NOT NULL\n                AND eth_prove_tx_id IS NULL\n            ORDER BY\n                number\n            LIMIT\n                $1\n            ",
   "describe": {
     "columns": [
       {
@@ -45,111 +45,91 @@
       },
       {
         "ordinal": 8,
-        "name": "eth_prove_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "eth_commit_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "eth_execute_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 12,
         "name": "l2_to_l1_messages",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 13,
+        "ordinal": 9,
         "name": "used_contract_hashes",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 14,
+        "ordinal": 10,
         "name": "compressed_initial_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 15,
+        "ordinal": 11,
         "name": "compressed_repeated_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 16,
+        "ordinal": 12,
         "name": "l2_l1_merkle_root",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 17,
+        "ordinal": 13,
         "name": "rollup_last_leaf_index",
         "type_info": "Int8"
       },
       {
-        "ordinal": 18,
+        "ordinal": 14,
         "name": "zkporter_is_available",
         "type_info": "Bool"
       },
       {
-        "ordinal": 19,
+        "ordinal": 15,
         "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 20,
+        "ordinal": 16,
         "name": "default_aa_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 21,
+        "ordinal": 17,
         "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 18,
         "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 23,
+        "ordinal": 19,
         "name": "meta_parameters_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 20,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 25,
-        "name": "system_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 26,
+        "ordinal": 21,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 27,
+        "ordinal": 22,
+        "name": "system_logs",
+        "type_info": "ByteaArray"
+      },
+      {
+        "ordinal": 23,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 28,
+        "ordinal": 24,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 29,
+        "ordinal": 25,
         "name": "pubdata_input",
         "type_info": "Bytea"
       }
@@ -168,10 +148,6 @@
       false,
       true,
       true,
-      true,
-      true,
-      true,
-      false,
       false,
       false,
       true,
@@ -185,12 +161,12 @@
       true,
       true,
       true,
-      false,
       true,
+      false,
       true,
       true,
       true
     ]
   },
-  "hash": "70137d0b3cdcbbf6d85c9d0a5408490e9dd1108a34b97b0efd54d19b678fb598"
+  "hash": "05b0050aa9d2944542abbcef31af3fe8d35800340d1c6e9d02c15226b699c93b"
 }
diff --git a/core/lib/dal/.sqlx/query-982a7566aebc4f94b37c9cbe32f0f6d8b037d7a5fade524a4faadb421399a00b.json b/core/lib/dal/.sqlx/query-05be1a2c5cefcb1a58af2e5113e89003638d26219c13bc176e8cfee696d4e9f6.json
similarity index 61%
rename from core/lib/dal/.sqlx/query-982a7566aebc4f94b37c9cbe32f0f6d8b037d7a5fade524a4faadb421399a00b.json
rename to core/lib/dal/.sqlx/query-05be1a2c5cefcb1a58af2e5113e89003638d26219c13bc176e8cfee696d4e9f6.json
index a0567d0917df..69a1077452dd 100644
--- a/core/lib/dal/.sqlx/query-982a7566aebc4f94b37c9cbe32f0f6d8b037d7a5fade524a4faadb421399a00b.json
+++ b/core/lib/dal/.sqlx/query-05be1a2c5cefcb1a58af2e5113e89003638d26219c13bc176e8cfee696d4e9f6.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    transactions.hash AS tx_hash,\n                    transactions.index_in_block AS index_in_block,\n                    transactions.miniblock_number AS block_number,\n                    transactions.nonce AS nonce,\n                    transactions.signature AS signature,\n                    transactions.initiator_address AS initiator_address,\n                    transactions.tx_format AS tx_format,\n                    transactions.value AS value,\n                    transactions.gas_limit AS gas_limit,\n                    transactions.max_fee_per_gas AS max_fee_per_gas,\n                    transactions.max_priority_fee_per_gas AS max_priority_fee_per_gas,\n                    transactions.effective_gas_price AS effective_gas_price,\n                    transactions.l1_batch_number AS l1_batch_number,\n                    transactions.l1_batch_tx_index AS l1_batch_tx_index,\n                    transactions.data->'contractAddress' AS \"execute_contract_address\",\n                    transactions.data->'calldata' AS \"calldata\",\n                    miniblocks.hash AS \"block_hash\"\n                FROM transactions\n                LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                WHERE\n                transactions.miniblock_number = $1 AND transactions.index_in_block = $2 AND transactions.data != '{}'::jsonb",
+  "query": "\n                SELECT\n                    transactions.hash AS tx_hash,\n                    transactions.index_in_block AS index_in_block,\n                    miniblocks.number AS block_number,\n                    transactions.nonce AS nonce,\n                    transactions.signature AS signature,\n                    transactions.initiator_address AS initiator_address,\n                    transactions.tx_format AS tx_format,\n                    transactions.value AS value,\n                    transactions.gas_limit AS gas_limit,\n                    transactions.max_fee_per_gas AS max_fee_per_gas,\n                    transactions.max_priority_fee_per_gas AS max_priority_fee_per_gas,\n                    transactions.effective_gas_price AS effective_gas_price,\n                    transactions.l1_batch_number AS l1_batch_number,\n                    transactions.l1_batch_tx_index AS l1_batch_tx_index,\n                    transactions.data->'contractAddress' AS \"execute_contract_address\",\n                    transactions.data->'calldata' AS \"calldata\",\n                    miniblocks.hash AS \"block_hash\"\n                FROM transactions\n                LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                WHERE\n                miniblocks.number = $1 AND transactions.index_in_block = $2 AND transactions.data != '{}'::jsonb",
   "describe": {
     "columns": [
       {
@@ -98,7 +98,7 @@
     "nullable": [
       false,
       true,
-      true,
+      false,
       true,
       true,
       false,
@@ -115,5 +115,5 @@
       false
     ]
   },
-  "hash": "982a7566aebc4f94b37c9cbe32f0f6d8b037d7a5fade524a4faadb421399a00b"
+  "hash": "05be1a2c5cefcb1a58af2e5113e89003638d26219c13bc176e8cfee696d4e9f6"
 }
diff --git a/core/lib/dal/.sqlx/query-0a2138a1cbf21546931867319ccbfe1e597151ecfaeb3cfa6624f2a1978ef23f.json b/core/lib/dal/.sqlx/query-0a2138a1cbf21546931867319ccbfe1e597151ecfaeb3cfa6624f2a1978ef23f.json
new file mode 100644
index 000000000000..eaef732751ec
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0a2138a1cbf21546931867319ccbfe1e597151ecfaeb3cfa6624f2a1978ef23f.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n                available_batches AS (\n                    SELECT\n                        MAX(number) AS \"last_batch\"\n                    FROM\n                        l1_batches\n                ),\n                processed_batches AS (\n                    SELECT\n                        COALESCE(MAX(l1_batch_number), $1) + $2 AS \"last_ready_batch\"\n                    FROM\n                        vm_runner_protective_reads\n                )\n            SELECT\n                LEAST(last_batch, last_ready_batch) AS \"last_ready_batch!\"\n            FROM\n                available_batches\n                FULL JOIN processed_batches ON TRUE\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "last_ready_batch!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "0a2138a1cbf21546931867319ccbfe1e597151ecfaeb3cfa6624f2a1978ef23f"
+}
diff --git a/core/lib/dal/.sqlx/query-0b5d5efeac95d429cf6a5be22153897edf8c868094ad029e2e8fcf286d44fd55.json b/core/lib/dal/.sqlx/query-0b5d5efeac95d429cf6a5be22153897edf8c868094ad029e2e8fcf286d44fd55.json
new file mode 100644
index 000000000000..822a6967f6db
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0b5d5efeac95d429cf6a5be22153897edf8c868094ad029e2e8fcf286d44fd55.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                data_availability (l1_batch_number, blob_id, sent_at, created_at, updated_at)\n            VALUES\n                ($1, $2, $3, NOW(), NOW())\n            ON CONFLICT DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Timestamp"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "0b5d5efeac95d429cf6a5be22153897edf8c868094ad029e2e8fcf286d44fd55"
+}
diff --git a/core/lib/dal/.sqlx/query-0ccfbde0df7c74b489bae4799177b9a22283340a8c9fb4c28d2d76de921ca77b.json b/core/lib/dal/.sqlx/query-0ccfbde0df7c74b489bae4799177b9a22283340a8c9fb4c28d2d76de921ca77b.json
new file mode 100644
index 000000000000..f4bd9fdfb765
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0ccfbde0df7c74b489bae4799177b9a22283340a8c9fb4c28d2d76de921ca77b.json
@@ -0,0 +1,38 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                l1_batch_number,\n                blob_id,\n                inclusion_data,\n                sent_at\n            FROM\n                data_availability\n            WHERE\n                inclusion_data IS NULL\n            ORDER BY\n                l1_batch_number\n            LIMIT\n                1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "blob_id",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "inclusion_data",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 3,
+        "name": "sent_at",
+        "type_info": "Timestamp"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "0ccfbde0df7c74b489bae4799177b9a22283340a8c9fb4c28d2d76de921ca77b"
+}
diff --git a/core/lib/dal/.sqlx/query-2dd7dbaeb2572404451e78a96f540e73a2778633bbf9d8e591ec912634639af9.json b/core/lib/dal/.sqlx/query-0f1856e55a370280a078d048f09e2d457914c737660b37e9f66b576bbc9a7904.json
similarity index 89%
rename from core/lib/dal/.sqlx/query-2dd7dbaeb2572404451e78a96f540e73a2778633bbf9d8e591ec912634639af9.json
rename to core/lib/dal/.sqlx/query-0f1856e55a370280a078d048f09e2d457914c737660b37e9f66b576bbc9a7904.json
index bb81e7c31943..498e839a63d7 100644
--- a/core/lib/dal/.sqlx/query-2dd7dbaeb2572404451e78a96f540e73a2778633bbf9d8e591ec912634639af9.json
+++ b/core/lib/dal/.sqlx/query-0f1856e55a370280a078d048f09e2d457914c737660b37e9f66b576bbc9a7904.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                *\n            FROM\n                transactions\n            WHERE\n                miniblock_number = $1\n            ORDER BY\n                index_in_block\n            ",
+  "query": "\n            SELECT\n                transactions.*\n            FROM\n                transactions\n                INNER JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n            WHERE\n                miniblocks.number BETWEEN $1 AND $2\n            ORDER BY\n                miniblock_number,\n                index_in_block\n            ",
   "describe": {
     "columns": [
       {
@@ -186,6 +186,7 @@
     ],
     "parameters": {
       "Left": [
+        "Int8",
         "Int8"
       ]
     },
@@ -228,5 +229,5 @@
       true
     ]
   },
-  "hash": "2dd7dbaeb2572404451e78a96f540e73a2778633bbf9d8e591ec912634639af9"
+  "hash": "0f1856e55a370280a078d048f09e2d457914c737660b37e9f66b576bbc9a7904"
 }
diff --git a/core/lib/dal/.sqlx/query-0fbdf8da9a000c433c5475d57f6ad2574cd1310dff1d1bf06825d5634ba25f04.json b/core/lib/dal/.sqlx/query-0fbdf8da9a000c433c5475d57f6ad2574cd1310dff1d1bf06825d5634ba25f04.json
new file mode 100644
index 000000000000..05b94ad249ac
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0fbdf8da9a000c433c5475d57f6ad2574cd1310dff1d1bf06825d5634ba25f04.json
@@ -0,0 +1,30 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE tee_verifier_input_producer_jobs\n            SET\n                status = $1,\n                updated_at = NOW(),\n                time_taken = $3,\n                input_blob_url = $4\n            WHERE\n                l1_batch_number = $2\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        {
+          "Custom": {
+            "name": "tee_verifier_input_producer_job_status",
+            "kind": {
+              "Enum": [
+                "Queued",
+                "ManuallySkipped",
+                "InProgress",
+                "Successful",
+                "Failed"
+              ]
+            }
+          }
+        },
+        "Int8",
+        "Time",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "0fbdf8da9a000c433c5475d57f6ad2574cd1310dff1d1bf06825d5634ba25f04"
+}
diff --git a/core/lib/dal/.sqlx/query-0fc8ede1d0962938d606c6352335afce09869d43eb88ec7fdb526ce8491e35d9.json b/core/lib/dal/.sqlx/query-0fc8ede1d0962938d606c6352335afce09869d43eb88ec7fdb526ce8491e35d9.json
new file mode 100644
index 000000000000..1ad92abac368
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0fc8ede1d0962938d606c6352335afce09869d43eb88ec7fdb526ce8491e35d9.json
@@ -0,0 +1,56 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                *\n            FROM\n                base_token_ratios\n            ORDER BY\n                ratio_timestamp DESC\n            LIMIT\n                1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "created_at",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 2,
+        "name": "updated_at",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 3,
+        "name": "ratio_timestamp",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 4,
+        "name": "numerator",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 5,
+        "name": "denominator",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 6,
+        "name": "used_in_l1",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "0fc8ede1d0962938d606c6352335afce09869d43eb88ec7fdb526ce8491e35d9"
+}
diff --git a/core/lib/dal/.sqlx/query-0fef49a649d20c9fd263c1dfa40daa9b94d398c635c37746736e98f1f18fcca7.json b/core/lib/dal/.sqlx/query-0fef49a649d20c9fd263c1dfa40daa9b94d398c635c37746736e98f1f18fcca7.json
new file mode 100644
index 000000000000..adfd1919db51
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-0fef49a649d20c9fd263c1dfa40daa9b94d398c635c37746736e98f1f18fcca7.json
@@ -0,0 +1,65 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE tee_verifier_input_producer_jobs\n            SET\n                status = $1,\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        tee_verifier_input_producer_jobs\n                    WHERE\n                        status = $2\n                        OR (\n                            status = $1\n                            AND processing_started_at < NOW() - $4::INTERVAL\n                        )\n                        OR (\n                            status = $3\n                            AND attempts < $5\n                        )\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                tee_verifier_input_producer_jobs.l1_batch_number\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        {
+          "Custom": {
+            "name": "tee_verifier_input_producer_job_status",
+            "kind": {
+              "Enum": [
+                "Queued",
+                "ManuallySkipped",
+                "InProgress",
+                "Successful",
+                "Failed"
+              ]
+            }
+          }
+        },
+        {
+          "Custom": {
+            "name": "tee_verifier_input_producer_job_status",
+            "kind": {
+              "Enum": [
+                "Queued",
+                "ManuallySkipped",
+                "InProgress",
+                "Successful",
+                "Failed"
+              ]
+            }
+          }
+        },
+        {
+          "Custom": {
+            "name": "tee_verifier_input_producer_job_status",
+            "kind": {
+              "Enum": [
+                "Queued",
+                "ManuallySkipped",
+                "InProgress",
+                "Successful",
+                "Failed"
+              ]
+            }
+          }
+        },
+        "Interval",
+        "Int2"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "0fef49a649d20c9fd263c1dfa40daa9b94d398c635c37746736e98f1f18fcca7"
+}
diff --git a/core/lib/dal/.sqlx/query-1074d0a2e4a4afb9a92f3822e133db7a71aca15698bafba051a8d9a91a4dbc76.json b/core/lib/dal/.sqlx/query-1074d0a2e4a4afb9a92f3822e133db7a71aca15698bafba051a8d9a91a4dbc76.json
new file mode 100644
index 000000000000..13e4cdb9431d
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-1074d0a2e4a4afb9a92f3822e133db7a71aca15698bafba051a8d9a91a4dbc76.json
@@ -0,0 +1,112 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n                mb AS (\n                    SELECT\n                        l1_gas_price,\n                        l2_fair_gas_price,\n                        fair_pubdata_price\n                    FROM\n                        miniblocks\n                    WHERE\n                        l1_batch_number = $1\n                    LIMIT\n                        1\n                )\n            SELECT\n                l1_batches.number,\n                l1_batches.timestamp,\n                l1_batches.l1_tx_count,\n                l1_batches.l2_tx_count,\n                l1_batches.hash AS \"root_hash?\",\n                commit_tx.tx_hash AS \"commit_tx_hash?\",\n                commit_tx.confirmed_at AS \"committed_at?\",\n                prove_tx.tx_hash AS \"prove_tx_hash?\",\n                prove_tx.confirmed_at AS \"proven_at?\",\n                execute_tx.tx_hash AS \"execute_tx_hash?\",\n                execute_tx.confirmed_at AS \"executed_at?\",\n                mb.l1_gas_price,\n                mb.l2_fair_gas_price,\n                mb.fair_pubdata_price,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash\n            FROM\n                l1_batches\n                INNER JOIN mb ON TRUE\n                LEFT JOIN eth_txs_history AS commit_tx ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS prove_tx ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS execute_tx ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                l1_batches.number = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "l1_tx_count",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 3,
+        "name": "l2_tx_count",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 4,
+        "name": "root_hash?",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 5,
+        "name": "commit_tx_hash?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "committed_at?",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 7,
+        "name": "prove_tx_hash?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 8,
+        "name": "proven_at?",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 9,
+        "name": "execute_tx_hash?",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 10,
+        "name": "executed_at?",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 11,
+        "name": "l1_gas_price",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 12,
+        "name": "l2_fair_gas_price",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 13,
+        "name": "fair_pubdata_price",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 14,
+        "name": "bootloader_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 15,
+        "name": "default_aa_code_hash",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      false,
+      true,
+      false,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "1074d0a2e4a4afb9a92f3822e133db7a71aca15698bafba051a8d9a91a4dbc76"
+}
diff --git a/core/lib/dal/.sqlx/query-11eaf115b7409feaf15aaee50839edd4367018ed40c77d9866899ab15d2abe05.json b/core/lib/dal/.sqlx/query-11eaf115b7409feaf15aaee50839edd4367018ed40c77d9866899ab15d2abe05.json
new file mode 100644
index 000000000000..fb1be26d15c4
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-11eaf115b7409feaf15aaee50839edd4367018ed40c77d9866899ab15d2abe05.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                protocol_patches (\n                    minor,\n                    patch,\n                    recursion_scheduler_level_vk_hash,\n                    recursion_node_level_vk_hash,\n                    recursion_leaf_level_vk_hash,\n                    recursion_circuits_set_vks_hash,\n                    created_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, $6, NOW())\n            ON CONFLICT DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Int4",
+        "Bytea",
+        "Bytea",
+        "Bytea",
+        "Bytea"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "11eaf115b7409feaf15aaee50839edd4367018ed40c77d9866899ab15d2abe05"
+}
diff --git a/core/lib/dal/.sqlx/query-120970162104e0560784ee4b8fa44a0202265d741912125f7865e570411997d7.json b/core/lib/dal/.sqlx/query-120970162104e0560784ee4b8fa44a0202265d741912125f7865e570411997d7.json
new file mode 100644
index 000000000000..00e558b13628
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-120970162104e0560784ee4b8fa44a0202265d741912125f7865e570411997d7.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE l1_batches\n            SET\n                tree_writes = $1\n            WHERE\n                number = $2\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "120970162104e0560784ee4b8fa44a0202265d741912125f7865e570411997d7"
+}
diff --git a/core/lib/dal/.sqlx/query-127a87a1fa6690944ff1b69c6e28018d301eefed1b713b34129d47932c555b22.json b/core/lib/dal/.sqlx/query-127a87a1fa6690944ff1b69c6e28018d301eefed1b713b34129d47932c555b22.json
new file mode 100644
index 000000000000..de80e6af8a95
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-127a87a1fa6690944ff1b69c6e28018d301eefed1b713b34129d47932c555b22.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                patch\n            FROM\n                protocol_patches\n            WHERE\n                minor = $1\n            ORDER BY\n                patch\n            LIMIT\n                1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "patch",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "127a87a1fa6690944ff1b69c6e28018d301eefed1b713b34129d47932c555b22"
+}
diff --git a/core/lib/dal/.sqlx/query-148dd243ab476724a430e74406119a148b59a79b03dacf3b1c32223c5ebf8d4b.json b/core/lib/dal/.sqlx/query-148dd243ab476724a430e74406119a148b59a79b03dacf3b1c32223c5ebf8d4b.json
new file mode 100644
index 000000000000..4f14d753fd6f
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-148dd243ab476724a430e74406119a148b59a79b03dacf3b1c32223c5ebf8d4b.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                number\n            FROM\n                l1_batches\n            WHERE\n                hash IS NOT NULL\n                AND commitment IS NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "148dd243ab476724a430e74406119a148b59a79b03dacf3b1c32223c5ebf8d4b"
+}
diff --git a/core/lib/dal/.sqlx/query-19545806b8f772075096e69f8665d98a3d9f7df162ae22a98c3c7620fcd13bd2.json b/core/lib/dal/.sqlx/query-19545806b8f772075096e69f8665d98a3d9f7df162ae22a98c3c7620fcd13bd2.json
deleted file mode 100644
index fe7af657ba58..000000000000
--- a/core/lib/dal/.sqlx/query-19545806b8f772075096e69f8665d98a3d9f7df162ae22a98c3c7620fcd13bd2.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                *\n            FROM\n                protocol_versions\n            ORDER BY\n                id DESC\n            LIMIT\n                1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "timestamp",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "recursion_scheduler_level_vk_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 3,
-        "name": "recursion_node_level_vk_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 4,
-        "name": "recursion_leaf_level_vk_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 5,
-        "name": "recursion_circuits_set_vks_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 6,
-        "name": "bootloader_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 7,
-        "name": "default_account_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 8,
-        "name": "verifier_address",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 9,
-        "name": "upgrade_tx_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 10,
-        "name": "created_at",
-        "type_info": "Timestamp"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false
-    ]
-  },
-  "hash": "19545806b8f772075096e69f8665d98a3d9f7df162ae22a98c3c7620fcd13bd2"
-}
diff --git a/core/lib/dal/.sqlx/query-1dcb3afb0c1947f92981f61d95c099c4591ce3f8d51f3df99db0165e086f96af.json b/core/lib/dal/.sqlx/query-1dcb3afb0c1947f92981f61d95c099c4591ce3f8d51f3df99db0165e086f96af.json
deleted file mode 100644
index dd142601d007..000000000000
--- a/core/lib/dal/.sqlx/query-1dcb3afb0c1947f92981f61d95c099c4591ce3f8d51f3df99db0165e086f96af.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                bytecode\n            FROM\n                factory_deps\n            WHERE\n                bytecode_hash = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "bytecode",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Bytea"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "1dcb3afb0c1947f92981f61d95c099c4591ce3f8d51f3df99db0165e086f96af"
-}
diff --git a/core/lib/dal/.sqlx/query-b259e6bacd98fa68003e0c87bb28cc77bd2dcee4a04d1afc9779714854623a79.json b/core/lib/dal/.sqlx/query-1e3c88b41bc02cb6a116fa930ae85b8b60165ed757ae1044e83fdc877d95cbd8.json
similarity index 71%
rename from core/lib/dal/.sqlx/query-b259e6bacd98fa68003e0c87bb28cc77bd2dcee4a04d1afc9779714854623a79.json
rename to core/lib/dal/.sqlx/query-1e3c88b41bc02cb6a116fa930ae85b8b60165ed757ae1044e83fdc877d95cbd8.json
index 90c940c3977c..206d2f91e3b1 100644
--- a/core/lib/dal/.sqlx/query-b259e6bacd98fa68003e0c87bb28cc77bd2dcee4a04d1afc9779714854623a79.json
+++ b/core/lib/dal/.sqlx/query-1e3c88b41bc02cb6a116fa930ae85b8b60165ed757ae1044e83fdc877d95cbd8.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                miniblock_number,\n                log_index_in_miniblock,\n                log_index_in_tx,\n                tx_hash,\n                NULL::bytea AS \"block_hash\",\n                NULL::BIGINT AS \"l1_batch_number?\",\n                shard_id,\n                is_service,\n                tx_index_in_miniblock,\n                tx_index_in_l1_batch,\n                sender,\n                key,\n                value\n            FROM\n                l2_to_l1_logs\n            WHERE\n                tx_hash = ANY ($1)\n            ORDER BY\n                tx_index_in_l1_batch ASC,\n                log_index_in_tx ASC\n            ",
+  "query": "\n            SELECT\n                miniblock_number,\n                log_index_in_miniblock,\n                log_index_in_tx,\n                tx_hash,\n                NULL::BIGINT AS \"l1_batch_number?\",\n                shard_id,\n                is_service,\n                tx_index_in_miniblock,\n                tx_index_in_l1_batch,\n                sender,\n                key,\n                value\n            FROM\n                l2_to_l1_logs\n            WHERE\n                tx_hash = ANY ($1)\n            ORDER BY\n                tx_index_in_l1_batch ASC,\n                log_index_in_tx ASC\n            ",
   "describe": {
     "columns": [
       {
@@ -25,46 +25,41 @@
       },
       {
         "ordinal": 4,
-        "name": "block_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 5,
         "name": "l1_batch_number?",
         "type_info": "Int8"
       },
       {
-        "ordinal": 6,
+        "ordinal": 5,
         "name": "shard_id",
         "type_info": "Int4"
       },
       {
-        "ordinal": 7,
+        "ordinal": 6,
         "name": "is_service",
         "type_info": "Bool"
       },
       {
-        "ordinal": 8,
+        "ordinal": 7,
         "name": "tx_index_in_miniblock",
         "type_info": "Int4"
       },
       {
-        "ordinal": 9,
+        "ordinal": 8,
         "name": "tx_index_in_l1_batch",
         "type_info": "Int4"
       },
       {
-        "ordinal": 10,
+        "ordinal": 9,
         "name": "sender",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 11,
+        "ordinal": 10,
         "name": "key",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 12,
+        "ordinal": 11,
         "name": "value",
         "type_info": "Bytea"
       }
@@ -80,7 +75,6 @@
       false,
       false,
       null,
-      null,
       false,
       false,
       false,
@@ -90,5 +84,5 @@
       false
     ]
   },
-  "hash": "b259e6bacd98fa68003e0c87bb28cc77bd2dcee4a04d1afc9779714854623a79"
+  "hash": "1e3c88b41bc02cb6a116fa930ae85b8b60165ed757ae1044e83fdc877d95cbd8"
 }
diff --git a/core/lib/dal/.sqlx/query-1f4c123edaf6faf50e1c07a797cd1d4794007904fef7a5e837ebfb1b502711a1.json b/core/lib/dal/.sqlx/query-1f4c123edaf6faf50e1c07a797cd1d4794007904fef7a5e837ebfb1b502711a1.json
deleted file mode 100644
index 58780d59a3b1..000000000000
--- a/core/lib/dal/.sqlx/query-1f4c123edaf6faf50e1c07a797cd1d4794007904fef7a5e837ebfb1b502711a1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                protocol_versions (\n                    id,\n                    timestamp,\n                    recursion_scheduler_level_vk_hash,\n                    recursion_node_level_vk_hash,\n                    recursion_leaf_level_vk_hash,\n                    recursion_circuits_set_vks_hash,\n                    bootloader_code_hash,\n                    default_account_code_hash,\n                    upgrade_tx_hash,\n                    created_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, $6, $7, $8, $9, NOW())\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Int8",
-        "Bytea",
-        "Bytea",
-        "Bytea",
-        "Bytea",
-        "Bytea",
-        "Bytea",
-        "Bytea"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "1f4c123edaf6faf50e1c07a797cd1d4794007904fef7a5e837ebfb1b502711a1"
-}
diff --git a/core/lib/dal/.sqlx/query-c75cdc655cd843a474f857e80b30685582bb37ba816a5434ee546d86ef9a8d9e.json b/core/lib/dal/.sqlx/query-21cfb584e3731852e96da1968503208a30b0eead764527ff957ea6e86a34eec6.json
similarity index 65%
rename from core/lib/dal/.sqlx/query-c75cdc655cd843a474f857e80b30685582bb37ba816a5434ee546d86ef9a8d9e.json
rename to core/lib/dal/.sqlx/query-21cfb584e3731852e96da1968503208a30b0eead764527ff957ea6e86a34eec6.json
index 0cf33a5559f0..541af15fa271 100644
--- a/core/lib/dal/.sqlx/query-c75cdc655cd843a474f857e80b30685582bb37ba816a5434ee546d86ef9a8d9e.json
+++ b/core/lib/dal/.sqlx/query-21cfb584e3731852e96da1968503208a30b0eead764527ff957ea6e86a34eec6.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                hashed_key,\n                address,\n                key,\n                value,\n                operation_number,\n                tx_hash,\n                miniblock_number\n            FROM\n                storage_logs\n            ORDER BY\n                miniblock_number,\n                operation_number\n            ",
+  "query": "\n            SELECT\n                hashed_key,\n                address,\n                key,\n                value,\n                operation_number,\n                miniblock_number\n            FROM\n                storage_logs\n            ORDER BY\n                miniblock_number,\n                operation_number\n            ",
   "describe": {
     "columns": [
       {
@@ -30,11 +30,6 @@
       },
       {
         "ordinal": 5,
-        "name": "tx_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 6,
         "name": "miniblock_number",
         "type_info": "Int8"
       }
@@ -44,13 +39,12 @@
     },
     "nullable": [
       false,
-      false,
-      false,
-      false,
+      true,
+      true,
       false,
       false,
       false
     ]
   },
-  "hash": "c75cdc655cd843a474f857e80b30685582bb37ba816a5434ee546d86ef9a8d9e"
+  "hash": "21cfb584e3731852e96da1968503208a30b0eead764527ff957ea6e86a34eec6"
 }
diff --git a/core/lib/dal/.sqlx/query-66ea8037bb114e0cfccc51b9db41b0a2e83e864d997aba4ca92c1d27e947b716.json b/core/lib/dal/.sqlx/query-2486f8404e8cfcb9c178acd6dccae32e8812becbe5ce85e63694385f015f2cfe.json
similarity index 66%
rename from core/lib/dal/.sqlx/query-66ea8037bb114e0cfccc51b9db41b0a2e83e864d997aba4ca92c1d27e947b716.json
rename to core/lib/dal/.sqlx/query-2486f8404e8cfcb9c178acd6dccae32e8812becbe5ce85e63694385f015f2cfe.json
index 82befeb8a93d..f28e3d044ccc 100644
--- a/core/lib/dal/.sqlx/query-66ea8037bb114e0cfccc51b9db41b0a2e83e864d997aba4ca92c1d27e947b716.json
+++ b/core/lib/dal/.sqlx/query-2486f8404e8cfcb9c178acd6dccae32e8812becbe5ce85e63694385f015f2cfe.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    number,\n                    timestamp,\n                    l1_tx_count,\n                    l2_tx_count,\n                    bloom,\n                    priority_ops_onchain_data,\n                    hash,\n                    commitment,\n                    eth_prove_tx_id,\n                    eth_commit_tx_id,\n                    eth_execute_tx_id,\n                    l2_to_l1_logs,\n                    l2_to_l1_messages,\n                    used_contract_hashes,\n                    compressed_initial_writes,\n                    compressed_repeated_writes,\n                    l2_l1_merkle_root,\n                    rollup_last_leaf_index,\n                    zkporter_is_available,\n                    bootloader_code_hash,\n                    default_aa_code_hash,\n                    aux_data_hash,\n                    pass_through_data_hash,\n                    meta_parameters_hash,\n                    protocol_version,\n                    compressed_state_diffs,\n                    system_logs,\n                    events_queue_commitment,\n                    bootloader_initial_content_commitment,\n                    pubdata_input\n                FROM\n                    l1_batches\n                    LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                WHERE\n                    number BETWEEN $1 AND $2\n                ORDER BY\n                    number\n                LIMIT\n                    $3\n                ",
+  "query": "\n                SELECT\n                    number,\n                    timestamp,\n                    l1_tx_count,\n                    l2_tx_count,\n                    bloom,\n                    priority_ops_onchain_data,\n                    hash,\n                    commitment,\n                    l2_to_l1_messages,\n                    used_contract_hashes,\n                    compressed_initial_writes,\n                    compressed_repeated_writes,\n                    l2_l1_merkle_root,\n                    rollup_last_leaf_index,\n                    zkporter_is_available,\n                    bootloader_code_hash,\n                    default_aa_code_hash,\n                    aux_data_hash,\n                    pass_through_data_hash,\n                    meta_parameters_hash,\n                    protocol_version,\n                    compressed_state_diffs,\n                    system_logs,\n                    events_queue_commitment,\n                    bootloader_initial_content_commitment,\n                    pubdata_input\n                FROM\n                    l1_batches\n                    LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                WHERE\n                    number BETWEEN $1 AND $2\n                ORDER BY\n                    number\n                LIMIT\n                    $3\n                ",
   "describe": {
     "columns": [
       {
@@ -45,111 +45,91 @@
       },
       {
         "ordinal": 8,
-        "name": "eth_prove_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "eth_commit_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "eth_execute_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 12,
         "name": "l2_to_l1_messages",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 13,
+        "ordinal": 9,
         "name": "used_contract_hashes",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 14,
+        "ordinal": 10,
         "name": "compressed_initial_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 15,
+        "ordinal": 11,
         "name": "compressed_repeated_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 16,
+        "ordinal": 12,
         "name": "l2_l1_merkle_root",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 17,
+        "ordinal": 13,
         "name": "rollup_last_leaf_index",
         "type_info": "Int8"
       },
       {
-        "ordinal": 18,
+        "ordinal": 14,
         "name": "zkporter_is_available",
         "type_info": "Bool"
       },
       {
-        "ordinal": 19,
+        "ordinal": 15,
         "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 20,
+        "ordinal": 16,
         "name": "default_aa_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 21,
+        "ordinal": 17,
         "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 18,
         "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 23,
+        "ordinal": 19,
         "name": "meta_parameters_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 20,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 25,
+        "ordinal": 21,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 22,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 27,
+        "ordinal": 23,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 28,
+        "ordinal": 24,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 29,
+        "ordinal": 25,
         "name": "pubdata_input",
         "type_info": "Bytea"
       }
@@ -170,10 +150,6 @@
       false,
       true,
       true,
-      true,
-      true,
-      true,
-      false,
       false,
       false,
       true,
@@ -194,5 +170,5 @@
       true
     ]
   },
-  "hash": "66ea8037bb114e0cfccc51b9db41b0a2e83e864d997aba4ca92c1d27e947b716"
+  "hash": "2486f8404e8cfcb9c178acd6dccae32e8812becbe5ce85e63694385f015f2cfe"
 }
diff --git a/core/lib/dal/.sqlx/query-245dc5bb82cc82df38e4440a7746ca08324bc86a72e4ea85c9c7962a6c8c9e30.json b/core/lib/dal/.sqlx/query-25ef41cbeb95d10e4051b822769518daf76a5f283e4298fd12022b0c3db07319.json
similarity index 75%
rename from core/lib/dal/.sqlx/query-245dc5bb82cc82df38e4440a7746ca08324bc86a72e4ea85c9c7962a6c8c9e30.json
rename to core/lib/dal/.sqlx/query-25ef41cbeb95d10e4051b822769518daf76a5f283e4298fd12022b0c3db07319.json
index 0b9c4aa59b7a..079246791a98 100644
--- a/core/lib/dal/.sqlx/query-245dc5bb82cc82df38e4440a7746ca08324bc86a72e4ea85c9c7962a6c8c9e30.json
+++ b/core/lib/dal/.sqlx/query-25ef41cbeb95d10e4051b822769518daf76a5f283e4298fd12022b0c3db07319.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE l1_batches\n                    SET\n                        eth_prove_tx_id = $1,\n                        updated_at = NOW()\n                    WHERE\n                        number BETWEEN $2 AND $3\n                    ",
+  "query": "\n                    UPDATE l1_batches\n                    SET\n                        eth_prove_tx_id = $1,\n                        updated_at = NOW()\n                    WHERE\n                        number BETWEEN $2 AND $3\n                        AND eth_prove_tx_id IS NULL\n                    ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -12,5 +12,5 @@
     },
     "nullable": []
   },
-  "hash": "245dc5bb82cc82df38e4440a7746ca08324bc86a72e4ea85c9c7962a6c8c9e30"
+  "hash": "25ef41cbeb95d10e4051b822769518daf76a5f283e4298fd12022b0c3db07319"
 }
diff --git a/core/lib/dal/.sqlx/query-25fb31277591dd7d5d783bd8777f1a855e76b37b6ed36ae612b551f9a6a55633.json b/core/lib/dal/.sqlx/query-25fb31277591dd7d5d783bd8777f1a855e76b37b6ed36ae612b551f9a6a55633.json
new file mode 100644
index 000000000000..ee88bcdf39bd
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-25fb31277591dd7d5d783bd8777f1a855e76b37b6ed36ae612b551f9a6a55633.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                protocol_versions (\n                    id,\n                    timestamp,\n                    bootloader_code_hash,\n                    default_account_code_hash,\n                    upgrade_tx_hash,\n                    created_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, NOW())\n            ON CONFLICT DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Int8",
+        "Bytea",
+        "Bytea",
+        "Bytea"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "25fb31277591dd7d5d783bd8777f1a855e76b37b6ed36ae612b551f9a6a55633"
+}
diff --git a/core/lib/dal/.sqlx/query-294005d0b9445cc8b9c8e4ce7453f71664dcb5ebbc35005a18c5251c3d902f62.json b/core/lib/dal/.sqlx/query-294005d0b9445cc8b9c8e4ce7453f71664dcb5ebbc35005a18c5251c3d902f62.json
new file mode 100644
index 000000000000..e2aeb15b19af
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-294005d0b9445cc8b9c8e4ce7453f71664dcb5ebbc35005a18c5251c3d902f62.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                MAX(INDEX) AS \"max?\"\n            FROM\n                initial_writes\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        MAX(l1_batch_number) AS \"max?\"\n                    FROM\n                        initial_writes\n                    WHERE\n                        l1_batch_number <= $1\n                )\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "max?",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "294005d0b9445cc8b9c8e4ce7453f71664dcb5ebbc35005a18c5251c3d902f62"
+}
diff --git a/core/lib/dal/.sqlx/query-2cba440c2925631655a7f67486a5a8869da8f10738ba77e3d8e048057b0e7b12.json b/core/lib/dal/.sqlx/query-2cba440c2925631655a7f67486a5a8869da8f10738ba77e3d8e048057b0e7b12.json
new file mode 100644
index 000000000000..b01a5b41649b
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-2cba440c2925631655a7f67486a5a8869da8f10738ba77e3d8e048057b0e7b12.json
@@ -0,0 +1,36 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                factory_deps.bytecode,\n                transactions.data AS \"data?\",\n                transactions.contract_address AS \"contract_address?\"\n            FROM\n                (\n                    SELECT\n                        miniblock_number,\n                        tx_hash,\n                        topic3\n                    FROM\n                        events\n                    WHERE\n                        address = $1\n                        AND topic1 = $2\n                        AND topic4 = $3\n                    LIMIT\n                        1\n                ) deploy_event\n                JOIN factory_deps ON factory_deps.bytecode_hash = deploy_event.topic3\n                LEFT JOIN transactions ON transactions.hash = deploy_event.tx_hash\n            WHERE\n                deploy_event.miniblock_number <= (\n                    SELECT\n                        MAX(number)\n                    FROM\n                        miniblocks\n                )\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "bytecode",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 1,
+        "name": "data?",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 2,
+        "name": "contract_address?",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea",
+        "Bytea"
+      ]
+    },
+    "nullable": [
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "2cba440c2925631655a7f67486a5a8869da8f10738ba77e3d8e048057b0e7b12"
+}
diff --git a/core/lib/dal/.sqlx/query-55e6f5ea121090034c8920dffb7cfb3ba0659b6fcc582e174ee80601b54f89d9.json b/core/lib/dal/.sqlx/query-2d8da95804a7a300ff2b756e6785c0665ee3ea4086ddb91428fa1b6a00760737.json
similarity index 51%
rename from core/lib/dal/.sqlx/query-55e6f5ea121090034c8920dffb7cfb3ba0659b6fcc582e174ee80601b54f89d9.json
rename to core/lib/dal/.sqlx/query-2d8da95804a7a300ff2b756e6785c0665ee3ea4086ddb91428fa1b6a00760737.json
index 117d1bad9bf2..8b8cef7dd77e 100644
--- a/core/lib/dal/.sqlx/query-55e6f5ea121090034c8920dffb7cfb3ba0659b6fcc582e174ee80601b54f89d9.json
+++ b/core/lib/dal/.sqlx/query-2d8da95804a7a300ff2b756e6785c0665ee3ea4086ddb91428fa1b6a00760737.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT DISTINCT\n                ON (hashed_key) hashed_key,\n                miniblock_number,\n                value\n            FROM\n                storage_logs\n            WHERE\n                hashed_key = ANY ($1)\n                AND miniblock_number <= $2\n            ORDER BY\n                hashed_key,\n                miniblock_number DESC,\n                operation_number DESC\n            ",
+  "query": "\n            SELECT DISTINCT\n                ON (hashed_key) hashed_key,\n                miniblock_number,\n                value\n            FROM\n                storage_logs\n            WHERE\n                hashed_key = ANY ($1)\n                AND miniblock_number <= $2\n                AND miniblock_number <= COALESCE(\n                    (\n                        SELECT\n                            MAX(number)\n                        FROM\n                            miniblocks\n                    ),\n                    (\n                        SELECT\n                            miniblock_number\n                        FROM\n                            snapshot_recovery\n                    )\n                )\n            ORDER BY\n                hashed_key,\n                miniblock_number DESC,\n                operation_number DESC\n            ",
   "describe": {
     "columns": [
       {
@@ -31,5 +31,5 @@
       false
     ]
   },
-  "hash": "55e6f5ea121090034c8920dffb7cfb3ba0659b6fcc582e174ee80601b54f89d9"
+  "hash": "2d8da95804a7a300ff2b756e6785c0665ee3ea4086ddb91428fa1b6a00760737"
 }
diff --git a/core/lib/dal/.sqlx/query-2ffa321700ef1f70a1c3f516f3162af196d586cc08ea0f23d2c568527e94b41d.json b/core/lib/dal/.sqlx/query-2ffa321700ef1f70a1c3f516f3162af196d586cc08ea0f23d2c568527e94b41d.json
new file mode 100644
index 000000000000..a273eb249a4e
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-2ffa321700ef1f70a1c3f516f3162af196d586cc08ea0f23d2c568527e94b41d.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            DELETE FROM tee_verifier_input_producer_jobs\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "2ffa321700ef1f70a1c3f516f3162af196d586cc08ea0f23d2c568527e94b41d"
+}
diff --git a/core/lib/dal/.sqlx/query-30e5c8710b1611872da06b72ac681aff512b3a9b2587b8e59848345c07dd8f3b.json b/core/lib/dal/.sqlx/query-30e5c8710b1611872da06b72ac681aff512b3a9b2587b8e59848345c07dd8f3b.json
new file mode 100644
index 000000000000..1ddc86f29a0a
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-30e5c8710b1611872da06b72ac681aff512b3a9b2587b8e59848345c07dd8f3b.json
@@ -0,0 +1,52 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE tee_verifier_input_producer_jobs\n            SET\n                status = $1,\n                updated_at = NOW(),\n                time_taken = $3,\n                error = $4\n            WHERE\n                l1_batch_number = $2\n                AND status != $5\n            RETURNING\n                tee_verifier_input_producer_jobs.attempts\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "attempts",
+        "type_info": "Int2"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        {
+          "Custom": {
+            "name": "tee_verifier_input_producer_job_status",
+            "kind": {
+              "Enum": [
+                "Queued",
+                "ManuallySkipped",
+                "InProgress",
+                "Successful",
+                "Failed"
+              ]
+            }
+          }
+        },
+        "Int8",
+        "Time",
+        "Text",
+        {
+          "Custom": {
+            "name": "tee_verifier_input_producer_job_status",
+            "kind": {
+              "Enum": [
+                "Queued",
+                "ManuallySkipped",
+                "InProgress",
+                "Successful",
+                "Failed"
+              ]
+            }
+          }
+        }
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "30e5c8710b1611872da06b72ac681aff512b3a9b2587b8e59848345c07dd8f3b"
+}
diff --git a/core/lib/dal/.sqlx/query-136569d7eb4037fd77e0fac2246c68e8e15a831f1a45dc3b2240d5c6809d5ef2.json b/core/lib/dal/.sqlx/query-33b1fbb1e80c3815d30da5854c866d2fe2908a22e933b2f25ce6b4357e51ed9b.json
similarity index 53%
rename from core/lib/dal/.sqlx/query-136569d7eb4037fd77e0fac2246c68e8e15a831f1a45dc3b2240d5c6809d5ef2.json
rename to core/lib/dal/.sqlx/query-33b1fbb1e80c3815d30da5854c866d2fe2908a22e933b2f25ce6b4357e51ed9b.json
index 22d29f0f4d8e..bb38503cc353 100644
--- a/core/lib/dal/.sqlx/query-136569d7eb4037fd77e0fac2246c68e8e15a831f1a45dc3b2240d5c6809d5ef2.json
+++ b/core/lib/dal/.sqlx/query-33b1fbb1e80c3815d30da5854c866d2fe2908a22e933b2f25ce6b4357e51ed9b.json
@@ -1,11 +1,11 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                *\n            FROM\n                protocol_versions\n            WHERE\n                id = $1\n            ",
+  "query": "\n            SELECT\n                protocol_versions.id AS \"minor!\",\n                protocol_versions.timestamp,\n                protocol_versions.bootloader_code_hash,\n                protocol_versions.default_account_code_hash,\n                protocol_patches.patch,\n                protocol_patches.recursion_scheduler_level_vk_hash,\n                protocol_patches.recursion_node_level_vk_hash,\n                protocol_patches.recursion_leaf_level_vk_hash,\n                protocol_patches.recursion_circuits_set_vks_hash\n            FROM\n                protocol_versions\n                JOIN protocol_patches ON protocol_patches.minor = protocol_versions.id\n            WHERE\n                id = $1\n            ORDER BY\n                protocol_patches.patch DESC\n            LIMIT\n                1\n            ",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "id",
+        "name": "minor!",
         "type_info": "Int4"
       },
       {
@@ -15,48 +15,38 @@
       },
       {
         "ordinal": 2,
-        "name": "recursion_scheduler_level_vk_hash",
+        "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 3,
-        "name": "recursion_node_level_vk_hash",
+        "name": "default_account_code_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 4,
-        "name": "recursion_leaf_level_vk_hash",
-        "type_info": "Bytea"
+        "name": "patch",
+        "type_info": "Int4"
       },
       {
         "ordinal": 5,
-        "name": "recursion_circuits_set_vks_hash",
+        "name": "recursion_scheduler_level_vk_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 6,
-        "name": "bootloader_code_hash",
+        "name": "recursion_node_level_vk_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 7,
-        "name": "default_account_code_hash",
+        "name": "recursion_leaf_level_vk_hash",
         "type_info": "Bytea"
       },
       {
         "ordinal": 8,
-        "name": "verifier_address",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 9,
-        "name": "upgrade_tx_hash",
+        "name": "recursion_circuits_set_vks_hash",
         "type_info": "Bytea"
-      },
-      {
-        "ordinal": 10,
-        "name": "created_at",
-        "type_info": "Timestamp"
       }
     ],
     "parameters": {
@@ -73,10 +63,8 @@
       false,
       false,
       false,
-      true,
-      true,
       false
     ]
   },
-  "hash": "136569d7eb4037fd77e0fac2246c68e8e15a831f1a45dc3b2240d5c6809d5ef2"
+  "hash": "33b1fbb1e80c3815d30da5854c866d2fe2908a22e933b2f25ce6b4357e51ed9b"
 }
diff --git a/core/lib/dal/.sqlx/query-37890022be6b5e893cf051266fa16618914d6dedb39a9a40d36484741e8b01f4.json b/core/lib/dal/.sqlx/query-37890022be6b5e893cf051266fa16618914d6dedb39a9a40d36484741e8b01f4.json
new file mode 100644
index 000000000000..a39a1bdb07b8
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-37890022be6b5e893cf051266fa16618914d6dedb39a9a40d36484741e8b01f4.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                tee_attestations (pubkey, attestation)\n            VALUES\n                ($1, $2)\n            ON CONFLICT (pubkey) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "37890022be6b5e893cf051266fa16618914d6dedb39a9a40d36484741e8b01f4"
+}
diff --git a/core/lib/dal/.sqlx/query-50f1f9ababe67af63fab9b82294f709ec0333e6673ce43fedd00638b9252cbd8.json b/core/lib/dal/.sqlx/query-38dea171e4c49f54bf1db5ac9bfb3be9cf3928755be5f5fcfcdc086e73fb15e2.json
similarity index 63%
rename from core/lib/dal/.sqlx/query-50f1f9ababe67af63fab9b82294f709ec0333e6673ce43fedd00638b9252cbd8.json
rename to core/lib/dal/.sqlx/query-38dea171e4c49f54bf1db5ac9bfb3be9cf3928755be5f5fcfcdc086e73fb15e2.json
index 78f4430fda18..7ac6785d8e64 100644
--- a/core/lib/dal/.sqlx/query-50f1f9ababe67af63fab9b82294f709ec0333e6673ce43fedd00638b9252cbd8.json
+++ b/core/lib/dal/.sqlx/query-38dea171e4c49f54bf1db5ac9bfb3be9cf3928755be5f5fcfcdc086e73fb15e2.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    SELECT\n                        number,\n                        timestamp,\n                        l1_tx_count,\n                        l2_tx_count,\n                        bloom,\n                        priority_ops_onchain_data,\n                        hash,\n                        commitment,\n                        eth_prove_tx_id,\n                        eth_commit_tx_id,\n                        eth_execute_tx_id,\n                        l2_to_l1_logs,\n                        l2_to_l1_messages,\n                        used_contract_hashes,\n                        compressed_initial_writes,\n                        compressed_repeated_writes,\n                        l2_l1_merkle_root,\n                        rollup_last_leaf_index,\n                        zkporter_is_available,\n                        bootloader_code_hash,\n                        default_aa_code_hash,\n                        aux_data_hash,\n                        pass_through_data_hash,\n                        meta_parameters_hash,\n                        protocol_version,\n                        compressed_state_diffs,\n                        system_logs,\n                        events_queue_commitment,\n                        bootloader_initial_content_commitment,\n                        pubdata_input\n                    FROM\n                        l1_batches\n                        LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                    WHERE\n                        eth_prove_tx_id IS NOT NULL\n                        AND eth_execute_tx_id IS NULL\n                    ORDER BY\n                        number\n                    LIMIT\n                        $1\n                    ",
+  "query": "\n                    SELECT\n                        number,\n                        timestamp,\n                        l1_tx_count,\n                        l2_tx_count,\n                        bloom,\n                        priority_ops_onchain_data,\n                        hash,\n                        commitment,\n                        l2_to_l1_messages,\n                        used_contract_hashes,\n                        compressed_initial_writes,\n                        compressed_repeated_writes,\n                        l2_l1_merkle_root,\n                        rollup_last_leaf_index,\n                        zkporter_is_available,\n                        bootloader_code_hash,\n                        default_aa_code_hash,\n                        aux_data_hash,\n                        pass_through_data_hash,\n                        meta_parameters_hash,\n                        protocol_version,\n                        compressed_state_diffs,\n                        system_logs,\n                        events_queue_commitment,\n                        bootloader_initial_content_commitment,\n                        pubdata_input\n                    FROM\n                        l1_batches\n                        LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                    WHERE\n                        eth_prove_tx_id IS NOT NULL\n                        AND eth_execute_tx_id IS NULL\n                    ORDER BY\n                        number\n                    LIMIT\n                        $1\n                    ",
   "describe": {
     "columns": [
       {
@@ -45,111 +45,91 @@
       },
       {
         "ordinal": 8,
-        "name": "eth_prove_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "eth_commit_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "eth_execute_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 12,
         "name": "l2_to_l1_messages",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 13,
+        "ordinal": 9,
         "name": "used_contract_hashes",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 14,
+        "ordinal": 10,
         "name": "compressed_initial_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 15,
+        "ordinal": 11,
         "name": "compressed_repeated_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 16,
+        "ordinal": 12,
         "name": "l2_l1_merkle_root",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 17,
+        "ordinal": 13,
         "name": "rollup_last_leaf_index",
         "type_info": "Int8"
       },
       {
-        "ordinal": 18,
+        "ordinal": 14,
         "name": "zkporter_is_available",
         "type_info": "Bool"
       },
       {
-        "ordinal": 19,
+        "ordinal": 15,
         "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 20,
+        "ordinal": 16,
         "name": "default_aa_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 21,
+        "ordinal": 17,
         "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 18,
         "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 23,
+        "ordinal": 19,
         "name": "meta_parameters_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 20,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 25,
+        "ordinal": 21,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 22,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 27,
+        "ordinal": 23,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 28,
+        "ordinal": 24,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 29,
+        "ordinal": 25,
         "name": "pubdata_input",
         "type_info": "Bytea"
       }
@@ -168,10 +148,6 @@
       false,
       true,
       true,
-      true,
-      true,
-      true,
-      false,
       false,
       false,
       true,
@@ -192,5 +168,5 @@
       true
     ]
   },
-  "hash": "50f1f9ababe67af63fab9b82294f709ec0333e6673ce43fedd00638b9252cbd8"
+  "hash": "38dea171e4c49f54bf1db5ac9bfb3be9cf3928755be5f5fcfcdc086e73fb15e2"
 }
diff --git a/core/lib/dal/.sqlx/query-3e3ddd6578e37d38cc03fa1df0b7617de769aac94aeabc55d58b906ca3698bc8.json b/core/lib/dal/.sqlx/query-3e3ddd6578e37d38cc03fa1df0b7617de769aac94aeabc55d58b906ca3698bc8.json
deleted file mode 100644
index fb1478c1a627..000000000000
--- a/core/lib/dal/.sqlx/query-3e3ddd6578e37d38cc03fa1df0b7617de769aac94aeabc55d58b906ca3698bc8.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                l1_batches (\n                    number,\n                    l1_tx_count,\n                    l2_tx_count,\n                    timestamp,\n                    l2_to_l1_logs,\n                    l2_to_l1_messages,\n                    bloom,\n                    priority_ops_onchain_data,\n                    predicted_commit_gas_cost,\n                    predicted_prove_gas_cost,\n                    predicted_execute_gas_cost,\n                    initial_bootloader_heap_content,\n                    used_contract_hashes,\n                    bootloader_code_hash,\n                    default_aa_code_hash,\n                    protocol_version,\n                    system_logs,\n                    storage_refunds,\n                    pubdata_costs,\n                    pubdata_input,\n                    predicted_circuits_by_type,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                (\n                    $1,\n                    $2,\n                    $3,\n                    $4,\n                    $5,\n                    $6,\n                    $7,\n                    $8,\n                    $9,\n                    $10,\n                    $11,\n                    $12,\n                    $13,\n                    $14,\n                    $15,\n                    $16,\n                    $17,\n                    $18,\n                    $19,\n                    $20,\n                    $21,\n                    NOW(),\n                    NOW()\n                )\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int4",
-        "Int4",
-        "Int8",
-        "ByteaArray",
-        "ByteaArray",
-        "Bytea",
-        "ByteaArray",
-        "Int8",
-        "Int8",
-        "Int8",
-        "Jsonb",
-        "Jsonb",
-        "Bytea",
-        "Bytea",
-        "Int4",
-        "ByteaArray",
-        "Int8Array",
-        "Int8Array",
-        "Bytea",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "3e3ddd6578e37d38cc03fa1df0b7617de769aac94aeabc55d58b906ca3698bc8"
-}
diff --git a/core/lib/dal/.sqlx/query-3ecd408294c93a5ee7dbbe128c52c62033a7f690353f01b2978ef9b30d52c94e.json b/core/lib/dal/.sqlx/query-3ecd408294c93a5ee7dbbe128c52c62033a7f690353f01b2978ef9b30d52c94e.json
new file mode 100644
index 000000000000..a64b8e06628f
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-3ecd408294c93a5ee7dbbe128c52c62033a7f690353f01b2978ef9b30d52c94e.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT\n                    inclusion_data\n                FROM\n                    data_availability\n                WHERE\n                    l1_batch_number = $1\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "inclusion_data",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "3ecd408294c93a5ee7dbbe128c52c62033a7f690353f01b2978ef9b30d52c94e"
+}
diff --git a/core/lib/dal/.sqlx/query-3feb0cae2cd055bc2a02e5993db9ef5f6b03c144f5a35204c8c77b7098548b19.json b/core/lib/dal/.sqlx/query-3feb0cae2cd055bc2a02e5993db9ef5f6b03c144f5a35204c8c77b7098548b19.json
deleted file mode 100644
index 0c7acd0125b7..000000000000
--- a/core/lib/dal/.sqlx/query-3feb0cae2cd055bc2a02e5993db9ef5f6b03c144f5a35204c8c77b7098548b19.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                sl AS (\n                    SELECT DISTINCT\n                        ON (storage_logs.tx_hash) *\n                    FROM\n                        storage_logs\n                    WHERE\n                        storage_logs.address = $1\n                        AND storage_logs.tx_hash = ANY ($3)\n                    ORDER BY\n                        storage_logs.tx_hash,\n                        storage_logs.miniblock_number DESC,\n                        storage_logs.operation_number DESC\n                )\n            SELECT\n                transactions.hash AS tx_hash,\n                transactions.index_in_block AS index_in_block,\n                transactions.l1_batch_tx_index AS l1_batch_tx_index,\n                transactions.miniblock_number AS \"block_number!\",\n                transactions.error AS error,\n                transactions.effective_gas_price AS effective_gas_price,\n                transactions.initiator_address AS initiator_address,\n                transactions.data -> 'to' AS \"transfer_to?\",\n                transactions.data -> 'contractAddress' AS \"execute_contract_address?\",\n                transactions.tx_format AS \"tx_format?\",\n                transactions.refunded_gas AS refunded_gas,\n                transactions.gas_limit AS gas_limit,\n                miniblocks.hash AS \"block_hash\",\n                miniblocks.l1_batch_number AS \"l1_batch_number?\",\n                sl.key AS \"contract_address?\"\n            FROM\n                transactions\n                JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                LEFT JOIN sl ON sl.value != $2\n                AND sl.tx_hash = transactions.hash\n            WHERE\n                transactions.hash = ANY ($3)\n                AND transactions.data != '{}'::jsonb\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "tx_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 1,
-        "name": "index_in_block",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 2,
-        "name": "l1_batch_tx_index",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "block_number!",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 4,
-        "name": "error",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "effective_gas_price",
-        "type_info": "Numeric"
-      },
-      {
-        "ordinal": 6,
-        "name": "initiator_address",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 7,
-        "name": "transfer_to?",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 8,
-        "name": "execute_contract_address?",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 9,
-        "name": "tx_format?",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "refunded_gas",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 11,
-        "name": "gas_limit",
-        "type_info": "Numeric"
-      },
-      {
-        "ordinal": 12,
-        "name": "block_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 13,
-        "name": "l1_batch_number?",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 14,
-        "name": "contract_address?",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Bytea",
-        "ByteaArray"
-      ]
-    },
-    "nullable": [
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      null,
-      null,
-      true,
-      false,
-      true,
-      false,
-      true,
-      true
-    ]
-  },
-  "hash": "3feb0cae2cd055bc2a02e5993db9ef5f6b03c144f5a35204c8c77b7098548b19"
-}
diff --git a/core/lib/dal/.sqlx/query-44490ad52b8dbcd978a96677ffac5437752a4cf3ac92ec09b334089a8dc5b4ca.json b/core/lib/dal/.sqlx/query-44490ad52b8dbcd978a96677ffac5437752a4cf3ac92ec09b334089a8dc5b4ca.json
deleted file mode 100644
index cb2d1b149ecf..000000000000
--- a/core/lib/dal/.sqlx/query-44490ad52b8dbcd978a96677ffac5437752a4cf3ac92ec09b334089a8dc5b4ca.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH\n                mb AS (\n                    SELECT\n                        l1_gas_price,\n                        l2_fair_gas_price\n                    FROM\n                        miniblocks\n                    WHERE\n                        l1_batch_number = $1\n                    LIMIT\n                        1\n                )\n            SELECT\n                l1_batches.number,\n                l1_batches.timestamp,\n                l1_batches.l1_tx_count,\n                l1_batches.l2_tx_count,\n                l1_batches.hash AS \"root_hash?\",\n                commit_tx.tx_hash AS \"commit_tx_hash?\",\n                commit_tx.confirmed_at AS \"committed_at?\",\n                prove_tx.tx_hash AS \"prove_tx_hash?\",\n                prove_tx.confirmed_at AS \"proven_at?\",\n                execute_tx.tx_hash AS \"execute_tx_hash?\",\n                execute_tx.confirmed_at AS \"executed_at?\",\n                mb.l1_gas_price,\n                mb.l2_fair_gas_price,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash\n            FROM\n                l1_batches\n                INNER JOIN mb ON TRUE\n                LEFT JOIN eth_txs_history AS commit_tx ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS prove_tx ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS execute_tx ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                l1_batches.number = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "timestamp",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "l1_tx_count",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "l2_tx_count",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 4,
-        "name": "root_hash?",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 5,
-        "name": "commit_tx_hash?",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 6,
-        "name": "committed_at?",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 7,
-        "name": "prove_tx_hash?",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 8,
-        "name": "proven_at?",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 9,
-        "name": "execute_tx_hash?",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 10,
-        "name": "executed_at?",
-        "type_info": "Timestamp"
-      },
-      {
-        "ordinal": 11,
-        "name": "l1_gas_price",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 12,
-        "name": "l2_fair_gas_price",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 13,
-        "name": "bootloader_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 14,
-        "name": "default_aa_code_hash",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      false,
-      true,
-      false,
-      true,
-      false,
-      true,
-      false,
-      false,
-      true,
-      true
-    ]
-  },
-  "hash": "44490ad52b8dbcd978a96677ffac5437752a4cf3ac92ec09b334089a8dc5b4ca"
-}
diff --git a/core/lib/dal/.sqlx/query-6ed5cc84e8097c4febf6c935193f45ef713ef7f9909ce26653faceddb549a383.json b/core/lib/dal/.sqlx/query-454e16ddb5e85285d0c4b9013bcce5d464ecc55c80b54bc16040226df7e297bd.json
similarity index 68%
rename from core/lib/dal/.sqlx/query-6ed5cc84e8097c4febf6c935193f45ef713ef7f9909ce26653faceddb549a383.json
rename to core/lib/dal/.sqlx/query-454e16ddb5e85285d0c4b9013bcce5d464ecc55c80b54bc16040226df7e297bd.json
index 9d3050eaa838..4a73fde57e29 100644
--- a/core/lib/dal/.sqlx/query-6ed5cc84e8097c4febf6c935193f45ef713ef7f9909ce26653faceddb549a383.json
+++ b/core/lib/dal/.sqlx/query-454e16ddb5e85285d0c4b9013bcce5d464ecc55c80b54bc16040226df7e297bd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                l1_tx_count,\n                l2_tx_count,\n                timestamp,\n                l2_to_l1_logs,\n                l2_to_l1_messages,\n                bloom,\n                priority_ops_onchain_data,\n                used_contract_hashes,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                pubdata_input\n            FROM\n                l1_batches\n            WHERE\n                number = $1\n            ",
+  "query": "\n            SELECT\n                number,\n                l1_tx_count,\n                l2_tx_count,\n                timestamp,\n                l2_to_l1_messages,\n                bloom,\n                priority_ops_onchain_data,\n                used_contract_hashes,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                protocol_version,\n                system_logs,\n                pubdata_input\n            FROM\n                l1_batches\n            WHERE\n                number = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -25,56 +25,46 @@
       },
       {
         "ordinal": 4,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 5,
         "name": "l2_to_l1_messages",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 6,
+        "ordinal": 5,
         "name": "bloom",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 7,
+        "ordinal": 6,
         "name": "priority_ops_onchain_data",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 8,
+        "ordinal": 7,
         "name": "used_contract_hashes",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 9,
+        "ordinal": 8,
         "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 10,
+        "ordinal": 9,
         "name": "default_aa_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 11,
+        "ordinal": 10,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 12,
-        "name": "compressed_state_diffs",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 13,
+        "ordinal": 11,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 14,
+        "ordinal": 12,
         "name": "pubdata_input",
         "type_info": "Bytea"
       }
@@ -93,8 +83,6 @@
       false,
       false,
       false,
-      false,
-      true,
       true,
       true,
       true,
@@ -102,5 +90,5 @@
       true
     ]
   },
-  "hash": "6ed5cc84e8097c4febf6c935193f45ef713ef7f9909ce26653faceddb549a383"
+  "hash": "454e16ddb5e85285d0c4b9013bcce5d464ecc55c80b54bc16040226df7e297bd"
 }
diff --git a/core/lib/dal/.sqlx/query-fe06e06c04466429bb85709e6fe8dd6c2ad2793c06071f4a067dcc31306adebc.json b/core/lib/dal/.sqlx/query-45a968c6d667b13bbe9d895e7734fc05eaa158a6f38a87187d7f2c2068a0112a.json
similarity index 60%
rename from core/lib/dal/.sqlx/query-fe06e06c04466429bb85709e6fe8dd6c2ad2793c06071f4a067dcc31306adebc.json
rename to core/lib/dal/.sqlx/query-45a968c6d667b13bbe9d895e7734fc05eaa158a6f38a87187d7f2c2068a0112a.json
index 8f0065433012..36da129b5b77 100644
--- a/core/lib/dal/.sqlx/query-fe06e06c04466429bb85709e6fe8dd6c2ad2793c06071f4a067dcc31306adebc.json
+++ b/core/lib/dal/.sqlx/query-45a968c6d667b13bbe9d895e7734fc05eaa158a6f38a87187d7f2c2068a0112a.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                eth_txs_history (\n                    eth_tx_id,\n                    base_fee_per_gas,\n                    priority_fee_per_gas,\n                    tx_hash,\n                    signed_raw_tx,\n                    created_at,\n                    updated_at,\n                    blob_base_fee_per_gas\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, NOW(), NOW(), $6)\n            ON CONFLICT (tx_hash) DO NOTHING\n            RETURNING\n                id\n            ",
+  "query": "\n            INSERT INTO\n                eth_txs_history (\n                    eth_tx_id,\n                    base_fee_per_gas,\n                    priority_fee_per_gas,\n                    tx_hash,\n                    signed_raw_tx,\n                    created_at,\n                    updated_at,\n                    blob_base_fee_per_gas,\n                    sent_at_block,\n                    sent_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, NOW())\n            ON CONFLICT (tx_hash) DO NOTHING\n            RETURNING\n                id\n            ",
   "describe": {
     "columns": [
       {
@@ -16,12 +16,13 @@
         "Int8",
         "Text",
         "Bytea",
-        "Int8"
+        "Int8",
+        "Int4"
       ]
     },
     "nullable": [
       false
     ]
   },
-  "hash": "fe06e06c04466429bb85709e6fe8dd6c2ad2793c06071f4a067dcc31306adebc"
+  "hash": "45a968c6d667b13bbe9d895e7734fc05eaa158a6f38a87187d7f2c2068a0112a"
 }
diff --git a/core/lib/dal/.sqlx/query-494aca1d3684d394c0e7b5a7febbf222083d375221c5a1097f3aa10ccd9094e1.json b/core/lib/dal/.sqlx/query-494aca1d3684d394c0e7b5a7febbf222083d375221c5a1097f3aa10ccd9094e1.json
new file mode 100644
index 000000000000..5d2691edb3e9
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-494aca1d3684d394c0e7b5a7febbf222083d375221c5a1097f3aa10ccd9094e1.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                minor,\n                patch\n            FROM\n                protocol_patches\n            ORDER BY\n                minor DESC,\n                patch DESC\n            LIMIT\n                1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "minor",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "patch",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "494aca1d3684d394c0e7b5a7febbf222083d375221c5a1097f3aa10ccd9094e1"
+}
diff --git a/core/lib/dal/.sqlx/query-4bdda8d8956ac5dedc3bd389e3721fbe5f9e838b0f1fd6ff906c0130a15f9509.json b/core/lib/dal/.sqlx/query-4bdda8d8956ac5dedc3bd389e3721fbe5f9e838b0f1fd6ff906c0130a15f9509.json
deleted file mode 100644
index cdf143094c23..000000000000
--- a/core/lib/dal/.sqlx/query-4bdda8d8956ac5dedc3bd389e3721fbe5f9e838b0f1fd6ff906c0130a15f9509.json
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                l1_batches.timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                eth_prove_tx_id,\n                eth_commit_tx_id,\n                eth_execute_tx_id,\n                l2_to_l1_logs,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND protocol_versions.bootloader_code_hash = $1\n                AND protocol_versions.default_account_code_hash = $2\n                AND commitment IS NOT NULL\n                AND (\n                    protocol_versions.id = $3\n                    OR protocol_versions.upgrade_tx_hash IS NULL\n                )\n                AND events_queue_commitment IS NOT NULL\n                AND bootloader_initial_content_commitment IS NOT NULL\n            ORDER BY\n                number\n            LIMIT\n                $4\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "timestamp",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "l1_tx_count",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "l2_tx_count",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 4,
-        "name": "bloom",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 5,
-        "name": "priority_ops_onchain_data",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 6,
-        "name": "hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 7,
-        "name": "commitment",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 8,
-        "name": "eth_prove_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "eth_commit_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "eth_execute_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 12,
-        "name": "l2_to_l1_messages",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 13,
-        "name": "used_contract_hashes",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 14,
-        "name": "compressed_initial_writes",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 15,
-        "name": "compressed_repeated_writes",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 16,
-        "name": "l2_l1_merkle_root",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 17,
-        "name": "rollup_last_leaf_index",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 18,
-        "name": "zkporter_is_available",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 19,
-        "name": "bootloader_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 20,
-        "name": "default_aa_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 21,
-        "name": "aux_data_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 22,
-        "name": "pass_through_data_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 23,
-        "name": "meta_parameters_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 24,
-        "name": "protocol_version",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 25,
-        "name": "compressed_state_diffs",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 26,
-        "name": "system_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 27,
-        "name": "events_queue_commitment",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 28,
-        "name": "bootloader_initial_content_commitment",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 29,
-        "name": "pubdata_input",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Bytea",
-        "Int4",
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "4bdda8d8956ac5dedc3bd389e3721fbe5f9e838b0f1fd6ff906c0130a15f9509"
-}
diff --git a/core/lib/dal/.sqlx/query-4cff62fad4a7044a824a60656050e8a100140875f95cd8cf5de3c6202d59a19c.json b/core/lib/dal/.sqlx/query-4cff62fad4a7044a824a60656050e8a100140875f95cd8cf5de3c6202d59a19c.json
deleted file mode 100644
index 2c4d795f2f45..000000000000
--- a/core/lib/dal/.sqlx/query-4cff62fad4a7044a824a60656050e8a100140875f95cd8cf5de3c6202d59a19c.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            DELETE FROM storage_logs USING (\n                SELECT\n                    hashed_key,\n                    MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op\n                FROM\n                    storage_logs\n                WHERE\n                    miniblock_number BETWEEN $1 AND $2\n                GROUP BY\n                    hashed_key\n            ) AS last_storage_logs\n            WHERE\n                storage_logs.miniblock_number BETWEEN $1 AND $2\n                AND last_storage_logs.hashed_key = storage_logs.hashed_key\n                AND (\n                    storage_logs.miniblock_number != last_storage_logs.op[1]\n                    OR storage_logs.operation_number != last_storage_logs.op[2]\n                )\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "4cff62fad4a7044a824a60656050e8a100140875f95cd8cf5de3c6202d59a19c"
-}
diff --git a/core/lib/dal/.sqlx/query-c6b799f7afc1c310a16aeaa9819c4b8026e0e8dde20d98750f874415f14faefd.json b/core/lib/dal/.sqlx/query-52bb6de515e1edf4dcf34a31600edb31cfd855014dfca5041833b9d5d9f7a55e.json
similarity index 66%
rename from core/lib/dal/.sqlx/query-c6b799f7afc1c310a16aeaa9819c4b8026e0e8dde20d98750f874415f14faefd.json
rename to core/lib/dal/.sqlx/query-52bb6de515e1edf4dcf34a31600edb31cfd855014dfca5041833b9d5d9f7a55e.json
index db146fd7acba..b872e2ce6297 100644
--- a/core/lib/dal/.sqlx/query-c6b799f7afc1c310a16aeaa9819c4b8026e0e8dde20d98750f874415f14faefd.json
+++ b/core/lib/dal/.sqlx/query-52bb6de515e1edf4dcf34a31600edb31cfd855014dfca5041833b9d5d9f7a55e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                eth_prove_tx_id,\n                eth_commit_tx_id,\n                eth_execute_tx_id,\n                l2_to_l1_logs,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            WHERE\n                eth_commit_tx_id IS NOT NULL\n                AND eth_prove_tx_id IS NULL\n            ORDER BY\n                number\n            LIMIT\n                $1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                system_logs,\n                compressed_state_diffs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            WHERE\n                number = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -45,111 +45,91 @@
       },
       {
         "ordinal": 8,
-        "name": "eth_prove_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "eth_commit_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "eth_execute_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 12,
         "name": "l2_to_l1_messages",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 13,
+        "ordinal": 9,
         "name": "used_contract_hashes",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 14,
+        "ordinal": 10,
         "name": "compressed_initial_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 15,
+        "ordinal": 11,
         "name": "compressed_repeated_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 16,
+        "ordinal": 12,
         "name": "l2_l1_merkle_root",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 17,
+        "ordinal": 13,
         "name": "rollup_last_leaf_index",
         "type_info": "Int8"
       },
       {
-        "ordinal": 18,
+        "ordinal": 14,
         "name": "zkporter_is_available",
         "type_info": "Bool"
       },
       {
-        "ordinal": 19,
+        "ordinal": 15,
         "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 20,
+        "ordinal": 16,
         "name": "default_aa_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 21,
+        "ordinal": 17,
         "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 18,
         "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 23,
+        "ordinal": 19,
         "name": "meta_parameters_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 20,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 25,
-        "name": "compressed_state_diffs",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 26,
+        "ordinal": 21,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 27,
+        "ordinal": 22,
+        "name": "compressed_state_diffs",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 23,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 28,
+        "ordinal": 24,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 29,
+        "ordinal": 25,
         "name": "pubdata_input",
         "type_info": "Bytea"
       }
@@ -168,13 +148,8 @@
       false,
       true,
       true,
-      true,
-      true,
-      true,
       false,
       false,
-      false,
-      true,
       true,
       true,
       true,
@@ -189,8 +164,9 @@
       false,
       true,
       true,
+      true,
       true
     ]
   },
-  "hash": "c6b799f7afc1c310a16aeaa9819c4b8026e0e8dde20d98750f874415f14faefd"
+  "hash": "52bb6de515e1edf4dcf34a31600edb31cfd855014dfca5041833b9d5d9f7a55e"
 }
diff --git a/core/lib/dal/.sqlx/query-53ab91ac4daebeb7d9d38018f31a9a184779646a16537df5b7cc54d0b4175d24.json b/core/lib/dal/.sqlx/query-53ab91ac4daebeb7d9d38018f31a9a184779646a16537df5b7cc54d0b4175d24.json
new file mode 100644
index 000000000000..9694b9c662c1
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-53ab91ac4daebeb7d9d38018f31a9a184779646a16537df5b7cc54d0b4175d24.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                transactions.execution_info\n            FROM\n                transactions\n            WHERE\n                transactions.hash = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "execution_info",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bytea"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "53ab91ac4daebeb7d9d38018f31a9a184779646a16537df5b7cc54d0b4175d24"
+}
diff --git a/core/lib/dal/.sqlx/query-5556ebdb040428b42c04ea9121b3c2a3d0a09c5ee88bdd671462904d4d27a355.json b/core/lib/dal/.sqlx/query-5556ebdb040428b42c04ea9121b3c2a3d0a09c5ee88bdd671462904d4d27a355.json
new file mode 100644
index 000000000000..5e9051587bb9
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-5556ebdb040428b42c04ea9121b3c2a3d0a09c5ee88bdd671462904d4d27a355.json
@@ -0,0 +1,46 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                id AS \"minor!\",\n                timestamp,\n                bootloader_code_hash,\n                default_account_code_hash,\n                upgrade_tx_hash\n            FROM\n                protocol_versions\n            WHERE\n                id = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "minor!",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "bootloader_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 3,
+        "name": "default_account_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 4,
+        "name": "upgrade_tx_hash",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true
+    ]
+  },
+  "hash": "5556ebdb040428b42c04ea9121b3c2a3d0a09c5ee88bdd671462904d4d27a355"
+}
diff --git a/core/lib/dal/.sqlx/query-58f900812efdb615f6286eb4212c3252680594256dccb0d7e51444f613011980.json b/core/lib/dal/.sqlx/query-58f900812efdb615f6286eb4212c3252680594256dccb0d7e51444f613011980.json
new file mode 100644
index 000000000000..0b45e2c25c2c
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-58f900812efdb615f6286eb4212c3252680594256dccb0d7e51444f613011980.json
@@ -0,0 +1,88 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                miniblock_number,\n                log_index_in_miniblock,\n                log_index_in_tx,\n                tx_hash,\n                l1_batch_number,\n                shard_id,\n                is_service,\n                tx_index_in_miniblock,\n                tx_index_in_l1_batch,\n                sender,\n                key,\n                value\n            FROM\n                l2_to_l1_logs\n                JOIN miniblocks ON l2_to_l1_logs.miniblock_number = miniblocks.number\n            WHERE\n                l1_batch_number = $1\n            ORDER BY\n                miniblock_number,\n                log_index_in_miniblock\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "miniblock_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "log_index_in_miniblock",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 2,
+        "name": "log_index_in_tx",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 3,
+        "name": "tx_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 4,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 5,
+        "name": "shard_id",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 6,
+        "name": "is_service",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 7,
+        "name": "tx_index_in_miniblock",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 8,
+        "name": "tx_index_in_l1_batch",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 9,
+        "name": "sender",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 10,
+        "name": "key",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 11,
+        "name": "value",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      true,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "58f900812efdb615f6286eb4212c3252680594256dccb0d7e51444f613011980"
+}
diff --git a/core/lib/dal/.sqlx/query-5c7409ff9e413e7684cea5df6046f1a607a0bcc6864490c5961dd4e2ee12ed78.json b/core/lib/dal/.sqlx/query-5c7409ff9e413e7684cea5df6046f1a607a0bcc6864490c5961dd4e2ee12ed78.json
new file mode 100644
index 000000000000..f34c4a548cb3
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-5c7409ff9e413e7684cea5df6046f1a607a0bcc6864490c5961dd4e2ee12ed78.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                attempts\n            FROM\n                tee_verifier_input_producer_jobs\n            WHERE\n                l1_batch_number = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "attempts",
+        "type_info": "Int2"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "5c7409ff9e413e7684cea5df6046f1a607a0bcc6864490c5961dd4e2ee12ed78"
+}
diff --git a/core/lib/dal/.sqlx/query-5c99342c4fbf36ccc8e9c9dafc76de37201091bfccd3caf922e766896c5a542b.json b/core/lib/dal/.sqlx/query-5c99342c4fbf36ccc8e9c9dafc76de37201091bfccd3caf922e766896c5a542b.json
new file mode 100644
index 000000000000..5d09a9c37f7a
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-5c99342c4fbf36ccc8e9c9dafc76de37201091bfccd3caf922e766896c5a542b.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE data_availability\n            SET\n                inclusion_data = $1,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $2\n                AND inclusion_data IS NULL\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "5c99342c4fbf36ccc8e9c9dafc76de37201091bfccd3caf922e766896c5a542b"
+}
diff --git a/core/lib/dal/.sqlx/query-5f09cee144c84ea8f69d017f10ca96a8c4d88eb02b621cfa6aeb4e10c6ec0bc4.json b/core/lib/dal/.sqlx/query-5f09cee144c84ea8f69d017f10ca96a8c4d88eb02b621cfa6aeb4e10c6ec0bc4.json
new file mode 100644
index 000000000000..5b793f251353
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-5f09cee144c84ea8f69d017f10ca96a8c4d88eb02b621cfa6aeb4e10c6ec0bc4.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                MAX(l1_batch_number) AS \"last_processed_l1_batch\"\n            FROM\n                vm_runner_protective_reads\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "last_processed_l1_batch",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "5f09cee144c84ea8f69d017f10ca96a8c4d88eb02b621cfa6aeb4e10c6ec0bc4"
+}
diff --git a/core/lib/dal/.sqlx/query-04e63146ce0d7c5c7343b2881debfda36a55972bde029fb97bbd3ddbcf2046cd.json b/core/lib/dal/.sqlx/query-63f95c6cdcfd933e2cf8f62c0d408f2dce89f7b700896fcc0f242e0e15ba058e.json
similarity index 61%
rename from core/lib/dal/.sqlx/query-04e63146ce0d7c5c7343b2881debfda36a55972bde029fb97bbd3ddbcf2046cd.json
rename to core/lib/dal/.sqlx/query-63f95c6cdcfd933e2cf8f62c0d408f2dce89f7b700896fcc0f242e0e15ba058e.json
index 08aa73e9a796..cb68e7622524 100644
--- a/core/lib/dal/.sqlx/query-04e63146ce0d7c5c7343b2881debfda36a55972bde029fb97bbd3ddbcf2046cd.json
+++ b/core/lib/dal/.sqlx/query-63f95c6cdcfd933e2cf8f62c0d408f2dce89f7b700896fcc0f242e0e15ba058e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                l1_batches.timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                eth_prove_tx_id,\n                eth_commit_tx_id,\n                eth_execute_tx_id,\n                l2_to_l1_logs,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND protocol_versions.bootloader_code_hash = $1\n                AND protocol_versions.default_account_code_hash = $2\n                AND commitment IS NOT NULL\n                AND (\n                    protocol_versions.id = $3\n                    OR protocol_versions.upgrade_tx_hash IS NULL\n                )\n            ORDER BY\n                number\n            LIMIT\n                $4\n            ",
+  "query": "\n            SELECT\n                number,\n                l1_batches.timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n                JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND protocol_versions.bootloader_code_hash = $1\n                AND protocol_versions.default_account_code_hash = $2\n                AND commitment IS NOT NULL\n                AND (\n                    protocol_versions.id = $3\n                    OR protocol_versions.upgrade_tx_hash IS NULL\n                )\n                AND events_queue_commitment IS NOT NULL\n                AND bootloader_initial_content_commitment IS NOT NULL\n                AND (\n                    data_availability.inclusion_data IS NOT NULL\n                    OR $4 IS FALSE\n                )\n            ORDER BY\n                number\n            LIMIT\n                $5\n            ",
   "describe": {
     "columns": [
       {
@@ -45,111 +45,91 @@
       },
       {
         "ordinal": 8,
-        "name": "eth_prove_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "eth_commit_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "eth_execute_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 12,
         "name": "l2_to_l1_messages",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 13,
+        "ordinal": 9,
         "name": "used_contract_hashes",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 14,
+        "ordinal": 10,
         "name": "compressed_initial_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 15,
+        "ordinal": 11,
         "name": "compressed_repeated_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 16,
+        "ordinal": 12,
         "name": "l2_l1_merkle_root",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 17,
+        "ordinal": 13,
         "name": "rollup_last_leaf_index",
         "type_info": "Int8"
       },
       {
-        "ordinal": 18,
+        "ordinal": 14,
         "name": "zkporter_is_available",
         "type_info": "Bool"
       },
       {
-        "ordinal": 19,
+        "ordinal": 15,
         "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 20,
+        "ordinal": 16,
         "name": "default_aa_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 21,
+        "ordinal": 17,
         "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 18,
         "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 23,
+        "ordinal": 19,
         "name": "meta_parameters_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 20,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 25,
+        "ordinal": 21,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 22,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 27,
+        "ordinal": 23,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 28,
+        "ordinal": 24,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 29,
+        "ordinal": 25,
         "name": "pubdata_input",
         "type_info": "Bytea"
       }
@@ -159,6 +139,7 @@
         "Bytea",
         "Bytea",
         "Int4",
+        "Bool",
         "Int8"
       ]
     },
@@ -171,10 +152,6 @@
       false,
       true,
       true,
-      true,
-      true,
-      true,
-      false,
       false,
       false,
       true,
@@ -195,5 +172,5 @@
       true
     ]
   },
-  "hash": "04e63146ce0d7c5c7343b2881debfda36a55972bde029fb97bbd3ddbcf2046cd"
+  "hash": "63f95c6cdcfd933e2cf8f62c0d408f2dce89f7b700896fcc0f242e0e15ba058e"
 }
diff --git a/core/lib/dal/.sqlx/query-640d37aa1d6dc722b1651c74b7ea2fca14965083b0589c3b3efad02e37d55f0c.json b/core/lib/dal/.sqlx/query-640d37aa1d6dc722b1651c74b7ea2fca14965083b0589c3b3efad02e37d55f0c.json
new file mode 100644
index 000000000000..f0603488f1e8
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-640d37aa1d6dc722b1651c74b7ea2fca14965083b0589c3b3efad02e37d55f0c.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                proofs.l1_batch_number\n            FROM\n                tee_proof_generation_details AS proofs\n                JOIN tee_verifier_input_producer_jobs AS inputs ON proofs.l1_batch_number = inputs.l1_batch_number\n            WHERE\n                inputs.status = 'Successful'\n                AND proofs.status = 'ready_to_be_proven'\n            ORDER BY\n                proofs.l1_batch_number ASC\n            LIMIT\n                1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "640d37aa1d6dc722b1651c74b7ea2fca14965083b0589c3b3efad02e37d55f0c"
+}
diff --git a/core/lib/dal/.sqlx/query-2cc640434b8bd8b848bb285d060a8c166c71630d71cdc1b8d005a7261c0b53c6.json b/core/lib/dal/.sqlx/query-659f616d3af4a79f898e84f890e06de9633d1086da972a467d89831e7a07c67e.json
similarity index 61%
rename from core/lib/dal/.sqlx/query-2cc640434b8bd8b848bb285d060a8c166c71630d71cdc1b8d005a7261c0b53c6.json
rename to core/lib/dal/.sqlx/query-659f616d3af4a79f898e84f890e06de9633d1086da972a467d89831e7a07c67e.json
index fc11c7d65655..9116a25c1673 100644
--- a/core/lib/dal/.sqlx/query-2cc640434b8bd8b848bb285d060a8c166c71630d71cdc1b8d005a7261c0b53c6.json
+++ b/core/lib/dal/.sqlx/query-659f616d3af4a79f898e84f890e06de9633d1086da972a467d89831e7a07c67e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                eth_prove_tx_id,\n                eth_commit_tx_id,\n                eth_execute_tx_id,\n                l2_to_l1_logs,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                system_logs,\n                compressed_state_diffs,\n                protocol_version,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                (\n                    SELECT\n                        l1_batches.*,\n                        ROW_NUMBER() OVER (\n                            ORDER BY\n                                number ASC\n                        ) AS ROW_NUMBER\n                    FROM\n                        l1_batches\n                    WHERE\n                        eth_commit_tx_id IS NOT NULL\n                        AND l1_batches.skip_proof = TRUE\n                        AND l1_batches.number > $1\n                    ORDER BY\n                        number\n                    LIMIT\n                        $2\n                ) inn\n                LEFT JOIN commitments ON commitments.l1_batch_number = inn.number\n            WHERE\n                number - ROW_NUMBER = $1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                system_logs,\n                compressed_state_diffs,\n                protocol_version,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                (\n                    SELECT\n                        l1_batches.*,\n                        ROW_NUMBER() OVER (\n                            ORDER BY\n                                number ASC\n                        ) AS ROW_NUMBER\n                    FROM\n                        l1_batches\n                    WHERE\n                        eth_commit_tx_id IS NOT NULL\n                        AND l1_batches.skip_proof = TRUE\n                        AND l1_batches.number > $1\n                    ORDER BY\n                        number\n                    LIMIT\n                        $2\n                ) inn\n                LEFT JOIN commitments ON commitments.l1_batch_number = inn.number\n            WHERE\n                number - ROW_NUMBER = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -45,111 +45,91 @@
       },
       {
         "ordinal": 8,
-        "name": "eth_prove_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "eth_commit_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "eth_execute_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 12,
         "name": "l2_to_l1_messages",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 13,
+        "ordinal": 9,
         "name": "used_contract_hashes",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 14,
+        "ordinal": 10,
         "name": "compressed_initial_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 15,
+        "ordinal": 11,
         "name": "compressed_repeated_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 16,
+        "ordinal": 12,
         "name": "l2_l1_merkle_root",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 17,
+        "ordinal": 13,
         "name": "rollup_last_leaf_index",
         "type_info": "Int8"
       },
       {
-        "ordinal": 18,
+        "ordinal": 14,
         "name": "zkporter_is_available",
         "type_info": "Bool"
       },
       {
-        "ordinal": 19,
+        "ordinal": 15,
         "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 20,
+        "ordinal": 16,
         "name": "default_aa_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 21,
+        "ordinal": 17,
         "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 18,
         "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 23,
+        "ordinal": 19,
         "name": "meta_parameters_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 20,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 25,
+        "ordinal": 21,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 22,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 27,
+        "ordinal": 23,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 28,
+        "ordinal": 24,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 29,
+        "ordinal": 25,
         "name": "pubdata_input",
         "type_info": "Bytea"
       }
@@ -169,10 +149,6 @@
       false,
       true,
       true,
-      true,
-      true,
-      true,
-      false,
       false,
       false,
       true,
@@ -193,5 +169,5 @@
       true
     ]
   },
-  "hash": "2cc640434b8bd8b848bb285d060a8c166c71630d71cdc1b8d005a7261c0b53c6"
+  "hash": "659f616d3af4a79f898e84f890e06de9633d1086da972a467d89831e7a07c67e"
 }
diff --git a/core/lib/dal/.sqlx/query-66b3f476cf4487239190175d2940fd5e1330393d8b04c7cf03b8c7ab2edad5d1.json b/core/lib/dal/.sqlx/query-66b3f476cf4487239190175d2940fd5e1330393d8b04c7cf03b8c7ab2edad5d1.json
new file mode 100644
index 000000000000..0cf4a1e32005
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-66b3f476cf4487239190175d2940fd5e1330393d8b04c7cf03b8c7ab2edad5d1.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                transactions (\n                    hash,\n                    is_priority,\n                    initiator_address,\n                    gas_limit,\n                    max_fee_per_gas,\n                    gas_per_pubdata_limit,\n                    data,\n                    upgrade_id,\n                    contract_address,\n                    l1_block_number,\n                    value,\n                    paymaster,\n                    paymaster_input,\n                    tx_format,\n                    l1_tx_mint,\n                    l1_tx_refund_recipient,\n                    miniblock_number,\n                    index_in_block,\n                    error,\n                    execution_info,\n                    refunded_gas,\n                    effective_gas_price,\n                    received_at,\n                    created_at,\n                    updated_at\n                )\n            SELECT\n                data_table.hash,\n                TRUE,\n                data_table.initiator_address,\n                data_table.gas_limit,\n                data_table.max_fee_per_gas,\n                data_table.gas_per_pubdata_limit,\n                data_table.data,\n                data_table.upgrade_id,\n                data_table.contract_address,\n                data_table.l1_block_number,\n                data_table.value,\n                '\\x0000000000000000000000000000000000000000'::bytea,\n                '\\x'::bytea,\n                data_table.tx_format,\n                data_table.l1_tx_mint,\n                data_table.l1_tx_refund_recipient,\n                $19,\n                data_table.index_in_block,\n                NULLIF(data_table.error, ''),\n                data_table.execution_info,\n                data_table.refunded_gas,\n                data_table.effective_gas_price,\n                NOW(),\n                NOW(),\n                NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::BYTEA[]) AS hash,\n                        UNNEST($2::BYTEA[]) AS initiator_address,\n                        UNNEST($3::NUMERIC[]) AS gas_limit,\n                        UNNEST($4::NUMERIC[]) AS max_fee_per_gas,\n                        UNNEST($5::NUMERIC[]) AS gas_per_pubdata_limit,\n                        UNNEST($6::JSONB[]) AS data,\n                        UNNEST($7::INT[]) AS upgrade_id,\n                        UNNEST($8::BYTEA[]) AS contract_address,\n                        UNNEST($9::INT[]) AS l1_block_number,\n                        UNNEST($10::NUMERIC[]) AS value,\n                        UNNEST($11::INTEGER[]) AS tx_format,\n                        UNNEST($12::NUMERIC[]) AS l1_tx_mint,\n                        UNNEST($13::BYTEA[]) AS l1_tx_refund_recipient,\n                        UNNEST($14::INT[]) AS index_in_block,\n                        UNNEST($15::VARCHAR[]) AS error,\n                        UNNEST($16::JSONB[]) AS execution_info,\n                        UNNEST($17::BIGINT[]) AS refunded_gas,\n                        UNNEST($18::NUMERIC[]) AS effective_gas_price\n                ) AS data_table\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "ByteaArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "JsonbArray",
+        "Int4Array",
+        "ByteaArray",
+        "Int4Array",
+        "NumericArray",
+        "Int4Array",
+        "NumericArray",
+        "ByteaArray",
+        "Int4Array",
+        "VarcharArray",
+        "JsonbArray",
+        "Int8Array",
+        "NumericArray",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "66b3f476cf4487239190175d2940fd5e1330393d8b04c7cf03b8c7ab2edad5d1"
+}
diff --git a/core/lib/dal/.sqlx/query-69c885498b186f3b7cbb215112ec86783d7da0ec1d008680872f3619cf217923.json b/core/lib/dal/.sqlx/query-69c885498b186f3b7cbb215112ec86783d7da0ec1d008680872f3619cf217923.json
new file mode 100644
index 000000000000..82575c807fb3
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-69c885498b186f3b7cbb215112ec86783d7da0ec1d008680872f3619cf217923.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                DELETE FROM transactions\n                WHERE\n                    hash = ANY ($1)\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "69c885498b186f3b7cbb215112ec86783d7da0ec1d008680872f3619cf217923"
+}
diff --git a/core/lib/dal/.sqlx/query-ac47b807af0441cd522a41879f25679d90947c0af172c9a199cf9280aa557e95.json b/core/lib/dal/.sqlx/query-6e3a3ef443ce8aab55b10eea55f9c8ff11775885aebaf457075c6825305244e5.json
similarity index 54%
rename from core/lib/dal/.sqlx/query-ac47b807af0441cd522a41879f25679d90947c0af172c9a199cf9280aa557e95.json
rename to core/lib/dal/.sqlx/query-6e3a3ef443ce8aab55b10eea55f9c8ff11775885aebaf457075c6825305244e5.json
index be3f6ca3c774..de474897307a 100644
--- a/core/lib/dal/.sqlx/query-ac47b807af0441cd522a41879f25679d90947c0af172c9a199cf9280aa557e95.json
+++ b/core/lib/dal/.sqlx/query-6e3a3ef443ce8aab55b10eea55f9c8ff11775885aebaf457075c6825305244e5.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                transactions.is_priority,\n                transactions.initiator_address,\n                transactions.gas_limit,\n                transactions.gas_per_pubdata_limit,\n                transactions.received_at,\n                transactions.miniblock_number,\n                transactions.error,\n                transactions.effective_gas_price,\n                transactions.refunded_gas,\n                commit_tx.tx_hash AS \"eth_commit_tx_hash?\",\n                prove_tx.tx_hash AS \"eth_prove_tx_hash?\",\n                execute_tx.tx_hash AS \"eth_execute_tx_hash?\"\n            FROM\n                transactions\n                LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number\n                LEFT JOIN eth_txs_history AS commit_tx ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS prove_tx ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS execute_tx ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                transactions.hash = $1\n                AND transactions.data != '{}'::jsonb\n            ",
+  "query": "\n            SELECT\n                transactions.is_priority,\n                transactions.initiator_address,\n                transactions.gas_limit,\n                transactions.gas_per_pubdata_limit,\n                transactions.received_at,\n                miniblocks.number AS \"miniblock_number?\",\n                transactions.error,\n                transactions.effective_gas_price,\n                transactions.refunded_gas,\n                commit_tx.tx_hash AS \"eth_commit_tx_hash?\",\n                prove_tx.tx_hash AS \"eth_prove_tx_hash?\",\n                execute_tx.tx_hash AS \"eth_execute_tx_hash?\"\n            FROM\n                transactions\n                LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                LEFT JOIN l1_batches ON l1_batches.number = miniblocks.l1_batch_number\n                LEFT JOIN eth_txs_history AS commit_tx ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS prove_tx ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS execute_tx ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                transactions.hash = $1\n                AND transactions.data != '{}'::jsonb\n            ",
   "describe": {
     "columns": [
       {
@@ -30,7 +30,7 @@
       },
       {
         "ordinal": 5,
-        "name": "miniblock_number",
+        "name": "miniblock_number?",
         "type_info": "Int8"
       },
       {
@@ -75,7 +75,7 @@
       true,
       true,
       false,
-      true,
+      false,
       true,
       true,
       false,
@@ -84,5 +84,5 @@
       false
     ]
   },
-  "hash": "ac47b807af0441cd522a41879f25679d90947c0af172c9a199cf9280aa557e95"
+  "hash": "6e3a3ef443ce8aab55b10eea55f9c8ff11775885aebaf457075c6825305244e5"
 }
diff --git a/core/lib/dal/.sqlx/query-6f003ee0311b9ff1f42d3a74587670ab55ca94647e0caa92adab7c18260f18ff.json b/core/lib/dal/.sqlx/query-6f003ee0311b9ff1f42d3a74587670ab55ca94647e0caa92adab7c18260f18ff.json
new file mode 100644
index 000000000000..768089b083a1
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-6f003ee0311b9ff1f42d3a74587670ab55ca94647e0caa92adab7c18260f18ff.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT\n                    blob_id\n                FROM\n                    data_availability\n                WHERE\n                    l1_batch_number = $1\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "blob_id",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "6f003ee0311b9ff1f42d3a74587670ab55ca94647e0caa92adab7c18260f18ff"
+}
diff --git a/core/lib/dal/.sqlx/query-6f05b8ad720f9c1fae9292c16b5960b7bd48b48b63d9db071ef94c5fec4660c9.json b/core/lib/dal/.sqlx/query-6f05b8ad720f9c1fae9292c16b5960b7bd48b48b63d9db071ef94c5fec4660c9.json
new file mode 100644
index 000000000000..32a9955cc270
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-6f05b8ad720f9c1fae9292c16b5960b7bd48b48b63d9db071ef94c5fec4660c9.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                patch\n            FROM\n                protocol_patches\n            WHERE\n                minor = $1\n                AND recursion_scheduler_level_vk_hash = $2\n            ORDER BY\n                patch DESC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "patch",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Bytea"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "6f05b8ad720f9c1fae9292c16b5960b7bd48b48b63d9db071ef94c5fec4660c9"
+}
diff --git a/core/lib/dal/.sqlx/query-70fa8e4193c4e546227b328f25c5d84dc38610a86642d359c10f709145a9b446.json b/core/lib/dal/.sqlx/query-70fa8e4193c4e546227b328f25c5d84dc38610a86642d359c10f709145a9b446.json
deleted file mode 100644
index 4cfe93b3f81e..000000000000
--- a/core/lib/dal/.sqlx/query-70fa8e4193c4e546227b328f25c5d84dc38610a86642d359c10f709145a9b446.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            DELETE FROM storage_logs USING (\n                SELECT\n                    *\n                FROM\n                    storage_logs\n                WHERE\n                    miniblock_number BETWEEN $1 AND $2\n            ) AS batches_to_prune\n            WHERE\n                storage_logs.miniblock_number < $1\n                AND batches_to_prune.hashed_key = storage_logs.hashed_key\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "70fa8e4193c4e546227b328f25c5d84dc38610a86642d359c10f709145a9b446"
-}
diff --git a/core/lib/dal/.sqlx/query-718d29517c100ad9d258a7ee90c48449c1c4bed4d0236fcedc177c9478e72262.json b/core/lib/dal/.sqlx/query-718d29517c100ad9d258a7ee90c48449c1c4bed4d0236fcedc177c9478e72262.json
new file mode 100644
index 000000000000..4e523efe3fc8
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-718d29517c100ad9d258a7ee90c48449c1c4bed4d0236fcedc177c9478e72262.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                tee_verifier_input_producer_jobs (l1_batch_number, status, created_at, updated_at)\n            VALUES\n                ($1, $2, NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        {
+          "Custom": {
+            "name": "tee_verifier_input_producer_job_status",
+            "kind": {
+              "Enum": [
+                "Queued",
+                "ManuallySkipped",
+                "InProgress",
+                "Successful",
+                "Failed"
+              ]
+            }
+          }
+        }
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "718d29517c100ad9d258a7ee90c48449c1c4bed4d0236fcedc177c9478e72262"
+}
diff --git a/core/lib/dal/.sqlx/query-727d4dc6a8fdb39a6c54d4395124f8d103f12e51252c46a210a007e5e600d711.json b/core/lib/dal/.sqlx/query-727d4dc6a8fdb39a6c54d4395124f8d103f12e51252c46a210a007e5e600d711.json
new file mode 100644
index 000000000000..8e210aade885
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-727d4dc6a8fdb39a6c54d4395124f8d103f12e51252c46a210a007e5e600d711.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE tee_proof_generation_details\n            SET\n                status = 'generated',\n                signature = $1,\n                pubkey = $2,\n                proof = $3,\n                tee_type = $4,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $5\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea",
+        "Bytea",
+        "Text",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "727d4dc6a8fdb39a6c54d4395124f8d103f12e51252c46a210a007e5e600d711"
+}
diff --git a/core/lib/dal/.sqlx/query-730095f41fd5e2ea376fd869887be82028e2865e646677ff67d0720ad17b1eac.json b/core/lib/dal/.sqlx/query-730095f41fd5e2ea376fd869887be82028e2865e646677ff67d0720ad17b1eac.json
new file mode 100644
index 000000000000..e6d2f72575e3
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-730095f41fd5e2ea376fd869887be82028e2865e646677ff67d0720ad17b1eac.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                tree_writes\n            FROM\n                l1_batches\n            WHERE\n                number = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "tree_writes",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "730095f41fd5e2ea376fd869887be82028e2865e646677ff67d0720ad17b1eac"
+}
diff --git a/core/lib/dal/.sqlx/query-3596a70433e4e27fcda18f37073b51dea32e37cb8c51f1dd5d82c15eddc48e6b.json b/core/lib/dal/.sqlx/query-778f92b1ac91e1ae279f588053d75a9ac877fdd28bda99661e423405e695223d.json
similarity index 66%
rename from core/lib/dal/.sqlx/query-3596a70433e4e27fcda18f37073b51dea32e37cb8c51f1dd5d82c15eddc48e6b.json
rename to core/lib/dal/.sqlx/query-778f92b1ac91e1ae279f588053d75a9ac877fdd28bda99661e423405e695223d.json
index 7fc673c7c22f..aa7d4c65a39d 100644
--- a/core/lib/dal/.sqlx/query-3596a70433e4e27fcda18f37073b51dea32e37cb8c51f1dd5d82c15eddc48e6b.json
+++ b/core/lib/dal/.sqlx/query-778f92b1ac91e1ae279f588053d75a9ac877fdd28bda99661e423405e695223d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                miniblocks.number,\n                COALESCE(\n                    miniblocks.l1_batch_number,\n                    (\n                        SELECT\n                            (MAX(number) + 1)\n                        FROM\n                            l1_batches\n                    ),\n                    (\n                        SELECT\n                            MAX(l1_batch_number) + 1\n                        FROM\n                            snapshot_recovery\n                    )\n                ) AS \"l1_batch_number!\",\n                (\n                    SELECT\n                        MAX(m2.number)\n                    FROM\n                        miniblocks m2\n                    WHERE\n                        miniblocks.l1_batch_number = m2.l1_batch_number\n                ) AS \"last_batch_miniblock?\",\n                miniblocks.timestamp,\n                miniblocks.l1_gas_price,\n                miniblocks.l2_fair_gas_price,\n                miniblocks.fair_pubdata_price,\n                miniblocks.bootloader_code_hash,\n                miniblocks.default_aa_code_hash,\n                miniblocks.virtual_blocks,\n                miniblocks.hash,\n                miniblocks.protocol_version AS \"protocol_version!\",\n                miniblocks.fee_account_address AS \"fee_account_address!\"\n            FROM\n                miniblocks\n            WHERE\n                miniblocks.number = $1\n            ",
+  "query": "\n            SELECT\n                miniblocks.number,\n                COALESCE(\n                    miniblocks.l1_batch_number,\n                    (\n                        SELECT\n                            (MAX(number) + 1)\n                        FROM\n                            l1_batches\n                    ),\n                    (\n                        SELECT\n                            MAX(l1_batch_number) + 1\n                        FROM\n                            snapshot_recovery\n                    )\n                ) AS \"l1_batch_number!\",\n                (miniblocks.l1_tx_count + miniblocks.l2_tx_count) AS \"tx_count!\",\n                miniblocks.timestamp,\n                miniblocks.l1_gas_price,\n                miniblocks.l2_fair_gas_price,\n                miniblocks.fair_pubdata_price,\n                miniblocks.bootloader_code_hash,\n                miniblocks.default_aa_code_hash,\n                miniblocks.virtual_blocks,\n                miniblocks.hash,\n                miniblocks.protocol_version AS \"protocol_version!\",\n                miniblocks.fee_account_address AS \"fee_account_address!\"\n            FROM\n                miniblocks\n            WHERE\n                miniblocks.number BETWEEN $1 AND $2\n            ",
   "describe": {
     "columns": [
       {
@@ -15,8 +15,8 @@
       },
       {
         "ordinal": 2,
-        "name": "last_batch_miniblock?",
-        "type_info": "Int8"
+        "name": "tx_count!",
+        "type_info": "Int4"
       },
       {
         "ordinal": 3,
@@ -71,6 +71,7 @@
     ],
     "parameters": {
       "Left": [
+        "Int8",
         "Int8"
       ]
     },
@@ -90,5 +91,5 @@
       false
     ]
   },
-  "hash": "3596a70433e4e27fcda18f37073b51dea32e37cb8c51f1dd5d82c15eddc48e6b"
+  "hash": "778f92b1ac91e1ae279f588053d75a9ac877fdd28bda99661e423405e695223d"
 }
diff --git a/core/lib/dal/.sqlx/query-77de28ce78e1e5827f03d7e7550aec881fb5d3cde2f3aad9a5db5629070d6b7c.json b/core/lib/dal/.sqlx/query-77de28ce78e1e5827f03d7e7550aec881fb5d3cde2f3aad9a5db5629070d6b7c.json
new file mode 100644
index 000000000000..6fc747ea1237
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-77de28ce78e1e5827f03d7e7550aec881fb5d3cde2f3aad9a5db5629070d6b7c.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                (tree_writes IS NOT NULL) AS \"tree_writes_are_present!\"\n            FROM\n                l1_batches\n            WHERE\n                number = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "tree_writes_are_present!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "77de28ce78e1e5827f03d7e7550aec881fb5d3cde2f3aad9a5db5629070d6b7c"
+}
diff --git a/core/lib/dal/.sqlx/query-5659480e5d79dab3399e35539b240e7eb9f598999c28015a504605f88bf84b33.json b/core/lib/dal/.sqlx/query-7e6e8cd0b5217616d847c0b7a62723b395d9b28ca025e6b0b1b7dc9ef93c6b81.json
similarity index 79%
rename from core/lib/dal/.sqlx/query-5659480e5d79dab3399e35539b240e7eb9f598999c28015a504605f88bf84b33.json
rename to core/lib/dal/.sqlx/query-7e6e8cd0b5217616d847c0b7a62723b395d9b28ca025e6b0b1b7dc9ef93c6b81.json
index 5948d75785b2..6e284803521a 100644
--- a/core/lib/dal/.sqlx/query-5659480e5d79dab3399e35539b240e7eb9f598999c28015a504605f88bf84b33.json
+++ b/core/lib/dal/.sqlx/query-7e6e8cd0b5217616d847c0b7a62723b395d9b28ca025e6b0b1b7dc9ef93c6b81.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                *\n            FROM\n                eth_txs\n            WHERE\n                id > (\n                    SELECT\n                        COALESCE(MAX(eth_tx_id), 0)\n                    FROM\n                        eth_txs_history\n                )\n            ORDER BY\n                id\n            LIMIT\n                $1\n            ",
+  "query": "\n            SELECT\n                *\n            FROM\n                eth_txs\n            WHERE\n                from_addr IS NOT DISTINCT FROM $2 -- can't just use equality as NULL != NULL\n                AND id > (\n                    SELECT\n                        COALESCE(MAX(eth_tx_id), 0)\n                    FROM\n                        eth_txs_history\n                )\n            ORDER BY\n                id\n            LIMIT\n                $1\n            ",
   "describe": {
     "columns": [
       {
@@ -76,7 +76,8 @@
     ],
     "parameters": {
       "Left": [
-        "Int8"
+        "Int8",
+        "Bytea"
       ]
     },
     "nullable": [
@@ -96,5 +97,5 @@
       true
     ]
   },
-  "hash": "5659480e5d79dab3399e35539b240e7eb9f598999c28015a504605f88bf84b33"
+  "hash": "7e6e8cd0b5217616d847c0b7a62723b395d9b28ca025e6b0b1b7dc9ef93c6b81"
 }
diff --git a/core/lib/dal/.sqlx/query-89d58c9735adbd9f40791d61bd63a0a2691a4b3238fce9dbc3a7d2861a4ca967.json b/core/lib/dal/.sqlx/query-89d58c9735adbd9f40791d61bd63a0a2691a4b3238fce9dbc3a7d2861a4ca967.json
new file mode 100644
index 000000000000..b65b57e4e01e
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-89d58c9735adbd9f40791d61bd63a0a2691a4b3238fce9dbc3a7d2861a4ca967.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                address AS \"address!\",\n                key AS \"key!\",\n                value\n            FROM\n                storage_logs\n            WHERE\n                miniblock_number BETWEEN (\n                    SELECT\n                        MIN(number)\n                    FROM\n                        miniblocks\n                    WHERE\n                        l1_batch_number = $1\n                ) AND (\n                    SELECT\n                        MAX(number)\n                    FROM\n                        miniblocks\n                    WHERE\n                        l1_batch_number = $1\n                )\n            ORDER BY\n                miniblock_number,\n                operation_number\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "address!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 1,
+        "name": "key!",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 2,
+        "name": "value",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true,
+      true,
+      false
+    ]
+  },
+  "hash": "89d58c9735adbd9f40791d61bd63a0a2691a4b3238fce9dbc3a7d2861a4ca967"
+}
diff --git a/core/lib/dal/.sqlx/query-8cc3cf441b12a8b6a2f25f4fe5581e33845ec68e386ef032715ad1222e2fdc8b.json b/core/lib/dal/.sqlx/query-8cc3cf441b12a8b6a2f25f4fe5581e33845ec68e386ef032715ad1222e2fdc8b.json
new file mode 100644
index 000000000000..a048969f0123
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-8cc3cf441b12a8b6a2f25f4fe5581e33845ec68e386ef032715ad1222e2fdc8b.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                    DELETE FROM transactions\n                    WHERE\n                        initiator_address = $1\n                        AND nonce = $2\n                    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "8cc3cf441b12a8b6a2f25f4fe5581e33845ec68e386ef032715ad1222e2fdc8b"
+}
diff --git a/core/lib/dal/.sqlx/query-928139bf23bd0d57b8dbdb3283b139300ad3b80ac9e70c00864c3d9f6521b028.json b/core/lib/dal/.sqlx/query-928139bf23bd0d57b8dbdb3283b139300ad3b80ac9e70c00864c3d9f6521b028.json
new file mode 100644
index 000000000000..e192763b189b
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-928139bf23bd0d57b8dbdb3283b139300ad3b80ac9e70c00864c3d9f6521b028.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                number,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND data_availability.blob_id IS NULL\n                AND pubdata_input IS NOT NULL\n            ORDER BY\n                number\n            LIMIT\n                $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "pubdata_input",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      true
+    ]
+  },
+  "hash": "928139bf23bd0d57b8dbdb3283b139300ad3b80ac9e70c00864c3d9f6521b028"
+}
diff --git a/core/lib/dal/.sqlx/query-9533a672ae82db344ae1070ae11b608d21dc70397b64ce500881a8b55953c59c.json b/core/lib/dal/.sqlx/query-9533a672ae82db344ae1070ae11b608d21dc70397b64ce500881a8b55953c59c.json
new file mode 100644
index 000000000000..994bfcfbb5a2
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-9533a672ae82db344ae1070ae11b608d21dc70397b64ce500881a8b55953c59c.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                tee_proof_generation_details (l1_batch_number, status, created_at, updated_at)\n            VALUES\n                ($1, 'ready_to_be_proven', NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9533a672ae82db344ae1070ae11b608d21dc70397b64ce500881a8b55953c59c"
+}
diff --git a/core/lib/dal/.sqlx/query-9955b9215096f781442153518c4f0a9676e26f422506545ccc90b7e8a36c8d47.json b/core/lib/dal/.sqlx/query-9955b9215096f781442153518c4f0a9676e26f422506545ccc90b7e8a36c8d47.json
deleted file mode 100644
index c05539164cee..000000000000
--- a/core/lib/dal/.sqlx/query-9955b9215096f781442153518c4f0a9676e26f422506545ccc90b7e8a36c8d47.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                factory_deps.bytecode,\n                transactions.data AS \"data?\",\n                transactions.contract_address AS \"contract_address?\"\n            FROM\n                (\n                    SELECT\n                        *\n                    FROM\n                        storage_logs\n                    WHERE\n                        storage_logs.hashed_key = $1\n                    ORDER BY\n                        miniblock_number DESC,\n                        operation_number DESC\n                    LIMIT\n                        1\n                ) storage_logs\n                JOIN factory_deps ON factory_deps.bytecode_hash = storage_logs.value\n                LEFT JOIN transactions ON transactions.hash = storage_logs.tx_hash\n            WHERE\n                storage_logs.value != $2\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "bytecode",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 1,
-        "name": "data?",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 2,
-        "name": "contract_address?",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Bytea"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "9955b9215096f781442153518c4f0a9676e26f422506545ccc90b7e8a36c8d47"
-}
diff --git a/core/lib/dal/.sqlx/query-99acb091650478fe0feb367b1d64561347b81f8931cc2addefa907c9aa9355e6.json b/core/lib/dal/.sqlx/query-99acb091650478fe0feb367b1d64561347b81f8931cc2addefa907c9aa9355e6.json
deleted file mode 100644
index 2699d19e9e42..000000000000
--- a/core/lib/dal/.sqlx/query-99acb091650478fe0feb367b1d64561347b81f8931cc2addefa907c9aa9355e6.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                *\n            FROM\n                protocol_versions\n            WHERE\n                id < $1\n            ORDER BY\n                id DESC\n            LIMIT\n                1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 1,
-        "name": "timestamp",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "recursion_scheduler_level_vk_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 3,
-        "name": "recursion_node_level_vk_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 4,
-        "name": "recursion_leaf_level_vk_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 5,
-        "name": "recursion_circuits_set_vks_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 6,
-        "name": "bootloader_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 7,
-        "name": "default_account_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 8,
-        "name": "verifier_address",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 9,
-        "name": "upgrade_tx_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 10,
-        "name": "created_at",
-        "type_info": "Timestamp"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false
-    ]
-  },
-  "hash": "99acb091650478fe0feb367b1d64561347b81f8931cc2addefa907c9aa9355e6"
-}
diff --git a/core/lib/dal/.sqlx/query-d6b70256793417a949081899eccf75260c7afaf110870656061a04079c35c2d8.json b/core/lib/dal/.sqlx/query-9f29aa31d4698031e9f3fe2eb273724dcce382936af0d4c386143399995cd325.json
similarity index 87%
rename from core/lib/dal/.sqlx/query-d6b70256793417a949081899eccf75260c7afaf110870656061a04079c35c2d8.json
rename to core/lib/dal/.sqlx/query-9f29aa31d4698031e9f3fe2eb273724dcce382936af0d4c386143399995cd325.json
index c116d2d7de6e..2e1bf7c3e61c 100644
--- a/core/lib/dal/.sqlx/query-d6b70256793417a949081899eccf75260c7afaf110870656061a04079c35c2d8.json
+++ b/core/lib/dal/.sqlx/query-9f29aa31d4698031e9f3fe2eb273724dcce382936af0d4c386143399995cd325.json
@@ -1,21 +1,21 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                storage_logs.key AS \"key!\",\n                storage_logs.value AS \"value!\",\n                storage_logs.address AS \"address!\",\n                storage_logs.miniblock_number AS \"miniblock_number!\",\n                initial_writes.l1_batch_number AS \"l1_batch_number!\",\n                initial_writes.index\n            FROM\n                (\n                    SELECT\n                        hashed_key,\n                        MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op\n                    FROM\n                        storage_logs\n                    WHERE\n                        miniblock_number <= $1\n                        AND hashed_key >= $3\n                        AND hashed_key <= $4\n                    GROUP BY\n                        hashed_key\n                    ORDER BY\n                        hashed_key\n                ) AS keys\n                INNER JOIN storage_logs ON keys.hashed_key = storage_logs.hashed_key\n                AND storage_logs.miniblock_number = keys.op[1]\n                AND storage_logs.operation_number = keys.op[2]\n                INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key\n            WHERE\n                initial_writes.l1_batch_number <= $2\n            ",
+  "query": "\n            SELECT\n                storage_logs.address AS \"address!\",\n                storage_logs.key AS \"key!\",\n                storage_logs.value AS \"value!\",\n                storage_logs.miniblock_number AS \"miniblock_number!\",\n                initial_writes.l1_batch_number AS \"l1_batch_number!\",\n                initial_writes.index\n            FROM\n                (\n                    SELECT\n                        hashed_key,\n                        MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op\n                    FROM\n                        storage_logs\n                    WHERE\n                        miniblock_number <= $1\n                        AND hashed_key >= $3\n                        AND hashed_key <= $4\n                    GROUP BY\n                        hashed_key\n                    ORDER BY\n                        hashed_key\n                ) AS keys\n                INNER JOIN storage_logs ON keys.hashed_key = storage_logs.hashed_key\n                AND storage_logs.miniblock_number = keys.op[1]\n                AND storage_logs.operation_number = keys.op[2]\n                INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key\n            WHERE\n                initial_writes.l1_batch_number <= $2\n            ",
   "describe": {
     "columns": [
       {
         "ordinal": 0,
-        "name": "key!",
+        "name": "address!",
         "type_info": "Bytea"
       },
       {
         "ordinal": 1,
-        "name": "value!",
+        "name": "key!",
         "type_info": "Bytea"
       },
       {
         "ordinal": 2,
-        "name": "address!",
+        "name": "value!",
         "type_info": "Bytea"
       },
       {
@@ -43,13 +43,13 @@
       ]
     },
     "nullable": [
-      false,
-      false,
+      true,
+      true,
       false,
       false,
       false,
       false
     ]
   },
-  "hash": "d6b70256793417a949081899eccf75260c7afaf110870656061a04079c35c2d8"
+  "hash": "9f29aa31d4698031e9f3fe2eb273724dcce382936af0d4c386143399995cd325"
 }
diff --git a/core/lib/dal/.sqlx/query-9f2c06e6b14434ac4f3b556dc97994cc05ebeb4e5aeeaee50b7c4d8baf58ca44.json b/core/lib/dal/.sqlx/query-9f2c06e6b14434ac4f3b556dc97994cc05ebeb4e5aeeaee50b7c4d8baf58ca44.json
new file mode 100644
index 000000000000..54f0d27bab26
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-9f2c06e6b14434ac4f3b556dc97994cc05ebeb4e5aeeaee50b7c4d8baf58ca44.json
@@ -0,0 +1,33 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                l1_batches (\n                    number,\n                    l1_tx_count,\n                    l2_tx_count,\n                    timestamp,\n                    l2_to_l1_messages,\n                    bloom,\n                    priority_ops_onchain_data,\n                    predicted_commit_gas_cost,\n                    predicted_prove_gas_cost,\n                    predicted_execute_gas_cost,\n                    initial_bootloader_heap_content,\n                    used_contract_hashes,\n                    bootloader_code_hash,\n                    default_aa_code_hash,\n                    protocol_version,\n                    system_logs,\n                    storage_refunds,\n                    pubdata_costs,\n                    pubdata_input,\n                    predicted_circuits_by_type,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                (\n                    $1,\n                    $2,\n                    $3,\n                    $4,\n                    $5,\n                    $6,\n                    $7,\n                    $8,\n                    $9,\n                    $10,\n                    $11,\n                    $12,\n                    $13,\n                    $14,\n                    $15,\n                    $16,\n                    $17,\n                    $18,\n                    $19,\n                    $20,\n                    NOW(),\n                    NOW()\n                )\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int4",
+        "Int4",
+        "Int8",
+        "ByteaArray",
+        "Bytea",
+        "ByteaArray",
+        "Int8",
+        "Int8",
+        "Int8",
+        "Jsonb",
+        "Jsonb",
+        "Bytea",
+        "Bytea",
+        "Int4",
+        "ByteaArray",
+        "Int8Array",
+        "Int8Array",
+        "Bytea",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "9f2c06e6b14434ac4f3b556dc97994cc05ebeb4e5aeeaee50b7c4d8baf58ca44"
+}
diff --git a/core/lib/dal/.sqlx/query-a8d55f14de2f489fdc12c8da540e0d51f86d30d5ad92496e4aa087a3c4aae09f.json b/core/lib/dal/.sqlx/query-a8d55f14de2f489fdc12c8da540e0d51f86d30d5ad92496e4aa087a3c4aae09f.json
new file mode 100644
index 000000000000..b00999f21448
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-a8d55f14de2f489fdc12c8da540e0d51f86d30d5ad92496e4aa087a3c4aae09f.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                transactions (\n                    hash,\n                    is_priority,\n                    initiator_address,\n                    gas_limit,\n                    max_fee_per_gas,\n                    gas_per_pubdata_limit,\n                    data,\n                    priority_op_id,\n                    full_fee,\n                    layer_2_tip_fee,\n                    contract_address,\n                    l1_block_number,\n                    value,\n                    paymaster,\n                    paymaster_input,\n                    tx_format,\n                    l1_tx_mint,\n                    l1_tx_refund_recipient,\n                    miniblock_number,\n                    index_in_block,\n                    error,\n                    execution_info,\n                    refunded_gas,\n                    effective_gas_price,\n                    received_at,\n                    created_at,\n                    updated_at\n                )\n            SELECT\n                data_table.hash,\n                TRUE,\n                data_table.initiator_address,\n                data_table.gas_limit,\n                data_table.max_fee_per_gas,\n                data_table.gas_per_pubdata_limit,\n                data_table.data,\n                data_table.priority_op_id,\n                data_table.full_fee,\n                data_table.layer_2_tip_fee,\n                data_table.contract_address,\n                data_table.l1_block_number,\n                data_table.value,\n                '\\x0000000000000000000000000000000000000000'::bytea,\n                '\\x'::bytea,\n                data_table.tx_format,\n                data_table.l1_tx_mint,\n                data_table.l1_tx_refund_recipient,\n                $21,\n                data_table.index_in_block,\n                NULLIF(data_table.error, ''),\n                data_table.execution_info,\n                data_table.refunded_gas,\n                data_table.effective_gas_price,\n                NOW(),\n                NOW(),\n                NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::BYTEA[]) AS hash,\n                        UNNEST($2::BYTEA[]) AS initiator_address,\n                        UNNEST($3::NUMERIC[]) AS gas_limit,\n                        UNNEST($4::NUMERIC[]) AS max_fee_per_gas,\n                        UNNEST($5::NUMERIC[]) AS gas_per_pubdata_limit,\n                        UNNEST($6::JSONB[]) AS data,\n                        UNNEST($7::BIGINT[]) AS priority_op_id,\n                        UNNEST($8::NUMERIC[]) AS full_fee,\n                        UNNEST($9::NUMERIC[]) AS layer_2_tip_fee,\n                        UNNEST($10::BYTEA[]) AS contract_address,\n                        UNNEST($11::INT[]) AS l1_block_number,\n                        UNNEST($12::NUMERIC[]) AS value,\n                        UNNEST($13::INTEGER[]) AS tx_format,\n                        UNNEST($14::NUMERIC[]) AS l1_tx_mint,\n                        UNNEST($15::BYTEA[]) AS l1_tx_refund_recipient,\n                        UNNEST($16::INT[]) AS index_in_block,\n                        UNNEST($17::VARCHAR[]) AS error,\n                        UNNEST($18::JSONB[]) AS execution_info,\n                        UNNEST($19::BIGINT[]) AS refunded_gas,\n                        UNNEST($20::NUMERIC[]) AS effective_gas_price\n                ) AS data_table\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "ByteaArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "JsonbArray",
+        "Int8Array",
+        "NumericArray",
+        "NumericArray",
+        "ByteaArray",
+        "Int4Array",
+        "NumericArray",
+        "Int4Array",
+        "NumericArray",
+        "ByteaArray",
+        "Int4Array",
+        "VarcharArray",
+        "JsonbArray",
+        "Int8Array",
+        "NumericArray",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a8d55f14de2f489fdc12c8da540e0d51f86d30d5ad92496e4aa087a3c4aae09f"
+}
diff --git a/core/lib/dal/.sqlx/query-23be43bf705d679ca751c89353716065fcad42c6b621efb3a135a16b477dcfd9.json b/core/lib/dal/.sqlx/query-aa92b31d0e0a2b353b66c501bf73b36b935046a9132f045ab105eaeac30c4a4d.json
similarity index 75%
rename from core/lib/dal/.sqlx/query-23be43bf705d679ca751c89353716065fcad42c6b621efb3a135a16b477dcfd9.json
rename to core/lib/dal/.sqlx/query-aa92b31d0e0a2b353b66c501bf73b36b935046a9132f045ab105eaeac30c4a4d.json
index c0e8bb9d2553..b80a10462c07 100644
--- a/core/lib/dal/.sqlx/query-23be43bf705d679ca751c89353716065fcad42c6b621efb3a135a16b477dcfd9.json
+++ b/core/lib/dal/.sqlx/query-aa92b31d0e0a2b353b66c501bf73b36b935046a9132f045ab105eaeac30c4a4d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                *\n            FROM\n                eth_txs\n            WHERE\n                confirmed_eth_tx_history_id IS NULL\n                AND id <= (\n                    SELECT\n                        COALESCE(MAX(eth_tx_id), 0)\n                    FROM\n                        eth_txs_history\n                    WHERE\n                        sent_at_block IS NOT NULL\n                )\n            ORDER BY\n                id\n            ",
+  "query": "\n            SELECT\n                *\n            FROM\n                eth_txs\n            WHERE\n                from_addr IS NOT DISTINCT FROM $1 -- can't just use equality as NULL != NULL\n                AND confirmed_eth_tx_history_id IS NULL\n                AND id <= (\n                    SELECT\n                        COALESCE(MAX(eth_tx_id), 0)\n                    FROM\n                        eth_txs_history\n                    WHERE\n                        sent_at_block IS NOT NULL\n                )\n            ORDER BY\n                id\n            ",
   "describe": {
     "columns": [
       {
@@ -75,7 +75,9 @@
       }
     ],
     "parameters": {
-      "Left": []
+      "Left": [
+        "Bytea"
+      ]
     },
     "nullable": [
       false,
@@ -94,5 +96,5 @@
       true
     ]
   },
-  "hash": "23be43bf705d679ca751c89353716065fcad42c6b621efb3a135a16b477dcfd9"
+  "hash": "aa92b31d0e0a2b353b66c501bf73b36b935046a9132f045ab105eaeac30c4a4d"
 }
diff --git a/core/lib/dal/.sqlx/query-ac505ae6cfc744b07b52997db789bdc9efc6b89fc0444caf8271edd7dfe4a3bc.json b/core/lib/dal/.sqlx/query-ac505ae6cfc744b07b52997db789bdc9efc6b89fc0444caf8271edd7dfe4a3bc.json
deleted file mode 100644
index 2dad4563cc70..000000000000
--- a/core/lib/dal/.sqlx/query-ac505ae6cfc744b07b52997db789bdc9efc6b89fc0444caf8271edd7dfe4a3bc.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                id\n            FROM\n                protocol_versions\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "ac505ae6cfc744b07b52997db789bdc9efc6b89fc0444caf8271edd7dfe4a3bc"
-}
diff --git a/core/lib/dal/.sqlx/query-ae8050de1fc30824e15346f9ac426783113663c125882bc185190a5d733363bb.json b/core/lib/dal/.sqlx/query-ae8050de1fc30824e15346f9ac426783113663c125882bc185190a5d733363bb.json
new file mode 100644
index 000000000000..23e695483dbe
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-ae8050de1fc30824e15346f9ac426783113663c125882bc185190a5d733363bb.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                bytecode\n            FROM\n                factory_deps\n            WHERE\n                bytecode_hash = $1\n                AND miniblock_number <= COALESCE(\n                    (\n                        SELECT\n                            MAX(number)\n                        FROM\n                            miniblocks\n                    ),\n                    (\n                        SELECT\n                            miniblock_number\n                        FROM\n                            snapshot_recovery\n                    )\n                )\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "bytecode",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bytea"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "ae8050de1fc30824e15346f9ac426783113663c125882bc185190a5d733363bb"
+}
diff --git a/core/lib/dal/.sqlx/query-b49478150dbc8731c531ef3eddc0c2cfff08e6fef3c3824d20dfdf2d0f73e671.json b/core/lib/dal/.sqlx/query-b49478150dbc8731c531ef3eddc0c2cfff08e6fef3c3824d20dfdf2d0f73e671.json
deleted file mode 100644
index 59a4d95f1f22..000000000000
--- a/core/lib/dal/.sqlx/query-b49478150dbc8731c531ef3eddc0c2cfff08e6fef3c3824d20dfdf2d0f73e671.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                hash,\n                number,\n                timestamp\n            FROM\n                miniblocks\n            WHERE\n                number > $1\n            ORDER BY\n                number ASC\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 1,
-        "name": "number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 2,
-        "name": "timestamp",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "b49478150dbc8731c531ef3eddc0c2cfff08e6fef3c3824d20dfdf2d0f73e671"
-}
diff --git a/core/lib/dal/.sqlx/query-b66045a20fd41f44627e5f1360cdd70e04bd6e714c8b763efdfe0259a5dd4128.json b/core/lib/dal/.sqlx/query-b66045a20fd41f44627e5f1360cdd70e04bd6e714c8b763efdfe0259a5dd4128.json
deleted file mode 100644
index 93f485f255f8..000000000000
--- a/core/lib/dal/.sqlx/query-b66045a20fd41f44627e5f1360cdd70e04bd6e714c8b763efdfe0259a5dd4128.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            VACUUM l1_batches,\n            miniblocks,\n            storage_logs,\n            events,\n            call_traces,\n            l2_to_l1_logs,\n            transactions\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": []
-  },
-  "hash": "b66045a20fd41f44627e5f1360cdd70e04bd6e714c8b763efdfe0259a5dd4128"
-}
diff --git a/core/lib/dal/.sqlx/query-b7cd7c40282c2ca2287eef93ee79c69a9e494bf1f873291b4ae7bf68b7e3c549.json b/core/lib/dal/.sqlx/query-b7cd7c40282c2ca2287eef93ee79c69a9e494bf1f873291b4ae7bf68b7e3c549.json
new file mode 100644
index 000000000000..ed4744206a48
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-b7cd7c40282c2ca2287eef93ee79c69a9e494bf1f873291b4ae7bf68b7e3c549.json
@@ -0,0 +1,175 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                number,\n                l1_batches.timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                l1_batches.bootloader_code_hash,\n                l1_batches.default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n                JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version\n            WHERE\n                eth_commit_tx_id IS NULL\n                AND number != 0\n                AND protocol_versions.bootloader_code_hash = $1\n                AND protocol_versions.default_account_code_hash = $2\n                AND commitment IS NOT NULL\n                AND (\n                    protocol_versions.id = $3\n                    OR protocol_versions.upgrade_tx_hash IS NULL\n                )\n            ORDER BY\n                number\n            LIMIT\n                $4\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "l1_tx_count",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 3,
+        "name": "l2_tx_count",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 4,
+        "name": "bloom",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 5,
+        "name": "priority_ops_onchain_data",
+        "type_info": "ByteaArray"
+      },
+      {
+        "ordinal": 6,
+        "name": "hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 7,
+        "name": "commitment",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 8,
+        "name": "l2_to_l1_messages",
+        "type_info": "ByteaArray"
+      },
+      {
+        "ordinal": 9,
+        "name": "used_contract_hashes",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 10,
+        "name": "compressed_initial_writes",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 11,
+        "name": "compressed_repeated_writes",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 12,
+        "name": "l2_l1_merkle_root",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 13,
+        "name": "rollup_last_leaf_index",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 14,
+        "name": "zkporter_is_available",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 15,
+        "name": "bootloader_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 16,
+        "name": "default_aa_code_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 17,
+        "name": "aux_data_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 18,
+        "name": "pass_through_data_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 19,
+        "name": "meta_parameters_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 20,
+        "name": "protocol_version",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 21,
+        "name": "compressed_state_diffs",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 22,
+        "name": "system_logs",
+        "type_info": "ByteaArray"
+      },
+      {
+        "ordinal": 23,
+        "name": "events_queue_commitment",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 24,
+        "name": "bootloader_initial_content_commitment",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 25,
+        "name": "pubdata_input",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea",
+        "Int4",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "b7cd7c40282c2ca2287eef93ee79c69a9e494bf1f873291b4ae7bf68b7e3c549"
+}
diff --git a/core/lib/dal/.sqlx/query-4c9df15553b3add049d5756bfa96cd97cb00335b1ef8c613824ea7b55c076b16.json b/core/lib/dal/.sqlx/query-b98e3790de305017c8fa5fba4c0c783b3710ee47f88edce1b17c2b8fa21dadd3.json
similarity index 63%
rename from core/lib/dal/.sqlx/query-4c9df15553b3add049d5756bfa96cd97cb00335b1ef8c613824ea7b55c076b16.json
rename to core/lib/dal/.sqlx/query-b98e3790de305017c8fa5fba4c0c783b3710ee47f88edce1b17c2b8fa21dadd3.json
index 23b98142557e..81981683e895 100644
--- a/core/lib/dal/.sqlx/query-4c9df15553b3add049d5756bfa96cd97cb00335b1ef8c613824ea7b55c076b16.json
+++ b/core/lib/dal/.sqlx/query-b98e3790de305017c8fa5fba4c0c783b3710ee47f88edce1b17c2b8fa21dadd3.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                protocol_version\n            FROM\n                transactions\n                LEFT JOIN miniblocks ON transactions.miniblock_number = miniblocks.number\n            WHERE\n                transactions.hash = $1\n            ",
+  "query": "\n            SELECT\n                protocol_version\n            FROM\n                transactions\n                INNER JOIN miniblocks ON transactions.miniblock_number = miniblocks.number\n            WHERE\n                transactions.hash = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       true
     ]
   },
-  "hash": "4c9df15553b3add049d5756bfa96cd97cb00335b1ef8c613824ea7b55c076b16"
+  "hash": "b98e3790de305017c8fa5fba4c0c783b3710ee47f88edce1b17c2b8fa21dadd3"
 }
diff --git a/core/lib/dal/.sqlx/query-be092376ee3aec298f8b22229abf6552b86d46808fe219c55a5210af56cce2ee.json b/core/lib/dal/.sqlx/query-be092376ee3aec298f8b22229abf6552b86d46808fe219c55a5210af56cce2ee.json
new file mode 100644
index 000000000000..82c544631339
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-be092376ee3aec298f8b22229abf6552b86d46808fe219c55a5210af56cce2ee.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                hashed_key,\n                value\n            FROM\n                storage_logs\n            WHERE\n                miniblock_number BETWEEN (\n                    SELECT\n                        MIN(number)\n                    FROM\n                        miniblocks\n                    WHERE\n                        l1_batch_number = $1\n                ) AND (\n                    SELECT\n                        MAX(number)\n                    FROM\n                        miniblocks\n                    WHERE\n                        l1_batch_number = $1\n                )\n            ORDER BY\n                miniblock_number,\n                operation_number\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "hashed_key",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 1,
+        "name": "value",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "be092376ee3aec298f8b22229abf6552b86d46808fe219c55a5210af56cce2ee"
+}
diff --git a/core/lib/dal/.sqlx/query-bf481c2b498420f80765b837059cab02b0656d863dbfce4b5dad7bc72e52b05d.json b/core/lib/dal/.sqlx/query-bf481c2b498420f80765b837059cab02b0656d863dbfce4b5dad7bc72e52b05d.json
new file mode 100644
index 000000000000..c353a35ec5e1
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-bf481c2b498420f80765b837059cab02b0656d863dbfce4b5dad7bc72e52b05d.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                transactions (\n                    hash,\n                    is_priority,\n                    initiator_address,\n                    nonce,\n                    signature,\n                    gas_limit,\n                    max_fee_per_gas,\n                    max_priority_fee_per_gas,\n                    gas_per_pubdata_limit,\n                    input,\n                    data,\n                    tx_format,\n                    contract_address,\n                    value,\n                    paymaster,\n                    paymaster_input,\n                    execution_info,\n                    miniblock_number,\n                    index_in_block,\n                    error,\n                    effective_gas_price,\n                    refunded_gas,\n                    received_at,\n                    created_at,\n                    updated_at\n                )\n            SELECT\n                data_table.hash,\n                FALSE,\n                data_table.initiator_address,\n                data_table.nonce,\n                data_table.signature,\n                data_table.gas_limit,\n                data_table.max_fee_per_gas,\n                data_table.max_priority_fee_per_gas,\n                data_table.gas_per_pubdata_limit,\n                data_table.input,\n                data_table.data,\n                data_table.tx_format,\n                data_table.contract_address,\n                data_table.value,\n                data_table.paymaster,\n                data_table.paymaster_input,\n                data_table.new_execution_info,\n                $21,\n                data_table.index_in_block,\n                NULLIF(data_table.error, ''),\n                data_table.effective_gas_price,\n                data_table.refunded_gas,\n                NOW(),\n                NOW(),\n                NOW()\n            FROM\n                (\n                    SELECT\n                        UNNEST($1::bytea[]) AS hash,\n                        UNNEST($2::bytea[]) AS initiator_address,\n                        UNNEST($3::INT[]) AS nonce,\n                        UNNEST($4::bytea[]) AS signature,\n                        UNNEST($5::NUMERIC[]) AS gas_limit,\n                        UNNEST($6::NUMERIC[]) AS max_fee_per_gas,\n                        UNNEST($7::NUMERIC[]) AS max_priority_fee_per_gas,\n                        UNNEST($8::NUMERIC[]) AS gas_per_pubdata_limit,\n                        UNNEST($9::bytea[]) AS input,\n                        UNNEST($10::jsonb[]) AS data,\n                        UNNEST($11::INT[]) AS tx_format,\n                        UNNEST($12::bytea[]) AS contract_address,\n                        UNNEST($13::NUMERIC[]) AS value,\n                        UNNEST($14::bytea[]) AS paymaster,\n                        UNNEST($15::bytea[]) AS paymaster_input,\n                        UNNEST($16::jsonb[]) AS new_execution_info,\n                        UNNEST($17::INTEGER[]) AS index_in_block,\n                        UNNEST($18::VARCHAR[]) AS error,\n                        UNNEST($19::NUMERIC[]) AS effective_gas_price,\n                        UNNEST($20::BIGINT[]) AS refunded_gas\n                ) AS data_table\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "ByteaArray",
+        "ByteaArray",
+        "Int4Array",
+        "ByteaArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "NumericArray",
+        "ByteaArray",
+        "JsonbArray",
+        "Int4Array",
+        "ByteaArray",
+        "NumericArray",
+        "ByteaArray",
+        "ByteaArray",
+        "JsonbArray",
+        "Int4Array",
+        "VarcharArray",
+        "NumericArray",
+        "Int8Array",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "bf481c2b498420f80765b837059cab02b0656d863dbfce4b5dad7bc72e52b05d"
+}
diff --git a/core/lib/dal/.sqlx/query-2003dcf7bc807c7d345368538accd9b0128f82306e27e4c7258116082a54ab95.json b/core/lib/dal/.sqlx/query-bf6eac8dce87063b971724e85d20f288a7a8867c55e28467cddeea8d1b0397cf.json
similarity index 60%
rename from core/lib/dal/.sqlx/query-2003dcf7bc807c7d345368538accd9b0128f82306e27e4c7258116082a54ab95.json
rename to core/lib/dal/.sqlx/query-bf6eac8dce87063b971724e85d20f288a7a8867c55e28467cddeea8d1b0397cf.json
index 77177e405f12..6c42b6fa6d40 100644
--- a/core/lib/dal/.sqlx/query-2003dcf7bc807c7d345368538accd9b0128f82306e27e4c7258116082a54ab95.json
+++ b/core/lib/dal/.sqlx/query-bf6eac8dce87063b971724e85d20f288a7a8867c55e28467cddeea8d1b0397cf.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                transactions.hash,\n                transactions.received_at\n            FROM\n                transactions\n                LEFT JOIN miniblocks ON miniblocks.number = miniblock_number\n            WHERE\n                received_at > $1\n            ORDER BY\n                received_at ASC\n            LIMIT\n                $2\n            ",
+  "query": "\n            SELECT\n                transactions.hash,\n                transactions.received_at\n            FROM\n                transactions\n            WHERE\n                received_at > $1\n            ORDER BY\n                received_at ASC\n            LIMIT\n                $2\n            ",
   "describe": {
     "columns": [
       {
@@ -25,5 +25,5 @@
       false
     ]
   },
-  "hash": "2003dcf7bc807c7d345368538accd9b0128f82306e27e4c7258116082a54ab95"
+  "hash": "bf6eac8dce87063b971724e85d20f288a7a8867c55e28467cddeea8d1b0397cf"
 }
diff --git a/core/lib/dal/.sqlx/query-c195037dcf6031a90f407f652657956350786f3596c7302bdeb8d813f9fbf621.json b/core/lib/dal/.sqlx/query-c195037dcf6031a90f407f652657956350786f3596c7302bdeb8d813f9fbf621.json
deleted file mode 100644
index 0b8a91d7bc8b..000000000000
--- a/core/lib/dal/.sqlx/query-c195037dcf6031a90f407f652657956350786f3596c7302bdeb8d813f9fbf621.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                l1_tx_count,\n                l2_tx_count,\n                timestamp,\n                l2_to_l1_logs,\n                l2_to_l1_messages,\n                bloom,\n                priority_ops_onchain_data,\n                used_contract_hashes,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                protocol_version,\n                system_logs,\n                compressed_state_diffs,\n                pubdata_input\n            FROM\n                l1_batches\n            WHERE\n                eth_commit_tx_id = $1\n                OR eth_prove_tx_id = $1\n                OR eth_execute_tx_id = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "l1_tx_count",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 2,
-        "name": "l2_tx_count",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "timestamp",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 4,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 5,
-        "name": "l2_to_l1_messages",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 6,
-        "name": "bloom",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 7,
-        "name": "priority_ops_onchain_data",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 8,
-        "name": "used_contract_hashes",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 9,
-        "name": "bootloader_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 10,
-        "name": "default_aa_code_hash",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 11,
-        "name": "protocol_version",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 12,
-        "name": "system_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 13,
-        "name": "compressed_state_diffs",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 14,
-        "name": "pubdata_input",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      false,
-      true,
-      true
-    ]
-  },
-  "hash": "c195037dcf6031a90f407f652657956350786f3596c7302bdeb8d813f9fbf621"
-}
diff --git a/core/lib/dal/.sqlx/query-c36abacc705a2244d423599779e38d60d6e93bcb34fd20422e227714fccbf6b7.json b/core/lib/dal/.sqlx/query-c36abacc705a2244d423599779e38d60d6e93bcb34fd20422e227714fccbf6b7.json
deleted file mode 100644
index ea4b266d8259..000000000000
--- a/core/lib/dal/.sqlx/query-c36abacc705a2244d423599779e38d60d6e93bcb34fd20422e227714fccbf6b7.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                address,\n                key,\n                value\n            FROM\n                storage_logs\n            WHERE\n                miniblock_number BETWEEN (\n                    SELECT\n                        MIN(number)\n                    FROM\n                        miniblocks\n                    WHERE\n                        l1_batch_number = $1\n                ) AND (\n                    SELECT\n                        MAX(number)\n                    FROM\n                        miniblocks\n                    WHERE\n                        l1_batch_number = $1\n                )\n            ORDER BY\n                miniblock_number,\n                operation_number\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "address",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 1,
-        "name": "key",
-        "type_info": "Bytea"
-      },
-      {
-        "ordinal": 2,
-        "name": "value",
-        "type_info": "Bytea"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "c36abacc705a2244d423599779e38d60d6e93bcb34fd20422e227714fccbf6b7"
-}
diff --git a/core/lib/dal/.sqlx/query-c5aef75dbeb520c965a0996abed9713f437db492e2075ca69e11e2ef5728ccaa.json b/core/lib/dal/.sqlx/query-c5aef75dbeb520c965a0996abed9713f437db492e2075ca69e11e2ef5728ccaa.json
new file mode 100644
index 000000000000..6dd2f6cc7a9f
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-c5aef75dbeb520c965a0996abed9713f437db492e2075ca69e11e2ef5728ccaa.json
@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                base_token_ratios (numerator, denominator, ratio_timestamp, created_at, updated_at)\n            VALUES\n                ($1, $2, $3, NOW(), NOW())\n            RETURNING\n                id\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Numeric",
+        "Numeric",
+        "Timestamp"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "c5aef75dbeb520c965a0996abed9713f437db492e2075ca69e11e2ef5728ccaa"
+}
diff --git a/core/lib/dal/.sqlx/query-c809f42a221b18a767e9dd0286503d8bd356f2f9cc249cd8b90caa5a8b5918e3.json b/core/lib/dal/.sqlx/query-c809f42a221b18a767e9dd0286503d8bd356f2f9cc249cd8b90caa5a8b5918e3.json
deleted file mode 100644
index b85f4c542bf8..000000000000
--- a/core/lib/dal/.sqlx/query-c809f42a221b18a767e9dd0286503d8bd356f2f9cc249cd8b90caa5a8b5918e3.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                COUNT(*) AS \"count!\"\n            FROM\n                (\n                    SELECT\n                        *\n                    FROM\n                        storage_logs\n                    WHERE\n                        storage_logs.hashed_key = $1\n                    ORDER BY\n                        storage_logs.miniblock_number DESC,\n                        storage_logs.operation_number DESC\n                    LIMIT\n                        1\n                ) sl\n            WHERE\n                sl.value != $2\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "count!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Bytea"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "c809f42a221b18a767e9dd0286503d8bd356f2f9cc249cd8b90caa5a8b5918e3"
-}
diff --git a/core/lib/dal/.sqlx/query-dea22358feed1418430505767d03aa4239d3a8be71b47178b4b8fb11fe898b31.json b/core/lib/dal/.sqlx/query-c81438eae5e2482c57c54941780864174f39e6011fdfdc56490397ce90233055.json
similarity index 75%
rename from core/lib/dal/.sqlx/query-dea22358feed1418430505767d03aa4239d3a8be71b47178b4b8fb11fe898b31.json
rename to core/lib/dal/.sqlx/query-c81438eae5e2482c57c54941780864174f39e6011fdfdc56490397ce90233055.json
index ef070554c2fd..eb09077290e3 100644
--- a/core/lib/dal/.sqlx/query-dea22358feed1418430505767d03aa4239d3a8be71b47178b4b8fb11fe898b31.json
+++ b/core/lib/dal/.sqlx/query-c81438eae5e2482c57c54941780864174f39e6011fdfdc56490397ce90233055.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE l1_batches\n                    SET\n                        eth_execute_tx_id = $1,\n                        updated_at = NOW()\n                    WHERE\n                        number BETWEEN $2 AND $3\n                    ",
+  "query": "\n                    UPDATE l1_batches\n                    SET\n                        eth_execute_tx_id = $1,\n                        updated_at = NOW()\n                    WHERE\n                        number BETWEEN $2 AND $3\n                        AND eth_execute_tx_id IS NULL\n                    ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -12,5 +12,5 @@
     },
     "nullable": []
   },
-  "hash": "dea22358feed1418430505767d03aa4239d3a8be71b47178b4b8fb11fe898b31"
+  "hash": "c81438eae5e2482c57c54941780864174f39e6011fdfdc56490397ce90233055"
 }
diff --git a/core/lib/dal/.sqlx/query-61bc330d6d1b5fddec78342c1b0f00e82b0b3ad9ae36bf4fe44d7e85b74c6f49.json b/core/lib/dal/.sqlx/query-cf3a9acaeff6d30aff772db93bce1edd4dc242a6b32e61d779b7ec65f6e7b2b1.json
similarity index 56%
rename from core/lib/dal/.sqlx/query-61bc330d6d1b5fddec78342c1b0f00e82b0b3ad9ae36bf4fe44d7e85b74c6f49.json
rename to core/lib/dal/.sqlx/query-cf3a9acaeff6d30aff772db93bce1edd4dc242a6b32e61d779b7ec65f6e7b2b1.json
index 2c0454b0dd8b..624a1366471d 100644
--- a/core/lib/dal/.sqlx/query-61bc330d6d1b5fddec78342c1b0f00e82b0b3ad9ae36bf4fe44d7e85b74c6f49.json
+++ b/core/lib/dal/.sqlx/query-cf3a9acaeff6d30aff772db93bce1edd4dc242a6b32e61d779b7ec65f6e7b2b1.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    MAX(priority_op_id) AS \"op_id\"\n                FROM\n                    transactions\n                WHERE\n                    is_priority = TRUE\n                    AND miniblock_number IS NOT NULL\n                ",
+  "query": "\n                SELECT\n                    MAX(priority_op_id) AS \"op_id\"\n                FROM\n                    transactions\n                WHERE\n                    is_priority = TRUE\n                    AND transactions.miniblock_number <= (\n                        SELECT\n                            MAX(number)\n                        FROM\n                            miniblocks\n                    )\n                ",
   "describe": {
     "columns": [
       {
@@ -16,5 +16,5 @@
       null
     ]
   },
-  "hash": "61bc330d6d1b5fddec78342c1b0f00e82b0b3ad9ae36bf4fe44d7e85b74c6f49"
+  "hash": "cf3a9acaeff6d30aff772db93bce1edd4dc242a6b32e61d779b7ec65f6e7b2b1"
 }
diff --git a/core/lib/dal/.sqlx/query-cf3c7b918a3f82476543841d4dc5393ec02458104c483a2023b24881ae0c6716.json b/core/lib/dal/.sqlx/query-cf3c7b918a3f82476543841d4dc5393ec02458104c483a2023b24881ae0c6716.json
new file mode 100644
index 000000000000..59bfa4858c02
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-cf3c7b918a3f82476543841d4dc5393ec02458104c483a2023b24881ae0c6716.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                COUNT(*) AS \"count!\"\n            FROM\n                (\n                    SELECT\n                        *\n                    FROM\n                        storage_logs\n                    WHERE\n                        hashed_key = $1\n                        AND miniblock_number <= COALESCE(\n                            (\n                                SELECT\n                                    MAX(number)\n                                FROM\n                                    miniblocks\n                            ),\n                            (\n                                SELECT\n                                    miniblock_number\n                                FROM\n                                    snapshot_recovery\n                            )\n                        )\n                    ORDER BY\n                        miniblock_number DESC,\n                        operation_number DESC\n                    LIMIT\n                        1\n                ) sl\n            WHERE\n                sl.value != $2\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "cf3c7b918a3f82476543841d4dc5393ec02458104c483a2023b24881ae0c6716"
+}
diff --git a/core/lib/dal/.sqlx/query-3b013b93ea4a6766162c9f0c60517a7ffc993cf436ad3aeeae82ed3e330b07bd.json b/core/lib/dal/.sqlx/query-d3d472436f1f3a6cc61bc9d47de5731b755cf2e09d877dd4eb70d58a1d11a977.json
similarity index 58%
rename from core/lib/dal/.sqlx/query-3b013b93ea4a6766162c9f0c60517a7ffc993cf436ad3aeeae82ed3e330b07bd.json
rename to core/lib/dal/.sqlx/query-d3d472436f1f3a6cc61bc9d47de5731b755cf2e09d877dd4eb70d58a1d11a977.json
index 6e7bffec4854..61497cdb1694 100644
--- a/core/lib/dal/.sqlx/query-3b013b93ea4a6766162c9f0c60517a7ffc993cf436ad3aeeae82ed3e330b07bd.json
+++ b/core/lib/dal/.sqlx/query-d3d472436f1f3a6cc61bc9d47de5731b755cf2e09d877dd4eb70d58a1d11a977.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                certificate\n            FROM\n                miniblocks_consensus\n            ORDER BY\n                number ASC\n            LIMIT\n                1\n            ",
+  "query": "\n            SELECT\n                certificate\n            FROM\n                miniblocks_consensus\n            WHERE\n                number >= $1\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
   "describe": {
     "columns": [
       {
@@ -10,11 +10,13 @@
       }
     ],
     "parameters": {
-      "Left": []
+      "Left": [
+        "Int8"
+      ]
     },
     "nullable": [
       false
     ]
   },
-  "hash": "3b013b93ea4a6766162c9f0c60517a7ffc993cf436ad3aeeae82ed3e330b07bd"
+  "hash": "d3d472436f1f3a6cc61bc9d47de5731b755cf2e09d877dd4eb70d58a1d11a977"
 }
diff --git a/core/lib/dal/.sqlx/query-d43d5c96ae92f52b12b320d5c6c43335d23bec1370e520186739d7075e9e3338.json b/core/lib/dal/.sqlx/query-d43d5c96ae92f52b12b320d5c6c43335d23bec1370e520186739d7075e9e3338.json
new file mode 100644
index 000000000000..93934a3a0bed
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-d43d5c96ae92f52b12b320d5c6c43335d23bec1370e520186739d7075e9e3338.json
@@ -0,0 +1,108 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n                events AS (\n                    SELECT DISTINCT\n                        ON (events.tx_hash) *\n                    FROM\n                        events\n                    WHERE\n                        events.address = $1\n                        AND events.topic1 = $2\n                        AND events.tx_hash = ANY ($3)\n                    ORDER BY\n                        events.tx_hash,\n                        events.event_index_in_tx DESC\n                )\n            SELECT\n                transactions.hash AS tx_hash,\n                transactions.index_in_block AS index_in_block,\n                transactions.l1_batch_tx_index AS l1_batch_tx_index,\n                transactions.miniblock_number AS \"block_number!\",\n                transactions.error AS error,\n                transactions.effective_gas_price AS effective_gas_price,\n                transactions.initiator_address AS initiator_address,\n                transactions.data -> 'to' AS \"transfer_to?\",\n                transactions.data -> 'contractAddress' AS \"execute_contract_address?\",\n                transactions.tx_format AS \"tx_format?\",\n                transactions.refunded_gas AS refunded_gas,\n                transactions.gas_limit AS gas_limit,\n                miniblocks.hash AS \"block_hash\",\n                miniblocks.l1_batch_number AS \"l1_batch_number?\",\n                events.topic4 AS \"contract_address?\"\n            FROM\n                transactions\n                JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                LEFT JOIN events ON events.tx_hash = transactions.hash\n            WHERE\n                transactions.hash = ANY ($3)\n                AND transactions.data != '{}'::jsonb\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "tx_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 1,
+        "name": "index_in_block",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 2,
+        "name": "l1_batch_tx_index",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 3,
+        "name": "block_number!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 4,
+        "name": "error",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 5,
+        "name": "effective_gas_price",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 6,
+        "name": "initiator_address",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 7,
+        "name": "transfer_to?",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 8,
+        "name": "execute_contract_address?",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 9,
+        "name": "tx_format?",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 10,
+        "name": "refunded_gas",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 11,
+        "name": "gas_limit",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 12,
+        "name": "block_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 13,
+        "name": "l1_batch_number?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 14,
+        "name": "contract_address?",
+        "type_info": "Bytea"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bytea",
+        "Bytea",
+        "ByteaArray"
+      ]
+    },
+    "nullable": [
+      false,
+      true,
+      true,
+      true,
+      true,
+      true,
+      false,
+      null,
+      null,
+      true,
+      false,
+      true,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "d43d5c96ae92f52b12b320d5c6c43335d23bec1370e520186739d7075e9e3338"
+}
diff --git a/core/lib/dal/.sqlx/query-d45de6e0add0a94d7f6df10bca0248fdf74448b6a8906d55b68b48320f2b04ba.json b/core/lib/dal/.sqlx/query-d45de6e0add0a94d7f6df10bca0248fdf74448b6a8906d55b68b48320f2b04ba.json
new file mode 100644
index 000000000000..926df40cf9da
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-d45de6e0add0a94d7f6df10bca0248fdf74448b6a8906d55b68b48320f2b04ba.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                minor,\n                patch\n            FROM\n                protocol_patches\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "minor",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "patch",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "d45de6e0add0a94d7f6df10bca0248fdf74448b6a8906d55b68b48320f2b04ba"
+}
diff --git a/core/lib/dal/.sqlx/query-daa330d43f150824f2195cdbfb96862d6ad0de7c7ca1d5320800f317428f07e1.json b/core/lib/dal/.sqlx/query-daa330d43f150824f2195cdbfb96862d6ad0de7c7ca1d5320800f317428f07e1.json
new file mode 100644
index 000000000000..836bbc435f00
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-daa330d43f150824f2195cdbfb96862d6ad0de7c7ca1d5320800f317428f07e1.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            DELETE FROM vm_runner_protective_reads\n            WHERE\n                l1_batch_number > $1\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "daa330d43f150824f2195cdbfb96862d6ad0de7c7ca1d5320800f317428f07e1"
+}
diff --git a/core/lib/dal/.sqlx/query-966dddc881bfe6fd94b56f587424125a2633ddb6abaa129f2b12389140d83c3f.json b/core/lib/dal/.sqlx/query-daed1021023a37f01ba5a1207b1745d6bb2b76dbd3b366a177ddfc705500fa31.json
similarity index 81%
rename from core/lib/dal/.sqlx/query-966dddc881bfe6fd94b56f587424125a2633ddb6abaa129f2b12389140d83c3f.json
rename to core/lib/dal/.sqlx/query-daed1021023a37f01ba5a1207b1745d6bb2b76dbd3b366a177ddfc705500fa31.json
index bf4eb3f9462d..00152a612cd9 100644
--- a/core/lib/dal/.sqlx/query-966dddc881bfe6fd94b56f587424125a2633ddb6abaa129f2b12389140d83c3f.json
+++ b/core/lib/dal/.sqlx/query-daed1021023a37f01ba5a1207b1745d6bb2b76dbd3b366a177ddfc705500fa31.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                recursion_scheduler_level_vk_hash,\n                recursion_node_level_vk_hash,\n                recursion_leaf_level_vk_hash,\n                recursion_circuits_set_vks_hash\n            FROM\n                protocol_versions\n            WHERE\n                id = $1\n            ",
+  "query": "\n            SELECT\n                recursion_scheduler_level_vk_hash,\n                recursion_node_level_vk_hash,\n                recursion_leaf_level_vk_hash,\n                recursion_circuits_set_vks_hash\n            FROM\n                protocol_patches\n            WHERE\n                minor = $1\n                AND patch = $2\n            ",
   "describe": {
     "columns": [
       {
@@ -26,6 +26,7 @@
     ],
     "parameters": {
       "Left": [
+        "Int4",
         "Int4"
       ]
     },
@@ -36,5 +37,5 @@
       false
     ]
   },
-  "hash": "966dddc881bfe6fd94b56f587424125a2633ddb6abaa129f2b12389140d83c3f"
+  "hash": "daed1021023a37f01ba5a1207b1745d6bb2b76dbd3b366a177ddfc705500fa31"
 }
diff --git a/core/lib/dal/.sqlx/query-4b8c99469e2ed69d0d6859ef1fa609cb7fcee648e35b6d66b44944b2a9a82cef.json b/core/lib/dal/.sqlx/query-de255be5d2e5ef215428e9a886e7c9dc036873c60b8b916ce8c446e310447b66.json
similarity index 66%
rename from core/lib/dal/.sqlx/query-4b8c99469e2ed69d0d6859ef1fa609cb7fcee648e35b6d66b44944b2a9a82cef.json
rename to core/lib/dal/.sqlx/query-de255be5d2e5ef215428e9a886e7c9dc036873c60b8b916ce8c446e310447b66.json
index 3c4cda193626..8a492376557b 100644
--- a/core/lib/dal/.sqlx/query-4b8c99469e2ed69d0d6859ef1fa609cb7fcee648e35b6d66b44944b2a9a82cef.json
+++ b/core/lib/dal/.sqlx/query-de255be5d2e5ef215428e9a886e7c9dc036873c60b8b916ce8c446e310447b66.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                eth_prove_tx_id,\n                eth_commit_tx_id,\n                eth_execute_tx_id,\n                l2_to_l1_logs,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            WHERE\n                number = 0\n                OR eth_commit_tx_id IS NOT NULL\n                AND commitment IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
+  "query": "\n            SELECT\n                number,\n                timestamp,\n                l1_tx_count,\n                l2_tx_count,\n                bloom,\n                priority_ops_onchain_data,\n                hash,\n                commitment,\n                l2_to_l1_messages,\n                used_contract_hashes,\n                compressed_initial_writes,\n                compressed_repeated_writes,\n                l2_l1_merkle_root,\n                rollup_last_leaf_index,\n                zkporter_is_available,\n                bootloader_code_hash,\n                default_aa_code_hash,\n                aux_data_hash,\n                pass_through_data_hash,\n                meta_parameters_hash,\n                protocol_version,\n                compressed_state_diffs,\n                system_logs,\n                events_queue_commitment,\n                bootloader_initial_content_commitment,\n                pubdata_input\n            FROM\n                l1_batches\n                LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number\n            WHERE\n                number = 0\n                OR eth_commit_tx_id IS NOT NULL\n                AND commitment IS NOT NULL\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
   "describe": {
     "columns": [
       {
@@ -45,111 +45,91 @@
       },
       {
         "ordinal": 8,
-        "name": "eth_prove_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "eth_commit_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "eth_execute_tx_id",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 11,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      },
-      {
-        "ordinal": 12,
         "name": "l2_to_l1_messages",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 13,
+        "ordinal": 9,
         "name": "used_contract_hashes",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 14,
+        "ordinal": 10,
         "name": "compressed_initial_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 15,
+        "ordinal": 11,
         "name": "compressed_repeated_writes",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 16,
+        "ordinal": 12,
         "name": "l2_l1_merkle_root",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 17,
+        "ordinal": 13,
         "name": "rollup_last_leaf_index",
         "type_info": "Int8"
       },
       {
-        "ordinal": 18,
+        "ordinal": 14,
         "name": "zkporter_is_available",
         "type_info": "Bool"
       },
       {
-        "ordinal": 19,
+        "ordinal": 15,
         "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 20,
+        "ordinal": 16,
         "name": "default_aa_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 21,
+        "ordinal": 17,
         "name": "aux_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 22,
+        "ordinal": 18,
         "name": "pass_through_data_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 23,
+        "ordinal": 19,
         "name": "meta_parameters_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 24,
+        "ordinal": 20,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 25,
+        "ordinal": 21,
         "name": "compressed_state_diffs",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 26,
+        "ordinal": 22,
         "name": "system_logs",
         "type_info": "ByteaArray"
       },
       {
-        "ordinal": 27,
+        "ordinal": 23,
         "name": "events_queue_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 28,
+        "ordinal": 24,
         "name": "bootloader_initial_content_commitment",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 29,
+        "ordinal": 25,
         "name": "pubdata_input",
         "type_info": "Bytea"
       }
@@ -166,10 +146,6 @@
       false,
       true,
       true,
-      true,
-      true,
-      true,
-      false,
       false,
       false,
       true,
@@ -190,5 +166,5 @@
       true
     ]
   },
-  "hash": "4b8c99469e2ed69d0d6859ef1fa609cb7fcee648e35b6d66b44944b2a9a82cef"
+  "hash": "de255be5d2e5ef215428e9a886e7c9dc036873c60b8b916ce8c446e310447b66"
 }
diff --git a/core/lib/dal/.sqlx/query-df3256c012f86a9cd3b9260b97be5c6feb8059722149a747c4b6bd46731e2536.json b/core/lib/dal/.sqlx/query-df3256c012f86a9cd3b9260b97be5c6feb8059722149a747c4b6bd46731e2536.json
deleted file mode 100644
index 552b6ab2cc8e..000000000000
--- a/core/lib/dal/.sqlx/query-df3256c012f86a9cd3b9260b97be5c6feb8059722149a747c4b6bd46731e2536.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    COUNT(*) AS \"count!\"\n                FROM\n                    l1_batches\n                WHERE\n                    number = $1\n                    AND hash = $2\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "count!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Bytea"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "df3256c012f86a9cd3b9260b97be5c6feb8059722149a747c4b6bd46731e2536"
-}
diff --git a/core/lib/dal/.sqlx/query-e28e052dbd306ba408dd26e01c38176f2f9dbba45761a2117c185912d1e07bdf.json b/core/lib/dal/.sqlx/query-e28e052dbd306ba408dd26e01c38176f2f9dbba45761a2117c185912d1e07bdf.json
new file mode 100644
index 000000000000..580a5370c89d
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-e28e052dbd306ba408dd26e01c38176f2f9dbba45761a2117c185912d1e07bdf.json
@@ -0,0 +1,64 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                miniblocks.hash AS \"block_hash\",\n                miniblocks.number AS \"block_number\",\n                prev_miniblock.hash AS \"parent_hash?\",\n                miniblocks.timestamp AS \"block_timestamp\",\n                miniblocks.base_fee_per_gas AS \"base_fee_per_gas\",\n                miniblocks.gas_limit AS \"block_gas_limit?\",\n                transactions.gas_limit AS \"transaction_gas_limit?\",\n                transactions.refunded_gas AS \"transaction_refunded_gas?\"\n            FROM\n                miniblocks\n                LEFT JOIN miniblocks prev_miniblock ON prev_miniblock.number = miniblocks.number - 1\n                LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number\n            WHERE\n                miniblocks.number > $1\n            ORDER BY\n                miniblocks.number ASC,\n                transactions.index_in_block ASC\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "block_hash",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 1,
+        "name": "block_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 2,
+        "name": "parent_hash?",
+        "type_info": "Bytea"
+      },
+      {
+        "ordinal": 3,
+        "name": "block_timestamp",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 4,
+        "name": "base_fee_per_gas",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 5,
+        "name": "block_gas_limit?",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 6,
+        "name": "transaction_gas_limit?",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 7,
+        "name": "transaction_refunded_gas?",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false
+    ]
+  },
+  "hash": "e28e052dbd306ba408dd26e01c38176f2f9dbba45761a2117c185912d1e07bdf"
+}
diff --git a/core/lib/dal/.sqlx/query-e2ff392b3aa7a22fc39d150d08b148b0f1c7e512dd43434062341eb263fe434f.json b/core/lib/dal/.sqlx/query-e2ff392b3aa7a22fc39d150d08b148b0f1c7e512dd43434062341eb263fe434f.json
new file mode 100644
index 000000000000..4236e72fccad
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-e2ff392b3aa7a22fc39d150d08b148b0f1c7e512dd43434062341eb263fe434f.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE tee_proof_generation_details\n            SET\n                status = 'picked_by_prover',\n                updated_at = NOW(),\n                prover_taken_at = NOW()\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        proofs.l1_batch_number\n                    FROM\n                        tee_proof_generation_details AS proofs\n                        JOIN tee_verifier_input_producer_jobs AS inputs ON proofs.l1_batch_number = inputs.l1_batch_number\n                    WHERE\n                        inputs.status = 'Successful'\n                        AND (\n                            proofs.status = 'ready_to_be_proven'\n                            OR (\n                                proofs.status = 'picked_by_prover'\n                                AND proofs.prover_taken_at < NOW() - $1::INTERVAL\n                            )\n                        )\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                tee_proof_generation_details.l1_batch_number\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Interval"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "e2ff392b3aa7a22fc39d150d08b148b0f1c7e512dd43434062341eb263fe434f"
+}
diff --git a/core/lib/dal/.sqlx/query-ead71ae66fe4685132c03a973612fe98364aa684180dd6fbf540bb0b68d96a64.json b/core/lib/dal/.sqlx/query-ead71ae66fe4685132c03a973612fe98364aa684180dd6fbf540bb0b68d96a64.json
new file mode 100644
index 000000000000..02cd6733e811
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-ead71ae66fe4685132c03a973612fe98364aa684180dd6fbf540bb0b68d96a64.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH\n                new_logs AS MATERIALIZED (\n                    SELECT DISTINCT\n                        ON (hashed_key) hashed_key,\n                        miniblock_number,\n                        operation_number\n                    FROM\n                        storage_logs\n                    WHERE\n                        miniblock_number BETWEEN $1 AND $2\n                    ORDER BY\n                        hashed_key,\n                        miniblock_number DESC,\n                        operation_number DESC\n                )\n            DELETE FROM storage_logs USING new_logs\n            WHERE\n                storage_logs.hashed_key = new_logs.hashed_key\n                AND storage_logs.miniblock_number <= $2\n                AND (storage_logs.miniblock_number, storage_logs.operation_number) < (new_logs.miniblock_number, new_logs.operation_number)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "ead71ae66fe4685132c03a973612fe98364aa684180dd6fbf540bb0b68d96a64"
+}
diff --git a/core/lib/dal/.sqlx/query-6874b501c82e6062ab22622095070d67840b2484ea3a03ac49eb3d50ea153163.json b/core/lib/dal/.sqlx/query-ef70506e90e8add3b95940a7333f8222bd9fbe8ce82d8963f7da03fe6fcf9225.json
similarity index 72%
rename from core/lib/dal/.sqlx/query-6874b501c82e6062ab22622095070d67840b2484ea3a03ac49eb3d50ea153163.json
rename to core/lib/dal/.sqlx/query-ef70506e90e8add3b95940a7333f8222bd9fbe8ce82d8963f7da03fe6fcf9225.json
index 5ccda40f56fc..cf102b828aa8 100644
--- a/core/lib/dal/.sqlx/query-6874b501c82e6062ab22622095070d67840b2484ea3a03ac49eb3d50ea153163.json
+++ b/core/lib/dal/.sqlx/query-ef70506e90e8add3b95940a7333f8222bd9fbe8ce82d8963f7da03fe6fcf9225.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                miniblocks.number,\n                COALESCE(\n                    miniblocks.l1_batch_number,\n                    (\n                        SELECT\n                            (MAX(number) + 1)\n                        FROM\n                            l1_batches\n                    )\n                ) AS \"l1_batch_number!\",\n                miniblocks.timestamp,\n                miniblocks.l1_tx_count,\n                miniblocks.l2_tx_count,\n                miniblocks.hash AS \"root_hash?\",\n                commit_tx.tx_hash AS \"commit_tx_hash?\",\n                commit_tx.confirmed_at AS \"committed_at?\",\n                prove_tx.tx_hash AS \"prove_tx_hash?\",\n                prove_tx.confirmed_at AS \"proven_at?\",\n                execute_tx.tx_hash AS \"execute_tx_hash?\",\n                execute_tx.confirmed_at AS \"executed_at?\",\n                miniblocks.l1_gas_price,\n                miniblocks.l2_fair_gas_price,\n                miniblocks.bootloader_code_hash,\n                miniblocks.default_aa_code_hash,\n                miniblocks.protocol_version,\n                miniblocks.fee_account_address\n            FROM\n                miniblocks\n                LEFT JOIN l1_batches ON miniblocks.l1_batch_number = l1_batches.number\n                LEFT JOIN eth_txs_history AS commit_tx ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS prove_tx ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS execute_tx ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                miniblocks.number = $1\n            ",
+  "query": "\n            SELECT\n                miniblocks.number,\n                COALESCE(\n                    miniblocks.l1_batch_number,\n                    (\n                        SELECT\n                            (MAX(number) + 1)\n                        FROM\n                            l1_batches\n                    )\n                ) AS \"l1_batch_number!\",\n                miniblocks.timestamp,\n                miniblocks.l1_tx_count,\n                miniblocks.l2_tx_count,\n                miniblocks.hash AS \"root_hash?\",\n                commit_tx.tx_hash AS \"commit_tx_hash?\",\n                commit_tx.confirmed_at AS \"committed_at?\",\n                prove_tx.tx_hash AS \"prove_tx_hash?\",\n                prove_tx.confirmed_at AS \"proven_at?\",\n                execute_tx.tx_hash AS \"execute_tx_hash?\",\n                execute_tx.confirmed_at AS \"executed_at?\",\n                miniblocks.l1_gas_price,\n                miniblocks.l2_fair_gas_price,\n                miniblocks.fair_pubdata_price,\n                miniblocks.bootloader_code_hash,\n                miniblocks.default_aa_code_hash,\n                miniblocks.protocol_version,\n                miniblocks.fee_account_address\n            FROM\n                miniblocks\n                LEFT JOIN l1_batches ON miniblocks.l1_batch_number = l1_batches.number\n                LEFT JOIN eth_txs_history AS commit_tx ON (\n                    l1_batches.eth_commit_tx_id = commit_tx.eth_tx_id\n                    AND commit_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS prove_tx ON (\n                    l1_batches.eth_prove_tx_id = prove_tx.eth_tx_id\n                    AND prove_tx.confirmed_at IS NOT NULL\n                )\n                LEFT JOIN eth_txs_history AS execute_tx ON (\n                    l1_batches.eth_execute_tx_id = execute_tx.eth_tx_id\n                    AND execute_tx.confirmed_at IS NOT NULL\n                )\n            WHERE\n                miniblocks.number = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -75,21 +75,26 @@
       },
       {
         "ordinal": 14,
+        "name": "fair_pubdata_price",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 15,
         "name": "bootloader_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 15,
+        "ordinal": 16,
         "name": "default_aa_code_hash",
         "type_info": "Bytea"
       },
       {
-        "ordinal": 16,
+        "ordinal": 17,
         "name": "protocol_version",
         "type_info": "Int4"
       },
       {
-        "ordinal": 17,
+        "ordinal": 18,
         "name": "fee_account_address",
         "type_info": "Bytea"
       }
@@ -117,8 +122,9 @@
       true,
       true,
       true,
+      true,
       false
     ]
   },
-  "hash": "6874b501c82e6062ab22622095070d67840b2484ea3a03ac49eb3d50ea153163"
+  "hash": "ef70506e90e8add3b95940a7333f8222bd9fbe8ce82d8963f7da03fe6fcf9225"
 }
diff --git a/core/lib/dal/.sqlx/query-f63586d59264eab7388ad1de823227ecaa45d76d1ba260074898fe57c059a15a.json b/core/lib/dal/.sqlx/query-f023e5fa599b279acd6ac02dffb7a33a8fea8ab7fdefb7d9210673245a2a6f6c.json
similarity index 86%
rename from core/lib/dal/.sqlx/query-f63586d59264eab7388ad1de823227ecaa45d76d1ba260074898fe57c059a15a.json
rename to core/lib/dal/.sqlx/query-f023e5fa599b279acd6ac02dffb7a33a8fea8ab7fdefb7d9210673245a2a6f6c.json
index d62e213ef57b..2cd001b274da 100644
--- a/core/lib/dal/.sqlx/query-f63586d59264eab7388ad1de823227ecaa45d76d1ba260074898fe57c059a15a.json
+++ b/core/lib/dal/.sqlx/query-f023e5fa599b279acd6ac02dffb7a33a8fea8ab7fdefb7d9210673245a2a6f6c.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                *\n            FROM\n                transactions\n            WHERE\n                l1_batch_number = $1\n            ORDER BY\n                miniblock_number,\n                index_in_block\n            ",
+  "query": "\n            SELECT\n                *\n            FROM\n                transactions\n            WHERE\n                miniblock_number BETWEEN (\n                    SELECT\n                        MIN(number)\n                    FROM\n                        miniblocks\n                    WHERE\n                        miniblocks.l1_batch_number = $1\n                ) AND (\n                    SELECT\n                        MAX(number)\n                    FROM\n                        miniblocks\n                    WHERE\n                        miniblocks.l1_batch_number = $1\n                )\n            ORDER BY\n                miniblock_number,\n                index_in_block\n            ",
   "describe": {
     "columns": [
       {
@@ -228,5 +228,5 @@
       true
     ]
   },
-  "hash": "f63586d59264eab7388ad1de823227ecaa45d76d1ba260074898fe57c059a15a"
+  "hash": "f023e5fa599b279acd6ac02dffb7a33a8fea8ab7fdefb7d9210673245a2a6f6c"
 }
diff --git a/core/lib/dal/.sqlx/query-f2f1b6c4f4686b423a4c449c56e1687e91d8367347b3830830a4c76407d60bc5.json b/core/lib/dal/.sqlx/query-f2f1b6c4f4686b423a4c449c56e1687e91d8367347b3830830a4c76407d60bc5.json
new file mode 100644
index 000000000000..e49cc211cdcd
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-f2f1b6c4f4686b423a4c449c56e1687e91d8367347b3830830a4c76407d60bc5.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                vm_runner_protective_reads (l1_batch_number, created_at, updated_at)\n            VALUES\n                ($1, NOW(), NOW())\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f2f1b6c4f4686b423a4c449c56e1687e91d8367347b3830830a4c76407d60bc5"
+}
diff --git a/core/lib/dal/.sqlx/query-012bed5d34240ed28c331c8515c381d82925556a4801f678b8786235d525d784.json b/core/lib/dal/.sqlx/query-f3c651a3ecd2aefabef802f32c18779128de288484abea33d338c3304dd66e08.json
similarity index 75%
rename from core/lib/dal/.sqlx/query-012bed5d34240ed28c331c8515c381d82925556a4801f678b8786235d525d784.json
rename to core/lib/dal/.sqlx/query-f3c651a3ecd2aefabef802f32c18779128de288484abea33d338c3304dd66e08.json
index fbeefdfbf956..7d5467b4459c 100644
--- a/core/lib/dal/.sqlx/query-012bed5d34240ed28c331c8515c381d82925556a4801f678b8786235d525d784.json
+++ b/core/lib/dal/.sqlx/query-f3c651a3ecd2aefabef802f32c18779128de288484abea33d338c3304dd66e08.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    UPDATE l1_batches\n                    SET\n                        eth_commit_tx_id = $1,\n                        updated_at = NOW()\n                    WHERE\n                        number BETWEEN $2 AND $3\n                    ",
+  "query": "\n                    UPDATE l1_batches\n                    SET\n                        eth_commit_tx_id = $1,\n                        updated_at = NOW()\n                    WHERE\n                        number BETWEEN $2 AND $3\n                        AND eth_commit_tx_id IS NULL\n                    ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -12,5 +12,5 @@
     },
     "nullable": []
   },
-  "hash": "012bed5d34240ed28c331c8515c381d82925556a4801f678b8786235d525d784"
+  "hash": "f3c651a3ecd2aefabef802f32c18779128de288484abea33d338c3304dd66e08"
 }
diff --git a/core/lib/dal/.sqlx/query-f6c0b212fad536f46863ce3a6105249bd77b263c4fcef81689f9dcd155064a36.json b/core/lib/dal/.sqlx/query-f6c0b212fad536f46863ce3a6105249bd77b263c4fcef81689f9dcd155064a36.json
new file mode 100644
index 000000000000..f916d0dddcef
--- /dev/null
+++ b/core/lib/dal/.sqlx/query-f6c0b212fad536f46863ce3a6105249bd77b263c4fcef81689f9dcd155064a36.json
@@ -0,0 +1,40 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                number,\n                l1_tx_count,\n                l2_tx_count,\n                timestamp\n            FROM\n                l1_batches\n            WHERE\n                eth_commit_tx_id = $1\n                OR eth_prove_tx_id = $1\n                OR eth_execute_tx_id = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "l1_tx_count",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 2,
+        "name": "l2_tx_count",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 3,
+        "name": "timestamp",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "f6c0b212fad536f46863ce3a6105249bd77b263c4fcef81689f9dcd155064a36"
+}
diff --git a/core/lib/dal/.sqlx/query-f406091f793e2eb09d9490f2f8f7ac942fc88835d4bd925e4144cfbb7bc1cf2c.json b/core/lib/dal/.sqlx/query-faef06e2c44922a25eede5ff7f28f79ad3b5bab2de3c616fa38a9abd583b47a1.json
similarity index 62%
rename from core/lib/dal/.sqlx/query-f406091f793e2eb09d9490f2f8f7ac942fc88835d4bd925e4144cfbb7bc1cf2c.json
rename to core/lib/dal/.sqlx/query-faef06e2c44922a25eede5ff7f28f79ad3b5bab2de3c616fa38a9abd583b47a1.json
index eb09b438c684..49b370754878 100644
--- a/core/lib/dal/.sqlx/query-f406091f793e2eb09d9490f2f8f7ac942fc88835d4bd925e4144cfbb7bc1cf2c.json
+++ b/core/lib/dal/.sqlx/query-faef06e2c44922a25eede5ff7f28f79ad3b5bab2de3c616fa38a9abd583b47a1.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    transactions.hash AS tx_hash,\n                    transactions.index_in_block AS index_in_block,\n                    transactions.miniblock_number AS block_number,\n                    transactions.nonce AS nonce,\n                    transactions.signature AS signature,\n                    transactions.initiator_address AS initiator_address,\n                    transactions.tx_format AS tx_format,\n                    transactions.value AS value,\n                    transactions.gas_limit AS gas_limit,\n                    transactions.max_fee_per_gas AS max_fee_per_gas,\n                    transactions.max_priority_fee_per_gas AS max_priority_fee_per_gas,\n                    transactions.effective_gas_price AS effective_gas_price,\n                    transactions.l1_batch_number AS l1_batch_number,\n                    transactions.l1_batch_tx_index AS l1_batch_tx_index,\n                    transactions.data->'contractAddress' AS \"execute_contract_address\",\n                    transactions.data->'calldata' AS \"calldata\",\n                    miniblocks.hash AS \"block_hash\"\n                FROM transactions\n                LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                WHERE\n                transactions.hash = ANY($1) AND transactions.data != '{}'::jsonb",
+  "query": "\n                SELECT\n                    transactions.hash AS tx_hash,\n                    transactions.index_in_block AS index_in_block,\n                    miniblocks.number AS block_number,\n                    transactions.nonce AS nonce,\n                    transactions.signature AS signature,\n                    transactions.initiator_address AS initiator_address,\n                    transactions.tx_format AS tx_format,\n                    transactions.value AS value,\n                    transactions.gas_limit AS gas_limit,\n                    transactions.max_fee_per_gas AS max_fee_per_gas,\n                    transactions.max_priority_fee_per_gas AS max_priority_fee_per_gas,\n                    transactions.effective_gas_price AS effective_gas_price,\n                    transactions.l1_batch_number AS l1_batch_number,\n                    transactions.l1_batch_tx_index AS l1_batch_tx_index,\n                    transactions.data->'contractAddress' AS \"execute_contract_address\",\n                    transactions.data->'calldata' AS \"calldata\",\n                    miniblocks.hash AS \"block_hash\"\n                FROM transactions\n                LEFT JOIN miniblocks ON miniblocks.number = transactions.miniblock_number\n                WHERE\n                transactions.hash = ANY($1) AND transactions.data != '{}'::jsonb",
   "describe": {
     "columns": [
       {
@@ -114,5 +114,5 @@
       true
     ]
   },
-  "hash": "f406091f793e2eb09d9490f2f8f7ac942fc88835d4bd925e4144cfbb7bc1cf2c"
+  "hash": "faef06e2c44922a25eede5ff7f28f79ad3b5bab2de3c616fa38a9abd583b47a1"
 }
diff --git a/core/lib/dal/.sqlx/query-fe501f86f4bf6c5b8ccc2e039a4eb09b538a67d1c39fda052c4f4ddb23ce0084.json b/core/lib/dal/.sqlx/query-fe501f86f4bf6c5b8ccc2e039a4eb09b538a67d1c39fda052c4f4ddb23ce0084.json
deleted file mode 100644
index 5573cdd99530..000000000000
--- a/core/lib/dal/.sqlx/query-fe501f86f4bf6c5b8ccc2e039a4eb09b538a67d1c39fda052c4f4ddb23ce0084.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                l2_to_l1_logs\n            FROM\n                l1_batches\n            WHERE\n                number = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l2_to_l1_logs",
-        "type_info": "ByteaArray"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "fe501f86f4bf6c5b8ccc2e039a4eb09b538a67d1c39fda052c4f4ddb23ce0084"
-}
diff --git a/core/lib/dal/.sqlx/query-fec7b791e371a4c58350b6537065223f4599d4128db588d8645f3d106de5f50b.json b/core/lib/dal/.sqlx/query-fec7b791e371a4c58350b6537065223f4599d4128db588d8645f3d106de5f50b.json
deleted file mode 100644
index c34d38ac2d03..000000000000
--- a/core/lib/dal/.sqlx/query-fec7b791e371a4c58350b6537065223f4599d4128db588d8645f3d106de5f50b.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                certificate\n            FROM\n                miniblocks_consensus\n            ORDER BY\n                number DESC\n            LIMIT\n                1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "certificate",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "fec7b791e371a4c58350b6537065223f4599d4128db588d8645f3d106de5f50b"
-}
diff --git a/core/lib/dal/Cargo.toml b/core/lib/dal/Cargo.toml
index 034f252f7e50..aa1d7097b9ba 100644
--- a/core/lib/dal/Cargo.toml
+++ b/core/lib/dal/Cargo.toml
@@ -49,5 +49,9 @@ strum = { workspace = true, features = ["derive"] }
 tracing.workspace = true
 chrono = { workspace = true, features = ["serde"] }
 
+[dev-dependencies]
+zksync_test_account.workspace = true
+zksync_concurrency.workspace = true
+
 [build-dependencies]
 zksync_protobuf_build.workspace = true
diff --git a/core/lib/dal/README.md b/core/lib/dal/README.md
index 59f4401924ee..cc247733467d 100644
--- a/core/lib/dal/README.md
+++ b/core/lib/dal/README.md
@@ -83,6 +83,12 @@ invariants are expected to be upheld:
 - L2 blocks and L1 batches present in the DB form a continuous range of numbers. If a DB is recovered from a node
   snapshot, the first L2 block / L1 batch is **the next one** after the snapshot L2 block / L1 batch mentioned in the
   `snapshot_recovery` table. Otherwise, L2 blocks / L1 batches must start from number 0 (aka genesis).
+- `address` and `key` fields in the `storage_logs` table are not null for all blocks executed on the node (i.e., blocks
+  the header of which is present in `miniblocks`). On the other hand, `address` and `key` fields may be null for
+  snapshot storage logs. These fields are needed for some components post-processing L1 batches, such as the Merkle tree
+  and the commitment generator. Both use `(address, key)` tuples to sort logs in a batch to get canonical ordering.
+  Since a snapshot is not post-processed in such a way, it is acceptable to skip them for the snapshot logs (and only
+  for them).
 
 ## Contributing to DAL
 
diff --git a/core/lib/dal/migrations/20240325133100_add_tee_verifier_input_producer_jobs_table.down.sql b/core/lib/dal/migrations/20240325133100_add_tee_verifier_input_producer_jobs_table.down.sql
new file mode 100644
index 000000000000..2d4d6a6ad7a7
--- /dev/null
+++ b/core/lib/dal/migrations/20240325133100_add_tee_verifier_input_producer_jobs_table.down.sql
@@ -0,0 +1,5 @@
+DROP INDEX IF EXISTS idx_tee_verifier_input_producer_jobs_status_processing_attempts;
+
+DROP TABLE IF EXISTS tee_verifier_input_producer_jobs;
+
+DROP TYPE IF EXISTS tee_verifier_input_producer_job_status;
diff --git a/core/lib/dal/migrations/20240325143100_add_tee_verifier_input_producer_jobs_table.up.sql b/core/lib/dal/migrations/20240325143100_add_tee_verifier_input_producer_jobs_table.up.sql
new file mode 100644
index 000000000000..eb34068f876d
--- /dev/null
+++ b/core/lib/dal/migrations/20240325143100_add_tee_verifier_input_producer_jobs_table.up.sql
@@ -0,0 +1,18 @@
+CREATE TYPE tee_verifier_input_producer_job_status AS ENUM ('Queued', 'ManuallySkipped', 'InProgress', 'Successful', 'Failed');
+
+CREATE TABLE IF NOT EXISTS tee_verifier_input_producer_jobs
+(
+    l1_batch_number       BIGINT    NOT NULL PRIMARY KEY,
+    attempts              SMALLINT  NOT NULL DEFAULT 0,
+    status                tee_verifier_input_producer_job_status,
+    picked_by             TEXT,
+    input_blob_url        TEXT,
+    error                 TEXT,
+    created_at            TIMESTAMP NOT NULL,
+    updated_at            TIMESTAMP NOT NULL,
+    processing_started_at TIMESTAMP,
+    time_taken            TIME
+);
+
+CREATE INDEX IF NOT EXISTS idx_tee_verifier_input_producer_jobs_status_processing_attempts
+    ON tee_verifier_input_producer_jobs (status, processing_started_at, attempts);
diff --git a/core/lib/dal/migrations/20240415161211_drop_miniblock_constraints.down.sql b/core/lib/dal/migrations/20240415161211_drop_miniblock_constraints.down.sql
new file mode 100644
index 000000000000..6337be1598a2
--- /dev/null
+++ b/core/lib/dal/migrations/20240415161211_drop_miniblock_constraints.down.sql
@@ -0,0 +1,4 @@
+ALTER TABLE events
+    ADD FOREIGN KEY (miniblock_number) REFERENCES miniblocks;
+ALTER TABLE l2_to_l1_logs
+    ADD FOREIGN KEY (miniblock_number) REFERENCES miniblocks;
diff --git a/core/lib/dal/migrations/20240415161211_drop_miniblock_constraints.up.sql b/core/lib/dal/migrations/20240415161211_drop_miniblock_constraints.up.sql
new file mode 100644
index 000000000000..310c79945529
--- /dev/null
+++ b/core/lib/dal/migrations/20240415161211_drop_miniblock_constraints.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE events DROP CONSTRAINT IF EXISTS events_miniblock_number_fkey;
+ALTER TABLE l2_to_l1_logs DROP CONSTRAINT IF EXISTS l2_to_l1_logs_miniblock_number_fkey;
diff --git a/core/lib/dal/migrations/20240513155728_l1_batches_add_tree_input.down.sql b/core/lib/dal/migrations/20240513155728_l1_batches_add_tree_input.down.sql
new file mode 100644
index 000000000000..2e8ace3fadd8
--- /dev/null
+++ b/core/lib/dal/migrations/20240513155728_l1_batches_add_tree_input.down.sql
@@ -0,0 +1 @@
+ALTER TABLE l1_batches DROP COLUMN IF EXISTS tree_writes;
diff --git a/core/lib/dal/migrations/20240513155728_l1_batches_add_tree_input.up.sql b/core/lib/dal/migrations/20240513155728_l1_batches_add_tree_input.up.sql
new file mode 100644
index 000000000000..580f539acaa6
--- /dev/null
+++ b/core/lib/dal/migrations/20240513155728_l1_batches_add_tree_input.up.sql
@@ -0,0 +1 @@
+ALTER TABLE l1_batches ADD COLUMN IF NOT EXISTS tree_writes BYTEA;
diff --git a/core/lib/dal/migrations/20240522081114_create_data_availability_table.down.sql b/core/lib/dal/migrations/20240522081114_create_data_availability_table.down.sql
new file mode 100644
index 000000000000..b6993d850ea5
--- /dev/null
+++ b/core/lib/dal/migrations/20240522081114_create_data_availability_table.down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS data_availability;
diff --git a/core/lib/dal/migrations/20240522081114_create_data_availability_table.up.sql b/core/lib/dal/migrations/20240522081114_create_data_availability_table.up.sql
new file mode 100644
index 000000000000..037398021da6
--- /dev/null
+++ b/core/lib/dal/migrations/20240522081114_create_data_availability_table.up.sql
@@ -0,0 +1,13 @@
+CREATE TABLE IF NOT EXISTS data_availability
+(
+    l1_batch_number BIGINT PRIMARY KEY REFERENCES l1_batches (number) ON DELETE CASCADE,
+
+    blob_id         TEXT      NOT NULL, -- blob here is an abstract term, unrelated to any DA implementation
+    -- the BYTEA used for this column as the most generic type
+    -- the actual format of blob identifier and inclusion data is defined by the DA client implementation
+    inclusion_data  BYTEA,
+    sent_at         TIMESTAMP NOT NULL,
+
+    created_at      TIMESTAMP NOT NULL,
+    updated_at      TIMESTAMP NOT NULL
+);
diff --git a/core/lib/dal/migrations/20240522123456_remove_consensus_fields_for_miniblocks.down.sql b/core/lib/dal/migrations/20240522123456_remove_consensus_fields_for_miniblocks.down.sql
new file mode 100644
index 000000000000..cdfd74990eaf
--- /dev/null
+++ b/core/lib/dal/migrations/20240522123456_remove_consensus_fields_for_miniblocks.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE miniblocks
+    ADD COLUMN consensus JSONB NULL;
diff --git a/core/lib/dal/migrations/20240522123456_remove_consensus_fields_for_miniblocks.up.sql b/core/lib/dal/migrations/20240522123456_remove_consensus_fields_for_miniblocks.up.sql
new file mode 100644
index 000000000000..701c5e608548
--- /dev/null
+++ b/core/lib/dal/migrations/20240522123456_remove_consensus_fields_for_miniblocks.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE miniblocks
+    DROP COLUMN IF EXISTS consensus;
diff --git a/core/lib/dal/migrations/20240522215934_add_vm_runner_protective_reads_table.down.sql b/core/lib/dal/migrations/20240522215934_add_vm_runner_protective_reads_table.down.sql
new file mode 100644
index 000000000000..773b22aa4fa1
--- /dev/null
+++ b/core/lib/dal/migrations/20240522215934_add_vm_runner_protective_reads_table.down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS vm_runner_protective_reads;
diff --git a/core/lib/dal/migrations/20240522215934_add_vm_runner_protective_reads_table.up.sql b/core/lib/dal/migrations/20240522215934_add_vm_runner_protective_reads_table.up.sql
new file mode 100644
index 000000000000..170569508281
--- /dev/null
+++ b/core/lib/dal/migrations/20240522215934_add_vm_runner_protective_reads_table.up.sql
@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS vm_runner_protective_reads
+(
+    l1_batch_number       BIGINT    NOT NULL PRIMARY KEY,
+    created_at            TIMESTAMP NOT NULL,
+    updated_at            TIMESTAMP NOT NULL,
+    time_taken            TIME
+);
diff --git a/core/lib/dal/migrations/20240523085604_add_tee_proof_generation_details_table.down.sql b/core/lib/dal/migrations/20240523085604_add_tee_proof_generation_details_table.down.sql
new file mode 100644
index 000000000000..5b4f9958a8ea
--- /dev/null
+++ b/core/lib/dal/migrations/20240523085604_add_tee_proof_generation_details_table.down.sql
@@ -0,0 +1,4 @@
+DROP TABLE IF EXISTS tee_attestations;
+DROP TABLE IF EXISTS tee_proof_generation_details;
+
+DROP INDEX IF EXISTS idx_tee_proof_generation_details_status_prover_taken_at;
diff --git a/core/lib/dal/migrations/20240523085604_add_tee_proof_generation_details_table.up.sql b/core/lib/dal/migrations/20240523085604_add_tee_proof_generation_details_table.up.sql
new file mode 100644
index 000000000000..3a249c44346c
--- /dev/null
+++ b/core/lib/dal/migrations/20240523085604_add_tee_proof_generation_details_table.up.sql
@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS tee_attestations
+(
+    pubkey                  BYTEA PRIMARY KEY,
+    attestation             BYTEA
+);
+
+CREATE TABLE IF NOT EXISTS tee_proof_generation_details
+(
+    l1_batch_number         BIGINT PRIMARY KEY REFERENCES tee_verifier_input_producer_jobs (l1_batch_number) ON DELETE CASCADE,
+    status                  TEXT      NOT NULL,
+    signature               BYTEA,
+    pubkey                  BYTEA REFERENCES tee_attestations (pubkey) ON DELETE SET NULL,
+    proof                   BYTEA,
+    tee_type                TEXT,
+    created_at              TIMESTAMP NOT NULL,
+    updated_at              TIMESTAMP NOT NULL,
+    prover_taken_at         TIMESTAMP
+);
+
+CREATE INDEX IF NOT EXISTS idx_tee_proof_generation_details_status_prover_taken_at
+    ON tee_proof_generation_details (prover_taken_at)
+    WHERE status = 'picked_by_prover';
diff --git a/core/lib/dal/migrations/20240527082006_add_protocol_vk_patches_table.down.sql b/core/lib/dal/migrations/20240527082006_add_protocol_vk_patches_table.down.sql
new file mode 100644
index 000000000000..8dfc84a65a10
--- /dev/null
+++ b/core/lib/dal/migrations/20240527082006_add_protocol_vk_patches_table.down.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS protocol_patches;
+
+ALTER TABLE protocol_versions ALTER COLUMN recursion_scheduler_level_vk_hash SET NOT NULL;
+ALTER TABLE protocol_versions ALTER COLUMN recursion_node_level_vk_hash SET NOT NULL;
+ALTER TABLE protocol_versions ALTER COLUMN recursion_leaf_level_vk_hash SET NOT NULL;
+ALTER TABLE protocol_versions ALTER COLUMN recursion_circuits_set_vks_hash SET NOT NULL;
diff --git a/core/lib/dal/migrations/20240527082006_add_protocol_vk_patches_table.up.sql b/core/lib/dal/migrations/20240527082006_add_protocol_vk_patches_table.up.sql
new file mode 100644
index 000000000000..840c1ef9d32e
--- /dev/null
+++ b/core/lib/dal/migrations/20240527082006_add_protocol_vk_patches_table.up.sql
@@ -0,0 +1,20 @@
+CREATE TABLE protocol_patches (
+    minor INTEGER NOT NULL REFERENCES protocol_versions(id),
+    patch INTEGER NOT NULL,
+    recursion_scheduler_level_vk_hash BYTEA NOT NULL,
+    recursion_node_level_vk_hash      BYTEA NOT NULL,
+    recursion_leaf_level_vk_hash      BYTEA NOT NULL,
+    recursion_circuits_set_vks_hash   BYTEA NOT NULL,
+    created_at TIMESTAMP NOT NULL,
+    PRIMARY KEY (minor, patch)
+);
+
+INSERT INTO protocol_patches
+SELECT id as "minor", 0 as "patch", recursion_scheduler_level_vk_hash, recursion_node_level_vk_hash,
+    recursion_leaf_level_vk_hash, recursion_circuits_set_vks_hash, now() as "created_at"
+FROM protocol_versions;
+
+ALTER TABLE protocol_versions ALTER COLUMN recursion_scheduler_level_vk_hash DROP NOT NULL;
+ALTER TABLE protocol_versions ALTER COLUMN recursion_node_level_vk_hash DROP NOT NULL;
+ALTER TABLE protocol_versions ALTER COLUMN recursion_leaf_level_vk_hash DROP NOT NULL;
+ALTER TABLE protocol_versions ALTER COLUMN recursion_circuits_set_vks_hash DROP NOT NULL;
diff --git a/core/lib/dal/migrations/20240611121747_add_base_token_ratio_table.down.sql b/core/lib/dal/migrations/20240611121747_add_base_token_ratio_table.down.sql
new file mode 100644
index 000000000000..e64cb3c7c408
--- /dev/null
+++ b/core/lib/dal/migrations/20240611121747_add_base_token_ratio_table.down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS base_token_ratios;
diff --git a/core/lib/dal/migrations/20240611121747_add_base_token_ratio_table.up.sql b/core/lib/dal/migrations/20240611121747_add_base_token_ratio_table.up.sql
new file mode 100644
index 000000000000..f4853e352802
--- /dev/null
+++ b/core/lib/dal/migrations/20240611121747_add_base_token_ratio_table.up.sql
@@ -0,0 +1,11 @@
+CREATE TABLE base_token_ratios (
+    id SERIAL PRIMARY KEY,
+    created_at TIMESTAMP NOT NULL,
+    updated_at TIMESTAMP NOT NULL,
+
+    ratio_timestamp TIMESTAMP NOT NULL,
+    numerator NUMERIC(20,0) NOT NULL,
+    denominator NUMERIC(20,0) NOT NULL,
+
+    used_in_l1 BOOLEAN NOT NULL DEFAULT FALSE
+);
diff --git a/core/lib/dal/migrations/20240617103351_make_key_preimage_nullable.down.sql b/core/lib/dal/migrations/20240617103351_make_key_preimage_nullable.down.sql
new file mode 100644
index 000000000000..4348c29caef5
--- /dev/null
+++ b/core/lib/dal/migrations/20240617103351_make_key_preimage_nullable.down.sql
@@ -0,0 +1,3 @@
+ALTER TABLE storage_logs
+    ALTER COLUMN address SET NOT NULL,
+    ALTER COLUMN key SET NOT NULL;
diff --git a/core/lib/dal/migrations/20240617103351_make_key_preimage_nullable.up.sql b/core/lib/dal/migrations/20240617103351_make_key_preimage_nullable.up.sql
new file mode 100644
index 000000000000..18a623c67f56
--- /dev/null
+++ b/core/lib/dal/migrations/20240617103351_make_key_preimage_nullable.up.sql
@@ -0,0 +1,3 @@
+ALTER TABLE storage_logs
+    ALTER COLUMN address DROP NOT NULL,
+    ALTER COLUMN key DROP NOT NULL;
diff --git a/core/lib/dal/migrations/20240619060210_make_storage_logs_tx_hash_nullable.down.sql b/core/lib/dal/migrations/20240619060210_make_storage_logs_tx_hash_nullable.down.sql
new file mode 100644
index 000000000000..c1c97e67e442
--- /dev/null
+++ b/core/lib/dal/migrations/20240619060210_make_storage_logs_tx_hash_nullable.down.sql
@@ -0,0 +1 @@
+ALTER TABLE storage_logs ALTER COLUMN tx_hash SET NOT NULL;
diff --git a/core/lib/dal/migrations/20240619060210_make_storage_logs_tx_hash_nullable.up.sql b/core/lib/dal/migrations/20240619060210_make_storage_logs_tx_hash_nullable.up.sql
new file mode 100644
index 000000000000..d6c0e5d2b36b
--- /dev/null
+++ b/core/lib/dal/migrations/20240619060210_make_storage_logs_tx_hash_nullable.up.sql
@@ -0,0 +1 @@
+ALTER TABLE storage_logs ALTER COLUMN tx_hash DROP NOT NULL;
diff --git a/core/lib/dal/src/base_token_dal.rs b/core/lib/dal/src/base_token_dal.rs
new file mode 100644
index 000000000000..a8bf51d0c603
--- /dev/null
+++ b/core/lib/dal/src/base_token_dal.rs
@@ -0,0 +1,61 @@
+use std::num::NonZeroU64;
+
+use bigdecimal::{BigDecimal, FromPrimitive};
+use zksync_db_connection::{connection::Connection, error::DalResult, instrument::InstrumentExt};
+use zksync_types::base_token_ratio::BaseTokenRatio;
+
+use crate::{models::storage_base_token_ratio::StorageBaseTokenRatio, Core};
+
+#[derive(Debug)]
+pub struct BaseTokenDal<'a, 'c> {
+    pub(crate) storage: &'a mut Connection<'c, Core>,
+}
+
+impl BaseTokenDal<'_, '_> {
+    pub async fn insert_token_ratio(
+        &mut self,
+        numerator: NonZeroU64,
+        denominator: NonZeroU64,
+        ratio_timestamp: &chrono::NaiveDateTime,
+    ) -> DalResult<usize> {
+        let row = sqlx::query!(
+            r#"
+            INSERT INTO
+                base_token_ratios (numerator, denominator, ratio_timestamp, created_at, updated_at)
+            VALUES
+                ($1, $2, $3, NOW(), NOW())
+            RETURNING
+                id
+            "#,
+            BigDecimal::from_u64(numerator.get()),
+            BigDecimal::from_u64(denominator.get()),
+            ratio_timestamp,
+        )
+        .instrument("insert_token_ratio")
+        .fetch_one(self.storage)
+        .await?;
+
+        Ok(row.id as usize)
+    }
+
+    pub async fn get_latest_ratio(&mut self) -> DalResult<Option<BaseTokenRatio>> {
+        let row = sqlx::query_as!(
+            StorageBaseTokenRatio,
+            r#"
+            SELECT
+                *
+            FROM
+                base_token_ratios
+            ORDER BY
+                ratio_timestamp DESC
+            LIMIT
+                1
+            "#,
+        )
+        .instrument("get_latest_ratio")
+        .fetch_optional(self.storage)
+        .await?;
+
+        Ok(row.map(|r| r.into()))
+    }
+}
diff --git a/core/lib/dal/src/blocks_dal.rs b/core/lib/dal/src/blocks_dal.rs
index 4e39a7bcea31..4f4b3e99ff7b 100644
--- a/core/lib/dal/src/blocks_dal.rs
+++ b/core/lib/dal/src/blocks_dal.rs
@@ -2,28 +2,36 @@ use std::{
     collections::HashMap,
     convert::{Into, TryInto},
     ops,
+    sync::atomic::{AtomicBool, Ordering},
 };
 
 use anyhow::Context as _;
 use bigdecimal::{BigDecimal, FromPrimitive, ToPrimitive};
 use zksync_db_connection::{
     connection::Connection,
-    error::DalResult,
+    error::{DalResult, SqlxContext},
     instrument::{InstrumentExt, Instrumented},
     interpolate_query, match_query_as,
 };
 use zksync_types::{
     aggregated_operations::AggregatedActionType,
-    block::{BlockGasCount, L1BatchHeader, L1BatchTreeData, L2BlockHeader, StorageOracleInfo},
+    block::{
+        BlockGasCount, L1BatchHeader, L1BatchStatistics, L1BatchTreeData, L2BlockHeader,
+        StorageOracleInfo,
+    },
     circuit::CircuitStatistic,
     commitment::{L1BatchCommitmentArtifacts, L1BatchWithMetadata},
+    l2_to_l1_log::UserL2ToL1Log,
+    writes::TreeWrite,
     Address, L1BatchNumber, L2BlockNumber, ProtocolVersionId, H256, U256,
 };
 
+pub use crate::models::storage_block::{L1BatchMetadataError, L1BatchWithOptionalMetadata};
 use crate::{
     models::{
         parse_protocol_version,
         storage_block::{StorageL1Batch, StorageL1BatchHeader, StorageL2BlockHeader},
+        storage_event::StorageL2ToL1Log,
         storage_oracle_info::DbStorageOracleInfo,
     },
     Core, CoreDal,
@@ -99,7 +107,7 @@ impl BlocksDal<'_, '_> {
                 l1_batches
             "#
         )
-        .instrument("get_sealed_block_number")
+        .instrument("get_sealed_l1_batch_number")
         .report_latency()
         .fetch_one(self.storage)
         .await?;
@@ -142,7 +150,7 @@ impl BlocksDal<'_, '_> {
         Ok(row.number.map(|num| L1BatchNumber(num as u32)))
     }
 
-    pub async fn get_last_l1_batch_number_with_metadata(
+    pub async fn get_last_l1_batch_number_with_tree_data(
         &mut self,
     ) -> DalResult<Option<L1BatchNumber>> {
         let row = sqlx::query!(
@@ -155,7 +163,7 @@ impl BlocksDal<'_, '_> {
                 hash IS NOT NULL
             "#
         )
-        .instrument("get_last_block_number_with_metadata")
+        .instrument("get_last_l1_batch_number_with_tree_data")
         .report_latency()
         .fetch_one(self.storage)
         .await?;
@@ -163,6 +171,8 @@ impl BlocksDal<'_, '_> {
         Ok(row.number.map(|num| L1BatchNumber(num as u32)))
     }
 
+    /// Gets a number of the earliest L1 batch that is ready for commitment generation (i.e., doesn't have commitment
+    /// yet, and has tree data).
     pub async fn get_next_l1_batch_ready_for_commitment_generation(
         &mut self,
     ) -> DalResult<Option<L1BatchNumber>> {
@@ -189,6 +199,34 @@ impl BlocksDal<'_, '_> {
         Ok(row.map(|row| L1BatchNumber(row.number as u32)))
     }
 
+    /// Gets a number of the last L1 batch that is ready for commitment generation (i.e., doesn't have commitment
+    /// yet, and has tree data).
+    pub async fn get_last_l1_batch_ready_for_commitment_generation(
+        &mut self,
+    ) -> DalResult<Option<L1BatchNumber>> {
+        let row = sqlx::query!(
+            r#"
+            SELECT
+                number
+            FROM
+                l1_batches
+            WHERE
+                hash IS NOT NULL
+                AND commitment IS NULL
+            ORDER BY
+                number DESC
+            LIMIT
+                1
+            "#
+        )
+        .instrument("get_last_l1_batch_ready_for_commitment_generation")
+        .report_latency()
+        .fetch_optional(self.storage)
+        .await?;
+
+        Ok(row.map(|row| L1BatchNumber(row.number as u32)))
+    }
+
     /// Returns the number of the earliest L1 batch with metadata (= state hash) present in the DB,
     /// or `None` if there are no such L1 batches.
     pub async fn get_earliest_l1_batch_number_with_metadata(
@@ -212,29 +250,17 @@ impl BlocksDal<'_, '_> {
         Ok(row.number.map(|num| L1BatchNumber(num as u32)))
     }
 
-    pub async fn get_l1_batches_for_eth_tx_id(
+    pub async fn get_l1_batches_statistics_for_eth_tx_id(
         &mut self,
         eth_tx_id: u32,
-    ) -> DalResult<Vec<L1BatchHeader>> {
-        let l1_batches = sqlx::query_as!(
-            StorageL1BatchHeader,
+    ) -> DalResult<Vec<L1BatchStatistics>> {
+        Ok(sqlx::query!(
             r#"
             SELECT
                 number,
                 l1_tx_count,
                 l2_tx_count,
-                timestamp,
-                l2_to_l1_logs,
-                l2_to_l1_messages,
-                bloom,
-                priority_ops_onchain_data,
-                used_contract_hashes,
-                bootloader_code_hash,
-                default_aa_code_hash,
-                protocol_version,
-                system_logs,
-                compressed_state_diffs,
-                pubdata_input
+                timestamp
             FROM
                 l1_batches
             WHERE
@@ -244,15 +270,21 @@ impl BlocksDal<'_, '_> {
             "#,
             eth_tx_id as i32
         )
-        .instrument("get_l1_batches_for_eth_tx_id")
+        .instrument("get_l1_batch_statistics_for_eth_tx_id")
         .with_arg("eth_tx_id", &eth_tx_id)
         .fetch_all(self.storage)
-        .await?;
-
-        Ok(l1_batches.into_iter().map(Into::into).collect())
+        .await?
+        .into_iter()
+        .map(|row| L1BatchStatistics {
+            number: L1BatchNumber(row.number as u32),
+            timestamp: row.timestamp as u64,
+            l2_tx_count: row.l2_tx_count as u32,
+            l1_tx_count: row.l1_tx_count as u32,
+        })
+        .collect())
     }
 
-    pub async fn get_storage_l1_batch(
+    async fn get_storage_l1_batch(
         &mut self,
         number: L1BatchNumber,
     ) -> DalResult<Option<StorageL1Batch>> {
@@ -268,10 +300,6 @@ impl BlocksDal<'_, '_> {
                 priority_ops_onchain_data,
                 hash,
                 commitment,
-                eth_prove_tx_id,
-                eth_commit_tx_id,
-                eth_execute_tx_id,
-                l2_to_l1_logs,
                 l2_to_l1_messages,
                 used_contract_hashes,
                 compressed_initial_writes,
@@ -308,7 +336,7 @@ impl BlocksDal<'_, '_> {
         &mut self,
         number: L1BatchNumber,
     ) -> DalResult<Option<L1BatchHeader>> {
-        Ok(sqlx::query_as!(
+        let storage_l1_batch_header = sqlx::query_as!(
             StorageL1BatchHeader,
             r#"
             SELECT
@@ -316,7 +344,6 @@ impl BlocksDal<'_, '_> {
                 l1_tx_count,
                 l2_tx_count,
                 timestamp,
-                l2_to_l1_logs,
                 l2_to_l1_messages,
                 bloom,
                 priority_ops_onchain_data,
@@ -324,7 +351,6 @@ impl BlocksDal<'_, '_> {
                 bootloader_code_hash,
                 default_aa_code_hash,
                 protocol_version,
-                compressed_state_diffs,
                 system_logs,
                 pubdata_input
             FROM
@@ -337,8 +363,18 @@ impl BlocksDal<'_, '_> {
         .instrument("get_l1_batch_header")
         .with_arg("number", &number)
         .fetch_optional(self.storage)
-        .await?
-        .map(Into::into))
+        .await?;
+
+        if let Some(storage_l1_batch_header) = storage_l1_batch_header {
+            let l2_to_l1_logs = self
+                .get_l2_to_l1_logs_for_batch::<UserL2ToL1Log>(number)
+                .await?;
+            return Ok(Some(
+                storage_l1_batch_header.into_l1_batch_header_with_logs(l2_to_l1_logs),
+            ));
+        }
+
+        Ok(None)
     }
 
     /// Returns initial bootloader heap content for the specified L1 batch.
@@ -405,7 +441,11 @@ impl BlocksDal<'_, '_> {
     ) -> DalResult<()> {
         match aggregation_type {
             AggregatedActionType::Commit => {
-                sqlx::query!(
+                let instrumentation = Instrumented::new("set_eth_tx_id#commit")
+                    .with_arg("number_range", &number_range)
+                    .with_arg("eth_tx_id", &eth_tx_id);
+
+                let query = sqlx::query!(
                     r#"
                     UPDATE l1_batches
                     SET
@@ -413,19 +453,30 @@ impl BlocksDal<'_, '_> {
                         updated_at = NOW()
                     WHERE
                         number BETWEEN $2 AND $3
+                        AND eth_commit_tx_id IS NULL
                     "#,
                     eth_tx_id as i32,
                     i64::from(number_range.start().0),
                     i64::from(number_range.end().0)
-                )
-                .instrument("set_eth_tx_id#commit")
-                .with_arg("number_range", &number_range)
-                .with_arg("eth_tx_id", &eth_tx_id)
-                .execute(self.storage)
-                .await?;
+                );
+                let result = instrumentation
+                    .clone()
+                    .with(query)
+                    .execute(self.storage)
+                    .await?;
+
+                if result.rows_affected() == 0 {
+                    let err = instrumentation.constraint_error(anyhow::anyhow!(
+                        "Update eth_commit_tx_id that is is not null is not allowed"
+                    ));
+                    return Err(err);
+                }
             }
             AggregatedActionType::PublishProofOnchain => {
-                sqlx::query!(
+                let instrumentation = Instrumented::new("set_eth_tx_id#prove")
+                    .with_arg("number_range", &number_range)
+                    .with_arg("eth_tx_id", &eth_tx_id);
+                let query = sqlx::query!(
                     r#"
                     UPDATE l1_batches
                     SET
@@ -433,19 +484,32 @@ impl BlocksDal<'_, '_> {
                         updated_at = NOW()
                     WHERE
                         number BETWEEN $2 AND $3
+                        AND eth_prove_tx_id IS NULL
                     "#,
                     eth_tx_id as i32,
                     i64::from(number_range.start().0),
                     i64::from(number_range.end().0)
-                )
-                .instrument("set_eth_tx_id#prove")
-                .with_arg("number_range", &number_range)
-                .with_arg("eth_tx_id", &eth_tx_id)
-                .execute(self.storage)
-                .await?;
+                );
+
+                let result = instrumentation
+                    .clone()
+                    .with(query)
+                    .execute(self.storage)
+                    .await?;
+
+                if result.rows_affected() == 0 {
+                    let err = instrumentation.constraint_error(anyhow::anyhow!(
+                        "Update eth_prove_tx_id that is is not null is not allowed"
+                    ));
+                    return Err(err);
+                }
             }
             AggregatedActionType::Execute => {
-                sqlx::query!(
+                let instrumentation = Instrumented::new("set_eth_tx_id#execute")
+                    .with_arg("number_range", &number_range)
+                    .with_arg("eth_tx_id", &eth_tx_id);
+
+                let query = sqlx::query!(
                     r#"
                     UPDATE l1_batches
                     SET
@@ -453,16 +517,25 @@ impl BlocksDal<'_, '_> {
                         updated_at = NOW()
                     WHERE
                         number BETWEEN $2 AND $3
+                        AND eth_execute_tx_id IS NULL
                     "#,
                     eth_tx_id as i32,
                     i64::from(number_range.start().0),
                     i64::from(number_range.end().0)
-                )
-                .instrument("set_eth_tx_id#execute")
-                .with_arg("number_range", &number_range)
-                .with_arg("eth_tx_id", &eth_tx_id)
-                .execute(self.storage)
-                .await?;
+                );
+
+                let result = instrumentation
+                    .clone()
+                    .with(query)
+                    .execute(self.storage)
+                    .await?;
+
+                if result.rows_affected() == 0 {
+                    let err = instrumentation.constraint_error(anyhow::anyhow!(
+                        "Update eth_execute_tx_id that is is not null is not allowed"
+                    ));
+                    return Err(err);
+                }
             }
         }
         Ok(())
@@ -490,11 +563,6 @@ impl BlocksDal<'_, '_> {
             .iter()
             .map(|data| data.clone().into())
             .collect();
-        let l2_to_l1_logs: Vec<_> = header
-            .l2_to_l1_logs
-            .iter()
-            .map(|log| log.0.to_bytes().to_vec())
-            .collect();
         let system_logs = header
             .system_logs
             .iter()
@@ -516,7 +584,6 @@ impl BlocksDal<'_, '_> {
                     l1_tx_count,
                     l2_tx_count,
                     timestamp,
-                    l2_to_l1_logs,
                     l2_to_l1_messages,
                     bloom,
                     priority_ops_onchain_data,
@@ -558,7 +625,6 @@ impl BlocksDal<'_, '_> {
                     $18,
                     $19,
                     $20,
-                    $21,
                     NOW(),
                     NOW()
                 )
@@ -567,7 +633,6 @@ impl BlocksDal<'_, '_> {
             i32::from(header.l1_tx_count),
             i32::from(header.l2_tx_count),
             header.timestamp as i64,
-            &l2_to_l1_logs,
             &header.l2_to_l1_messages,
             header.bloom.as_bytes(),
             &priority_onchain_data,
@@ -804,33 +869,12 @@ impl BlocksDal<'_, '_> {
         if update_result.rows_affected() == 0 {
             tracing::debug!("L1 batch #{number}: tree data wasn't updated as it's already present");
 
-            // Batch was already processed. Verify that existing hash matches
-            let matched: i64 = sqlx::query!(
-                r#"
-                SELECT
-                    COUNT(*) AS "count!"
-                FROM
-                    l1_batches
-                WHERE
-                    number = $1
-                    AND hash = $2
-                "#,
-                i64::from(number.0),
-                tree_data.hash.as_bytes(),
-            )
-            .instrument("get_matching_batch_hash")
-            .with_arg("number", &number)
-            .report_latency()
-            .fetch_one(self.storage)
-            .await?
-            .count;
-
+            // Batch was already processed. Verify that the existing tree data matches.
+            let existing_tree_data = self.get_l1_batch_tree_data(number).await?;
             anyhow::ensure!(
-                matched == 1,
-                "Root hash verification failed. Hash for L1 batch #{} does not match the expected value \
-                 (expected root hash: {:?})",
-                number,
-                tree_data.hash,
+                existing_tree_data.as_ref() == Some(tree_data),
+                "Root hash verification failed. Tree data for L1 batch #{number} does not match the expected value \
+                 (expected: {tree_data:?}, existing: {existing_tree_data:?})",
             );
         }
         Ok(())
@@ -944,8 +988,8 @@ impl BlocksDal<'_, '_> {
     pub async fn get_last_committed_to_eth_l1_batch(
         &mut self,
     ) -> DalResult<Option<L1BatchWithMetadata>> {
-        // We can get 0 block for the first transaction
-        let block = sqlx::query_as!(
+        // We can get 0 batch for the first transaction
+        let batch = sqlx::query_as!(
             StorageL1Batch,
             r#"
             SELECT
@@ -957,10 +1001,6 @@ impl BlocksDal<'_, '_> {
                 priority_ops_onchain_data,
                 hash,
                 commitment,
-                eth_prove_tx_id,
-                eth_commit_tx_id,
-                eth_execute_tx_id,
-                l2_to_l1_logs,
                 l2_to_l1_messages,
                 used_contract_hashes,
                 compressed_initial_writes,
@@ -995,12 +1035,12 @@ impl BlocksDal<'_, '_> {
         .instrument("get_last_committed_to_eth_l1_batch")
         .fetch_one(self.storage)
         .await?;
-        // genesis block is first generated without commitment, we should wait for the tree to set it.
-        if block.commitment.is_none() {
+        // genesis batch is first generated without commitment, we should wait for the tree to set it.
+        if batch.commitment.is_none() {
             return Ok(None);
         }
 
-        self.get_l1_batch_with_metadata(block).await
+        self.map_storage_l1_batch(batch).await
     }
 
     /// Returns the number of the last L1 batch for which an Ethereum commit tx was sent and confirmed.
@@ -1141,10 +1181,6 @@ impl BlocksDal<'_, '_> {
                 priority_ops_onchain_data,
                 hash,
                 commitment,
-                eth_prove_tx_id,
-                eth_commit_tx_id,
-                eth_execute_tx_id,
-                l2_to_l1_logs,
                 l2_to_l1_messages,
                 used_contract_hashes,
                 compressed_initial_writes,
@@ -1190,16 +1226,16 @@ impl BlocksDal<'_, '_> {
         &mut self,
         raw_batches: Vec<StorageL1Batch>,
     ) -> anyhow::Result<Vec<L1BatchWithMetadata>> {
-        let mut l1_batches = Vec::with_capacity(raw_batches.len());
+        let mut l1_batches_with_metadata = Vec::with_capacity(raw_batches.len());
         for raw_batch in raw_batches {
-            let block = self
-                .get_l1_batch_with_metadata(raw_batch)
+            let batch = self
+                .map_storage_l1_batch(raw_batch)
                 .await
-                .context("get_l1_batch_with_metadata()")?
-                .context("Block should be complete")?;
-            l1_batches.push(block);
+                .context("map_storage_l1_batch()")?
+                .context("Batch should be complete")?;
+            l1_batches_with_metadata.push(batch);
         }
-        Ok(l1_batches)
+        Ok(l1_batches_with_metadata)
     }
 
     /// This method returns batches that are committed on L1 and witness jobs for them are skipped.
@@ -1207,12 +1243,12 @@ impl BlocksDal<'_, '_> {
         &mut self,
         limit: usize,
     ) -> anyhow::Result<Vec<L1BatchWithMetadata>> {
-        let last_proved_block_number = self
+        let last_proved_batch_number = self
             .get_last_l1_batch_with_prove_tx()
             .await
             .context("get_last_l1_batch_with_prove_tx()")?;
         // Witness jobs can be processed out of order, so `WHERE l1_batches.number - row_number = $1`
-        // is used to avoid having gaps in the list of blocks to send dummy proofs for.
+        // is used to avoid having gaps in the list of batches to send dummy proofs for.
         let raw_batches = sqlx::query_as!(
             StorageL1Batch,
             r#"
@@ -1225,10 +1261,6 @@ impl BlocksDal<'_, '_> {
                 priority_ops_onchain_data,
                 hash,
                 commitment,
-                eth_prove_tx_id,
-                eth_commit_tx_id,
-                eth_execute_tx_id,
-                l2_to_l1_logs,
                 l2_to_l1_messages,
                 used_contract_hashes,
                 compressed_initial_writes,
@@ -1270,7 +1302,7 @@ impl BlocksDal<'_, '_> {
             WHERE
                 number - ROW_NUMBER = $1
             "#,
-            last_proved_block_number.0 as i32,
+            last_proved_batch_number.0 as i32,
             limit as i32
         )
         .instrument("get_skipped_for_proof_l1_batches")
@@ -1302,10 +1334,6 @@ impl BlocksDal<'_, '_> {
                         priority_ops_onchain_data,
                         hash,
                         commitment,
-                        eth_prove_tx_id,
-                        eth_commit_tx_id,
-                        eth_execute_tx_id,
-                        l2_to_l1_logs,
                         l2_to_l1_messages,
                         used_contract_hashes,
                         compressed_initial_writes,
@@ -1415,10 +1443,10 @@ impl BlocksDal<'_, '_> {
         .fetch_one(self.storage.conn())
         .await?;
 
-        Ok(if let Some(max_ready_to_send_block) = row.max {
-            // If we found at least one ready to execute batch then we can simply return all blocks between
-            // the expected started point and the max ready to send block because we send them to the L1 sequentially.
-            assert!(max_ready_to_send_block >= expected_started_point);
+        Ok(if let Some(max_ready_to_send_batch) = row.max {
+            // If we found at least one ready to execute batch then we can simply return all batches between
+            // the expected started point and the max ready to send batch because we send them to the L1 sequentially.
+            assert!(max_ready_to_send_batch >= expected_started_point);
             sqlx::query_as!(
                 StorageL1Batch,
                 r#"
@@ -1431,10 +1459,6 @@ impl BlocksDal<'_, '_> {
                     priority_ops_onchain_data,
                     hash,
                     commitment,
-                    eth_prove_tx_id,
-                    eth_commit_tx_id,
-                    eth_execute_tx_id,
-                    l2_to_l1_logs,
                     l2_to_l1_messages,
                     used_contract_hashes,
                     compressed_initial_writes,
@@ -1464,13 +1488,13 @@ impl BlocksDal<'_, '_> {
                     $3
                 "#,
                 expected_started_point as i32,
-                max_ready_to_send_block,
+                max_ready_to_send_batch,
                 limit as i32,
             )
             .instrument("get_ready_for_execute_l1_batches")
             .with_arg(
                 "numbers",
-                &(expected_started_point..=max_ready_to_send_block),
+                &(expected_started_point..=max_ready_to_send_batch),
             )
             .with_arg("limit", &limit)
             .fetch_all(self.storage)
@@ -1499,10 +1523,6 @@ impl BlocksDal<'_, '_> {
                 priority_ops_onchain_data,
                 hash,
                 commitment,
-                eth_prove_tx_id,
-                eth_commit_tx_id,
-                eth_execute_tx_id,
-                l2_to_l1_logs,
                 l2_to_l1_messages,
                 used_contract_hashes,
                 compressed_initial_writes,
@@ -1558,12 +1578,16 @@ impl BlocksDal<'_, '_> {
             .context("map_l1_batches()")
     }
 
+    /// When `with_da_inclusion_info` is true, only batches for which custom DA inclusion
+    /// information has already been provided will be included
     pub async fn get_ready_for_commit_l1_batches(
         &mut self,
         limit: usize,
         bootloader_hash: H256,
         default_aa_hash: H256,
         protocol_version_id: ProtocolVersionId,
+
+        with_da_inclusion_info: bool,
     ) -> anyhow::Result<Vec<L1BatchWithMetadata>> {
         let raw_batches = sqlx::query_as!(
             StorageL1Batch,
@@ -1577,10 +1601,6 @@ impl BlocksDal<'_, '_> {
                 priority_ops_onchain_data,
                 hash,
                 commitment,
-                eth_prove_tx_id,
-                eth_commit_tx_id,
-                eth_execute_tx_id,
-                l2_to_l1_logs,
                 l2_to_l1_messages,
                 used_contract_hashes,
                 compressed_initial_writes,
@@ -1602,6 +1622,7 @@ impl BlocksDal<'_, '_> {
             FROM
                 l1_batches
                 LEFT JOIN commitments ON commitments.l1_batch_number = l1_batches.number
+                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
                 JOIN protocol_versions ON protocol_versions.id = l1_batches.protocol_version
             WHERE
                 eth_commit_tx_id IS NULL
@@ -1615,14 +1636,19 @@ impl BlocksDal<'_, '_> {
                 )
                 AND events_queue_commitment IS NOT NULL
                 AND bootloader_initial_content_commitment IS NOT NULL
+                AND (
+                    data_availability.inclusion_data IS NOT NULL
+                    OR $4 IS FALSE
+                )
             ORDER BY
                 number
             LIMIT
-                $4
+                $5
             "#,
             bootloader_hash.as_bytes(),
             default_aa_hash.as_bytes(),
             protocol_version_id as i32,
+            with_da_inclusion_info,
             limit as i64,
         )
         .instrument("get_ready_for_commit_l1_batches")
@@ -1630,6 +1656,7 @@ impl BlocksDal<'_, '_> {
         .with_arg("bootloader_hash", &bootloader_hash)
         .with_arg("default_aa_hash", &default_aa_hash)
         .with_arg("protocol_version_id", &protocol_version_id)
+        .with_arg("with_da_inclusion_info", &with_da_inclusion_info)
         .fetch_all(self.storage)
         .await?;
 
@@ -1697,7 +1724,28 @@ impl BlocksDal<'_, '_> {
         let Some(l1_batch) = self.get_storage_l1_batch(number).await? else {
             return Ok(None);
         };
-        self.get_l1_batch_with_metadata(l1_batch).await
+        self.map_storage_l1_batch(l1_batch).await
+    }
+
+    /// Returns the header and optional metadata for an L1 batch with the specified number. If a batch exists
+    /// but does not have all metadata, it's possible to inspect which metadata is missing.
+    pub async fn get_optional_l1_batch_metadata(
+        &mut self,
+        number: L1BatchNumber,
+    ) -> DalResult<Option<L1BatchWithOptionalMetadata>> {
+        let Some(l1_batch) = self.get_storage_l1_batch(number).await? else {
+            return Ok(None);
+        };
+
+        let l2_to_l1_logs = self
+            .get_l2_to_l1_logs_for_batch::<UserL2ToL1Log>(number)
+            .await?;
+        Ok(Some(L1BatchWithOptionalMetadata {
+            header: l1_batch
+                .clone()
+                .into_l1_batch_header_with_logs(l2_to_l1_logs),
+            metadata: l1_batch.try_into(),
+        }))
     }
 
     pub async fn get_l1_batch_tree_data(
@@ -1729,17 +1777,26 @@ impl BlocksDal<'_, '_> {
         }))
     }
 
-    pub async fn get_l1_batch_with_metadata(
+    async fn map_storage_l1_batch(
         &mut self,
         storage_batch: StorageL1Batch,
     ) -> DalResult<Option<L1BatchWithMetadata>> {
         let unsorted_factory_deps = self
             .get_l1_batch_factory_deps(L1BatchNumber(storage_batch.number as u32))
             .await?;
-        let header: L1BatchHeader = storage_batch.clone().into();
-        let Ok(metadata) = storage_batch.try_into() else {
+
+        let l2_to_l1_logs = self
+            .get_l2_to_l1_logs_for_batch::<UserL2ToL1Log>(L1BatchNumber(
+                storage_batch.number as u32,
+            ))
+            .await?;
+
+        let Ok(metadata) = storage_batch.clone().try_into() else {
             return Ok(None);
         };
+
+        let header: L1BatchHeader = storage_batch.into_l1_batch_header_with_logs(l2_to_l1_logs);
+
         let raw_published_bytecode_hashes = self
             .storage
             .events_dal()
@@ -2060,29 +2117,6 @@ impl BlocksDal<'_, '_> {
         Ok(())
     }
 
-    pub async fn get_l2_block_protocol_version_id(
-        &mut self,
-        l2_block_number: L2BlockNumber,
-    ) -> DalResult<Option<ProtocolVersionId>> {
-        Ok(sqlx::query!(
-            r#"
-            SELECT
-                protocol_version
-            FROM
-                miniblocks
-            WHERE
-                number = $1
-            "#,
-            i64::from(l2_block_number.0)
-        )
-        .try_map(|row| row.protocol_version.map(parse_protocol_version).transpose())
-        .instrument("get_l2_block_protocol_version_id")
-        .with_arg("l2_block_number", &l2_block_number)
-        .fetch_optional(self.storage)
-        .await?
-        .flatten())
-    }
-
     pub async fn get_fee_address_for_l2_block(
         &mut self,
         number: L2BlockNumber,
@@ -2181,6 +2215,125 @@ impl BlocksDal<'_, '_> {
         .await?;
         Ok(())
     }
+
+    pub async fn set_tree_writes(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+        tree_writes: Vec<TreeWrite>,
+    ) -> DalResult<()> {
+        let instrumentation =
+            Instrumented::new("set_tree_writes").with_arg("l1_batch_number", &l1_batch_number);
+        let tree_writes = bincode::serialize(&tree_writes)
+            .map_err(|err| instrumentation.arg_error("tree_writes", err))?;
+
+        let query = sqlx::query!(
+            r#"
+            UPDATE l1_batches
+            SET
+                tree_writes = $1
+            WHERE
+                number = $2
+            "#,
+            &tree_writes,
+            i64::from(l1_batch_number.0),
+        );
+
+        instrumentation.with(query).execute(self.storage).await?;
+
+        Ok(())
+    }
+
+    pub async fn get_tree_writes(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> DalResult<Option<Vec<TreeWrite>>> {
+        Ok(sqlx::query!(
+            r#"
+            SELECT
+                tree_writes
+            FROM
+                l1_batches
+            WHERE
+                number = $1
+            "#,
+            i64::from(l1_batch_number.0),
+        )
+        .try_map(|row| {
+            row.tree_writes
+                .map(|data| bincode::deserialize(&data).decode_column("tree_writes"))
+                .transpose()
+        })
+        .instrument("get_tree_writes")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .fetch_optional(self.storage)
+        .await?
+        .flatten())
+    }
+
+    pub async fn check_tree_writes_presence(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> DalResult<bool> {
+        Ok(sqlx::query!(
+            r#"
+            SELECT
+                (tree_writes IS NOT NULL) AS "tree_writes_are_present!"
+            FROM
+                l1_batches
+            WHERE
+                number = $1
+            "#,
+            i64::from(l1_batch_number.0),
+        )
+        .instrument("check_tree_writes_presence")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .fetch_optional(self.storage)
+        .await?
+        .map(|row| row.tree_writes_are_present)
+        .unwrap_or(false))
+    }
+
+    pub(crate) async fn get_l2_to_l1_logs_for_batch<L>(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> DalResult<Vec<L>>
+    where
+        L: From<StorageL2ToL1Log>,
+    {
+        let results = sqlx::query_as!(
+            StorageL2ToL1Log,
+            r#"
+            SELECT
+                miniblock_number,
+                log_index_in_miniblock,
+                log_index_in_tx,
+                tx_hash,
+                l1_batch_number,
+                shard_id,
+                is_service,
+                tx_index_in_miniblock,
+                tx_index_in_l1_batch,
+                sender,
+                key,
+                value
+            FROM
+                l2_to_l1_logs
+                JOIN miniblocks ON l2_to_l1_logs.miniblock_number = miniblocks.number
+            WHERE
+                l1_batch_number = $1
+            ORDER BY
+                miniblock_number,
+                log_index_in_miniblock
+            "#,
+            i64::from(l1_batch_number.0)
+        )
+        .instrument("get_l2_to_l1_logs_by_number")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .fetch_all(self.storage)
+        .await?;
+
+        Ok(results.into_iter().map(L::from).collect())
+    }
 }
 
 /// These methods should only be used for tests.
@@ -2230,52 +2383,192 @@ impl BlocksDal<'_, '_> {
         self.delete_logs_inner().await?;
         Ok(())
     }
+
+    /// Obtains a protocol version projected to be applied for the next L2 block. This is either the version used by the last
+    /// sealed L2 block, or (if there are no L2 blocks), one referenced in the snapshot recovery record.
+    pub async fn pending_protocol_version(&mut self) -> anyhow::Result<ProtocolVersionId> {
+        static WARNED_ABOUT_NO_VERSION: AtomicBool = AtomicBool::new(false);
+
+        let last_l2_block = self
+            .storage
+            .blocks_dal()
+            .get_last_sealed_l2_block_header()
+            .await?;
+        if let Some(last_l2_block) = last_l2_block {
+            return Ok(last_l2_block.protocol_version.unwrap_or_else(|| {
+                // Protocol version should be set for the most recent L2 block even in cases it's not filled
+                // for old L2 blocks, hence the warning. We don't want to rely on this assumption, so we treat
+                // the lack of it as in other similar places, replacing with the default value.
+                if !WARNED_ABOUT_NO_VERSION.fetch_or(true, Ordering::Relaxed) {
+                    tracing::warn!(
+                        "Protocol version not set for recent L2 block: {last_l2_block:?}"
+                    );
+                }
+                ProtocolVersionId::last_potentially_undefined()
+            }));
+        }
+        // No L2 blocks in the storage; use snapshot recovery information.
+        let snapshot_recovery = self
+            .storage
+            .snapshot_recovery_dal()
+            .get_applied_snapshot_status()
+            .await?
+            .context("storage contains neither L2 blocks, nor snapshot recovery info")?;
+        Ok(snapshot_recovery.protocol_version)
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use zksync_contracts::BaseSystemContractsHashes;
-    use zksync_types::{
-        l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log},
-        Address, ProtocolVersion, ProtocolVersionId,
-    };
+    use zksync_types::{tx::IncludedTxLocation, Address, ProtocolVersion, ProtocolVersionId};
 
     use super::*;
-    use crate::{ConnectionPool, Core, CoreDal};
+    use crate::{
+        tests::{create_l1_batch_header, create_l2_block_header, create_l2_to_l1_log},
+        ConnectionPool, Core, CoreDal,
+    };
+
+    async fn save_mock_eth_tx(action_type: AggregatedActionType, conn: &mut Connection<'_, Core>) {
+        conn.eth_sender_dal()
+            .save_eth_tx(1, vec![], action_type, Address::default(), 1, None, None)
+            .await
+            .unwrap();
+    }
+
+    fn mock_l1_batch_header() -> L1BatchHeader {
+        let mut header = create_l1_batch_header(1);
+        header.l1_tx_count = 3;
+        header.l2_tx_count = 5;
+        header.l2_to_l1_logs.push(create_l2_to_l1_log(0, 0));
+        header.l2_to_l1_messages.push(vec![22; 22]);
+        header.l2_to_l1_messages.push(vec![33; 33]);
+
+        header
+    }
+
+    async fn insert_mock_l1_batch_header(conn: &mut Connection<'_, Core>, header: &L1BatchHeader) {
+        conn.blocks_dal()
+            .insert_mock_l1_batch(header)
+            .await
+            .unwrap();
+    }
+
+    #[tokio::test]
+    async fn set_tx_id_works_correctly() {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = pool.connection().await.unwrap();
+
+        conn.protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
+            .await
+            .unwrap();
+
+        let header = mock_l1_batch_header();
+
+        insert_mock_l1_batch_header(&mut conn, &header).await;
+
+        save_mock_eth_tx(AggregatedActionType::Commit, &mut conn).await;
+        save_mock_eth_tx(AggregatedActionType::PublishProofOnchain, &mut conn).await;
+        save_mock_eth_tx(AggregatedActionType::Execute, &mut conn).await;
+
+        assert!(conn
+            .blocks_dal()
+            .set_eth_tx_id(
+                L1BatchNumber(1)..=L1BatchNumber(1),
+                1,
+                AggregatedActionType::Commit,
+            )
+            .await
+            .is_ok());
+
+        assert!(conn
+            .blocks_dal()
+            .set_eth_tx_id(
+                L1BatchNumber(1)..=L1BatchNumber(1),
+                2,
+                AggregatedActionType::Commit,
+            )
+            .await
+            .is_err());
+
+        assert!(conn
+            .blocks_dal()
+            .set_eth_tx_id(
+                L1BatchNumber(1)..=L1BatchNumber(1),
+                1,
+                AggregatedActionType::PublishProofOnchain,
+            )
+            .await
+            .is_ok());
+
+        assert!(conn
+            .blocks_dal()
+            .set_eth_tx_id(
+                L1BatchNumber(1)..=L1BatchNumber(1),
+                2,
+                AggregatedActionType::PublishProofOnchain,
+            )
+            .await
+            .is_err());
+
+        assert!(conn
+            .blocks_dal()
+            .set_eth_tx_id(
+                L1BatchNumber(1)..=L1BatchNumber(1),
+                1,
+                AggregatedActionType::Execute,
+            )
+            .await
+            .is_ok());
+
+        assert!(conn
+            .blocks_dal()
+            .set_eth_tx_id(
+                L1BatchNumber(1)..=L1BatchNumber(1),
+                2,
+                AggregatedActionType::Execute,
+            )
+            .await
+            .is_err());
+    }
 
     #[tokio::test]
     async fn loading_l1_batch_header() {
         let pool = ConnectionPool::<Core>::test_pool().await;
         let mut conn = pool.connection().await.unwrap();
+
         conn.protocol_versions_dal()
             .save_protocol_version_with_tx(&ProtocolVersion::default())
             .await
             .unwrap();
 
-        let mut header = L1BatchHeader::new(
-            L1BatchNumber(1),
-            100,
-            BaseSystemContractsHashes {
-                bootloader: H256::repeat_byte(1),
-                default_aa: H256::repeat_byte(42),
-            },
-            ProtocolVersionId::latest(),
-        );
-        header.l1_tx_count = 3;
-        header.l2_tx_count = 5;
-        header.l2_to_l1_logs.push(UserL2ToL1Log(L2ToL1Log {
-            shard_id: 0,
-            is_service: false,
-            tx_number_in_block: 2,
-            sender: Address::repeat_byte(2),
-            key: H256::repeat_byte(3),
-            value: H256::zero(),
-        }));
-        header.l2_to_l1_messages.push(vec![22; 22]);
-        header.l2_to_l1_messages.push(vec![33; 33]);
+        let header = mock_l1_batch_header();
+
+        insert_mock_l1_batch_header(&mut conn, &header).await;
+
+        let l2_block_header = create_l2_block_header(1);
 
         conn.blocks_dal()
-            .insert_mock_l1_batch(&header)
+            .insert_l2_block(&l2_block_header)
+            .await
+            .unwrap();
+
+        conn.blocks_dal()
+            .mark_l2_blocks_as_executed_in_l1_batch(L1BatchNumber(1))
+            .await
+            .unwrap();
+
+        let first_location = IncludedTxLocation {
+            tx_hash: H256([1; 32]),
+            tx_index_in_l2_block: 0,
+            tx_initiator_address: Address::repeat_byte(2),
+        };
+        let first_logs = [create_l2_to_l1_log(0, 0)];
+
+        let all_logs = vec![(first_location, first_logs.iter().collect())];
+        conn.events_dal()
+            .save_user_l2_to_l1_logs(L2BlockNumber(1), &all_logs)
             .await
             .unwrap();
 
@@ -2285,6 +2578,7 @@ mod tests {
             .await
             .unwrap()
             .unwrap();
+
         assert_eq!(loaded_header.number, header.number);
         assert_eq!(loaded_header.timestamp, header.timestamp);
         assert_eq!(loaded_header.l1_tx_count, header.l1_tx_count);
diff --git a/core/lib/dal/src/blocks_web3_dal.rs b/core/lib/dal/src/blocks_web3_dal.rs
index 81a288795719..2957701f9e23 100644
--- a/core/lib/dal/src/blocks_web3_dal.rs
+++ b/core/lib/dal/src/blocks_web3_dal.rs
@@ -14,6 +14,7 @@ use zksync_utils::bigdecimal_to_u256;
 
 use crate::{
     models::{
+        parse_protocol_version,
         storage_block::{
             ResolvedL1BatchForL2Block, StorageBlockDetails, StorageL1BatchDetails,
             LEGACY_BLOCK_GAS_LIMIT,
@@ -164,18 +165,26 @@ impl BlocksWeb3Dal<'_, '_> {
         &mut self,
         from_block: L2BlockNumber,
     ) -> DalResult<Vec<BlockHeader>> {
-        let rows = sqlx::query!(
+        let blocks_rows: Vec<_> = sqlx::query!(
             r#"
             SELECT
-                hash,
-                number,
-                timestamp
+                miniblocks.hash AS "block_hash",
+                miniblocks.number AS "block_number",
+                prev_miniblock.hash AS "parent_hash?",
+                miniblocks.timestamp AS "block_timestamp",
+                miniblocks.base_fee_per_gas AS "base_fee_per_gas",
+                miniblocks.gas_limit AS "block_gas_limit?",
+                transactions.gas_limit AS "transaction_gas_limit?",
+                transactions.refunded_gas AS "transaction_refunded_gas?"
             FROM
                 miniblocks
+                LEFT JOIN miniblocks prev_miniblock ON prev_miniblock.number = miniblocks.number - 1
+                LEFT JOIN transactions ON transactions.miniblock_number = miniblocks.number
             WHERE
-                number > $1
+                miniblocks.number > $1
             ORDER BY
-                number ASC
+                miniblocks.number ASC,
+                transactions.index_in_block ASC
             "#,
             i64::from(from_block.0),
         )
@@ -184,27 +193,50 @@ impl BlocksWeb3Dal<'_, '_> {
         .fetch_all(self.storage)
         .await?;
 
-        let blocks = rows.into_iter().map(|row| BlockHeader {
-            hash: Some(H256::from_slice(&row.hash)),
-            parent_hash: H256::zero(),
-            uncles_hash: EMPTY_UNCLES_HASH,
-            author: H160::zero(),
-            state_root: H256::zero(),
-            transactions_root: H256::zero(),
-            receipts_root: H256::zero(),
-            number: Some(U64::from(row.number)),
-            gas_used: U256::zero(),
-            gas_limit: U256::zero(),
-            base_fee_per_gas: None,
-            extra_data: Bytes::default(),
-            // TODO: include logs
-            logs_bloom: H2048::default(),
-            timestamp: U256::from(row.timestamp),
-            difficulty: U256::zero(),
-            mix_hash: None,
-            nonce: None,
-        });
-        Ok(blocks.collect())
+        let mut headers_map = std::collections::HashMap::new();
+
+        for row in blocks_rows.iter() {
+            let entry = headers_map
+                .entry(row.block_number)
+                .or_insert_with(|| BlockHeader {
+                    hash: Some(H256::from_slice(&row.block_hash)),
+                    parent_hash: row
+                        .parent_hash
+                        .as_deref()
+                        .map_or_else(H256::zero, H256::from_slice),
+                    uncles_hash: EMPTY_UNCLES_HASH,
+                    author: H160::zero(),
+                    state_root: H256::zero(),
+                    transactions_root: H256::zero(),
+                    receipts_root: H256::zero(),
+                    number: Some(U64::from(row.block_number)),
+                    gas_used: U256::zero(),
+                    gas_limit: (row
+                        .block_gas_limit
+                        .unwrap_or(i64::from(LEGACY_BLOCK_GAS_LIMIT))
+                        as u64)
+                        .into(),
+                    base_fee_per_gas: Some(bigdecimal_to_u256(row.base_fee_per_gas.clone())),
+                    extra_data: Bytes::default(),
+                    logs_bloom: H2048::default(),
+                    timestamp: U256::from(row.block_timestamp),
+                    difficulty: U256::zero(),
+                    mix_hash: None,
+                    nonce: None,
+                });
+
+            if let (Some(gas_limit), Some(refunded_gas)) = (
+                row.transaction_gas_limit.clone(),
+                row.transaction_refunded_gas,
+            ) {
+                entry.gas_used += bigdecimal_to_u256(gas_limit) - U256::from(refunded_gas as u64);
+            }
+        }
+
+        let mut headers: Vec<BlockHeader> = headers_map.into_values().collect();
+        headers.sort_by_key(|header| header.number);
+
+        Ok(headers)
     }
 
     pub async fn resolve_block_id(
@@ -239,6 +271,24 @@ impl BlocksWeb3Dal<'_, '_> {
                 api::BlockId::Number(api::BlockNumber::Latest | api::BlockNumber::Committed) => (
                     "SELECT MAX(number) AS number FROM miniblocks";
                 ),
+                api::BlockId::Number(api::BlockNumber::L1Committed) => (
+                    "
+                    SELECT COALESCE(
+                        (
+                            SELECT MAX(number) FROM miniblocks
+                            WHERE l1_batch_number = (
+                                SELECT number FROM l1_batches
+                                JOIN eth_txs ON
+                                    l1_batches.eth_commit_tx_id = eth_txs.id
+                                WHERE
+                                    eth_txs.confirmed_eth_tx_history_id IS NOT NULL
+                                ORDER BY number DESC LIMIT 1
+                            )
+                        ),
+                        0
+                    ) AS number
+                    ";
+                ),
                 api::BlockId::Number(api::BlockNumber::Finalized) => (
                     "
                     SELECT COALESCE(
@@ -374,28 +424,10 @@ impl BlocksWeb3Dal<'_, '_> {
         &mut self,
         l1_batch_number: L1BatchNumber,
     ) -> DalResult<Vec<L2ToL1Log>> {
-        let raw_logs = sqlx::query!(
-            r#"
-            SELECT
-                l2_to_l1_logs
-            FROM
-                l1_batches
-            WHERE
-                number = $1
-            "#,
-            i64::from(l1_batch_number.0)
-        )
-        .instrument("get_l2_to_l1_logs")
-        .with_arg("l1_batch_number", &l1_batch_number)
-        .fetch_optional(self.storage)
-        .await?
-        .map(|row| row.l2_to_l1_logs)
-        .unwrap_or_default();
-
-        Ok(raw_logs
-            .into_iter()
-            .map(|bytes| L2ToL1Log::from_slice(&bytes))
-            .collect())
+        self.storage
+            .blocks_dal()
+            .get_l2_to_l1_logs_for_batch::<L2ToL1Log>(l1_batch_number)
+            .await
     }
 
     pub async fn get_l1_batch_number_of_l2_block(
@@ -486,12 +518,27 @@ impl BlocksWeb3Dal<'_, '_> {
         &mut self,
         block_number: L2BlockNumber,
     ) -> DalResult<Vec<Call>> {
-        let protocol_version = self
-            .storage
-            .blocks_dal()
-            .get_l2_block_protocol_version_id(block_number)
-            .await?
-            .unwrap_or_else(ProtocolVersionId::last_potentially_undefined);
+        let protocol_version = sqlx::query!(
+            r#"
+            SELECT
+                protocol_version
+            FROM
+                miniblocks
+            WHERE
+                number = $1
+            "#,
+            i64::from(block_number.0)
+        )
+        .try_map(|row| row.protocol_version.map(parse_protocol_version).transpose())
+        .instrument("get_traces_for_l2_block#get_l2_block_protocol_version_id")
+        .with_arg("l2_block_number", &block_number)
+        .fetch_optional(self.storage)
+        .await?;
+        let Some(protocol_version) = protocol_version else {
+            return Ok(Vec::new());
+        };
+        let protocol_version =
+            protocol_version.unwrap_or_else(ProtocolVersionId::last_potentially_undefined);
 
         Ok(sqlx::query_as!(
             CallTrace,
@@ -582,6 +629,7 @@ impl BlocksWeb3Dal<'_, '_> {
                 execute_tx.confirmed_at AS "executed_at?",
                 miniblocks.l1_gas_price,
                 miniblocks.l2_fair_gas_price,
+                miniblocks.fair_pubdata_price,
                 miniblocks.bootloader_code_hash,
                 miniblocks.default_aa_code_hash,
                 miniblocks.protocol_version,
@@ -626,7 +674,8 @@ impl BlocksWeb3Dal<'_, '_> {
                 mb AS (
                     SELECT
                         l1_gas_price,
-                        l2_fair_gas_price
+                        l2_fair_gas_price,
+                        fair_pubdata_price
                     FROM
                         miniblocks
                     WHERE
@@ -648,6 +697,7 @@ impl BlocksWeb3Dal<'_, '_> {
                 execute_tx.confirmed_at AS "executed_at?",
                 mb.l1_gas_price,
                 mb.l2_fair_gas_price,
+                mb.fair_pubdata_price,
                 l1_batches.bootloader_code_hash,
                 l1_batches.default_aa_code_hash
             FROM
@@ -683,6 +733,7 @@ impl BlocksWeb3Dal<'_, '_> {
 #[cfg(test)]
 mod tests {
     use zksync_types::{
+        aggregated_operations::AggregatedActionType,
         block::{L2BlockHasher, L2BlockHeader},
         fee::TransactionExecutionMetrics,
         Address, L2BlockNumber, ProtocolVersion, ProtocolVersionId,
@@ -691,10 +742,10 @@ mod tests {
     use super::*;
     use crate::{
         tests::{
-            create_l2_block_header, create_snapshot_recovery, mock_execution_result,
-            mock_l2_transaction,
+            create_l1_batch_header, create_l2_block_header, create_snapshot_recovery,
+            mock_execution_result, mock_l2_transaction,
         },
-        ConnectionPool, Core,
+        ConnectionPool, Core, CoreDal,
     };
 
     #[tokio::test]
@@ -852,6 +903,79 @@ mod tests {
         assert_eq!(l2_block_number, Some(L2BlockNumber(43)));
     }
 
+    #[tokio::test]
+    async fn resolving_l1_committed_block_id() {
+        let connection_pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = connection_pool.connection().await.unwrap();
+        conn.protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
+            .await
+            .unwrap();
+
+        let l2_block_header = create_l2_block_header(1);
+        conn.blocks_dal()
+            .insert_l2_block(&l2_block_header)
+            .await
+            .unwrap();
+
+        let l1_batch_header = create_l1_batch_header(0);
+
+        conn.blocks_dal()
+            .insert_mock_l1_batch(&l1_batch_header)
+            .await
+            .unwrap();
+        conn.blocks_dal()
+            .mark_l2_blocks_as_executed_in_l1_batch(l1_batch_header.number)
+            .await
+            .unwrap();
+
+        let resolved_l2_block_number = conn
+            .blocks_web3_dal()
+            .resolve_block_id(api::BlockId::Number(api::BlockNumber::L1Committed))
+            .await
+            .unwrap();
+        assert_eq!(resolved_l2_block_number, Some(L2BlockNumber(0)));
+
+        let mocked_commit_eth_tx = conn
+            .eth_sender_dal()
+            .save_eth_tx(
+                0,
+                vec![],
+                AggregatedActionType::Commit,
+                Address::default(),
+                0,
+                None,
+                None,
+            )
+            .await
+            .unwrap();
+        let tx_hash = H256::random();
+        conn.eth_sender_dal()
+            .insert_tx_history(mocked_commit_eth_tx.id, 0, 0, None, tx_hash, &[], 0)
+            .await
+            .unwrap();
+        conn.eth_sender_dal()
+            .confirm_tx(tx_hash, U256::zero())
+            .await
+            .unwrap();
+        conn.blocks_dal()
+            .set_eth_tx_id(
+                l1_batch_header.number..=l1_batch_header.number,
+                mocked_commit_eth_tx.id,
+                AggregatedActionType::Commit,
+            )
+            .await
+            .unwrap();
+
+        let resolved_l2_block_number = conn
+            .blocks_web3_dal()
+            .resolve_block_id(api::BlockId::Number(api::BlockNumber::L1Committed))
+            .await
+            .unwrap();
+
+        assert_eq!(resolved_l2_block_number, Some(l2_block_header.number));
+    }
+
     #[tokio::test]
     async fn resolving_block_by_hash() {
         let connection_pool = ConnectionPool::<Core>::test_pool().await;
@@ -912,7 +1036,13 @@ mod tests {
             tx_results.push(tx_result);
         }
         conn.transactions_dal()
-            .mark_txs_as_executed_in_l2_block(L2BlockNumber(1), &tx_results, 1.into())
+            .mark_txs_as_executed_in_l2_block(
+                L2BlockNumber(1),
+                &tx_results,
+                1.into(),
+                ProtocolVersionId::latest(),
+                false,
+            )
             .await
             .unwrap();
 
diff --git a/core/lib/dal/src/consensus/mod.rs b/core/lib/dal/src/consensus/mod.rs
index 1829c130970d..fac045ce2224 100644
--- a/core/lib/dal/src/consensus/mod.rs
+++ b/core/lib/dal/src/consensus/mod.rs
@@ -7,6 +7,7 @@ use anyhow::{anyhow, Context as _};
 use zksync_consensus_roles::validator;
 use zksync_protobuf::{required, ProtoFmt, ProtoRepr};
 use zksync_types::{
+    abi, ethabi,
     fee::Fee,
     l1::{OpProcessingType, PriorityQueueType},
     l2::TransactionType,
@@ -38,38 +39,59 @@ pub struct Payload {
 impl ProtoFmt for Payload {
     type Proto = proto::Payload;
 
-    fn read(message: &Self::Proto) -> anyhow::Result<Self> {
-        let mut transactions = Vec::with_capacity(message.transactions.len());
-        for (i, tx) in message.transactions.iter().enumerate() {
-            transactions.push(tx.read().with_context(|| format!("transactions[{i}]"))?)
+    fn read(r: &Self::Proto) -> anyhow::Result<Self> {
+        let protocol_version = required(&r.protocol_version)
+            .and_then(|x| Ok(ProtocolVersionId::try_from(u16::try_from(*x)?)?))
+            .context("protocol_version")?;
+        let mut transactions = vec![];
+
+        match protocol_version {
+            v if v >= ProtocolVersionId::Version25 => {
+                anyhow::ensure!(
+                    r.transactions.is_empty(),
+                    "transactions should be empty in protocol_version {v}"
+                );
+                for (i, tx) in r.transactions_v25.iter().enumerate() {
+                    transactions.push(
+                        tx.read()
+                            .with_context(|| format!("transactions_v25[{i}]"))?,
+                    );
+                }
+            }
+            v => {
+                anyhow::ensure!(
+                    r.transactions_v25.is_empty(),
+                    "transactions_v25 should be empty in protocol_version {v}"
+                );
+                for (i, tx) in r.transactions.iter().enumerate() {
+                    transactions.push(tx.read().with_context(|| format!("transactions[{i}]"))?)
+                }
+            }
         }
 
         Ok(Self {
-            protocol_version: required(&message.protocol_version)
-                .and_then(|x| Ok(ProtocolVersionId::try_from(u16::try_from(*x)?)?))
-                .context("protocol_version")?,
-            hash: required(&message.hash)
+            protocol_version,
+            hash: required(&r.hash)
                 .and_then(|h| parse_h256(h))
                 .context("hash")?,
             l1_batch_number: L1BatchNumber(
-                *required(&message.l1_batch_number).context("l1_batch_number")?,
+                *required(&r.l1_batch_number).context("l1_batch_number")?,
             ),
-            timestamp: *required(&message.timestamp).context("timestamp")?,
-            l1_gas_price: *required(&message.l1_gas_price).context("l1_gas_price")?,
-            l2_fair_gas_price: *required(&message.l2_fair_gas_price)
-                .context("l2_fair_gas_price")?,
-            fair_pubdata_price: message.fair_pubdata_price,
-            virtual_blocks: *required(&message.virtual_blocks).context("virtual_blocks")?,
-            operator_address: required(&message.operator_address)
+            timestamp: *required(&r.timestamp).context("timestamp")?,
+            l1_gas_price: *required(&r.l1_gas_price).context("l1_gas_price")?,
+            l2_fair_gas_price: *required(&r.l2_fair_gas_price).context("l2_fair_gas_price")?,
+            fair_pubdata_price: r.fair_pubdata_price,
+            virtual_blocks: *required(&r.virtual_blocks).context("virtual_blocks")?,
+            operator_address: required(&r.operator_address)
                 .and_then(|a| parse_h160(a))
                 .context("operator_address")?,
             transactions,
-            last_in_batch: *required(&message.last_in_batch).context("last_in_batch")?,
+            last_in_batch: *required(&r.last_in_batch).context("last_in_batch")?,
         })
     }
 
     fn build(&self) -> Self::Proto {
-        Self::Proto {
+        let mut x = Self::Proto {
             protocol_version: Some((self.protocol_version as u16).into()),
             hash: Some(self.hash.as_bytes().into()),
             l1_batch_number: Some(self.l1_batch_number.0),
@@ -80,13 +102,19 @@ impl ProtoFmt for Payload {
             virtual_blocks: Some(self.virtual_blocks),
             operator_address: Some(self.operator_address.as_bytes().into()),
             // Transactions are stored in execution order, therefore order is deterministic.
-            transactions: self
-                .transactions
-                .iter()
-                .map(proto::Transaction::build)
-                .collect(),
+            transactions: vec![],
+            transactions_v25: vec![],
             last_in_batch: Some(self.last_in_batch),
+        };
+        match self.protocol_version {
+            v if v >= ProtocolVersionId::Version25 => {
+                x.transactions_v25 = self.transactions.iter().map(ProtoRepr::build).collect();
+            }
+            _ => {
+                x.transactions = self.transactions.iter().map(ProtoRepr::build).collect();
+            }
         }
+        x
     }
 }
 
@@ -100,6 +128,50 @@ impl Payload {
     }
 }
 
+impl ProtoRepr for proto::TransactionV25 {
+    type Type = Transaction;
+
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        use proto::transaction_v25::T;
+        let tx = match required(&self.t)? {
+            T::L1(l1) => abi::Transaction::L1 {
+                tx: required(&l1.rlp)
+                    .and_then(|x| {
+                        let tokens = ethabi::decode(&[abi::L2CanonicalTransaction::schema()], x)
+                            .context("ethabi::decode()")?;
+                        // Unwrap is safe because `ethabi::decode` does the verification.
+                        let tx =
+                            abi::L2CanonicalTransaction::decode(tokens.into_iter().next().unwrap())
+                                .context("L2CanonicalTransaction::decode()")?;
+                        Ok(tx)
+                    })
+                    .context("rlp")?
+                    .into(),
+                factory_deps: l1.factory_deps.clone(),
+                eth_block: 0,
+            },
+            T::L2(l2) => abi::Transaction::L2(required(&l2.rlp).context("rlp")?.clone()),
+        };
+        tx.try_into()
+    }
+
+    fn build(tx: &Self::Type) -> Self {
+        let tx = abi::Transaction::try_from(tx.clone()).unwrap();
+        use proto::transaction_v25::T;
+        Self {
+            t: Some(match tx {
+                abi::Transaction::L1 {
+                    tx, factory_deps, ..
+                } => T::L1(proto::L1Transaction {
+                    rlp: Some(ethabi::encode(&[tx.encode()])),
+                    factory_deps,
+                }),
+                abi::Transaction::L2(tx) => T::L2(proto::L2Transaction { rlp: Some(tx) }),
+            }),
+        }
+    }
+}
+
 impl ProtoRepr for proto::Transaction {
     type Type = Transaction;
 
@@ -109,6 +181,17 @@ impl ProtoRepr for proto::Transaction {
         Ok(Self::Type {
             common_data: match common_data {
                 proto::transaction::CommonData::L1(common_data) => {
+                    anyhow::ensure!(
+                        *required(&common_data.deadline_block)
+                            .context("common_data.deadline_block")?
+                            == 0
+                    );
+                    anyhow::ensure!(
+                        required(&common_data.eth_hash)
+                            .and_then(|x| parse_h256(x))
+                            .context("common_data.eth_hash")?
+                            == H256::default()
+                    );
                     ExecuteTransactionCommon::L1(L1TxCommonData {
                         sender: required(&common_data.sender_address)
                             .and_then(|x| parse_h160(x))
@@ -116,8 +199,6 @@ impl ProtoRepr for proto::Transaction {
                         serial_id: required(&common_data.serial_id)
                             .map(|x| PriorityOpId(*x))
                             .context("common_data.serial_id")?,
-                        deadline_block: *required(&common_data.deadline_block)
-                            .context("common_data.deadline_block")?,
                         layer_2_tip_fee: required(&common_data.layer_2_tip_fee)
                             .and_then(|x| parse_h256(x))
                             .map(h256_to_u256)
@@ -150,9 +231,6 @@ impl ProtoRepr for proto::Transaction {
                                     .map_err(|_| anyhow!("u8::try_from"))
                             })
                             .context("common_data.priority_queue_type")?,
-                        eth_hash: required(&common_data.eth_hash)
-                            .and_then(|x| parse_h256(x))
-                            .context("common_data.eth_hash")?,
                         eth_block: *required(&common_data.eth_block)
                             .context("common_data.eth_block")?,
                         canonical_tx_hash: required(&common_data.canonical_tx_hash)
@@ -247,9 +325,6 @@ impl ProtoRepr for proto::Transaction {
                             .and_then(|x| parse_h256(x))
                             .map(h256_to_u256)
                             .context("common_data.gas_per_pubdata_limit")?,
-                        eth_hash: required(&common_data.eth_hash)
-                            .and_then(|x| parse_h256(x))
-                            .context("common_data.eth_hash")?,
                         eth_block: *required(&common_data.eth_block)
                             .context("common_data.eth_block")?,
                         canonical_tx_hash: required(&common_data.canonical_tx_hash)
@@ -274,10 +349,7 @@ impl ProtoRepr for proto::Transaction {
                     .and_then(|x| parse_h256(x))
                     .map(h256_to_u256)
                     .context("execute.value")?,
-                factory_deps: match execute.factory_deps.is_empty() {
-                    true => None,
-                    false => Some(execute.factory_deps.clone()),
-                },
+                factory_deps: execute.factory_deps.clone(),
             },
             received_timestamp_ms: 0, // This timestamp is local to the node
             raw_bytes: self.raw_bytes.as_ref().map(|x| x.clone().into()),
@@ -290,7 +362,7 @@ impl ProtoRepr for proto::Transaction {
                 proto::transaction::CommonData::L1(proto::L1TxCommonData {
                     sender_address: Some(data.sender.as_bytes().into()),
                     serial_id: Some(data.serial_id.0),
-                    deadline_block: Some(data.deadline_block),
+                    deadline_block: Some(0),
                     layer_2_tip_fee: Some(u256_to_h256(data.layer_2_tip_fee).as_bytes().into()),
                     full_fee: Some(u256_to_h256(data.full_fee).as_bytes().into()),
                     max_fee_per_gas: Some(u256_to_h256(data.max_fee_per_gas).as_bytes().into()),
@@ -300,7 +372,7 @@ impl ProtoRepr for proto::Transaction {
                     ),
                     op_processing_type: Some(data.op_processing_type as u32),
                     priority_queue_type: Some(data.priority_queue_type as u32),
-                    eth_hash: Some(data.eth_hash.as_bytes().into()),
+                    eth_hash: Some(H256::default().as_bytes().into()),
                     eth_block: Some(data.eth_block),
                     canonical_tx_hash: Some(data.canonical_tx_hash.as_bytes().into()),
                     to_mint: Some(u256_to_h256(data.to_mint).as_bytes().into()),
@@ -345,7 +417,7 @@ impl ProtoRepr for proto::Transaction {
                         gas_per_pubdata_limit: Some(
                             u256_to_h256(data.gas_per_pubdata_limit).as_bytes().into(),
                         ),
-                        eth_hash: Some(data.eth_hash.as_bytes().into()),
+                        eth_hash: Some(H256::default().as_bytes().into()),
                         eth_block: Some(data.eth_block),
                         canonical_tx_hash: Some(data.canonical_tx_hash.as_bytes().into()),
                         to_mint: Some(u256_to_h256(data.to_mint).as_bytes().into()),
@@ -358,10 +430,7 @@ impl ProtoRepr for proto::Transaction {
             contract_address: Some(this.execute.contract_address.as_bytes().into()),
             calldata: Some(this.execute.calldata.clone()),
             value: Some(u256_to_h256(this.execute.value).as_bytes().into()),
-            factory_deps: match &this.execute.factory_deps {
-                Some(inner) => inner.clone(),
-                None => vec![],
-            },
+            factory_deps: this.execute.factory_deps.clone(),
         };
         Self {
             common_data: Some(common_data),
diff --git a/core/lib/dal/src/consensus/proto/mod.proto b/core/lib/dal/src/consensus/proto/mod.proto
index 711c964f5341..a7b5ea344152 100644
--- a/core/lib/dal/src/consensus/proto/mod.proto
+++ b/core/lib/dal/src/consensus/proto/mod.proto
@@ -13,11 +13,33 @@ message Payload {
   optional uint64 fair_pubdata_price = 11; // required since 1.4.1; gwei
   optional uint32 virtual_blocks = 6; // required
   optional bytes operator_address = 7; // required; H160
+  // Set for protocol_version < 25.
   repeated Transaction transactions = 8;
+  // Set for protocol_version >= 25.
+  repeated TransactionV25 transactions_v25 = 12;
   optional bool last_in_batch = 10; // required
 }
 
+message L1Transaction {
+  optional bytes rlp = 1; // required; RLP encoded L2CanonicalTransaction
+  repeated bytes factory_deps = 2;
+}
+
+message L2Transaction {
+  optional bytes rlp = 1; // required; RLP encoded TransactionRequest
+}
+
+message TransactionV25 {
+  // required
+  oneof t {
+    L1Transaction l1 = 1;
+    L2Transaction l2 = 2;
+  }
+}
+
 message Transaction {
+  reserved 5;
+  reserved "received_timestamp_ms";
   oneof common_data {
     L1TxCommonData l1 = 1;
     L2TxCommonData l2 = 2;
@@ -30,7 +52,6 @@ message Transaction {
 message L1TxCommonData {
   optional bytes sender_address = 1; // required; H160
   optional uint64 serial_id = 2; // required
-  optional uint64 deadline_block = 3; // required
   optional bytes layer_2_tip_fee = 4; // required; U256
   optional bytes full_fee = 5; // required; U256
   optional bytes max_fee_per_gas = 6; // required; U256
@@ -38,11 +59,15 @@ message L1TxCommonData {
   optional bytes gas_per_pubdata_limit = 8; // required; U256
   optional uint32 op_processing_type = 9; // required
   optional uint32 priority_queue_type = 10; // required; U256
-  optional bytes eth_hash = 11; // required; H256
-  optional uint64 eth_block = 12; // required
+
   optional bytes canonical_tx_hash = 13; // // required; H256
   optional bytes to_mint = 14; // required; U256
   optional bytes refund_recipient_address = 15; // required; H160
+
+  // deprecated.
+  optional uint64 deadline_block = 3; // required; constant = 0
+  optional bytes eth_hash = 11; // required; constant = [0;32]
+  optional uint64 eth_block = 12; // required
 }
 
 message L2TxCommonData {
@@ -64,18 +89,20 @@ message ProtocolUpgradeTxCommonData {
   optional bytes max_fee_per_gas = 3; // required; U256
   optional bytes gas_limit = 4; // required; U256
   optional bytes gas_per_pubdata_limit = 5; // required; U256
-  optional bytes eth_hash = 6; // required; U256
-  optional uint64 eth_block = 7; // required
   optional bytes canonical_tx_hash = 8; // required; H256
   optional bytes to_mint = 9; // required; U256
   optional bytes refund_recipient_address = 10; // required; H160
+  
+  // deprecated.
+  optional bytes eth_hash = 6; // required; constant = [0;32]
+  optional uint64 eth_block = 7; // required
 }
 
 message Execute {
   optional bytes contract_address = 1; // required; H160
   optional bytes calldata = 2; // required
   optional bytes value = 3; // required; U256
-  repeated bytes factory_deps = 4; // optional
+  repeated bytes factory_deps = 4;
 }
 
 message InputData {
diff --git a/core/lib/dal/src/consensus/tests.rs b/core/lib/dal/src/consensus/tests.rs
index 694634f11a8c..4a69bebdc362 100644
--- a/core/lib/dal/src/consensus/tests.rs
+++ b/core/lib/dal/src/consensus/tests.rs
@@ -1,21 +1,75 @@
 use std::fmt::Debug;
 
+use rand::Rng;
+use zksync_concurrency::ctx;
 use zksync_protobuf::{
     repr::{decode, encode},
+    testonly::test_encode,
     ProtoRepr,
 };
-use zksync_types::{web3::Bytes, Execute, ExecuteTransactionCommon, Transaction};
+use zksync_test_account::Account;
+use zksync_types::{
+    web3::Bytes, Execute, ExecuteTransactionCommon, L1BatchNumber, ProtocolVersionId, Transaction,
+};
+
+use super::{proto, Payload};
+use crate::tests::mock_protocol_upgrade_transaction;
+
+fn execute(rng: &mut impl Rng) -> Execute {
+    Execute {
+        contract_address: rng.gen(),
+        value: rng.gen::<u128>().into(),
+        calldata: (0..10 * 32).map(|_| rng.gen()).collect(),
+        // TODO: find a way to generate valid random bytecode.
+        factory_deps: vec![],
+    }
+}
 
-use crate::tests::{mock_l1_execute, mock_l2_transaction, mock_protocol_upgrade_transaction};
+fn l1_transaction(rng: &mut impl Rng) -> Transaction {
+    Account::random_using(rng).get_l1_tx(execute(rng), rng.gen())
+}
+
+fn l2_transaction(rng: &mut impl Rng) -> Transaction {
+    Account::random_using(rng).get_l2_tx_for_execute(execute(rng), None)
+}
+
+fn payload(rng: &mut impl Rng, protocol_version: ProtocolVersionId) -> Payload {
+    Payload {
+        protocol_version,
+        hash: rng.gen(),
+        l1_batch_number: L1BatchNumber(rng.gen()),
+        timestamp: rng.gen(),
+        l1_gas_price: rng.gen(),
+        l2_fair_gas_price: rng.gen(),
+        fair_pubdata_price: Some(rng.gen()),
+        virtual_blocks: rng.gen(),
+        operator_address: rng.gen(),
+        transactions: (0..10)
+            .map(|_| match rng.gen() {
+                true => l1_transaction(rng),
+                false => l2_transaction(rng),
+            })
+            .collect(),
+        last_in_batch: rng.gen(),
+    }
+}
 
 /// Tests struct <-> proto struct conversions.
 #[test]
 fn test_encoding() {
-    encode_decode::<super::proto::Transaction, ComparableTransaction>(mock_l1_execute().into());
-    encode_decode::<super::proto::Transaction, ComparableTransaction>(mock_l2_transaction().into());
-    encode_decode::<super::proto::Transaction, ComparableTransaction>(
+    let ctx = &ctx::test_root(&ctx::RealClock);
+    let rng = &mut ctx.rng();
+    encode_decode::<proto::TransactionV25, ComparableTransaction>(l1_transaction(rng));
+    encode_decode::<proto::TransactionV25, ComparableTransaction>(l2_transaction(rng));
+    encode_decode::<proto::Transaction, ComparableTransaction>(l1_transaction(rng));
+    encode_decode::<proto::Transaction, ComparableTransaction>(l2_transaction(rng));
+    encode_decode::<proto::Transaction, ComparableTransaction>(
         mock_protocol_upgrade_transaction().into(),
     );
+    let p = payload(rng, ProtocolVersionId::Version24);
+    test_encode(rng, &p);
+    let p = payload(rng, ProtocolVersionId::Version25);
+    test_encode(rng, &p);
 }
 
 fn encode_decode<P, C>(msg: P::Type)
diff --git a/core/lib/dal/src/consensus_dal.rs b/core/lib/dal/src/consensus_dal.rs
index 6dab5f0ae2f5..d4178fa32e00 100644
--- a/core/lib/dal/src/consensus_dal.rs
+++ b/core/lib/dal/src/consensus_dal.rs
@@ -1,11 +1,9 @@
-use std::ops;
-
 use anyhow::Context as _;
 use zksync_consensus_roles::validator;
-use zksync_consensus_storage::ReplicaState;
+use zksync_consensus_storage::{BlockStoreState, ReplicaState};
 use zksync_db_connection::{
     connection::Connection,
-    error::{DalResult, SqlxContext},
+    error::{DalError, DalResult, SqlxContext},
     instrument::{InstrumentExt, Instrumented},
 };
 use zksync_types::L2BlockNumber;
@@ -19,6 +17,19 @@ pub struct ConsensusDal<'a, 'c> {
     pub storage: &'a mut Connection<'c, Core>,
 }
 
+/// Error returned by `ConsensusDal::insert_certificate()`.
+#[derive(thiserror::Error, Debug)]
+pub enum InsertCertificateError {
+    #[error("corresponding L2 block is missing")]
+    MissingPayload,
+    #[error("certificate doesn't match the payload")]
+    PayloadMismatch,
+    #[error(transparent)]
+    Dal(#[from] DalError),
+    #[error(transparent)]
+    Other(#[from] anyhow::Error),
+}
+
 impl ConsensusDal<'_, '_> {
     /// Fetches genesis.
     pub async fn genesis(&mut self) -> DalResult<Option<validator::Genesis>> {
@@ -47,6 +58,8 @@ impl ConsensusDal<'_, '_> {
     }
 
     /// Attempts to update the genesis.
+    /// Fails if the new genesis is invalid.
+    /// Fails if the new genesis has different `chain_id`.
     /// Fails if the storage contains a newer genesis (higher fork number).
     /// Noop if the new genesis is the same as the current one.
     /// Resets the stored consensus state otherwise and purges all certificates.
@@ -57,12 +70,19 @@ impl ConsensusDal<'_, '_> {
             if &got == genesis {
                 return Ok(());
             }
+            anyhow::ensure!(
+                got.chain_id == genesis.chain_id,
+                "changing chain_id is not allowed: old = {:?}, new = {:?}",
+                got.chain_id,
+                genesis.chain_id,
+            );
             anyhow::ensure!(
                 got.fork_number < genesis.fork_number,
                 "transition to a past fork is not allowed: old = {:?}, new = {:?}",
                 got.fork_number,
                 genesis.fork_number,
             );
+            genesis.verify().context("genesis.verify()")?;
         }
         let genesis =
             zksync_protobuf::serde::serialize(genesis, serde_json::value::Serializer).unwrap();
@@ -76,14 +96,16 @@ impl ConsensusDal<'_, '_> {
             DELETE FROM miniblocks_consensus
             "#
         )
-        .execute(txn.conn())
+        .instrument("try_update_genesis#DELETE FROM miniblock_consensus")
+        .execute(&mut txn)
         .await?;
         sqlx::query!(
             r#"
             DELETE FROM consensus_replica_state
             "#
         )
-        .execute(txn.conn())
+        .instrument("try_update_genesis#DELETE FROM consensus_replica_state")
+        .execute(&mut txn)
         .await?;
         sqlx::query!(
             r#"
@@ -95,32 +117,13 @@ impl ConsensusDal<'_, '_> {
             genesis,
             state,
         )
-        .execute(txn.conn())
+        .instrument("try_update_genesis#INSERT INTO consenuss_replica_state")
+        .execute(&mut txn)
         .await?;
         txn.commit().await?;
         Ok(())
     }
 
-    /// Fetches the range of L2 blocks present in storage.
-    /// If storage was recovered from snapshot, the range doesn't need to start at 0.
-    pub async fn block_range(&mut self) -> DalResult<ops::Range<validator::BlockNumber>> {
-        let mut txn = self.storage.start_transaction().await?;
-        let snapshot = txn
-            .snapshot_recovery_dal()
-            .get_applied_snapshot_status()
-            .await?;
-        // `snapshot.l2_block_number` indicates the last block processed.
-        // This block is NOT present in storage. Therefore, the first block
-        // that will appear in storage is `snapshot.l2_block_number + 1`.
-        let start = validator::BlockNumber(snapshot.map_or(0, |s| s.l2_block_number.0 + 1).into());
-        let end = txn
-            .blocks_dal()
-            .get_sealed_l2_block_number()
-            .await?
-            .map_or(start, |last| validator::BlockNumber(last.0.into()).next());
-        Ok(start..end)
-    }
-
     /// [Main node only] creates a new consensus fork starting at
     /// the last sealed L2 block. Resets the state of the consensus
     /// by calling `try_update_genesis()`.
@@ -133,19 +136,18 @@ impl ConsensusDal<'_, '_> {
         let Some(old) = txn.consensus_dal().genesis().await.context("genesis()")? else {
             return Ok(());
         };
-        let first_block = txn
-            .consensus_dal()
-            .block_range()
-            .await
-            .context("get_block_range()")?
-            .end;
         let new = validator::GenesisRaw {
             chain_id: old.chain_id,
             fork_number: old.fork_number.next(),
-            first_block,
+            first_block: txn
+                .consensus_dal()
+                .next_block()
+                .await
+                .context("next_block()")?,
 
-            protocol_version: validator::ProtocolVersion::CURRENT,
-            committee: old.committee.clone(),
+            protocol_version: old.protocol_version,
+            validators: old.validators.clone(),
+            attesters: old.attesters.clone(),
             leader_selection: old.leader_selection.clone(),
         }
         .with_hash();
@@ -187,68 +189,90 @@ impl ConsensusDal<'_, '_> {
             state_json
         )
         .instrument("set_replica_state")
+        .report_latency()
         .with_arg("state.view", &state.view)
         .execute(self.storage)
         .await?;
         Ok(())
     }
 
-    /// Fetches the first consensus certificate.
-    /// It might NOT be the certificate for the first L2 block:
-    /// see `validator::Genesis.first_block`.
-    pub async fn first_certificate(&mut self) -> DalResult<Option<validator::CommitQC>> {
-        sqlx::query!(
-            r#"
-            SELECT
-                certificate
-            FROM
-                miniblocks_consensus
-            ORDER BY
-                number ASC
-            LIMIT
-                1
-            "#
-        )
-        .try_map(|row| {
-            zksync_protobuf::serde::deserialize(row.certificate).decode_column("certificate")
+    /// First block that should be in storage.
+    async fn first_block(&mut self) -> anyhow::Result<validator::BlockNumber> {
+        let info = self
+            .storage
+            .pruning_dal()
+            .get_pruning_info()
+            .await
+            .context("get_pruning_info()")?;
+        Ok(match info.last_soft_pruned_l2_block {
+            // It is guaranteed that pruning info values are set for storage recovered from
+            // snapshot, even if pruning was not enabled.
+            Some(last_pruned) => validator::BlockNumber(last_pruned.0.into()) + 1,
+            // No snapshot and no pruning:
+            None => validator::BlockNumber(0),
         })
-        .instrument("first_certificate")
-        .fetch_optional(self.storage)
-        .await
+    }
+
+    /// Next block that should be inserted to storage.
+    pub async fn next_block(&mut self) -> anyhow::Result<validator::BlockNumber> {
+        if let Some(last) = self
+            .storage
+            .blocks_dal()
+            .get_sealed_l2_block_number()
+            .await
+            .context("get_sealed_l2_block_number()")?
+        {
+            return Ok(validator::BlockNumber(last.0.into()) + 1);
+        }
+        let next = self
+            .storage
+            .consensus_dal()
+            .first_block()
+            .await
+            .context("first_block()")?;
+        Ok(next)
     }
 
     /// Fetches the last consensus certificate.
     /// Currently, certificates are NOT generated synchronously with L2 blocks,
     /// so it might NOT be the certificate for the last L2 block.
-    pub async fn last_certificate(&mut self) -> DalResult<Option<validator::CommitQC>> {
-        sqlx::query!(
+    pub async fn certificates_range(&mut self) -> anyhow::Result<BlockStoreState> {
+        // It cannot be older than genesis first block.
+        let mut start = self.genesis().await?.context("genesis()")?.first_block;
+        start = start.max(self.first_block().await.context("first_block()")?);
+        let row = sqlx::query!(
             r#"
             SELECT
                 certificate
             FROM
                 miniblocks_consensus
+            WHERE
+                number >= $1
             ORDER BY
                 number DESC
             LIMIT
                 1
-            "#
+            "#,
+            i64::try_from(start.0)?,
         )
-        .try_map(|row| {
-            zksync_protobuf::serde::deserialize(row.certificate).decode_column("certificate")
-        })
         .instrument("last_certificate")
+        .report_latency()
         .fetch_optional(self.storage)
-        .await
+        .await?;
+        Ok(BlockStoreState {
+            first: start,
+            last: row
+                .map(|row| zksync_protobuf::serde::deserialize(row.certificate))
+                .transpose()?,
+        })
     }
 
     /// Fetches the consensus certificate for the L2 block with the given `block_number`.
     pub async fn certificate(
         &mut self,
         block_number: validator::BlockNumber,
-    ) -> DalResult<Option<validator::CommitQC>> {
-        let instrumentation =
-            Instrumented::new("certificate").with_arg("block_number", &block_number);
-        let query = sqlx::query!(
+    ) -> anyhow::Result<Option<validator::CommitQC>> {
+        let Some(row) = sqlx::query!(
             r#"
             SELECT
                 certificate
@@ -257,76 +281,85 @@ impl ConsensusDal<'_, '_> {
             WHERE
                 number = $1
             "#,
-            i64::try_from(block_number.0)
-                .map_err(|err| { instrumentation.arg_error("block_number", err) })?
+            i64::try_from(block_number.0)?
         )
-        .try_map(|row| {
-            zksync_protobuf::serde::deserialize(row.certificate).decode_column("certificate")
-        });
-
-        instrumentation
-            .with(query)
-            .fetch_optional(self.storage)
-            .await
+        .instrument("certificate")
+        .report_latency()
+        .fetch_optional(self.storage)
+        .await?
+        else {
+            return Ok(None);
+        };
+        Ok(Some(zksync_protobuf::serde::deserialize(row.certificate)?))
     }
 
-    /// Converts the L2 block `block_number` into consensus payload. `Payload` is an
-    /// opaque format for the L2 block that consensus understands and generates a
-    /// certificate for it.
-    pub async fn block_payload(
+    /// Fetches a range of L2 blocks from storage and converts them to `Payload`s.
+    pub async fn block_payloads(
         &mut self,
-        block_number: validator::BlockNumber,
-    ) -> DalResult<Option<Payload>> {
-        let instrumentation =
-            Instrumented::new("block_payload").with_arg("block_number", &block_number);
-        let block_number = u32::try_from(block_number.0)
-            .map_err(|err| instrumentation.arg_error("block_number", err))?;
-        let block_number = L2BlockNumber(block_number);
+        numbers: std::ops::Range<validator::BlockNumber>,
+    ) -> DalResult<Vec<Payload>> {
+        let numbers = (|| {
+            anyhow::Ok(std::ops::Range {
+                start: L2BlockNumber(numbers.start.0.try_into().context("start")?),
+                end: L2BlockNumber(numbers.end.0.try_into().context("end")?),
+            })
+        })()
+        .map_err(|err| {
+            Instrumented::new("block_payloads")
+                .with_arg("numbers", &numbers)
+                .arg_error("numbers", err)
+        })?;
 
-        let Some(block) = self
+        let blocks = self
             .storage
             .sync_dal()
-            .sync_block_inner(block_number)
-            .await?
-        else {
-            return Ok(None);
-        };
-        let transactions = self
+            .sync_blocks_inner(numbers.clone())
+            .await?;
+        let mut transactions = self
             .storage
             .transactions_web3_dal()
-            .get_raw_l2_block_transactions(block_number)
+            .get_raw_l2_blocks_transactions(numbers)
             .await?;
-        Ok(Some(block.into_payload(transactions)))
+        Ok(blocks
+            .into_iter()
+            .map(|b| {
+                let txs = transactions.remove(&b.number).unwrap_or_default();
+                b.into_payload(txs)
+            })
+            .collect())
+    }
+
+    /// Fetches an L2 block from storage and converts it to `Payload`. `Payload` is an
+    /// opaque format for the L2 block that consensus understands and generates a
+    /// certificate for it.
+    pub async fn block_payload(
+        &mut self,
+        number: validator::BlockNumber,
+    ) -> DalResult<Option<Payload>> {
+        Ok(self
+            .block_payloads(number..number + 1)
+            .await?
+            .into_iter()
+            .next())
     }
 
-    /// Inserts a certificate for the L2 block `cert.header().number`. It verifies that
-    ///
-    /// - the certified payload matches the L2 block in storage
-    /// - the `cert.header().parent` matches the parent L2 block.
-    /// - the parent block already has a certificate.
-    ///
-    /// NOTE: This is an extra secure way of storing a certificate,
-    /// which will help us to detect bugs in the consensus implementation
-    /// while it is "fresh". If it turns out to take too long,
-    /// we can remove the verification checks later.
-    pub async fn insert_certificate(&mut self, cert: &validator::CommitQC) -> anyhow::Result<()> {
+    /// Inserts a certificate for the L2 block `cert.header().number`.
+    /// Fails if certificate doesn't match the stored block.
+    pub async fn insert_certificate(
+        &mut self,
+        cert: &validator::CommitQC,
+    ) -> Result<(), InsertCertificateError> {
+        use InsertCertificateError as E;
         let header = &cert.message.proposal;
         let mut txn = self.storage.start_transaction().await?;
-        if let Some(last) = txn.consensus_dal().last_certificate().await? {
-            anyhow::ensure!(
-                last.header().number.next() == header.number,
-                "expected certificate for a block after the current head block"
-            );
-        }
         let want_payload = txn
             .consensus_dal()
             .block_payload(cert.message.proposal.number)
             .await?
-            .context("corresponding L2 block is missing")?;
-        anyhow::ensure!(
-            header.payload == want_payload.encode().hash(),
-            "consensus block payload doesn't match the L2 block"
-        );
+            .ok_or(E::MissingPayload)?;
+        if header.payload != want_payload.encode().hash() {
+            return Err(E::PayloadMismatch);
+        }
         sqlx::query!(
             r#"
             INSERT INTO
@@ -337,9 +370,11 @@ impl ConsensusDal<'_, '_> {
             header.number.0 as i64,
             zksync_protobuf::serde::serialize(cert, serde_json::value::Serializer).unwrap(),
         )
-        .execute(txn.conn())
+        .instrument("insert_certificate")
+        .report_latency()
+        .execute(&mut txn)
         .await?;
-        txn.commit().await?;
+        txn.commit().await.context("commit")?;
         Ok(())
     }
 }
diff --git a/core/lib/dal/src/contract_verification_dal.rs b/core/lib/dal/src/contract_verification_dal.rs
index 03c6c408f654..3045c84255ee 100644
--- a/core/lib/dal/src/contract_verification_dal.rs
+++ b/core/lib/dal/src/contract_verification_dal.rs
@@ -12,8 +12,10 @@ use zksync_types::{
         DeployContractCalldata, VerificationIncomingRequest, VerificationInfo, VerificationRequest,
         VerificationRequestStatus,
     },
-    get_code_key, Address, CONTRACT_DEPLOYER_ADDRESS, FAILED_CONTRACT_DEPLOYMENT_BYTECODE_HASH,
+    event::DEPLOY_EVENT_SIGNATURE,
+    Address, CONTRACT_DEPLOYER_ADDRESS,
 };
+use zksync_utils::address_to_h256;
 
 use crate::{models::storage_verification_request::StorageVerificationRequest, Core};
 
@@ -288,7 +290,7 @@ impl ContractVerificationDal<'_, '_> {
         &mut self,
         address: Address,
     ) -> anyhow::Result<Option<(Vec<u8>, DeployContractCalldata)>> {
-        let hashed_key = get_code_key(&address).hashed_key();
+        let address_h256 = address_to_h256(&address);
         let Some(row) = sqlx::query!(
             r#"
             SELECT
@@ -298,24 +300,31 @@ impl ContractVerificationDal<'_, '_> {
             FROM
                 (
                     SELECT
-                        *
+                        miniblock_number,
+                        tx_hash,
+                        topic3
                     FROM
-                        storage_logs
+                        events
                     WHERE
-                        storage_logs.hashed_key = $1
-                    ORDER BY
-                        miniblock_number DESC,
-                        operation_number DESC
+                        address = $1
+                        AND topic1 = $2
+                        AND topic4 = $3
                     LIMIT
                         1
-                ) storage_logs
-                JOIN factory_deps ON factory_deps.bytecode_hash = storage_logs.value
-                LEFT JOIN transactions ON transactions.hash = storage_logs.tx_hash
+                ) deploy_event
+                JOIN factory_deps ON factory_deps.bytecode_hash = deploy_event.topic3
+                LEFT JOIN transactions ON transactions.hash = deploy_event.tx_hash
             WHERE
-                storage_logs.value != $2
+                deploy_event.miniblock_number <= (
+                    SELECT
+                        MAX(number)
+                    FROM
+                        miniblocks
+                )
             "#,
-            hashed_key.as_bytes(),
-            FAILED_CONTRACT_DEPLOYMENT_BYTECODE_HASH.as_bytes()
+            CONTRACT_DEPLOYER_ADDRESS.as_bytes(),
+            DEPLOY_EVENT_SIGNATURE.as_bytes(),
+            address_h256.as_bytes(),
         )
         .fetch_optional(self.storage.conn())
         .await?
diff --git a/core/lib/dal/src/data_availability_dal.rs b/core/lib/dal/src/data_availability_dal.rs
new file mode 100644
index 000000000000..24048ec4fa19
--- /dev/null
+++ b/core/lib/dal/src/data_availability_dal.rs
@@ -0,0 +1,217 @@
+use zksync_db_connection::{
+    connection::Connection,
+    error::DalResult,
+    instrument::{InstrumentExt, Instrumented},
+};
+use zksync_types::{pubdata_da::DataAvailabilityBlob, L1BatchNumber};
+
+use crate::{
+    models::storage_data_availability::{L1BatchDA, StorageDABlob},
+    Core,
+};
+
+#[derive(Debug)]
+pub struct DataAvailabilityDal<'a, 'c> {
+    pub(crate) storage: &'a mut Connection<'c, Core>,
+}
+
+impl DataAvailabilityDal<'_, '_> {
+    /// Inserts the blob_id for the given L1 batch. If the blob_id is already present,
+    /// verifies that it matches the one provided in the function arguments
+    /// (preventing the same L1 batch from being stored twice)
+    pub async fn insert_l1_batch_da(
+        &mut self,
+        number: L1BatchNumber,
+        blob_id: &str,
+        sent_at: chrono::NaiveDateTime,
+    ) -> DalResult<()> {
+        let update_result = sqlx::query!(
+            r#"
+            INSERT INTO
+                data_availability (l1_batch_number, blob_id, sent_at, created_at, updated_at)
+            VALUES
+                ($1, $2, $3, NOW(), NOW())
+            ON CONFLICT DO NOTHING
+            "#,
+            i64::from(number.0),
+            blob_id,
+            sent_at,
+        )
+        .instrument("insert_l1_batch_da")
+        .with_arg("number", &number)
+        .with_arg("blob_id", &blob_id)
+        .report_latency()
+        .execute(self.storage)
+        .await?;
+
+        if update_result.rows_affected() == 0 {
+            tracing::debug!(
+                "L1 batch #{number}: DA blob_id wasn't updated as it's already present"
+            );
+
+            let instrumentation =
+                Instrumented::new("get_matching_batch_da_blob_id").with_arg("number", &number);
+
+            // Batch was already processed. Verify that existing DA blob_id matches
+            let query = sqlx::query!(
+                r#"
+                SELECT
+                    blob_id
+                FROM
+                    data_availability
+                WHERE
+                    l1_batch_number = $1
+                "#,
+                i64::from(number.0),
+            );
+
+            let matched: String = instrumentation
+                .clone()
+                .with(query)
+                .report_latency()
+                .fetch_one(self.storage)
+                .await?
+                .blob_id;
+
+            if matched != *blob_id.to_string() {
+                let err = instrumentation.constraint_error(anyhow::anyhow!(
+                    "Error storing DA blob id. DA blob_id {blob_id} for L1 batch #{number} does not match the expected value"
+                ));
+                return Err(err);
+            }
+        }
+        Ok(())
+    }
+
+    /// Saves the inclusion data for the given L1 batch. If the inclusion data is already present,
+    /// verifies that it matches the one provided in the function arguments
+    /// (meaning that the inclusion data corresponds to the same DA blob)
+    pub async fn save_l1_batch_inclusion_data(
+        &mut self,
+        number: L1BatchNumber,
+        da_inclusion_data: &[u8],
+    ) -> DalResult<()> {
+        let update_result = sqlx::query!(
+            r#"
+            UPDATE data_availability
+            SET
+                inclusion_data = $1,
+                updated_at = NOW()
+            WHERE
+                l1_batch_number = $2
+                AND inclusion_data IS NULL
+            "#,
+            da_inclusion_data,
+            i64::from(number.0),
+        )
+        .instrument("save_l1_batch_da_data")
+        .with_arg("number", &number)
+        .report_latency()
+        .execute(self.storage)
+        .await?;
+
+        if update_result.rows_affected() == 0 {
+            tracing::debug!("L1 batch #{number}: DA data wasn't updated as it's already present");
+
+            let instrumentation =
+                Instrumented::new("get_matching_batch_da_data").with_arg("number", &number);
+
+            // Batch was already processed. Verify that existing DA data matches
+            let query = sqlx::query!(
+                r#"
+                SELECT
+                    inclusion_data
+                FROM
+                    data_availability
+                WHERE
+                    l1_batch_number = $1
+                "#,
+                i64::from(number.0),
+            );
+
+            let matched: Option<Vec<u8>> = instrumentation
+                .clone()
+                .with(query)
+                .report_latency()
+                .fetch_one(self.storage)
+                .await?
+                .inclusion_data;
+
+            if matched.unwrap_or_default() != da_inclusion_data.to_vec() {
+                let err = instrumentation.constraint_error(anyhow::anyhow!(
+                    "Error storing DA inclusion data. DA data for L1 batch #{number} does not match the one provided before"
+                ));
+                return Err(err);
+            }
+        }
+        Ok(())
+    }
+
+    /// Assumes that the L1 batches are sorted by number, and returns the first one that is ready for DA dispatch.
+    pub async fn get_first_da_blob_awaiting_inclusion(
+        &mut self,
+    ) -> DalResult<Option<DataAvailabilityBlob>> {
+        Ok(sqlx::query_as!(
+            StorageDABlob,
+            r#"
+            SELECT
+                l1_batch_number,
+                blob_id,
+                inclusion_data,
+                sent_at
+            FROM
+                data_availability
+            WHERE
+                inclusion_data IS NULL
+            ORDER BY
+                l1_batch_number
+            LIMIT
+                1
+            "#,
+        )
+        .instrument("get_first_da_blob_awaiting_inclusion")
+        .fetch_optional(self.storage)
+        .await?
+        .map(DataAvailabilityBlob::from))
+    }
+
+    /// Fetches the pubdata and `l1_batch_number` for the L1 batches that are ready for DA dispatch.
+    pub async fn get_ready_for_da_dispatch_l1_batches(
+        &mut self,
+        limit: usize,
+    ) -> DalResult<Vec<L1BatchDA>> {
+        let rows = sqlx::query!(
+            r#"
+            SELECT
+                number,
+                pubdata_input
+            FROM
+                l1_batches
+                LEFT JOIN data_availability ON data_availability.l1_batch_number = l1_batches.number
+            WHERE
+                eth_commit_tx_id IS NULL
+                AND number != 0
+                AND data_availability.blob_id IS NULL
+                AND pubdata_input IS NOT NULL
+            ORDER BY
+                number
+            LIMIT
+                $1
+            "#,
+            limit as i64,
+        )
+        .instrument("get_ready_for_da_dispatch_l1_batches")
+        .with_arg("limit", &limit)
+        .fetch_all(self.storage)
+        .await?;
+
+        Ok(rows
+            .into_iter()
+            .map(|row| L1BatchDA {
+                // `unwrap` is safe here because we have a `WHERE` clause that filters out `NULL` values
+                pubdata: row.pubdata_input.unwrap(),
+                l1_batch_number: L1BatchNumber(row.number as u32),
+            })
+            .collect())
+    }
+}
diff --git a/core/lib/dal/src/eth_sender_dal.rs b/core/lib/dal/src/eth_sender_dal.rs
index ad1e910af12e..bb27cf8c1f68 100644
--- a/core/lib/dal/src/eth_sender_dal.rs
+++ b/core/lib/dal/src/eth_sender_dal.rs
@@ -22,7 +22,10 @@ pub struct EthSenderDal<'a, 'c> {
 }
 
 impl EthSenderDal<'_, '_> {
-    pub async fn get_inflight_txs(&mut self) -> sqlx::Result<Vec<EthTx>> {
+    pub async fn get_inflight_txs(
+        &mut self,
+        operator_address: Option<Address>,
+    ) -> sqlx::Result<Vec<EthTx>> {
         let txs = sqlx::query_as!(
             StorageEthTx,
             r#"
@@ -31,7 +34,8 @@ impl EthSenderDal<'_, '_> {
             FROM
                 eth_txs
             WHERE
-                confirmed_eth_tx_history_id IS NULL
+                from_addr IS NOT DISTINCT FROM $1 -- can't just use equality as NULL != NULL
+                AND confirmed_eth_tx_history_id IS NULL
                 AND id <= (
                     SELECT
                         COALESCE(MAX(eth_tx_id), 0)
@@ -42,7 +46,8 @@ impl EthSenderDal<'_, '_> {
                 )
             ORDER BY
                 id
-            "#
+            "#,
+            operator_address.as_ref().map(|h160| h160.as_bytes()),
         )
         .fetch_all(self.storage.conn())
         .await?;
@@ -121,7 +126,11 @@ impl EthSenderDal<'_, '_> {
         .map(Into::into))
     }
 
-    pub async fn get_new_eth_txs(&mut self, limit: u64) -> sqlx::Result<Vec<EthTx>> {
+    pub async fn get_new_eth_txs(
+        &mut self,
+        limit: u64,
+        operator_address: &Option<Address>,
+    ) -> sqlx::Result<Vec<EthTx>> {
         let txs = sqlx::query_as!(
             StorageEthTx,
             r#"
@@ -130,7 +139,8 @@ impl EthSenderDal<'_, '_> {
             FROM
                 eth_txs
             WHERE
-                id > (
+                from_addr IS NOT DISTINCT FROM $2 -- can't just use equality as NULL != NULL
+                AND id > (
                     SELECT
                         COALESCE(MAX(eth_tx_id), 0)
                     FROM
@@ -141,7 +151,8 @@ impl EthSenderDal<'_, '_> {
             LIMIT
                 $1
             "#,
-            limit as i64
+            limit as i64,
+            operator_address.as_ref().map(|h160| h160.as_bytes()),
         )
         .fetch_all(self.storage.conn())
         .await?;
@@ -221,6 +232,7 @@ impl EthSenderDal<'_, '_> {
         Ok(eth_tx.into())
     }
 
+    #[allow(clippy::too_many_arguments)]
     pub async fn insert_tx_history(
         &mut self,
         eth_tx_id: u32,
@@ -229,6 +241,7 @@ impl EthSenderDal<'_, '_> {
         blob_base_fee_per_gas: Option<u64>,
         tx_hash: H256,
         raw_signed_tx: &[u8],
+        sent_at_block: u32,
     ) -> anyhow::Result<Option<u32>> {
         let priority_fee_per_gas =
             i64::try_from(priority_fee_per_gas).context("Can't convert u64 to i64")?;
@@ -247,10 +260,12 @@ impl EthSenderDal<'_, '_> {
                     signed_raw_tx,
                     created_at,
                     updated_at,
-                    blob_base_fee_per_gas
+                    blob_base_fee_per_gas,
+                    sent_at_block,
+                    sent_at
                 )
             VALUES
-                ($1, $2, $3, $4, $5, NOW(), NOW(), $6)
+                ($1, $2, $3, $4, $5, NOW(), NOW(), $6, $7, NOW())
             ON CONFLICT (tx_hash) DO NOTHING
             RETURNING
                 id
@@ -261,6 +276,7 @@ impl EthSenderDal<'_, '_> {
             tx_hash,
             raw_signed_tx,
             blob_base_fee_per_gas.map(|v| v as i64),
+            sent_at_block as i32
         )
         .fetch_optional(self.storage.conn())
         .await?
diff --git a/core/lib/dal/src/events_dal.rs b/core/lib/dal/src/events_dal.rs
index 3a6b86afee97..7bbffb23e320 100644
--- a/core/lib/dal/src/events_dal.rs
+++ b/core/lib/dal/src/events_dal.rs
@@ -84,7 +84,7 @@ impl EventsDal<'_, '_> {
                 write_str!(
                     &mut buffer,
                     r"\\x{topic0:x}|\\x{topic1:x}|\\x{topic2:x}|\\x{topic3:x}|",
-                    topic0 = EventTopic(event.indexed_topics.get(0)),
+                    topic0 = EventTopic(event.indexed_topics.first()),
                     topic1 = EventTopic(event.indexed_topics.get(1)),
                     topic2 = EventTopic(event.indexed_topics.get(2)),
                     topic3 = EventTopic(event.indexed_topics.get(3))
@@ -307,7 +307,6 @@ impl EventsDal<'_, '_> {
                 log_index_in_miniblock,
                 log_index_in_tx,
                 tx_hash,
-                NULL::bytea AS "block_hash",
                 NULL::BIGINT AS "l1_batch_number?",
                 shard_id,
                 is_service,
@@ -416,7 +415,10 @@ mod tests {
     use zksync_types::{Address, L1BatchNumber, ProtocolVersion};
 
     use super::*;
-    use crate::{tests::create_l2_block_header, ConnectionPool, Core};
+    use crate::{
+        tests::{create_l2_block_header, create_l2_to_l1_log},
+        ConnectionPool, Core,
+    };
 
     fn create_vm_event(index: u8, topic_count: u8) -> VmEvent {
         assert!(topic_count <= 4);
@@ -454,7 +456,7 @@ mod tests {
             tx_index_in_l2_block: 0,
             tx_initiator_address: Address::default(),
         };
-        let first_events = vec![create_vm_event(0, 0), create_vm_event(1, 4)];
+        let first_events = [create_vm_event(0, 0), create_vm_event(1, 4)];
         let second_location = IncludedTxLocation {
             tx_hash: H256([2; 32]),
             tx_index_in_l2_block: 1,
@@ -498,17 +500,6 @@ mod tests {
         }
     }
 
-    fn create_l2_to_l1_log(tx_number_in_block: u16, index: u8) -> UserL2ToL1Log {
-        UserL2ToL1Log(L2ToL1Log {
-            shard_id: 0,
-            is_service: false,
-            tx_number_in_block,
-            sender: Address::repeat_byte(index),
-            key: H256::from_low_u64_be(u64::from(index)),
-            value: H256::repeat_byte(index),
-        })
-    }
-
     #[tokio::test]
     async fn storing_l2_to_l1_logs() {
         let pool = ConnectionPool::<Core>::test_pool().await;
diff --git a/core/lib/dal/src/events_web3_dal.rs b/core/lib/dal/src/events_web3_dal.rs
index de973bacb791..1a182f6052d5 100644
--- a/core/lib/dal/src/events_web3_dal.rs
+++ b/core/lib/dal/src/events_web3_dal.rs
@@ -81,7 +81,7 @@ impl EventsWeb3Dal<'_, '_> {
             )
             SELECT miniblocks.hash as "block_hash", miniblocks.l1_batch_number as "l1_batch_number", events_select.*
             FROM events_select
-            LEFT JOIN miniblocks ON events_select.miniblock_number = miniblocks.number
+            INNER JOIN miniblocks ON events_select.miniblock_number = miniblocks.number
             ORDER BY miniblock_number ASC, event_index_in_block ASC
             "#,
             where_sql, arg_index
diff --git a/core/lib/dal/src/factory_deps_dal.rs b/core/lib/dal/src/factory_deps_dal.rs
index d846a233a3bf..02ce32306cfb 100644
--- a/core/lib/dal/src/factory_deps_dal.rs
+++ b/core/lib/dal/src/factory_deps_dal.rs
@@ -56,7 +56,8 @@ impl FactoryDepsDal<'_, '_> {
     }
 
     /// Returns bytecode for a factory dependency with the specified bytecode `hash`.
-    pub async fn get_factory_dep(&mut self, hash: H256) -> DalResult<Option<Vec<u8>>> {
+    /// Returns bytecodes only from sealed miniblocks.
+    pub async fn get_sealed_factory_dep(&mut self, hash: H256) -> DalResult<Option<Vec<u8>>> {
         Ok(sqlx::query!(
             r#"
             SELECT
@@ -65,10 +66,24 @@ impl FactoryDepsDal<'_, '_> {
                 factory_deps
             WHERE
                 bytecode_hash = $1
+                AND miniblock_number <= COALESCE(
+                    (
+                        SELECT
+                            MAX(number)
+                        FROM
+                            miniblocks
+                    ),
+                    (
+                        SELECT
+                            miniblock_number
+                        FROM
+                            snapshot_recovery
+                    )
+                )
             "#,
             hash.as_bytes(),
         )
-        .instrument("get_factory_dep")
+        .instrument("get_sealed_factory_dep")
         .with_arg("hash", &hash)
         .fetch_optional(self.storage)
         .await?
@@ -81,7 +96,7 @@ impl FactoryDepsDal<'_, '_> {
         default_aa_hash: H256,
     ) -> anyhow::Result<BaseSystemContracts> {
         let bootloader_bytecode = self
-            .get_factory_dep(bootloader_hash)
+            .get_sealed_factory_dep(bootloader_hash)
             .await
             .context("failed loading bootloader code")?
             .with_context(|| format!("bootloader code with hash {bootloader_hash:?} should be present in the database"))?;
@@ -91,7 +106,7 @@ impl FactoryDepsDal<'_, '_> {
         };
 
         let default_aa_bytecode = self
-            .get_factory_dep(default_aa_hash)
+            .get_sealed_factory_dep(default_aa_hash)
             .await
             .context("failed loading default account code")?
             .with_context(|| format!("default account code with hash {default_aa_hash:?} should be present in the database"))?;
diff --git a/core/lib/dal/src/helpers.rs b/core/lib/dal/src/helpers.rs
new file mode 100644
index 000000000000..65e9161bd047
--- /dev/null
+++ b/core/lib/dal/src/helpers.rs
@@ -0,0 +1,89 @@
+//! Various helpers for using DAL methods.
+
+use std::time::Duration;
+
+use tokio::sync::watch;
+use zksync_types::L1BatchNumber;
+
+use crate::{ConnectionPool, Core, CoreDal};
+
+/// Repeatedly polls the DB until there is an L1 batch. We may not have such a batch initially
+/// if the DB is recovered from an application-level snapshot.
+///
+/// Returns the number of the *earliest* L1 batch, or `None` if the stop signal is received.
+pub async fn wait_for_l1_batch(
+    pool: &ConnectionPool<Core>,
+    poll_interval: Duration,
+    stop_receiver: &mut watch::Receiver<bool>,
+) -> anyhow::Result<Option<L1BatchNumber>> {
+    tracing::debug!("Waiting for at least one L1 batch in db in DB");
+    loop {
+        if *stop_receiver.borrow() {
+            return Ok(None);
+        }
+
+        let mut storage = pool.connection().await?;
+        let sealed_l1_batch_number = storage.blocks_dal().get_earliest_l1_batch_number().await?;
+        drop(storage);
+
+        if let Some(number) = sealed_l1_batch_number {
+            return Ok(Some(number));
+        }
+
+        // We don't check the result: if a stop signal is received, we'll return at the start
+        // of the next iteration.
+        tokio::time::timeout(poll_interval, stop_receiver.changed())
+            .await
+            .ok();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use zksync_types::ProtocolVersion;
+
+    use super::*;
+    use crate::{tests::create_l1_batch_header, ConnectionPool, Core, CoreDal};
+
+    #[tokio::test]
+    async fn waiting_for_l1_batch_success() {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let (_stop_sender, mut stop_receiver) = watch::channel(false);
+
+        let pool_copy = pool.clone();
+        tokio::spawn(async move {
+            tokio::time::sleep(Duration::from_millis(25)).await;
+            let mut conn = pool_copy.connection().await.unwrap();
+            conn.protocol_versions_dal()
+                .save_protocol_version_with_tx(&ProtocolVersion::default())
+                .await
+                .unwrap();
+            let header = create_l1_batch_header(0);
+            conn.blocks_dal()
+                .insert_mock_l1_batch(&header)
+                .await
+                .unwrap();
+        });
+
+        let l1_batch = wait_for_l1_batch(&pool, Duration::from_millis(10), &mut stop_receiver)
+            .await
+            .unwrap();
+        assert_eq!(l1_batch, Some(L1BatchNumber(0)));
+    }
+
+    #[tokio::test]
+    async fn waiting_for_l1_batch_cancellation() {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let (stop_sender, mut stop_receiver) = watch::channel(false);
+
+        tokio::spawn(async move {
+            tokio::time::sleep(Duration::from_millis(25)).await;
+            stop_sender.send_replace(true);
+        });
+
+        let l1_batch = wait_for_l1_batch(&pool, Duration::from_secs(30), &mut stop_receiver)
+            .await
+            .unwrap();
+        assert_eq!(l1_batch, None);
+    }
+}
diff --git a/core/lib/dal/src/lib.rs b/core/lib/dal/src/lib.rs
index 5a95f9688ff6..0e1badb9af76 100644
--- a/core/lib/dal/src/lib.rs
+++ b/core/lib/dal/src/lib.rs
@@ -1,4 +1,4 @@
-//! Data access layer (DAL) for zkSync Era.
+//! Data access layer (DAL) for ZKsync Era.
 
 // Linter settings.
 #![warn(clippy::cast_lossless)]
@@ -6,34 +6,39 @@
 pub use sqlx::{types::BigDecimal, Error as SqlxError};
 use zksync_db_connection::connection::DbMarker;
 pub use zksync_db_connection::{
-    connection::Connection,
+    connection::{Connection, IsolationLevel},
     connection_pool::{ConnectionPool, ConnectionPoolBuilder},
     error::{DalError, DalResult},
 };
 
 use crate::{
-    blocks_dal::BlocksDal, blocks_web3_dal::BlocksWeb3Dal, consensus_dal::ConsensusDal,
-    contract_verification_dal::ContractVerificationDal, eth_sender_dal::EthSenderDal,
+    base_token_dal::BaseTokenDal, blocks_dal::BlocksDal, blocks_web3_dal::BlocksWeb3Dal,
+    consensus_dal::ConsensusDal, contract_verification_dal::ContractVerificationDal,
+    data_availability_dal::DataAvailabilityDal, eth_sender_dal::EthSenderDal,
     events_dal::EventsDal, events_web3_dal::EventsWeb3Dal, factory_deps_dal::FactoryDepsDal,
     proof_generation_dal::ProofGenerationDal, protocol_versions_dal::ProtocolVersionsDal,
     protocol_versions_web3_dal::ProtocolVersionsWeb3Dal, pruning_dal::PruningDal,
     snapshot_recovery_dal::SnapshotRecoveryDal, snapshots_creator_dal::SnapshotsCreatorDal,
     snapshots_dal::SnapshotsDal, storage_logs_dal::StorageLogsDal,
     storage_logs_dedup_dal::StorageLogsDedupDal, storage_web3_dal::StorageWeb3Dal,
-    sync_dal::SyncDal, system_dal::SystemDal, tokens_dal::TokensDal,
+    sync_dal::SyncDal, system_dal::SystemDal, tee_proof_generation_dal::TeeProofGenerationDal,
+    tee_verifier_input_producer_dal::TeeVerifierInputProducerDal, tokens_dal::TokensDal,
     tokens_web3_dal::TokensWeb3Dal, transactions_dal::TransactionsDal,
-    transactions_web3_dal::TransactionsWeb3Dal,
+    transactions_web3_dal::TransactionsWeb3Dal, vm_runner_dal::VmRunnerDal,
 };
 
+pub mod base_token_dal;
 pub mod blocks_dal;
 pub mod blocks_web3_dal;
 pub mod consensus;
 pub mod consensus_dal;
 pub mod contract_verification_dal;
+mod data_availability_dal;
 pub mod eth_sender_dal;
 pub mod events_dal;
 pub mod events_web3_dal;
 pub mod factory_deps_dal;
+pub mod helpers;
 pub mod metrics;
 mod models;
 pub mod proof_generation_dal;
@@ -48,10 +53,13 @@ pub mod storage_logs_dedup_dal;
 pub mod storage_web3_dal;
 pub mod sync_dal;
 pub mod system_dal;
+pub mod tee_proof_generation_dal;
+pub mod tee_verifier_input_producer_dal;
 pub mod tokens_dal;
 pub mod tokens_web3_dal;
 pub mod transactions_dal;
 pub mod transactions_web3_dal;
+pub mod vm_runner_dal;
 
 #[cfg(test)]
 mod tests;
@@ -71,6 +79,8 @@ where
 
     fn transactions_web3_dal(&mut self) -> TransactionsWeb3Dal<'_, 'a>;
 
+    fn tee_verifier_input_producer_dal(&mut self) -> TeeVerifierInputProducerDal<'_, 'a>;
+
     fn blocks_dal(&mut self) -> BlocksDal<'_, 'a>;
 
     fn blocks_web3_dal(&mut self) -> BlocksWeb3Dal<'_, 'a>;
@@ -105,6 +115,8 @@ where
 
     fn proof_generation_dal(&mut self) -> ProofGenerationDal<'_, 'a>;
 
+    fn tee_proof_generation_dal(&mut self) -> TeeProofGenerationDal<'_, 'a>;
+
     fn system_dal(&mut self) -> SystemDal<'_, 'a>;
 
     fn snapshots_dal(&mut self) -> SnapshotsDal<'_, 'a>;
@@ -114,6 +126,12 @@ where
     fn snapshot_recovery_dal(&mut self) -> SnapshotRecoveryDal<'_, 'a>;
 
     fn pruning_dal(&mut self) -> PruningDal<'_, 'a>;
+
+    fn data_availability_dal(&mut self) -> DataAvailabilityDal<'_, 'a>;
+
+    fn vm_runner_dal(&mut self) -> VmRunnerDal<'_, 'a>;
+
+    fn base_token_dal(&mut self) -> BaseTokenDal<'_, 'a>;
 }
 
 #[derive(Clone, Debug)]
@@ -133,6 +151,10 @@ impl<'a> CoreDal<'a> for Connection<'a, Core> {
         TransactionsWeb3Dal { storage: self }
     }
 
+    fn tee_verifier_input_producer_dal(&mut self) -> TeeVerifierInputProducerDal<'_, 'a> {
+        TeeVerifierInputProducerDal { storage: self }
+    }
+
     fn blocks_dal(&mut self) -> BlocksDal<'_, 'a> {
         BlocksDal { storage: self }
     }
@@ -201,6 +223,10 @@ impl<'a> CoreDal<'a> for Connection<'a, Core> {
         ProofGenerationDal { storage: self }
     }
 
+    fn tee_proof_generation_dal(&mut self) -> TeeProofGenerationDal<'_, 'a> {
+        TeeProofGenerationDal { storage: self }
+    }
+
     fn system_dal(&mut self) -> SystemDal<'_, 'a> {
         SystemDal { storage: self }
     }
@@ -220,4 +246,16 @@ impl<'a> CoreDal<'a> for Connection<'a, Core> {
     fn pruning_dal(&mut self) -> PruningDal<'_, 'a> {
         PruningDal { storage: self }
     }
+
+    fn data_availability_dal(&mut self) -> DataAvailabilityDal<'_, 'a> {
+        DataAvailabilityDal { storage: self }
+    }
+
+    fn vm_runner_dal(&mut self) -> VmRunnerDal<'_, 'a> {
+        VmRunnerDal { storage: self }
+    }
+
+    fn base_token_dal(&mut self) -> BaseTokenDal<'_, 'a> {
+        BaseTokenDal { storage: self }
+    }
 }
diff --git a/core/lib/dal/src/models/mod.rs b/core/lib/dal/src/models/mod.rs
index 66ab73040d68..1e852e3f6364 100644
--- a/core/lib/dal/src/models/mod.rs
+++ b/core/lib/dal/src/models/mod.rs
@@ -3,9 +3,10 @@ use anyhow::Context as _;
 use zksync_db_connection::error::SqlxContext;
 use zksync_types::{ProtocolVersionId, H160, H256};
 
+pub mod storage_base_token_ratio;
+pub(crate) mod storage_data_availability;
 pub mod storage_eth_tx;
 pub mod storage_event;
-pub mod storage_fee_monitor;
 pub mod storage_log;
 pub mod storage_oracle_info;
 pub mod storage_protocol_version;
diff --git a/core/lib/dal/src/models/storage_base_token_ratio.rs b/core/lib/dal/src/models/storage_base_token_ratio.rs
new file mode 100644
index 000000000000..f486aefd4085
--- /dev/null
+++ b/core/lib/dal/src/models/storage_base_token_ratio.rs
@@ -0,0 +1,31 @@
+use std::num::NonZeroU64;
+
+use bigdecimal::{BigDecimal, ToPrimitive};
+use chrono::NaiveDateTime;
+use zksync_types::base_token_ratio::BaseTokenRatio;
+
+/// Represents a row in the `base_token_ratios` table.
+#[derive(Debug, Clone)]
+pub struct StorageBaseTokenRatio {
+    pub id: i64,
+    pub created_at: NaiveDateTime,
+    pub updated_at: NaiveDateTime,
+    pub ratio_timestamp: NaiveDateTime,
+    pub numerator: BigDecimal,
+    pub denominator: BigDecimal,
+    pub used_in_l1: bool,
+}
+
+impl From<StorageBaseTokenRatio> for BaseTokenRatio {
+    fn from(row: StorageBaseTokenRatio) -> BaseTokenRatio {
+        BaseTokenRatio {
+            id: row.id as u32,
+            ratio_timestamp: row.ratio_timestamp.and_utc(),
+            numerator: NonZeroU64::new(row.numerator.to_u64().expect("numerator is not u64"))
+                .unwrap(),
+            denominator: NonZeroU64::new(row.denominator.to_u64().expect("denominator is not u64"))
+                .unwrap(),
+            used_in_l1: row.used_in_l1,
+        }
+    }
+}
diff --git a/core/lib/dal/src/models/storage_block.rs b/core/lib/dal/src/models/storage_block.rs
index a336888f312a..be8b4e4152b5 100644
--- a/core/lib/dal/src/models/storage_block.rs
+++ b/core/lib/dal/src/models/storage_block.rs
@@ -14,22 +14,30 @@ use zksync_types::{
 };
 
 /// This is the gas limit that was used inside blocks before we started saving block gas limit into the database.
-pub const LEGACY_BLOCK_GAS_LIMIT: u32 = u32::MAX;
+pub(crate) const LEGACY_BLOCK_GAS_LIMIT: u32 = u32::MAX;
 
+/// App-level error fetching L1 batch metadata. For now, there's only one kind of such errors:
+/// incomplete metadata.
 #[derive(Debug, Error)]
-pub enum StorageL1BatchConvertError {
-    #[error("Incomplete L1 batch")]
-    Incomplete,
+pub enum L1BatchMetadataError {
+    #[error("incomplete L1 batch metadata: missing `{}` field", _0)]
+    Incomplete(&'static str),
+}
+
+/// L1 batch header with optional metadata.
+#[derive(Debug)]
+pub struct L1BatchWithOptionalMetadata {
+    pub header: L1BatchHeader,
+    pub metadata: Result<L1BatchMetadata, L1BatchMetadataError>,
 }
 
 /// Projection of the `l1_batches` table corresponding to [`L1BatchHeader`].
 #[derive(Debug, Clone, sqlx::FromRow)]
-pub struct StorageL1BatchHeader {
+pub(crate) struct StorageL1BatchHeader {
     pub number: i64,
     pub timestamp: i64,
     pub l1_tx_count: i32,
     pub l2_tx_count: i32,
-    pub l2_to_l1_logs: Vec<Vec<u8>>,
     pub l2_to_l1_messages: Vec<Vec<u8>>,
     pub bloom: Vec<u8>,
     pub priority_ops_onchain_data: Vec<Vec<u8>>,
@@ -38,48 +46,48 @@ pub struct StorageL1BatchHeader {
     pub default_aa_code_hash: Option<Vec<u8>>,
     pub protocol_version: Option<i32>,
 
-    // Both `system_logs` and `compressed_state_diffs` are introduced as part of boojum and will be
-    // absent in all batches generated prior to boojum.
+    // `system_logs` are introduced as part of boojum and will be absent in all batches generated prior to boojum.
     // System logs are logs generated by the VM execution, rather than directly from user transactions,
     // that facilitate sending information required for committing a batch to l1. In a given batch there
     // will be exactly 7 (or 8 in the event of a protocol upgrade) system logs.
     pub system_logs: Vec<Vec<u8>>,
-    pub compressed_state_diffs: Option<Vec<u8>>,
     pub pubdata_input: Option<Vec<u8>>,
 }
 
-impl From<StorageL1BatchHeader> for L1BatchHeader {
-    fn from(l1_batch: StorageL1BatchHeader) -> Self {
-        let priority_ops_onchain_data: Vec<_> = l1_batch
+impl StorageL1BatchHeader {
+    pub fn into_l1_batch_header_with_logs(
+        self,
+        l2_to_l1_logs: Vec<UserL2ToL1Log>,
+    ) -> L1BatchHeader {
+        let priority_ops_onchain_data: Vec<_> = self
             .priority_ops_onchain_data
             .into_iter()
             .map(|raw_data| raw_data.into())
             .collect();
 
-        let system_logs = convert_l2_to_l1_logs(l1_batch.system_logs);
-        let user_l2_to_l1_logs = convert_l2_to_l1_logs(l1_batch.l2_to_l1_logs);
+        let system_logs = convert_l2_to_l1_logs(self.system_logs);
 
         L1BatchHeader {
-            number: L1BatchNumber(l1_batch.number as u32),
-            timestamp: l1_batch.timestamp as u64,
+            number: L1BatchNumber(self.number as u32),
+            timestamp: self.timestamp as u64,
             priority_ops_onchain_data,
-            l1_tx_count: l1_batch.l1_tx_count as u16,
-            l2_tx_count: l1_batch.l2_tx_count as u16,
-            l2_to_l1_logs: user_l2_to_l1_logs.into_iter().map(UserL2ToL1Log).collect(),
-            l2_to_l1_messages: l1_batch.l2_to_l1_messages,
+            l1_tx_count: self.l1_tx_count as u16,
+            l2_tx_count: self.l2_tx_count as u16,
+            l2_to_l1_logs,
+            l2_to_l1_messages: self.l2_to_l1_messages,
 
-            bloom: H2048::from_slice(&l1_batch.bloom),
-            used_contract_hashes: serde_json::from_value(l1_batch.used_contract_hashes)
+            bloom: H2048::from_slice(&self.bloom),
+            used_contract_hashes: serde_json::from_value(self.used_contract_hashes)
                 .expect("invalid value for used_contract_hashes in the DB"),
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
-                l1_batch.bootloader_code_hash,
-                l1_batch.default_aa_code_hash,
+                self.bootloader_code_hash,
+                self.default_aa_code_hash,
             ),
             system_logs: system_logs.into_iter().map(SystemL2ToL1Log).collect(),
-            protocol_version: l1_batch
+            protocol_version: self
                 .protocol_version
                 .map(|v| (v as u16).try_into().unwrap()),
-            pubdata_input: l1_batch.pubdata_input,
+            pubdata_input: self.pubdata_input,
         }
     }
 }
@@ -107,15 +115,13 @@ fn convert_base_system_contracts_hashes(
 }
 
 /// Projection of the columns corresponding to [`L1BatchHeader`] + [`L1BatchMetadata`].
-// TODO(PLA-369): use `#[sqlx(flatten)]` once upgraded to newer `sqlx`
-#[derive(Debug, Clone, sqlx::FromRow)]
-pub struct StorageL1Batch {
+#[derive(Debug, Clone)]
+pub(crate) struct StorageL1Batch {
     pub number: i64,
     pub timestamp: i64,
     pub l1_tx_count: i32,
     pub l2_tx_count: i32,
     pub bloom: Vec<u8>,
-    pub l2_to_l1_logs: Vec<Vec<u8>>,
     pub priority_ops_onchain_data: Vec<Vec<u8>>,
 
     pub hash: Option<Vec<u8>>,
@@ -134,117 +140,113 @@ pub struct StorageL1Batch {
     pub compressed_initial_writes: Option<Vec<u8>>,
     pub compressed_repeated_writes: Option<Vec<u8>>,
 
-    pub eth_prove_tx_id: Option<i32>,
-    pub eth_commit_tx_id: Option<i32>,
-    pub eth_execute_tx_id: Option<i32>,
-
     pub used_contract_hashes: serde_json::Value,
-
     pub system_logs: Vec<Vec<u8>>,
     pub compressed_state_diffs: Option<Vec<u8>>,
-
     pub protocol_version: Option<i32>,
-
     pub events_queue_commitment: Option<Vec<u8>>,
     pub bootloader_initial_content_commitment: Option<Vec<u8>>,
     pub pubdata_input: Option<Vec<u8>>,
 }
 
-impl From<StorageL1Batch> for L1BatchHeader {
-    fn from(l1_batch: StorageL1Batch) -> Self {
-        let priority_ops_onchain_data: Vec<_> = l1_batch
+impl StorageL1Batch {
+    pub fn into_l1_batch_header_with_logs(
+        self,
+        l2_to_l1_logs: Vec<UserL2ToL1Log>,
+    ) -> L1BatchHeader {
+        let priority_ops_onchain_data: Vec<_> = self
             .priority_ops_onchain_data
             .into_iter()
             .map(Vec::into)
             .collect();
 
-        let system_logs = convert_l2_to_l1_logs(l1_batch.system_logs);
-        let user_l2_to_l1_logs = convert_l2_to_l1_logs(l1_batch.l2_to_l1_logs);
+        let system_logs = convert_l2_to_l1_logs(self.system_logs);
 
         L1BatchHeader {
-            number: L1BatchNumber(l1_batch.number as u32),
-            timestamp: l1_batch.timestamp as u64,
+            number: L1BatchNumber(self.number as u32),
+            timestamp: self.timestamp as u64,
             priority_ops_onchain_data,
-            l1_tx_count: l1_batch.l1_tx_count as u16,
-            l2_tx_count: l1_batch.l2_tx_count as u16,
-            l2_to_l1_logs: user_l2_to_l1_logs.into_iter().map(UserL2ToL1Log).collect(),
-            l2_to_l1_messages: l1_batch.l2_to_l1_messages,
+            l1_tx_count: self.l1_tx_count as u16,
+            l2_tx_count: self.l2_tx_count as u16,
+            l2_to_l1_logs,
+            l2_to_l1_messages: self.l2_to_l1_messages,
 
-            bloom: H2048::from_slice(&l1_batch.bloom),
-            used_contract_hashes: serde_json::from_value(l1_batch.used_contract_hashes)
+            bloom: H2048::from_slice(&self.bloom),
+            used_contract_hashes: serde_json::from_value(self.used_contract_hashes)
                 .expect("invalid value for used_contract_hashes in the DB"),
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
-                l1_batch.bootloader_code_hash,
-                l1_batch.default_aa_code_hash,
+                self.bootloader_code_hash,
+                self.default_aa_code_hash,
             ),
             system_logs: system_logs.into_iter().map(SystemL2ToL1Log).collect(),
-            protocol_version: l1_batch
+            protocol_version: self
                 .protocol_version
                 .map(|v| (v as u16).try_into().unwrap()),
-            pubdata_input: l1_batch.pubdata_input,
+            pubdata_input: self.pubdata_input,
         }
     }
 }
 
-impl TryInto<L1BatchMetadata> for StorageL1Batch {
-    type Error = StorageL1BatchConvertError;
+impl TryFrom<StorageL1Batch> for L1BatchMetadata {
+    type Error = L1BatchMetadataError;
 
-    fn try_into(self) -> Result<L1BatchMetadata, Self::Error> {
-        Ok(L1BatchMetadata {
-            root_hash: H256::from_slice(&self.hash.ok_or(StorageL1BatchConvertError::Incomplete)?),
-            rollup_last_leaf_index: self
+    fn try_from(batch: StorageL1Batch) -> Result<Self, Self::Error> {
+        Ok(Self {
+            root_hash: H256::from_slice(
+                &batch.hash.ok_or(L1BatchMetadataError::Incomplete("hash"))?,
+            ),
+            rollup_last_leaf_index: batch
                 .rollup_last_leaf_index
-                .ok_or(StorageL1BatchConvertError::Incomplete)?
+                .ok_or(L1BatchMetadataError::Incomplete("rollup_last_leaf_index"))?
                 as u64,
-            initial_writes_compressed: self.compressed_initial_writes,
-            repeated_writes_compressed: self.compressed_repeated_writes,
+            initial_writes_compressed: batch.compressed_initial_writes,
+            repeated_writes_compressed: batch.compressed_repeated_writes,
             l2_l1_merkle_root: H256::from_slice(
-                &self
+                &batch
                     .l2_l1_merkle_root
-                    .ok_or(StorageL1BatchConvertError::Incomplete)?,
+                    .ok_or(L1BatchMetadataError::Incomplete("l2_l1_merkle_root"))?,
             ),
             aux_data_hash: H256::from_slice(
-                &self
+                &batch
                     .aux_data_hash
-                    .ok_or(StorageL1BatchConvertError::Incomplete)?,
+                    .ok_or(L1BatchMetadataError::Incomplete("aux_data_hash"))?,
             ),
             meta_parameters_hash: H256::from_slice(
-                &self
+                &batch
                     .meta_parameters_hash
-                    .ok_or(StorageL1BatchConvertError::Incomplete)?,
+                    .ok_or(L1BatchMetadataError::Incomplete("meta_parameters_hash"))?,
             ),
             pass_through_data_hash: H256::from_slice(
-                &self
+                &batch
                     .pass_through_data_hash
-                    .ok_or(StorageL1BatchConvertError::Incomplete)?,
+                    .ok_or(L1BatchMetadataError::Incomplete("pass_through_data_hash"))?,
             ),
             commitment: H256::from_slice(
-                &self
+                &batch
                     .commitment
-                    .ok_or(StorageL1BatchConvertError::Incomplete)?,
+                    .ok_or(L1BatchMetadataError::Incomplete("commitment"))?,
             ),
             block_meta_params: L1BatchMetaParameters {
-                zkporter_is_available: self
+                zkporter_is_available: batch
                     .zkporter_is_available
-                    .ok_or(StorageL1BatchConvertError::Incomplete)?,
+                    .ok_or(L1BatchMetadataError::Incomplete("zkporter_is_available"))?,
                 bootloader_code_hash: H256::from_slice(
-                    &self
+                    &batch
                         .bootloader_code_hash
-                        .ok_or(StorageL1BatchConvertError::Incomplete)?,
+                        .ok_or(L1BatchMetadataError::Incomplete("bootloader_code_hash"))?,
                 ),
                 default_aa_code_hash: H256::from_slice(
-                    &self
+                    &batch
                         .default_aa_code_hash
-                        .ok_or(StorageL1BatchConvertError::Incomplete)?,
+                        .ok_or(L1BatchMetadataError::Incomplete("default_aa_code_hash"))?,
                 ),
-                protocol_version: self
+                protocol_version: batch
                     .protocol_version
-                    .map(|v| (v as u16).try_into().unwrap())
-                    .ok_or(StorageL1BatchConvertError::Incomplete)?,
+                    .map(|v| (v as u16).try_into().unwrap()),
             },
-            state_diffs_compressed: self.compressed_state_diffs.unwrap_or_default(),
-            events_queue_commitment: self.events_queue_commitment.map(|v| H256::from_slice(&v)),
-            bootloader_initial_content_commitment: self
+            state_diffs_compressed: batch.compressed_state_diffs.unwrap_or_default(),
+            events_queue_commitment: batch.events_queue_commitment.map(|v| H256::from_slice(&v)),
+            bootloader_initial_content_commitment: batch
                 .bootloader_initial_content_commitment
                 .map(|v| H256::from_slice(&v)),
         })
@@ -252,7 +254,7 @@ impl TryInto<L1BatchMetadata> for StorageL1Batch {
 }
 
 #[derive(Debug, Clone, sqlx::FromRow)]
-pub struct StorageBlockDetails {
+pub(crate) struct StorageBlockDetails {
     pub number: i64,
     pub l1_batch_number: i64,
     pub timestamp: i64,
@@ -269,6 +271,8 @@ pub struct StorageBlockDetails {
     pub l1_gas_price: i64,
     // L2 gas price assumed in the corresponding batch
     pub l2_fair_gas_price: i64,
+    // Cost of publishing 1 byte (in wei).
+    pub fair_pubdata_price: Option<i64>,
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
     pub fee_account_address: Vec<u8>,
@@ -312,6 +316,7 @@ impl From<StorageBlockDetails> for api::BlockDetails {
                 .map(|executed_at| DateTime::<Utc>::from_naive_utc_and_offset(executed_at, Utc)),
             l1_gas_price: details.l1_gas_price as u64,
             l2_fair_gas_price: details.l2_fair_gas_price as u64,
+            fair_pubdata_price: details.fair_pubdata_price.map(|x| x as u64),
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
                 details.bootloader_code_hash,
                 details.default_aa_code_hash,
@@ -330,7 +335,7 @@ impl From<StorageBlockDetails> for api::BlockDetails {
 }
 
 #[derive(Debug, Clone, sqlx::FromRow)]
-pub struct StorageL1BatchDetails {
+pub(crate) struct StorageL1BatchDetails {
     pub number: i64,
     pub timestamp: i64,
     pub l1_tx_count: i32,
@@ -344,6 +349,7 @@ pub struct StorageL1BatchDetails {
     pub executed_at: Option<NaiveDateTime>,
     pub l1_gas_price: i64,
     pub l2_fair_gas_price: i64,
+    pub fair_pubdata_price: Option<i64>,
     pub bootloader_code_hash: Option<Vec<u8>>,
     pub default_aa_code_hash: Option<Vec<u8>>,
 }
@@ -385,6 +391,7 @@ impl From<StorageL1BatchDetails> for api::L1BatchDetails {
                 .map(|executed_at| DateTime::<Utc>::from_naive_utc_and_offset(executed_at, Utc)),
             l1_gas_price: details.l1_gas_price as u64,
             l2_fair_gas_price: details.l2_fair_gas_price as u64,
+            fair_pubdata_price: details.fair_pubdata_price.map(|x| x as u64),
             base_system_contracts_hashes: convert_base_system_contracts_hashes(
                 details.bootloader_code_hash,
                 details.default_aa_code_hash,
@@ -397,7 +404,7 @@ impl From<StorageL1BatchDetails> for api::L1BatchDetails {
     }
 }
 
-pub struct StorageL2BlockHeader {
+pub(crate) struct StorageL2BlockHeader {
     pub number: i64,
     pub timestamp: i64,
     pub hash: Vec<u8>,
diff --git a/core/lib/dal/src/models/storage_data_availability.rs b/core/lib/dal/src/models/storage_data_availability.rs
new file mode 100644
index 000000000000..2a1b39845e69
--- /dev/null
+++ b/core/lib/dal/src/models/storage_data_availability.rs
@@ -0,0 +1,29 @@
+use chrono::NaiveDateTime;
+use zksync_types::{pubdata_da::DataAvailabilityBlob, L1BatchNumber};
+
+/// Represents a blob in the data availability layer.
+#[derive(Debug, Clone)]
+pub(crate) struct StorageDABlob {
+    pub l1_batch_number: i64,
+    pub blob_id: String,
+    pub inclusion_data: Option<Vec<u8>>,
+    pub sent_at: NaiveDateTime,
+}
+
+impl From<StorageDABlob> for DataAvailabilityBlob {
+    fn from(blob: StorageDABlob) -> DataAvailabilityBlob {
+        DataAvailabilityBlob {
+            l1_batch_number: L1BatchNumber(blob.l1_batch_number as u32),
+            blob_id: blob.blob_id,
+            inclusion_data: blob.inclusion_data,
+            sent_at: blob.sent_at.and_utc(),
+        }
+    }
+}
+
+/// A small struct used to store a batch and its data availability, which are retrieved from the database.
+#[derive(Debug)]
+pub struct L1BatchDA {
+    pub pubdata: Vec<u8>,
+    pub l1_batch_number: L1BatchNumber,
+}
diff --git a/core/lib/dal/src/models/storage_event.rs b/core/lib/dal/src/models/storage_event.rs
index 98e53ae374ef..f741e2aa1202 100644
--- a/core/lib/dal/src/models/storage_event.rs
+++ b/core/lib/dal/src/models/storage_event.rs
@@ -1,5 +1,6 @@
 use zksync_types::{
-    api::{L2ToL1Log, Log},
+    api,
+    l2_to_l1_log::{self, UserL2ToL1Log},
     web3::{Bytes, Index},
     Address, H256, U256, U64,
 };
@@ -21,8 +22,8 @@ pub struct StorageWeb3Log {
     pub event_index_in_tx: i32,
 }
 
-impl From<StorageWeb3Log> for Log {
-    fn from(log: StorageWeb3Log) -> Log {
+impl From<StorageWeb3Log> for api::Log {
+    fn from(log: StorageWeb3Log) -> api::Log {
         let topics = vec![log.topic1, log.topic2, log.topic3, log.topic4]
             .into_iter()
             .filter_map(|topic| {
@@ -33,7 +34,7 @@ impl From<StorageWeb3Log> for Log {
                 }
             })
             .collect();
-        Log {
+        api::Log {
             address: Address::from_slice(&log.address),
             topics,
             data: Bytes(log.value),
@@ -52,7 +53,6 @@ impl From<StorageWeb3Log> for Log {
 
 #[derive(sqlx::FromRow, Debug, Clone)]
 pub struct StorageL2ToL1Log {
-    pub block_hash: Option<Vec<u8>>,
     pub miniblock_number: i64,
     pub l1_batch_number: Option<i64>,
     pub log_index_in_miniblock: i32,
@@ -67,10 +67,10 @@ pub struct StorageL2ToL1Log {
     pub value: Vec<u8>,
 }
 
-impl From<StorageL2ToL1Log> for L2ToL1Log {
-    fn from(log: StorageL2ToL1Log) -> L2ToL1Log {
-        L2ToL1Log {
-            block_hash: log.block_hash.map(|hash| H256::from_slice(&hash)),
+impl From<StorageL2ToL1Log> for api::L2ToL1Log {
+    fn from(log: StorageL2ToL1Log) -> api::L2ToL1Log {
+        api::L2ToL1Log {
+            block_hash: None,
             block_number: (log.miniblock_number as u32).into(),
             l1_batch_number: (log.l1_batch_number).map(|n| (n as u32).into()),
             log_index: (log.log_index_in_miniblock as u32).into(),
@@ -86,3 +86,22 @@ impl From<StorageL2ToL1Log> for L2ToL1Log {
         }
     }
 }
+
+impl From<StorageL2ToL1Log> for l2_to_l1_log::L2ToL1Log {
+    fn from(log: StorageL2ToL1Log) -> l2_to_l1_log::L2ToL1Log {
+        l2_to_l1_log::L2ToL1Log {
+            shard_id: (log.shard_id as u32).try_into().unwrap(),
+            is_service: log.is_service,
+            tx_number_in_block: (log.tx_index_in_l1_batch as u32).try_into().unwrap(),
+            sender: Address::from_slice(&log.sender),
+            key: H256::from_slice(&log.key),
+            value: H256::from_slice(&log.value),
+        }
+    }
+}
+
+impl From<StorageL2ToL1Log> for l2_to_l1_log::UserL2ToL1Log {
+    fn from(log: StorageL2ToL1Log) -> l2_to_l1_log::UserL2ToL1Log {
+        UserL2ToL1Log(log.into())
+    }
+}
diff --git a/core/lib/dal/src/models/storage_fee_monitor.rs b/core/lib/dal/src/models/storage_fee_monitor.rs
deleted file mode 100644
index 989308f79fea..000000000000
--- a/core/lib/dal/src/models/storage_fee_monitor.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#[derive(Debug, Clone, sqlx::FromRow)]
-pub struct StorageBlockGasData {
-    pub number: i64,
-
-    pub commit_gas: Option<i64>,
-    pub commit_base_gas_price: Option<i64>,
-    pub commit_priority_gas_price: Option<i64>,
-
-    pub prove_gas: Option<i64>,
-    pub prove_base_gas_price: Option<i64>,
-    pub prove_priority_gas_price: Option<i64>,
-
-    pub execute_gas: Option<i64>,
-    pub execute_base_gas_price: Option<i64>,
-    pub execute_priority_gas_price: Option<i64>,
-}
diff --git a/core/lib/dal/src/models/storage_log.rs b/core/lib/dal/src/models/storage_log.rs
index cfbfe99bc679..055f37cde559 100644
--- a/core/lib/dal/src/models/storage_log.rs
+++ b/core/lib/dal/src/models/storage_log.rs
@@ -12,11 +12,10 @@ pub struct DbInitialWrite {
 #[derive(Debug, PartialEq)]
 pub struct DbStorageLog {
     pub hashed_key: H256,
-    pub address: H160,
-    pub key: H256,
+    pub address: Option<H160>,
+    pub key: Option<H256>,
     pub value: H256,
     pub operation_number: u64,
-    pub tx_hash: H256,
     pub l2_block_number: L2BlockNumber,
 }
 
diff --git a/core/lib/dal/src/models/storage_protocol_version.rs b/core/lib/dal/src/models/storage_protocol_version.rs
index 2c8c6760ade8..7ac6d70f38c9 100644
--- a/core/lib/dal/src/models/storage_protocol_version.rs
+++ b/core/lib/dal/src/models/storage_protocol_version.rs
@@ -1,17 +1,17 @@
 use std::convert::TryInto;
 
-use sqlx::types::chrono::NaiveDateTime;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_types::{
     api,
     protocol_upgrade::{self, ProtocolUpgradeTx},
-    protocol_version::{L1VerifierConfig, VerifierParams},
+    protocol_version::{L1VerifierConfig, ProtocolSemanticVersion, VerifierParams, VersionPatch},
     H256,
 };
 
 #[derive(sqlx::FromRow)]
 pub struct StorageProtocolVersion {
-    pub id: i32,
+    pub minor: i32,
+    pub patch: i32,
     pub timestamp: i64,
     pub recursion_scheduler_level_vk_hash: Vec<u8>,
     pub recursion_node_level_vk_hash: Vec<u8>,
@@ -19,10 +19,6 @@ pub struct StorageProtocolVersion {
     pub recursion_circuits_set_vks_hash: Vec<u8>,
     pub bootloader_code_hash: Vec<u8>,
     pub default_account_code_hash: Vec<u8>,
-    // deprecated
-    pub verifier_address: Option<Vec<u8>>,
-    pub created_at: NaiveDateTime,
-    pub upgrade_tx_hash: Option<Vec<u8>>,
 }
 
 pub(crate) fn protocol_version_from_storage(
@@ -30,7 +26,10 @@ pub(crate) fn protocol_version_from_storage(
     tx: Option<ProtocolUpgradeTx>,
 ) -> protocol_upgrade::ProtocolVersion {
     protocol_upgrade::ProtocolVersion {
-        id: (storage_version.id as u16).try_into().unwrap(),
+        version: ProtocolSemanticVersion {
+            minor: (storage_version.minor as u16).try_into().unwrap(),
+            patch: VersionPatch(storage_version.patch as u32),
+        },
         timestamp: storage_version.timestamp as u64,
         l1_verifier_config: L1VerifierConfig {
             params: VerifierParams {
@@ -56,36 +55,28 @@ pub(crate) fn protocol_version_from_storage(
     }
 }
 
-impl From<StorageProtocolVersion> for api::ProtocolVersion {
-    fn from(storage_protocol_version: StorageProtocolVersion) -> Self {
+#[derive(sqlx::FromRow)]
+pub struct StorageApiProtocolVersion {
+    pub minor: i32,
+    pub timestamp: i64,
+    pub bootloader_code_hash: Vec<u8>,
+    pub default_account_code_hash: Vec<u8>,
+    pub upgrade_tx_hash: Option<Vec<u8>>,
+}
+
+impl From<StorageApiProtocolVersion> for api::ProtocolVersion {
+    #[allow(deprecated)]
+    fn from(storage_protocol_version: StorageApiProtocolVersion) -> Self {
         let l2_system_upgrade_tx_hash = storage_protocol_version
             .upgrade_tx_hash
             .as_ref()
             .map(|hash| H256::from_slice(hash));
-        api::ProtocolVersion {
-            version_id: storage_protocol_version.id as u16,
-            timestamp: storage_protocol_version.timestamp as u64,
-            verification_keys_hashes: L1VerifierConfig {
-                params: VerifierParams {
-                    recursion_node_level_vk_hash: H256::from_slice(
-                        &storage_protocol_version.recursion_node_level_vk_hash,
-                    ),
-                    recursion_leaf_level_vk_hash: H256::from_slice(
-                        &storage_protocol_version.recursion_leaf_level_vk_hash,
-                    ),
-                    recursion_circuits_set_vks_hash: H256::from_slice(
-                        &storage_protocol_version.recursion_circuits_set_vks_hash,
-                    ),
-                },
-                recursion_scheduler_level_vk_hash: H256::from_slice(
-                    &storage_protocol_version.recursion_scheduler_level_vk_hash,
-                ),
-            },
-            base_system_contracts: BaseSystemContractsHashes {
-                bootloader: H256::from_slice(&storage_protocol_version.bootloader_code_hash),
-                default_aa: H256::from_slice(&storage_protocol_version.default_account_code_hash),
-            },
+        api::ProtocolVersion::new(
+            storage_protocol_version.minor as u16,
+            storage_protocol_version.timestamp as u64,
+            H256::from_slice(&storage_protocol_version.bootloader_code_hash),
+            H256::from_slice(&storage_protocol_version.default_account_code_hash),
             l2_system_upgrade_tx_hash,
-        }
+        )
     }
 }
diff --git a/core/lib/dal/src/models/storage_sync.rs b/core/lib/dal/src/models/storage_sync.rs
index 4bd00f478dc0..688a6f997904 100644
--- a/core/lib/dal/src/models/storage_sync.rs
+++ b/core/lib/dal/src/models/storage_sync.rs
@@ -13,7 +13,7 @@ use crate::{
 pub(crate) struct StorageSyncBlock {
     pub number: i64,
     pub l1_batch_number: i64,
-    pub last_batch_miniblock: Option<i64>,
+    pub tx_count: i32,
     pub timestamp: i64,
     // L1 gas price assumed in the corresponding batch
     pub l1_gas_price: i64,
@@ -55,7 +55,7 @@ impl TryFrom<StorageSyncBlock> for SyncBlock {
                     .try_into()
                     .decode_column("l1_batch_number")?,
             ),
-            last_in_batch: block.last_batch_miniblock == Some(block.number),
+            last_in_batch: block.tx_count == 0,
             timestamp: block.timestamp.try_into().decode_column("timestamp")?,
             l1_gas_price: block
                 .l1_gas_price
diff --git a/core/lib/dal/src/models/storage_transaction.rs b/core/lib/dal/src/models/storage_transaction.rs
index ed9c9b981dbf..01bbf4b4ff45 100644
--- a/core/lib/dal/src/models/storage_transaction.rs
+++ b/core/lib/dal/src/models/storage_transaction.rs
@@ -1,6 +1,7 @@
 use std::{convert::TryInto, str::FromStr};
 
 use bigdecimal::Zero;
+use serde_json::Value;
 use sqlx::types::chrono::{DateTime, NaiveDateTime, Utc};
 use zksync_types::{
     api::{self, TransactionDetails, TransactionReceipt, TransactionStatus},
@@ -42,7 +43,6 @@ pub struct StorageTransaction {
     pub received_at: NaiveDateTime,
     pub in_mempool: bool,
 
-    pub l1_block_number: Option<i32>,
     pub l1_batch_number: Option<i64>,
     pub l1_batch_tx_index: Option<i32>,
     pub miniblock_number: Option<i64>,
@@ -66,6 +66,9 @@ pub struct StorageTransaction {
 
     pub created_at: NaiveDateTime,
     pub updated_at: NaiveDateTime,
+
+    // DEPRECATED.
+    pub l1_block_number: Option<i32>,
 }
 
 impl From<StorageTransaction> for L1TxCommonData {
@@ -137,10 +140,9 @@ impl From<StorageTransaction> for L1TxCommonData {
                 .gas_per_pubdata_limit
                 .map(bigdecimal_to_u256)
                 .unwrap_or_else(|| U256::from(1u32)),
-            deadline_block: 0,
-            eth_hash: Default::default(),
-            eth_block: tx.l1_block_number.unwrap_or_default() as u64,
             canonical_tx_hash,
+            // DEPRECATED.
+            eth_block: tx.l1_block_number.unwrap_or_default() as u64,
         }
     }
 }
@@ -282,7 +284,7 @@ impl From<StorageTransaction> for ProtocolUpgradeTxCommonData {
                 .gas_per_pubdata_limit
                 .map(bigdecimal_to_u256)
                 .expect("gas_per_pubdata_limit field is missing for protocol upgrade tx"),
-            eth_hash: Default::default(),
+            // DEPRECATED.
             eth_block: tx.l1_block_number.unwrap_or_default() as u64,
             canonical_tx_hash,
         }
@@ -395,8 +397,15 @@ impl From<StorageTransactionReceipt> for TransactionReceipt {
     }
 }
 
+/// Details of the transaction execution.
+#[derive(Debug, Clone, sqlx::FromRow)]
+pub struct StorageTransactionExecutionInfo {
+    /// This is an opaque JSON field, with VM version specific contents.
+    pub execution_info: Value,
+}
+
 #[derive(Debug, Clone, sqlx::FromRow)]
-pub struct StorageTransactionDetails {
+pub(crate) struct StorageTransactionDetails {
     pub is_priority: bool,
     pub initiator_address: Vec<u8>,
     pub gas_limit: Option<BigDecimal>,
diff --git a/core/lib/dal/src/models/tests.rs b/core/lib/dal/src/models/tests.rs
index 6ed3d0844315..34cfde108f19 100644
--- a/core/lib/dal/src/models/tests.rs
+++ b/core/lib/dal/src/models/tests.rs
@@ -20,7 +20,7 @@ fn default_execute() -> Execute {
     8cdfd0000000000000000000000000000000000000000000000000000000157d600d0",
         )
         .unwrap(),
-        factory_deps: None,
+        factory_deps: vec![],
     }
 }
 
@@ -145,8 +145,6 @@ fn storage_tx_to_l1_tx() {
                 .unwrap(),
             l1_data.gas_per_pubdata_limit
         );
-        assert_eq!(0, l1_data.deadline_block);
-        assert_eq!(l1_data.eth_hash, Default::default());
         assert_eq!(stx.l1_block_number.unwrap() as u64, l1_data.eth_block);
         assert_eq!(stx.hash.as_slice(), l1_data.canonical_tx_hash.as_bytes());
     } else {
@@ -211,7 +209,6 @@ fn storage_tx_to_protocol_upgrade_tx() {
                 .unwrap(),
             l1_data.gas_per_pubdata_limit
         );
-        assert_eq!(l1_data.eth_hash, Default::default());
         assert_eq!(stx.l1_block_number.unwrap() as u64, l1_data.eth_block);
         assert_eq!(stx.hash.as_slice(), l1_data.canonical_tx_hash.as_bytes());
     } else {
diff --git a/core/lib/dal/src/proof_generation_dal.rs b/core/lib/dal/src/proof_generation_dal.rs
index 5c1734751458..88300cf08a18 100644
--- a/core/lib/dal/src/proof_generation_dal.rs
+++ b/core/lib/dal/src/proof_generation_dal.rs
@@ -2,10 +2,15 @@
 use std::time::Duration;
 
 use strum::{Display, EnumString};
-use zksync_db_connection::{connection::Connection, utils::pg_interval_from_duration};
+use zksync_db_connection::{
+    connection::Connection,
+    error::DalResult,
+    instrument::{InstrumentExt, Instrumented},
+    utils::pg_interval_from_duration,
+};
 use zksync_types::L1BatchNumber;
 
-use crate::{Core, SqlxError};
+use crate::Core;
 
 #[derive(Debug)]
 pub struct ProofGenerationDal<'a, 'c> {
@@ -28,7 +33,7 @@ impl ProofGenerationDal<'_, '_> {
     pub async fn get_next_block_to_be_proven(
         &mut self,
         processing_timeout: Duration,
-    ) -> Option<L1BatchNumber> {
+    ) -> DalResult<Option<L1BatchNumber>> {
         let processing_timeout = pg_interval_from_duration(processing_timeout);
         let result: Option<L1BatchNumber> = sqlx::query!(
             r#"
@@ -66,15 +71,16 @@ impl ProofGenerationDal<'_, '_> {
         .unwrap()
         .map(|row| L1BatchNumber(row.l1_batch_number as u32));
 
-        result
+        Ok(result)
     }
 
     pub async fn save_proof_artifacts_metadata(
         &mut self,
-        block_number: L1BatchNumber,
+        batch_number: L1BatchNumber,
         proof_blob_url: &str,
-    ) -> Result<(), SqlxError> {
-        sqlx::query!(
+    ) -> DalResult<()> {
+        let batch_number = i64::from(batch_number.0);
+        let query = sqlx::query!(
             r#"
             UPDATE proof_generation_details
             SET
@@ -85,22 +91,34 @@ impl ProofGenerationDal<'_, '_> {
                 l1_batch_number = $2
             "#,
             proof_blob_url,
-            i64::from(block_number.0)
-        )
-        .execute(self.storage.conn())
-        .await?
-        .rows_affected()
-        .eq(&1)
-        .then_some(())
-        .ok_or(sqlx::Error::RowNotFound)
+            batch_number
+        );
+        let instrumentation = Instrumented::new("save_proof_artifacts_metadata")
+            .with_arg("proof_blob_url", &proof_blob_url)
+            .with_arg("l1_batch_number", &batch_number);
+        let result = instrumentation
+            .clone()
+            .with(query)
+            .execute(self.storage)
+            .await?;
+        if result.rows_affected() == 0 {
+            let err = instrumentation.constraint_error(anyhow::anyhow!(
+                "Cannot save proof_blob_url for a batch number {} that does not exist",
+                batch_number
+            ));
+            return Err(err);
+        }
+
+        Ok(())
     }
 
+    /// The caller should ensure that `l1_batch_number` exists in the database.
     pub async fn insert_proof_generation_details(
         &mut self,
-        block_number: L1BatchNumber,
+        l1_batch_number: L1BatchNumber,
         proof_gen_data_blob_url: &str,
-    ) {
-        sqlx::query!(
+    ) -> DalResult<()> {
+        let result = sqlx::query!(
             r#"
             INSERT INTO
                 proof_generation_details (l1_batch_number, status, proof_gen_data_blob_url, created_at, updated_at)
@@ -108,19 +126,32 @@ impl ProofGenerationDal<'_, '_> {
                 ($1, 'ready_to_be_proven', $2, NOW(), NOW())
             ON CONFLICT (l1_batch_number) DO NOTHING
             "#,
-            i64::from(block_number.0),
+             i64::from(l1_batch_number.0),
             proof_gen_data_blob_url,
         )
-        .execute(self.storage.conn())
-        .await
-        .unwrap();
+        .instrument("insert_proof_generation_details")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .with_arg("proof_gen_data_blob_url", &proof_gen_data_blob_url)
+        .report_latency()
+        .execute(self.storage)
+        .await?;
+
+        if result.rows_affected() == 0 {
+            // Not an error: we may call `insert_proof_generation_details()` from multiple full trees instantiated
+            // for the same node. Unlike tree data, we don't particularly care about correspondence of `proof_gen_data_blob_url` across calls,
+            // so just log this fact and carry on.
+            tracing::debug!("L1 batch #{l1_batch_number}: proof generation data wasn't updated as it's already present");
+        }
+        Ok(())
     }
 
     pub async fn mark_proof_generation_job_as_skipped(
         &mut self,
         block_number: L1BatchNumber,
-    ) -> Result<(), SqlxError> {
-        sqlx::query!(
+    ) -> DalResult<()> {
+        let status = ProofGenerationJobStatus::Skipped.to_string();
+        let l1_batch_number = i64::from(block_number.0);
+        let query = sqlx::query!(
             r#"
             UPDATE proof_generation_details
             SET
@@ -129,18 +160,29 @@ impl ProofGenerationDal<'_, '_> {
             WHERE
                 l1_batch_number = $2
             "#,
-            ProofGenerationJobStatus::Skipped.to_string(),
-            i64::from(block_number.0)
-        )
-        .execute(self.storage.conn())
-        .await?
-        .rows_affected()
-        .eq(&1)
-        .then_some(())
-        .ok_or(sqlx::Error::RowNotFound)
+            status,
+            l1_batch_number
+        );
+        let instrumentation = Instrumented::new("mark_proof_generation_job_as_skipped")
+            .with_arg("status", &status)
+            .with_arg("l1_batch_number", &l1_batch_number);
+        let result = instrumentation
+            .clone()
+            .with(query)
+            .execute(self.storage)
+            .await?;
+        if result.rows_affected() == 0 {
+            let err = instrumentation.constraint_error(anyhow::anyhow!(
+                "Cannot mark proof as skipped because batch number {} does not exist",
+                l1_batch_number
+            ));
+            return Err(err);
+        }
+
+        Ok(())
     }
 
-    pub async fn get_oldest_unpicked_batch(&mut self) -> Option<L1BatchNumber> {
+    pub async fn get_oldest_unpicked_batch(&mut self) -> DalResult<Option<L1BatchNumber>> {
         let result: Option<L1BatchNumber> = sqlx::query!(
             r#"
             SELECT
@@ -160,10 +202,10 @@ impl ProofGenerationDal<'_, '_> {
         .unwrap()
         .map(|row| L1BatchNumber(row.l1_batch_number as u32));
 
-        result
+        Ok(result)
     }
 
-    pub async fn get_oldest_not_generated_batch(&mut self) -> Option<L1BatchNumber> {
+    pub async fn get_oldest_not_generated_batch(&mut self) -> DalResult<Option<L1BatchNumber>> {
         let result: Option<L1BatchNumber> = sqlx::query!(
             r#"
             SELECT
@@ -183,6 +225,100 @@ impl ProofGenerationDal<'_, '_> {
         .unwrap()
         .map(|row| L1BatchNumber(row.l1_batch_number as u32));
 
-        result
+        Ok(result)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use zksync_types::ProtocolVersion;
+
+    use super::*;
+    use crate::{tests::create_l1_batch_header, ConnectionPool, CoreDal};
+
+    #[tokio::test]
+    async fn proof_generation_workflow() {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = pool.connection().await.unwrap();
+
+        conn.protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
+            .await
+            .unwrap();
+        conn.blocks_dal()
+            .insert_mock_l1_batch(&create_l1_batch_header(1))
+            .await
+            .unwrap();
+
+        let unpicked_l1_batch = conn
+            .proof_generation_dal()
+            .get_oldest_unpicked_batch()
+            .await
+            .unwrap();
+        assert_eq!(unpicked_l1_batch, None);
+
+        conn.proof_generation_dal()
+            .insert_proof_generation_details(L1BatchNumber(1), "generation_data")
+            .await
+            .unwrap();
+
+        let unpicked_l1_batch = conn
+            .proof_generation_dal()
+            .get_oldest_unpicked_batch()
+            .await
+            .unwrap();
+        assert_eq!(unpicked_l1_batch, Some(L1BatchNumber(1)));
+
+        // Calling the method multiple times should work fine.
+        conn.proof_generation_dal()
+            .insert_proof_generation_details(L1BatchNumber(1), "generation_data")
+            .await
+            .unwrap();
+
+        let unpicked_l1_batch = conn
+            .proof_generation_dal()
+            .get_oldest_unpicked_batch()
+            .await
+            .unwrap();
+        assert_eq!(unpicked_l1_batch, Some(L1BatchNumber(1)));
+
+        let picked_l1_batch = conn
+            .proof_generation_dal()
+            .get_next_block_to_be_proven(Duration::MAX)
+            .await
+            .unwrap();
+        assert_eq!(picked_l1_batch, Some(L1BatchNumber(1)));
+        let unpicked_l1_batch = conn
+            .proof_generation_dal()
+            .get_oldest_unpicked_batch()
+            .await
+            .unwrap();
+        assert_eq!(unpicked_l1_batch, None);
+
+        // Check that with small enough processing timeout, the L1 batch can be picked again
+        let picked_l1_batch = conn
+            .proof_generation_dal()
+            .get_next_block_to_be_proven(Duration::ZERO)
+            .await
+            .unwrap();
+        assert_eq!(picked_l1_batch, Some(L1BatchNumber(1)));
+
+        conn.proof_generation_dal()
+            .save_proof_artifacts_metadata(L1BatchNumber(1), "proof")
+            .await
+            .unwrap();
+
+        let picked_l1_batch = conn
+            .proof_generation_dal()
+            .get_next_block_to_be_proven(Duration::MAX)
+            .await
+            .unwrap();
+        assert_eq!(picked_l1_batch, None);
+        let unpicked_l1_batch = conn
+            .proof_generation_dal()
+            .get_oldest_unpicked_batch()
+            .await
+            .unwrap();
+        assert_eq!(unpicked_l1_batch, None);
     }
 }
diff --git a/core/lib/dal/src/protocol_versions_dal.rs b/core/lib/dal/src/protocol_versions_dal.rs
index 6e10205884be..212be734f0b3 100644
--- a/core/lib/dal/src/protocol_versions_dal.rs
+++ b/core/lib/dal/src/protocol_versions_dal.rs
@@ -9,7 +9,7 @@ use zksync_db_connection::{
 };
 use zksync_types::{
     protocol_upgrade::{ProtocolUpgradeTx, ProtocolVersion},
-    protocol_version::{L1VerifierConfig, VerifierParams},
+    protocol_version::{L1VerifierConfig, ProtocolSemanticVersion, VerifierParams, VersionPatch},
     ProtocolVersionId, H256,
 };
 
@@ -29,32 +29,63 @@ pub struct ProtocolVersionsDal<'a, 'c> {
 impl ProtocolVersionsDal<'_, '_> {
     pub async fn save_protocol_version(
         &mut self,
-        id: ProtocolVersionId,
+        version: ProtocolSemanticVersion,
         timestamp: u64,
         l1_verifier_config: L1VerifierConfig,
         base_system_contracts_hashes: BaseSystemContractsHashes,
         tx_hash: Option<H256>,
     ) -> DalResult<()> {
+        let mut db_transaction = self.storage.start_transaction().await?;
+
         sqlx::query!(
             r#"
             INSERT INTO
                 protocol_versions (
                     id,
                     timestamp,
-                    recursion_scheduler_level_vk_hash,
-                    recursion_node_level_vk_hash,
-                    recursion_leaf_level_vk_hash,
-                    recursion_circuits_set_vks_hash,
                     bootloader_code_hash,
                     default_account_code_hash,
                     upgrade_tx_hash,
                     created_at
                 )
             VALUES
-                ($1, $2, $3, $4, $5, $6, $7, $8, $9, NOW())
+                ($1, $2, $3, $4, $5, NOW())
+            ON CONFLICT DO NOTHING
             "#,
-            id as i32,
+            version.minor as i32,
             timestamp as i64,
+            base_system_contracts_hashes.bootloader.as_bytes(),
+            base_system_contracts_hashes.default_aa.as_bytes(),
+            tx_hash.as_ref().map(H256::as_bytes),
+        )
+        .instrument("save_protocol_version#minor")
+        .with_arg("minor", &version.minor)
+        .with_arg(
+            "base_system_contracts_hashes",
+            &base_system_contracts_hashes,
+        )
+        .with_arg("tx_hash", &tx_hash)
+        .execute(&mut db_transaction)
+        .await?;
+
+        sqlx::query!(
+            r#"
+            INSERT INTO
+                protocol_patches (
+                    minor,
+                    patch,
+                    recursion_scheduler_level_vk_hash,
+                    recursion_node_level_vk_hash,
+                    recursion_leaf_level_vk_hash,
+                    recursion_circuits_set_vks_hash,
+                    created_at
+                )
+            VALUES
+                ($1, $2, $3, $4, $5, $6, NOW())
+            ON CONFLICT DO NOTHING
+            "#,
+            version.minor as i32,
+            version.patch.0 as i32,
             l1_verifier_config
                 .recursion_scheduler_level_vk_hash
                 .as_bytes(),
@@ -70,19 +101,14 @@ impl ProtocolVersionsDal<'_, '_> {
                 .params
                 .recursion_circuits_set_vks_hash
                 .as_bytes(),
-            base_system_contracts_hashes.bootloader.as_bytes(),
-            base_system_contracts_hashes.default_aa.as_bytes(),
-            tx_hash.as_ref().map(H256::as_bytes),
-        )
-        .instrument("save_protocol_version")
-        .with_arg("id", &id)
-        .with_arg(
-            "base_system_contracts_hashes",
-            &base_system_contracts_hashes,
         )
-        .with_arg("tx_hash", &tx_hash)
-        .execute(self.storage)
+        .instrument("save_protocol_version#patch")
+        .with_arg("version", &version)
+        .execute(&mut db_transaction)
         .await?;
+
+        db_transaction.commit().await?;
+
         Ok(())
     }
 
@@ -102,7 +128,7 @@ impl ProtocolVersionsDal<'_, '_> {
         db_transaction
             .protocol_versions_dal()
             .save_protocol_version(
-                version.id,
+                version.version,
                 version.timestamp,
                 version.l1_verifier_config,
                 version.base_system_contracts_hashes,
@@ -216,56 +242,36 @@ impl ProtocolVersionsDal<'_, '_> {
         })
     }
 
-    pub async fn load_previous_version(
+    pub async fn get_protocol_version_with_latest_patch(
         &mut self,
         version_id: ProtocolVersionId,
     ) -> DalResult<Option<ProtocolVersion>> {
-        let maybe_version = sqlx::query_as!(
+        let maybe_row = sqlx::query_as!(
             StorageProtocolVersion,
             r#"
             SELECT
-                *
+                protocol_versions.id AS "minor!",
+                protocol_versions.timestamp,
+                protocol_versions.bootloader_code_hash,
+                protocol_versions.default_account_code_hash,
+                protocol_patches.patch,
+                protocol_patches.recursion_scheduler_level_vk_hash,
+                protocol_patches.recursion_node_level_vk_hash,
+                protocol_patches.recursion_leaf_level_vk_hash,
+                protocol_patches.recursion_circuits_set_vks_hash
             FROM
                 protocol_versions
+                JOIN protocol_patches ON protocol_patches.minor = protocol_versions.id
             WHERE
-                id < $1
+                id = $1
             ORDER BY
-                id DESC
+                protocol_patches.patch DESC
             LIMIT
                 1
             "#,
             version_id as i32
         )
-        .try_map(|row| Ok((parse_protocol_version(row.id)?, row)))
-        .instrument("load_previous_version")
-        .with_arg("version_id", &version_id)
-        .fetch_optional(self.storage)
-        .await?;
-
-        let Some((version_id, row)) = maybe_version else {
-            return Ok(None);
-        };
-        let tx = self.get_protocol_upgrade_tx(version_id).await?;
-        Ok(Some(protocol_version_from_storage(row, tx)))
-    }
-
-    pub async fn get_protocol_version(
-        &mut self,
-        version_id: ProtocolVersionId,
-    ) -> DalResult<Option<ProtocolVersion>> {
-        let maybe_row = sqlx::query_as!(
-            StorageProtocolVersion,
-            r#"
-            SELECT
-                *
-            FROM
-                protocol_versions
-            WHERE
-                id = $1
-            "#,
-            version_id as i32
-        )
-        .instrument("get_protocol_version")
+        .instrument("get_protocol_version_with_latest_patch")
         .with_arg("version_id", &version_id)
         .fetch_optional(self.storage)
         .await?;
@@ -280,7 +286,7 @@ impl ProtocolVersionsDal<'_, '_> {
 
     pub async fn l1_verifier_config_for_version(
         &mut self,
-        version_id: ProtocolVersionId,
+        version: ProtocolSemanticVersion,
     ) -> Option<L1VerifierConfig> {
         let row = sqlx::query!(
             r#"
@@ -290,11 +296,13 @@ impl ProtocolVersionsDal<'_, '_> {
                 recursion_leaf_level_vk_hash,
                 recursion_circuits_set_vks_hash
             FROM
-                protocol_versions
+                protocol_patches
             WHERE
-                id = $1
+                minor = $1
+                AND patch = $2
             "#,
-            version_id as i32
+            version.minor as i32,
+            version.patch.0 as i32
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -313,20 +321,86 @@ impl ProtocolVersionsDal<'_, '_> {
         })
     }
 
-    pub async fn last_version_id(&mut self) -> DalResult<Option<ProtocolVersionId>> {
-        Ok(sqlx::query!(
+    pub async fn get_patch_versions_for_vk(
+        &mut self,
+        minor_version: ProtocolVersionId,
+        recursion_scheduler_level_vk_hash: H256,
+    ) -> DalResult<Vec<VersionPatch>> {
+        let rows = sqlx::query!(
             r#"
             SELECT
-                MAX(id) AS "max?"
+                patch
             FROM
-                protocol_versions
+                protocol_patches
+            WHERE
+                minor = $1
+                AND recursion_scheduler_level_vk_hash = $2
+            ORDER BY
+                patch DESC
+            "#,
+            minor_version as i32,
+            recursion_scheduler_level_vk_hash.as_bytes()
+        )
+        .instrument("get_patch_versions_for_vk")
+        .fetch_all(self.storage)
+        .await?;
+        Ok(rows
+            .into_iter()
+            .map(|row| VersionPatch(row.patch as u32))
+            .collect())
+    }
+
+    /// Returns first patch number for the minor version.
+    /// Note, that some patch numbers can be skipped, so the result is not always 0.
+    pub async fn first_patch_for_version(
+        &mut self,
+        version_id: ProtocolVersionId,
+    ) -> DalResult<Option<VersionPatch>> {
+        let row = sqlx::query!(
+            r#"
+            SELECT
+                patch
+            FROM
+                protocol_patches
+            WHERE
+                minor = $1
+            ORDER BY
+                patch
+            LIMIT
+                1
+            "#,
+            version_id as i32,
+        )
+        .instrument("first_patch_for_version")
+        .fetch_optional(self.storage)
+        .await?;
+        Ok(row.map(|row| VersionPatch(row.patch as u32)))
+    }
+
+    pub async fn latest_semantic_version(&mut self) -> DalResult<Option<ProtocolSemanticVersion>> {
+        sqlx::query!(
+            r#"
+            SELECT
+                minor,
+                patch
+            FROM
+                protocol_patches
+            ORDER BY
+                minor DESC,
+                patch DESC
+            LIMIT
+                1
             "#
         )
-        .try_map(|row| row.max.map(parse_protocol_version).transpose())
-        .instrument("last_version_id")
+        .try_map(|row| {
+            parse_protocol_version(row.minor).map(|minor| ProtocolSemanticVersion {
+                minor,
+                patch: (row.patch as u32).into(),
+            })
+        })
+        .instrument("latest_semantic_version")
         .fetch_optional(self.storage)
-        .await?
-        .flatten())
+        .await
     }
 
     pub async fn last_used_version_id(&mut self) -> Option<ProtocolVersionId> {
@@ -350,20 +424,24 @@ impl ProtocolVersionsDal<'_, '_> {
         Some((id as u16).try_into().unwrap())
     }
 
-    pub async fn all_version_ids(&mut self) -> Vec<ProtocolVersionId> {
+    pub async fn all_versions(&mut self) -> Vec<ProtocolSemanticVersion> {
         let rows = sqlx::query!(
             r#"
             SELECT
-                id
+                minor,
+                patch
             FROM
-                protocol_versions
+                protocol_patches
             "#
         )
         .fetch_all(self.storage.conn())
         .await
         .unwrap();
         rows.into_iter()
-            .map(|row| (row.id as u16).try_into().unwrap())
+            .map(|row| ProtocolSemanticVersion {
+                minor: (row.minor as u16).try_into().unwrap(),
+                patch: (row.patch as u32).into(),
+            })
             .collect()
     }
 
diff --git a/core/lib/dal/src/protocol_versions_web3_dal.rs b/core/lib/dal/src/protocol_versions_web3_dal.rs
index 974cdc824dab..a3a7a162c3dd 100644
--- a/core/lib/dal/src/protocol_versions_web3_dal.rs
+++ b/core/lib/dal/src/protocol_versions_web3_dal.rs
@@ -1,7 +1,7 @@
 use zksync_db_connection::{connection::Connection, error::DalResult, instrument::InstrumentExt};
 use zksync_types::api::ProtocolVersion;
 
-use crate::{models::storage_protocol_version::StorageProtocolVersion, Core};
+use crate::{models::storage_protocol_version::StorageApiProtocolVersion, Core, CoreDal};
 
 #[derive(Debug)]
 pub struct ProtocolVersionsWeb3Dal<'a, 'c> {
@@ -14,10 +14,14 @@ impl ProtocolVersionsWeb3Dal<'_, '_> {
         version_id: u16,
     ) -> DalResult<Option<ProtocolVersion>> {
         let storage_protocol_version = sqlx::query_as!(
-            StorageProtocolVersion,
+            StorageApiProtocolVersion,
             r#"
             SELECT
-                *
+                id AS "minor!",
+                timestamp,
+                bootloader_code_hash,
+                default_account_code_hash,
+                upgrade_tx_hash
             FROM
                 protocol_versions
             WHERE
@@ -34,23 +38,14 @@ impl ProtocolVersionsWeb3Dal<'_, '_> {
     }
 
     pub async fn get_latest_protocol_version(&mut self) -> DalResult<ProtocolVersion> {
-        let storage_protocol_version = sqlx::query_as!(
-            StorageProtocolVersion,
-            r#"
-            SELECT
-                *
-            FROM
-                protocol_versions
-            ORDER BY
-                id DESC
-            LIMIT
-                1
-            "#,
-        )
-        .instrument("get_latest_protocol_version")
-        .fetch_one(self.storage)
-        .await?;
-
-        Ok(ProtocolVersion::from(storage_protocol_version))
+        let latest_version = self
+            .storage
+            .protocol_versions_dal()
+            .latest_semantic_version()
+            .await?
+            .unwrap();
+        self.get_protocol_version_by_id(latest_version.minor as u16)
+            .await
+            .map(|v| v.unwrap())
     }
 }
diff --git a/core/lib/dal/src/pruning_dal/mod.rs b/core/lib/dal/src/pruning_dal/mod.rs
index df1a9921a8ba..0d1584ebba36 100644
--- a/core/lib/dal/src/pruning_dal/mod.rs
+++ b/core/lib/dal/src/pruning_dal/mod.rs
@@ -27,8 +27,7 @@ pub struct PruningInfo {
 pub struct HardPruningStats {
     pub deleted_l1_batches: u64,
     pub deleted_l2_blocks: u64,
-    pub deleted_storage_logs_from_past_batches: u64,
-    pub deleted_storage_logs_from_pruned_batches: u64,
+    pub deleted_storage_logs: u64,
     pub deleted_events: u64,
     pub deleted_call_traces: u64,
     pub deleted_l2_to_l1_logs: u64,
@@ -174,16 +173,8 @@ impl PruningDal<'_, '_> {
             self.clear_transaction_fields(first_l2_block_to_prune..=last_l2_block_to_prune)
                 .await?;
 
-            // The deleting of logs is split into two queries to make it faster,
-            // only the first query has to go through all previous logs
-            // and the query optimizer should be happy with it
-            let deleted_storage_logs_from_past_batches = self
-                .prune_storage_logs_from_past_l2_blocks(
-                    first_l2_block_to_prune..=last_l2_block_to_prune,
-                )
-                .await?;
-            let deleted_storage_logs_from_pruned_batches = self
-                .prune_storage_logs_in_range(first_l2_block_to_prune..=last_l2_block_to_prune)
+            let deleted_storage_logs = self
+                .prune_storage_logs(first_l2_block_to_prune..=last_l2_block_to_prune)
                 .await?;
             let deleted_l1_batches = self.delete_l1_batches(last_l1_batch_to_prune).await?;
             let deleted_l2_blocks = self.delete_l2_blocks(last_l2_block_to_prune).await?;
@@ -194,8 +185,7 @@ impl PruningDal<'_, '_> {
                 deleted_events,
                 deleted_l2_to_l1_logs,
                 deleted_call_traces,
-                deleted_storage_logs_from_past_batches,
-                deleted_storage_logs_from_pruned_batches,
+                deleted_storage_logs,
             }
         } else {
             HardPruningStats::default()
@@ -314,64 +304,45 @@ impl PruningDal<'_, '_> {
         Ok(execution_result.rows_affected())
     }
 
-    async fn prune_storage_logs_from_past_l2_blocks(
-        &mut self,
-        l2_blocks_to_prune: ops::RangeInclusive<L2BlockNumber>,
-    ) -> DalResult<u64> {
-        let execution_result = sqlx::query!(
-            r#"
-            DELETE FROM storage_logs USING (
-                SELECT
-                    *
-                FROM
-                    storage_logs
-                WHERE
-                    miniblock_number BETWEEN $1 AND $2
-            ) AS batches_to_prune
-            WHERE
-                storage_logs.miniblock_number < $1
-                AND batches_to_prune.hashed_key = storage_logs.hashed_key
-            "#,
-            i64::from(l2_blocks_to_prune.start().0),
-            i64::from(l2_blocks_to_prune.end().0)
-        )
-        .instrument("hard_prune_batches_range#prune_storage_logs_from_past_l2_blocks")
-        .with_arg("l2_blocks_to_prune", &l2_blocks_to_prune)
-        .report_latency()
-        .execute(self.storage)
-        .await?;
-        Ok(execution_result.rows_affected())
-    }
-
-    async fn prune_storage_logs_in_range(
+    /// Removes storage logs overwritten by the specified new logs.
+    async fn prune_storage_logs(
         &mut self,
         l2_blocks_to_prune: ops::RangeInclusive<L2BlockNumber>,
     ) -> DalResult<u64> {
+        // Storage log pruning is designed to use deterministic indexes and thus have predictable performance.
+        //
+        // - The WITH query is guaranteed to use the block number index (that's the only WHERE condition),
+        //   and the supplied range of blocks should be reasonably small.
+        // - The main DELETE query is virtually guaranteed to use the primary key index since it removes ranges w.r.t. this index.
+        //
+        // Using more sophisticated queries leads to fluctuating performance due to unpredictable indexes being used.
         let execution_result = sqlx::query!(
             r#"
-            DELETE FROM storage_logs USING (
-                SELECT
-                    hashed_key,
-                    MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op
-                FROM
-                    storage_logs
-                WHERE
-                    miniblock_number BETWEEN $1 AND $2
-                GROUP BY
-                    hashed_key
-            ) AS last_storage_logs
-            WHERE
-                storage_logs.miniblock_number BETWEEN $1 AND $2
-                AND last_storage_logs.hashed_key = storage_logs.hashed_key
-                AND (
-                    storage_logs.miniblock_number != last_storage_logs.op[1]
-                    OR storage_logs.operation_number != last_storage_logs.op[2]
+            WITH
+                new_logs AS MATERIALIZED (
+                    SELECT DISTINCT
+                        ON (hashed_key) hashed_key,
+                        miniblock_number,
+                        operation_number
+                    FROM
+                        storage_logs
+                    WHERE
+                        miniblock_number BETWEEN $1 AND $2
+                    ORDER BY
+                        hashed_key,
+                        miniblock_number DESC,
+                        operation_number DESC
                 )
+            DELETE FROM storage_logs USING new_logs
+            WHERE
+                storage_logs.hashed_key = new_logs.hashed_key
+                AND storage_logs.miniblock_number <= $2
+                AND (storage_logs.miniblock_number, storage_logs.operation_number) < (new_logs.miniblock_number, new_logs.operation_number)
             "#,
             i64::from(l2_blocks_to_prune.start().0),
             i64::from(l2_blocks_to_prune.end().0)
         )
-        .instrument("hard_prune_batches_range#prune_storage_logs_in_range")
+        .instrument("hard_prune_batches_range#prune_storage_logs")
         .with_arg("l2_blocks_to_prune", &l2_blocks_to_prune)
         .report_latency()
         .execute(self.storage)
@@ -443,25 +414,4 @@ impl PruningDal<'_, '_> {
         .await?;
         Ok(())
     }
-
-    // This method must be separate as VACUUM is not supported inside a transaction
-    pub async fn run_vacuum_after_hard_pruning(&mut self) -> DalResult<()> {
-        sqlx::query!(
-            r#"
-            VACUUM l1_batches,
-            miniblocks,
-            storage_logs,
-            events,
-            call_traces,
-            l2_to_l1_logs,
-            transactions
-            "#,
-        )
-        .instrument("hard_prune_batches_range#vacuum")
-        .report_latency()
-        .execute(self.storage)
-        .await?;
-
-        Ok(())
-    }
 }
diff --git a/core/lib/dal/src/pruning_dal/tests.rs b/core/lib/dal/src/pruning_dal/tests.rs
index a328870d60b0..0999e2be1642 100644
--- a/core/lib/dal/src/pruning_dal/tests.rs
+++ b/core/lib/dal/src/pruning_dal/tests.rs
@@ -1,22 +1,18 @@
 use std::ops;
 
-use zksync_contracts::BaseSystemContractsHashes;
 use zksync_db_connection::connection::Connection;
 use zksync_types::{
-    block::L1BatchHeader,
-    fee::TransactionExecutionMetrics,
-    l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log},
-    tx::IncludedTxLocation,
-    AccountTreeId, Address, L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersion,
-    ProtocolVersionId, StorageKey, StorageLog, H256,
+    fee::TransactionExecutionMetrics, tx::IncludedTxLocation, AccountTreeId, Address,
+    L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersion, ProtocolVersionId, StorageKey,
+    StorageLog, H256,
 };
 
 use super::*;
 use crate::{
     storage_logs_dal::DbStorageLog,
     tests::{
-        create_l2_block_header, mock_execution_result, mock_l2_to_l1_log, mock_l2_transaction,
-        mock_vm_event,
+        create_l1_batch_header, create_l2_block_header, create_l2_to_l1_log, mock_execution_result,
+        mock_l2_transaction, mock_vm_event,
     },
     ConnectionPool, Core, CoreDal,
 };
@@ -44,16 +40,16 @@ async fn insert_l2_to_l1_logs(conn: &mut Connection<'_, Core>, l2_block_number:
         tx_index_in_l2_block: 0,
         tx_initiator_address: Address::default(),
     };
-    let first_logs = vec![mock_l2_to_l1_log(), mock_l2_to_l1_log()];
+    let first_logs = [create_l2_to_l1_log(0, 0), create_l2_to_l1_log(0, 0)];
     let second_location = IncludedTxLocation {
         tx_hash: H256([2; 32]),
         tx_index_in_l2_block: 1,
         tx_initiator_address: Address::default(),
     };
     let second_logs = vec![
-        mock_l2_to_l1_log(),
-        mock_l2_to_l1_log(),
-        mock_l2_to_l1_log(),
+        create_l2_to_l1_log(0, 0),
+        create_l2_to_l1_log(0, 0),
+        create_l2_to_l1_log(0, 0),
     ];
     let all_logs = vec![
         (first_location, first_logs.iter().collect()),
@@ -71,7 +67,7 @@ async fn insert_events(conn: &mut Connection<'_, Core>, l2_block_number: L2Block
         tx_index_in_l2_block: 0,
         tx_initiator_address: Address::default(),
     };
-    let first_events = vec![mock_vm_event(0), mock_vm_event(1)];
+    let first_events = [mock_vm_event(0), mock_vm_event(1)];
     let second_location = IncludedTxLocation {
         tx_hash: H256([2; 32]),
         tx_index_in_l2_block: 1,
@@ -89,25 +85,10 @@ async fn insert_events(conn: &mut Connection<'_, Core>, l2_block_number: L2Block
 }
 
 async fn insert_l1_batch(conn: &mut Connection<'_, Core>, l1_batch_number: L1BatchNumber) {
-    let mut header = L1BatchHeader::new(
-        l1_batch_number,
-        100,
-        BaseSystemContractsHashes {
-            bootloader: H256::repeat_byte(1),
-            default_aa: H256::repeat_byte(42),
-        },
-        ProtocolVersionId::latest(),
-    );
+    let mut header = create_l1_batch_header(*l1_batch_number);
     header.l1_tx_count = 3;
     header.l2_tx_count = 5;
-    header.l2_to_l1_logs.push(UserL2ToL1Log(L2ToL1Log {
-        shard_id: 0,
-        is_service: false,
-        tx_number_in_block: 2,
-        sender: Address::repeat_byte(2),
-        key: H256::repeat_byte(3),
-        value: H256::zero(),
-    }));
+    header.l2_to_l1_logs.push(create_l2_to_l1_log(2, 2));
     header.l2_to_l1_messages.push(vec![22; 22]);
     header.l2_to_l1_messages.push(vec![33; 33]);
 
@@ -291,7 +272,7 @@ async fn insert_l2_block_storage_logs(
     storage_logs: Vec<StorageLog>,
 ) {
     conn.storage_logs_dal()
-        .insert_storage_logs(l2_block_number, &[(H256::zero(), storage_logs)])
+        .insert_storage_logs(l2_block_number, &storage_logs)
         .await
         .unwrap();
 }
@@ -361,7 +342,7 @@ async fn storage_logs_pruning_works_correctly() {
     )
     .await;
 
-    transaction
+    let stats = transaction
         .pruning_dal()
         .hard_prune_batches_range(L1BatchNumber(4), L2BlockNumber(9))
         .await
@@ -377,8 +358,9 @@ async fn storage_logs_pruning_works_correctly() {
         &[random_storage_log(2, 3), random_storage_log(3, 4)],
     );
     assert_l2_block_storage_logs_equal(L2BlockNumber(1), &actual_logs, &[random_storage_log(1, 1)]);
+    assert_eq!(stats.deleted_storage_logs, 1);
 
-    transaction
+    let stats = transaction
         .pruning_dal()
         .hard_prune_batches_range(L1BatchNumber(10), L2BlockNumber(21))
         .await
@@ -400,6 +382,7 @@ async fn storage_logs_pruning_works_correctly() {
         &actual_logs,
         &[random_storage_log(5, 7)],
     );
+    assert_eq!(stats.deleted_storage_logs, 2);
 }
 
 #[tokio::test]
@@ -486,6 +469,8 @@ async fn transactions_are_handled_correctly_after_pruning() {
             L2BlockNumber(1),
             &[mock_execution_result(tx.clone())],
             1.into(),
+            ProtocolVersionId::latest(),
+            false,
         )
         .await
         .unwrap();
diff --git a/core/lib/dal/src/snapshots_creator_dal.rs b/core/lib/dal/src/snapshots_creator_dal.rs
index 7648efc43cc2..b076240173b1 100644
--- a/core/lib/dal/src/snapshots_creator_dal.rs
+++ b/core/lib/dal/src/snapshots_creator_dal.rs
@@ -55,9 +55,74 @@ impl SnapshotsCreatorDal<'_, '_> {
         let storage_logs = sqlx::query!(
             r#"
             SELECT
-                storage_logs.key AS "key!",
+                storage_logs.hashed_key AS "hashed_key!",
                 storage_logs.value AS "value!",
+                storage_logs.miniblock_number AS "miniblock_number!",
+                initial_writes.l1_batch_number AS "l1_batch_number!",
+                initial_writes.index
+            FROM
+                (
+                    SELECT
+                        hashed_key,
+                        MAX(ARRAY[miniblock_number, operation_number]::INT[]) AS op
+                    FROM
+                        storage_logs
+                    WHERE
+                        miniblock_number <= $1
+                        AND hashed_key >= $3
+                        AND hashed_key <= $4
+                    GROUP BY
+                        hashed_key
+                    ORDER BY
+                        hashed_key
+                ) AS keys
+                INNER JOIN storage_logs ON keys.hashed_key = storage_logs.hashed_key
+                AND storage_logs.miniblock_number = keys.op[1]
+                AND storage_logs.operation_number = keys.op[2]
+                INNER JOIN initial_writes ON keys.hashed_key = initial_writes.hashed_key
+            WHERE
+                initial_writes.l1_batch_number <= $2
+            "#,
+            i64::from(l2_block_number.0),
+            i64::from(l1_batch_number.0),
+            hashed_keys_range.start().as_bytes(),
+            hashed_keys_range.end().as_bytes()
+        )
+        .instrument("get_storage_logs_chunk")
+        .with_arg("l2_block_number", &l2_block_number)
+        .with_arg("min_hashed_key", &hashed_keys_range.start())
+        .with_arg("max_hashed_key", &hashed_keys_range.end())
+        .report_latency()
+        .expect_slow_query()
+        .fetch_all(self.storage)
+        .await?
+        .iter()
+        .map(|row| SnapshotStorageLog {
+            key: H256::from_slice(&row.hashed_key),
+            value: H256::from_slice(&row.value),
+            l1_batch_number_of_initial_write: L1BatchNumber(row.l1_batch_number as u32),
+            enumeration_index: row.index as u64,
+        })
+        .collect();
+        Ok(storage_logs)
+    }
+
+    /// Same as [`Self::get_storage_logs_chunk()`], but returns full keys.
+    #[deprecated(
+        note = "will fail if called on a node restored from a v1 snapshot; use `get_storage_logs_chunk()` instead"
+    )]
+    pub async fn get_storage_logs_chunk_with_key_preimages(
+        &mut self,
+        l2_block_number: L2BlockNumber,
+        l1_batch_number: L1BatchNumber,
+        hashed_keys_range: std::ops::RangeInclusive<H256>,
+    ) -> DalResult<Vec<SnapshotStorageLog<StorageKey>>> {
+        let storage_logs = sqlx::query!(
+            r#"
+            SELECT
                 storage_logs.address AS "address!",
+                storage_logs.key AS "key!",
+                storage_logs.value AS "value!",
                 storage_logs.miniblock_number AS "miniblock_number!",
                 initial_writes.l1_batch_number AS "l1_batch_number!",
                 initial_writes.index
@@ -164,11 +229,12 @@ mod tests {
         logs.sort_unstable_by_key(|log| log.key.hashed_key());
 
         conn.storage_logs_dal()
-            .insert_storage_logs(L2BlockNumber(1), &[(H256::zero(), logs.clone())])
+            .insert_storage_logs(L2BlockNumber(1), &logs)
             .await
             .unwrap();
         let mut written_keys: Vec<_> = logs.iter().map(|log| log.key).collect();
         written_keys.sort_unstable();
+        let written_keys: Vec<_> = written_keys.iter().map(StorageKey::hashed_key).collect();
         conn.storage_logs_dedup_dal()
             .insert_initial_writes(L1BatchNumber(1), &written_keys)
             .await
@@ -190,7 +256,7 @@ mod tests {
             );
             StorageLog::new_write_log(key, H256::repeat_byte(1))
         });
-        let new_written_keys: Vec<_> = new_logs.clone().map(|log| log.key).collect();
+        let new_written_keys: Vec<_> = new_logs.clone().map(|log| log.key.hashed_key()).collect();
         let updated_logs = logs.iter().step_by(3).map(|&log| StorageLog {
             value: H256::repeat_byte(23),
             ..log
@@ -198,7 +264,7 @@ mod tests {
         let all_new_logs: Vec<_> = new_logs.chain(updated_logs).collect();
         let all_new_logs_len = all_new_logs.len();
         conn.storage_logs_dal()
-            .insert_storage_logs(L2BlockNumber(2), &[(H256::zero(), all_new_logs)])
+            .insert_storage_logs(L2BlockNumber(2), &all_new_logs)
             .await
             .unwrap();
         conn.storage_logs_dedup_dal()
@@ -238,7 +304,7 @@ mod tests {
             .unwrap();
         assert_eq!(all_logs.len(), expected_logs.len());
         for (log, expected_log) in all_logs.iter().zip(expected_logs) {
-            assert_eq!(log.key, expected_log.key);
+            assert_eq!(log.key, expected_log.key.hashed_key());
             assert_eq!(log.value, expected_log.value);
             assert_eq!(log.l1_batch_number_of_initial_write, l1_batch_number);
         }
@@ -253,7 +319,7 @@ mod tests {
                     .unwrap();
                 assert_eq!(logs.len(), chunk.len());
                 for (log, expected_log) in logs.iter().zip(chunk) {
-                    assert_eq!(log.key, expected_log.key);
+                    assert_eq!(log.key, expected_log.key.hashed_key());
                     assert_eq!(log.value, expected_log.value);
                 }
             }
@@ -271,18 +337,18 @@ mod tests {
             StorageLog::new_write_log(key, H256::zero()),
         ];
         conn.storage_logs_dal()
-            .insert_storage_logs(L2BlockNumber(1), &[(H256::zero(), phantom_writes)])
+            .insert_storage_logs(L2BlockNumber(1), &phantom_writes)
             .await
             .unwrap();
         // initial writes are intentionally not inserted.
 
         let real_write = StorageLog::new_write_log(key, H256::repeat_byte(2));
         conn.storage_logs_dal()
-            .insert_storage_logs(L2BlockNumber(2), &[(H256::zero(), vec![real_write])])
+            .insert_storage_logs(L2BlockNumber(2), &[real_write])
             .await
             .unwrap();
         conn.storage_logs_dedup_dal()
-            .insert_initial_writes(L1BatchNumber(2), &[key])
+            .insert_initial_writes(L1BatchNumber(2), &[key.hashed_key()])
             .await
             .unwrap();
 
@@ -307,7 +373,7 @@ mod tests {
             .await
             .unwrap();
         assert_eq!(logs.len(), 1);
-        assert_eq!(logs[0].key, key);
+        assert_eq!(logs[0].key, key.hashed_key());
         assert_eq!(logs[0].value, real_write.value);
         assert_eq!(logs[0].l1_batch_number_of_initial_write, L1BatchNumber(2));
     }
diff --git a/core/lib/dal/src/storage_logs_dal.rs b/core/lib/dal/src/storage_logs_dal.rs
index 9a483ce2b44b..d5de66037b49 100644
--- a/core/lib/dal/src/storage_logs_dal.rs
+++ b/core/lib/dal/src/storage_logs_dal.rs
@@ -26,7 +26,7 @@ impl StorageLogsDal<'_, '_> {
     pub async fn insert_storage_logs(
         &mut self,
         block_number: L2BlockNumber,
-        logs: &[(H256, Vec<StorageLog>)],
+        logs: &[StorageLog],
     ) -> DalResult<()> {
         self.insert_storage_logs_inner(block_number, logs, 0).await
     }
@@ -34,13 +34,13 @@ impl StorageLogsDal<'_, '_> {
     async fn insert_storage_logs_inner(
         &mut self,
         block_number: L2BlockNumber,
-        logs: &[(H256, Vec<StorageLog>)],
+        logs: &[StorageLog],
         mut operation_number: u32,
     ) -> DalResult<()> {
         let logs_len = logs.len();
         let copy = CopyStatement::new(
             "COPY storage_logs(
-                hashed_key, address, key, value, operation_number, tx_hash, miniblock_number,
+                hashed_key, address, key, value, operation_number, miniblock_number,
                 created_at, updated_at
             )
             FROM STDIN WITH (DELIMITER '|')",
@@ -53,31 +53,30 @@ impl StorageLogsDal<'_, '_> {
 
         let mut buffer = String::new();
         let now = Utc::now().naive_utc().to_string();
-        for (tx_hash, logs) in logs {
-            for log in logs {
-                write_str!(
-                    &mut buffer,
-                    r"\\x{hashed_key:x}|\\x{address:x}|\\x{key:x}|\\x{value:x}|",
-                    hashed_key = log.key.hashed_key(),
-                    address = log.key.address(),
-                    key = log.key.key(),
-                    value = log.value
-                );
-                writeln_str!(
-                    &mut buffer,
-                    r"{operation_number}|\\x{tx_hash:x}|{block_number}|{now}|{now}"
-                );
-
-                operation_number += 1;
-            }
+        for log in logs {
+            write_str!(
+                &mut buffer,
+                r"\\x{hashed_key:x}|\\x{address:x}|\\x{key:x}|\\x{value:x}|",
+                hashed_key = log.key.hashed_key(),
+                address = log.key.address(),
+                key = log.key.key(),
+                value = log.value
+            );
+            writeln_str!(
+                &mut buffer,
+                r"{operation_number}|{block_number}|{now}|{now}"
+            );
+
+            operation_number += 1;
         }
         copy.send(buffer.as_bytes()).await
     }
 
-    pub async fn insert_storage_logs_from_snapshot(
+    #[deprecated(note = "Will be removed in favor of `insert_storage_logs_from_snapshot()`")]
+    pub async fn insert_storage_logs_with_preimages_from_snapshot(
         &mut self,
         l2_block_number: L2BlockNumber,
-        snapshot_storage_logs: &[SnapshotStorageLog],
+        snapshot_storage_logs: &[SnapshotStorageLog<StorageKey>],
     ) -> DalResult<()> {
         let storage_logs_len = snapshot_storage_logs.len();
         let copy = CopyStatement::new(
@@ -114,10 +113,48 @@ impl StorageLogsDal<'_, '_> {
         copy.send(buffer.as_bytes()).await
     }
 
+    pub async fn insert_storage_logs_from_snapshot(
+        &mut self,
+        l2_block_number: L2BlockNumber,
+        snapshot_storage_logs: &[SnapshotStorageLog],
+    ) -> DalResult<()> {
+        let storage_logs_len = snapshot_storage_logs.len();
+        let copy = CopyStatement::new(
+            "COPY storage_logs(
+                hashed_key, value, operation_number, tx_hash, miniblock_number,
+                created_at, updated_at
+            )
+            FROM STDIN WITH (DELIMITER '|')",
+        )
+        .instrument("insert_storage_logs_from_snapshot")
+        .with_arg("l2_block_number", &l2_block_number)
+        .with_arg("storage_logs.len", &storage_logs_len)
+        .start(self.storage)
+        .await?;
+
+        let mut buffer = String::new();
+        let now = Utc::now().naive_utc().to_string();
+        for log in snapshot_storage_logs.iter() {
+            write_str!(
+                &mut buffer,
+                r"\\x{hashed_key:x}|\\x{value:x}|",
+                hashed_key = log.key,
+                value = log.value
+            );
+            writeln_str!(
+                &mut buffer,
+                r"{}|\\x{:x}|{l2_block_number}|{now}|{now}",
+                log.enumeration_index,
+                H256::zero()
+            );
+        }
+        copy.send(buffer.as_bytes()).await
+    }
+
     pub async fn append_storage_logs(
         &mut self,
         block_number: L2BlockNumber,
-        logs: &[(H256, Vec<StorageLog>)],
+        logs: &[StorageLog],
     ) -> DalResult<()> {
         let operation_number = sqlx::query!(
             r#"
@@ -200,10 +237,24 @@ impl StorageLogsDal<'_, '_> {
                     FROM
                         storage_logs
                     WHERE
-                        storage_logs.hashed_key = $1
+                        hashed_key = $1
+                        AND miniblock_number <= COALESCE(
+                            (
+                                SELECT
+                                    MAX(number)
+                                FROM
+                                    miniblocks
+                            ),
+                            (
+                                SELECT
+                                    miniblock_number
+                                FROM
+                                    snapshot_recovery
+                            )
+                        )
                     ORDER BY
-                        storage_logs.miniblock_number DESC,
-                        storage_logs.operation_number DESC
+                        miniblock_number DESC,
+                        operation_number DESC
                     LIMIT
                         1
                 ) sl
@@ -247,6 +298,20 @@ impl StorageLogsDal<'_, '_> {
             WHERE
                 hashed_key = ANY ($1)
                 AND miniblock_number <= $2
+                AND miniblock_number <= COALESCE(
+                    (
+                        SELECT
+                            MAX(number)
+                        FROM
+                            miniblocks
+                    ),
+                    (
+                        SELECT
+                            miniblock_number
+                        FROM
+                            snapshot_recovery
+                    )
+                )
             ORDER BY
                 hashed_key,
                 miniblock_number DESC,
@@ -273,17 +338,16 @@ impl StorageLogsDal<'_, '_> {
         Ok(deployment_data.collect())
     }
 
-    /// Returns latest values for all [`StorageKey`]s written to in the specified L1 batch
+    /// Returns latest values for all slots written to in the specified L1 batch
     /// judging by storage logs (i.e., not taking deduplication logic into account).
     pub async fn get_touched_slots_for_l1_batch(
         &mut self,
         l1_batch_number: L1BatchNumber,
-    ) -> DalResult<HashMap<StorageKey, H256>> {
+    ) -> DalResult<HashMap<H256, H256>> {
         let rows = sqlx::query!(
             r#"
             SELECT
-                address,
-                key,
+                hashed_key,
                 value
             FROM
                 storage_logs
@@ -314,6 +378,57 @@ impl StorageLogsDal<'_, '_> {
         .fetch_all(self.storage)
         .await?;
 
+        let touched_slots = rows.into_iter().map(|row| {
+            (
+                H256::from_slice(&row.hashed_key),
+                H256::from_slice(&row.value),
+            )
+        });
+        Ok(touched_slots.collect())
+    }
+
+    /// Same as [`Self::get_touched_slots_for_l1_batch()`], but loads key preimages instead of hashed keys.
+    /// Correspondingly, this method is safe to call for locally executed L1 batches, for which key preimages
+    /// are known; otherwise, it will error.
+    pub async fn get_touched_slots_for_executed_l1_batch(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> DalResult<HashMap<StorageKey, H256>> {
+        let rows = sqlx::query!(
+            r#"
+            SELECT
+                address AS "address!",
+                key AS "key!",
+                value
+            FROM
+                storage_logs
+            WHERE
+                miniblock_number BETWEEN (
+                    SELECT
+                        MIN(number)
+                    FROM
+                        miniblocks
+                    WHERE
+                        l1_batch_number = $1
+                ) AND (
+                    SELECT
+                        MAX(number)
+                    FROM
+                        miniblocks
+                    WHERE
+                        l1_batch_number = $1
+                )
+            ORDER BY
+                miniblock_number,
+                operation_number
+            "#,
+            i64::from(l1_batch_number.0)
+        )
+        .instrument("get_touched_slots_for_executed_l1_batch")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .fetch_all(self.storage)
+        .await?;
+
         let touched_slots = rows.into_iter().map(|row| {
             let key = StorageKey::new(
                 AccountTreeId::new(Address::from_slice(&row.address)),
@@ -537,7 +652,6 @@ impl StorageLogsDal<'_, '_> {
                 key,
                 value,
                 operation_number,
-                tx_hash,
                 miniblock_number
             FROM
                 storage_logs
@@ -553,11 +667,10 @@ impl StorageLogsDal<'_, '_> {
         rows.into_iter()
             .map(|row| DbStorageLog {
                 hashed_key: H256::from_slice(&row.hashed_key),
-                address: H160::from_slice(&row.address),
-                key: H256::from_slice(&row.key),
+                address: row.address.as_deref().map(H160::from_slice),
+                key: row.key.as_deref().map(H256::from_slice),
                 value: H256::from_slice(&row.value),
                 operation_number: row.operation_number as u64,
-                tx_hash: H256::from_slice(&row.tx_hash),
                 l2_block_number: L2BlockNumber(row.miniblock_number as u32),
             })
             .collect()
@@ -696,7 +809,9 @@ impl StorageLogsDal<'_, '_> {
 #[cfg(test)]
 mod tests {
     use zksync_contracts::BaseSystemContractsHashes;
-    use zksync_types::{block::L1BatchHeader, ProtocolVersion, ProtocolVersionId};
+    use zksync_types::{
+        block::L1BatchHeader, AccountTreeId, ProtocolVersion, ProtocolVersionId, StorageKey,
+    };
 
     use super::*;
     use crate::{tests::create_l2_block_header, ConnectionPool, Core};
@@ -717,7 +832,6 @@ mod tests {
             .await
             .unwrap();
 
-        let logs = [(H256::zero(), logs)];
         conn.storage_logs_dal()
             .insert_storage_logs(L2BlockNumber(number), &logs)
             .await
@@ -750,12 +864,15 @@ mod tests {
             .await
             .unwrap();
         assert_eq!(touched_slots.len(), 2);
-        assert_eq!(touched_slots[&first_key], H256::repeat_byte(1));
-        assert_eq!(touched_slots[&second_key], H256::repeat_byte(2));
+        assert_eq!(touched_slots[&first_key.hashed_key()], H256::repeat_byte(1));
+        assert_eq!(
+            touched_slots[&second_key.hashed_key()],
+            H256::repeat_byte(2)
+        );
 
         // Add more logs and check log ordering.
         let third_log = StorageLog::new_write_log(first_key, H256::repeat_byte(3));
-        let more_logs = [(H256::repeat_byte(1), vec![third_log])];
+        let more_logs = vec![third_log];
         conn.storage_logs_dal()
             .append_storage_logs(L2BlockNumber(1), &more_logs)
             .await
@@ -767,8 +884,11 @@ mod tests {
             .await
             .unwrap();
         assert_eq!(touched_slots.len(), 2);
-        assert_eq!(touched_slots[&first_key], H256::repeat_byte(3));
-        assert_eq!(touched_slots[&second_key], H256::repeat_byte(2));
+        assert_eq!(touched_slots[&first_key.hashed_key()], H256::repeat_byte(3));
+        assert_eq!(
+            touched_slots[&second_key.hashed_key()],
+            H256::repeat_byte(2)
+        );
 
         test_revert(&mut conn, first_key, second_key).await;
     }
@@ -838,7 +958,7 @@ mod tests {
             })
             .collect();
         insert_l2_block(&mut conn, 1, logs.clone()).await;
-        let written_keys: Vec<_> = logs.iter().map(|log| log.key).collect();
+        let written_keys: Vec<_> = logs.iter().map(|log| log.key.hashed_key()).collect();
         conn.storage_logs_dedup_dal()
             .insert_initial_writes(L1BatchNumber(1), &written_keys)
             .await
@@ -851,7 +971,10 @@ mod tests {
             })
             .collect();
         insert_l2_block(&mut conn, 2, new_logs.clone()).await;
-        let new_written_keys: Vec<_> = new_logs[5..].iter().map(|log| log.key).collect();
+        let new_written_keys: Vec<_> = new_logs[5..]
+            .iter()
+            .map(|log| log.key.hashed_key())
+            .collect();
         conn.storage_logs_dedup_dal()
             .insert_initial_writes(L1BatchNumber(2), &new_written_keys)
             .await
@@ -908,8 +1031,9 @@ mod tests {
             let initial_keys: Vec<_> = logs
                 .iter()
                 .filter_map(|log| {
-                    (!log.value.is_zero() && !non_initial.contains(&log.key.hashed_key()))
-                        .then_some(log.key)
+                    let hashed_key = log.key.hashed_key();
+                    (!log.value.is_zero() && !non_initial.contains(&hashed_key))
+                        .then_some(hashed_key)
                 })
                 .collect();
 
@@ -993,6 +1117,7 @@ mod tests {
 
         let mut initial_keys: Vec<_> = logs.iter().map(|log| log.key).collect();
         initial_keys.sort_unstable();
+        let initial_keys: Vec<_> = initial_keys.iter().map(StorageKey::hashed_key).collect();
         conn.storage_logs_dedup_dal()
             .insert_initial_writes(L1BatchNumber(1), &initial_keys)
             .await
@@ -1049,15 +1174,13 @@ mod tests {
 
         let pool = ConnectionPool::<Core>::test_pool().await;
         let mut conn = pool.connection().await.unwrap();
-        // If deployment fails then two writes are issued, one that writes `bytecode_hash` to the "correct" value,
-        // and the next write reverts its value back to `FAILED_CONTRACT_DEPLOYMENT_BYTECODE_HASH`.
-        conn.storage_logs_dal()
-            .insert_storage_logs(
-                L2BlockNumber(1),
-                &[(H256::zero(), vec![successful_deployment, failed_deployment])],
-            )
+        conn.protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
             .await
             .unwrap();
+        // If deployment fails then two writes are issued, one that writes `bytecode_hash` to the "correct" value,
+        // and the next write reverts its value back to `FAILED_CONTRACT_DEPLOYMENT_BYTECODE_HASH`.
+        insert_l2_block(&mut conn, 1, vec![successful_deployment, failed_deployment]).await;
 
         let tested_l2_blocks = [
             None,
@@ -1080,13 +1203,7 @@ mod tests {
             );
         }
 
-        conn.storage_logs_dal()
-            .insert_storage_logs(
-                L2BlockNumber(2),
-                &[(H256::zero(), vec![successful_deployment])],
-            )
-            .await
-            .unwrap();
+        insert_l2_block(&mut conn, 2, vec![successful_deployment]).await;
 
         for old_l2_block in [L2BlockNumber(0), L2BlockNumber(1)] {
             let deployed_map = conn
@@ -1121,13 +1238,7 @@ mod tests {
             get_code_key(&other_contract_address),
             H256::repeat_byte(0xff),
         );
-        conn.storage_logs_dal()
-            .insert_storage_logs(
-                L2BlockNumber(3),
-                &[(H256::zero(), vec![other_successful_deployment])],
-            )
-            .await
-            .unwrap();
+        insert_l2_block(&mut conn, 3, vec![other_successful_deployment]).await;
 
         for old_l2_block in [L2BlockNumber(0), L2BlockNumber(1)] {
             let deployed_map = conn
diff --git a/core/lib/dal/src/storage_logs_dedup_dal.rs b/core/lib/dal/src/storage_logs_dedup_dal.rs
index 6304869a8261..02049f3e9ade 100644
--- a/core/lib/dal/src/storage_logs_dedup_dal.rs
+++ b/core/lib/dal/src/storage_logs_dedup_dal.rs
@@ -7,10 +7,9 @@ use zksync_db_connection::{
     instrument::{CopyStatement, InstrumentExt},
 };
 use zksync_types::{
-    snapshots::SnapshotStorageLog, zk_evm_types::LogQuery, AccountTreeId, Address, L1BatchNumber,
-    StorageKey, H256,
+    snapshots::SnapshotStorageLog, AccountTreeId, Address, L1BatchNumber, StorageKey, StorageLog,
+    H256,
 };
-use zksync_utils::u256_to_h256;
 
 pub use crate::models::storage_log::DbInitialWrite;
 use crate::Core;
@@ -24,7 +23,7 @@ impl StorageLogsDedupDal<'_, '_> {
     pub async fn insert_protective_reads(
         &mut self,
         l1_batch_number: L1BatchNumber,
-        read_logs: &[LogQuery],
+        read_logs: &[StorageLog],
     ) -> DalResult<()> {
         let read_logs_len = read_logs.len();
         let copy = CopyStatement::new(
@@ -40,8 +39,8 @@ impl StorageLogsDedupDal<'_, '_> {
         let mut bytes: Vec<u8> = Vec::new();
         let now = Utc::now().naive_utc().to_string();
         for log in read_logs.iter() {
-            let address_str = format!("\\\\x{}", hex::encode(log.address.0));
-            let key_str = format!("\\\\x{}", hex::encode(u256_to_h256(log.key).0));
+            let address_str = format!("\\\\x{}", hex::encode(log.key.address()));
+            let key_str = format!("\\\\x{}", hex::encode(log.key.key()));
             let row = format!(
                 "{}|{}|{}|{}|{}\n",
                 l1_batch_number, address_str, key_str, now, now
@@ -69,14 +68,10 @@ impl StorageLogsDedupDal<'_, '_> {
 
         let mut bytes: Vec<u8> = Vec::new();
         let now = Utc::now().naive_utc().to_string();
-        for log in snapshot_storage_logs.iter() {
+        for log in snapshot_storage_logs {
             let row = format!(
                 "\\\\x{:x}|{}|{}|{}|{}\n",
-                log.key.hashed_key(),
-                log.enumeration_index,
-                log.l1_batch_number_of_initial_write,
-                now,
-                now,
+                log.key, log.enumeration_index, log.l1_batch_number_of_initial_write, now, now,
             );
             bytes.extend_from_slice(row.as_bytes());
         }
@@ -86,12 +81,9 @@ impl StorageLogsDedupDal<'_, '_> {
     pub async fn insert_initial_writes(
         &mut self,
         l1_batch_number: L1BatchNumber,
-        written_storage_keys: &[StorageKey],
+        written_hashed_keys: &[H256],
     ) -> DalResult<()> {
-        let hashed_keys: Vec<_> = written_storage_keys
-            .iter()
-            .map(|key| StorageKey::raw_hashed_key(key.address(), key.key()).to_vec())
-            .collect();
+        let hashed_keys: Vec<_> = written_hashed_keys.iter().map(H256::as_bytes).collect();
 
         let last_index = self.max_enumeration_index().await?.unwrap_or(0);
         let indices: Vec<_> = ((last_index + 1)..=(last_index + hashed_keys.len() as u64))
@@ -111,7 +103,7 @@ impl StorageLogsDedupDal<'_, '_> {
             FROM
                 UNNEST($1::bytea[], $2::BIGINT[]) AS u (hashed_key, INDEX)
             "#,
-            &hashed_keys,
+            &hashed_keys as &[&[u8]],
             &indices,
             i64::from(l1_batch_number.0)
         )
@@ -172,6 +164,36 @@ impl StorageLogsDedupDal<'_, '_> {
         .map(|max| max as u64))
     }
 
+    /// Returns the max enumeration index by the provided L1 batch number.
+    pub async fn max_enumeration_index_by_l1_batch(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> DalResult<Option<u64>> {
+        Ok(sqlx::query!(
+            r#"
+            SELECT
+                MAX(INDEX) AS "max?"
+            FROM
+                initial_writes
+            WHERE
+                l1_batch_number = (
+                    SELECT
+                        MAX(l1_batch_number) AS "max?"
+                    FROM
+                        initial_writes
+                    WHERE
+                        l1_batch_number <= $1
+                )
+            "#,
+            i64::from(l1_batch_number.0)
+        )
+        .instrument("max_enumeration_index_by_l1_batch")
+        .fetch_one(self.storage)
+        .await?
+        .max
+        .map(|max| max as u64))
+    }
+
     pub async fn initial_writes_for_batch(
         &mut self,
         l1_batch_number: L1BatchNumber,
@@ -295,3 +317,61 @@ impl StorageLogsDedupDal<'_, '_> {
             .collect()
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{ConnectionPool, CoreDal};
+
+    #[tokio::test]
+    async fn getting_max_enumeration_index_in_batch() {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = pool.connection().await.unwrap();
+        let max_index = conn
+            .storage_logs_dedup_dal()
+            .max_enumeration_index_by_l1_batch(L1BatchNumber(0))
+            .await
+            .unwrap();
+        assert_eq!(max_index, None);
+
+        let account = AccountTreeId::new(Address::repeat_byte(1));
+        let initial_writes = [
+            StorageKey::new(account, H256::zero()).hashed_key(),
+            StorageKey::new(account, H256::repeat_byte(1)).hashed_key(),
+        ];
+        conn.storage_logs_dedup_dal()
+            .insert_initial_writes(L1BatchNumber(0), &initial_writes)
+            .await
+            .unwrap();
+
+        let max_index = conn
+            .storage_logs_dedup_dal()
+            .max_enumeration_index_by_l1_batch(L1BatchNumber(0))
+            .await
+            .unwrap();
+        assert_eq!(max_index, Some(2));
+
+        let initial_writes = [
+            StorageKey::new(account, H256::repeat_byte(2)).hashed_key(),
+            StorageKey::new(account, H256::repeat_byte(3)).hashed_key(),
+        ];
+        conn.storage_logs_dedup_dal()
+            .insert_initial_writes(L1BatchNumber(1), &initial_writes)
+            .await
+            .unwrap();
+
+        let max_index = conn
+            .storage_logs_dedup_dal()
+            .max_enumeration_index_by_l1_batch(L1BatchNumber(0))
+            .await
+            .unwrap();
+        assert_eq!(max_index, Some(2));
+
+        let max_index = conn
+            .storage_logs_dedup_dal()
+            .max_enumeration_index_by_l1_batch(L1BatchNumber(1))
+            .await
+            .unwrap();
+        assert_eq!(max_index, Some(4));
+    }
+}
diff --git a/core/lib/dal/src/storage_web3_dal.rs b/core/lib/dal/src/storage_web3_dal.rs
index 9b6e332c99c3..f54ac766ee8c 100644
--- a/core/lib/dal/src/storage_web3_dal.rs
+++ b/core/lib/dal/src/storage_web3_dal.rs
@@ -1,6 +1,10 @@
 use std::collections::HashMap;
 
-use zksync_db_connection::{connection::Connection, error::DalResult, instrument::InstrumentExt};
+use zksync_db_connection::{
+    connection::Connection,
+    error::DalResult,
+    instrument::{InstrumentExt, Instrumented},
+};
 use zksync_types::{
     get_code_key, get_nonce_key,
     utils::{decompose_full_nonce, storage_key_for_standard_token_balance},
@@ -24,7 +28,7 @@ impl StorageWeb3Dal<'_, '_> {
     ) -> DalResult<U256> {
         let nonce_key = get_nonce_key(&address);
         let nonce_value = self
-            .get_historical_value_unchecked(&nonce_key, block_number)
+            .get_historical_value_unchecked(nonce_key.hashed_key(), block_number)
             .await?;
         let full_nonce = h256_to_u256(nonce_value);
         Ok(decompose_full_nonce(full_nonce).0)
@@ -62,24 +66,49 @@ impl StorageWeb3Dal<'_, '_> {
     ) -> DalResult<U256> {
         let key = storage_key_for_standard_token_balance(token_id, account_id.address());
         let balance = self
-            .get_historical_value_unchecked(&key, block_number)
+            .get_historical_value_unchecked(key.hashed_key(), block_number)
             .await?;
         Ok(h256_to_u256(balance))
     }
 
-    /// Gets the current value for the specified `key`.
+    /// Gets the current value for the specified `key`. Uses state of the latest sealed L2 block.
+    /// Returns error if there is no sealed L2 blocks.
+    // FIXME: propagate hashed_key?
     pub async fn get_value(&mut self, key: &StorageKey) -> DalResult<H256> {
-        self.get_historical_value_unchecked(key, L2BlockNumber(u32::MAX))
+        let Some(l2_block_number) = self
+            .storage
+            .blocks_dal()
+            .get_sealed_l2_block_number()
+            .await?
+        else {
+            let err = Instrumented::new("get_value")
+                .with_arg("key", &key)
+                .constraint_error(anyhow::anyhow!("no sealed l2 blocks"));
+            return Err(err);
+        };
+        self.get_historical_value_unchecked(key.hashed_key(), l2_block_number)
             .await
     }
 
     /// Gets the current values for the specified `hashed_keys`. The returned map has requested hashed keys as keys
-    /// and current storage values as values.
+    /// and current storage values as values. Uses state of the latest sealed L2 block.
+    /// Returns error if there is no sealed L2 blocks.
     pub async fn get_values(&mut self, hashed_keys: &[H256]) -> DalResult<HashMap<H256, H256>> {
+        let Some(l2_block_number) = self
+            .storage
+            .blocks_dal()
+            .get_sealed_l2_block_number()
+            .await?
+        else {
+            let err = Instrumented::new("get_values")
+                .with_arg("hashed_keys", &hashed_keys)
+                .constraint_error(anyhow::anyhow!("no sealed l2 blocks"));
+            return Err(err);
+        };
         let storage_map = self
             .storage
             .storage_logs_dal()
-            .get_storage_values(hashed_keys, L2BlockNumber(u32::MAX))
+            .get_storage_values(hashed_keys, l2_block_number)
             .await?;
         Ok(storage_map
             .into_iter()
@@ -91,11 +120,9 @@ impl StorageWeb3Dal<'_, '_> {
     /// It will return the current value if the block is in the future.
     pub async fn get_historical_value_unchecked(
         &mut self,
-        key: &StorageKey,
+        hashed_key: H256,
         block_number: L2BlockNumber,
     ) -> DalResult<H256> {
-        let hashed_key = key.hashed_key();
-
         sqlx::query!(
             r#"
             SELECT
@@ -176,9 +203,8 @@ impl StorageWeb3Dal<'_, '_> {
 
     pub async fn get_l1_batch_number_for_initial_write(
         &mut self,
-        key: &StorageKey,
+        hashed_key: H256,
     ) -> DalResult<Option<L1BatchNumber>> {
-        let hashed_key = key.hashed_key();
         let row = sqlx::query!(
             r#"
             SELECT
diff --git a/core/lib/dal/src/sync_dal.rs b/core/lib/dal/src/sync_dal.rs
index ccee0c53d08f..898770c38f5a 100644
--- a/core/lib/dal/src/sync_dal.rs
+++ b/core/lib/dal/src/sync_dal.rs
@@ -15,11 +15,15 @@ pub struct SyncDal<'a, 'c> {
 }
 
 impl SyncDal<'_, '_> {
-    pub(super) async fn sync_block_inner(
+    pub(super) async fn sync_blocks_inner(
         &mut self,
-        block_number: L2BlockNumber,
-    ) -> DalResult<Option<SyncBlock>> {
-        let block = sqlx::query_as!(
+        numbers: std::ops::Range<L2BlockNumber>,
+    ) -> DalResult<Vec<SyncBlock>> {
+        // Check if range is non-empty, because BETWEEN in SQL in `unordered`.
+        if numbers.is_empty() {
+            return Ok(vec![]);
+        }
+        let blocks = sqlx::query_as!(
             StorageSyncBlock,
             r#"
             SELECT
@@ -39,14 +43,7 @@ impl SyncDal<'_, '_> {
                             snapshot_recovery
                     )
                 ) AS "l1_batch_number!",
-                (
-                    SELECT
-                        MAX(m2.number)
-                    FROM
-                        miniblocks m2
-                    WHERE
-                        miniblocks.l1_batch_number = m2.l1_batch_number
-                ) AS "last_batch_miniblock?",
+                (miniblocks.l1_tx_count + miniblocks.l2_tx_count) AS "tx_count!",
                 miniblocks.timestamp,
                 miniblocks.l1_gas_price,
                 miniblocks.l2_fair_gas_price,
@@ -60,35 +57,44 @@ impl SyncDal<'_, '_> {
             FROM
                 miniblocks
             WHERE
-                miniblocks.number = $1
+                miniblocks.number BETWEEN $1 AND $2
             "#,
-            i64::from(block_number.0)
+            i64::from(numbers.start.0),
+            i64::from(numbers.end.0 - 1),
         )
         .try_map(SyncBlock::try_from)
-        .instrument("sync_dal_sync_block.block")
-        .with_arg("block_number", &block_number)
-        .fetch_optional(self.storage)
+        .instrument("sync_dal_sync_blocks.block")
+        .with_arg("numbers", &numbers)
+        .fetch_all(self.storage)
         .await?;
 
-        Ok(block)
+        Ok(blocks)
     }
 
     pub async fn sync_block(
         &mut self,
-        block_number: L2BlockNumber,
+        number: L2BlockNumber,
         include_transactions: bool,
     ) -> DalResult<Option<en::SyncBlock>> {
         let _latency = MethodLatency::new("sync_dal_sync_block");
-        let Some(block) = self.sync_block_inner(block_number).await? else {
+        let numbers = number..number + 1;
+        let Some(block) = self
+            .sync_blocks_inner(numbers.clone())
+            .await?
+            .into_iter()
+            .next()
+        else {
             return Ok(None);
         };
         let transactions = if include_transactions {
-            let transactions = self
+            let mut transactions = self
                 .storage
                 .transactions_web3_dal()
-                .get_raw_l2_block_transactions(block_number)
+                .get_raw_l2_blocks_transactions(numbers)
                 .await?;
-            Some(transactions)
+            // If there are no transactions in the block,
+            // return `Some(vec![])`.
+            Some(transactions.remove(&number).unwrap_or_default())
         } else {
             None
         };
@@ -152,6 +158,7 @@ mod tests {
         // Insert another block in the store.
         let miniblock_header = L2BlockHeader {
             fee_account_address: Address::repeat_byte(0x42),
+            l2_tx_count: 1,
             ..create_l2_block_header(1)
         };
         let tx = mock_l2_transaction();
@@ -168,6 +175,8 @@ mod tests {
                 L2BlockNumber(1),
                 &[mock_execution_result(tx.clone())],
                 1.into(),
+                ProtocolVersionId::latest(),
+                false,
             )
             .await
             .unwrap();
@@ -210,6 +219,16 @@ mod tests {
         let transactions = block.transactions.unwrap();
         assert_eq!(transactions, [Transaction::from(tx)]);
 
+        let miniblock_header = L2BlockHeader {
+            fee_account_address: Address::repeat_byte(0x42),
+            l2_tx_count: 0,
+            ..create_l2_block_header(2)
+        };
+        conn.blocks_dal()
+            .insert_l2_block(&miniblock_header)
+            .await
+            .unwrap();
+
         l1_batch_header.number = L1BatchNumber(1);
         l1_batch_header.timestamp = 1;
         conn.blocks_dal()
@@ -223,7 +242,7 @@ mod tests {
 
         let block = conn
             .sync_dal()
-            .sync_block(L2BlockNumber(1), true)
+            .sync_block(L2BlockNumber(2), true)
             .await
             .unwrap()
             .expect("no sync block");
diff --git a/core/lib/dal/src/tee_proof_generation_dal.rs b/core/lib/dal/src/tee_proof_generation_dal.rs
new file mode 100644
index 000000000000..0ddf36abdbed
--- /dev/null
+++ b/core/lib/dal/src/tee_proof_generation_dal.rs
@@ -0,0 +1,205 @@
+use std::time::Duration;
+
+use strum::{Display, EnumString};
+use zksync_db_connection::{
+    connection::Connection,
+    error::DalResult,
+    instrument::{InstrumentExt, Instrumented},
+    utils::pg_interval_from_duration,
+};
+use zksync_types::{tee_types::TeeType, L1BatchNumber};
+
+use crate::Core;
+
+#[derive(Debug)]
+pub struct TeeProofGenerationDal<'a, 'c> {
+    pub(crate) storage: &'a mut Connection<'c, Core>,
+}
+
+#[derive(Debug, EnumString, Display)]
+enum TeeProofGenerationJobStatus {
+    #[strum(serialize = "ready_to_be_proven")]
+    ReadyToBeProven,
+    #[strum(serialize = "picked_by_prover")]
+    PickedByProver,
+    #[strum(serialize = "generated")]
+    Generated,
+    #[strum(serialize = "skipped")]
+    Skipped,
+}
+
+impl TeeProofGenerationDal<'_, '_> {
+    pub async fn get_next_block_to_be_proven(
+        &mut self,
+        processing_timeout: Duration,
+    ) -> DalResult<Option<L1BatchNumber>> {
+        let processing_timeout = pg_interval_from_duration(processing_timeout);
+        let result: Option<L1BatchNumber> = sqlx::query!(
+            r#"
+            UPDATE tee_proof_generation_details
+            SET
+                status = 'picked_by_prover',
+                updated_at = NOW(),
+                prover_taken_at = NOW()
+            WHERE
+                l1_batch_number = (
+                    SELECT
+                        proofs.l1_batch_number
+                    FROM
+                        tee_proof_generation_details AS proofs
+                        JOIN tee_verifier_input_producer_jobs AS inputs ON proofs.l1_batch_number = inputs.l1_batch_number
+                    WHERE
+                        inputs.status = 'Successful'
+                        AND (
+                            proofs.status = 'ready_to_be_proven'
+                            OR (
+                                proofs.status = 'picked_by_prover'
+                                AND proofs.prover_taken_at < NOW() - $1::INTERVAL
+                            )
+                        )
+                    ORDER BY
+                        l1_batch_number ASC
+                    LIMIT
+                        1
+                    FOR UPDATE
+                        SKIP LOCKED
+                )
+            RETURNING
+                tee_proof_generation_details.l1_batch_number
+            "#,
+            &processing_timeout,
+        )
+        .fetch_optional(self.storage.conn())
+        .await
+        .unwrap()
+        .map(|row| L1BatchNumber(row.l1_batch_number as u32));
+
+        Ok(result)
+    }
+
+    pub async fn save_proof_artifacts_metadata(
+        &mut self,
+        block_number: L1BatchNumber,
+        signature: &[u8],
+        pubkey: &[u8],
+        proof: &[u8],
+        tee_type: TeeType,
+    ) -> DalResult<()> {
+        let query = sqlx::query!(
+            r#"
+            UPDATE tee_proof_generation_details
+            SET
+                status = 'generated',
+                signature = $1,
+                pubkey = $2,
+                proof = $3,
+                tee_type = $4,
+                updated_at = NOW()
+            WHERE
+                l1_batch_number = $5
+            "#,
+            signature,
+            pubkey,
+            proof,
+            tee_type.to_string(),
+            i64::from(block_number.0)
+        );
+        let instrumentation = Instrumented::new("save_proof_artifacts_metadata")
+            .with_arg("signature", &signature)
+            .with_arg("pubkey", &pubkey)
+            .with_arg("proof", &proof)
+            .with_arg("tee_type", &tee_type);
+        let result = instrumentation
+            .clone()
+            .with(query)
+            .execute(self.storage)
+            .await?;
+        if result.rows_affected() == 0 {
+            let err = instrumentation.constraint_error(anyhow::anyhow!(
+                "Updating TEE proof for a non-existent batch number is not allowed"
+            ));
+            return Err(err);
+        }
+
+        Ok(())
+    }
+
+    pub async fn insert_tee_proof_generation_job(
+        &mut self,
+        block_number: L1BatchNumber,
+    ) -> DalResult<()> {
+        let block_number = i64::from(block_number.0);
+        sqlx::query!(
+            r#"
+            INSERT INTO
+                tee_proof_generation_details (l1_batch_number, status, created_at, updated_at)
+            VALUES
+                ($1, 'ready_to_be_proven', NOW(), NOW())
+            ON CONFLICT (l1_batch_number) DO NOTHING
+            "#,
+            block_number,
+        )
+        .instrument("create_tee_proof_generation_details")
+        .with_arg("l1_batch_number", &block_number)
+        .report_latency()
+        .execute(self.storage)
+        .await?;
+
+        Ok(())
+    }
+
+    pub async fn get_oldest_unpicked_batch(&mut self) -> DalResult<Option<L1BatchNumber>> {
+        let result: Option<L1BatchNumber> = sqlx::query!(
+            r#"
+            SELECT
+                proofs.l1_batch_number
+            FROM
+                tee_proof_generation_details AS proofs
+                JOIN tee_verifier_input_producer_jobs AS inputs ON proofs.l1_batch_number = inputs.l1_batch_number
+            WHERE
+                inputs.status = 'Successful'
+                AND proofs.status = 'ready_to_be_proven'
+            ORDER BY
+                proofs.l1_batch_number ASC
+            LIMIT
+                1
+            "#,
+        )
+        .fetch_optional(self.storage.conn())
+        .await
+        .unwrap()
+        .map(|row| L1BatchNumber(row.l1_batch_number as u32));
+
+        Ok(result)
+    }
+
+    pub async fn save_attestation(&mut self, pubkey: &[u8], attestation: &[u8]) -> DalResult<()> {
+        let query = sqlx::query!(
+            r#"
+            INSERT INTO
+                tee_attestations (pubkey, attestation)
+            VALUES
+                ($1, $2)
+            ON CONFLICT (pubkey) DO NOTHING
+            "#,
+            pubkey,
+            attestation
+        );
+        let instrumentation = Instrumented::new("save_attestation")
+            .with_arg("pubkey", &pubkey)
+            .with_arg("attestation", &attestation);
+        let result = instrumentation
+            .clone()
+            .with(query)
+            .execute(self.storage)
+            .await?;
+        if result.rows_affected() == 0 {
+            let err = instrumentation.constraint_error(anyhow::anyhow!(
+                "Unable to insert TEE attestation: given pubkey already has an attestation assigned"
+            ));
+            return Err(err);
+        }
+
+        Ok(())
+    }
+}
diff --git a/core/lib/dal/src/tee_verifier_input_producer_dal.rs b/core/lib/dal/src/tee_verifier_input_producer_dal.rs
new file mode 100644
index 000000000000..bdf899fa36f8
--- /dev/null
+++ b/core/lib/dal/src/tee_verifier_input_producer_dal.rs
@@ -0,0 +1,232 @@
+use std::time::{Duration, Instant};
+
+use sqlx::postgres::types::PgInterval;
+use zksync_db_connection::{
+    connection::Connection,
+    error::DalResult,
+    instrument::InstrumentExt,
+    utils::{duration_to_naive_time, pg_interval_from_duration},
+};
+use zksync_types::L1BatchNumber;
+
+use crate::Core;
+
+#[derive(Debug)]
+pub struct TeeVerifierInputProducerDal<'a, 'c> {
+    pub(crate) storage: &'a mut Connection<'c, Core>,
+}
+
+/// The amount of attempts to process a job before giving up.
+pub const JOB_MAX_ATTEMPT: i16 = 2;
+
+/// Time to wait for job to be processed
+const JOB_PROCESSING_TIMEOUT: PgInterval = pg_interval_from_duration(Duration::from_secs(10 * 60));
+
+/// Status of a job that the producer will work on.
+
+#[derive(Debug, sqlx::Type)]
+#[sqlx(type_name = "tee_verifier_input_producer_job_status")]
+pub enum TeeVerifierInputProducerJobStatus {
+    /// When the job is queued. Metadata calculator creates the job and marks it as queued.
+    Queued,
+    /// The job is not going to be processed. This state is designed for manual operations on DB.
+    /// It is expected to be used if some jobs should be skipped like:
+    /// - testing purposes (want to check a specific L1 Batch, I can mark everything before it skipped)
+    /// - trim down costs on some environments (if I've done breaking changes,
+    /// makes no sense to wait for everything to be processed, I can just skip them and save resources)
+    ManuallySkipped,
+    /// Currently being processed by one of the jobs. Transitory state, will transition to either
+    /// [`TeeVerifierInputProducerStatus::Successful`] or [`TeeVerifierInputProducerStatus::Failed`].
+    InProgress,
+    /// The final (happy case) state we expect all jobs to end up. After the run is complete,
+    /// the job uploaded it's inputs, it lands in successful.
+    Successful,
+    /// The job failed for reasons. It will be marked as such and the error persisted in DB.
+    /// If it failed less than MAX_ATTEMPTs, the job will be retried,
+    /// otherwise it will stay in this state as final state.
+    Failed,
+}
+
+impl TeeVerifierInputProducerDal<'_, '_> {
+    pub async fn create_tee_verifier_input_producer_job(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> DalResult<()> {
+        sqlx::query!(
+            r#"
+            INSERT INTO
+                tee_verifier_input_producer_jobs (l1_batch_number, status, created_at, updated_at)
+            VALUES
+                ($1, $2, NOW(), NOW())
+            ON CONFLICT (l1_batch_number) DO NOTHING
+            "#,
+            i64::from(l1_batch_number.0),
+            TeeVerifierInputProducerJobStatus::Queued as TeeVerifierInputProducerJobStatus,
+        )
+        .instrument("create_tee_verifier_input_producer_job")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .report_latency()
+        .execute(self.storage)
+        .await?;
+
+        Ok(())
+    }
+
+    pub async fn get_next_tee_verifier_input_producer_job(
+        &mut self,
+    ) -> DalResult<Option<L1BatchNumber>> {
+        let l1_batch_number = sqlx::query!(
+            r#"
+            UPDATE tee_verifier_input_producer_jobs
+            SET
+                status = $1,
+                attempts = attempts + 1,
+                updated_at = NOW(),
+                processing_started_at = NOW()
+            WHERE
+                l1_batch_number = (
+                    SELECT
+                        l1_batch_number
+                    FROM
+                        tee_verifier_input_producer_jobs
+                    WHERE
+                        status = $2
+                        OR (
+                            status = $1
+                            AND processing_started_at < NOW() - $4::INTERVAL
+                        )
+                        OR (
+                            status = $3
+                            AND attempts < $5
+                        )
+                    ORDER BY
+                        l1_batch_number ASC
+                    LIMIT
+                        1
+                    FOR UPDATE
+                        SKIP LOCKED
+                )
+            RETURNING
+                tee_verifier_input_producer_jobs.l1_batch_number
+            "#,
+            TeeVerifierInputProducerJobStatus::InProgress as TeeVerifierInputProducerJobStatus,
+            TeeVerifierInputProducerJobStatus::Queued as TeeVerifierInputProducerJobStatus,
+            TeeVerifierInputProducerJobStatus::Failed as TeeVerifierInputProducerJobStatus,
+            &JOB_PROCESSING_TIMEOUT,
+            JOB_MAX_ATTEMPT,
+        )
+        .instrument("get_next_tee_verifier_input_producer_job")
+        .report_latency()
+        .fetch_optional(self.storage)
+        .await?
+        .map(|job| L1BatchNumber(job.l1_batch_number as u32));
+
+        Ok(l1_batch_number)
+    }
+
+    pub async fn get_tee_verifier_input_producer_job_attempts(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> DalResult<Option<u32>> {
+        let attempts = sqlx::query!(
+            r#"
+            SELECT
+                attempts
+            FROM
+                tee_verifier_input_producer_jobs
+            WHERE
+                l1_batch_number = $1
+            "#,
+            i64::from(l1_batch_number.0),
+        )
+        .instrument("get_tee_verifier_input_producer_job_attempts")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .fetch_optional(self.storage)
+        .await?
+        .map(|job| job.attempts as u32);
+
+        Ok(attempts)
+    }
+
+    pub async fn mark_job_as_successful(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+        started_at: Instant,
+        object_path: &str,
+    ) -> DalResult<()> {
+        sqlx::query!(
+            r#"
+            UPDATE tee_verifier_input_producer_jobs
+            SET
+                status = $1,
+                updated_at = NOW(),
+                time_taken = $3,
+                input_blob_url = $4
+            WHERE
+                l1_batch_number = $2
+            "#,
+            TeeVerifierInputProducerJobStatus::Successful as TeeVerifierInputProducerJobStatus,
+            i64::from(l1_batch_number.0),
+            duration_to_naive_time(started_at.elapsed()),
+            object_path,
+        )
+        .instrument("mark_job_as_successful")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .report_latency()
+        .execute(self.storage)
+        .await?;
+
+        Ok(())
+    }
+
+    pub async fn mark_job_as_failed(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+        started_at: Instant,
+        error: String,
+    ) -> DalResult<Option<u32>> {
+        let attempts = sqlx::query!(
+            r#"
+            UPDATE tee_verifier_input_producer_jobs
+            SET
+                status = $1,
+                updated_at = NOW(),
+                time_taken = $3,
+                error = $4
+            WHERE
+                l1_batch_number = $2
+                AND status != $5
+            RETURNING
+                tee_verifier_input_producer_jobs.attempts
+            "#,
+            TeeVerifierInputProducerJobStatus::Failed as TeeVerifierInputProducerJobStatus,
+            i64::from(l1_batch_number.0),
+            duration_to_naive_time(started_at.elapsed()),
+            error,
+            TeeVerifierInputProducerJobStatus::Successful as TeeVerifierInputProducerJobStatus,
+        )
+        .instrument("mark_job_as_failed")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .report_latency()
+        .fetch_optional(self.storage)
+        .await?
+        .map(|job| job.attempts as u32);
+
+        Ok(attempts)
+    }
+}
+
+/// These functions should only be used for tests.
+impl TeeVerifierInputProducerDal<'_, '_> {
+    pub async fn delete_all_jobs(&mut self) -> DalResult<()> {
+        sqlx::query!(
+            r#"
+            DELETE FROM tee_verifier_input_producer_jobs
+            "#
+        )
+        .instrument("delete_all_tee_verifier_jobs")
+        .execute(self.storage)
+        .await?;
+        Ok(())
+    }
+}
diff --git a/core/lib/dal/src/tests/mod.rs b/core/lib/dal/src/tests/mod.rs
index 6cc415f000f7..11f88ba8a70b 100644
--- a/core/lib/dal/src/tests/mod.rs
+++ b/core/lib/dal/src/tests/mod.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_db_connection::connection_pool::ConnectionPool;
 use zksync_types::{
-    block::{L2BlockHasher, L2BlockHeader},
+    block::{L1BatchHeader, L2BlockHasher, L2BlockHeader},
     fee::{Fee, TransactionExecutionMetrics},
     fee_model::BatchFeeInput,
     helpers::unix_timestamp_ms,
@@ -50,6 +50,17 @@ pub(crate) fn create_l2_block_header(number: u32) -> L2BlockHeader {
         gas_limit: 0,
     }
 }
+pub(crate) fn create_l1_batch_header(number: u32) -> L1BatchHeader {
+    L1BatchHeader::new(
+        L1BatchNumber(number),
+        100,
+        BaseSystemContractsHashes {
+            bootloader: H256::repeat_byte(1),
+            default_aa: H256::repeat_byte(42),
+        },
+        ProtocolVersionId::latest(),
+    )
+}
 
 pub(crate) fn mock_l2_transaction() -> L2Tx {
     let fee = Fee {
@@ -66,7 +77,7 @@ pub(crate) fn mock_l2_transaction() -> L2Tx {
         Default::default(),
         L2ChainId::from(270),
         &K256PrivateKey::random(),
-        None,
+        vec![],
         Default::default(),
     )
     .unwrap();
@@ -81,7 +92,6 @@ pub(crate) fn mock_l1_execute() -> L1Tx {
         sender: H160::random(),
         canonical_tx_hash: H256::from_low_u64_be(serial_id),
         serial_id: PriorityOpId(serial_id),
-        deadline_block: 100000,
         layer_2_tip_fee: U256::zero(),
         full_fee: U256::zero(),
         gas_limit: U256::from(100_100),
@@ -89,17 +99,17 @@ pub(crate) fn mock_l1_execute() -> L1Tx {
         gas_per_pubdata_limit: 100.into(),
         op_processing_type: OpProcessingType::Common,
         priority_queue_type: PriorityQueueType::Deque,
-        eth_hash: H256::random(),
         to_mint: U256::zero(),
         refund_recipient: Address::random(),
-        eth_block: 1,
+        // DEPRECATED.
+        eth_block: 0,
     };
 
     let execute = Execute {
         contract_address: H160::random(),
         value: Default::default(),
         calldata: vec![],
-        factory_deps: None,
+        factory_deps: vec![],
     };
 
     L1Tx {
@@ -118,7 +128,6 @@ pub(crate) fn mock_protocol_upgrade_transaction() -> ProtocolUpgradeTx {
         gas_limit: U256::from(100_100),
         max_fee_per_gas: U256::from(1u32),
         gas_per_pubdata_limit: 100.into(),
-        eth_hash: H256::random(),
         to_mint: U256::zero(),
         refund_recipient: Address::random(),
         eth_block: 1,
@@ -128,7 +137,7 @@ pub(crate) fn mock_protocol_upgrade_transaction() -> ProtocolUpgradeTx {
         contract_address: H160::random(),
         value: Default::default(),
         calldata: vec![],
-        factory_deps: None,
+        factory_deps: vec![],
     };
 
     ProtocolUpgradeTx {
@@ -174,14 +183,14 @@ pub(crate) fn mock_vm_event(index: u8) -> VmEvent {
     }
 }
 
-pub(crate) fn mock_l2_to_l1_log() -> UserL2ToL1Log {
+pub(crate) fn create_l2_to_l1_log(tx_number_in_block: u16, index: u8) -> UserL2ToL1Log {
     UserL2ToL1Log(L2ToL1Log {
         shard_id: 0,
         is_service: false,
-        tx_number_in_block: 0,
-        sender: Address::repeat_byte(0),
-        key: H256::from_low_u64_be(0),
-        value: H256::repeat_byte(0),
+        tx_number_in_block,
+        sender: Address::repeat_byte(index),
+        key: H256::from_low_u64_be(u64::from(index)),
+        value: H256::repeat_byte(index),
     })
 }
 
@@ -300,6 +309,8 @@ async fn remove_stuck_txs() {
             L2BlockNumber(1),
             &[mock_execution_result(executed_tx.clone())],
             U256::from(1),
+            ProtocolVersionId::latest(),
+            false,
         )
         .await
         .unwrap();
diff --git a/core/lib/dal/src/tokens_dal.rs b/core/lib/dal/src/tokens_dal.rs
index 9a892c20bb58..b34b913c45c3 100644
--- a/core/lib/dal/src/tokens_dal.rs
+++ b/core/lib/dal/src/tokens_dal.rs
@@ -91,11 +91,20 @@ impl TokensDal<'_, '_> {
         let token_deployment_data = self
             .storage
             .storage_logs_dal()
-            .filter_deployed_contracts(all_token_addresses.into_iter(), None)
+            .filter_deployed_contracts(all_token_addresses.iter().copied(), None)
             .await?;
-        let token_addresses_to_be_removed: Vec<_> = token_deployment_data
+        let token_addresses_to_be_removed: Vec<_> = all_token_addresses
             .into_iter()
-            .filter_map(|(address, deployed_at)| (deployed_at > block_number).then_some(address.0))
+            .filter_map(|address| {
+                if address.is_zero() {
+                    None
+                } else if let Some(deployed_at) = token_deployment_data.get(&address) {
+                    (deployed_at > &block_number).then_some(address.0)
+                } else {
+                    // Token belongs to a "pending" L2 block that's not yet fully inserted to the database.
+                    Some(address.0)
+                }
+            })
             .collect();
         sqlx::query!(
             r#"
@@ -123,10 +132,10 @@ mod tests {
     use std::{collections::HashSet, slice};
 
     use zksync_system_constants::FAILED_CONTRACT_DEPLOYMENT_BYTECODE_HASH;
-    use zksync_types::{get_code_key, tokens::TokenMetadata, StorageLog, H256};
+    use zksync_types::{get_code_key, tokens::TokenMetadata, ProtocolVersion, StorageLog, H256};
 
     use super::*;
-    use crate::{ConnectionPool, Core, CoreDal};
+    use crate::{tests::create_l2_block_header, ConnectionPool, Core, CoreDal};
 
     fn test_token_info() -> TokenInfo {
         TokenInfo {
@@ -152,13 +161,42 @@ mod tests {
         }
     }
 
+    async fn insert_l2_block(conn: &mut Connection<'_, Core>, number: u32, logs: Vec<StorageLog>) {
+        conn.blocks_dal()
+            .insert_l2_block(&create_l2_block_header(number))
+            .await
+            .unwrap();
+
+        conn.storage_logs_dal()
+            .insert_storage_logs(L2BlockNumber(number), &logs)
+            .await
+            .unwrap();
+    }
+
     #[tokio::test]
     async fn adding_and_getting_tokens() {
         let pool = ConnectionPool::<Core>::test_pool().await;
         let mut storage = pool.connection().await.unwrap();
+        storage
+            .protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
+            .await
+            .unwrap();
+
         let tokens = [test_token_info(), eth_token_info()];
         storage.tokens_dal().add_tokens(&tokens).await.unwrap();
 
+        let storage_logs: Vec<_> = tokens
+            .iter()
+            .map(|token_info| {
+                StorageLog::new_write_log(
+                    get_code_key(&token_info.l2_address),
+                    H256::repeat_byte(0xff),
+                )
+            })
+            .collect();
+        insert_l2_block(&mut storage, 1, storage_logs).await;
+
         let token_addresses = storage
             .tokens_dal()
             .get_all_l2_token_addresses()
@@ -203,40 +241,31 @@ mod tests {
     async fn rolling_back_tokens() {
         let pool = ConnectionPool::<Core>::test_pool().await;
         let mut storage = pool.connection().await.unwrap();
+        storage
+            .protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
+            .await
+            .unwrap();
 
         let eth_info = eth_token_info();
         let eth_deployment_log =
             StorageLog::new_write_log(get_code_key(&eth_info.l2_address), H256::repeat_byte(1));
-        storage
-            .storage_logs_dal()
-            .insert_storage_logs(
-                L2BlockNumber(0),
-                &[(H256::zero(), vec![eth_deployment_log])],
-            )
-            .await
-            .unwrap();
         storage
             .tokens_dal()
             .add_tokens(slice::from_ref(&eth_info))
             .await
             .unwrap();
+        insert_l2_block(&mut storage, 0, vec![eth_deployment_log]).await;
 
         let test_info = test_token_info();
         let test_deployment_log =
             StorageLog::new_write_log(get_code_key(&test_info.l2_address), H256::repeat_byte(2));
-        storage
-            .storage_logs_dal()
-            .insert_storage_logs(
-                L2BlockNumber(2),
-                &[(H256::zero(), vec![test_deployment_log])],
-            )
-            .await
-            .unwrap();
         storage
             .tokens_dal()
             .add_tokens(slice::from_ref(&test_info))
             .await
             .unwrap();
+        insert_l2_block(&mut storage, 2, vec![test_deployment_log]).await;
 
         test_getting_all_tokens(&mut storage).await;
 
@@ -283,10 +312,10 @@ mod tests {
             assert!(all_tokens.contains(&test_token_info()));
         }
 
-        for at_miniblock in [L2BlockNumber(0), L2BlockNumber(1)] {
+        for at_l2_block in [L2BlockNumber(0), L2BlockNumber(1)] {
             let all_tokens = storage
                 .tokens_web3_dal()
-                .get_all_tokens(Some(at_miniblock))
+                .get_all_tokens(Some(at_l2_block))
                 .await
                 .unwrap();
             assert_eq!(all_tokens, [eth_token_info()]);
@@ -307,10 +336,7 @@ mod tests {
         );
         storage
             .storage_logs_dal()
-            .insert_storage_logs(
-                L2BlockNumber(1),
-                &[(H256::zero(), vec![failed_deployment_log])],
-            )
+            .insert_storage_logs(L2BlockNumber(1), &[failed_deployment_log])
             .await
             .unwrap();
 
@@ -318,10 +344,7 @@ mod tests {
             StorageLog::new_write_log(get_code_key(&test_info.l2_address), H256::repeat_byte(2));
         storage
             .storage_logs_dal()
-            .insert_storage_logs(
-                L2BlockNumber(100),
-                &[(H256::zero(), vec![test_deployment_log])],
-            )
+            .insert_storage_logs(L2BlockNumber(100), &[test_deployment_log])
             .await
             .unwrap();
         storage
diff --git a/core/lib/dal/src/tokens_web3_dal.rs b/core/lib/dal/src/tokens_web3_dal.rs
index 092847cc4f2d..00c7a69385db 100644
--- a/core/lib/dal/src/tokens_web3_dal.rs
+++ b/core/lib/dal/src/tokens_web3_dal.rs
@@ -58,7 +58,30 @@ impl TokensWeb3Dal<'_, '_> {
         .fetch_all(self.storage)
         .await?;
 
-        Ok(records.into_iter().map(Into::into).collect())
+        let l2_token_addresses = records
+            .iter()
+            .map(|storage_token_info| Address::from_slice(&storage_token_info.l2_address));
+        let token_deployment_data = self
+            .storage
+            .storage_logs_dal()
+            .filter_deployed_contracts(l2_token_addresses, None)
+            .await?;
+
+        let tokens = records
+            .into_iter()
+            .filter_map(|storage_token_info| {
+                let l2_token_address = Address::from_slice(&storage_token_info.l2_address);
+                if !l2_token_address.is_zero()
+                    && !token_deployment_data.contains_key(&l2_token_address)
+                {
+                    return None;
+                }
+
+                Some(TokenInfo::from(storage_token_info))
+            })
+            .collect();
+
+        Ok(tokens)
     }
 
     /// Returns information about all tokens.
@@ -88,18 +111,17 @@ impl TokensWeb3Dal<'_, '_> {
         .await?;
 
         let mut all_tokens: Vec<_> = records.into_iter().map(TokenInfo::from).collect();
-        let Some(at_l2_block) = at_l2_block else {
-            return Ok(all_tokens); // No additional filtering is required
-        };
 
         let token_addresses = all_tokens.iter().map(|token| token.l2_address);
         let filtered_addresses = self
             .storage
             .storage_logs_dal()
-            .filter_deployed_contracts(token_addresses, Some(at_l2_block))
+            .filter_deployed_contracts(token_addresses, at_l2_block)
             .await?;
 
-        all_tokens.retain(|token| filtered_addresses.contains_key(&token.l2_address));
+        all_tokens.retain(|token| {
+            token.l2_address.is_zero() || filtered_addresses.contains_key(&token.l2_address)
+        });
         Ok(all_tokens)
     }
 }
diff --git a/core/lib/dal/src/transactions_dal.rs b/core/lib/dal/src/transactions_dal.rs
index 23c162d24c51..f76b61ec1646 100644
--- a/core/lib/dal/src/transactions_dal.rs
+++ b/core/lib/dal/src/transactions_dal.rs
@@ -510,13 +510,12 @@ impl TransactionsDal<'_, '_> {
         l2_block_number: L2BlockNumber,
         transactions: &[TransactionExecutionResult],
         block_base_fee_per_gas: U256,
+        protocol_version: ProtocolVersionId,
+        // On the main node, transactions are inserted into the DB by API servers.
+        // However on the EN, they need to be inserted after they are executed by the state keeper.
+        insert_txs: bool,
     ) -> DalResult<()> {
         let mut transaction = self.storage.start_transaction().await?;
-        let protocol_version = transaction
-            .blocks_dal()
-            .get_l2_block_protocol_version_id(l2_block_number)
-            .await?
-            .unwrap_or_else(ProtocolVersionId::last_potentially_undefined);
 
         let mut call_traces_tx_hashes = Vec::with_capacity(transactions.len());
         let mut bytea_call_traces = Vec::with_capacity(transactions.len());
@@ -528,18 +527,77 @@ impl TransactionsDal<'_, '_> {
             }
         }
 
-        transaction
-            .transactions_dal()
-            .handle_executed_l2_transactions(l2_block_number, block_base_fee_per_gas, transactions)
-            .await?;
-        transaction
-            .transactions_dal()
-            .handle_executed_l1_transactions(l2_block_number, transactions)
-            .await?;
-        transaction
-            .transactions_dal()
-            .handle_executed_upgrade_transactions(l2_block_number, transactions)
+        if insert_txs {
+            // There can be transactions in the DB in case of block rollback or if the DB was restored from a dump.
+            let tx_hashes: Vec<_> = transactions.iter().map(|tx| tx.hash.as_bytes()).collect();
+            sqlx::query!(
+                r#"
+                DELETE FROM transactions
+                WHERE
+                    hash = ANY ($1)
+                "#,
+                &tx_hashes as &[&[u8]],
+            )
+            .instrument("mark_txs_as_executed_in_l2_block#remove_old_txs_with_hashes")
+            .execute(&mut transaction)
             .await?;
+            for tx in transactions {
+                let Some(nonce) = tx.transaction.nonce() else {
+                    // Nonce is missing for L1 and upgrade txs, they can be skipped in this loop.
+                    continue;
+                };
+                let initiator = tx.transaction.initiator_account();
+                sqlx::query!(
+                    r#"
+                    DELETE FROM transactions
+                    WHERE
+                        initiator_address = $1
+                        AND nonce = $2
+                    "#,
+                    initiator.as_bytes(),
+                    nonce.0 as i32,
+                )
+                .instrument("mark_txs_as_executed_in_l2_block#remove_old_txs_with_addr_and_nonce")
+                .execute(&mut transaction)
+                .await?;
+            }
+
+            // Different transaction types have different sets of fields to insert so we handle them separately.
+            transaction
+                .transactions_dal()
+                .insert_executed_l2_transactions(
+                    l2_block_number,
+                    block_base_fee_per_gas,
+                    transactions,
+                )
+                .await?;
+            transaction
+                .transactions_dal()
+                .insert_executed_l1_transactions(l2_block_number, transactions)
+                .await?;
+            transaction
+                .transactions_dal()
+                .insert_executed_upgrade_transactions(l2_block_number, transactions)
+                .await?;
+        } else {
+            // Different transaction types have different sets of fields to update so we handle them separately.
+            transaction
+                .transactions_dal()
+                .update_executed_l2_transactions(
+                    l2_block_number,
+                    block_base_fee_per_gas,
+                    transactions,
+                )
+                .await?;
+            transaction
+                .transactions_dal()
+                .update_executed_l1_transactions(l2_block_number, transactions)
+                .await?;
+            transaction
+                .transactions_dal()
+                .update_executed_upgrade_transactions(l2_block_number, transactions)
+                .await?;
+        }
 
         if !bytea_call_traces.is_empty() {
             sqlx::query!(
@@ -575,7 +633,211 @@ impl TransactionsDal<'_, '_> {
         }
     }
 
-    async fn handle_executed_l2_transactions(
+    async fn insert_executed_l2_transactions(
+        &mut self,
+        l2_block_number: L2BlockNumber,
+        block_base_fee_per_gas: U256,
+        transactions: &[TransactionExecutionResult],
+    ) -> DalResult<()> {
+        let l2_txs_len = transactions
+            .iter()
+            .filter(|tx_res| {
+                matches!(
+                    tx_res.transaction.common_data,
+                    ExecuteTransactionCommon::L2(_)
+                )
+            })
+            .count();
+        if l2_txs_len == 0 {
+            return Ok(());
+        }
+
+        let instrumentation = Instrumented::new("mark_txs_as_executed_in_l2_block#insert_l2_txs")
+            .with_arg("l2_block_number", &l2_block_number)
+            .with_arg("l2_txs.len", &l2_txs_len);
+
+        let mut l2_hashes = Vec::with_capacity(l2_txs_len);
+        let mut l2_initiators = Vec::with_capacity(l2_txs_len);
+        let mut l2_nonces = Vec::with_capacity(l2_txs_len);
+        let mut l2_signatures = Vec::with_capacity(l2_txs_len);
+        let mut l2_gas_limits = Vec::with_capacity(l2_txs_len);
+        let mut l2_max_fees_per_gas = Vec::with_capacity(l2_txs_len);
+        let mut l2_max_priority_fees_per_gas = Vec::with_capacity(l2_txs_len);
+        let mut l2_gas_per_pubdata_limit = Vec::with_capacity(l2_txs_len);
+        let mut l2_inputs = Vec::with_capacity(l2_txs_len);
+        let mut l2_datas = Vec::with_capacity(l2_txs_len);
+        let mut l2_tx_formats = Vec::with_capacity(l2_txs_len);
+        let mut l2_contract_addresses = Vec::with_capacity(l2_txs_len);
+        let mut l2_values = Vec::with_capacity(l2_txs_len);
+        let mut l2_paymaster = Vec::with_capacity(l2_txs_len);
+        let mut l2_paymaster_input = Vec::with_capacity(l2_txs_len);
+        let mut l2_execution_infos = Vec::with_capacity(l2_txs_len);
+        let mut l2_indices_in_block = Vec::with_capacity(l2_txs_len);
+        let mut l2_errors = Vec::with_capacity(l2_txs_len);
+        let mut l2_effective_gas_prices = Vec::with_capacity(l2_txs_len);
+        let mut l2_refunded_gas = Vec::with_capacity(l2_txs_len);
+
+        for (index_in_block, tx_res) in transactions.iter().enumerate() {
+            let transaction = &tx_res.transaction;
+            let ExecuteTransactionCommon::L2(common_data) = &transaction.common_data else {
+                continue;
+            };
+
+            let data = serde_json::to_value(&transaction.execute).map_err(|err| {
+                instrumentation.arg_error(
+                    &format!("transactions[{index_in_block}].transaction.execute"),
+                    err,
+                )
+            })?;
+            let l2_execution_info = serde_json::to_value(tx_res.execution_info).map_err(|err| {
+                instrumentation.arg_error(
+                    &format!("transactions[{index_in_block}].execution_info"),
+                    err,
+                )
+            })?;
+            let refunded_gas = i64::try_from(tx_res.refunded_gas).map_err(|err| {
+                instrumentation
+                    .arg_error(&format!("transactions[{index_in_block}].refunded_gas"), err)
+            })?;
+
+            l2_values.push(u256_to_big_decimal(transaction.execute.value));
+            l2_contract_addresses.push(transaction.execute.contract_address.as_bytes());
+            l2_paymaster_input.push(&common_data.paymaster_params.paymaster_input[..]);
+            l2_paymaster.push(common_data.paymaster_params.paymaster.as_bytes());
+            l2_hashes.push(tx_res.hash.as_bytes());
+            l2_indices_in_block.push(index_in_block as i32);
+            l2_initiators.push(transaction.initiator_account().0);
+            l2_nonces.push(common_data.nonce.0 as i32);
+            l2_signatures.push(&common_data.signature[..]);
+            l2_tx_formats.push(common_data.transaction_type as i32);
+            l2_errors.push(Self::map_transaction_error(tx_res));
+            let l2_effective_gas_price = common_data
+                .fee
+                .get_effective_gas_price(block_base_fee_per_gas);
+            l2_effective_gas_prices.push(u256_to_big_decimal(l2_effective_gas_price));
+            l2_execution_infos.push(l2_execution_info);
+            // Normally input data is mandatory
+            l2_inputs.push(common_data.input_data().unwrap_or_default());
+            l2_datas.push(data);
+            l2_gas_limits.push(u256_to_big_decimal(common_data.fee.gas_limit));
+            l2_max_fees_per_gas.push(u256_to_big_decimal(common_data.fee.max_fee_per_gas));
+            l2_max_priority_fees_per_gas.push(u256_to_big_decimal(
+                common_data.fee.max_priority_fee_per_gas,
+            ));
+            l2_gas_per_pubdata_limit
+                .push(u256_to_big_decimal(common_data.fee.gas_per_pubdata_limit));
+            l2_refunded_gas.push(refunded_gas);
+        }
+
+        let query = sqlx::query!(
+            r#"
+            INSERT INTO
+                transactions (
+                    hash,
+                    is_priority,
+                    initiator_address,
+                    nonce,
+                    signature,
+                    gas_limit,
+                    max_fee_per_gas,
+                    max_priority_fee_per_gas,
+                    gas_per_pubdata_limit,
+                    input,
+                    data,
+                    tx_format,
+                    contract_address,
+                    value,
+                    paymaster,
+                    paymaster_input,
+                    execution_info,
+                    miniblock_number,
+                    index_in_block,
+                    error,
+                    effective_gas_price,
+                    refunded_gas,
+                    received_at,
+                    created_at,
+                    updated_at
+                )
+            SELECT
+                data_table.hash,
+                FALSE,
+                data_table.initiator_address,
+                data_table.nonce,
+                data_table.signature,
+                data_table.gas_limit,
+                data_table.max_fee_per_gas,
+                data_table.max_priority_fee_per_gas,
+                data_table.gas_per_pubdata_limit,
+                data_table.input,
+                data_table.data,
+                data_table.tx_format,
+                data_table.contract_address,
+                data_table.value,
+                data_table.paymaster,
+                data_table.paymaster_input,
+                data_table.new_execution_info,
+                $21,
+                data_table.index_in_block,
+                NULLIF(data_table.error, ''),
+                data_table.effective_gas_price,
+                data_table.refunded_gas,
+                NOW(),
+                NOW(),
+                NOW()
+            FROM
+                (
+                    SELECT
+                        UNNEST($1::bytea[]) AS hash,
+                        UNNEST($2::bytea[]) AS initiator_address,
+                        UNNEST($3::INT[]) AS nonce,
+                        UNNEST($4::bytea[]) AS signature,
+                        UNNEST($5::NUMERIC[]) AS gas_limit,
+                        UNNEST($6::NUMERIC[]) AS max_fee_per_gas,
+                        UNNEST($7::NUMERIC[]) AS max_priority_fee_per_gas,
+                        UNNEST($8::NUMERIC[]) AS gas_per_pubdata_limit,
+                        UNNEST($9::bytea[]) AS input,
+                        UNNEST($10::jsonb[]) AS data,
+                        UNNEST($11::INT[]) AS tx_format,
+                        UNNEST($12::bytea[]) AS contract_address,
+                        UNNEST($13::NUMERIC[]) AS value,
+                        UNNEST($14::bytea[]) AS paymaster,
+                        UNNEST($15::bytea[]) AS paymaster_input,
+                        UNNEST($16::jsonb[]) AS new_execution_info,
+                        UNNEST($17::INTEGER[]) AS index_in_block,
+                        UNNEST($18::VARCHAR[]) AS error,
+                        UNNEST($19::NUMERIC[]) AS effective_gas_price,
+                        UNNEST($20::BIGINT[]) AS refunded_gas
+                ) AS data_table
+            "#,
+            &l2_hashes as &[&[u8]],
+            &l2_initiators as &[[u8; 20]],
+            &l2_nonces,
+            &l2_signatures as &[&[u8]],
+            &l2_gas_limits,
+            &l2_max_fees_per_gas,
+            &l2_max_priority_fees_per_gas,
+            &l2_gas_per_pubdata_limit,
+            &l2_inputs as &[&[u8]],
+            &l2_datas,
+            &l2_tx_formats,
+            &l2_contract_addresses as &[&[u8]],
+            &l2_values,
+            &l2_paymaster as &[&[u8]],
+            &l2_paymaster_input as &[&[u8]],
+            &l2_execution_infos,
+            &l2_indices_in_block,
+            &l2_errors as &[&str],
+            &l2_effective_gas_prices,
+            &l2_refunded_gas,
+            l2_block_number.0 as i32,
+        );
+
+        instrumentation.with(query).execute(self.storage).await?;
+        Ok(())
+    }
+
+    async fn update_executed_l2_transactions(
         &mut self,
         l2_block_number: L2BlockNumber,
         block_base_fee_per_gas: U256,
@@ -764,7 +1026,205 @@ impl TransactionsDal<'_, '_> {
         Ok(())
     }
 
-    async fn handle_executed_l1_transactions(
+    async fn insert_executed_l1_transactions(
+        &mut self,
+        l2_block_number: L2BlockNumber,
+        transactions: &[TransactionExecutionResult],
+    ) -> DalResult<()> {
+        let l1_txs_len = transactions
+            .iter()
+            .filter(|tx_res| {
+                matches!(
+                    tx_res.transaction.common_data,
+                    ExecuteTransactionCommon::L1(_)
+                )
+            })
+            .count();
+        if l1_txs_len == 0 {
+            return Ok(());
+        }
+
+        let instrumentation = Instrumented::new("mark_txs_as_executed_in_l2_block#insert_l1_txs")
+            .with_arg("l2_block_number", &l2_block_number)
+            .with_arg("l1_txs.len", &l1_txs_len);
+
+        let mut l1_hashes = Vec::with_capacity(l1_txs_len);
+        let mut l1_initiator_address = Vec::with_capacity(l1_txs_len);
+        let mut l1_gas_limit = Vec::with_capacity(l1_txs_len);
+        let mut l1_max_fee_per_gas = Vec::with_capacity(l1_txs_len);
+        let mut l1_gas_per_pubdata_limit = Vec::with_capacity(l1_txs_len);
+        let mut l1_data = Vec::with_capacity(l1_txs_len);
+        let mut l1_priority_op_id = Vec::with_capacity(l1_txs_len);
+        let mut l1_full_fee = Vec::with_capacity(l1_txs_len);
+        let mut l1_layer_2_tip_fee = Vec::with_capacity(l1_txs_len);
+        let mut l1_contract_address = Vec::with_capacity(l1_txs_len);
+        let mut l1_l1_block_number = Vec::with_capacity(l1_txs_len);
+        let mut l1_value = Vec::with_capacity(l1_txs_len);
+        let mut l1_tx_format = Vec::with_capacity(l1_txs_len);
+        let mut l1_tx_mint = Vec::with_capacity(l1_txs_len);
+        let mut l1_tx_refund_recipient = Vec::with_capacity(l1_txs_len);
+        let mut l1_indices_in_block = Vec::with_capacity(l1_txs_len);
+        let mut l1_errors = Vec::with_capacity(l1_txs_len);
+        let mut l1_execution_infos = Vec::with_capacity(l1_txs_len);
+        let mut l1_refunded_gas = Vec::with_capacity(l1_txs_len);
+        let mut l1_effective_gas_prices = Vec::with_capacity(l1_txs_len);
+
+        for (index_in_block, tx_res) in transactions.iter().enumerate() {
+            let transaction = &tx_res.transaction;
+            let ExecuteTransactionCommon::L1(common_data) = &transaction.common_data else {
+                continue;
+            };
+
+            let l1_execution_info = serde_json::to_value(tx_res.execution_info).map_err(|err| {
+                instrumentation.arg_error(
+                    &format!("transactions[{index_in_block}].execution_info"),
+                    err,
+                )
+            })?;
+            let refunded_gas = i64::try_from(tx_res.refunded_gas).map_err(|err| {
+                instrumentation
+                    .arg_error(&format!("transactions[{index_in_block}].refunded_gas"), err)
+            })?;
+
+            let tx = &tx_res.transaction;
+            l1_hashes.push(tx_res.hash.as_bytes());
+            l1_initiator_address.push(common_data.sender.as_bytes());
+            l1_gas_limit.push(u256_to_big_decimal(common_data.gas_limit));
+            l1_max_fee_per_gas.push(u256_to_big_decimal(common_data.max_fee_per_gas));
+            l1_gas_per_pubdata_limit.push(u256_to_big_decimal(common_data.gas_per_pubdata_limit));
+            l1_data.push(
+                serde_json::to_value(&tx.execute)
+                    .unwrap_or_else(|_| panic!("cannot serialize tx {:?} to json", tx.hash())),
+            );
+            l1_priority_op_id.push(common_data.serial_id.0 as i64);
+            l1_full_fee.push(u256_to_big_decimal(common_data.full_fee));
+            l1_layer_2_tip_fee.push(u256_to_big_decimal(common_data.layer_2_tip_fee));
+            l1_contract_address.push(tx.execute.contract_address.as_bytes());
+            l1_l1_block_number.push(common_data.eth_block as i32);
+            l1_value.push(u256_to_big_decimal(tx.execute.value));
+            l1_tx_format.push(common_data.tx_format() as i32);
+            l1_tx_mint.push(u256_to_big_decimal(common_data.to_mint));
+            l1_tx_refund_recipient.push(common_data.refund_recipient.as_bytes());
+            l1_indices_in_block.push(index_in_block as i32);
+            l1_errors.push(Self::map_transaction_error(tx_res));
+            l1_execution_infos.push(l1_execution_info);
+            l1_refunded_gas.push(refunded_gas);
+            l1_effective_gas_prices.push(u256_to_big_decimal(common_data.max_fee_per_gas));
+        }
+
+        let query = sqlx::query!(
+            r#"
+            INSERT INTO
+                transactions (
+                    hash,
+                    is_priority,
+                    initiator_address,
+                    gas_limit,
+                    max_fee_per_gas,
+                    gas_per_pubdata_limit,
+                    data,
+                    priority_op_id,
+                    full_fee,
+                    layer_2_tip_fee,
+                    contract_address,
+                    l1_block_number,
+                    value,
+                    paymaster,
+                    paymaster_input,
+                    tx_format,
+                    l1_tx_mint,
+                    l1_tx_refund_recipient,
+                    miniblock_number,
+                    index_in_block,
+                    error,
+                    execution_info,
+                    refunded_gas,
+                    effective_gas_price,
+                    received_at,
+                    created_at,
+                    updated_at
+                )
+            SELECT
+                data_table.hash,
+                TRUE,
+                data_table.initiator_address,
+                data_table.gas_limit,
+                data_table.max_fee_per_gas,
+                data_table.gas_per_pubdata_limit,
+                data_table.data,
+                data_table.priority_op_id,
+                data_table.full_fee,
+                data_table.layer_2_tip_fee,
+                data_table.contract_address,
+                data_table.l1_block_number,
+                data_table.value,
+                '\x0000000000000000000000000000000000000000'::bytea,
+                '\x'::bytea,
+                data_table.tx_format,
+                data_table.l1_tx_mint,
+                data_table.l1_tx_refund_recipient,
+                $21,
+                data_table.index_in_block,
+                NULLIF(data_table.error, ''),
+                data_table.execution_info,
+                data_table.refunded_gas,
+                data_table.effective_gas_price,
+                NOW(),
+                NOW(),
+                NOW()
+            FROM
+                (
+                    SELECT
+                        UNNEST($1::BYTEA[]) AS hash,
+                        UNNEST($2::BYTEA[]) AS initiator_address,
+                        UNNEST($3::NUMERIC[]) AS gas_limit,
+                        UNNEST($4::NUMERIC[]) AS max_fee_per_gas,
+                        UNNEST($5::NUMERIC[]) AS gas_per_pubdata_limit,
+                        UNNEST($6::JSONB[]) AS data,
+                        UNNEST($7::BIGINT[]) AS priority_op_id,
+                        UNNEST($8::NUMERIC[]) AS full_fee,
+                        UNNEST($9::NUMERIC[]) AS layer_2_tip_fee,
+                        UNNEST($10::BYTEA[]) AS contract_address,
+                        UNNEST($11::INT[]) AS l1_block_number,
+                        UNNEST($12::NUMERIC[]) AS value,
+                        UNNEST($13::INTEGER[]) AS tx_format,
+                        UNNEST($14::NUMERIC[]) AS l1_tx_mint,
+                        UNNEST($15::BYTEA[]) AS l1_tx_refund_recipient,
+                        UNNEST($16::INT[]) AS index_in_block,
+                        UNNEST($17::VARCHAR[]) AS error,
+                        UNNEST($18::JSONB[]) AS execution_info,
+                        UNNEST($19::BIGINT[]) AS refunded_gas,
+                        UNNEST($20::NUMERIC[]) AS effective_gas_price
+                ) AS data_table
+            "#,
+            &l1_hashes as &[&[u8]],
+            &l1_initiator_address as &[&[u8]],
+            &l1_gas_limit,
+            &l1_max_fee_per_gas,
+            &l1_gas_per_pubdata_limit,
+            &l1_data,
+            &l1_priority_op_id,
+            &l1_full_fee,
+            &l1_layer_2_tip_fee,
+            &l1_contract_address as &[&[u8]],
+            &l1_l1_block_number,
+            &l1_value,
+            &l1_tx_format,
+            &l1_tx_mint,
+            &l1_tx_refund_recipient as &[&[u8]],
+            &l1_indices_in_block,
+            &l1_errors as &[&str],
+            &l1_execution_infos,
+            &l1_refunded_gas,
+            &l1_effective_gas_prices,
+            l2_block_number.0 as i32,
+        );
+
+        instrumentation.with(query).execute(self.storage).await?;
+        Ok(())
+    }
+
+    async fn update_executed_l1_transactions(
         &mut self,
         l2_block_number: L2BlockNumber,
         transactions: &[TransactionExecutionResult],
@@ -856,7 +1316,196 @@ impl TransactionsDal<'_, '_> {
         Ok(())
     }
 
-    async fn handle_executed_upgrade_transactions(
+    async fn insert_executed_upgrade_transactions(
+        &mut self,
+        l2_block_number: L2BlockNumber,
+        transactions: &[TransactionExecutionResult],
+    ) -> DalResult<()> {
+        let upgrade_txs_len = transactions
+            .iter()
+            .filter(|tx_res| {
+                matches!(
+                    tx_res.transaction.common_data,
+                    ExecuteTransactionCommon::ProtocolUpgrade(_)
+                )
+            })
+            .count();
+        if upgrade_txs_len == 0 {
+            return Ok(());
+        }
+
+        let instrumentation =
+            Instrumented::new("mark_txs_as_executed_in_l2_block#insert_upgrade_txs")
+                .with_arg("l2_block_number", &l2_block_number)
+                .with_arg("upgrade_txs.len", &upgrade_txs_len);
+
+        let mut upgrade_hashes = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_initiator_address = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_gas_limit = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_max_fee_per_gas = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_gas_per_pubdata_limit = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_data = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_upgrade_id = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_contract_address = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_l1_block_number = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_value = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_tx_format = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_tx_mint = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_tx_refund_recipient = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_indices_in_block = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_errors = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_execution_infos = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_refunded_gas = Vec::with_capacity(upgrade_txs_len);
+        let mut upgrade_effective_gas_prices = Vec::with_capacity(upgrade_txs_len);
+
+        for (index_in_block, tx_res) in transactions.iter().enumerate() {
+            let transaction = &tx_res.transaction;
+            let ExecuteTransactionCommon::ProtocolUpgrade(common_data) = &transaction.common_data
+            else {
+                continue;
+            };
+
+            let execution_info = serde_json::to_value(tx_res.execution_info).map_err(|err| {
+                instrumentation.arg_error(
+                    &format!("transactions[{index_in_block}].execution_info"),
+                    err,
+                )
+            })?;
+            let refunded_gas = i64::try_from(tx_res.refunded_gas).map_err(|err| {
+                instrumentation
+                    .arg_error(&format!("transactions[{index_in_block}].refunded_gas"), err)
+            })?;
+
+            let tx = &tx_res.transaction;
+            upgrade_hashes.push(tx_res.hash.as_bytes());
+            upgrade_initiator_address.push(common_data.sender.as_bytes());
+            upgrade_gas_limit.push(u256_to_big_decimal(common_data.gas_limit));
+            upgrade_max_fee_per_gas.push(u256_to_big_decimal(common_data.max_fee_per_gas));
+            upgrade_gas_per_pubdata_limit
+                .push(u256_to_big_decimal(common_data.gas_per_pubdata_limit));
+            upgrade_data.push(
+                serde_json::to_value(&tx.execute)
+                    .unwrap_or_else(|_| panic!("cannot serialize tx {:?} to json", tx.hash())),
+            );
+            upgrade_upgrade_id.push(common_data.upgrade_id as i32);
+            upgrade_contract_address.push(tx.execute.contract_address.as_bytes());
+            upgrade_l1_block_number.push(common_data.eth_block as i32);
+            upgrade_value.push(u256_to_big_decimal(tx.execute.value));
+            upgrade_tx_format.push(common_data.tx_format() as i32);
+            upgrade_tx_mint.push(u256_to_big_decimal(common_data.to_mint));
+            upgrade_tx_refund_recipient.push(common_data.refund_recipient.as_bytes());
+            upgrade_indices_in_block.push(index_in_block as i32);
+            upgrade_errors.push(Self::map_transaction_error(tx_res));
+            upgrade_execution_infos.push(execution_info);
+            upgrade_refunded_gas.push(refunded_gas);
+            upgrade_effective_gas_prices.push(u256_to_big_decimal(common_data.max_fee_per_gas));
+        }
+
+        let query = sqlx::query!(
+            r#"
+            INSERT INTO
+                transactions (
+                    hash,
+                    is_priority,
+                    initiator_address,
+                    gas_limit,
+                    max_fee_per_gas,
+                    gas_per_pubdata_limit,
+                    data,
+                    upgrade_id,
+                    contract_address,
+                    l1_block_number,
+                    value,
+                    paymaster,
+                    paymaster_input,
+                    tx_format,
+                    l1_tx_mint,
+                    l1_tx_refund_recipient,
+                    miniblock_number,
+                    index_in_block,
+                    error,
+                    execution_info,
+                    refunded_gas,
+                    effective_gas_price,
+                    received_at,
+                    created_at,
+                    updated_at
+                )
+            SELECT
+                data_table.hash,
+                TRUE,
+                data_table.initiator_address,
+                data_table.gas_limit,
+                data_table.max_fee_per_gas,
+                data_table.gas_per_pubdata_limit,
+                data_table.data,
+                data_table.upgrade_id,
+                data_table.contract_address,
+                data_table.l1_block_number,
+                data_table.value,
+                '\x0000000000000000000000000000000000000000'::bytea,
+                '\x'::bytea,
+                data_table.tx_format,
+                data_table.l1_tx_mint,
+                data_table.l1_tx_refund_recipient,
+                $19,
+                data_table.index_in_block,
+                NULLIF(data_table.error, ''),
+                data_table.execution_info,
+                data_table.refunded_gas,
+                data_table.effective_gas_price,
+                NOW(),
+                NOW(),
+                NOW()
+            FROM
+                (
+                    SELECT
+                        UNNEST($1::BYTEA[]) AS hash,
+                        UNNEST($2::BYTEA[]) AS initiator_address,
+                        UNNEST($3::NUMERIC[]) AS gas_limit,
+                        UNNEST($4::NUMERIC[]) AS max_fee_per_gas,
+                        UNNEST($5::NUMERIC[]) AS gas_per_pubdata_limit,
+                        UNNEST($6::JSONB[]) AS data,
+                        UNNEST($7::INT[]) AS upgrade_id,
+                        UNNEST($8::BYTEA[]) AS contract_address,
+                        UNNEST($9::INT[]) AS l1_block_number,
+                        UNNEST($10::NUMERIC[]) AS value,
+                        UNNEST($11::INTEGER[]) AS tx_format,
+                        UNNEST($12::NUMERIC[]) AS l1_tx_mint,
+                        UNNEST($13::BYTEA[]) AS l1_tx_refund_recipient,
+                        UNNEST($14::INT[]) AS index_in_block,
+                        UNNEST($15::VARCHAR[]) AS error,
+                        UNNEST($16::JSONB[]) AS execution_info,
+                        UNNEST($17::BIGINT[]) AS refunded_gas,
+                        UNNEST($18::NUMERIC[]) AS effective_gas_price
+                ) AS data_table
+            "#,
+            &upgrade_hashes as &[&[u8]],
+            &upgrade_initiator_address as &[&[u8]],
+            &upgrade_gas_limit,
+            &upgrade_max_fee_per_gas,
+            &upgrade_gas_per_pubdata_limit,
+            &upgrade_data,
+            &upgrade_upgrade_id,
+            &upgrade_contract_address as &[&[u8]],
+            &upgrade_l1_block_number,
+            &upgrade_value,
+            &upgrade_tx_format,
+            &upgrade_tx_mint,
+            &upgrade_tx_refund_recipient as &[&[u8]],
+            &upgrade_indices_in_block,
+            &upgrade_errors as &[&str],
+            &upgrade_execution_infos,
+            &upgrade_refunded_gas,
+            &upgrade_effective_gas_prices,
+            l2_block_number.0 as i32,
+        );
+
+        instrumentation.with(query).execute(self.storage).await?;
+        Ok(())
+    }
+
+    async fn update_executed_upgrade_transactions(
         &mut self,
         l2_block_number: L2BlockNumber,
         transactions: &[TransactionExecutionResult],
@@ -1206,6 +1855,8 @@ impl TransactionsDal<'_, '_> {
             .map(|op_id| PriorityOpId(op_id as u64)))
     }
 
+    /// Returns the next ID after the ID of the last sealed priority operation.
+    /// Doesn't work if node was recovered from snapshot because transaction history is not recovered.
     pub async fn next_priority_id(&mut self) -> PriorityOpId {
         {
             sqlx::query!(
@@ -1216,7 +1867,12 @@ impl TransactionsDal<'_, '_> {
                     transactions
                 WHERE
                     is_priority = TRUE
-                    AND miniblock_number IS NOT NULL
+                    AND transactions.miniblock_number <= (
+                        SELECT
+                            MAX(number)
+                        FROM
+                            miniblocks
+                    )
                 "#
             )
             .fetch_optional(self.storage.conn())
@@ -1271,7 +1927,21 @@ impl TransactionsDal<'_, '_> {
             FROM
                 transactions
             WHERE
-                l1_batch_number = $1
+                miniblock_number BETWEEN (
+                    SELECT
+                        MIN(number)
+                    FROM
+                        miniblocks
+                    WHERE
+                        miniblocks.l1_batch_number = $1
+                ) AND (
+                    SELECT
+                        MAX(number)
+                    FROM
+                        miniblocks
+                    WHERE
+                        miniblocks.l1_batch_number = $1
+                )
             ORDER BY
                 miniblock_number,
                 index_in_block
@@ -1435,13 +2105,13 @@ impl TransactionsDal<'_, '_> {
     }
 
     pub async fn get_call_trace(&mut self, tx_hash: H256) -> DalResult<Option<Call>> {
-        let protocol_version: ProtocolVersionId = sqlx::query!(
+        let row = sqlx::query!(
             r#"
             SELECT
                 protocol_version
             FROM
                 transactions
-                LEFT JOIN miniblocks ON transactions.miniblock_number = miniblocks.number
+                INNER JOIN miniblocks ON transactions.miniblock_number = miniblocks.number
             WHERE
                 transactions.hash = $1
             "#,
@@ -1450,9 +2120,16 @@ impl TransactionsDal<'_, '_> {
         .instrument("get_call_trace")
         .with_arg("tx_hash", &tx_hash)
         .fetch_optional(self.storage)
-        .await?
-        .and_then(|row| row.protocol_version.map(|v| (v as u16).try_into().unwrap()))
-        .unwrap_or_else(ProtocolVersionId::last_potentially_undefined);
+        .await?;
+
+        let Some(row) = row else {
+            return Ok(None);
+        };
+
+        let protocol_version = row
+            .protocol_version
+            .map(|v| (v as u16).try_into().unwrap())
+            .unwrap_or_else(ProtocolVersionId::last_potentially_undefined);
 
         Ok(sqlx::query_as!(
             CallTrace,
@@ -1532,7 +2209,13 @@ mod tests {
         });
         let expected_call_trace = tx_result.call_trace().unwrap();
         conn.transactions_dal()
-            .mark_txs_as_executed_in_l2_block(L2BlockNumber(1), &[tx_result], 1.into())
+            .mark_txs_as_executed_in_l2_block(
+                L2BlockNumber(1),
+                &[tx_result],
+                1.into(),
+                ProtocolVersionId::latest(),
+                false,
+            )
             .await
             .unwrap();
 
@@ -1544,4 +2227,35 @@ mod tests {
             .expect("no call trace");
         assert_eq!(call_trace, expected_call_trace);
     }
+
+    #[tokio::test]
+    async fn insert_l2_block_executed_txs() {
+        let connection_pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = connection_pool.connection().await.unwrap();
+        conn.protocol_versions_dal()
+            .save_protocol_version_with_tx(&ProtocolVersion::default())
+            .await
+            .unwrap();
+
+        let tx = mock_l2_transaction();
+        let tx_hash = tx.hash();
+        let tx_result = mock_execution_result(tx);
+        conn.transactions_dal()
+            .mark_txs_as_executed_in_l2_block(
+                L2BlockNumber(1),
+                &[tx_result],
+                1.into(),
+                ProtocolVersionId::latest(),
+                true,
+            )
+            .await
+            .unwrap();
+
+        let tx_from_db = conn
+            .transactions_web3_dal()
+            .get_transactions(&[tx_hash], Default::default())
+            .await
+            .unwrap();
+        assert_eq!(tx_from_db[0].hash, tx_hash);
+    }
 }
diff --git a/core/lib/dal/src/transactions_web3_dal.rs b/core/lib/dal/src/transactions_web3_dal.rs
index f855b8bbc862..a73a383ff640 100644
--- a/core/lib/dal/src/transactions_web3_dal.rs
+++ b/core/lib/dal/src/transactions_web3_dal.rs
@@ -1,17 +1,22 @@
+use std::collections::HashMap;
+
+use anyhow::Context as _;
 use sqlx::types::chrono::NaiveDateTime;
 use zksync_db_connection::{
-    connection::Connection, error::DalResult, instrument::InstrumentExt, interpolate_query,
-    match_query_as,
+    connection::Connection,
+    error::{DalResult, SqlxContext as _},
+    instrument::InstrumentExt,
+    interpolate_query, match_query_as,
 };
 use zksync_types::{
-    api, api::TransactionReceipt, Address, L2BlockNumber, L2ChainId, Transaction,
-    ACCOUNT_CODE_STORAGE_ADDRESS, FAILED_CONTRACT_DEPLOYMENT_BYTECODE_HASH, H256, U256,
+    api, api::TransactionReceipt, event::DEPLOY_EVENT_SIGNATURE, Address, L2BlockNumber, L2ChainId,
+    Transaction, CONTRACT_DEPLOYER_ADDRESS, H256, U256,
 };
 
 use crate::{
     models::storage_transaction::{
         StorageApiTransaction, StorageTransaction, StorageTransactionDetails,
-        StorageTransactionReceipt,
+        StorageTransactionExecutionInfo, StorageTransactionReceipt,
     },
     Core, CoreDal,
 };
@@ -35,22 +40,25 @@ impl TransactionsWeb3Dal<'_, '_> {
         hashes: &[H256],
     ) -> DalResult<Vec<TransactionReceipt>> {
         let hash_bytes: Vec<_> = hashes.iter().map(H256::as_bytes).collect();
+        // Clarification for first part of the query(`WITH` clause):
+        // Looking for `ContractDeployed` event in the events table
+        // to find the address of deployed contract
         let mut receipts: Vec<TransactionReceipt> = sqlx::query_as!(
             StorageTransactionReceipt,
             r#"
             WITH
-                sl AS (
+                events AS (
                     SELECT DISTINCT
-                        ON (storage_logs.tx_hash) *
+                        ON (events.tx_hash) *
                     FROM
-                        storage_logs
+                        events
                     WHERE
-                        storage_logs.address = $1
-                        AND storage_logs.tx_hash = ANY ($3)
+                        events.address = $1
+                        AND events.topic1 = $2
+                        AND events.tx_hash = ANY ($3)
                     ORDER BY
-                        storage_logs.tx_hash,
-                        storage_logs.miniblock_number DESC,
-                        storage_logs.operation_number DESC
+                        events.tx_hash,
+                        events.event_index_in_tx DESC
                 )
             SELECT
                 transactions.hash AS tx_hash,
@@ -67,21 +75,20 @@ impl TransactionsWeb3Dal<'_, '_> {
                 transactions.gas_limit AS gas_limit,
                 miniblocks.hash AS "block_hash",
                 miniblocks.l1_batch_number AS "l1_batch_number?",
-                sl.key AS "contract_address?"
+                events.topic4 AS "contract_address?"
             FROM
                 transactions
                 JOIN miniblocks ON miniblocks.number = transactions.miniblock_number
-                LEFT JOIN sl ON sl.value != $2
-                AND sl.tx_hash = transactions.hash
+                LEFT JOIN events ON events.tx_hash = transactions.hash
             WHERE
                 transactions.hash = ANY ($3)
                 AND transactions.data != '{}'::jsonb
             "#,
             // ^ Filter out transactions with pruned data, which would lead to potentially incomplete / bogus
             // transaction info.
-            ACCOUNT_CODE_STORAGE_ADDRESS.as_bytes(),
-            FAILED_CONTRACT_DEPLOYMENT_BYTECODE_HASH.as_bytes(),
-            &hash_bytes as &[&[u8]]
+            CONTRACT_DEPLOYER_ADDRESS.as_bytes(),
+            DEPLOY_EVENT_SIGNATURE.as_bytes(),
+            &hash_bytes as &[&[u8]],
         )
         .instrument("get_transaction_receipts")
         .with_arg("hashes.len", &hashes.len())
@@ -144,6 +151,29 @@ impl TransactionsWeb3Dal<'_, '_> {
             .await
     }
 
+    pub async fn get_unstable_transaction_execution_info(
+        &mut self,
+        hash: H256,
+    ) -> DalResult<Option<serde_json::Value>> {
+        let row = sqlx::query_as!(
+            StorageTransactionExecutionInfo,
+            r#"
+            SELECT
+                transactions.execution_info
+            FROM
+                transactions
+            WHERE
+                transactions.hash = $1
+            "#,
+            hash.as_bytes()
+        )
+        .instrument("get_unstable_transaction_execution_info")
+        .with_arg("hash", &hash)
+        .fetch_optional(self.storage)
+        .await?;
+        Ok(row.map(|entry| entry.execution_info))
+    }
+
     async fn get_transactions_inner(
         &mut self,
         selector: TransactionSelector<'_>,
@@ -163,7 +193,7 @@ impl TransactionsWeb3Dal<'_, '_> {
                 SELECT
                     transactions.hash AS tx_hash,
                     transactions.index_in_block AS index_in_block,
-                    transactions.miniblock_number AS block_number,
+                    miniblocks.number AS block_number,
                     transactions.nonce AS nonce,
                     transactions.signature AS signature,
                     transactions.initiator_address AS initiator_address,
@@ -193,7 +223,7 @@ impl TransactionsWeb3Dal<'_, '_> {
                     &hashes.iter().map(H256::as_bytes).collect::<Vec<_>>() as &[&[u8]]
                 ),
                 TransactionSelector::Position(block_number, idx) => (
-                    "transactions.miniblock_number = $1 AND transactions.index_in_block = $2";
+                    "miniblocks.number = $1 AND transactions.index_in_block = $2";
                     i64::from(block_number.0),
                     idx as i32
                 ),
@@ -249,7 +279,7 @@ impl TransactionsWeb3Dal<'_, '_> {
                 transactions.gas_limit,
                 transactions.gas_per_pubdata_limit,
                 transactions.received_at,
-                transactions.miniblock_number,
+                miniblocks.number AS "miniblock_number?",
                 transactions.error,
                 transactions.effective_gas_price,
                 transactions.refunded_gas,
@@ -301,7 +331,6 @@ impl TransactionsWeb3Dal<'_, '_> {
                 transactions.received_at
             FROM
                 transactions
-                LEFT JOIN miniblocks ON miniblocks.number = miniblock_number
             WHERE
                 received_at > $1
             ORDER BY
@@ -378,32 +407,66 @@ impl TransactionsWeb3Dal<'_, '_> {
         Ok(U256::from(pending_nonce))
     }
 
-    /// Returns the server transactions (not API ones) from a certain L2 block.
-    /// Returns an empty list if the L2 block doesn't exist.
-    pub async fn get_raw_l2_block_transactions(
+    /// Returns the server transactions (not API ones) from a L2 block range.
+    pub async fn get_raw_l2_blocks_transactions(
         &mut self,
-        l2_block: L2BlockNumber,
-    ) -> DalResult<Vec<Transaction>> {
+        blocks: std::ops::Range<L2BlockNumber>,
+    ) -> DalResult<HashMap<L2BlockNumber, Vec<Transaction>>> {
+        // Check if range is non-empty, because BETWEEN in SQL in `unordered`.
+        if blocks.is_empty() {
+            return Ok(HashMap::default());
+        }
+        // We do an inner join with `miniblocks.number`, because
+        // transaction insertions are not atomic with miniblock insertion.
         let rows = sqlx::query_as!(
             StorageTransaction,
             r#"
             SELECT
-                *
+                transactions.*
             FROM
                 transactions
+                INNER JOIN miniblocks ON miniblocks.number = transactions.miniblock_number
             WHERE
-                miniblock_number = $1
+                miniblocks.number BETWEEN $1 AND $2
             ORDER BY
+                miniblock_number,
                 index_in_block
             "#,
-            i64::from(l2_block.0)
+            i64::from(blocks.start.0),
+            i64::from(blocks.end.0 - 1),
         )
-        .instrument("get_raw_l2_block_transactions")
-        .with_arg("l2_block", &l2_block)
+        .try_map(|row| {
+            let to_block_number = |n: Option<i64>| {
+                anyhow::Ok(L2BlockNumber(
+                    n.context("missing")?.try_into().context("overflow")?,
+                ))
+            };
+            Ok((
+                to_block_number(row.miniblock_number).decode_column("miniblock_number")?,
+                Transaction::from(row),
+            ))
+        })
+        .instrument("get_raw_l2_blocks_transactions")
+        .with_arg("blocks", &blocks)
         .fetch_all(self.storage)
         .await?;
+        let mut txs: HashMap<L2BlockNumber, Vec<Transaction>> = HashMap::new();
+        for (n, tx) in rows {
+            txs.entry(n).or_default().push(tx);
+        }
+        Ok(txs)
+    }
 
-        Ok(rows.into_iter().map(Into::into).collect())
+    /// Returns the server transactions (not API ones) from an L2 block.
+    pub async fn get_raw_l2_block_transactions(
+        &mut self,
+        block: L2BlockNumber,
+    ) -> DalResult<Vec<Transaction>> {
+        Ok(self
+            .get_raw_l2_blocks_transactions(block..block + 1)
+            .await?
+            .remove(&block)
+            .unwrap_or_default())
     }
 }
 
@@ -411,7 +474,9 @@ impl TransactionsWeb3Dal<'_, '_> {
 mod tests {
     use std::collections::HashMap;
 
-    use zksync_types::{fee::TransactionExecutionMetrics, l2::L2Tx, Nonce, ProtocolVersion};
+    use zksync_types::{
+        fee::TransactionExecutionMetrics, l2::L2Tx, Nonce, ProtocolVersion, ProtocolVersionId,
+    };
 
     use super::*;
     use crate::{
@@ -448,7 +513,13 @@ mod tests {
             .collect::<Vec<_>>();
 
         conn.transactions_dal()
-            .mark_txs_as_executed_in_l2_block(L2BlockNumber(1), &tx_results, U256::from(1))
+            .mark_txs_as_executed_in_l2_block(
+                L2BlockNumber(1),
+                &tx_results,
+                U256::from(1),
+                ProtocolVersionId::latest(),
+                false,
+            )
             .await
             .unwrap();
     }
@@ -502,6 +573,21 @@ mod tests {
             .get_transaction_by_hash(H256::zero(), L2ChainId::from(270))
             .await;
         assert!(web3_tx.unwrap().is_none());
+
+        let execution_info = conn
+            .transactions_web3_dal()
+            .get_unstable_transaction_execution_info(tx_hash)
+            .await
+            .unwrap()
+            .expect("Transaction execution info is missing in the DAL");
+
+        // Check that execution info has at least the circuit statistics field.
+        // If this assertion fails because the transaction execution info format
+        // has changed, replace circuit_statistic with any other valid field
+        assert!(
+            execution_info.get("circuit_statistic").is_some(),
+            "Missing circuit_statistics field"
+        );
     }
 
     #[tokio::test]
@@ -619,7 +705,13 @@ mod tests {
             mock_execution_result(tx_by_nonce[&1].clone()),
         ];
         conn.transactions_dal()
-            .mark_txs_as_executed_in_l2_block(l2_block.number, &executed_txs, 1.into())
+            .mark_txs_as_executed_in_l2_block(
+                l2_block.number,
+                &executed_txs,
+                1.into(),
+                ProtocolVersionId::latest(),
+                false,
+            )
             .await
             .unwrap();
 
diff --git a/core/lib/dal/src/vm_runner_dal.rs b/core/lib/dal/src/vm_runner_dal.rs
new file mode 100644
index 000000000000..bd6a08eacd0e
--- /dev/null
+++ b/core/lib/dal/src/vm_runner_dal.rs
@@ -0,0 +1,113 @@
+use zksync_db_connection::{connection::Connection, error::DalResult, instrument::InstrumentExt};
+use zksync_types::L1BatchNumber;
+
+use crate::Core;
+
+#[derive(Debug)]
+pub struct VmRunnerDal<'c, 'a> {
+    pub(crate) storage: &'c mut Connection<'a, Core>,
+}
+
+impl VmRunnerDal<'_, '_> {
+    pub async fn get_protective_reads_latest_processed_batch(
+        &mut self,
+    ) -> DalResult<Option<L1BatchNumber>> {
+        let row = sqlx::query!(
+            r#"
+            SELECT
+                MAX(l1_batch_number) AS "last_processed_l1_batch"
+            FROM
+                vm_runner_protective_reads
+            "#
+        )
+        .instrument("get_protective_reads_latest_processed_batch")
+        .report_latency()
+        .fetch_one(self.storage)
+        .await?;
+        Ok(row.last_processed_l1_batch.map(|n| L1BatchNumber(n as u32)))
+    }
+
+    pub async fn get_protective_reads_last_ready_batch(
+        &mut self,
+        default_batch: L1BatchNumber,
+        window_size: u32,
+    ) -> DalResult<L1BatchNumber> {
+        let row = sqlx::query!(
+            r#"
+            WITH
+                available_batches AS (
+                    SELECT
+                        MAX(number) AS "last_batch"
+                    FROM
+                        l1_batches
+                ),
+                processed_batches AS (
+                    SELECT
+                        COALESCE(MAX(l1_batch_number), $1) + $2 AS "last_ready_batch"
+                    FROM
+                        vm_runner_protective_reads
+                )
+            SELECT
+                LEAST(last_batch, last_ready_batch) AS "last_ready_batch!"
+            FROM
+                available_batches
+                FULL JOIN processed_batches ON TRUE
+            "#,
+            default_batch.0 as i32,
+            window_size as i32
+        )
+        .instrument("get_protective_reads_last_ready_batch")
+        .report_latency()
+        .fetch_one(self.storage)
+        .await?;
+        Ok(L1BatchNumber(row.last_ready_batch as u32))
+    }
+
+    pub async fn mark_protective_reads_batch_as_completed(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> DalResult<()> {
+        sqlx::query!(
+            r#"
+            INSERT INTO
+                vm_runner_protective_reads (l1_batch_number, created_at, updated_at)
+            VALUES
+                ($1, NOW(), NOW())
+            "#,
+            i64::from(l1_batch_number.0),
+        )
+        .instrument("mark_protective_reads_batch_as_completed")
+        .report_latency()
+        .execute(self.storage)
+        .await?;
+        Ok(())
+    }
+
+    pub async fn delete_protective_reads(
+        &mut self,
+        last_batch_to_keep: L1BatchNumber,
+    ) -> DalResult<()> {
+        self.delete_protective_reads_inner(Some(last_batch_to_keep))
+            .await
+    }
+
+    async fn delete_protective_reads_inner(
+        &mut self,
+        last_batch_to_keep: Option<L1BatchNumber>,
+    ) -> DalResult<()> {
+        let l1_batch_number = last_batch_to_keep.map_or(-1, |number| i64::from(number.0));
+        sqlx::query!(
+            r#"
+            DELETE FROM vm_runner_protective_reads
+            WHERE
+                l1_batch_number > $1
+            "#,
+            l1_batch_number
+        )
+        .instrument("delete_protective_reads")
+        .with_arg("l1_batch_number", &l1_batch_number)
+        .execute(self.storage)
+        .await?;
+        Ok(())
+    }
+}
diff --git a/core/lib/db_connection/Cargo.toml b/core/lib/db_connection/Cargo.toml
index 2e929e385991..795ec5ab5ac7 100644
--- a/core/lib/db_connection/Cargo.toml
+++ b/core/lib/db_connection/Cargo.toml
@@ -36,3 +36,4 @@ tracing.workspace = true
 
 [dev-dependencies]
 assert_matches.workspace = true
+test-casing.workspace = true
diff --git a/core/lib/db_connection/src/connection.rs b/core/lib/db_connection/src/connection.rs
index 30ffe62977ef..22a63765b3bf 100644
--- a/core/lib/db_connection/src/connection.rs
+++ b/core/lib/db_connection/src/connection.rs
@@ -1,6 +1,6 @@
 use std::{
     collections::HashMap,
-    fmt,
+    fmt, io,
     panic::Location,
     sync::{
         atomic::{AtomicUsize, Ordering},
@@ -16,6 +16,7 @@ use sqlx::{
 use crate::{
     connection_pool::ConnectionPool,
     error::{DalConnectionError, DalResult},
+    instrument::InstrumentExt,
     metrics::CONNECTION_METRICS,
     utils::InternalMarker,
 };
@@ -183,6 +184,7 @@ impl<'a, DB: DbMarker> Connection<'a, DB> {
         }
     }
 
+    /// Starts a transaction or a new checkpoint within the current transaction.
     pub async fn start_transaction(&mut self) -> DalResult<Connection<'_, DB>> {
         let (conn, tags) = self.conn_and_tags();
         let inner = ConnectionInner::Transaction {
@@ -198,23 +200,72 @@ impl<'a, DB: DbMarker> Connection<'a, DB> {
         })
     }
 
+    /// Starts building a new transaction with custom settings. Unlike [`Self::start_transaction()`], this method
+    /// will error if called from a transaction; it is a logical error to change transaction settings in the middle of it.
+    pub fn transaction_builder(&mut self) -> DalResult<TransactionBuilder<'_, 'a, DB>> {
+        if let ConnectionInner::Transaction { tags, .. } = &self.inner {
+            let err = io::Error::new(
+                io::ErrorKind::Other,
+                "`Connection::transaction_builder()` can only be invoked outside of a transaction",
+            );
+            return Err(
+                DalConnectionError::start_transaction(sqlx::Error::Io(err), tags.cloned()).into(),
+            );
+        }
+        Ok(TransactionBuilder {
+            connection: self,
+            is_readonly: false,
+            isolation_level: None,
+        })
+    }
+
     /// Checks if the `Connection` is currently within database transaction.
     pub fn in_transaction(&self) -> bool {
         matches!(self.inner, ConnectionInner::Transaction { .. })
     }
 
+    /// Commits a transactional connection (one which was created by calling [`Self::start_transaction()`]).
+    /// If this connection is not transactional, returns an error.
     pub async fn commit(self) -> DalResult<()> {
-        if let ConnectionInner::Transaction {
-            transaction: postgres,
-            tags,
-        } = self.inner
-        {
-            postgres
+        match self.inner {
+            ConnectionInner::Transaction {
+                transaction: postgres,
+                tags,
+            } => postgres
                 .commit()
                 .await
-                .map_err(|err| DalConnectionError::commit_transaction(err, tags.cloned()).into())
-        } else {
-            panic!("Connection::commit can only be invoked after calling Connection::begin_transaction");
+                .map_err(|err| DalConnectionError::commit_transaction(err, tags.cloned()).into()),
+            ConnectionInner::Pooled(conn) => {
+                let err = io::Error::new(
+                    io::ErrorKind::Other,
+                    "`Connection::commit()` can only be invoked after calling `Connection::begin_transaction()`",
+                );
+                Err(DalConnectionError::commit_transaction(sqlx::Error::Io(err), conn.tags).into())
+            }
+        }
+    }
+
+    /// Rolls back a transactional connection (one which was created by calling [`Self::start_transaction()`]).
+    /// If this connection is not transactional, returns an error.
+    pub async fn rollback(self) -> DalResult<()> {
+        match self.inner {
+            ConnectionInner::Transaction {
+                transaction: postgres,
+                tags,
+            } => postgres
+                .rollback()
+                .await
+                .map_err(|err| DalConnectionError::rollback_transaction(err, tags.cloned()).into()),
+            ConnectionInner::Pooled(conn) => {
+                let err = io::Error::new(
+                    io::ErrorKind::Other,
+                    "`Connection::rollback()` can only be invoked after calling `Connection::begin_transaction()`",
+                );
+                Err(
+                    DalConnectionError::rollback_transaction(sqlx::Error::Io(err), conn.tags)
+                        .into(),
+                )
+            }
         }
     }
 
@@ -230,9 +281,81 @@ impl<'a, DB: DbMarker> Connection<'a, DB> {
     }
 }
 
+/// Transaction isolation level.
+///
+/// See [Postgres docs](https://www.postgresql.org/docs/14/transaction-iso.html) for details on isolation level semantics.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[non_exhaustive]
+pub enum IsolationLevel {
+    /// "Read committed" isolation level.
+    ReadCommitted,
+    /// "Repeatable read" isolation level (aka "snapshot isolation").
+    RepeatableRead,
+    /// Serializable isolation level.
+    Serializable,
+}
+
+/// Builder of transactions allowing to configure transaction characteristics (for now, just its readonly status).
+#[derive(Debug)]
+pub struct TransactionBuilder<'a, 'c, DB: DbMarker> {
+    connection: &'a mut Connection<'c, DB>,
+    is_readonly: bool,
+    isolation_level: Option<IsolationLevel>,
+}
+
+impl<'a, DB: DbMarker> TransactionBuilder<'a, '_, DB> {
+    /// Sets the readonly status of the created transaction.
+    pub fn set_readonly(mut self) -> Self {
+        self.is_readonly = true;
+        self
+    }
+
+    /// Sets the isolation level of this transaction. If this method is not called, the isolation level will be
+    /// "read committed" (the default Postgres isolation level) for read-write transactions, and "repeatable read"
+    /// for readonly transactions. Beware that setting high isolation level for read-write transactions may lead
+    /// to performance degradation and/or isolation-related errors.
+    pub fn set_isolation(mut self, level: IsolationLevel) -> Self {
+        self.isolation_level = Some(level);
+        self
+    }
+
+    /// Builds the transaction with the provided characteristics.
+    pub async fn build(self) -> DalResult<Connection<'a, DB>> {
+        let mut transaction = self.connection.start_transaction().await?;
+
+        let level = self.isolation_level.unwrap_or(if self.is_readonly {
+            IsolationLevel::RepeatableRead
+        } else {
+            IsolationLevel::ReadCommitted
+        });
+        let level = match level {
+            IsolationLevel::ReadCommitted => "READ COMMITTED",
+            IsolationLevel::RepeatableRead => "REPEATABLE READ",
+            IsolationLevel::Serializable => "SERIALIZABLE",
+        };
+        let mut set_transaction_args = format!(" ISOLATION LEVEL {level}");
+
+        if self.is_readonly {
+            set_transaction_args += " READ ONLY";
+        }
+
+        if !set_transaction_args.is_empty() {
+            sqlx::query(&format!("SET TRANSACTION{set_transaction_args}"))
+                .instrument("set_transaction_characteristics")
+                .with_arg("isolation_level", &self.isolation_level)
+                .with_arg("readonly", &self.is_readonly)
+                .execute(&mut transaction)
+                .await?;
+        }
+        Ok(transaction)
+    }
+}
+
 #[cfg(test)]
 mod tests {
-    use crate::{connection_pool::ConnectionPool, utils::InternalMarker};
+    use test_casing::test_casing;
+
+    use super::*;
 
     #[tokio::test]
     async fn processor_tags_propagate_to_transactions() {
@@ -266,4 +389,65 @@ mod tests {
             assert!(traced.is_empty());
         }
     }
+
+    const ISOLATION_LEVELS: [Option<IsolationLevel>; 4] = [
+        None,
+        Some(IsolationLevel::ReadCommitted),
+        Some(IsolationLevel::RepeatableRead),
+        Some(IsolationLevel::Serializable),
+    ];
+
+    #[test_casing(4, ISOLATION_LEVELS)]
+    #[tokio::test]
+    async fn setting_isolation_level_for_transaction(level: Option<IsolationLevel>) {
+        let pool = ConnectionPool::<InternalMarker>::constrained_test_pool(1).await;
+        let mut connection = pool.connection().await.unwrap();
+        let mut transaction_builder = connection.transaction_builder().unwrap();
+        if let Some(level) = level {
+            transaction_builder = transaction_builder.set_isolation(level);
+        }
+
+        let mut transaction = transaction_builder.build().await.unwrap();
+        assert!(transaction.in_transaction());
+
+        sqlx::query("SELECT COUNT(*) AS \"count?\" FROM miniblocks")
+            .instrument("test")
+            .fetch_optional(&mut transaction)
+            .await
+            .unwrap()
+            .expect("no row returned");
+        // Check that it's possible to execute write statements in the transaction.
+        sqlx::query("DELETE FROM miniblocks")
+            .instrument("test")
+            .execute(&mut transaction)
+            .await
+            .unwrap();
+    }
+
+    #[test_casing(4, ISOLATION_LEVELS)]
+    #[tokio::test]
+    async fn creating_readonly_transaction(level: Option<IsolationLevel>) {
+        let pool = ConnectionPool::<InternalMarker>::constrained_test_pool(1).await;
+        let mut connection = pool.connection().await.unwrap();
+        let mut transaction_builder = connection.transaction_builder().unwrap().set_readonly();
+        if let Some(level) = level {
+            transaction_builder = transaction_builder.set_isolation(level);
+        }
+
+        let mut readonly_transaction = transaction_builder.build().await.unwrap();
+        assert!(readonly_transaction.in_transaction());
+
+        sqlx::query("SELECT COUNT(*) AS \"count?\" FROM miniblocks")
+            .instrument("test")
+            .fetch_optional(&mut readonly_transaction)
+            .await
+            .unwrap()
+            .expect("no row returned");
+        // Check that it's impossible to execute write statements in the transaction.
+        sqlx::query("DELETE FROM miniblocks")
+            .instrument("test")
+            .execute(&mut readonly_transaction)
+            .await
+            .unwrap_err();
+    }
 }
diff --git a/core/lib/db_connection/src/error.rs b/core/lib/db_connection/src/error.rs
index ce6966679e0c..6d192de44d5c 100644
--- a/core/lib/db_connection/src/error.rs
+++ b/core/lib/db_connection/src/error.rs
@@ -100,6 +100,7 @@ enum ConnectionAction {
     AcquireConnection,
     StartTransaction,
     CommitTransaction,
+    RollbackTransaction,
 }
 
 impl ConnectionAction {
@@ -108,6 +109,7 @@ impl ConnectionAction {
             Self::AcquireConnection => "acquiring DB connection",
             Self::StartTransaction => "starting DB transaction",
             Self::CommitTransaction => "committing DB transaction",
+            Self::RollbackTransaction => "rolling back DB transaction",
         }
     }
 }
@@ -165,6 +167,17 @@ impl DalConnectionError {
             connection_tags,
         }
     }
+
+    pub(crate) fn rollback_transaction(
+        inner: sqlx::Error,
+        connection_tags: Option<ConnectionTags>,
+    ) -> Self {
+        Self {
+            inner,
+            action: ConnectionAction::RollbackTransaction,
+            connection_tags,
+        }
+    }
 }
 
 /// Extension trait to create `sqlx::Result`s, similar to `anyhow::Context`.
diff --git a/core/lib/db_connection/src/instrument.rs b/core/lib/db_connection/src/instrument.rs
index c61fad25b1ed..244329ca75bb 100644
--- a/core/lib/db_connection/src/instrument.rs
+++ b/core/lib/db_connection/src/instrument.rs
@@ -31,7 +31,7 @@ use crate::{
 type ThreadSafeDebug<'a> = dyn fmt::Debug + Send + Sync + 'a;
 
 /// Logged arguments for an SQL query.
-#[derive(Debug, Default)]
+#[derive(Debug, Clone, Default)]
 struct QueryArgs<'a> {
     inner: Vec<(&'static str, &'a ThreadSafeDebug<'a>)>,
 }
@@ -180,7 +180,7 @@ impl ActiveCopy<'_> {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 struct InstrumentedData<'a> {
     name: &'static str,
     location: &'static Location<'static>,
@@ -200,6 +200,21 @@ impl<'a> InstrumentedData<'a> {
         }
     }
 
+    fn observe_error(&self, err: &dyn fmt::Display) {
+        let InstrumentedData {
+            name,
+            location,
+            args,
+            ..
+        } = self;
+        tracing::warn!(
+            "Query {name}{args} called at {file}:{line} has resulted in error: {err}",
+            file = location.file(),
+            line = location.line()
+        );
+        REQUEST_METRICS.request_error[name].inc();
+    }
+
     async fn fetch<R>(
         self,
         connection_tags: Option<&ConnectionTags>,
@@ -278,7 +293,7 @@ impl<'a> InstrumentedData<'a> {
 ///   included in the case of a slow query, plus the error info.
 /// - Slow and erroneous queries are also reported using metrics (`dal.request.slow` and `dal.request.error`,
 ///   respectively). The query name is included as a metric label; args are not included for obvious reasons.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Instrumented<'a, Q> {
     query: Q,
     data: InstrumentedData<'a>,
@@ -295,32 +310,40 @@ impl<'a> Instrumented<'a, ()> {
         }
     }
 
-    /// Wraps a provided argument validation error.
+    /// Wraps a provided argument validation error. It is assumed that the returned error
+    /// will be returned as an error cause (e.g., it is logged as an error and observed using metrics).
+    #[must_use]
     pub fn arg_error<E>(&self, arg_name: &str, err: E) -> DalError
     where
         E: Into<anyhow::Error>,
     {
         let err: anyhow::Error = err.into();
         let err = err.context(format!("failed validating query argument `{arg_name}`"));
-        DalRequestError::new(
+        let err = DalRequestError::new(
             sqlx::Error::Decode(err.into()),
             self.data.name,
             self.data.location,
         )
-        .with_args(self.data.args.to_owned())
-        .into()
+        .with_args(self.data.args.to_owned());
+
+        self.data.observe_error(&err);
+        err.into()
     }
 
-    /// Wraps a provided application-level data constraint error.
+    /// Wraps a provided application-level data constraint error. It is assumed that the returned error
+    /// will be returned as an error cause (e.g., it is logged as an error and observed using metrics).
+    #[must_use]
     pub fn constraint_error(&self, err: anyhow::Error) -> DalError {
         let err = err.context("application-level data constraint violation");
-        DalRequestError::new(
+        let err = DalRequestError::new(
             sqlx::Error::Decode(err.into()),
             self.data.name,
             self.data.location,
         )
-        .with_args(self.data.args.to_owned())
-        .into()
+        .with_args(self.data.args.to_owned());
+
+        self.data.observe_error(&err);
+        err.into()
     }
 
     pub fn with<Q>(self, query: Q) -> Instrumented<'a, Q> {
@@ -475,7 +498,7 @@ mod tests {
     #[tokio::test]
     async fn instrumenting_erroneous_query() {
         let pool = ConnectionPool::<InternalMarker>::test_pool().await;
-        // Add `vlog::init()` here to debug this test
+        // Add `zksync_vlog::init()` here to debug this test
 
         let mut conn = pool.connection().await.unwrap();
         sqlx::query("WHAT")
@@ -491,7 +514,7 @@ mod tests {
     #[tokio::test]
     async fn instrumenting_slow_query() {
         let pool = ConnectionPool::<InternalMarker>::test_pool().await;
-        // Add `vlog::init()` here to debug this test
+        // Add `zksync_vlog::init()` here to debug this test
 
         let mut conn = pool.connection().await.unwrap();
         sqlx::query("SELECT pg_sleep(1.5)")
diff --git a/core/lib/db_connection/src/utils.rs b/core/lib/db_connection/src/utils.rs
index 7c917845c7e3..80cf0a5cbb35 100644
--- a/core/lib/db_connection/src/utils.rs
+++ b/core/lib/db_connection/src/utils.rs
@@ -9,6 +9,10 @@ pub(crate) struct InternalMarker;
 
 impl DbMarker for InternalMarker {}
 
+const MICROSECONDS_IN_A_SECOND: i64 = 1_000_000;
+const MICROSECONDS_IN_A_MINUTE: i64 = MICROSECONDS_IN_A_SECOND * 60;
+const MICROSECONDS_IN_AN_HOUR: i64 = MICROSECONDS_IN_A_MINUTE * 60;
+
 pub fn duration_to_naive_time(duration: Duration) -> NaiveTime {
     let total_seconds = duration.as_secs() as u32;
     NaiveTime::from_hms_opt(
@@ -26,3 +30,16 @@ pub const fn pg_interval_from_duration(processing_timeout: Duration) -> PgInterv
         microseconds: processing_timeout.as_micros() as i64,
     }
 }
+
+// Note: this conversion purposefully ignores `.days` and `.months` fields of PgInterval.
+// The PgIntervals expected are below 24h (represented by `.microseconds`). If that's not the case,
+// the function will trim days and months. Use at your own risk.
+pub fn naive_time_from_pg_interval(pg_interval: PgInterval) -> NaiveTime {
+    NaiveTime::from_hms_micro_opt(
+        (pg_interval.microseconds / MICROSECONDS_IN_AN_HOUR) as u32,
+        ((pg_interval.microseconds / MICROSECONDS_IN_A_MINUTE) % 60) as u32,
+        ((pg_interval.microseconds / MICROSECONDS_IN_A_SECOND) % 60) as u32,
+        (pg_interval.microseconds as u32) % 1_000_000,
+    )
+    .expect("failed to convert PgInterval to NaiveTime")
+}
diff --git a/core/lib/default_da_clients/Cargo.toml b/core/lib/default_da_clients/Cargo.toml
new file mode 100644
index 000000000000..c19af34681a8
--- /dev/null
+++ b/core/lib/default_da_clients/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "zksync_default_da_clients"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+serde = { workspace = true, features = ["derive"] }
+tracing.workspace = true
+async-trait.workspace = true
+anyhow.workspace = true
+flate2.workspace = true
+
+zksync_config.workspace = true
+zksync_types.workspace = true
+zksync_object_store.workspace = true
+zksync_da_client.workspace = true
+zksync_node_framework.workspace = true
+zksync_env_config.workspace = true
diff --git a/core/lib/default_da_clients/README.md b/core/lib/default_da_clients/README.md
new file mode 100644
index 000000000000..17ced715b268
--- /dev/null
+++ b/core/lib/default_da_clients/README.md
@@ -0,0 +1,11 @@
+# Default DA Clients
+
+This crate contains the default implementations of the Data Availability clients. Default clients are maintained within
+this repo because they are tightly coupled with the codebase, and would cause the circular dependency if they were to be
+moved to the [hyperchain-da](https://github.com/matter-labs/hyperchain-da) repository.
+
+Currently, the following DataAvailability clients are implemented:
+
+- `NoDA client` that does not send or store any pubdata, it is needed to run the zkSync network in the "no-DA" mode
+  utilizing the DA framework.
+- `Object Store client` that stores the pubdata in the Object Store(GCS).
diff --git a/core/lib/default_da_clients/src/lib.rs b/core/lib/default_da_clients/src/lib.rs
new file mode 100644
index 000000000000..3aa2a18cdcec
--- /dev/null
+++ b/core/lib/default_da_clients/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod no_da;
+pub mod object_store;
diff --git a/core/lib/default_da_clients/src/no_da/client.rs b/core/lib/default_da_clients/src/no_da/client.rs
new file mode 100644
index 000000000000..2710c9ce9d9b
--- /dev/null
+++ b/core/lib/default_da_clients/src/no_da/client.rs
@@ -0,0 +1,28 @@
+use async_trait::async_trait;
+use zksync_da_client::{
+    types::{DAError, DispatchResponse, InclusionData},
+    DataAvailabilityClient,
+};
+
+/// A no-op implementation of the `DataAvailabilityClient` trait, that doesn't store the pubdata.
+#[derive(Clone, Debug, Default)]
+pub struct NoDAClient;
+
+#[async_trait]
+impl DataAvailabilityClient for NoDAClient {
+    async fn dispatch_blob(&self, _: u32, _: Vec<u8>) -> Result<DispatchResponse, DAError> {
+        Ok(DispatchResponse::default())
+    }
+
+    async fn get_inclusion_data(&self, _: &str) -> Result<Option<InclusionData>, DAError> {
+        return Ok(Some(InclusionData::default()));
+    }
+
+    fn clone_boxed(&self) -> Box<dyn DataAvailabilityClient> {
+        Box::new(self.clone())
+    }
+
+    fn blob_size_limit(&self) -> Option<usize> {
+        None
+    }
+}
diff --git a/core/lib/default_da_clients/src/no_da/mod.rs b/core/lib/default_da_clients/src/no_da/mod.rs
new file mode 100644
index 000000000000..814cf30c2cbd
--- /dev/null
+++ b/core/lib/default_da_clients/src/no_da/mod.rs
@@ -0,0 +1,2 @@
+pub mod client;
+pub mod wiring_layer;
diff --git a/core/lib/default_da_clients/src/no_da/wiring_layer.rs b/core/lib/default_da_clients/src/no_da/wiring_layer.rs
new file mode 100644
index 000000000000..c1332da9a97e
--- /dev/null
+++ b/core/lib/default_da_clients/src/no_da/wiring_layer.rs
@@ -0,0 +1,28 @@
+use std::fmt::Debug;
+
+use zksync_da_client::DataAvailabilityClient;
+use zksync_node_framework::{
+    implementations::resources::da_client::DAClientResource,
+    service::ServiceContext,
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+use crate::no_da::client::NoDAClient;
+
+#[derive(Debug, Default)]
+pub struct NoDAClientWiringLayer;
+
+#[async_trait::async_trait]
+impl WiringLayer for NoDAClientWiringLayer {
+    fn layer_name(&self) -> &'static str {
+        "no_da_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let client: Box<dyn DataAvailabilityClient> = Box::new(NoDAClient);
+
+        context.insert_resource(DAClientResource(client))?;
+
+        Ok(())
+    }
+}
diff --git a/core/lib/default_da_clients/src/object_store/client.rs b/core/lib/default_da_clients/src/object_store/client.rs
new file mode 100644
index 000000000000..fc17a842a099
--- /dev/null
+++ b/core/lib/default_da_clients/src/object_store/client.rs
@@ -0,0 +1,86 @@
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use zksync_config::ObjectStoreConfig;
+use zksync_da_client::{
+    types::{DAError, DispatchResponse, InclusionData},
+    DataAvailabilityClient,
+};
+use zksync_object_store::{ObjectStore, ObjectStoreFactory};
+use zksync_types::L1BatchNumber;
+
+use crate::object_store::types::StorablePubdata;
+
+/// An implementation of the `DataAvailabilityClient` trait that stores the pubdata in the GCS.
+#[derive(Clone, Debug)]
+pub struct ObjectStoreDAClient {
+    object_store: Arc<dyn ObjectStore>,
+}
+
+impl ObjectStoreDAClient {
+    pub async fn new(object_store_conf: ObjectStoreConfig) -> anyhow::Result<Self> {
+        Ok(ObjectStoreDAClient {
+            object_store: ObjectStoreFactory::new(object_store_conf)
+                .create_store()
+                .await?,
+        })
+    }
+}
+
+#[async_trait]
+impl DataAvailabilityClient for ObjectStoreDAClient {
+    async fn dispatch_blob(
+        &self,
+        batch_number: u32,
+        data: Vec<u8>,
+    ) -> Result<DispatchResponse, DAError> {
+        if let Err(err) = self
+            .object_store
+            .put(L1BatchNumber(batch_number), &StorablePubdata { data })
+            .await
+        {
+            return Err(DAError {
+                is_transient: err.is_transient(),
+                error: anyhow::Error::from(err),
+            });
+        }
+
+        Ok(DispatchResponse {
+            blob_id: batch_number.to_string(),
+        })
+    }
+
+    async fn get_inclusion_data(&self, key: &str) -> Result<Option<InclusionData>, DAError> {
+        let key_u32 = key.parse::<u32>().map_err(|err| DAError {
+            error: anyhow::Error::from(err).context(format!("Failed to parse blob key: {}", key)),
+            is_transient: false,
+        })?;
+
+        if let Err(err) = self
+            .object_store
+            .get::<StorablePubdata>(L1BatchNumber(key_u32))
+            .await
+        {
+            if let zksync_object_store::ObjectStoreError::KeyNotFound(_) = err {
+                return Ok(None);
+            }
+
+            return Err(DAError {
+                is_transient: err.is_transient(),
+                error: anyhow::Error::from(err),
+            });
+        }
+
+        // Using default here because we don't get any inclusion data from object store, thus
+        // there's nothing to check on L1.
+        return Ok(Some(InclusionData::default()));
+    }
+
+    fn clone_boxed(&self) -> Box<dyn DataAvailabilityClient> {
+        Box::new(self.clone())
+    }
+
+    fn blob_size_limit(&self) -> Option<usize> {
+        None
+    }
+}
diff --git a/core/lib/default_da_clients/src/object_store/config.rs b/core/lib/default_da_clients/src/object_store/config.rs
new file mode 100644
index 000000000000..285c39827c79
--- /dev/null
+++ b/core/lib/default_da_clients/src/object_store/config.rs
@@ -0,0 +1,12 @@
+use zksync_config::ObjectStoreConfig;
+use zksync_env_config::envy_load;
+
+#[derive(Debug)]
+pub struct DAObjectStoreConfig(pub ObjectStoreConfig);
+
+impl DAObjectStoreConfig {
+    pub fn from_env() -> anyhow::Result<Self> {
+        let config = envy_load("object_store", "DA_CLIENT_OBJECT_STORE_")?;
+        Ok(Self(config))
+    }
+}
diff --git a/core/lib/default_da_clients/src/object_store/mod.rs b/core/lib/default_da_clients/src/object_store/mod.rs
new file mode 100644
index 000000000000..1600941b0572
--- /dev/null
+++ b/core/lib/default_da_clients/src/object_store/mod.rs
@@ -0,0 +1,4 @@
+pub mod client;
+pub mod config;
+mod types;
+pub mod wiring_layer;
diff --git a/core/lib/default_da_clients/src/object_store/types.rs b/core/lib/default_da_clients/src/object_store/types.rs
new file mode 100644
index 000000000000..b8ec9303e71e
--- /dev/null
+++ b/core/lib/default_da_clients/src/object_store/types.rs
@@ -0,0 +1,38 @@
+use std::io::{Read, Write};
+
+use flate2::{read::GzDecoder, write::GzEncoder, Compression};
+use zksync_object_store::{Bucket, StoredObject, _reexports::BoxedError};
+use zksync_types::L1BatchNumber;
+
+/// Used as a wrapper for the pubdata to be stored in the GCS.
+#[derive(Debug)]
+pub struct StorablePubdata {
+    pub data: Vec<u8>,
+}
+
+impl StoredObject for StorablePubdata {
+    const BUCKET: Bucket = Bucket::DataAvailability;
+    type Key<'a> = L1BatchNumber;
+
+    fn encode_key(key: Self::Key<'_>) -> String {
+        format!("l1_batch_{key}_pubdata.gzip")
+    }
+
+    fn serialize(&self) -> Result<Vec<u8>, BoxedError> {
+        let mut encoder = GzEncoder::new(Vec::new(), Compression::default());
+        encoder.write_all(&self.data[..])?;
+        encoder.finish().map_err(From::from)
+    }
+
+    fn deserialize(bytes: Vec<u8>) -> Result<Self, BoxedError> {
+        let mut decoder = GzDecoder::new(&bytes[..]);
+        let mut decompressed_bytes = Vec::new();
+        decoder
+            .read_to_end(&mut decompressed_bytes)
+            .map_err(BoxedError::from)?;
+
+        Ok(Self {
+            data: decompressed_bytes,
+        })
+    }
+}
diff --git a/core/lib/default_da_clients/src/object_store/wiring_layer.rs b/core/lib/default_da_clients/src/object_store/wiring_layer.rs
new file mode 100644
index 000000000000..7af7e4d04fa6
--- /dev/null
+++ b/core/lib/default_da_clients/src/object_store/wiring_layer.rs
@@ -0,0 +1,36 @@
+use zksync_config::ObjectStoreConfig;
+use zksync_da_client::DataAvailabilityClient;
+use zksync_node_framework::{
+    implementations::resources::da_client::DAClientResource,
+    service::ServiceContext,
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+use crate::object_store::client::ObjectStoreDAClient;
+
+#[derive(Debug)]
+pub struct ObjectStorageClientWiringLayer {
+    config: ObjectStoreConfig,
+}
+
+impl ObjectStorageClientWiringLayer {
+    pub fn new(config: ObjectStoreConfig) -> Self {
+        Self { config }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for ObjectStorageClientWiringLayer {
+    fn layer_name(&self) -> &'static str {
+        "object_store_da_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let client: Box<dyn DataAvailabilityClient> =
+            Box::new(ObjectStoreDAClient::new(self.config).await?);
+
+        context.insert_resource(DAClientResource(client))?;
+
+        Ok(())
+    }
+}
diff --git a/core/lib/env_config/src/api.rs b/core/lib/env_config/src/api.rs
index 6f1948241c9e..68af37393bba 100644
--- a/core/lib/env_config/src/api.rs
+++ b/core/lib/env_config/src/api.rs
@@ -98,6 +98,8 @@ mod tests {
                     addr("0x0000000000000000000000000000000000000001"),
                     addr("0x0000000000000000000000000000000000000002"),
                 ],
+                api_namespaces: Some(vec!["debug".to_string()]),
+                extended_api_tracing: true,
             },
             prometheus: PrometheusConfig {
                 listener_port: 3312,
@@ -129,6 +131,8 @@ mod tests {
             API_WEB3_JSON_RPC_MAX_NONCE_AHEAD=5
             API_WEB3_JSON_RPC_GAS_PRICE_SCALE_FACTOR=1.2
             API_WEB3_JSON_RPC_REQUEST_TIMEOUT=10
+            API_WEB3_JSON_RPC_API_NAMESPACES=debug
+            API_WEB3_JSON_RPC_EXTENDED_API_TRACING=true
             API_WEB3_JSON_RPC_ACCOUNT_PKS="0x0000000000000000000000000000000000000000000000000000000000000001,0x0000000000000000000000000000000000000000000000000000000000000002"
             API_WEB3_JSON_RPC_WHITELISTED_TOKENS_FOR_AA="0x0000000000000000000000000000000000000001,0x0000000000000000000000000000000000000002"
             API_WEB3_JSON_RPC_ESTIMATE_GAS_SCALE_FACTOR=1.0
diff --git a/core/lib/env_config/src/base_token_adjuster.rs b/core/lib/env_config/src/base_token_adjuster.rs
new file mode 100644
index 000000000000..5e4ef39671ca
--- /dev/null
+++ b/core/lib/env_config/src/base_token_adjuster.rs
@@ -0,0 +1,9 @@
+use zksync_config::configs::BaseTokenAdjusterConfig;
+
+use crate::{envy_load, FromEnv};
+
+impl FromEnv for BaseTokenAdjusterConfig {
+    fn from_env() -> anyhow::Result<Self> {
+        envy_load("base_token_adjuster", "BASE_TOKEN_ADJUSTER_")
+    }
+}
diff --git a/core/lib/env_config/src/chain.rs b/core/lib/env_config/src/chain.rs
index c9da7bb78ff2..441fcc4159cb 100644
--- a/core/lib/env_config/src/chain.rs
+++ b/core/lib/env_config/src/chain.rs
@@ -36,8 +36,8 @@ impl FromEnv for MempoolConfig {
 
 #[cfg(test)]
 mod tests {
-    use zksync_basic_types::L2ChainId;
-    use zksync_config::configs::chain::{FeeModelVersion, L1BatchCommitDataGeneratorMode};
+    use zksync_basic_types::{commitment::L1BatchCommitmentMode, L2ChainId};
+    use zksync_config::configs::chain::FeeModelVersion;
 
     use super::*;
     use crate::test_utils::{addr, hash, EnvMutex};
@@ -70,7 +70,7 @@ mod tests {
 
     #[allow(deprecated)]
     fn expected_state_keeper_config(
-        l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+        l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
     ) -> StateKeeperConfig {
         StateKeeperConfig {
             transaction_slots: 50,
@@ -104,6 +104,7 @@ mod tests {
             )),
             l1_batch_commit_data_generator_mode,
             max_circuits_per_batch: 24100,
+            protective_reads_persistence_enabled: true,
         }
     }
 
@@ -152,11 +153,11 @@ mod tests {
     fn state_keeper_from_env() {
         _state_keeper_from_env(
             &state_keeper_config(ROLLUP_L1_BATCH_COMMIT_DATA_GENERATOR_MODE),
-            expected_state_keeper_config(L1BatchCommitDataGeneratorMode::Rollup),
+            expected_state_keeper_config(L1BatchCommitmentMode::Rollup),
         );
         _state_keeper_from_env(
             &state_keeper_config(VALIDIUM_L1_BATCH_COMMIT_DATA_GENERATOR_MODE),
-            expected_state_keeper_config(L1BatchCommitDataGeneratorMode::Validium),
+            expected_state_keeper_config(L1BatchCommitmentMode::Validium),
         );
     }
 
@@ -217,7 +218,7 @@ mod tests {
     fn default_state_keeper_mode() {
         assert_eq!(
             StateKeeperConfig::default().l1_batch_commit_data_generator_mode,
-            L1BatchCommitDataGeneratorMode::Rollup
+            L1BatchCommitmentMode::Rollup
         );
     }
 }
diff --git a/core/lib/env_config/src/da_dispatcher.rs b/core/lib/env_config/src/da_dispatcher.rs
new file mode 100644
index 000000000000..194e4185b286
--- /dev/null
+++ b/core/lib/env_config/src/da_dispatcher.rs
@@ -0,0 +1,44 @@
+use zksync_config::DADispatcherConfig;
+
+use crate::{envy_load, FromEnv};
+
+impl FromEnv for DADispatcherConfig {
+    fn from_env() -> anyhow::Result<Self> {
+        envy_load("da_dispatcher", "DA_DISPATCHER_")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use zksync_config::configs::da_dispatcher::DADispatcherConfig;
+
+    use super::*;
+    use crate::test_utils::EnvMutex;
+
+    static MUTEX: EnvMutex = EnvMutex::new();
+
+    fn expected_da_layer_config(
+        interval: u32,
+        rows_limit: u32,
+        max_retries: u16,
+    ) -> DADispatcherConfig {
+        DADispatcherConfig {
+            polling_interval_ms: Some(interval),
+            max_rows_to_dispatch: Some(rows_limit),
+            max_retries: Some(max_retries),
+        }
+    }
+
+    #[test]
+    fn from_env_da_dispatcher() {
+        let mut lock = MUTEX.lock();
+        let config = r#"
+            DA_DISPATCHER_POLLING_INTERVAL_MS=5000
+            DA_DISPATCHER_MAX_ROWS_TO_DISPATCH=60
+            DA_DISPATCHER_MAX_RETRIES=7
+        "#;
+        lock.set_env(config);
+        let actual = DADispatcherConfig::from_env().unwrap();
+        assert_eq!(actual, expected_da_layer_config(5000, 60, 7));
+    }
+}
diff --git a/core/lib/env_config/src/database.rs b/core/lib/env_config/src/database.rs
index daba8ef29c57..c067c96de73e 100644
--- a/core/lib/env_config/src/database.rs
+++ b/core/lib/env_config/src/database.rs
@@ -1,7 +1,7 @@
 use std::{env, error, str::FromStr};
 
 use anyhow::Context as _;
-use zksync_config::{DBConfig, PostgresConfig};
+use zksync_config::{configs::DatabaseSecrets, DBConfig, PostgresConfig};
 
 use crate::{envy_load, FromEnv};
 
@@ -29,22 +29,33 @@ impl FromEnv for DBConfig {
     }
 }
 
-impl FromEnv for PostgresConfig {
+impl FromEnv for DatabaseSecrets {
     fn from_env() -> anyhow::Result<Self> {
-        let master_url = env::var("DATABASE_URL")
+        let server_url = env::var("DATABASE_URL")
             .ok()
             .map(|s| s.parse())
             .transpose()?;
-        let replica_url = env::var("DATABASE_REPLICA_URL")
+        let server_replica_url = env::var("DATABASE_REPLICA_URL")
             .ok()
             .map(|s| s.parse())
             .transpose()?
-            .or_else(|| master_url.clone());
+            .or_else(|| server_url.clone());
         let prover_url = env::var("DATABASE_PROVER_URL")
             .ok()
             .map(|s| s.parse())
             .transpose()?
-            .or_else(|| master_url.clone());
+            .or_else(|| server_url.clone());
+
+        Ok(Self {
+            server_url,
+            prover_url,
+            server_replica_url,
+        })
+    }
+}
+
+impl FromEnv for PostgresConfig {
+    fn from_env() -> anyhow::Result<Self> {
         let test_server_url = env::var("TEST_DATABASE_URL").ok();
         let test_prover_url = env::var("TEST_DATABASE_PROVER_URL").ok();
         let max_connections = parse_optional_var("DATABASE_POOL_SIZE")?;
@@ -56,9 +67,6 @@ impl FromEnv for PostgresConfig {
         let slow_query_threshold_ms = parse_optional_var("DATABASE_SLOW_QUERY_THRESHOLD_MS")?;
 
         Ok(Self {
-            master_url,
-            replica_url,
-            prover_url,
             max_connections,
             max_connections_master,
             acquire_timeout_sec,
@@ -184,12 +192,6 @@ mod tests {
         lock.set_env(config);
 
         let postgres_config = PostgresConfig::from_env().unwrap();
-        assert_eq!(
-            postgres_config.master_url().unwrap(),
-            "postgres://postgres:notsecurepassword@localhost/zksync_local"
-                .parse()
-                .unwrap()
-        );
         assert_eq!(postgres_config.max_connections().unwrap(), 50);
         assert_eq!(
             postgres_config.statement_timeout(),
@@ -208,4 +210,34 @@ mod tests {
             Some(Duration::from_millis(150))
         );
     }
+    #[test]
+    fn database_secrets_from_env() {
+        let mut lock = MUTEX.lock();
+        let config = r#"
+            DATABASE_URL=postgres://postgres:notsecurepassword@localhost/zksync_local
+            DATABASE_REPLICA_URL=postgres://postgres:notsecurepassword@localhost/zksync_replica_local
+            DATABASE_PROVER_URL=postgres://postgres:notsecurepassword@localhost/zksync_prover_local
+        "#;
+        lock.set_env(config);
+
+        let postgres_config = DatabaseSecrets::from_env().unwrap();
+        assert_eq!(
+            postgres_config.replica_url().unwrap(),
+            "postgres://postgres:notsecurepassword@localhost/zksync_replica_local"
+                .parse()
+                .unwrap()
+        );
+        assert_eq!(
+            postgres_config.master_url().unwrap(),
+            "postgres://postgres:notsecurepassword@localhost/zksync_local"
+                .parse()
+                .unwrap()
+        );
+        assert_eq!(
+            postgres_config.prover_url().unwrap(),
+            "postgres://postgres:notsecurepassword@localhost/zksync_prover_local"
+                .parse()
+                .unwrap()
+        );
+    }
 }
diff --git a/core/lib/env_config/src/eth_sender.rs b/core/lib/env_config/src/eth_sender.rs
index 7f98ecf8fbe0..bd48f80609e8 100644
--- a/core/lib/env_config/src/eth_sender.rs
+++ b/core/lib/env_config/src/eth_sender.rs
@@ -1,6 +1,7 @@
 use anyhow::Context as _;
 use zksync_config::{
-    configs::eth_sender::SenderConfig, EthConfig, EthWatchConfig, GasAdjusterConfig,
+    configs::{eth_sender::SenderConfig, L1Secrets},
+    EthConfig, EthWatchConfig, GasAdjusterConfig,
 };
 
 use crate::{envy_load, FromEnv};
@@ -11,7 +12,14 @@ impl FromEnv for EthConfig {
             sender: SenderConfig::from_env().ok(),
             gas_adjuster: GasAdjusterConfig::from_env().ok(),
             watcher: EthWatchConfig::from_env().ok(),
-            web3_url: std::env::var("ETH_CLIENT_WEB3_URL")
+        })
+    }
+}
+
+impl FromEnv for L1Secrets {
+    fn from_env() -> anyhow::Result<Self> {
+        Ok(Self {
+            l1_rpc_url: std::env::var("ETH_CLIENT_WEB3_URL")
                 .context("ETH_CLIENT_WEB3_URL")?
                 .parse()
                 .context("ETH_CLIENT_WEB3_URL")?,
@@ -33,58 +41,59 @@ impl FromEnv for GasAdjusterConfig {
 
 #[cfg(test)]
 mod tests {
-    use zksync_config::configs::eth_sender::{
-        ProofLoadingMode, ProofSendingMode, PubdataSendingMode,
-    };
+    use zksync_config::configs::eth_sender::{ProofSendingMode, PubdataSendingMode};
 
     use super::*;
     use crate::test_utils::{hash, EnvMutex};
 
     static MUTEX: EnvMutex = EnvMutex::new();
 
-    fn expected_config() -> EthConfig {
-        EthConfig {
-            sender: Some(SenderConfig {
-                aggregated_proof_sizes: vec![1, 5],
-                aggregated_block_commit_deadline: 30,
-                aggregated_block_prove_deadline: 3_000,
-                aggregated_block_execute_deadline: 4_000,
-                max_aggregated_tx_gas: 4_000_000,
-                max_eth_tx_data_size: 120_000,
+    fn expected_config() -> (EthConfig, L1Secrets) {
+        (
+            EthConfig {
+                sender: Some(SenderConfig {
+                    aggregated_proof_sizes: vec![1, 5],
+                    aggregated_block_commit_deadline: 30,
+                    aggregated_block_prove_deadline: 3_000,
+                    aggregated_block_execute_deadline: 4_000,
+                    max_aggregated_tx_gas: 4_000_000,
+                    max_eth_tx_data_size: 120_000,
 
-                timestamp_criteria_max_allowed_lag: 30,
-                max_aggregated_blocks_to_commit: 3,
-                max_aggregated_blocks_to_execute: 4,
-                wait_confirmations: Some(1),
-                tx_poll_period: 3,
-                aggregate_tx_poll_period: 3,
-                max_txs_in_flight: 3,
-                proof_sending_mode: ProofSendingMode::SkipEveryProof,
-                l1_batch_min_age_before_execute_seconds: Some(1000),
-                max_acceptable_priority_fee_in_gwei: 100_000_000_000,
-                proof_loading_mode: ProofLoadingMode::OldProofFromDb,
-                pubdata_sending_mode: PubdataSendingMode::Calldata,
-            }),
-            gas_adjuster: Some(GasAdjusterConfig {
-                default_priority_fee_per_gas: 20000000000,
-                max_base_fee_samples: 10000,
-                pricing_formula_parameter_a: 1.5,
-                pricing_formula_parameter_b: 1.0005,
-                internal_l1_pricing_multiplier: 0.8,
-                internal_enforced_l1_gas_price: None,
-                internal_enforced_pubdata_price: None,
-                poll_period: 15,
-                max_l1_gas_price: Some(100000000),
-                num_samples_for_blob_base_fee_estimate: 10,
-                internal_pubdata_pricing_multiplier: 1.0,
-                max_blob_base_fee: None,
-            }),
-            watcher: Some(EthWatchConfig {
-                confirmations_for_eth_event: Some(0),
-                eth_node_poll_interval: 300,
-            }),
-            web3_url: "http://127.0.0.1:8545".parse().unwrap(),
-        }
+                    timestamp_criteria_max_allowed_lag: 30,
+                    max_aggregated_blocks_to_commit: 3,
+                    max_aggregated_blocks_to_execute: 4,
+                    wait_confirmations: Some(1),
+                    tx_poll_period: 3,
+                    aggregate_tx_poll_period: 3,
+                    max_txs_in_flight: 3,
+                    proof_sending_mode: ProofSendingMode::SkipEveryProof,
+                    l1_batch_min_age_before_execute_seconds: Some(1000),
+                    max_acceptable_priority_fee_in_gwei: 100_000_000_000,
+                    pubdata_sending_mode: PubdataSendingMode::Calldata,
+                }),
+                gas_adjuster: Some(GasAdjusterConfig {
+                    default_priority_fee_per_gas: 20000000000,
+                    max_base_fee_samples: 10000,
+                    pricing_formula_parameter_a: 1.5,
+                    pricing_formula_parameter_b: 1.0005,
+                    internal_l1_pricing_multiplier: 0.8,
+                    internal_enforced_l1_gas_price: None,
+                    internal_enforced_pubdata_price: None,
+                    poll_period: 15,
+                    max_l1_gas_price: Some(100000000),
+                    num_samples_for_blob_base_fee_estimate: 10,
+                    internal_pubdata_pricing_multiplier: 1.0,
+                    max_blob_base_fee: None,
+                }),
+                watcher: Some(EthWatchConfig {
+                    confirmations_for_eth_event: Some(0),
+                    eth_node_poll_interval: 300,
+                }),
+            },
+            L1Secrets {
+                l1_rpc_url: "http://127.0.0.1:8545".to_string().parse().unwrap(),
+            },
+        )
     }
 
     #[test]
@@ -121,7 +130,6 @@ mod tests {
             ETH_SENDER_SENDER_MAX_ETH_TX_DATA_SIZE="120000"
             ETH_SENDER_SENDER_L1_BATCH_MIN_AGE_BEFORE_EXECUTE_SECONDS="1000"
             ETH_SENDER_SENDER_MAX_ACCEPTABLE_PRIORITY_FEE_IN_GWEI="100000000000"
-            ETH_SENDER_SENDER_PROOF_LOADING_MODE="OldProofFromDb"
             ETH_SENDER_SENDER_PUBDATA_SENDING_MODE="Calldata"
             ETH_CLIENT_WEB3_URL="http://127.0.0.1:8545"
 
@@ -129,7 +137,7 @@ mod tests {
         lock.set_env(config);
 
         let actual = EthConfig::from_env().unwrap();
-        assert_eq!(actual, expected_config());
+        assert_eq!(actual, expected_config().0);
         let private_key = actual
             .sender
             .unwrap()
@@ -140,5 +148,7 @@ mod tests {
             private_key.expose_secret().secret_bytes(),
             hash("27593fea79697e947890ecbecce7901b0008345e5d7259710d0dd5e500d040be").as_bytes()
         );
+        let actual = L1Secrets::from_env().unwrap();
+        assert_eq!(actual, expected_config().1);
     }
 }
diff --git a/core/lib/env_config/src/fri_prover.rs b/core/lib/env_config/src/fri_prover.rs
index b9cb25ef3c4a..96069d6514ea 100644
--- a/core/lib/env_config/src/fri_prover.rs
+++ b/core/lib/env_config/src/fri_prover.rs
@@ -1,11 +1,16 @@
-use zksync_config::{configs::FriProverConfig, ObjectStoreConfig};
+use zksync_config::configs::FriProverConfig;
 
-use crate::{envy_load, FromEnv};
+use crate::{
+    envy_load,
+    object_store::{ProverObjectStoreConfig, PublicObjectStoreConfig},
+    FromEnv,
+};
 
 impl FromEnv for FriProverConfig {
     fn from_env() -> anyhow::Result<Self> {
         let mut prover: FriProverConfig = envy_load("fri_prover", "FRI_PROVER_")?;
-        prover.object_store = ObjectStoreConfig::from_env().ok();
+        prover.prover_object_store = ProverObjectStoreConfig::from_env().map(|a| a.0).ok();
+        prover.public_object_store = PublicObjectStoreConfig::from_env().map(|a| a.0).ok();
         Ok(prover)
     }
 }
@@ -35,12 +40,21 @@ mod tests {
             zone_read_url: "http://metadata.google.internal/computeMetadata/v1/instance/zone"
                 .to_string(),
             shall_save_to_public_bucket: true,
-            object_store: Some(ObjectStoreConfig {
+            prover_object_store: Some(ObjectStoreConfig {
                 mode: ObjectStoreMode::GCSWithCredentialFile {
                     bucket_base_url: "/base/url".to_owned(),
-                    gcs_credential_file_path: "/path/to/credentials.json".to_owned(),
+                    gcs_credential_file_path: "/path/to/credentials1.json".to_owned(),
                 },
                 max_retries: 5,
+                local_mirror_path: None,
+            }),
+            public_object_store: Some(ObjectStoreConfig {
+                mode: ObjectStoreMode::GCSWithCredentialFile {
+                    bucket_base_url: "/base/url".to_owned(),
+                    gcs_credential_file_path: "/path/to/credentials2.json".to_owned(),
+                },
+                max_retries: 5,
+                local_mirror_path: None,
             }),
             availability_check_interval_in_secs: Some(1_800),
         }
@@ -61,11 +75,14 @@ mod tests {
             FRI_PROVER_ZONE_READ_URL="http://metadata.google.internal/computeMetadata/v1/instance/zone"
             FRI_PROVER_SHALL_SAVE_TO_PUBLIC_BUCKET=true
             FRI_PROVER_AVAILABILITY_CHECK_INTERVAL_IN_SECS="1800"
-            OBJECT_STORE_BUCKET_BASE_URL="/base/url"
-            OBJECT_STORE_MODE="GCSWithCredentialFile"
-            OBJECT_STORE_GCS_CREDENTIAL_FILE_PATH="/path/to/credentials.json"
-            OBJECT_STORE_MAX_RETRIES="5"
-
+            PROVER_OBJECT_STORE_BUCKET_BASE_URL="/base/url"
+            PROVER_OBJECT_STORE_MODE="GCSWithCredentialFile"
+            PROVER_OBJECT_STORE_GCS_CREDENTIAL_FILE_PATH="/path/to/credentials1.json"
+            PROVER_OBJECT_STORE_MAX_RETRIES="5"
+            PUBLIC_OBJECT_STORE_BUCKET_BASE_URL="/base/url"
+            PUBLIC_OBJECT_STORE_MODE="GCSWithCredentialFile"
+            PUBLIC_OBJECT_STORE_GCS_CREDENTIAL_FILE_PATH="/path/to/credentials2.json"
+            PUBLIC_OBJECT_STORE_MAX_RETRIES="5"
         "#;
         lock.set_env(config);
 
diff --git a/core/lib/env_config/src/genesis.rs b/core/lib/env_config/src/genesis.rs
index cf9a48d3ca92..646ad0dba757 100644
--- a/core/lib/env_config/src/genesis.rs
+++ b/core/lib/env_config/src/genesis.rs
@@ -1,6 +1,6 @@
 use anyhow::Context;
 use serde::{Deserialize, Serialize};
-use zksync_basic_types::{Address, H256};
+use zksync_basic_types::{protocol_version::ProtocolSemanticVersion, Address, H256};
 use zksync_config::{
     configs::chain::{NetworkConfig, StateKeeperConfig},
     GenesisConfig,
@@ -16,6 +16,7 @@ struct ContractsForGenesis {
     pub genesis_rollup_leaf_index: Option<u64>,
     pub genesis_batch_commitment: Option<H256>,
     pub genesis_protocol_version: Option<u16>,
+    pub genesis_protocol_semantic_version: Option<ProtocolSemanticVersion>,
     pub fri_recursion_scheduler_level_vk_hash: H256,
     pub fri_recursion_node_level_vk_hash: H256,
     pub fri_recursion_leaf_level_vk_hash: H256,
@@ -45,9 +46,23 @@ impl FromEnv for GenesisConfig {
         let contracts_config = &ContractsForGenesis::from_env()?;
         let state_keeper = StateKeeperConfig::from_env()?;
 
+        // This is needed for backward compatibility, so if the new variable `genesis_protocol_semantic_version`
+        // wasn't added yet server could still work. TODO: remove it in the next release.
+        let protocol_version_deprecated = contracts_config
+            .genesis_protocol_version
+            .map(|minor| {
+                minor.try_into().map(|minor| ProtocolSemanticVersion {
+                    minor,
+                    patch: 0.into(),
+                })
+            })
+            .transpose()?;
+
         #[allow(deprecated)]
         Ok(GenesisConfig {
-            protocol_version: contracts_config.genesis_protocol_version,
+            protocol_version: contracts_config
+                .genesis_protocol_semantic_version
+                .or(protocol_version_deprecated),
             genesis_root_hash: contracts_config.genesis_root,
             rollup_last_leaf_index: contracts_config.genesis_rollup_leaf_index,
             genesis_commitment: contracts_config.genesis_batch_commitment,
diff --git a/core/lib/env_config/src/lib.rs b/core/lib/env_config/src/lib.rs
index f6290020f38d..bd7aa035b68b 100644
--- a/core/lib/env_config/src/lib.rs
+++ b/core/lib/env_config/src/lib.rs
@@ -21,9 +21,12 @@ mod proof_data_handler;
 mod snapshots_creator;
 mod utils;
 
+mod base_token_adjuster;
+mod da_dispatcher;
 mod genesis;
 #[cfg(test)]
 mod test_utils;
+mod vm_runner;
 mod wallets;
 
 pub trait FromEnv: Sized {
diff --git a/core/lib/env_config/src/object_store.rs b/core/lib/env_config/src/object_store.rs
index e9d31093c68c..a5881473b351 100644
--- a/core/lib/env_config/src/object_store.rs
+++ b/core/lib/env_config/src/object_store.rs
@@ -56,6 +56,7 @@ mod tests {
                 gcs_credential_file_path: "/path/to/credentials.json".to_owned(),
             },
             max_retries: 5,
+            local_mirror_path: Some("/var/cache".to_owned()),
         }
     }
 
@@ -67,6 +68,7 @@ mod tests {
             OBJECT_STORE_MODE="GCSWithCredentialFile"
             OBJECT_STORE_GCS_CREDENTIAL_FILE_PATH="/path/to/credentials.json"
             OBJECT_STORE_MAX_RETRIES="5"
+            OBJECT_STORE_LOCAL_MIRROR_PATH="/var/cache"
         "#;
         lock.set_env(config);
         let actual = ObjectStoreConfig::from_env().unwrap();
@@ -117,6 +119,7 @@ mod tests {
             PROVER_OBJECT_STORE_MODE="GCSWithCredentialFile"
             PROVER_OBJECT_STORE_GCS_CREDENTIAL_FILE_PATH="/path/to/credentials.json"
             PROVER_OBJECT_STORE_MAX_RETRIES="5"
+            PROVER_OBJECT_STORE_LOCAL_MIRROR_PATH="/var/cache"
         "#;
         lock.set_env(config);
         let actual = ProverObjectStoreConfig::from_env().unwrap().0;
diff --git a/core/lib/env_config/src/observability.rs b/core/lib/env_config/src/observability.rs
index e76849fc428d..3463ee189957 100644
--- a/core/lib/env_config/src/observability.rs
+++ b/core/lib/env_config/src/observability.rs
@@ -39,10 +39,6 @@ impl FromEnv for ObservabilityConfig {
             (Some(level), Some(endpoint)) => Some(OpentelemetryConfig { level, endpoint }),
             _ => None,
         };
-        let sporadic_crypto_errors_substrs = std::env::var("ALERTS_SPORADIC_CRYPTO_ERRORS_SUBSTRS")
-            .ok()
-            .map(|a| a.split(',').map(|a| a.to_string()).collect())
-            .unwrap_or_default();
 
         let log_directives = std::env::var("RUST_LOG").ok();
 
@@ -51,7 +47,6 @@ impl FromEnv for ObservabilityConfig {
             sentry_environment,
             log_format,
             opentelemetry,
-            sporadic_crypto_errors_substrs,
             log_directives,
         })
     }
diff --git a/core/lib/env_config/src/proof_data_handler.rs b/core/lib/env_config/src/proof_data_handler.rs
index 53bbeb42ee6a..f69aa1d6dc59 100644
--- a/core/lib/env_config/src/proof_data_handler.rs
+++ b/core/lib/env_config/src/proof_data_handler.rs
@@ -19,6 +19,7 @@ mod tests {
         ProofDataHandlerConfig {
             http_port: 3320,
             proof_generation_timeout_in_secs: 18000,
+            tee_support: true,
         }
     }
 
@@ -27,6 +28,7 @@ mod tests {
         let config = r#"
             PROOF_DATA_HANDLER_PROOF_GENERATION_TIMEOUT_IN_SECS="18000"
             PROOF_DATA_HANDLER_HTTP_PORT="3320"
+            PROOF_DATA_HANDLER_TEE_SUPPORT="true"
         "#;
         let mut lock = MUTEX.lock();
         lock.set_env(config);
diff --git a/core/lib/env_config/src/vm_runner.rs b/core/lib/env_config/src/vm_runner.rs
new file mode 100644
index 000000000000..8a99ea2dc8e2
--- /dev/null
+++ b/core/lib/env_config/src/vm_runner.rs
@@ -0,0 +1,9 @@
+use zksync_config::configs::ProtectiveReadsWriterConfig;
+
+use crate::{envy_load, FromEnv};
+
+impl FromEnv for ProtectiveReadsWriterConfig {
+    fn from_env() -> anyhow::Result<Self> {
+        envy_load("vm_runner.protective_reads", "VM_RUNNER_PROTECTIVE_READS_")
+    }
+}
diff --git a/core/lib/eth_client/Cargo.toml b/core/lib/eth_client/Cargo.toml
index 24041e77f838..72d92f2ce48f 100644
--- a/core/lib/eth_client/Cargo.toml
+++ b/core/lib/eth_client/Cargo.toml
@@ -15,6 +15,7 @@ zksync_types.workspace = true
 zksync_eth_signer.workspace = true
 zksync_config.workspace = true
 zksync_contracts.workspace = true
+zksync_web3_decl.workspace = true
 
 thiserror.workspace = true
 async-trait.workspace = true
@@ -26,7 +27,7 @@ tracing.workspace = true
 rlp.workspace = true
 
 [dev-dependencies]
-static_assertions.workspace = true
+assert_matches.workspace = true
 tokio = { workspace = true, features = ["full"] }
 pretty_assertions.workspace = true
 hex.workspace = true
diff --git a/core/lib/eth_client/src/clients/http/decl.rs b/core/lib/eth_client/src/clients/http/decl.rs
index 7887e1bdee09..77cc1c841e1b 100644
--- a/core/lib/eth_client/src/clients/http/decl.rs
+++ b/core/lib/eth_client/src/clients/http/decl.rs
@@ -1,8 +1,9 @@
 use jsonrpsee::proc_macros::rpc;
 use zksync_types::{web3, Address, H256, U256, U64};
+use zksync_web3_decl::client::{ForNetwork, L1};
 
 /// Subset of the L1 `eth` namespace used by the L1 client.
-#[rpc(client, namespace = "eth")]
+#[rpc(client, namespace = "eth", client_bounds(Self: ForNetwork<Net = L1>))]
 pub(super) trait L1EthNamespace {
     #[method(name = "chainId")]
     async fn chain_id(&self) -> RpcResult<U256>;
diff --git a/core/lib/eth_client/src/clients/http/mod.rs b/core/lib/eth_client/src/clients/http/mod.rs
index bfdf2129a5e7..2d1ed244afd4 100644
--- a/core/lib/eth_client/src/clients/http/mod.rs
+++ b/core/lib/eth_client/src/clients/http/mod.rs
@@ -4,10 +4,7 @@ use vise::{
     Buckets, Counter, EncodeLabelSet, EncodeLabelValue, Family, Histogram, LabeledFamily, Metrics,
 };
 
-pub use self::{
-    query::QueryClient,
-    signing::{PKSigningClient, SigningClient},
-};
+pub use self::signing::{PKSigningClient, SigningClient};
 
 mod decl;
 mod query;
diff --git a/core/lib/eth_client/src/clients/http/query.rs b/core/lib/eth_client/src/clients/http/query.rs
index 922248487e09..1dee9fb0fda5 100644
--- a/core/lib/eth_client/src/clients/http/query.rs
+++ b/core/lib/eth_client/src/clients/http/query.rs
@@ -1,63 +1,29 @@
 use std::fmt;
 
 use async_trait::async_trait;
-use jsonrpsee::{core::ClientError, http_client::HttpClient};
-use zksync_types::{url::SensitiveUrl, web3, Address, L1ChainId, H256, U256, U64};
+use jsonrpsee::core::ClientError;
+use zksync_types::{web3, Address, L1ChainId, H256, U256, U64};
+use zksync_web3_decl::error::{ClientRpcContext, EnrichedClientError, EnrichedClientResult};
 
 use super::{decl::L1EthNamespaceClient, Method, COUNTERS, LATENCIES};
 use crate::{
-    types::{Error, ExecutedTxStatus, FailureInfo},
-    EthInterface, RawTransactionBytes,
+    types::{ExecutedTxStatus, FailureInfo},
+    BaseFees, EthInterface, RawTransactionBytes,
 };
 
-/// An "anonymous" Ethereum client that can invoke read-only methods that aren't
-/// tied to a particular account.
-#[derive(Clone)]
-pub struct QueryClient {
-    web3: HttpClient,
-    url: SensitiveUrl,
-    component: &'static str,
-}
-
-impl fmt::Debug for QueryClient {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter
-            .debug_struct("QueryClient")
-            .field("url", &self.url)
-            .field("component", &self.component)
-            .finish()
-    }
-}
-
-impl QueryClient {
-    /// Creates a new HTTP client.
-    pub fn new(url: SensitiveUrl) -> Result<Self, Error> {
-        Ok(Self {
-            web3: <HttpClient>::builder().build(url.expose_str())?,
-            url,
-            component: "",
-        })
-    }
-}
-
 #[async_trait]
-impl EthInterface for QueryClient {
-    fn clone_boxed(&self) -> Box<dyn EthInterface> {
-        Box::new(self.clone())
-    }
-
-    fn for_component(mut self: Box<Self>, component_name: &'static str) -> Box<dyn EthInterface> {
-        self.component = component_name;
-        self
-    }
-
-    async fn fetch_chain_id(&self) -> Result<L1ChainId, Error> {
-        COUNTERS.call[&(Method::ChainId, self.component)].inc();
+impl<T> EthInterface for T
+where
+    T: L1EthNamespaceClient + fmt::Debug + Send + Sync,
+{
+    async fn fetch_chain_id(&self) -> EnrichedClientResult<L1ChainId> {
+        COUNTERS.call[&(Method::ChainId, self.component())].inc();
         let latency = LATENCIES.direct[&Method::ChainId].start();
-        let raw_chain_id = self.web3.chain_id().await?;
+        let raw_chain_id = self.chain_id().rpc_context("chain_id").await?;
         latency.observe();
         let chain_id = u64::try_from(raw_chain_id).map_err(|err| {
-            Error::EthereumGateway(ClientError::Custom(format!("invalid chainId: {err}")))
+            let err = ClientError::Custom(format!("invalid chainId: {err}"));
+            EnrichedClientError::new(err, "chain_id").with_arg("chain_id", &raw_chain_id)
         })?;
         Ok(L1ChainId(chain_id))
     }
@@ -66,33 +32,44 @@ impl EthInterface for QueryClient {
         &self,
         account: Address,
         block: web3::BlockNumber,
-    ) -> Result<U256, Error> {
-        COUNTERS.call[&(Method::NonceAtForAccount, self.component)].inc();
+    ) -> EnrichedClientResult<U256> {
+        COUNTERS.call[&(Method::NonceAtForAccount, self.component())].inc();
         let latency = LATENCIES.direct[&Method::NonceAtForAccount].start();
-        let nonce = self.web3.get_transaction_count(account, block).await?;
+        let nonce = self
+            .get_transaction_count(account, block)
+            .rpc_context("get_transaction_count")
+            .with_arg("account", &account)
+            .with_arg("block", &block)
+            .await?;
         latency.observe();
         Ok(nonce)
     }
 
-    async fn block_number(&self) -> Result<U64, Error> {
-        COUNTERS.call[&(Method::BlockNumber, self.component)].inc();
+    async fn block_number(&self) -> EnrichedClientResult<U64> {
+        COUNTERS.call[&(Method::BlockNumber, self.component())].inc();
         let latency = LATENCIES.direct[&Method::BlockNumber].start();
-        let block_number = self.web3.get_block_number().await?;
+        let block_number = self
+            .get_block_number()
+            .rpc_context("get_block_number")
+            .await?;
         latency.observe();
         Ok(block_number)
     }
 
-    async fn get_gas_price(&self) -> Result<U256, Error> {
-        COUNTERS.call[&(Method::GetGasPrice, self.component)].inc();
+    async fn get_gas_price(&self) -> EnrichedClientResult<U256> {
+        COUNTERS.call[&(Method::GetGasPrice, self.component())].inc();
         let latency = LATENCIES.direct[&Method::GetGasPrice].start();
-        let network_gas_price = self.web3.gas_price().await?;
+        let network_gas_price = self.gas_price().rpc_context("gas_price").await?;
         latency.observe();
         Ok(network_gas_price)
     }
 
-    async fn send_raw_tx(&self, tx: RawTransactionBytes) -> Result<H256, Error> {
+    async fn send_raw_tx(&self, tx: RawTransactionBytes) -> EnrichedClientResult<H256> {
         let latency = LATENCIES.direct[&Method::SendRawTx].start();
-        let tx = self.web3.send_raw_transaction(web3::Bytes(tx.0)).await?;
+        let tx = self
+            .send_raw_transaction(web3::Bytes(tx.0))
+            .rpc_context("send_raw_transaction")
+            .await?;
         latency.observe();
         Ok(tx)
     }
@@ -101,10 +78,18 @@ impl EthInterface for QueryClient {
         &self,
         upto_block: usize,
         block_count: usize,
-    ) -> Result<Vec<u64>, Error> {
+    ) -> EnrichedClientResult<Vec<BaseFees>> {
+        // Non-panicking conversion to u64.
+        fn cast_to_u64(value: U256, tag: &str) -> EnrichedClientResult<u64> {
+            u64::try_from(value).map_err(|_| {
+                let err = ClientError::Custom(format!("{tag} value does not fit in u64"));
+                EnrichedClientError::new(err, "cast_to_u64").with_arg("value", &value)
+            })
+        }
+
         const MAX_REQUEST_CHUNK: usize = 1024;
 
-        COUNTERS.call[&(Method::BaseFeeHistory, self.component)].inc();
+        COUNTERS.call[&(Method::BaseFeeHistory, self.component())].inc();
         let latency = LATENCIES.direct[&Method::BaseFeeHistory].start();
         let mut history = Vec::with_capacity(block_count);
         let from_block = upto_block.saturating_sub(block_count);
@@ -117,46 +102,76 @@ impl EthInterface for QueryClient {
             let chunk_size = chunk_end - chunk_start;
 
             let fee_history = self
-                .web3
                 .fee_history(
                     U64::from(chunk_size),
                     web3::BlockNumber::from(chunk_end),
                     None,
                 )
+                .rpc_context("fee_history")
+                .with_arg("chunk_size", &chunk_size)
+                .with_arg("block", &chunk_end)
                 .await?;
-            history.extend(fee_history.base_fee_per_gas);
+
+            // Check that the lengths are the same.
+            // Per specification, the values should always be provided, and must be 0 for blocks
+            // prior to EIP-4844.
+            // https://ethereum.github.io/execution-apis/api-documentation/
+            if fee_history.base_fee_per_gas.len() != fee_history.base_fee_per_blob_gas.len() {
+                tracing::error!(
+                    "base_fee_per_gas and base_fee_per_blob_gas have different lengths: {} and {}",
+                    fee_history.base_fee_per_gas.len(),
+                    fee_history.base_fee_per_blob_gas.len()
+                );
+            }
+
+            for (base, blob) in fee_history
+                .base_fee_per_gas
+                .into_iter()
+                .zip(fee_history.base_fee_per_blob_gas)
+            {
+                let fees = BaseFees {
+                    base_fee_per_gas: cast_to_u64(base, "base_fee_per_gas")?,
+                    base_fee_per_blob_gas: blob,
+                };
+                history.push(fees)
+            }
         }
 
         latency.observe();
-        Ok(history.into_iter().map(|fee| fee.as_u64()).collect())
+        Ok(history)
     }
 
-    async fn get_pending_block_base_fee_per_gas(&self) -> Result<U256, Error> {
-        COUNTERS.call[&(Method::PendingBlockBaseFee, self.component)].inc();
+    async fn get_pending_block_base_fee_per_gas(&self) -> EnrichedClientResult<U256> {
+        COUNTERS.call[&(Method::PendingBlockBaseFee, self.component())].inc();
         let latency = LATENCIES.direct[&Method::PendingBlockBaseFee].start();
 
         let block = self
-            .web3
             .get_block_by_number(web3::BlockNumber::Pending, false)
+            .rpc_context("get_block_by_number")
+            .with_arg("number", &web3::BlockNumber::Pending)
+            .with_arg("with_transactions", &false)
             .await?;
         let block = if let Some(block) = block {
             block
         } else {
             // Fallback for local reth. Because of artificial nature of producing blocks in local reth setup
             // there may be no pending block
-            self.web3
-                .get_block_by_number(web3::BlockNumber::Latest, false)
+            self.get_block_by_number(web3::BlockNumber::Latest, false)
+                .rpc_context("get_block_by_number")
+                .with_arg("number", &web3::BlockNumber::Latest)
+                .with_arg("with_transactions", &false)
                 .await?
                 .expect("Latest block always exists")
         };
 
         latency.observe();
+
         // base_fee_per_gas always exists after London fork
         Ok(block.base_fee_per_gas.unwrap())
     }
 
-    async fn get_tx_status(&self, hash: H256) -> Result<Option<ExecutedTxStatus>, Error> {
-        COUNTERS.call[&(Method::GetTxStatus, self.component)].inc();
+    async fn get_tx_status(&self, hash: H256) -> EnrichedClientResult<Option<ExecutedTxStatus>> {
+        COUNTERS.call[&(Method::GetTxStatus, self.component())].inc();
         let latency = LATENCIES.direct[&Method::GetTxStatus].start();
 
         let receipt = self.tx_receipt(hash).await?;
@@ -177,10 +192,18 @@ impl EthInterface for QueryClient {
         Ok(res)
     }
 
-    async fn failure_reason(&self, tx_hash: H256) -> Result<Option<FailureInfo>, Error> {
+    async fn failure_reason(&self, tx_hash: H256) -> EnrichedClientResult<Option<FailureInfo>> {
         let latency = LATENCIES.direct[&Method::FailureReason].start();
-        let transaction = self.web3.get_transaction_by_hash(tx_hash).await?;
-        let receipt = self.web3.get_transaction_receipt(tx_hash).await?;
+        let transaction = self
+            .get_transaction_by_hash(tx_hash)
+            .rpc_context("failure_reason#get_transaction_by_hash")
+            .with_arg("hash", &tx_hash)
+            .await?;
+        let receipt = self
+            .get_transaction_receipt(tx_hash)
+            .rpc_context("failure_reason#get_transaction_receipt")
+            .with_arg("hash", &tx_hash)
+            .await?;
 
         match (transaction, receipt) {
             (Some(transaction), Some(receipt)) => {
@@ -203,24 +226,32 @@ impl EthInterface for QueryClient {
                 let block_number = receipt
                     .block_number
                     .map_or_else(|| web3::BlockNumber::Latest.into(), Into::into);
-                let err = self.web3.call(call_request, block_number).await.err();
-
-                let failure_info = match err {
-                    Some(ClientError::Call(call_err)) => {
-                        let revert_code = call_err.code().into();
-                        let message_len =
-                            "execution reverted: ".len().min(call_err.message().len());
-                        let revert_reason = call_err.message()[message_len..].to_string();
-
-                        Ok(Some(FailureInfo {
-                            revert_code,
-                            revert_reason,
-                            gas_used,
-                            gas_limit,
-                        }))
+                let result = self
+                    .call(call_request.clone(), block_number)
+                    .rpc_context("failure_reason#call")
+                    .with_arg("call_request", &call_request)
+                    .with_arg("block_number", &block_number)
+                    .await;
+
+                let failure_info = match result {
+                    Err(err) => {
+                        if let ClientError::Call(call_err) = err.as_ref() {
+                            let revert_code = call_err.code().into();
+                            let message_len =
+                                "execution reverted: ".len().min(call_err.message().len());
+                            let revert_reason = call_err.message()[message_len..].to_string();
+
+                            Ok(Some(FailureInfo {
+                                revert_code,
+                                revert_reason,
+                                gas_used,
+                                gas_limit,
+                            }))
+                        } else {
+                            Err(err)
+                        }
                     }
-                    Some(err) => Err(err.into()),
-                    None => Ok(None),
+                    Ok(_) => Ok(None),
                 };
 
                 latency.observe();
@@ -230,9 +261,13 @@ impl EthInterface for QueryClient {
         }
     }
 
-    async fn get_tx(&self, hash: H256) -> Result<Option<web3::Transaction>, Error> {
-        COUNTERS.call[&(Method::GetTx, self.component)].inc();
-        let tx = self.web3.get_transaction_by_hash(hash).await?;
+    async fn get_tx(&self, hash: H256) -> EnrichedClientResult<Option<web3::Transaction>> {
+        COUNTERS.call[&(Method::GetTx, self.component())].inc();
+        let tx = self
+            .get_transaction_by_hash(hash)
+            .rpc_context("get_transaction_by_hash")
+            .with_arg("hash", &hash)
+            .await?;
         Ok(tx)
     }
 
@@ -240,47 +275,79 @@ impl EthInterface for QueryClient {
         &self,
         request: web3::CallRequest,
         block: Option<web3::BlockId>,
-    ) -> Result<web3::Bytes, Error> {
+    ) -> EnrichedClientResult<web3::Bytes> {
         let latency = LATENCIES.direct[&Method::CallContractFunction].start();
         let block = block.unwrap_or_else(|| web3::BlockNumber::Latest.into());
-        let output_bytes = self.web3.call(request, block).await?;
+        let output_bytes = self
+            .call(request.clone(), block)
+            .rpc_context("call")
+            .with_arg("request", &request)
+            .with_arg("block", &block)
+            .await?;
         latency.observe();
         Ok(output_bytes)
     }
 
-    async fn tx_receipt(&self, tx_hash: H256) -> Result<Option<web3::TransactionReceipt>, Error> {
-        COUNTERS.call[&(Method::TxReceipt, self.component)].inc();
+    async fn tx_receipt(
+        &self,
+        tx_hash: H256,
+    ) -> EnrichedClientResult<Option<web3::TransactionReceipt>> {
+        COUNTERS.call[&(Method::TxReceipt, self.component())].inc();
         let latency = LATENCIES.direct[&Method::TxReceipt].start();
-        let receipt = self.web3.get_transaction_receipt(tx_hash).await?;
+        let receipt = self
+            .get_transaction_receipt(tx_hash)
+            .rpc_context("get_transaction_receipt")
+            .with_arg("hash", &tx_hash)
+            .await?;
         latency.observe();
         Ok(receipt)
     }
 
-    async fn eth_balance(&self, address: Address) -> Result<U256, Error> {
-        COUNTERS.call[&(Method::EthBalance, self.component)].inc();
+    async fn eth_balance(&self, address: Address) -> EnrichedClientResult<U256> {
+        COUNTERS.call[&(Method::EthBalance, self.component())].inc();
         let latency = LATENCIES.direct[&Method::EthBalance].start();
         let balance = self
-            .web3
             .get_balance(address, web3::BlockNumber::Latest)
+            .rpc_context("get_balance")
+            .with_arg("address", &address)
             .await?;
         latency.observe();
         Ok(balance)
     }
 
-    async fn logs(&self, filter: web3::Filter) -> Result<Vec<web3::Log>, Error> {
-        COUNTERS.call[&(Method::Logs, self.component)].inc();
+    async fn logs(&self, filter: &web3::Filter) -> EnrichedClientResult<Vec<web3::Log>> {
+        COUNTERS.call[&(Method::Logs, self.component())].inc();
         let latency = LATENCIES.direct[&Method::Logs].start();
-        let logs = self.web3.get_logs(filter).await?;
+        let logs = self
+            .get_logs(filter.clone())
+            .rpc_context("get_logs")
+            .with_arg("filter", filter)
+            .await?;
         latency.observe();
         Ok(logs)
     }
 
-    async fn block(&self, block_id: web3::BlockId) -> Result<Option<web3::Block<H256>>, Error> {
-        COUNTERS.call[&(Method::Block, self.component)].inc();
+    async fn block(
+        &self,
+        block_id: web3::BlockId,
+    ) -> EnrichedClientResult<Option<web3::Block<H256>>> {
+        COUNTERS.call[&(Method::Block, self.component())].inc();
         let latency = LATENCIES.direct[&Method::Block].start();
         let block = match block_id {
-            web3::BlockId::Hash(hash) => self.web3.get_block_by_hash(hash, false).await?,
-            web3::BlockId::Number(num) => self.web3.get_block_by_number(num, false).await?,
+            web3::BlockId::Hash(hash) => {
+                self.get_block_by_hash(hash, false)
+                    .rpc_context("get_block_by_hash")
+                    .with_arg("hash", &hash)
+                    .with_arg("with_transactions", &false)
+                    .await?
+            }
+            web3::BlockId::Number(num) => {
+                self.get_block_by_number(num, false)
+                    .rpc_context("get_block_by_number")
+                    .with_arg("number", &num)
+                    .with_arg("with_transactions", &false)
+                    .await?
+            }
         };
         latency.observe();
         Ok(block)
diff --git a/core/lib/eth_client/src/clients/http/signing.rs b/core/lib/eth_client/src/clients/http/signing.rs
index 816545dbecd9..2b89af97a773 100644
--- a/core/lib/eth_client/src/clients/http/signing.rs
+++ b/core/lib/eth_client/src/clients/http/signing.rs
@@ -6,10 +6,11 @@ use zksync_eth_signer::{EthereumSigner, PrivateKeySigner, TransactionParameters}
 use zksync_types::{
     ethabi, web3, Address, K256PrivateKey, L1ChainId, EIP_4844_TX_TYPE, H160, U256,
 };
+use zksync_web3_decl::client::{DynClient, L1};
 
 use super::{Method, LATENCIES};
 use crate::{
-    types::{encode_blob_tx_with_sidecar, Error, SignedCallResult},
+    types::{encode_blob_tx_with_sidecar, ContractCallError, SignedCallResult, SigningError},
     BoundEthInterface, CallFunctionArgs, EthInterface, Options, RawTransactionBytes,
 };
 
@@ -22,7 +23,7 @@ impl PKSigningClient {
         diamond_proxy_addr: Address,
         default_priority_fee_per_gas: u64,
         l1_chain_id: L1ChainId,
-        query_client: Box<dyn EthInterface>,
+        query_client: Box<DynClient<L1>>,
     ) -> Self {
         let operator_address = operator_private_key.address();
         let signer = PrivateKeySigner::new(operator_private_key);
@@ -49,7 +50,7 @@ const FALLBACK_GAS_LIMIT: u64 = 3_000_000;
 #[derive(Clone)]
 pub struct SigningClient<S: EthereumSigner> {
     inner: Arc<EthDirectClientInner<S>>,
-    query_client: Box<dyn EthInterface>,
+    query_client: Box<DynClient<L1>>,
 }
 
 struct EthDirectClientInner<S: EthereumSigner> {
@@ -73,8 +74,8 @@ impl<S: EthereumSigner> fmt::Debug for SigningClient<S> {
     }
 }
 
-impl<S: EthereumSigner> AsRef<dyn EthInterface> for SigningClient<S> {
-    fn as_ref(&self) -> &dyn EthInterface {
+impl<S: EthereumSigner> AsRef<DynClient<L1>> for SigningClient<S> {
+    fn as_ref(&self) -> &DynClient<L1> {
         self.query_client.as_ref()
     }
 }
@@ -113,7 +114,7 @@ impl<S: EthereumSigner> BoundEthInterface for SigningClient<S> {
         data: Vec<u8>,
         contract_addr: H160,
         options: Options,
-    ) -> Result<SignedCallResult, Error> {
+    ) -> Result<SignedCallResult, SigningError> {
         let latency = LATENCIES.direct[&Method::SignPreparedTx].start();
         // Fetch current max priority fee per gas
         let max_priority_fee_per_gas = match options.max_priority_fee_per_gas {
@@ -123,10 +124,10 @@ impl<S: EthereumSigner> BoundEthInterface for SigningClient<S> {
 
         if options.transaction_type == Some(EIP_4844_TX_TYPE.into()) {
             if options.max_fee_per_blob_gas.is_none() {
-                return Err(Error::Eip4844MissingMaxFeePerBlobGas);
+                return Err(SigningError::Eip4844MissingMaxFeePerBlobGas);
             }
             if options.blob_versioned_hashes.is_none() {
-                return Err(Error::Eip4844MissingBlobVersionedHashes);
+                return Err(SigningError::Eip4844MissingBlobVersionedHashes);
             }
         }
 
@@ -139,7 +140,7 @@ impl<S: EthereumSigner> BoundEthInterface for SigningClient<S> {
         };
 
         if max_fee_per_gas < max_priority_fee_per_gas {
-            return Err(Error::WrongFeeProvided(
+            return Err(SigningError::WrongFeeProvided(
                 max_fee_per_gas,
                 max_priority_fee_per_gas,
             ));
@@ -196,7 +197,7 @@ impl<S: EthereumSigner> BoundEthInterface for SigningClient<S> {
         token_address: Address,
         address: Address,
         erc20_abi: &ethabi::Contract,
-    ) -> Result<U256, Error> {
+    ) -> Result<U256, ContractCallError> {
         let latency = LATENCIES.direct[&Method::Allowance].start();
         let allowance: U256 =
             CallFunctionArgs::new("allowance", (self.inner.sender_account, address))
@@ -210,7 +211,7 @@ impl<S: EthereumSigner> BoundEthInterface for SigningClient<S> {
 
 impl<S: EthereumSigner> SigningClient<S> {
     pub fn new(
-        query_client: Box<dyn EthInterface>,
+        query_client: Box<DynClient<L1>>,
         contract: ethabi::Contract,
         operator_eth_addr: H160,
         eth_signer: S,
diff --git a/core/lib/eth_client/src/clients/mock.rs b/core/lib/eth_client/src/clients/mock.rs
index 60d14bc29f0c..9fbc5ceb4b2e 100644
--- a/core/lib/eth_client/src/clients/mock.rs
+++ b/core/lib/eth_client/src/clients/mock.rs
@@ -4,17 +4,17 @@ use std::{
     sync::{Arc, RwLock, RwLockWriteGuard},
 };
 
-use async_trait::async_trait;
 use jsonrpsee::{core::ClientError, types::ErrorObject};
 use zksync_types::{
     ethabi,
     web3::{self, contract::Tokenize, BlockId},
     Address, L1ChainId, H160, H256, U256, U64,
 };
+use zksync_web3_decl::client::{DynClient, MockClient, L1};
 
 use crate::{
-    types::{Error, ExecutedTxStatus, FailureInfo, SignedCallResult},
-    BoundEthInterface, EthInterface, Options, RawTransactionBytes,
+    types::{ContractCallError, SignedCallResult, SigningError},
+    BaseFees, BoundEthInterface, Options, RawTransactionBytes,
 };
 
 #[derive(Debug, Clone)]
@@ -31,9 +31,9 @@ impl From<Vec<u8>> for MockTx {
     fn from(tx: Vec<u8>) -> Self {
         let len = tx.len();
         let recipient = Address::from_slice(&tx[len - 116..len - 96]);
-        let max_fee_per_gas = U256::try_from(&tx[len - 96..len - 64]).unwrap();
-        let max_priority_fee_per_gas = U256::try_from(&tx[len - 64..len - 32]).unwrap();
-        let nonce = U256::try_from(&tx[len - 32..]).unwrap().as_u64();
+        let max_fee_per_gas = U256::from(&tx[len - 96..len - 64]);
+        let max_priority_fee_per_gas = U256::from(&tx[len - 64..len - 32]);
+        let nonce = U256::from(&tx[len - 32..]).as_u64();
         let hash = {
             let mut buffer = [0_u8; 32];
             buffer.copy_from_slice(&tx[..32]);
@@ -65,11 +65,17 @@ impl From<MockTx> for web3::Transaction {
     }
 }
 
+#[derive(Debug)]
+struct MockExecutedTx {
+    receipt: web3::TransactionReceipt,
+    success: bool,
+}
+
 /// Mutable part of [`MockEthereum`] that needs to be synchronized via an `RwLock`.
 #[derive(Debug, Default)]
 struct MockEthereumInner {
     block_number: u64,
-    tx_statuses: HashMap<H256, ExecutedTxStatus>,
+    executed_txs: HashMap<H256, MockExecutedTx>,
     sent_txs: HashMap<H256, MockTx>,
     current_nonce: u64,
     pending_nonce: u64,
@@ -99,17 +105,89 @@ impl MockEthereumInner {
         }
         self.nonces.insert(block_number, nonce + 1);
 
-        let status = ExecutedTxStatus {
-            tx_hash,
+        let status = MockExecutedTx {
             success,
             receipt: web3::TransactionReceipt {
                 gas_used: Some(21000u32.into()),
                 block_number: Some(block_number.into()),
                 transaction_hash: tx_hash,
+                status: Some(U64::from(if success { 1 } else { 0 })),
                 ..web3::TransactionReceipt::default()
             },
         };
-        self.tx_statuses.insert(tx_hash, status);
+        self.executed_txs.insert(tx_hash, status);
+    }
+
+    fn get_transaction_count(&self, address: Address, block: web3::BlockNumber) -> U256 {
+        if address != MockEthereum::SENDER_ACCOUNT {
+            unimplemented!("Getting nonce for custom account is not supported");
+        }
+
+        match block {
+            web3::BlockNumber::Number(block_number) => {
+                let mut nonce_range = self.nonces.range(..=block_number.as_u64());
+                let (_, &nonce) = nonce_range.next_back().unwrap_or((&0, &0));
+                nonce.into()
+            }
+            web3::BlockNumber::Pending => self.pending_nonce.into(),
+            web3::BlockNumber::Latest => self.current_nonce.into(),
+            _ => unimplemented!(
+                "`nonce_at_for_account()` called with unsupported block number: {block:?}"
+            ),
+        }
+    }
+
+    fn send_raw_transaction(&mut self, tx: web3::Bytes) -> Result<H256, ClientError> {
+        let mock_tx = MockTx::from(tx.0);
+        let mock_tx_hash = mock_tx.hash;
+
+        if mock_tx.nonce < self.current_nonce {
+            let err = ErrorObject::owned(
+                101,
+                "transaction with the same nonce already processed",
+                None::<()>,
+            );
+            return Err(ClientError::Call(err));
+        }
+
+        if mock_tx.nonce == self.pending_nonce {
+            self.pending_nonce += 1;
+        }
+        self.sent_txs.insert(mock_tx_hash, mock_tx);
+        Ok(mock_tx_hash)
+    }
+
+    /// Processes a transaction-like `eth_call` which is used in `EthInterface::failure_reason()`.
+    fn transaction_call(
+        &self,
+        request: &web3::CallRequest,
+        block_id: BlockId,
+    ) -> Option<Result<web3::Bytes, ClientError>> {
+        if request.gas.is_none() || request.value.is_none() {
+            return None;
+        }
+        let data = request.data.as_ref()?;
+
+        // Check if any of sent transactions match the request parameters
+        let executed_tx = self.sent_txs.iter().find_map(|(hash, tx)| {
+            if request.to != Some(tx.recipient) || data.0 != tx.input {
+                return None;
+            }
+            let executed_tx = self.executed_txs.get(hash)?;
+            let expected_block_number = executed_tx.receipt.block_number.unwrap();
+            (block_id == BlockId::Number(expected_block_number.into())).then_some(executed_tx)
+        })?;
+
+        Some(if executed_tx.success {
+            Ok(web3::Bytes(vec![1]))
+        } else {
+            // The error code is arbitrary
+            Err(ClientError::Call(ErrorObject::owned(
+                3,
+                "execution reverted: oops",
+                None::<()>,
+            )))
+        })
     }
 }
 
@@ -121,37 +199,34 @@ pub struct MockExecutedTxHandle<'a> {
 
 impl MockExecutedTxHandle<'_> {
     pub fn with_logs(&mut self, logs: Vec<web3::Log>) -> &mut Self {
-        let status = self.inner.tx_statuses.get_mut(&self.tx_hash).unwrap();
+        let status = self.inner.executed_txs.get_mut(&self.tx_hash).unwrap();
         status.receipt.logs = logs;
         self
     }
 }
 
 type CallHandler =
-    dyn Fn(&web3::CallRequest, BlockId) -> Result<ethabi::Token, Error> + Send + Sync;
+    dyn Fn(&web3::CallRequest, BlockId) -> Result<ethabi::Token, ClientError> + Send + Sync;
 
-/// Mock Ethereum client is capable of recording all the incoming requests for the further analysis.
-#[derive(Clone)]
-pub struct MockEthereum {
+/// Builder for [`MockEthereum`] client.
+pub struct MockEthereumBuilder {
     max_fee_per_gas: U256,
     max_priority_fee_per_gas: U256,
-    base_fee_history: Vec<u64>,
-    excess_blob_gas_history: Vec<u64>,
+    base_fee_history: Vec<BaseFees>,
     /// If true, the mock will not check the ordering nonces of the transactions.
     /// This is useful for testing the cases when the transactions are executed out of order.
     non_ordering_confirmations: bool,
     inner: Arc<RwLock<MockEthereumInner>>,
-    call_handler: Arc<CallHandler>,
+    call_handler: Box<CallHandler>,
 }
 
-impl fmt::Debug for MockEthereum {
+impl fmt::Debug for MockEthereumBuilder {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         formatter
-            .debug_struct("MockEthereum")
+            .debug_struct("MockEthereumBuilder")
             .field("max_fee_per_gas", &self.max_fee_per_gas)
             .field("max_priority_fee_per_gas", &self.max_priority_fee_per_gas)
             .field("base_fee_history", &self.base_fee_history)
-            .field("excess_blob_gas_history", &self.excess_blob_gas_history)
             .field(
                 "non_ordering_confirmations",
                 &self.non_ordering_confirmations,
@@ -161,111 +236,30 @@ impl fmt::Debug for MockEthereum {
     }
 }
 
-impl Default for MockEthereum {
+impl Default for MockEthereumBuilder {
     fn default() -> Self {
         Self {
             max_fee_per_gas: 100.into(),
             max_priority_fee_per_gas: 10.into(),
             base_fee_history: vec![],
-            excess_blob_gas_history: vec![],
             non_ordering_confirmations: false,
             inner: Arc::default(),
-            call_handler: Arc::new(|call, block_id| {
+            call_handler: Box::new(|call, block_id| {
                 panic!("Unexpected eth_call: {call:?}, {block_id:?}");
             }),
         }
     }
 }
 
-impl MockEthereum {
-    const SENDER_ACCOUNT: Address = Address::repeat_byte(0x11);
-
-    /// A fake `sha256` hasher, which calculates an `std::hash` instead.
-    /// This is done for simplicity and it's also much faster.
-    fn fake_sha256(data: &[u8]) -> H256 {
-        use std::{collections::hash_map::DefaultHasher, hash::Hasher};
-
-        let mut hasher = DefaultHasher::new();
-        hasher.write(data);
-        let result = hasher.finish();
-        H256::from_low_u64_ne(result)
-    }
-
-    /// Returns the number of transactions sent via this client.
-    pub fn sent_tx_count(&self) -> usize {
-        self.inner.read().unwrap().sent_txs.len()
-    }
-
-    /// Increments the blocks by a provided `confirmations` and marks the sent transaction
-    /// as a success.
-    pub fn execute_tx(
-        &self,
-        tx_hash: H256,
-        success: bool,
-        confirmations: u64,
-    ) -> MockExecutedTxHandle<'_> {
-        let mut inner = self.inner.write().unwrap();
-        inner.execute_tx(
-            tx_hash,
-            success,
-            confirmations,
-            self.non_ordering_confirmations,
-        );
-        MockExecutedTxHandle { inner, tx_hash }
-    }
-
-    pub fn sign_prepared_tx(
-        &self,
-        mut raw_tx: Vec<u8>,
-        contract_addr: Address,
-        options: Options,
-    ) -> Result<SignedCallResult, Error> {
-        let max_fee_per_gas = options.max_fee_per_gas.unwrap_or(self.max_fee_per_gas);
-        let max_priority_fee_per_gas = options
-            .max_priority_fee_per_gas
-            .unwrap_or(self.max_priority_fee_per_gas);
-        let nonce = options.nonce.expect("Nonce must be set for every tx");
-
-        // Nonce and `gas_price` are appended to distinguish the same transactions
-        // with different gas by their hash in tests.
-        raw_tx.extend_from_slice(contract_addr.as_bytes());
-        raw_tx.extend_from_slice(&ethabi::encode(&max_fee_per_gas.into_tokens()));
-        raw_tx.extend_from_slice(&ethabi::encode(&max_priority_fee_per_gas.into_tokens()));
-        raw_tx.extend_from_slice(&ethabi::encode(&nonce.into_tokens()));
-        let hash = Self::fake_sha256(&raw_tx); // Okay for test purposes.
-
-        // Concatenate `raw_tx` plus hash for test purposes
-        let mut new_raw_tx = hash.as_bytes().to_vec();
-        new_raw_tx.extend(raw_tx);
-        Ok(SignedCallResult::new(
-            RawTransactionBytes(new_raw_tx),
-            max_priority_fee_per_gas,
-            max_fee_per_gas,
-            nonce,
-            hash,
-        ))
-    }
-
-    pub fn advance_block_number(&self, val: u64) -> u64 {
-        let mut inner = self.inner.write().unwrap();
-        inner.block_number += val;
-        inner.block_number
-    }
-
-    pub fn with_fee_history(self, history: Vec<u64>) -> Self {
+impl MockEthereumBuilder {
+    /// Sets fee history for each block in the mocked Ethereum network, starting from the 0th block.
+    pub fn with_fee_history(self, history: Vec<BaseFees>) -> Self {
         Self {
             base_fee_history: history,
             ..self
         }
     }
 
-    pub fn with_excess_blob_gas_history(self, history: Vec<u64>) -> Self {
-        Self {
-            excess_blob_gas_history: history,
-            ..self
-        }
-    }
-
     pub fn with_non_ordering_confirmation(self, non_ordering_confirmations: bool) -> Self {
         Self {
             non_ordering_confirmations,
@@ -273,178 +267,258 @@ impl MockEthereum {
         }
     }
 
+    /// Sets the `eth_call` handler. There are "standard" calls that will not be routed to the handler
+    /// (e.g., calls to determine transaction failure reason).
     pub fn with_call_handler<F>(self, call_handler: F) -> Self
     where
         F: 'static + Send + Sync + Fn(&web3::CallRequest, BlockId) -> ethabi::Token,
     {
         Self {
-            call_handler: Arc::new(move |call, block_id| Ok(call_handler(call, block_id))),
+            call_handler: Box::new(move |call, block_id| Ok(call_handler(call, block_id))),
             ..self
         }
     }
 
+    /// Same as [`Self::with_call_handler()`], with a difference that the provided closure should return a `Result`.
+    /// Thus, it can emulate network errors, reversions etc.
     pub fn with_fallible_call_handler<F>(self, call_handler: F) -> Self
     where
-        F: 'static + Send + Sync + Fn(&web3::CallRequest, BlockId) -> Result<ethabi::Token, Error>,
+        F: 'static
+            + Send
+            + Sync
+            + Fn(&web3::CallRequest, BlockId) -> Result<ethabi::Token, ClientError>,
     {
         Self {
-            call_handler: Arc::new(call_handler),
+            call_handler: Box::new(call_handler),
             ..self
         }
     }
-}
 
-#[async_trait]
-impl EthInterface for MockEthereum {
-    fn clone_boxed(&self) -> Box<dyn EthInterface> {
-        Box::new(self.clone())
-    }
-
-    fn for_component(self: Box<Self>, _component_name: &'static str) -> Box<dyn EthInterface> {
-        self
+    fn get_block_by_number(
+        fee_history: &[BaseFees],
+        block: web3::BlockNumber,
+    ) -> Option<web3::Block<H256>> {
+        let web3::BlockNumber::Number(number) = block else {
+            panic!("Non-numeric block requested");
+        };
+        let excess_blob_gas = Some(0.into()); // Not relevant for tests.
+        let base_fee_per_gas = fee_history
+            .get(number.as_usize())
+            .map(|fees| fees.base_fee_per_gas.into());
+
+        Some(web3::Block {
+            number: Some(number),
+            excess_blob_gas,
+            base_fee_per_gas,
+            ..web3::Block::default()
+        })
     }
 
-    async fn fetch_chain_id(&self) -> Result<L1ChainId, Error> {
-        Ok(L1ChainId(9))
+    fn build_client(self) -> MockClient<L1> {
+        const CHAIN_ID: L1ChainId = L1ChainId(9);
+
+        let base_fee_history = self.base_fee_history.clone();
+        let call_handler = self.call_handler;
+
+        MockClient::builder(CHAIN_ID.into())
+            .method("eth_chainId", || Ok(U64::from(CHAIN_ID.0)))
+            .method("eth_blockNumber", {
+                let inner = self.inner.clone();
+                move || Ok(U64::from(inner.read().unwrap().block_number))
+            })
+            .method("eth_getBlockByNumber", {
+                move |number, full_transactions: bool| {
+                    assert!(
+                        !full_transactions,
+                        "getting blocks with transactions is not mocked"
+                    );
+                    Ok(Self::get_block_by_number(&self.base_fee_history, number))
+                }
+            })
+            .method("eth_getTransactionCount", {
+                let inner = self.inner.clone();
+                move |address, block| {
+                    Ok(inner.read().unwrap().get_transaction_count(address, block))
+                }
+            })
+            .method("eth_gasPrice", move || Ok(self.max_fee_per_gas))
+            .method(
+                "eth_feeHistory",
+                move |block_count: U64, newest_block: web3::BlockNumber, _: Option<Vec<f32>>| {
+                    let web3::BlockNumber::Number(from_block) = newest_block else {
+                        panic!("Non-numeric newest block in `eth_feeHistory`");
+                    };
+                    let from_block = from_block.as_usize();
+                    let start_block = from_block.saturating_sub(block_count.as_usize() - 1);
+                    Ok(web3::FeeHistory {
+                        oldest_block: start_block.into(),
+                        base_fee_per_gas: base_fee_history[start_block..=from_block]
+                            .iter()
+                            .map(|fee| U256::from(fee.base_fee_per_gas))
+                            .collect(),
+                        base_fee_per_blob_gas: base_fee_history[start_block..=from_block]
+                            .iter()
+                            .map(|fee| fee.base_fee_per_blob_gas)
+                            .collect(),
+                        gas_used_ratio: vec![],      // not used
+                        blob_gas_used_ratio: vec![], // not used
+                        reward: None,
+                    })
+                },
+            )
+            .method("eth_call", {
+                let inner = self.inner.clone();
+                move |req, block| {
+                    if let Some(res) = inner.read().unwrap().transaction_call(&req, block) {
+                        return res;
+                    }
+                    call_handler(&req, block).map(|token| web3::Bytes(ethabi::encode(&[token])))
+                }
+            })
+            .method("eth_sendRawTransaction", {
+                let inner = self.inner.clone();
+                move |tx_bytes| inner.write().unwrap().send_raw_transaction(tx_bytes)
+            })
+            .method("eth_getTransactionByHash", {
+                let inner = self.inner.clone();
+                move |hash: H256| {
+                    let txs = &inner.read().unwrap().sent_txs;
+                    let Some(tx) = txs.get(&hash) else {
+                        return Ok(None);
+                    };
+                    Ok(Some(web3::Transaction::from(tx.clone())))
+                }
+            })
+            .method("eth_getTransactionReceipt", {
+                let inner = self.inner.clone();
+                move |hash: H256| {
+                    let inner = inner.read().unwrap();
+                    let status = inner.executed_txs.get(&hash);
+                    Ok(status.map(|status| status.receipt.clone()))
+                }
+            })
+            .build()
+    }
+
+    /// Builds a mock Ethereum client.
+    pub fn build(self) -> MockEthereum {
+        MockEthereum {
+            max_fee_per_gas: self.max_fee_per_gas,
+            max_priority_fee_per_gas: self.max_priority_fee_per_gas,
+            non_ordering_confirmations: self.non_ordering_confirmations,
+            inner: self.inner.clone(),
+            client: self.build_client(),
+        }
     }
+}
 
-    async fn get_tx_status(&self, hash: H256) -> Result<Option<ExecutedTxStatus>, Error> {
-        Ok(self.inner.read().unwrap().tx_statuses.get(&hash).cloned())
-    }
+/// Mock Ethereum client.
+#[derive(Debug, Clone)]
+pub struct MockEthereum {
+    max_fee_per_gas: U256,
+    max_priority_fee_per_gas: U256,
+    non_ordering_confirmations: bool,
+    inner: Arc<RwLock<MockEthereumInner>>,
+    client: MockClient<L1>,
+}
 
-    async fn block_number(&self) -> Result<U64, Error> {
-        Ok(self.inner.read().unwrap().block_number.into())
+impl Default for MockEthereum {
+    fn default() -> Self {
+        Self::builder().build()
     }
+}
 
-    async fn send_raw_tx(&self, tx: RawTransactionBytes) -> Result<H256, Error> {
-        let mock_tx = MockTx::from(tx.0);
-        let mock_tx_hash = mock_tx.hash;
-        let mut inner = self.inner.write().unwrap();
-
-        if mock_tx.nonce < inner.current_nonce {
-            let err = ErrorObject::owned(
-                101,
-                "transaction with the same nonce already processed",
-                None::<()>,
-            );
-            return Err(Error::EthereumGateway(ClientError::Call(err)));
-        }
+impl MockEthereum {
+    const SENDER_ACCOUNT: Address = Address::repeat_byte(0x11);
 
-        if mock_tx.nonce == inner.pending_nonce {
-            inner.pending_nonce += 1;
-        }
-        inner.sent_txs.insert(mock_tx_hash, mock_tx);
-        Ok(mock_tx_hash)
+    /// Initializes a builder for a [`MockEthereum`] instance.
+    pub fn builder() -> MockEthereumBuilder {
+        MockEthereumBuilder::default()
     }
 
-    async fn nonce_at_for_account(
-        &self,
-        account: Address,
-        block: web3::BlockNumber,
-    ) -> Result<U256, Error> {
-        if account != Self::SENDER_ACCOUNT {
-            unimplemented!("Getting nonce for custom account is not supported");
-        }
+    /// A fake `sha256` hasher, which calculates an `std::hash` instead.
+    /// This is done for simplicity, and it's also much faster.
+    fn fake_sha256(data: &[u8]) -> H256 {
+        use std::{collections::hash_map::DefaultHasher, hash::Hasher};
 
-        let inner = self.inner.read().unwrap();
-        Ok(match block {
-            web3::BlockNumber::Number(block_number) => {
-                let mut nonce_range = inner.nonces.range(..=block_number.as_u64());
-                let (_, &nonce) = nonce_range.next_back().unwrap_or((&0, &0));
-                nonce.into()
-            }
-            web3::BlockNumber::Pending => inner.pending_nonce.into(),
-            web3::BlockNumber::Latest => inner.current_nonce.into(),
-            _ => unimplemented!(
-                "`nonce_at_for_account()` called with unsupported block number: {block:?}"
-            ),
-        })
+        let mut hasher = DefaultHasher::new();
+        hasher.write(data);
+        let result = hasher.finish();
+        H256::from_low_u64_ne(result)
     }
 
-    async fn get_gas_price(&self) -> Result<U256, Error> {
-        Ok(self.max_fee_per_gas)
+    /// Returns the number of transactions sent via this client.
+    pub fn sent_tx_count(&self) -> usize {
+        self.inner.read().unwrap().sent_txs.len()
     }
 
-    async fn base_fee_history(
+    /// Signs a prepared transaction.
+    pub fn sign_prepared_tx(
         &self,
-        from_block: usize,
-        block_count: usize,
-    ) -> Result<Vec<u64>, Error> {
-        let start_block = from_block.saturating_sub(block_count - 1);
-        Ok(self.base_fee_history[start_block..=from_block].to_vec())
-    }
-
-    async fn get_pending_block_base_fee_per_gas(&self) -> Result<U256, Error> {
-        Ok(U256::from(*self.base_fee_history.last().unwrap()))
-    }
+        mut raw_tx: Vec<u8>,
+        contract_addr: Address,
+        options: Options,
+    ) -> Result<SignedCallResult, SigningError> {
+        let max_fee_per_gas = options.max_fee_per_gas.unwrap_or(self.max_fee_per_gas);
+        let max_priority_fee_per_gas = options
+            .max_priority_fee_per_gas
+            .unwrap_or(self.max_priority_fee_per_gas);
+        let nonce = options.nonce.expect("Nonce must be set for every tx");
 
-    async fn failure_reason(&self, tx_hash: H256) -> Result<Option<FailureInfo>, Error> {
-        let tx_status = self.get_tx_status(tx_hash).await.unwrap();
+        // Nonce and `gas_price` are appended to distinguish the same transactions
+        // with different gas by their hash in tests.
+        raw_tx.extend_from_slice(contract_addr.as_bytes());
+        raw_tx.extend_from_slice(&ethabi::encode(&max_fee_per_gas.into_tokens()));
+        raw_tx.extend_from_slice(&ethabi::encode(&max_priority_fee_per_gas.into_tokens()));
+        raw_tx.extend_from_slice(&ethabi::encode(&nonce.into_tokens()));
+        let hash = Self::fake_sha256(&raw_tx); // Okay for test purposes.
 
-        Ok(tx_status.map(|status| FailureInfo {
-            revert_code: status.success as i64,
-            revert_reason: "Unknown".into(),
-            gas_used: status.receipt.gas_used,
-            gas_limit: U256::zero(),
-        }))
+        // Concatenate `raw_tx` plus hash for test purposes
+        let mut new_raw_tx = hash.as_bytes().to_vec();
+        new_raw_tx.extend(raw_tx);
+        Ok(SignedCallResult::new(
+            RawTransactionBytes(new_raw_tx),
+            max_priority_fee_per_gas,
+            max_fee_per_gas,
+            nonce,
+            hash,
+        ))
     }
 
-    async fn call_contract_function(
+    /// Increments the blocks by a provided `confirmations` and marks the sent transaction
+    /// as a success.
+    pub fn execute_tx(
         &self,
-        request: web3::CallRequest,
-        block: Option<BlockId>,
-    ) -> Result<web3::Bytes, Error> {
-        (self.call_handler)(&request, block.unwrap_or(web3::BlockNumber::Pending.into()))
-            .map(|token| web3::Bytes(ethabi::encode(&[token])))
-    }
-
-    async fn get_tx(&self, hash: H256) -> Result<Option<web3::Transaction>, Error> {
-        let txs = &self.inner.read().unwrap().sent_txs;
-        let Some(tx) = txs.get(&hash) else {
-            return Ok(None);
-        };
-        Ok(Some(tx.clone().into()))
-    }
-
-    async fn tx_receipt(&self, _tx_hash: H256) -> Result<Option<web3::TransactionReceipt>, Error> {
-        unimplemented!("Not needed right now")
-    }
-
-    async fn eth_balance(&self, _address: Address) -> Result<U256, Error> {
-        unimplemented!("Not needed right now")
+        tx_hash: H256,
+        success: bool,
+        confirmations: u64,
+    ) -> MockExecutedTxHandle<'_> {
+        let mut inner = self.inner.write().unwrap();
+        inner.execute_tx(
+            tx_hash,
+            success,
+            confirmations,
+            self.non_ordering_confirmations,
+        );
+        MockExecutedTxHandle { inner, tx_hash }
     }
 
-    async fn logs(&self, _filter: web3::Filter) -> Result<Vec<web3::Log>, Error> {
-        unimplemented!("Not needed right now")
+    /// Increases the block number in the network by the specified value.
+    pub fn advance_block_number(&self, val: u64) -> u64 {
+        let mut inner = self.inner.write().unwrap();
+        inner.block_number += val;
+        inner.block_number
     }
 
-    async fn block(&self, block_id: web3::BlockId) -> Result<Option<web3::Block<H256>>, Error> {
-        match block_id {
-            web3::BlockId::Number(web3::BlockNumber::Number(number)) => {
-                let excess_blob_gas = self
-                    .excess_blob_gas_history
-                    .get(number.as_usize())
-                    .map(|excess_blob_gas| (*excess_blob_gas).into());
-                let base_fee_per_gas = self
-                    .base_fee_history
-                    .get(number.as_usize())
-                    .map(|base_fee| (*base_fee).into());
-
-                Ok(Some(web3::Block {
-                    number: Some(number),
-                    excess_blob_gas,
-                    base_fee_per_gas,
-                    ..Default::default()
-                }))
-            }
-            _ => unimplemented!("Not needed right now"),
-        }
+    /// Converts this client into an immutable / contract-agnostic client.
+    pub fn into_client(self) -> MockClient<L1> {
+        self.client
     }
 }
 
-impl AsRef<dyn EthInterface> for MockEthereum {
-    fn as_ref(&self) -> &dyn EthInterface {
-        self
+impl AsRef<DynClient<L1>> for MockEthereum {
+    fn as_ref(&self) -> &DynClient<L1> {
+        &self.client
     }
 }
 
@@ -479,7 +553,7 @@ impl BoundEthInterface for MockEthereum {
         data: Vec<u8>,
         contract_addr: H160,
         options: Options,
-    ) -> Result<SignedCallResult, Error> {
+    ) -> Result<SignedCallResult, SigningError> {
         self.sign_prepared_tx(data, contract_addr, options)
     }
 
@@ -488,29 +562,91 @@ impl BoundEthInterface for MockEthereum {
         _token_address: Address,
         _contract_address: Address,
         _erc20_abi: &ethabi::Contract,
-    ) -> Result<U256, Error> {
+    ) -> Result<U256, ContractCallError> {
         unimplemented!("Not needed right now")
     }
 }
 
 #[cfg(test)]
 mod tests {
+    use assert_matches::assert_matches;
+    use zksync_types::{commitment::L1BatchCommitmentMode, ProtocolVersionId};
+
     use super::*;
+    use crate::{CallFunctionArgs, EthInterface};
+
+    fn base_fees(block: u64, blob: u64) -> BaseFees {
+        BaseFees {
+            base_fee_per_gas: block,
+            base_fee_per_blob_gas: U256::from(blob),
+        }
+    }
 
     #[tokio::test]
     async fn managing_block_number() {
-        let client = MockEthereum::default();
-        let block_number = client.block_number().await.unwrap();
+        let mock = MockEthereum::builder()
+            .with_fee_history(vec![
+                base_fees(0, 4),
+                base_fees(1, 3),
+                base_fees(2, 2),
+                base_fees(3, 1),
+                base_fees(4, 0),
+            ])
+            .build();
+        let block_number = mock.client.block_number().await.unwrap();
         assert_eq!(block_number, 0.into());
 
-        client.advance_block_number(5);
-        let block_number = client.block_number().await.unwrap();
+        mock.advance_block_number(5);
+        let block_number = mock.client.block_number().await.unwrap();
         assert_eq!(block_number, 5.into());
+
+        for number in 0..=4 {
+            let block_number = web3::BlockNumber::Number(number.into()).into();
+            let block = mock
+                .client
+                .block(block_number)
+                .await
+                .unwrap()
+                .expect("no block");
+            assert_eq!(block.number, Some(number.into()));
+            assert_eq!(block.base_fee_per_gas.unwrap(), U256::from(number));
+        }
+    }
+
+    #[tokio::test]
+    async fn getting_chain_id() {
+        let mock = MockEthereum::builder().build();
+        let chain_id = mock.client.fetch_chain_id().await.unwrap();
+        assert_eq!(chain_id, L1ChainId(9));
+    }
+
+    #[tokio::test]
+    async fn managing_fee_history() {
+        let initial_fee_history = vec![
+            base_fees(1, 4),
+            base_fees(2, 3),
+            base_fees(3, 2),
+            base_fees(4, 1),
+            base_fees(5, 0),
+        ];
+        let client = MockEthereum::builder()
+            .with_fee_history(initial_fee_history.clone())
+            .build();
+        client.advance_block_number(4);
+
+        let fee_history = client.as_ref().base_fee_history(4, 4).await.unwrap();
+        assert_eq!(fee_history, &initial_fee_history[1..=4]);
+        let fee_history = client.as_ref().base_fee_history(2, 2).await.unwrap();
+        assert_eq!(fee_history, &initial_fee_history[1..=2]);
+        let fee_history = client.as_ref().base_fee_history(3, 2).await.unwrap();
+        assert_eq!(fee_history, &initial_fee_history[2..=3]);
     }
 
     #[tokio::test]
     async fn managing_transactions() {
-        let client = MockEthereum::default().with_non_ordering_confirmation(true);
+        let client = MockEthereum::builder()
+            .with_non_ordering_confirmation(true)
+            .build();
         client.advance_block_number(2);
 
         let signed_tx = client
@@ -527,11 +663,16 @@ mod tests {
         assert!(signed_tx.max_priority_fee_per_gas > 0.into());
         assert!(signed_tx.max_fee_per_gas > 0.into());
 
-        let tx_hash = client.send_raw_tx(signed_tx.raw_tx.clone()).await.unwrap();
+        let tx_hash = client
+            .as_ref()
+            .send_raw_tx(signed_tx.raw_tx.clone())
+            .await
+            .unwrap();
         assert_eq!(tx_hash, signed_tx.hash);
 
         client.execute_tx(tx_hash, true, 3);
         let returned_tx = client
+            .as_ref()
             .get_tx(tx_hash)
             .await
             .unwrap()
@@ -544,6 +685,7 @@ mod tests {
         assert!(returned_tx.max_fee_per_gas.is_some());
 
         let tx_status = client
+            .as_ref()
             .get_tx_status(tx_hash)
             .await
             .unwrap()
@@ -552,4 +694,97 @@ mod tests {
         assert_eq!(tx_status.tx_hash, tx_hash);
         assert_eq!(tx_status.receipt.block_number, Some(2.into()));
     }
+
+    #[tokio::test]
+    async fn calling_contracts() {
+        let client = MockEthereum::builder()
+            .with_call_handler(|req, _block_id| {
+                let packed_semver = ProtocolVersionId::latest().into_packed_semver_with_patch(0);
+                let call_signature = &req.data.as_ref().unwrap().0[..4];
+                let contract = zksync_contracts::hyperchain_contract();
+                let pricing_mode_sig = contract
+                    .function("getPubdataPricingMode")
+                    .unwrap()
+                    .short_signature();
+                let protocol_version_sig = contract
+                    .function("getProtocolVersion")
+                    .unwrap()
+                    .short_signature();
+                match call_signature {
+                    sig if sig == pricing_mode_sig => {
+                        ethabi::Token::Uint(0.into()) // "rollup" mode encoding
+                    }
+                    sig if sig == protocol_version_sig => ethabi::Token::Uint(packed_semver),
+                    _ => panic!("unexpected call"),
+                }
+            })
+            .build();
+
+        let l1_packed_protocol_version: U256 = CallFunctionArgs::new("getProtocolVersion", ())
+            .for_contract(
+                client.contract_addr(),
+                &zksync_contracts::hyperchain_contract(),
+            )
+            .call(client.as_ref())
+            .await
+            .unwrap();
+        let expected_packed_protocol_version =
+            ProtocolVersionId::latest().into_packed_semver_with_patch(0);
+        assert_eq!(l1_packed_protocol_version, expected_packed_protocol_version);
+
+        let commitment_mode: L1BatchCommitmentMode =
+            CallFunctionArgs::new("getPubdataPricingMode", ())
+                .for_contract(
+                    client.contract_addr(),
+                    &zksync_contracts::hyperchain_contract(),
+                )
+                .call(client.as_ref())
+                .await
+                .unwrap();
+        assert_matches!(commitment_mode, L1BatchCommitmentMode::Rollup);
+    }
+
+    #[tokio::test]
+    async fn getting_transaction_failure_reason() {
+        let client = MockEthereum::default();
+        let signed_tx = client
+            .sign_prepared_tx(
+                vec![1, 2, 3],
+                Address::repeat_byte(1),
+                Options {
+                    nonce: Some(0.into()),
+                    ..Options::default()
+                },
+            )
+            .unwrap();
+        let tx_hash = client.as_ref().send_raw_tx(signed_tx.raw_tx).await.unwrap();
+        assert_eq!(tx_hash, signed_tx.hash);
+
+        client.execute_tx(tx_hash, true, 1);
+        let failure = client.as_ref().failure_reason(tx_hash).await.unwrap();
+        assert!(failure.is_none(), "{failure:?}");
+
+        let signed_tx = client
+            .sign_prepared_tx(
+                vec![4, 5, 6],
+                Address::repeat_byte(0xff),
+                Options {
+                    nonce: Some(1.into()),
+                    ..Options::default()
+                },
+            )
+            .unwrap();
+        let failed_tx_hash = client.as_ref().send_raw_tx(signed_tx.raw_tx).await.unwrap();
+        assert_ne!(failed_tx_hash, tx_hash);
+
+        client.execute_tx(failed_tx_hash, false, 1);
+        let failure = client
+            .as_ref()
+            .failure_reason(failed_tx_hash)
+            .await
+            .unwrap()
+            .expect("no failure");
+        assert_eq!(failure.revert_reason, "oops");
+        assert_eq!(failure.revert_code, 3);
+    }
 }
diff --git a/core/lib/eth_client/src/clients/mod.rs b/core/lib/eth_client/src/clients/mod.rs
index b2e31cc9aac7..05b7f852f391 100644
--- a/core/lib/eth_client/src/clients/mod.rs
+++ b/core/lib/eth_client/src/clients/mod.rs
@@ -3,7 +3,9 @@
 mod http;
 mod mock;
 
+pub use zksync_web3_decl::client::{Client, DynClient, L1};
+
 pub use self::{
-    http::{PKSigningClient, QueryClient, SigningClient},
-    mock::MockEthereum,
+    http::{PKSigningClient, SigningClient},
+    mock::{MockEthereum, MockEthereumBuilder},
 };
diff --git a/core/lib/eth_client/src/lib.rs b/core/lib/eth_client/src/lib.rs
index ef023592d147..b6ac3a89b54f 100644
--- a/core/lib/eth_client/src/lib.rs
+++ b/core/lib/eth_client/src/lib.rs
@@ -1,7 +1,6 @@
 use std::fmt;
 
 use async_trait::async_trait;
-pub use jsonrpsee::core::ClientError;
 use zksync_types::{
     eth_sender::EthTxBlobSidecar,
     ethabi, web3,
@@ -11,10 +10,15 @@ use zksync_types::{
     },
     Address, L1ChainId, H160, H256, U256, U64,
 };
+use zksync_web3_decl::client::{DynClient, L1};
+pub use zksync_web3_decl::{
+    error::{EnrichedClientError, EnrichedClientResult},
+    jsonrpsee::core::ClientError,
+};
 
 pub use crate::types::{
-    encode_blob_tx_with_sidecar, CallFunctionArgs, ContractCall, ContractError, Error,
-    ExecutedTxStatus, FailureInfo, RawTransactionBytes, SignedCallResult,
+    encode_blob_tx_with_sidecar, CallFunctionArgs, ContractCall, ContractCallError,
+    ExecutedTxStatus, FailureInfo, RawTransactionBytes, SignedCallResult, SigningError,
 };
 
 pub mod clients;
@@ -61,8 +65,16 @@ impl Options {
     }
 }
 
+/// Information about the base fees provided by the L1 client.
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
+pub struct BaseFees {
+    pub base_fee_per_gas: u64,
+    pub base_fee_per_blob_gas: U256,
+}
+
 /// Common Web3 interface, as seen by the core applications.
-/// Encapsulates the raw Web3 interaction, providing a high-level interface.
+/// Encapsulates the raw Web3 interaction, providing a high-level interface. Acts as an extension
+/// trait implemented for L1 / Ethereum [clients](zksync_web3_decl::client::Client).
 ///
 /// ## Trait contents
 ///
@@ -71,24 +83,17 @@ impl Options {
 /// If you want to add a method to this trait, make sure that it doesn't depend on any particular
 /// contract or account address. For that, you can use the `BoundEthInterface` trait.
 #[async_trait]
-pub trait EthInterface: 'static + Sync + Send + fmt::Debug {
-    /// Clones this client.
-    fn clone_boxed(&self) -> Box<dyn EthInterface>;
-
-    /// Tags this client as working for a specific component. The component name can be used in logging,
-    /// metrics etc. The component name should be copied to the clones of this client, but should not be passed upstream.
-    fn for_component(self: Box<Self>, component_name: &'static str) -> Box<dyn EthInterface>;
-
+pub trait EthInterface: Sync + Send {
     /// Fetches the L1 chain ID (in contrast to [`BoundEthInterface::chain_id()`] which returns
     /// the *expected* L1 chain ID).
-    async fn fetch_chain_id(&self) -> Result<L1ChainId, Error>;
+    async fn fetch_chain_id(&self) -> EnrichedClientResult<L1ChainId>;
 
     /// Returns the nonce of the provided account at the specified block.
     async fn nonce_at_for_account(
         &self,
         account: Address,
         block: BlockNumber,
-    ) -> Result<U256, Error>;
+    ) -> EnrichedClientResult<U256>;
 
     /// Collects the base fee history for the specified block range.
     ///
@@ -98,25 +103,25 @@ pub trait EthInterface: 'static + Sync + Send + fmt::Debug {
         &self,
         from_block: usize,
         block_count: usize,
-    ) -> Result<Vec<u64>, Error>;
+    ) -> EnrichedClientResult<Vec<BaseFees>>;
 
     /// Returns the `base_fee_per_gas` value for the currently pending L1 block.
-    async fn get_pending_block_base_fee_per_gas(&self) -> Result<U256, Error>;
+    async fn get_pending_block_base_fee_per_gas(&self) -> EnrichedClientResult<U256>;
 
     /// Returns the current gas price.
-    async fn get_gas_price(&self) -> Result<U256, Error>;
+    async fn get_gas_price(&self) -> EnrichedClientResult<U256>;
 
     /// Returns the current block number.
-    async fn block_number(&self) -> Result<U64, Error>;
+    async fn block_number(&self) -> EnrichedClientResult<U64>;
 
     /// Sends a transaction to the Ethereum network.
-    async fn send_raw_tx(&self, tx: RawTransactionBytes) -> Result<H256, Error>;
+    async fn send_raw_tx(&self, tx: RawTransactionBytes) -> EnrichedClientResult<H256>;
 
     /// Fetches the transaction status for a specified transaction hash.
     ///
     /// Returns `Ok(None)` if the transaction is either not found or not executed yet.
     /// Returns `Err` only if the request fails (e.g. due to network issues).
-    async fn get_tx_status(&self, hash: H256) -> Result<Option<ExecutedTxStatus>, Error>;
+    async fn get_tx_status(&self, hash: H256) -> EnrichedClientResult<Option<ExecutedTxStatus>>;
 
     /// For a reverted transaction, attempts to recover information on the revert reason.
     ///
@@ -124,46 +129,37 @@ pub trait EthInterface: 'static + Sync + Send + fmt::Debug {
     /// Returns `Ok(None)` if the transaction isn't found, wasn't executed yet, or if it was
     /// executed successfully.
     /// Returns `Err` only if the request fails (e.g. due to network issues).
-    async fn failure_reason(&self, tx_hash: H256) -> Result<Option<FailureInfo>, Error>;
+    async fn failure_reason(&self, tx_hash: H256) -> EnrichedClientResult<Option<FailureInfo>>;
 
     /// Returns the transaction for the specified hash.
-    async fn get_tx(&self, hash: H256) -> Result<Option<Transaction>, Error>;
+    async fn get_tx(&self, hash: H256) -> EnrichedClientResult<Option<Transaction>>;
 
     /// Returns the receipt for the specified transaction hash.
-    async fn tx_receipt(&self, tx_hash: H256) -> Result<Option<TransactionReceipt>, Error>;
+    async fn tx_receipt(&self, tx_hash: H256) -> EnrichedClientResult<Option<TransactionReceipt>>;
 
     /// Returns the ETH balance of the specified token for the specified address.
-    async fn eth_balance(&self, address: Address) -> Result<U256, Error>;
+    async fn eth_balance(&self, address: Address) -> EnrichedClientResult<U256>;
 
     /// Invokes a function on a contract specified by `contract_address` / `contract_abi` using `eth_call`.
     async fn call_contract_function(
         &self,
         request: web3::CallRequest,
         block: Option<BlockId>,
-    ) -> Result<web3::Bytes, Error>;
+    ) -> EnrichedClientResult<web3::Bytes>;
 
     /// Returns the logs for the specified filter.
-    async fn logs(&self, filter: Filter) -> Result<Vec<Log>, Error>;
+    async fn logs(&self, filter: &Filter) -> EnrichedClientResult<Vec<Log>>;
 
     /// Returns the block header for the specified block number or hash.
-    async fn block(&self, block_id: BlockId) -> Result<Option<Block<H256>>, Error>;
+    async fn block(&self, block_id: BlockId) -> EnrichedClientResult<Option<Block<H256>>>;
 }
 
-impl Clone for Box<dyn EthInterface> {
-    fn clone(&self) -> Self {
-        self.clone_boxed()
-    }
-}
-
-#[cfg(test)]
-static_assertions::assert_obj_safe!(EthInterface);
-
 /// An extension of `EthInterface` trait, which is used to perform queries that are bound to
 /// a certain contract and account.
 ///
 /// The example use cases for this trait would be:
 ///
-/// - An operator that sends transactions and interacts with zkSync contract.
+/// - An operator that sends transactions and interacts with ZKsync contract.
 /// - A wallet implementation in the SDK that is tied to a user's account.
 ///
 /// When adding a method to this trait:
@@ -172,7 +168,7 @@ static_assertions::assert_obj_safe!(EthInterface);
 /// 2. Consider adding the "unbound" version to the `EthInterface` trait and create a default method
 ///   implementation that invokes `contract` / `contract_addr` / `sender_account` methods.
 #[async_trait]
-pub trait BoundEthInterface: AsRef<dyn EthInterface> + 'static + Sync + Send + fmt::Debug {
+pub trait BoundEthInterface: AsRef<DynClient<L1>> + 'static + Sync + Send + fmt::Debug {
     /// Clones this client.
     fn clone_boxed(&self) -> Box<dyn BoundEthInterface>;
 
@@ -201,7 +197,7 @@ pub trait BoundEthInterface: AsRef<dyn EthInterface> + 'static + Sync + Send + f
         token_address: Address,
         address: Address,
         erc20_abi: &ethabi::Contract,
-    ) -> Result<U256, Error>;
+    ) -> Result<U256, ContractCallError>;
 
     /// Signs the transaction and sends it to the Ethereum network.
     /// Expected to use credentials associated with `Self::sender_account()`.
@@ -210,7 +206,7 @@ pub trait BoundEthInterface: AsRef<dyn EthInterface> + 'static + Sync + Send + f
         data: Vec<u8>,
         contract_addr: H160,
         options: Options,
-    ) -> Result<SignedCallResult, Error>;
+    ) -> Result<SignedCallResult, SigningError>;
 }
 
 impl Clone for Box<dyn BoundEthInterface> {
@@ -221,19 +217,19 @@ impl Clone for Box<dyn BoundEthInterface> {
 
 impl dyn BoundEthInterface {
     /// Returns the nonce of the `Self::sender_account()` at the specified block.
-    pub async fn nonce_at(&self, block: BlockNumber) -> Result<U256, Error> {
+    pub async fn nonce_at(&self, block: BlockNumber) -> EnrichedClientResult<U256> {
         self.as_ref()
             .nonce_at_for_account(self.sender_account(), block)
             .await
     }
 
     /// Returns the current nonce of the `Self::sender_account()`.
-    pub async fn current_nonce(&self) -> Result<U256, Error> {
+    pub async fn current_nonce(&self) -> EnrichedClientResult<U256> {
         self.nonce_at(BlockNumber::Latest).await
     }
 
     /// Returns the pending nonce of the `Self::sender_account()`.
-    pub async fn pending_nonce(&self) -> Result<U256, Error> {
+    pub async fn pending_nonce(&self) -> EnrichedClientResult<U256> {
         self.nonce_at(BlockNumber::Pending).await
     }
 
@@ -242,13 +238,13 @@ impl dyn BoundEthInterface {
         &self,
         data: Vec<u8>,
         options: Options,
-    ) -> Result<SignedCallResult, Error> {
+    ) -> Result<SignedCallResult, SigningError> {
         self.sign_prepared_tx_for_addr(data, self.contract_addr(), options)
             .await
     }
 
     /// Returns the ETH balance of `Self::sender_account()`.
-    pub async fn sender_eth_balance(&self) -> Result<U256, Error> {
+    pub async fn sender_eth_balance(&self) -> EnrichedClientResult<U256> {
         self.as_ref().eth_balance(self.sender_account()).await
     }
 
diff --git a/core/lib/eth_client/src/types.rs b/core/lib/eth_client/src/types.rs
index 5fe9118e03cf..8ac5ff427fb8 100644
--- a/core/lib/eth_client/src/types.rs
+++ b/core/lib/eth_client/src/types.rs
@@ -8,6 +8,10 @@ use zksync_types::{
     },
     Address, EIP_4844_TX_TYPE, H256, U256,
 };
+use zksync_web3_decl::{
+    client::{DynClient, L1},
+    error::EnrichedClientError,
+};
 
 use crate::EthInterface;
 
@@ -75,18 +79,21 @@ impl ContractCall<'_> {
         &self.inner.params
     }
 
-    pub async fn call<Res: Detokenize>(&self, client: &dyn EthInterface) -> Result<Res, Error> {
+    pub async fn call<Res: Detokenize>(
+        &self,
+        client: &DynClient<L1>,
+    ) -> Result<Res, ContractCallError> {
         let func = self
             .contract_abi
             .function(&self.inner.name)
-            .map_err(ContractError::Function)?;
-        let encoded_input =
-            func.encode_input(&self.inner.params)
-                .map_err(|source| ContractError::EncodeInput {
-                    signature: func.signature(),
-                    input: self.inner.params.clone(),
-                    source,
-                })?;
+            .map_err(ContractCallError::Function)?;
+        let encoded_input = func.encode_input(&self.inner.params).map_err(|source| {
+            ContractCallError::EncodeInput {
+                signature: func.signature(),
+                input: self.inner.params.clone(),
+                source,
+            }
+        })?;
 
         let request = web3::CallRequest {
             from: self.inner.from,
@@ -106,25 +113,28 @@ impl ContractCall<'_> {
             .call_contract_function(request, self.inner.block)
             .await?;
         let output_tokens = func.decode_output(&encoded_output.0).map_err(|source| {
-            ContractError::DecodeOutput {
+            ContractCallError::DecodeOutput {
                 signature: func.signature(),
                 output: encoded_output,
                 source,
             }
         })?;
-        Ok(Res::from_tokens(output_tokens.clone()).map_err(|source| {
-            ContractError::DetokenizeOutput {
+        Res::from_tokens(output_tokens.clone()).map_err(|source| {
+            ContractCallError::DetokenizeOutput {
                 signature: func.signature(),
                 output: output_tokens,
                 source,
             }
-        })?)
+        })
     }
 }
 
 /// Contract-related subset of Ethereum client errors.
 #[derive(Debug, thiserror::Error)]
-pub enum ContractError {
+pub enum ContractCallError {
+    /// Problem on the Ethereum client side (e.g. bad RPC call, network issues).
+    #[error("Request to ethereum gateway failed: {0}")]
+    EthereumGateway(#[from] EnrichedClientError),
     /// Failed resolving a function specified for the contract call in the contract ABI.
     #[error("failed resolving contract function: {0}")]
     Function(#[source] ethabi::Error),
@@ -154,15 +164,12 @@ pub enum ContractError {
     },
 }
 
-/// Common error type exposed by the crate,
+/// Common error type exposed by the crate.
 #[derive(Debug, thiserror::Error)]
-pub enum Error {
+pub enum SigningError {
     /// Problem on the Ethereum client side (e.g. bad RPC call, network issues).
     #[error("Request to ethereum gateway failed: {0}")]
-    EthereumGateway(#[from] jsonrpsee::core::ClientError),
-    /// Problem with a contract call.
-    #[error("Call to contract failed: {0}")]
-    Contract(#[from] ContractError),
+    EthereumGateway(#[from] EnrichedClientError),
     /// Problem with transaction signer.
     #[error("Transaction signing failed: {0}")]
     Signer(#[from] zksync_eth_signer::SignerError),
@@ -319,8 +326,7 @@ mod tests {
     use zksync_eth_signer::{EthereumSigner, PrivateKeySigner, TransactionParameters};
     use zksync_types::{
         eth_sender::{EthTxBlobSidecarV1, SidecarBlobV1},
-        web3::{self},
-        K256PrivateKey, EIP_4844_TX_TYPE, H256, U256, U64,
+        web3, K256PrivateKey, EIP_4844_TX_TYPE, H256, U256, U64,
     };
 
     use super::*;
diff --git a/core/lib/external_price_api/Cargo.toml b/core/lib/external_price_api/Cargo.toml
new file mode 100644
index 000000000000..c75ff5851d75
--- /dev/null
+++ b/core/lib/external_price_api/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "zksync_external_price_api"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+async-trait.workspace = true
+anyhow.workspace = true
+
+zksync_config.workspace = true
+zksync_types.workspace = true
diff --git a/core/lib/external_price_api/README.md b/core/lib/external_price_api/README.md
new file mode 100644
index 000000000000..d1604bbae7e7
--- /dev/null
+++ b/core/lib/external_price_api/README.md
@@ -0,0 +1,7 @@
+# Price API Client
+
+This crate provides a simple trait to be implemented by clients interacting with external price APIs to fetch
+ETH<->BaseToken ratio.
+
+All clients should be implemented here and used by the node framework layer, which will be agnostic to the number of
+clients available.
diff --git a/core/lib/external_price_api/src/lib.rs b/core/lib/external_price_api/src/lib.rs
new file mode 100644
index 000000000000..4128c0f231f8
--- /dev/null
+++ b/core/lib/external_price_api/src/lib.rs
@@ -0,0 +1,11 @@
+use std::fmt;
+
+use async_trait::async_trait;
+use zksync_types::{base_token_ratio::BaseTokenAPIRatio, Address};
+
+/// Trait that defines the interface for a client connecting with an external API to get prices.
+#[async_trait]
+pub trait PriceAPIClient: Sync + Send + fmt::Debug {
+    /// Returns the price for the input token address in $USD.
+    async fn fetch_price(&self, token_address: Address) -> anyhow::Result<BaseTokenAPIRatio>;
+}
diff --git a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/mod.rs b/core/lib/l1_contract_interface/src/i_executor/commit/kzg/mod.rs
index f48f4b361f84..49ab7b93be70 100644
--- a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/mod.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/commit/kzg/mod.rs
@@ -1,288 +1 @@
-use std::convert::TryInto;
-
-pub use kzg::KzgSettings;
-use kzg::{
-    compute_commitment, compute_proof, compute_proof_poly,
-    zkevm_circuits::{
-        boojum::pairing::{
-            bls12_381::{Fr, FrRepr, G1Affine},
-            ff::{PrimeField, PrimeFieldRepr},
-            CurveAffine,
-        },
-        eip_4844::{
-            bitreverse, fft,
-            input::{BLOB_CHUNK_SIZE, ELEMENTS_PER_4844_BLOCK},
-            zksync_pubdata_into_ethereum_4844_data, zksync_pubdata_into_monomial_form_poly,
-        },
-    },
-};
-use sha2::Sha256;
-use sha3::{Digest, Keccak256};
-use zksync_types::H256;
-
-use self::trusted_setup::KZG_SETTINGS;
-
-#[cfg(test)]
-mod tests;
-mod trusted_setup;
-
-pub const ZK_SYNC_BYTES_PER_BLOB: usize = BLOB_CHUNK_SIZE * ELEMENTS_PER_4844_BLOCK;
-const EIP_4844_BYTES_PER_BLOB: usize = 32 * ELEMENTS_PER_4844_BLOCK;
-
-/// Packed pubdata commitments.
-/// Format: opening point (16 bytes) || claimed value (32 bytes) || commitment (48 bytes)
-///         || opening proof (48 bytes)) = 144 bytes
-const BYTES_PER_PUBDATA_COMMITMENT: usize = 144;
-
-const VERSIONED_HASH_VERSION_KZG: u8 = 0x01;
-
-/// All the info needed for both the network transaction and by our L1 contracts. As part of the network transaction we
-/// need to encode the sidecar which contains the: blob, `kzg` commitment, and the blob proof. The transaction payload
-/// will utilize the versioned hash. The info needed for `commitBatches` is the `kzg` commitment, opening point,
-/// opening value, and opening proof.
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct KzgInfo {
-    /// 4844 Compatible blob containing pubdata
-    pub blob: [u8; EIP_4844_BYTES_PER_BLOB],
-    /// KZG commitment to the blob
-    pub kzg_commitment: [u8; 48],
-    /// Point used by the point evaluation precompile
-    pub opening_point: [u8; 32],
-    /// Value retrieved by evaluation the `kzg` commitment at the `opening_point`
-    pub opening_value: [u8; 32],
-    /// Proof that opening the `kzg` commitment at the opening point yields the opening value
-    pub opening_proof: [u8; 48],
-    /// Hash of the `kzg` commitment where the first byte has been substituted for `VERSIONED_HASH_VERSION_KZG`
-    pub versioned_hash: [u8; 32],
-    /// Proof that the blob and `kzg` commitment represent the same data.
-    pub blob_proof: [u8; 48],
-}
-
-/// Given a KZG commitment, calculate the versioned hash.
-fn commitment_to_versioned_hash(kzg_commitment: G1Affine) -> [u8; 32] {
-    let mut versioned_hash = [0u8; 32];
-
-    let mut versioned_hash_bytes = Sha256::digest(kzg_commitment.into_compressed());
-    versioned_hash_bytes[0] = VERSIONED_HASH_VERSION_KZG;
-
-    versioned_hash.copy_from_slice(&versioned_hash_bytes);
-    versioned_hash
-}
-
-/// Calculate the opening point for a given `linear_hash` and `versioned_hash`. We calculate
-/// this point by hashing together the linear hash and versioned hash and only taking the last 16 bytes
-fn compute_opening_point(linear_hash: [u8; 32], versioned_hash: [u8; 32]) -> u128 {
-    let evaluation_point = &Keccak256::digest([linear_hash, versioned_hash].concat())[16..];
-
-    u128::from_be_bytes(evaluation_point.try_into().expect("should have 16 bytes"))
-}
-
-/// Copies the specified number of bytes from the input into out returning the rest of the data
-fn copy_n_bytes_return_rest<'a>(out: &'a mut [u8], input: &'a [u8], n: usize) -> &'a [u8] {
-    let (bytes, data) = input.split_at(n);
-    out.copy_from_slice(bytes);
-    data
-}
-
-impl KzgInfo {
-    /// Size of `KzgInfo` is equal to size(blob) + size(`kzg_commitment`) + size(bytes32) + size(bytes32)
-    /// + size(`kzg_proof`) + size(bytes32) + size(`kzg_proof`)
-    /// Here we use the size of the blob expected for 4844 (4096 elements * 32 bytes per element) and not
-    /// `BYTES_PER_BLOB_ZK_SYNC` which is (4096 elements * 31 bytes per element)
-    /// The zksync interpretation of the blob uses 31 byte fields so we can ensure they fit into a field element.
-    const SERIALIZED_SIZE: usize = EIP_4844_BYTES_PER_BLOB + 48 + 32 + 32 + 48 + 32 + 48;
-
-    /// Returns the bytes necessary for pubdata commitment part of batch commitments when blobs are used.
-    /// Return format: opening point (16 bytes) || claimed value (32 bytes) || commitment (48 bytes)
-    ///                || opening proof (48 bytes)
-    pub fn to_pubdata_commitment(&self) -> [u8; BYTES_PER_PUBDATA_COMMITMENT] {
-        let mut res = [0u8; BYTES_PER_PUBDATA_COMMITMENT];
-        // The crypto team/batch commitment expects the opening point to be 16 bytes
-        let mut truncated_opening_point = [0u8; 16];
-        truncated_opening_point.copy_from_slice(&self.opening_point.as_slice()[16..]);
-        res[0..16].copy_from_slice(&truncated_opening_point);
-        res[16..48].copy_from_slice(self.opening_value.as_slice());
-        res[48..96].copy_from_slice(self.kzg_commitment.as_slice());
-        res[96..144].copy_from_slice(self.opening_proof.as_slice());
-        res
-    }
-
-    /// Computes the commitment to the blob needed as part of the batch commitment through the aux output
-    /// Format is: Keccak(versioned hash || opening point || opening value)
-    pub fn to_blob_commitment(&self) -> [u8; 32] {
-        let mut commitment = [0u8; 32];
-        let hash = &Keccak256::digest(
-            [
-                &self.versioned_hash,
-                &self.opening_point[16..],
-                &self.opening_value,
-            ]
-            .concat(),
-        );
-        commitment.copy_from_slice(hash);
-        commitment
-    }
-
-    /// Deserializes `Self::SERIALIZED_SIZE` bytes into `KzgInfo` struct
-    pub fn from_slice(data: &[u8]) -> Self {
-        assert_eq!(data.len(), Self::SERIALIZED_SIZE);
-
-        let mut blob = [0u8; EIP_4844_BYTES_PER_BLOB];
-        let data = copy_n_bytes_return_rest(&mut blob, data, EIP_4844_BYTES_PER_BLOB);
-
-        let mut kzg_commitment = [0u8; 48];
-        let data = copy_n_bytes_return_rest(&mut kzg_commitment, data, 48);
-
-        let mut opening_point = [0u8; 32];
-        let data = copy_n_bytes_return_rest(&mut opening_point, data, 32);
-
-        let mut opening_value = [0u8; 32];
-        let data = copy_n_bytes_return_rest(&mut opening_value, data, 32);
-
-        let mut opening_proof = [0u8; 48];
-        let data = copy_n_bytes_return_rest(&mut opening_proof, data, 48);
-
-        let mut versioned_hash = [0u8; 32];
-        let data = copy_n_bytes_return_rest(&mut versioned_hash, data, 32);
-
-        let mut blob_proof = [0u8; 48];
-        let data = copy_n_bytes_return_rest(&mut blob_proof, data, 48);
-
-        assert_eq!(data.len(), 0);
-
-        Self {
-            blob,
-            kzg_commitment,
-            opening_point,
-            opening_value,
-            opening_proof,
-            versioned_hash,
-            blob_proof,
-        }
-    }
-
-    /// Converts `KzgInfo` struct into a byte array
-    pub fn to_bytes(&self) -> [u8; Self::SERIALIZED_SIZE] {
-        let mut res = [0u8; Self::SERIALIZED_SIZE];
-
-        let mut ptr = 0;
-
-        res[ptr..ptr + EIP_4844_BYTES_PER_BLOB].copy_from_slice(self.blob.as_slice());
-        ptr += EIP_4844_BYTES_PER_BLOB;
-
-        res[ptr..ptr + 48].copy_from_slice(self.kzg_commitment.as_slice());
-        ptr += 48;
-
-        res[ptr..ptr + 32].copy_from_slice(self.opening_point.as_slice());
-        ptr += 32;
-
-        res[ptr..ptr + 32].copy_from_slice(self.opening_value.as_slice());
-        ptr += 32;
-
-        res[ptr..ptr + 48].copy_from_slice(self.opening_proof.as_slice());
-        ptr += 48;
-
-        res[ptr..ptr + 32].copy_from_slice(self.versioned_hash.as_slice());
-        ptr += 32;
-
-        res[ptr..ptr + 48].copy_from_slice(self.blob_proof.as_slice());
-        ptr += 48;
-
-        assert_eq!(ptr, Self::SERIALIZED_SIZE);
-
-        res
-    }
-
-    /// Construct all the KZG info we need for turning a piece of zksync pubdata into a 4844 blob.
-    /// The information we need is:
-    ///     1. zksync blob <- `pad_right`(pubdata)
-    ///     2. linear hash <- hash(zksync blob)
-    ///     3. 4844 blob <- `zksync_pubdata_into_ethereum_4844_data`(zksync blob)
-    ///     4. `kzg` polynomial <- `zksync_pubdata_into_monomial_form_poly`(zksync blob)
-    ///     5. 4844 `kzg` commitment <- `compute_commitment`(4844 blob)
-    ///     6. versioned hash <- hash(4844 `kzg` commitment)
-    ///     7. opening point <- keccak(linear hash || versioned hash)`[16..]`
-    ///     8. opening value, opening proof <- `compute_kzg_proof`(4844)
-    ///     9. blob proof <- `compute_proof_poly`(blob, 4844 `kzg` commitment)
-    pub fn new(pubdata: &[u8]) -> Self {
-        assert!(pubdata.len() <= ZK_SYNC_BYTES_PER_BLOB);
-
-        let mut zksync_blob = [0u8; ZK_SYNC_BYTES_PER_BLOB];
-        zksync_blob[0..pubdata.len()].copy_from_slice(pubdata);
-
-        let linear_hash: [u8; 32] = Keccak256::digest(zksync_blob).into();
-
-        // We need to convert pubdata into poly form and apply `fft/bitreverse` transformations
-        let mut poly = zksync_pubdata_into_monomial_form_poly(&zksync_blob);
-        fft(&mut poly);
-        bitreverse(&mut poly);
-
-        let kzg_commitment = compute_commitment(&KZG_SETTINGS, &poly);
-        let versioned_hash = commitment_to_versioned_hash(kzg_commitment);
-        let opening_point = compute_opening_point(linear_hash, versioned_hash);
-        let opening_point_repr = Fr::from_repr(FrRepr([
-            opening_point as u64,
-            (opening_point >> 64) as u64,
-            0u64,
-            0u64,
-        ]))
-        .expect("should have a valid field element from 16 bytes");
-
-        let (opening_proof, opening_value) =
-            compute_proof(&KZG_SETTINGS, &poly, &opening_point_repr);
-
-        let blob_proof = compute_proof_poly(&KZG_SETTINGS, &poly, &kzg_commitment);
-
-        let blob_bytes = zksync_pubdata_into_ethereum_4844_data(&zksync_blob);
-        let mut blob = [0u8; EIP_4844_BYTES_PER_BLOB];
-        blob.copy_from_slice(&blob_bytes);
-
-        let mut commitment = [0u8; 48];
-        commitment.copy_from_slice(kzg_commitment.into_compressed().as_ref());
-
-        let mut challenge_point = [0u8; 32];
-        challenge_point[16..].copy_from_slice(&opening_point.to_be_bytes());
-
-        let mut challenge_value = [0u8; 32];
-        opening_value
-            .into_repr()
-            .write_be(&mut challenge_value[..])
-            .unwrap();
-
-        let mut challenge_proof = [0u8; 48];
-        challenge_proof.copy_from_slice(opening_proof.into_compressed().as_ref());
-
-        let mut commitment_proof = [0u8; 48];
-        commitment_proof.copy_from_slice(blob_proof.into_compressed().as_ref());
-
-        Self {
-            blob,
-            kzg_commitment: commitment,
-            opening_point: challenge_point,
-            opening_value: challenge_value,
-            opening_proof: challenge_proof,
-            versioned_hash,
-            blob_proof: commitment_proof,
-        }
-    }
-}
-
-pub fn pubdata_to_blob_commitments(num_blobs: usize, pubdata_input: &[u8]) -> Vec<H256> {
-    assert!(
-        pubdata_input.len() <= num_blobs * ZK_SYNC_BYTES_PER_BLOB,
-        "Pubdata length exceeds size of blobs"
-    );
-
-    let mut blob_commitments = pubdata_input
-        .chunks(ZK_SYNC_BYTES_PER_BLOB)
-        .map(|blob| {
-            let kzg_info = KzgInfo::new(blob);
-            H256(kzg_info.to_blob_commitment())
-        })
-        .collect::<Vec<_>>();
-
-    // Depending on the length of `pubdata_input`, we will sending the ceiling of
-    // `pubdata_input / ZK_SYNC_BYTES_PER_BLOB (126976)` blobs. The rest of the blob commitments will be 32 zero bytes.
-    blob_commitments.resize(num_blobs, H256::zero());
-    blob_commitments
-}
+pub use kzg::{pubdata_to_blob_commitments, KzgInfo, ZK_SYNC_BYTES_PER_BLOB};
diff --git a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/tests/kzg_test_0.json b/core/lib/l1_contract_interface/src/i_executor/commit/kzg/tests/kzg_test_0.json
deleted file mode 100644
index e348c5c1391a..000000000000
--- a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/tests/kzg_test_0.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "pubdata": "00000005000100550000000000000000000000000000000000008008000000000000000000000000000000000000000000000000000000000000800a42efd743e554bf21985b562e6b1f3ee3a2ed72f4dd98d76a68a1146cc9a21a86000102290000000000000000000000000000000000008008000000000000000000000000000000000000000000000000000000000000800acda5158c3dbcac23211672d2cc9c3359fc98a11a515a328ff84730ce388e0b29000103170000000000000000000000000000000000008008000000000000000000000000000000000000000000000000000000000000800a034d6369f58fa6f6577da618b1402ae4035b815c468a5e5e120833f35064d7d60001035b0000000000000000000000000000000000008008000000000000000000000000000000000000000000000000000000000000800aab90d8e21f8f6be792eaceaeaf2a7e262b8cd8b1a950cef7856d3c00d3e0fe240001036c000000000000000000000000000000000000800800000000000000000000000011f943b2c77b743ab90f4a0ae7d5a4e7fca3e102e0c3af29edc7fd00e8d0a61d41ed085b5999bd76d0ec57c8b794117edb48006600000005000000386c0960f9e67050e6b7ae575837febf738d9dd205bdd96129000000000000000000000000000000000000000000000000001da2dea1775200000000386c0960f9a255d58fcc01e78bd7f30db1c5d736a19d6de5d5000000000000000000000000000000000000000000000000018df33ae339d000000000386c0960f94f1b62090fc5498593cf8803898feecd5109b2d1000000000000000000000000000000000000000000000000001d9dedfce0a600000000386c0960f9988bf802a450b1a23b01a16361041b8cc4c0096c000000000000000000000000000000000000000000000000001bdd15e065b0000000004c11a2ccc170716ffaffcb4579f8226130d4a8625904162263a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000138ce2000000000001008d34040102f2e6ed1059ff0ad70d4e11336e3e5ad30e827e008cc2173fcbd003105e10deef0001000117285a242b48c751232df502f6448f1dbf4a1d9132f1cccfce399608c8b90b3a0a1f96e79f02ef0c7d92a6ba1968507b07a357809bf9eaf6ccf0fda94f00010013eff990900684eac2c81359f38c1b0a834d011273ae30310f9c7807464a1db77812daebf491cddd7c2c4af8b712a218f35b8f3ceeba86aad8ee402526c200010000939c0f641c18abe55b3a876a26f1720e4903c3f12e25b8b6214942db9069af66d7b664990e3f84e4633afb9c21a8da0ef39901d9bc286fad7e19d3e6690901c02aa7bf71858e06cbaedda3277e925e055d21c73be1309a36203fe4727785b409018a07091e19392f970a79e422657f4765f3c6498b0e174b862d050c05dcaf5bc50901ffa6d75a531a1505992e4c1ff4ae286f3c5336d1464bc9b25d9178749c5a0fc70901a9729e5ec3b68a9346d3dffbbb2027b1b0f40417a4e59e60fad413467c1e90a40901b4e5bfca3d03904333c9db34f701ee88c866ecab38b47bb219ecac0861ec961b0901adc5ed37ef2f96fcf6b4c8ae77d5dc254da413dcce18fbabba941fbbaeeb46c809024dfdf044fd553fd9ba2ef4251f008ee4cf873fe70182d1b2f75f28c91d282c06a1996a719fbc67f35a4344f73890c1172eb194a88cfb6b291ade6a03a87fceb351b6ccd7a8ba72fd46817f800389c924d23232fcc6a118cd1fc2a93f3a384b0535afd162716154269523f7345e0bc56795149c3dbd12ad80b8d16c271a08ce2873c63cd21f8b28275563390881110a3ecc00415f285ab6f8e3d9ba138242a46510c44a0c83a350067a6ee880f6fdcfb01ee4391e32b4789740000b73f38daa02eca7cdd85642f68cd8cf51fa015d796fc2dbcd1aebabf654bea441016b288c64f0c000bab081a7b6f92a4ec1f02eb005520b7673af201c4ebe79e761538585717fafbb39b59ec022d606f068ebf6717faab388c9c53c18fabe7838c5608820c5d2430989d90b92dd26451e4102c68af0bb1400006f4753c45e67f5311ae7255bf8889f7fe7e58b6af06d9806e5194a1c5c66d05139054ec8fb4b6000bd906f224650fc26515436b3c25a87d68addb31c6a5373f7e00f754d39119486391e3e8744f910003c67eee680524913ae37ae69f0baa481d0e4e6d3484a307479eb229bc30f479e391be3888d7ca00075aa7f75697d3feb547969a0d55f8731fead1e14041729ebd1d392848e7cb2af3914ae1318ecd9020f2f4ddce402fdc9ee7b3c86ecd111dbb325d01422bf470db82108a3abd1e3b34101192d1069581b941d50c402518ad6fdbed21958ed6c5724923454fdd2495cde5abc4bf4516ef98c3923b46bf7fe2000f6d7022ebe58dc19e751106f2cb98fd24bd6e14d8073a53d3f8e11b45c5df48b00a99e289160656884525d83a63124c30e63f37032d635435d92d49995a8f8b408dd140b448cfff621010bc3dd28788ddd82f2bfc323f8b837afc1ac6c5c1580b2091462157e0771f69f064d0d7bf52f7ebb7e91c66e35d4914a9dba6c7e3cd75ce6200914183241104a8b011521fc34fb04dc72026ec296cd803af9bb39e7dd5bf873ba5d191a524bc07d6ca5418464758476f726a9d98e7a81bdf17ac4ec7badc550129a1151b03c194c4b4034b276b9d891a6f4775fe20e1e5cc98babd8744c81e7daa3000b49c7e5c28abda1a47fd53ccec8fe0ec67794aea9e3cd392a49b88e01e96050ca4793360ad636d62a6d89ed1dd50d100393a25b769f51148d33e9c80901df92d744c1917c79c8c38fa95bb485b984c521a4253c1ac6c12035ee61226f5c417bf8114d29f36913853abff5b4c974f781edf65caff6e8293912904b86c909f9559cbfd685c0ba6e491dfafba0f1bd4300000231b5c9c8cae149bd749c383d5bebd9ee775377beb035eb84377eff29f5edac291b6103f419ce028a771a813617dc177b50fd2f2d4ea489a7f9c2b6dfbd7cb0608ff6bb949911d83cc543063aef4cc63829a471bd77f68576941d08cfd681e84f80d3e1645920171f09019ad2dc29fffa2ee724cd419095cff0605b7df10d65420c3f20d7522ab9fb81be2165a6de4ee706aedeba038f6e38ad43723329856ac986583787b60bc1f54a7f570a91b33269294c912982def982794434499fa4ce83d8a32f8629d2c1abf127af5e85f34909aaeb23a7a5450a60ce1493c3bc690643f16943df5367f77aa54a54bc8a8200c68674c041892fd6f77453341b524740e2f87d0a3df7f0ed575478a6b9041b04f0d563c8544007d64a89d51131d5adef571aa36d21bb0f9917c463b5c9906d07f248619a83b48509c798407bc4da757ab7035dcc0901a0703adc7ccba7cd1054340b8b59b73e6b8b455833b8cf427b7beee4a0f02c09a12a9096df9ef41ce9cac50cfaacf1151071f975ad45cc7125fba34a20bffab916ff36625d666f049583117e53406ad65493808667a1d3d91634cf4c04ad1b76ce2c06f7385a897f54d3bb11626357265a0e408c00504dcf29352cc80c19ea774e4a6f1cbe01933d6dbe0901567e3d3f853b2bf658b34a086e56c374fb85eb4c313829401d431924d7465d4aa180115c708e12edd42e504c1cd52aea96c547c05cbe9a44851e30b39b56297fdf090f6bf257d6c5bab3479854a280ba419fb6d5daa180115c708e12edd42e504c1cd52aea96c547c05c76a06ae72e8a8f120cf6b43317b34dba4b119b37e8d01ca2b28c514b97d2887e090171503ac05f8ca52d7cdb786cae95ae5062c8a97dac126ed9272dc7e30eb806c80901fd2e18833a48b67bbaaa3c77c79cbccee2f71b4ce0a92b5e2423c707cce4533aa180115c708e12edd42e504c1cd52aea96c547c05c8bc265e1dc0dcb7c9ecc7cbf5f7c1843c5da43bf586c40fa9560774c5eb1ff080901e8bb18c16a016ed06541ccb16b38473c9357af9322a2ac573175b7b1f9ec07cf090107ca4196285a78fd294c7947fbd5febe8b6ae006c9d658e31b60017ff3f97ae9090166df2a30dddf70b6f44a42de4833a3680b9c5ca958accae9dbf7f0b1600947f40901281c95c77398a8b558c513bea568f8be9be22fa8f1a6d5645573de661f2ee6a0a1c2fd44a8497e2fac310f4fc8418908125546f32efa28383624da04595bf930920bb58bc4b15b5de94ac42056027c1daba69332e0313f2a01718652997cd9436f8f814343cb15afa1919b850b03c4a0d28149ec068207f3c551c6c2090136d8384f8f88b18de18e3ae63b1057cf0772abe2067b98b68446b10ff458fa2e89010000000000000000000000000000000041e13027c1b52df1bd9803cf1545bf4ab94a16d168d9104f09d8766103d550bb0a01bf35d33c89f5e664ae2b92a66a939eb013ac1de6515a57ffea70d56fcf6b706619d057eab78b3a25d00ef7f39c4967eb220327371363098ab55ae8ac283be6cace684d200a01966f1152c6a8a2f9a663c24ed9440e728138744090cde391c63e8e1786df53102106db12ccc6511c9c36ac5967ccae5da01cd21ee0445c43211dd1198302ae036d5e3b2cc60a013abc0472eb8a8849953715f91ecd85ec47ef839e466dc143cd2d32c6b61349410a01a0dc9b0d01fe770f0cbed8572f05d38c58e5551d15c16d5608fc302b7ad49e0a2102a5692aad0f28864b4e3691a85974872a6ce40e6eab98b56b6d3b8236786a0da0292531210f3753091014a4ce05520dbaf7a2654d893c76a471863e356ea366e825fd296753bad41b1962c6ceeb0388076118d3a1e6e25ee9084ef2e74cfaecf782cf4003319c0f335f96911d19b0978b507111c55737118180a4607b2e9f115ff1c10ceb656a32a6f4cfbb21c8c6e0472101726199c58545f9a610de3b4061e87c21f85dd19449ca4aaca2dd868172c540728497bf311d9e0171863e7f0ea5f165f28a75168a2e392f1c22732864565c491a136cfa70189eba027acea12fbef53b81aad68c4727f3329869ee704609ee749f7a7407fb1ba20d656da3c5ff74892871546e61dda8da470c0b99caf78854120901688a021fdf7d14582bf5bd2eb5c93cf86f21171c52b86ca334776c7be06633e9a14aa5cc5f01876266b9a0abca2a77fb4af9425cc3c0f84c80c45a8236856be149391bf75bc23441e7e25070407a08efd97811e33da165d8e9461f9018596fe0ab94fa050ffb3bca242fef613fb876ab1c59ee2b84cb39b85d0df611e9380de6df4f5da1f8f02a925c8d490c944fd8e64880228050aac29f405aaa380863f232d74b43ef4408dd111745f3a9d46bda7ec362ed97a144ef12d4b87c5646869b28e6b62e8aca975afdfa753b08a8b2b9aaf55d8853d07c452777fc4c529029633816d926fdd31689a2ae29680171861aef4adc1342aa75eca6cd65fbec28e32540eeb9cc63c12a4e7fd74288094cc1e10901e9aa2c34ba3c83030e0d8f90d17ac623eb912fbf8cfbee93413bbf7329d959b00a013fec76ab6733aeb76b088570a0023b4fdcb8d0c828e9dcc8f81bb0e75645e6d419f2662152b7f4b7dfc66f12b9afe0f70362b0a6c5b42e041c3e4e9bed9df52f3dacadd60a012f93b53ae541da4ffad8c2e72ea9d77c1860404254cd8cdf8a5bff8708bf99de0a01e63866cab2b4c30eecb868b0dc9f50372b1f79ad7c93e37fb5a0ff411f5cf0c50a0123783ae730d29ee74f13dadbe6201b3063acccbadb0b768d5c80e8ce06a50d7409017282df9bdedfab9ea9fae6c127d63bb89e4c5e2bc6243b231ccdd2a835b1a8ac19a7e215f14e64c035ed9a1f45aa7f9decad368ac1292a3835f448e952b348ed2324b84d21027e577b5763f3ac147822e73df0eb878313e7e55df3db4405eb1db3746083c12f19b9d10a015f06be9c9642a6321a48bd6eb51fb69e85767218915fb4ef3e1ad12115ef907419121c1b961e6a90ac18d287abbe6645e314566d6068483ada0ecc53c1bad6918d130c5009018beba255936bf7debacdf5ae874cf4b74789861b8386733eff99d087b394c6a20a01df4b1208f951cd68e9169a4820678631882ce39999e2b20d20bc94b0f6273ae60a01dd845bf2c9bc9886ac2286d0dd8c08b0e7b227570809e3229895e49f65a298064902bbc099d5fb6d81289a8e412e9c64e1d0237b95f8899e9314631b7abf0fad93881ba7e447abfaadfc0920cc1d27e9ee7f5678cdad1e1140c4d852ca0c64f04346089c0809b48771cc695f090876af4949a5dda017af2fde7eb64989734c48bd449a895b7d22c7e20f4e85b27b0901d1b4ad97ce6833314f1374ed5de8210ccec6ac500552c49b35c486056d5c52580a016a975864c94755cc754e06fc62e04462f62979fbc2df237884199fdef76b8cf7096e352fcea326988173e6d09589571f5522c74e25834abe3e70b4ddddef84c6a603096e5ac400e164e56f8210320bc96798e6e0b5fec0470bca0041c760d46057277ed7210134d6f4e47a623cc0243610a628b008fe34865b98e100fe9c64dbb6aab3df82edfae169210134d6f442dc4493dd70032707de9f746062785a10d98a1fe54541e04a2c3fba6a25770f3904325b0881a86b033ed80ea5f81caf6ea810c94a038363a914e2bfd4bf89397f140896043438f549344692099866068fc7efbc7ca398ad874cfc7be2cfbcf493af177a976e278b076487fa4c23906040af191a524bd08b413cba0ad1f7ae3cdf10fa1a5a78fb0f763e8b958af889d1cc65742a81956906f17c2a1f17621892641e82adf64a6735ab0d469b6222445a27a0509b7334974617b086da6556919cb32bc86d310150969bfade2922350e35eea1b624bc0860fc6d1a88ef8949f6d193932a74f1cdadc3b17ded0901b91f047425ec49fcd708d173677a6a5c4294172167d6b9d3082d475119697f680901de1770af232be79daffa32d59cb27e047f3230375cbb6c6f359115ad2113d99c090101a485d8779c9a044e5957d15aa43aa8206a29204e97e578f6235eb52e23afc23103600171864a9d2c5b32b59cec41409eaccb473a7c1b6816ed36a719b35fa372f988da2d20d4a138f784e67869bbf5aaad5d664dcd05d7a47a9885d224de36f00d582d2a3defab0029281b54c6b681af3517a007ce32b98b6b01a7517f6a4e06b86e198796198f82561983b0e61ebc8b86a629f04ad9d09e9a785c984231c98d0eb041c971d9591415c9488a1690396681007c669c526d4b341486bedb9c3b8635c26b27602f7f0df7a6a0d653a140caac8c39571a923ca04ee1965836020f5cdc7d95a8ec1546ff2b8c7bec15af2af26384f5c96cfe387c870d310c40f9ef7267cee79a8cd93df1aa7d9f40c4e4ae2b7d1d4740f1e5e1ba1e977201cc6af3b0810a01b7b4e11ddfeeef52ca0c336858792be12d31db6c53b00d24a6776f4f08d08b7d392386f26fc100007ef3af95e82367c7180371ab903da968240e8720165f2d6d113d4e10f8d00279413ae5b783aac200009712281cec3fe27aec63dccb979a34e7d86e37e3b3da429e23697846a2ca958e0a011d3984ca7ed5c262e1067856cb7191d87bb7d1e8acf0230d4a600d07ca22bad2418ac7230489e80000c454190d333fcbedadfa7051049955993572cbd63cf42e68aa77b717d073c8a40901fb77b81a76104598d9ffda1152005f97e9820700085c91c332280307da83eae900810972423f7d915b94ae6a76e50f4327fb1e8b9d0e80c318ab05fd0819e639b4fd05e860183b1015058ae32bcb7719855ec7aa4d7200910ee810344e3cf034f9315af3107a4000f006789c75571d41a9aacb4465f684309aa3d0597b2c75366cde06e60bbbedf969012c000002ee00000000000000b9ef0eb0e2d93d6d27b065c20e022506f10a469215692dc4fab8347ccf84682b0061706500000000000000000000000000000000000000000000000000000000063e47078faf6c734bfe7e188b586ade665b4e478038a57f99fccd918751aa2b69006170650000000000000000000000000000000000000000000000000000000006dcbe7fcd0d4a4b51538f54650f1686c598455da5d3d4caf3857d4c6c8c8cce4609011235fc129aa7c102d35b04dc78a7d91183ec8dcebe12c0e5364660bff015328519033ba9f6c2a13297570dce587d6c1fc75835bf680950683a2c355761d8a473af1f2a9f090101acc07e9cf7f84857070a7a1f6320eb97b3e5415aa19cb3dcb262893651b0971903c55efe2aa6546051344415d9136c36d7224b5de88d5f50081448ac9b71fdb50ac10da1149173b9c112466d7bba1f647e2cdcdd6ff184e4275d59e3ff3f1f2321277c45d8ff9326dfa34100857af52b1e5c91a8768b04538139d4793ad35846718f9892a36e8b925b2b8e01b97a36abb0deeeb6503f11c3be5753c9d069dd7fd681798028313bdf09a144e8d30c05e5a2219d5f7e17e7b87e60f6c1353e9a3cd0481a52950a63256e2e403fd76b17c7229e295ecdfc3db33f44b869b3ada16dd28c2c5b91dd63b4d4e78ecac7139878371768686724262c779b02e44e6909c79dda2440adfd1f4e3da630f1b18562762c34594175b37816b749b66b0ca5180a81cdded691fa9475dd73710a0f98169e0077e37dd5bae3a8316c9c220a01fd9ffe9dfd6d0978af66e263e8dc7277c8e21b6a802c63a315f9922d8d43e3a6a10d5328bdfba313310c9d224c25772b6fa751b9d40213977d8228758a54d817457dad5de4b806b939a352c83bbde7f0a36e32e5243107b9017186586ff4762b92786831ba36ed9120db1a885d01d0d763980956b200644c7d26e1230901bce25afb1bddc81d393a7d30c196e5cf3753a0e876d4184457a9806266d3e436290a9d9896c78e9c6203892a9d5862e8511d457c70c7f63f5ba7637eedbb0f4ab76ed8ce64bf290f98114c0f326b8c018ec3ba88d28b7e146a1e3631b33af636c11a656bbe24dc43cbfe2cc429e84fb60e3bff1427493f2900dd9f0aed1df7c1510fa629ad473d2e32bddcbbfafa717a889311ef465c121784579443da935b76be97d7d06fd561934765db9344fea3ec4409d0b31b390d22f86191843d6e37d777cc8e8a5edec34e69d8cd7512f38c4cd1e90d4aab6a46c3433fb68d4b392c8850ad006bf0b94d78ea6081d51ce7b39f9aa65e254f9adb05243550fc4c377edc24663b6d78e10342a9706aaac244d001368b000000000000000000006a89e8b51815f5e8fd9e659eec56c8366856d20501bf14e46707331fc77ff92516e12cb25b0c3a0bf18a9d2882caa41fdfe4eb2119a2459da249b6bc6e3f23d4e12d1ba35abbfb0e961961328a4b2101c9c38047d89ddae6658dfc2fa241515f7b12b8ca79c357bdf4ec4aa0c2c2d6721ffcaf41107d4ec3af4257850cb66c12d0f834afc9b5f4ac808e7d80773c7d420dcdaee1fdd0f2d62e55a40209011b30b332b3d0c14d4041d58ea84b247009dcea5973fc8a3cacc21f7aa99dbcbaa1037119632437119bcd9a6b18ed9ea9ebccfbab7287cbb29a78f07e708e996654f2294c3da7277f0fadd03990d835b3838becdf9f4901f9e8e7ffc272bce3672a4b4cb989f3df5fde6f1604adf28cce47f315c72cf18f697884170e5fd57ae1034712a12495b627ab792d400000000000000000000000000012926a5b6731e66599d907c4913385770f91b103e1b072e98d12483a688f4b19309140090185ba802574057d16e01335eedc59ede451c146aa72c0ae54e419d23a671e5225a15039543c3b1e342da8ba16ea9c7dba464f74edf637dd4224f9cd1eedf6c115dfae7363382984a8772162a8a210da403f22c009203136d80171863947f55b48c65591d2d2fb62ee6858c2ada93941ed7895f9841e9851201a321993090a369ddb839ca0979e7c8c6d7cac3ebda8de4bd7055bbb218b511620d4d17bd55a09090eb9872b456aeeadd7a743ad65a50fe854d7b558990d88caaa2a8ab09b07049d09012afb31d0ff976e745a1ba27500820d92d6fca5b13db5ff96b13f51905046a4d6a1a47fd53ccec8fe0ec67794aea9e3cd392a49b88e7d4ebc6b7d65c7d59842ad93ee1a54e63c5a0df0e01a692bb464e57f6bdbffb30901ee19685744894fdc7f1f2f607e43fa01753c2204690dee07620a2900bffa7fc3312ff8017186165abc764a218ac3636196d9cf8d989974df3f0aa8b4fc13a2252810e20caa0d35312ff9017186226275857c0de7cc3bf2c0006472738b883e0829a6e5637f90a80ba4ddcfa0973f09016248f1313c0bcd995cb8c908eca722a4cdcd3c5f48a6c6db02fe2cb03a3a81e9a165477af971c552412773320c4c567228176872b3328334eab1e5acaedcc39e3f8e5dc1d57e1d9822c549b057678f25cce7fa5fefa17163d25153fe1b2f6f994e0f5fb2d47a84df264f26e63210489eeb2f2a274f2a82f8c61aaac5dd3ba8244d1b90fd32f45fee5310090151810e421c5111fda876cece5c9056080dd972a726a1e4428ab391a8618337020a0181399ee467cf03c8cd376963f8607f6e276a92dd89b19201f2137b4179f5bfaf210171861360ba191ef16d883d699184a191dbf55c7408c1b2f7bcfa70bb1a0a9d4c2de2094101b9eafba6c4c718db591fe422c98b3d9eaab1212c4217d10b7bfa96619c2a30c94f02c3931346ad190736b0fab0139776905c15dbdeeba04817991ad158e3cb31861b82a709ff11224f2415190738f5088b1bc394fb62a4a22daf0dfc14900023e60ec6d4cd59dc14959dd0a57f0d9e1907383578bbe26d685cdd03317abea7e600424a52b0593c10dea4270f7bc57f80bb8825097be8fbcb15cacd4bad0b7e6ab7091480ff8a8e566b9f33f13a09377d12e50a69c3190739b50ff653f4135296911a4f49f84aca85a6c002906ef30b7ee66193a515d32bbf51190765a2fa57d4d6e2f5ae8d1802033116982745fd5e1c51a08b0fe48b1277fac114a4d81909b5bcfe5ac6a61e70b02e52f8be996f9e3e7909aaa27a95efdfa5b528c8c433cf5dba1909130cb5d61b3701314843fc1f3cf26e69dfe568683bf5300908bdaa41da1deba8a5e9111f2dc5150b02810c8f02faceef1a14eaeb104c0864a565534f17a5152ef9eb82dd72116c06808f9ca701e7b88decec88ea71710cde44a2b0496fb2ca008a17da43138b1a3911054f269485e4113f0bc54e4ed3962928dea4ed30dc6e6acb1d28f318a696286a31610a01e98bcf7c91021dec06def30d4da8391f52e36ee64adfabfaebb0f4e31a7d01f7111f24432c1c9a293bb476887074caee2e22a5bc98b2858d6b9412dc667d6d0df38acea1d948da7ba45ba8d119a64e5498b247feaebd8b739b8f0070e47f6cb2d361a6ae2e89f0aaf5de3a5b29947bc280675ceb680c6ec2311af0017186401cd861d51220a7f456584ea2fb9f6001d2ea4c0aff83f825deb6c6de173afeed3904325b0881a86bac268ec7a39f04bd59bfeebad1668b7be705b8e278da30a00a393b6eb780edda79c097ce7bc90715b34b9f10000000001e61955552a75fd44eb3bc8a520617e7626f867c9784b0934d33df13fb0248fb79c097ce7bc90715b34b9f10000000009175577d243744580e4d3eba6d001ae4a52ecf41915633aaefaec812c0b255bc0a016da4f25e21ea9a9da707266a06a38385e4f45a7521d930bf7ac684d28dfc860e090131a49c135824a04a04360f4ecbc6867c746f5ccc530ccb0102622dd71f56c56109013e4006101e0fde5109283e76e0abb0a6496f75a63c979ef7bfe90c55a20c8c8831047cae0f1089b2c416fc546ac82f94a49374c48a6ed2011ad43b0c71cecd92f8990edb9a2db4090175505f6b9b08556a1e16c1c50dbb8c161c3abac8f3f50613e08d71037e0ec6d74170f5f9d3e35fef0d2fba6acb46454534d4fcf1d2027bd50dc1ff77ea016718c670d3def0da26a2a44170f5f9d3e35fef0d0ebfaff93008adcb69843ec9881d6b2e2bcccc3aa4b30bee9ade9a0221fcddc60a011cacced5b6f672ebeeb7e99dd69158424e69b24fa9075218dc525b51fa4c99d029d1adada9f99f1e7b9405b6770849049e59e363dedfa1a73f467405a64edd954f4f0709e6880901d6bc4f049abf9c4b0c663c1f137c302ded9772d4f923840246a2b5c0db47177e0901257acae0efe704629e1552412a67ef32106bf2191fb3dfef4bfeb844d40cc503090117391cd68366e6f2eefeec472aea267d5ed97727327927739f800b924f5d0f5d09016669faf6484b99ccf6b8de37b06ba36ced8277d91d45ddb18926ceb91bad8c700901ad8ec34ec3708e06a44070e9f8f0697fd925fc70d8115fd03b2767c5b02562260901940fea0027879592e27dbd46f7ce4c6c799e2f04415645566c340c0d318ffdbf09013b1d910ca21f4561e426cd233ad98c9a2925154a77cebf3bc5d6847a3d91075b090167b6c29087dac56105580e5f677e349bb179da137ece1d2430fd75ebdc1b22d509010b32db0729a5182cb3ad4f86f2328502c7db024a3656a057b33153f096e6b74f09014835b724a8d30ad18af48320980d1ff38ddc9b3fbdee2a6ac7f9211d9b05631f0901b10ef22029d3990a5edc1775a038412559a0b8194d37476656809d5c84f387eb09016278d477fe67124d3d3aeb8c2f5d726e6cd285bd543a5f827d33c759335b55100901a70ebe30bcfec080f540e96cd54c2b49c7aa18bf7b771b6168582113804bae300901dee3974538ddc7a0866fe26c52a389cc4c96767e5c09d3917ea04bb3395f7c2109014a4d16024ab61163e4442862311bd0fe61b720678d02e03e095437404b4b03e75979861e6a2dad8a248b8c0ea6150af75e4e48b97c1882bcea43aca1b01662ba932e546fe7d5ade1b949871e090190869960b5bd7dcfcf9447b302cd99aee59d882710ef2a0a1299920f7f7c685d09015d6c16992385cb5d833df31f4090ee6825b2c8701f92ce0477b63ce12b75b862005261657374726f0000000000000000000000000000000000000000000000000e46f3883d5c3a2477bda1bbfb8924fc5ecd14869c2d2fc38500a2faba696c14c000a8f6616edf999f5ce01f1fe1b894a726336cb13115a59043494944a072f579a4d1e7217d66d3d43fab8faba493feb42965e80cad570bb29988aab46c3b6153cb00c89efdaa54c0f20c7adf612882df0950f5a951637e0307cdcb4c672f298b8bc6f47586930205713a6a363a9d06c15d0db51436ec49fd51b8de8900ae32c2b96c096f0d5c261ad9aff66480c7b22a49e9c185589b67131e8e1099d86a3536086637cfa17816a972b63d0679c935879cfaeb6453c7c1c8c9e853ece842d12de2a0d1b7dfde9c9617fba97871e6a3cdc0a9f60f66e0c6c0f1a17816a972b63d0679c935879cfaeb6453c7c1c8c902e961595aeb5c304f2849d4c1a759413a26d8c473fe769319a18e319ace9d3a09026e708a3dc48ed3b38f705bae99f8fef0f0c4881cc5e96537f32f6d703106b50c09016fe4a5488c3854e373bdba93eb4552bfb427e6951995bd65b2c3a55b156d23b6090292e278a79d3343959e9f5c390277e32d556e615e476cf0a108f9b4524688ac47a156abb6a3f25dccdada106191053b1cc54c196deec8507d19a898613091d6415824a6244a7ba6212ee76a9d0a7c6c904a82f3e01b09015aaf9b799076012479363653434fa93b89f2822dd6150e4b56377b207f26fbbc0901f826346b5d717de99d1774a11e6b897315c60845807efda369ac20905b3f64e009012ed7a51071d0844752958bd1d67971666340bab5f8fd15c2d471a0fde4506147a17816a972b63d0679c935879cfaeb6453c7c1c8c9677f8ff1a98b7c11868d0408a7f9ba3d523562b858d34affa57ace4e74caf269a17816a972b63d0679c935879cfaeb6453c7c1c8c9d7219df5808c4bc0854d28b38fb26bbded52e00a9ba02dd85ef8285e6d0c6971a17816a972b63d0679c935879cfaeb6453c7c1c8c91749e7427159f18bb6e298b10b3679b956f41187a25bbcdc4b9b0daee8e3444c00697066733a2f2f516d556a6554533668747756766b51766d6463556372786165f0682fef72a02e4f48fea058e5bd83e1c82630d0db2348003a7514d343b80a61006f665178793452326e636d566f37476f436a666d482f30000000000000000000b589cd787e4d0d1d47e6b6dc38a21581d7a2d99c0a2a61a4db2b0b836149ff04090123f933b221f2747e4f696debdecc366a1de91271d188a260a8215ef3092186cd0901460aedc9249b63a4a2971178bafff352020838fa1fb066b099ddef723a32d3e509012cfec83d80457e553b6c58f546dd5015923eb928e9e020bc002703a6c47129b50901ae2f0a3b41bb84ac766d32c6615da315c2323727e715c6ca7eaf356d3da269c109013295ce215f546349bf345f5f7f8406a76b4a37c24167ba851c5cf449de84b6a03904a4a455de4348ba4bd574f6eaa9f4908c97ddd69ae4939bbbcc78db3a6d2589821800363d06ba21042aa1e8dac60805d1eb0ec310bbb4aa02e9c61feaf4a8879215462a9719f06e271c8d04210182219e1d25a204efca6d46244cce7ad7d2ef46033c6ba0583cf38098dbec0b21040fdd2165a6de4dc6ebcd94d5b43f27e0ec3962ac378a92c79cab9df11395fa083c1d3277c3be9c5922c2c22b62ce831b53bc81395387a23aea94411ae8d026836e206a43364996812a9d53eba32a5b22729ca729227610346e5dbad9b528bf307acda1e21df661b94eef1a5405710aadaf463ecfc73ee1496e0901f10404afee7818eb073f32117a11d500a20c73c046a0e27b52f453bf11beaa46a1a47fd53ccec8fe0ec67794aea9e3cd392a49b88e2109690fd4953c3057fb56444aeba5a904b21a5215cf37c4af87636f187b2b38a178bfec5e4693aee12dedff44f40e5ccce66ddb1c7b9fca3d919f48037bd36a73eee0c506d169bc80a4875fac3ffa2e9d38c491db0901cbac5c7603ae0a7ff05beac2bc7946663fcf627d46749c9a61436fae633ac0520901df0ee468c7b9b9c10d8b28697256da3a2a13433ca96e9d30f22ad3495553b1d2a144ef12d4b87c5646869b28e6b62e8aca975afdfaa29734b9b4680e31e370be9fc36c9b54e6523c48935f7740c3108bc03319ecad296c01718640d645e474f86fe66f2c63f0857e0aff27fb4ce12f94d4fcf320ef56a21720d163090190b19c1f41dddb2f54d53ad0d8f961ec9a866c37b50141da2932ef7f3eedf69f59524d10dbc0a39e7cea39c8626163e80cc225e64719f6c5b9404107acd41f117f495f1157516b47e17a4b8b2165a6de2b483b68e50ca45c31cb92e1d43b79be414335d8e3ae2d72889153d9bd4fdf0b6a31048c2739500077c1fab877047b94ce5b6df69d1a164a0f1164ef29985f833c0b27a6a64747ca2165a6de2b8c838f415041162cdf3cbc028978669046f32675466b835a337dd17b26c742400901313603fbaafd9b9dc2ee76867de15c515ba8a3ddac50b606c0dfc9ef3e9bdb860a014be94257e76c4c0957240e07b32bf0a494b4e72b28ff32e6c51b5660e705ff99313b890171863f8296538c0df71d959117b23991ab81cbf8793b09a2818127cfcfa4826adb86e609015b05d98d465ff9fed32b201bcff0fbf6a2406f6c98dade1505a29b0be6d96630a17163d25153fe1b2f6f994e0f5fb2d47a84df264f0c66ab9e09010b2107ae09010019933f090108afd9f609010806212009010133ae7409010a1ecea20901068018cd09010c64307509010669606409010b2a8fa809010601f0e5090107b21d038901000000000000000000000000000000000677b0eb09010c41cf7909010b8e7b8009020c2c70740901095a7281090109fde82c0901056783de090100579c9a090106bfc71209010c377173090104f1c34c09010077ee580901007444c9090200e76a4a090100564914090106b5d97909010019a3de0901036d2629090208086c30090100041aab09020c67e2ee09020766c88a09030c6805f7093704faaceb090200462b3609010ba8f6710901058faec509010b533a5a09010b6f0909090109f8fa190901056d73660901073f475b0901072886a6090101b8cf1009010264c0440901000290b409020c6709578901000000000000000000000000000000010c09638309010bfeba32090101309dd909010a0b6b9d09010c6808ea09320638faec090106106b0c09010a3b7c1d0901056d5fe9090105ddeaff09010071973209010a17304c0901019ca8c809020b61f03b090100676af40928001478ee09010bd9a6fe09020005e4d3090100327de70901008c6dcb0901004dcf1609010b07c96009020669c2f5090106706ac809010bdbbe9809010561870b0902003bae2609020c68079e0901034021c009010660d93d0901066f19390901032648dd09010aed18af09020a400f7e09030115cc6f090105d6ead3090100e5558109010660ef780901031ded4909010c67fddd09010520bbea09010c67de0c0902086ab54c09010589a7860901070e5651090106eb4b2f090109f9d2270903006593160901001109cd090109efaa8709030b209e2a090203189bd109010c67df880901000a2b32090105fd971c090202009826090100445cd0090109cd4b3a090701c197c909010b4076e1090100053ca909010c6807a009350bd9a3d4090109f07b6e090104d18eb709020491c84209010ba9972c09010b2b2f0509010ad6dcd2090100414751090202ea1dd1090107582da309010c67e4750901074faf5409010b4085a509010bda074b0901029b6ff909010b4bc7a209010b0033660901002a5be50903015e042409010b55111609010775e475090105b091920902002bf77a09010b8f00c709010289e0f509010b39f2b60901060b2d8c0901001d996c090205fcd07f09010046488189010000000000000000000000000000000006aa50d5090107cbf6970901000d9d7209020bd9be60090104e9bb72090106103a1e09010c67db19090302a8b08f0901032bfecc090109cd026a09010c54a109090109c2026209010c22df910902001831a1090205d2c8d50902002689ca0901091fb83c09020567809609010bdde3c709010c677e4609020017b82009010b2ab89909020bcff27209010173ca720901000fa0e2090101ad82dd09010bb3da6a090205a70bb509010b85934209010272cdba0901000e553909010ba8ff2e09010c680481090103fdd1b809020c526e49090107a89cdf09010b096577090109f9c5a409010829ef7b0901002556e6090100079f640901035440a4090107b21d06090205e37a1509010a16ca5c090205f310ae09010ae53901090101af593509010978121d090104eb6451090104f7d30a09060bee7558090100001fa30906060fe9e3090109daec820901023cd82409010010500f090100dc86c10901000f844b09020aff4bb109010afc8d38090100107676090106c0b79e0901089c8bd20901057da16109030a1625f009020233cff309010c614251090103e73810090109d4f6ab0901051778c409010b409e5909010610117c09010389a099090201d1637509010329bc3c090105554ea009010055bdda09020035758e09020c59cfd9090109765dcf09010b77065509010304597e09010693d5ff0902060f661209010c096e9e0901074cc6920901041362c609010c5efeec09010684f20309010bc4c98d09010bc4ebb80901056789be0901031fe67009030b5b499309010a0f25fb090106c0bdf809010ad6158c0901001d5ebe09010b258a7c0902003b5382090103266c4609010b8566d60901099c928e090109f4640f09010ae5292c09010005acd009010860ce950901070e64fc09010033df33090200c29fd20905002745410901065e5d7e09010008644509010bf29a71090300d25ae8090201a1100b09010ae0313d09010a6bd8f409010019f998090109e092b6090106b441fd09010326a3130901005b30060902000003f00901064f91be090101e5a8b2090200001fa4090309a108fa09020c6143f90902049bdf030901002f54ff09010be5f3cf09010643c35a0901009894240902063fcff80902087713c309020b7e71680901001bbbd709010babfa4109010bd0d3a5090109a178db09010017e472090208f489a9090105ce03f8090106eba5b5090100782698090100657ec7090109d42ca6090105e80d1609010b8d46f109010b185fb9090100014ed609010401a1ea090102bf6e1109010848de0e090102f7ea4c09020000f821090105d9f3040901018116d109020ab7244f090109eaed9a09010554bf0b09010c680484091a02a1a2970903012b60e609010a293b5c09010c67d77709020c67f3920903009d1c46090a031392fe0901000429de090107f0739509020c6808ed0931025b4ca309020babde7109010bcff83f090105677ed109010009588509010c67ed1009020a69dc670901036517b009010c67de1209020bd007bb0901088ae94b09060b197ff009010577ab5d0901006b80db090205677ed209010bc7af2509010b500dfa0901018b7176090a0b0f7e6f09010401387209030961737509010c677e490901003ade5f0901000bfe3b0902000b78130901065d17b70901003e69fc09010644dfe30901079dfad70902086ac190090106339b8309010c22f90d090104ec10ea090101c9dfd309010b8d5da709010a2a8e080901003bcb22090400111b3a09010201bd1509010445f9f909040bdb22f6090109310235090103f4df31090105e81baa09010a22e6aa090101af525b09020c1522d4090201f129b30901054756db09010b6f9eaf090100fb09e609020c644564090105678be709010a0502ef09010182b94f09010a6cb63909010c51c6bb0901021f4d3109020c2258a50901008abfcf09010124ab40090109eb2a2f090204ebff3609020b106d04090103a75f4c090109ff727f09010b2b256109010b61acce09010339be860901001fb231090105073d650901090adb6f090109a4f89009010b55e934090105e73d080901005ea21b090109f5f78b0901008b4e4509010567820b0901070e69cc09010c6809ff092f0b8f6b4609020b32ace109010207a1f8090104b4d5ac0902001eb0a2090100146b92090600f0a9c709020c6807a709360c15164e09020000b20f0901003575a5092503fcee1e09010a4127e4090100c6a402090205b0a97f09010064f1a4090205678dc909010069334a09020b955573090109fe7a6909010b2a989c09010687a8e7090107a09c9409010a81c1d509010a5a33bf09010c66bb1209010a32db290901003515870901055f03770901019cd93c090101571730090105678f7d090109cdb2160901000923c8090100e7171f09010030f41609010b17c7d90901054dd2df0905048d7abc090101538ff7090103ff66e709010938ea8309010000002f4201e5111d61f778000c515cc13278fc6fa250000b20d5853902c5a0525826eb00198ea73a01f04119e726ab07dbf5d1323eaf68e46f0008061fa53927c1250c1e32fe0133961d32287da4bef1000a1ecb9b3a06b5ec39cf3965067fea23323b13b95877000c617784322a4cf9fd2d0006625924322a9a3acf63000770e63e3ab017421402cff90b2648ac322811cbdfd90005bb81993a16345d84fd7ba006771350322811cbdfd9000c41cf8c322f58aca323000b8e6e9132d4e04b3c360007649f72391ef1b2e7fe60000c2c69cf3a0743da7c0b1c4708181dd232285e5fd7920009fde3c73914fcc59bb696ff056747893226fde45ecf00005797e4322a18d8824e0006bfae4732356b3cedf3000c376c6d322811cbdfd90004f0967732db65bc758c000073e7b6322f67162a2e0000743752329f7f3d0eb5cb00e75fc533216ac8e375c000561d0932f640e036610006b469933255aa0fed21000019a12d322f67162a2e00036d11ce3a0ec9c052e1baca0800f85c3278a1f544e2000003f9f9324df4f65319000c67df913251da5cb3af000b24ff1939354a6ba7a180020766b1ce3271823e01ea000c68011e3a343b838e24f88903a766c73a01435982a96300052e733531e35fa931a0000046273a322830402975000ba8d5df322f57dc0560000117fee83a0ec0fd33aa32000b44e366322a6c38eeab000b69876a32270b2fcbaa0009a5ad6b323c2d72f73b000556cf6a3a3830032768a0000bb23f913112309ce54000073a596532357a7712c10007287b3c328dd089866400085e6193312d79883d200001b8cbef3229770747e8000a419af53942af372e6f20010264acf732bc926e31bb0000028a8d324bf72208b0000c67077b3a03761b910ee9000c08b8b83917642f7a93e4bd0bfeb0de32c4e6e72ce00000b2c027316d23ad5f800001308cce39124b95997c0aea0957158f32285e5fd7920000903f65390793f3c34e50030c6806043a2f7a8b284b0d220638f2e0323b12d6d9110005d03aba3b37b810daa23fdc0a3b71f539019fdbc389019c056d601332bd2efc5b7f0005dc81003226e74eb8450000af040e390728a1bf38f000007195003b257c71d9d67eae0a16e2143a14f68cc320a078019c89ca3b9a6e7f18365f3902d458a031062f3f95a0000b1d051f32277d0a778400006765e13a26080a264e369000043a133a1b1e27620155000bd9a58732a7db68ec68000005d782322a4c295f6a000032762a322933aba83b00008c61a2322bc5115f26000c67d1c93a1eb22be53345000014300c3a07448a4b8298000b06031e39065bc1c2d7315e05d2adbc32270b2fcbaa0006604aae32b1fee9a95c000bd4cb403234cf082c5e000b951344315af3107a40000561873c33e7dc91cd9228003b993c324dc4ca1fa4000c6800363299e1cdd54f00033f6a0e3a056594fec7584a0b951582312d79883d20000646b60d3a06bb6eb3f15c15066f0be832356e4fb5f70002daf38c3a07231c46551a4a0aed136e3a0643f444b194a50a3fb741326aaf505b940000cdf3843a07cc564ee727180594fcb13a0139dcf5e45bdb0b2850a632b1912dfe130000e522fb326b804190e200065937073a0820accf6a500002b4820c3a2bd23a842363160c67fde23aa03a8b22428f5505209e92322e72af2b4d000c0b3a2e391572c8c51ff82e086a9b313a523ef0b8932d00058884be3a1772f6cb55239806c64f943226e74eb8450006d5dc133a063eae9072467b0c60b8d93903e28a86bcb55901665829390e3b276187c40009f9d0de3941b4e2f9cd009e00658ca03251b4632f30000c5268c73247fc441bc0000010fa7b322a6c38eeab0009d9f5e832715f4b59ad000246170c393822042b7380000ad0d95032f745047b660002da86213a052f09f7852cee0c06e26f3a1710a4c929f0940000214d412b85e64d385c77b30009694f32297636aa250005fd944a32b1d618f7a300020083183a08adfb6136a4b2003c28ac322a2f8bf63d0009cd3d6d3a0101033d331c0001bfacb0323744c4db25000b3f3b9c323d37e08f8e00000532c6322f67162a2e000c6800383a32558ca5c52da10bd9983332b2aa765d240009d628a0322d910c4ed200041209b03249a81d9a880000001cf609020491c5e1323efe56dded000b94ee213902f5d84a4647480ad6a75232fa28e81f6b2f003f05e13a02164b8d282d0002ea1de13236a0e12586000678bd583a04b4106596d6ce0c0e701b3a3cd5042bf7fb20074748003a0d0393910a8a450b9bb088312385416c274a0b40549b3901a305729a68dc0bd9f8c63a02fb5d0e94eb76029b6d39323df73d9e49000b2daa043a13d3fc726a7b3f0af9e1273235e3ae6988000029fa563a02e02b74baa996015dd46f32fa29b8bd2e2f0b5506b63a2421dfc3d1f5eb075444923a037a2968c32800056d1af032e702fbc5e0000055ca393917968e9bddd0080001fea83228203566e4000b8ef68e322f57dc0560000288da51322810fb4216000b39f2c1322701a401500003b7a7853a0d39d8902fa80000066915324dad8d947e0005ba36213a21fb6c3f63a66905c643581102d106aa20eb32407fe232bc0007cb5f9b32c46d7b5a6100000d9aff324da9c2063b000bd9a3e232278e0f90ff000405f1f139037803638fd62f04e946b03a01df501fc3960005d038d13b30f58adea393940c08153e32e5bf87528b7402a7fb26322770127cf70002dc122c3154536ec440f409ccf4583908d0533492945d0c526ac03a01b09b3908ad0009c1f0063934320e8087ff610c1b5e6732f8cf62d450000017e9004101633f21bfaab53405d2c72d32993ddafd1740002678f932271d64e0f800091ba0e4324753be443a000567478e3226fde45ecf000bdddebe3235ada42c9700034a6a64410122129a8a42fe000c1ad0a93946b350891e1386000b1a62410dca9095f543bb890700171f316d23ad5f80000b2ab8a532d9bae8b7d8fe0bcfaee7322f57dc0560000173c42c322f57dc056000000f87383a4763879fd9270001ad5872322a6b6850e8000b31a6333261c4c82ee20005a709c532d114f29e1f00062bb81f32323f7f4bc3000272cc643a04142a767bc011000e503a32356a6c5030000ba8faf6322f58aca323000c68031332ce2977ddb70003e179023a01ea112ef75f5e0c5245b231651e854f700007a7e510327e36e2e51e000badd1c5312d79883d20000b0948c6390e232b7f90b18009f9c0cd3901c981369935a8081d25853a02db4480c5136700250cda328b033b890c000007995632cb246690640002695eb43903ca5465a9e85207ac1aa83a02748344f70b0005e31241322811cbdfd9000a16ba0a324db2e87ca40005f24566322fa33a0b65000a3f3374322add966f10000b8f8651312d79883d200001add144322a5c3421fb000918ccfc3952be7de57809690420d23532270e12e4a60004f7d31d3a01e3662d9197400bee5edb32942c4198ba0000001fa5421fb4f598aec9fbc305d034883b365663bb27bda109dadcc339023b57fab9abc8023b72b7322810fb42160000104d7f322a5b6384380000dc837b32356a6c50300006316c8839237dda214e6008000f702d411c85284fd99258aa0c680a013a1ca575c01115000aff423f3913d173da3cb9ee0afc54c5390a1dd6054868b0001076af322a5b6384380006c0a59e322add966f100007f36510322811cbdfd9000559058d3a0105044d7b72be09e8400c3148c2739500000a15e993390adb2d23d4f1c90053bb7a3229606bab7d000c5dd2f5390496452197357c03e732933231bf70bdc70009d4d8633911a601d552c7be0516fe1e3b2a4015f26990c60b4081df3a47fd952fef7c2f05d036aa3b34c1a6c9bb52fd037490e132b4faaac71f000134ba45322c199bd1750002dbe764328cd77d63f5f105552739322f58aca323000024b54e3a12c21704b811000000f5d1324db205fd3e000c59c9583a23f10a92d0d7000c6803153a2223f0aad3b31f06648fde4102fac121da0b06510b76f9c23a1bd716e4db0900030430af322a5b6384380005d030ba3b2e3fba4a4bd9e30c096cf132356a6c50300006b079ee32270498fbef00041358f5322830402975000c5efd2639dd8b4acbc77a1805be472632270b715c550000002a3b39c060f02190c8000bc4c5d232942b70faf7000bc49f86322810fb421600056749353226fde45ecf00003921e44102ac9ba10837c000031fb92f32718ce7e674000b5b327c3a01a5b28f1525000a0f1880326c95ac800d0006c09a98322add966f10000ad48e973a0d0f9cbaa2203a095834d5411f2178e1a8ab7001001d574f32356a6c5030000b257bc13912ed745f2db6c6003b539b31940307c2800002dbc10f3a03f7f77b2d9cff0b85453e32fa29b8bd2e3b0992c0663b1d0f4231a8990009f462983297ff1385f2000ae4da1a390468b4d98d051c0000745f3229460a76b00008115b7b3a47d8712a5b7f0007014da33226e74eb8450002d9a53e310a1443614f4005413e8f31246139ca80000025e081324df425b5560000c2964632b33c07301000002728623274f1bc97b80006293bac32270b2fcbaa00000861c0322a4cf9fd2d000bf24cd1327160dab3900000c2f2c63a12b83a3fdf3b0001a10d4d39d88c554f4c22000adfd56839042a69f4f3fba00a64d62a322a5c3421fb0000196c88322e90a053930009dc4dea3a0f35b653d0b87406b43e2532357a7712c10002db8b1d3a052baa2d561de20a4c1bcb312d79883d2000005b2e2539333fab2c9c7c6c0000028e328401ab13430005b3148f3a0ce50f476c3e260c355294390a9f639fe0e00101e5a2bf324daf8242520000001e0b41019cef1dba180e34028ed6a039018a0c4092045c099996f53a037afa87bdd0ce0c5dd4fb390333d8242113d502b6623b3232e663e7c300002f4d7f32a857c9b986000be5f07e322be432833f00051223573235b6418bc900009894523a01191a09bdfa00063fbd9f3a012e2a4d79260008771082391179237adc68440b7e6ca93269d57a4088000c515cd039153b43d630197b001ad4053228210604a7000b94459d3229561b2f22000bd0c4be32b911de96b000096b03c632277d0a7784000017e2893273362bc8ad000a4b3fbb312d79883d200004461c2231f5904616e000070017223901ce692d85d0ef08f47ffe322a08981ad40005cc9a453a054440fd31100006eb2c8b3a23d6a64b3bd30000781b5b3a0bdb2f3e28709b00657a0d322967cd231a0009d4263c322f67162a2e0005e7fbfe3a45aeba54a0a7000b85f152322b176c3a44000b1856dd3a21c930528009ac00014c3d4107f67b64c9c589c50401050032abab044e560002bf5a793a0b2f4987b940000820a29032270498fbef0002f7e7c439226a8e88a3cc460000f5e03a2402e3036eac0005d9ce71322ced9fcec700017fe73f411a60757d070cf2000ab2c07232356b3cedf30009eaec2c3902a8c3eef4bdf10536bab93b0bb897ffdea5290c6802073a18b53e98fae366011911c73269bcd814a600011eabad322810fb4216000a291784390398664f09f3a70bfefcb63a02ba5971f628d600b1e4593910bb4b0ad579260c67ee413a023175f84aaf00009d197a3a0985cb050e8a7602c0dea33242a4c825f3000003ff353229770747e8000b1fffae3a04ccd605d8bb0007f05a5b3a0149cead855e000c6803193a2e8727771b48ff0a6de00d312d79883d200001f8aefb326ac4fd8cd7000babb53239bea2a1819f49e20bcfaeef322f57dc056000056745ac3226fde45ecf000009413d322a5b638438000c0e77ca3a3e9c85ae3d7ea606f90fb43118a5981233000a5caff431766e2fc0f63402ce87dc3a14ae70a14d97000c01a96d39122116f028465a0bcfaef2322f57dc056000088ae0f032dc59a05317000b19584b3a172396df85cd780544f49932270b2fcbaa00006b60b33a012db205b6b800056745ad3227b12bf263000b5d01403a075ec9e69360a30b4fface32372b4625be0000f97b5f4207212ca7732656000b0f10aa3905907cb88de7b40400b0ad3271e1f57a1900095fdb52323513db4e6a000c1afa8f393f9808a3ac5731003ada48322f57dc05600000004065422a566631615bb5b800004440324c2a9c9ef300000b6e9c322c91ef7fa50004f62d423944d0e9914ca00406589ac2324a872ada7400003bec053a044295fed86f030644d56432356a6c503000079d46e43b09e6cb6ea4eff2086aa23c3a2af736c9560500063336033a08ba03e4cd19000c22a54d322811cbdfd90003b30853322d858bd6a40001c9c26a322a5b638438000b8d5454322a4cf9fd2d000a2a713532b5f4a848f00000204dbe32912d43f9cc0009e8ae443148c27395000009e8e55c3148c273950000001113e9322b8da1817900018197123a04d45bf4dc3ccc06da451e31020a1f6a7900034a9b4d3a098577d4ae7c000bdb20ed39a5c06a979d684101572437410140500ad528f01f02a835dc322966fc85570003f3970d3241127f3e350005e804de323b2b84f0b5000a22632a3a070aeb2b01585705e8cc8a391930514375200001add14c324df5c6f0dc000c15185432495f5531120001f11b9342018e78b1397ed9000a60083439012d908be563250545776439277c14d8cc4f7c0b358554390843669f6bb4e100fb054b324bfe9b57d10006e346b04104dca0ca6af1c8c50567493a3226fde45ecf000891af2732285f3075550001828d41322fbe7dbf9800092dea034103810f6985c940000a66ea4f32b4e297a855000c517d543259f4be52f500020717fc3a0cc93f03899a000c672eca3358e0ba35b3000c2258b5322811cbdfd90000131b163a06bdd7efdb2a0008127dca313691d6afc0000124a56e322ac972a1cf0009eb1fb43a0159195a41640003b356533266b5a26a77000b103ee939064fe25927e76f039acc16322701a401500006107c5b310345b9830c0009fed9d7323a40f7389b000b61a0ae322beadb349d0002be170b39083b2ffef84aeb0ba7419d3a0e35fa931a0000001f7926329d5411b6b40004a3dbe83b1e7053e20c7ba508feed23324ba179dcbe15099d6cf53a01e664745bc5020b55d8d0323c28f4989a00059174363b072f2bcf9e07bb005e825832285f3075550009f5e22432c17732f229000057c1e2323ba81b62bc000bf6e3fc312d79883d2000056747933226fde45ecf0007016e073226e74eb845000c6804913a2ca0e536ab5d910b8f6b563a039bbf383c98dd0b32ab86322beadb349d000207a211322f7720ecbf0004b4a830390149c21822556400011e7732357a7712c1000013e14732dccdbd29320000eda10c392ea24f4ea033780c68020b3a3348659e826a4a0c14ddc033ed1b17a818340000721f3229596991f000003558e23a04c43bf509890003da1243391069d0b428cac30a410b2139027cae0e8d70d5000dbfc53a05b7b60044e80005aefea23226e74eb84500006145fa32bb77a26489000567493c3226fde45ecf0000233c193904bb4ee9020ecf0c51976739012f0b2ba3a0000b90564932dc877e70890009fe54073902114e1a1519300b2a91993a0104ae509d09000687a60e32d41d81fd4800078f11223251b4632f30000c67d1d73a1e66a2ba70a8000c5268cd3a13a79dca1b67000a78f227390b3c83fe966f7c0a59c3d0322685433432000c66bb1d3ab9fb739325a5000a326b7132730570882000003499fc32ac97e6125400055d1385322f67e6c7f100019ccdb439d88c554f4c2200015704ba322a6b6850e80005674b133226fde45ecf0009cd90283902f25cac4379e4000913ab327db8ecc83c0000e6ba96322a6c38eeab00002ff8bd3ac38f22a3e60a0c0b17a27e3901af152105307305488c9c32f1e2a3064500048d38093a025f94052c290000c52e4a32b433aab01c0003b031e93b0ba92c6de0f24c093898c9323b9b11868c000597bbcf42397f022f767c7a7c0000002489010000000000000000000000000000004d070a5197895200000000000000000000000000000054070a5bd9006d6ddd63ddd4a2157b38227c662e6d7952854772e2f3579dfb6bbe6a81973055070a5bda000709fab9fd95a8a0c200e329921b1b8d6800f788144e4daa7e50acde6057fc94070a5bdb008ffe7c315ac533335a182ac2b299acffe92810b4d5a6f3392b44c18bbac8e384070a5bdc0000f66c0a665811bd0cc14d319339151f8f59ef9ce4205ce2da326a8fbcde8512070a5bdd009fed2925bae3fdcc8e876587ae7d84a49bb7b05a241c01ca8c641ccb28e27fa1070a5bde0056a07be9babf358e6939609d16bdaaf25d0d7d5ece9e955b7e61e0fcbbc512a3070a5bdf0009900c19f7270a23399e2a1cd7a18623ba071b7d024853be75ac912159ebf289070a5be000bd852a8b80acd256fd209287595c4a4b487c82d16bac6a306b9ade6148f8ffcc070a5be1009982bf903474e958933dada56128d7003252a71340d03bd2a93baa1f47f7f4cb070a5be200377be92ff2e22a80607b9682548b57db6a1ff7b4e853f81d79b1e06a8464fc97070a5be30061bd1f1b93743d45db854d7f211309f3eff323ee728152b1b97d956f2c4d3823070a5be4009290725faece0b8804c81b21f62a92b06acf54e28ffe8bdf870aa2ddb7e09130070a5be500697b1c38d6b9582d41b8adf4a41a0ff6c20e15bc81c3899db7a61cc594f448f6070a5be6002efa65cb2ac822400156a605ab9a435e1d3d278e825efa3f2435cfdf652bedf5070a5be700c162bcb089f06c0cfc7f00e2e4863e2badd3e086db45acf08b852b4e5916208f070a5be800d8839e92cd3f6b32e5db6dc273e928e88c3fa42e6aaf46d0798640745bda4712070a5be90074e96903c0088ba0a33ba5f1f3b0df345dcbf84d5a1ab344b56961964430218f070a5bea000f4ffcffbdcf3ede64895966ff0004b664165bbe0c5ac5877fa9a2004cf4e991070a5beb00f9226300947636f58fbbfcc0b2ea48fe6b8926a42fad01ad8bf17222532377b3070a5bec00144e5d780f5e8e63ab026594b2b646aaf4331c29c2aa3a98a8b2a2232586bbf9070a5bed0042c638e91fae55af2f7162c90be63d81e7d2a8d0c9c9b0e188566b1ef0f6d801070a5bee00f856242dda26db04d3bde02025e471aad0ddd5e990d3e0d56f0e963503c03ac4070a5bef005b5ecbc123ea027d3fd8fe859b92ea983a6bb09d02926cbced73163d353188b6070a5bf000c3574ca2d0b213f6580d8f2a4db53f9cf00cf62bc1cbf37bb5ee4aee314f7fb5070a5bf100baa903bbb707977a5dd902a116c217f00a5f5a3ebb4054c9b5912274d5d1e3b4070a5bf20013c90febf653fb0348d9699ddd7d8947d59ddb1bbc32035985a47cbb24a2be60070a5d68007ac4b937f9565187f243c181707b57a59fd1f5f39987b15b33419a63ca72da01070a5d690072d1ade4dba274d2e1ad9455a658036f58bb8e6949f61b8e20420ec2e9d61ec2070a5d6a007188ebb23df5cdde059cc951110a7f73d528063c1605776c43b0eb5770d32928070a5d6b007c0fdbe358890e7bbabd96af73caed7804a97cba21783a050b88674cbb567a65070a5d6c006b4c52b358482aecc9d32e881bc54015fdf330b2c8e9dc2eec54074d684dd39d070a5d6d00b94b9d12fd4bcb411a316ffe858dd56ac6911d118663cc99fb84eafdf7095937070a5d6e00f1c1ccb97fc759e38fa46bed43b4f3be2f317cc73ede6e3143f23eb853e06b7e070a5d6f00e13d13242407f1de4f35d773c34319ff16b3689e44ceed365f6cd63680c3d030070a5d70008c29eb8041bc65d83ab58c2da3211baf91181436a3b63841ad747622faad981f070a5d710090303b47416508494b02ef5bc09d8c5ebd82aeb714ab5dbdb5d3ec2daa8ee5a9070a5d720031cc2923a8c7151887f9ba4ecf0200e239f34e1069e9f965997ddf0cb53b5d22070a5d7300f91229b9061141167361f7434fd4b72bf0d3e96e780c07a772f229e8b92ebf3a070a5d74006b4df17ac3c6cf19bd6c9629fbf2da722dc1170911a1773e6e7893135064f1c9070a5d750097ca97d150a2073e39dc94f8b0d9a9a6f88420fb532854aca77603f1675f37eb070a5d76008582c2e971c1b4a19f2f3fd9c3f4a89e36894a60abae8c4c8b2522027cb15338070a5d7700dcb00fc263f4cc921eee1c92673d6eea3d0b2ef62973104e5e8578ff34684204070a5d78009246e2bfeaa6057a6094f47c3fb865dae8b3c37a14580fcd3b1077175be4052d070a5d79003365ee5d0809baa3b40b430e00295269ac70b3d8a7cf9a7e1495ab27bf27b3c4070a5d7a00c458c29d92e8a8f8794f6feb4cec8fa54472c8b3c3a3a3a3a25ff76f657a08c1070a5d7b00ee18964a3e32fa71b872c951d43e130de1401309ce478cc0b5de678fbaac113e070a5d7c00c90a52fbf38019fafbac330dc28cea28f37ff93d139af7db00f9437ad1c0b042070a5d7d00fafa57de19eba9f28dd376ca2a6536fd93e85c7d833340801e060b5d68959def070a5d7e007069c6eb8fb74dc61c32f9a7a4ee845ea4d2ffd3e64d411e3bd60b72cead5e37070a5d7f00022beaa918accdae2feec5f9237a2ee83d4b82f265ce10a24d772774a1a42400070a5d800062a78e575d55449a5c44085e8d183504e8423d19c22de694a52e50bc5bb1b082070a5d81008cbd7b1bf67f3d8bec0a0414099c3121ec834fc71571065f15eae86df2650ffa070a5f4600d4850de787c7f43b65848bd2704a33411ddaac19bbe343c76f36fbb226c09f7c070a5f47008bd4f9a36128af6473be2cc7f3e6185df45d207b9eb375c4b3896769bb7d9395070a5f4800f8f2044fea300a28e9baf449e9908308b7cf41cc3c94207c7c2cddbd80694a21070a5f490095956db16a70150ea5cc2dce87bcb0bd142a8de3ab43b76e1be7d05b6be6ea09070a5f4a00023c43e4072d5232341c2f8f7105118e040f75b94e8d8514d1897c0d4cf8f374070a5f4b00cb2355cd0e3da87b2fca7f1e10bf45ea7ff04b6823728cfbf3ef28ed50b1b9ea070a5f4c00d0766acdca630024fd9e93dc0faff11e4088f53382b9ab594a3e0216fcf8dcf6070a5f4d00d4af8767239c07c84c2d913447ffbbdd2eb208a6442e2b73b1479ef8052f1c10070a5f4e001031fc14a65bffde9d99bd4217249e0702e3c1292a363dfef4d0df3c87f646c9070a519800040dfcda364264a10250a8351d85760e5f1c792e1b9db6bc5bd1de2942992163070a51990010a917a1b1b18c06b4185c56a71d7324185a40157e4946c2a220c1b8cc6b8125070a519a009143965d07019d59398f22ebc20bd7ec5ec20ce33528047b5f786329a4d37a16070a519b006c01d762f30c93b4c3013d4ecf8a9949439a474ccfe9fa2ff1355ca2abf0a303070a519c00d96f7c034e15beac5793b085f44ef0651af9a93a000a7a4b76b41b951836d264070a519d002b08d63b52cfb758f53ec40ed6b8336fec91385f9314120a481870e9ecb29ea4070a519e0082c62bde8e27cb11b1830685f112856273ecee17840f761b3c1f8d999d49d6ca070a519f00e18edf2dbd13501903870e36b56b5a567aab1cd0cef198c4fba92c2c834c4641070a51a000ec127887571a1cbed8589954e486bafced260a12cc4d64270eedbebc8bb3ad5a070a51a100007808b24cfac2044ffcedf329826092efb7dad9071a3386e34667a8c6e207a9070a51a200ecc041d8572ec21390650cd1cac935a8de9b47e24097071cd8d867f1cbe5db6f070a51a300584739c60fe19e4be6127ae4241430e63758e1b8dd181be3ec1127561e5deeaf070a51a400561f4aaa956190fe717f30152dea97e9a79ccd8f8c5b2641e36bc5abf578303a070a51a50083dd8255250064311b6cdc7447bb2fe2af5734fd9a740e2f7bd7c8ece9a85ad3070a51a600b6a3cc5e298d2d526ba7d457f291f82e1bc23374e50dcd30e89039febcddf767070a51a70008508bc8161c992ddf482fdb73912e60937b8b8276e7befbdd4be54eb506398c070a51a800bbeabe7a3667da4b51a8b94b8ed9a3fcbdbd5b26bde1d58060fe49dfabc0fafa070a5bf7004a280ec902ab384c80401403f27f293f9fb9b64f3bf0312ffb380ba16b32fb25070a5bf8006d20d1f212370912efa1d590db2e560c18886f5c2d74444b3782ff5b0ad86960070a5bf900e35b3c32ee3db94bb7360466f310a021147325bef615b7ebfd4b244046dddee4070a5bfa001e0dbc9f581223db8c0bc92de7823a7c60f3f4c87062364a4f359461f49578e4070a51b489520000000000000000000000000000005404cd9b8b194faed20b243cd9d10b00a0dba8c0fbbba183fffffffffffffffffffffffff95aa3ba0c094696d112972607071247ed9ddf00000000000000000000000006f50b180a44533df10180ffffffffffffffffffffffff8346000000000000c05cdff5d0a500000a44a69449fd6824ad9b95702b410a44a695b10248edd51289e8a7cca89bb648ee14afe9383b6137a30055ca673903bbd58314d3350055ca683913dab918c8fcd300ae069b095b00ae069c29214b5a810600b1fc8b1902388200b33c1c11aa8b00b1e78621014b1f0d0a3f8c060b130c6808fa2102556bc106e2e8ac71060eba4d771d5f2580c4f55af0d806dfe728aa240000000000000023899629915b43fae0e5eb9edb06dfeb88a29854d091fffffffffffffffffffffffff8446d0306dfe72941049f5e4e0000018806e2e8ad1109990c6786d379435fd717081259938d77160532a9ed0c6786d4990682c5a4e34ebeb12fb14d5983e8634a22c20a0c36b9b4792cca63e4bacf5b5cd10324d2a8ac2b0c36b9b5990477339d209eab7ccbf87b6165a05c39e4150602831e4f4202fb6929df376a5102831e504102fbe64019dd65350b8e7d874904e6167b4922d798500bd2b8504918650127cc3dc800000c6807c14a1b1ae4d6e2ef5000000be4a3da4902b5e3af16b18800000b8220b7030afcb38b4a04e6167b4922d7985009e8ae590901022d52a01af3d745022d52a119f419330775cf5e4155fbafdc33c988000a21c72842d1f3c1295de116ad0000015639711dee449a58b305c673c01924259a000f0f3d490193f24bd6d41100000ba74de54901040ac1d852a1a41f0000215041e9251466e89f46320c1608bd03000021c64101c477b9126962cf077630254140ea3a16c0959bba009dc7e9030c6803331303050bc7f393427672bb4157efc3a90a38ff6d291b6103f4190a38ff72f106e1000000000000000855b5b3b66a0000000000000000000000005b8d7f0a3900fd99a05183cfcfaddf218bfb3cdd50c9259c7c08100a3900fe614b8f82b2fea145776931c3580c5ea8a2030c02aebb81c86d6ea56a1115b76e77ff60a3bd7b2f0b98862d893c0000000000000000000000000000000004e468a05103830e756d6e90c1f6840a60470f4921aa81897338b5df6b04c7e4bf5203830e756d6e90c1f68401b401364a21aa81897338b5df6b000f7641490193f24bd6d4110000000f76423a16148d3144922e041f12ecf101810000000000000000000000007cb9ffffffffffffffecf0504b95f11604258eaf5909cdc071e8a2b2a49315ac04258eb0a13b0f43acedbe1a5c683f1d1926ba5391134fa7e00153fa441a2ceb660153fa4539041533775289600153fa46110100015408bc3138682b16a000015408bd5105207a0234ee0d634c000155a137390846e94ae9209502d98b76096b02d98b772914e31dae59039809cc298c39e3218a03980c01292a115dbd4202d9a56e11d83c0542e1f3494efbcb440149940000084b25ca0305c64e50310156768521d40c23b1e742023b4af5ee4800000052ea914a4ef98ffa61d1d121d404cc8e927102a44d95485a4cad0f075164febf04cc81968903feaed71e34638bc44dfb75189dec1a4604c272d4aa0f000000000000000ecec162a8f52c310118b096c304c272d5aa4639526cd70000000000000000000000008c1859f204c272d6410109a3b00000005804cc8e93190186a004cc819731024c57b536340c2cf5c281017c1d7b9875cea9b016f67a025c06d20c2cf5c3992dd01d70de3fd1996b3392218d84b5c6b5506f0c2cf5c481017471f7d38aaa339b93033f17148a8e0c2cf5c5992d26fc22f757aa27d0f6ecadb03b20fff250bd05918767095205918768290fa9a8ac5b05a4deda31058160c9fc6305ae0b3a3102da016d8e4f0597bbf12a04cbcd780d0c680a272a0aa6d5da510c680a28290fa9a8ac5b0b3dc6c70b01072b4fa5211e3a627f0803977d13074a00d1e36022030176dd00d1e3614902b247fa7757ee000009a4f8df090103f40694090103f40695419f325f4a4e0a91d903f40696420b9163762a3984a703f406971117d703f5ca7e5918babe0c3f8264355d065f03f5ca7f5901cd18a7d5250e029941030b81673a09010c680909a2974dfe99c61e93bc863fc8091f8c6948f693b58e03cfea0509020c54a13f030000928a1913ec630000928b3a01d02222f7ee1f0000928c09620000939829900127da480000939949045f1622cf1cb4925c02cef47819a71b5b02cef72d39086727102ac37109c0754f090106534d6a8902cb15f25e1bd992a6be8194dc6fc75d310652ee338937000000000000000000000000000000000c6807dc425aa86fd5c7f81c5c0b2910b641b432ebf0af45b1420c4b625842b432ebf0af45b1420ac1147841eb586625c40c51cc07782a0142eb586625c40c51cc005502ae19766e41005502af3a0ad21d9f971e8d005502b0096c005506dc299139616b28005506dd49046e64158b4d62942c085da0520901085e61ef090100001f3e22138ce20007a8a0941902bb740c43d98f03003b544a21047eaa720c5480a1030b1216cf0b010b2b03d421016d63950775e4de191f5c36074fafaf198a956c06b5d9d91a21a32409e1e459110fc201af5d8e03029b178f194349820c5ec3d8030bac5edf0304cd9c331950755d03d46f17210f91b3590544110e0309a8606522015d537b029ae042210d9d2f72000f851e0305f312ea81ffffffffffffffffffffffffff9da130086ab5a221037bfcd300f1d782194c4b400046083422037bfcd30b0b04e9030b46da6c1a1afa8a0a6742bc22017b46330935bbc6030000219f2137b6a3a401b7ada42202686ee80c6022162101c9c38004c2732f211bdeacda0acb35850305942c2b0300274627194c3af209cd02c81a65f3be001994a919124c0703ff7866211a4fba0a00aceddf1a4c4b4004c7e4ea210f4327ed0a293ba51a2c88020b0ae8c01a75512b07cbf31503036e1acb220129bdd20153fa591a2ceb6602f7eb110300f0aa8f220214a5730102ee0d03025b4ddc0307cebd8d03008ff8922239a47ca60092d30f221dcd6500084bb4c6030687a92f030c67de5919976e6d000092a91913ec6309fde86f030a854f3729010becb92609f83ffd123cb109e1e2c0210301632b000021d11939565500fa05281a74a37b086b56641997a63c00199762220177c8d70a32db7e1a4349820ae031ae1a32442d0c643349030a3bc80019e287c5044b21fa0304b4d64b03088b1ed203034a043a1a53e83a09c179bd21018722430017918721030c4d520b258ace030b7e946d19404db30ac22e420306378d32030c61447913016902bf6eac1974a37b0b2076f01927192409eaf0c22120daf6fd0c680a361a1529de09e0930719a1d339086ac1f02101d42d5d076870660306706b42030c51c6f4194c4b400300f28d1917110a0c67e4af2102985e8609dafc861a1cf36b0ba6b530030018327f0309f9d264030a3bcdc41a170b070548bba821381fe6750728854a2106b5eb9908570d4f03017d0e2a030548b65519121b9c0597c0602286b4dbd405150aac03059ffcc6030339bf551a64a225058a22ed19fdd40100008330190e5aa80c2b4d42030c61447d0bf2007fc4fc030c67dfe219f8c2680c4956af190da9e809eaede21a22e0810b2107fe1a2387070c644247210b4aa8ee08e7907c190f42400829f019191895ec0c680a38220f54816e00e556a52184eb185400c2a10b220d9d2f7207750b59030c67d7d419e3a89400fbefa829012aadcac000a64da7030bf926de03005b4161030a22e712194876e303b209da0a010b90c1be0305fd9627220423714f0389a14119c93f77000040a62901b38092c8060b2df31a09c6490719cb2a0301f71ead0309f1890203056d7414210265b37404b8be370303cda4d821017b463301bb1af9030c67ee6f1a09c6490c558922030542e2442256e6e06c0c1e31270305fcd106210171f8530a09848d21030be47c05d483fd1ab4b3790bed89a21a0f424003bd2b6a19c966870400b3d20307711d662106916061007867af210423714f0b770726210129bdd202a8ec65030c23d02c0303a7fd1421037248d80ae580131a365cd807582e02192ceb66080621c5030b6353d31a0933fa0ba997881a2778340b14abe3030087fd6f2202a5692a0687ac4c2a010becb926002538d4030b209e8b030c38c9e10300147a2a210125a6100bd0d3f1030601f16219f0e4250c5e3ab31a64a2250c6803622102a5692a09f5f7f522138ce2000ba3650021012657db0b6f9f091a61dcbc04083fe21ab85abd079e007e21370b6ea00a69dcd21a0933fa0c680a3c030c680a3d030b9555fb1a2ffcfb0583c73d19a3f3980c67d4e61b08f6910c5b016d2109404e43098895ac03005b096503072296d01a3ca16d0aed19351a4c4b400c680920030007a0372a012aadcac0010e020719277834095fa58203080631ee03099761c11917f6de057dee3d0304c25216220f20476b09d445bc0300b1e84c2101542d7f0ada781d03005502ec19766e41002a6e1711d5c50ad615fa198b00e40c408f11030b60bd1c030b5511b521015d537b0693d68a212050fd28005483bd192fbf8f0572d34e1aaee69a090adbde03000024ee220201652e03420afc1938173909f9c6061a1735df0c6445fd1332bb0c4d126d03074fcb7b2102fbd5750c59d5082101876df40a15d24c1923cdd20bc86bf0210b4022e101a437d60a0109a10adf19204a9502cef4d01104900c680a400305865b30222791efee03798fec2101dfd52d0b33ecad03023a9b01030b54f6cd19d4b5300a2a8e9221012c9fdd01bba05b22032dab8c03fa370921083faf3f0bf8ff1703054757bf0303971d731953e83a09dd5306d1026cfffffffffffeaa06cbc6293affffffffffffaca8f0a9d0b309dd5308b9019945ca261fffffffffffffffffffdf6d885ca3d3875a09ec7a50b120fd2ed5c663fffffffffffffffffd5fe2ef583868390c44f30bb1014c03a6c93dffffffffffffffffffe59395970c4a2409e7ef9ab90176fc97a9905cffffffffffffffffe22811d7b48ed4fc0c4d079b030548b67542c9e3d2c58796218d056816ea59037bd927138600d49b4d90054da50d09270bcfaf66030a46e7f709010a4c1c3509010c5bd888090109dd531342209277a35c2c78a60b9aea8741209277a35c2c78a600fbefbcc99c000000000888a7d3486ee8fc000000000022acbedefb5f5e00fbefbd090100fbefbec21b12dafbfdd0c316fffffffffffffef05a67c16a75940000010863a35316a253dbddd58131cd890c451d92ba08a4df4daa4772ffffffffffffffffa925507d569c417e0c2e5ba34b2c0084229a1569df370c5ad8644b0ad5346741605a9e9e0c2e5badc20208bd18cfd592ddffffffffffffffeb8fad8f6a3a87d0bf088a0e048189944a67fd8887d4068d29134fc834980888d993890cffffffffffffffffffffede8081952df0c5d6a5e930db4fce241dd331254b45955e759b9906c9303d46f36c96100000000001de9d0a296be1400000000000716c5b3a2c19a03d46f38c201698cbb5c309527fffffffffffffff1d706c6154911e07f0c59b2efba1a61815fe4c121fffffffffffffffef77fefeff0aa5724042b6310c2014443fe6005c4b2fffffffffffffff34cd852b7ebecc0bc0c3c7a4faa14c2b90b47ffffffffffffffffffff2fd9791c6c700c5f9f89ba0ae726d98d041bffffffffffffffff92af5393f35e5c3d00906feb1903cd60009027a141053b66e17d45c8c7008ff8c42239a84a060c60fd6b29056986fc3e0c60fd6c29109c5d155b001a667129109c5d155b022d7a9a29056986fc3e04c2642a69029cd0dc9601befc844e95506604c25506891a99f2e294e69eec28fa1a6b7c16767aa104c2524fc1010000010000000000000000fcb116aeffa3332d33f00b0a04c25250aa7433e70f1b0000000000000000000000000000000006ff262b4162ebbefa000020c504c2642b11072404c255073148c27394fff2010f3865030ba64f0709010bb2404f090101053fb3030a64e88f030c68093e030a15fd4e19219c8d07af16c303029b17cb1a42fbfa0c68065a1a06a0980b93a5fd030c68093f0304cd9fb31ac47e710a0352ab1b0c4033060647131a4c4b400c680a59030c68025a1993c4db089ab9a3030b72b260191557fb0c675c0f29010bfbaba90574fbde1a4fc54f029b1a471acb2d600c67e71a030b4cedcd19b8848c0a854f6d2a010bfbaba9086b56cd1a97971d0a629a691942fbfa09f46490191ed0a907209e531a5b8d7f0b40a2c7030a38ffd6195b8d7f0b0966290309f70c441b155dc209cdb28a1a26f6c80ac4d56919debe710c68025b1a06a0980b0b3aed1a4d8e300b0374da1a2ec1ec0548b6ac1a121c1b0c680383198006490a6782ca1a01d3e80a74b18d130c16058bcb9111519008ce49311176c70589dffd210326ced0058bcb9311cf840a46cf031ac96a80022d539f215b6684f709f66f8b1b155dc20c526ed4191e65060b437916030b3cbdef19f8c4c00871fb5b1990b19f0c680a5c0303a7fd3922036a2d9b0903f15e1a93c4db081258dc030b17f0ff1a43236f08cddc0a22026ab6f00a0395bb1a12d6c40a4684f91a20807006dfec2219bb6a710c649e170309851e40030c680a5e030a3e1f4e2102c677480a0f266c1a23d3540bf2a29f030a41b3ba1b0c40330c67fd060305865b6f2127939b3707ab051c030c6806663357f30ffacdaf09e1e3004a02bbc099d5fb6d81280bc3a2e5030a4453cf41c05cdff5d0a500000c680667030bf2a48303005483f3192fbf8f005483f41a2fbf8d005483f511010f0054953531023d3340b4fa00549536310236c03d4e720c50989e0a080b243d32030c23c025090804b56839c2d6dd7ab17898f622ffffffffffffffff2fe802be26151a7504b5683aca02a36f4789fa589414fffffffffffffffadebcacb20b1ca37004cd9cb28952ffffffffffffffffab92170ec0b4ed7e04d06768190364bc0c5f584e0304b56840c99897a77f8874d8e4a400000000000000004f0f3a878a5763b104b56841d105e853ffcd7b1bd168c2000000000000000637c4cedc5e64372e04b56842895a00000000000005e853ffcd7b1bd168c204ccbf0331367f0f4bfb9d04b56849c904fbb05e29a93b2adf00000000000000017bdabc4ad2329b4e04b5684ac90fa55fc849c633e2170000000000000009617f4a280cc9c31b04b5684b89970000000000000001f4abf90938c67c4304d0f752190331710c09470709020c680a6a030c6808193b4139ff1553628200d0e46c3903fa9a0613d57700d1e3c34902cd764c1a0ed7dc560c68081b030c5e8ed2030c680a6d3b4139ff1553628205876e804119d3a06ac81297150748c19e390fea68184f55de0afdf701110f0f0bdbbf2609010c5fc9b8098c0c34d7b909030bd65d4609010b8f018c09a00c41d03109c80ba8fff709910bcff8da09010bbb02fd09a00bcff8dd095a0c160cfd09010c160cfe09c80b859b3d09040ba8f73809a50c22a7d009f90bdbbf2909640b4ba04e09020c2adcc209780bd65d4b09960ba8f73a09010c22fb4b09010c22a7d709010bc564d311012d0b859b3f098c0bdde48509010c5fc9ba09010c41d03709010c2adccf09010c3f69dc09780c34d7c509dc0bcff30909010b4ba05009d20bd00885095a0bcff30a095a0bbb030309010bd9f60609640b8f019409030bdde48809780b72178909010c22fb5309a00c3f69de09010bd9f60b09020bd0088809010b72178a09cd0bc564d709010ba90003090101b402314a21aa81897338b5df6b01b40232390d74cd588d20000c680822030903f17e1a91ae9e0c68094e313086afcfb4f50903f18259045b800d5c97ce6b72ff2d0903f183410f87ac9ab7364f710651176c390c4611e277011400bc17a53907b7a66cca943300bc17a641265ab3c59e3f772100bc0e576964988e2f9ca76382faf3a116e900bc0e584903eb051ef2a61f90a200b1e8a121014b1f0d00bc149a6964988e2f9ca76382faf3a116e90c68095159015c76b8474f383b7749e808e0734169fe412349a007b6375cbbe79c4300bc14a1590182b58557823d4bdad23500bc14a241312772e8ee420f780a3f945639011648c153fbfb0c68082559049f6505903d636cf816d20a3f8ca40b1300bc17ab694e7ca90becece971fd4fdc2b1d065117724902706925fa818562160c68095319191c050c6809542102556bc100b1e54f3910786ceaf8a97f0a3f8ca6590d32a56f7537d7531ed9f9004c69d14101192d1069581b94004c69d209330bf1cd0b09010bf6e4a809010c09473741bfc0251dd96f547a04d01b80c95a0000000000000000000000000000000000000000000000000575ababd1027100000000000000000000000000000000003a6925fc60e0cb057f68a4413b5870af75813c370b243d48b12f47d6f93de7d412d100000000006c8de48162dbfebe057fca93d1027100000000000000000000000000000000000000000000000004d01b83c9530000000000000000000000000000000000000000000000000c5f5872a9438b05bb3e6e93dd000000000021ed231b1b090ac40c67f860a90301b8236a6237e80000000003867715cb273eb69e0c67c289b10c1127813160048abb000000000667b65640bdebec310c23c0455103c530c2b6a7500687aa0575a294c95300000000000000000000000000000000000808ad477f33fb05f3ce5fc99500000000000000000000000000000000000bbcd5e2e44dff0575a3a1c95a00000000000000000000000000000000396e5a6e245acc860b4cee0db111ce59aaf96c4721660000000001a672584024dfb12f0019fb5f1106910019fb601106670b8e452049056bc75e2d631000000b7c17ab4a056bc75e2d631000000a5bbc6603054bb4ede9440000000000000000000000003d74fffffffffffffff69b8ecd66ab61054e942d5901bbcf019b03df3c7f5ef7054e942ea10a6b3d75f2eefc6aa202326efd8f51d74b6abe8c00002156412b85e64d385c77b302db8c563905bb61e44c980004b58913421a67835a763b5b6403d46f524201698cbb5c30952801e36ec70309a4f954391fd7ab9a6e37eb0046088439514dc947af5000000021a342051164cdb739473101b7aea939380d19109f100004c273d34202874b1e2668585904079c00391aa4cb2630f102036e1b56391b0028e44b00000153fb38390415337752896002f689273904bd39622592f2009038bf41053b66e17d45c8c7002f56bc4102b42e2f31b30b910574fc0d39072d8e0e5b01ac029b1abf391292226e1c5da00a21c7ed390b74c7f337512c000092dc3a01d02222f7ee1f00fa0594390aa87bee538000001997f13922482f38a444ea09dd535039019945ca26200001af997c030a38fff6390855b5b3b66a000b7e8cd83a05d7359402c0000300f3143a0217907aa9c46402db89a7410591d35e956cb2000548bc4542051803f39d8e974200ad94b403004b24863af5a61df9971b9404b2453f0302009a06390880740a6b53b200009e8e39017ecd4caaa38408ce4959312d694efcb4000155a23b3102183722066e0589e0193a491f01fe8f8e0705d043e9410b1db9419116800000fbf00e421b12dafbfdd0c31705fd992e3a03e28a86bcb5590597185f392e7a36d85e9d05054bb4f93a0964713299549f0c680524420570a9ec4ff40000041f14093a130fafb46a0eea0087fdc3393db799f395cba60978133103097545af41015c2a7b13fd00000000215731343ab826e82908cddc4839382f51fa27dfab000871f0411b12dafbfdd0c317010e033b3a03947134637b48000024f131122f43d0889706dfec2d3a1100df58f432a904c252ae4101601cdf0989b552005503383a0ad21d9f971e8d0054f28a31689786263000000024f2392ebbb29f84fa31072eabf33a243dbe4b2ae6a30a3e1f9a3a4079d386312e3102cef7e3293abb90b98001bba0d3394f9c26095777f203fa37b83abf35527b40a1e200ae0745490452103a5bf1b02e7f00ae074f095b00bc0f2d490452103a5bf1b02e7f0368c5df0901000040fe422a566631615bb5b8022d53e21af3d7450313f97a1a1e6506000040ff421f8503008a9ac636022d53e319f4193301b4028f4a21aa81897338b5df6b03940b233a12c6b337e1696b022d5696215a90d0ca0313f97b411b2e51a2b6e9dc56000f107d490193f24bd6d411000003940b24490121ca814a8dfd200002649cc51176240283205e4202fb6929df376a51000041002901645ec4560052ebc34a4ef98ffa61d1d121d40283205f4102fbe64019dd653503940b2549076b9d4ab2674d200002649cc611762401b402904a21aa81897338b5df6b01b40291390d74cd588d200000d1e4784902cd764c1a0ed7dc56002fc8fc4270f5f9d3e35fef0d0b835c84410142001cdc61ef77028320604102fbe64019dd65350052ebc42156e6e06c0b835c85410142001cdc61ef77000f77863a16148d3144922e022d53e6215b6684f70394b1ec22047eaa720030075f31144b3e47de000394b1ed490649d2c967d95000000052ebc54a4ef98ffa61d1d121d4000041012901b38092c800d1e4794902b247fa7757ee0000000f7787490193f24bd6d411000000d1e47a22030176dd0b835c86320f30e478b53502649cc73a11d560af29644a003007604270f5f9d3e35fef0d08d99f3919aee69a01aea5494207a8c34d91966e190c527b021140000b835c89320f30e478b5350b835c8a410142001cdc61ef77029b1adee9b2000000000000001292226e1c5d9fffffffffffffffffffffff34d2a002a03ab89910317b59202b2d6e21d33d0732911ead5ea68a02a03ab96107a49cf3be6f948543b4ccc60542e2b6421cb6f85fd2e7522305439e7c7972986ad9ec2171280133565bc1183405439e7e39aad11b19a6df110197db7a030300f320c9d80000000000002671bf58283800000000001ec0b7646c9f9b0300f322ba0217907aa9c463ffffffffffffffffeb0565f44b7d60000304746fba01d6319aea5c25ffffffffffffffffed94ee172678145809f94876b234709d919f80fffffffffffffffffdf222e716e36a6d0c512557b20cee422dc8bdffffffffffffffffff7e54f60e21e13d0030076631144b3e47de00003007674270f5f9d3e35fef0d0052ebc74a4ef98ffa61d1d121d40052ebc82156e6e06c00233b0e6903ba8b37847ef8c3ffc592bcb30019a07189019b7e6885e057cfd94de9a8455396707900198dc6a9030000000000000002f6e8d8c462d415303fb8cb4f001997f7aa072f4327ff0000000000000000000000000000000000198dc741071f5d130000025c00233b0f1133030019a0723116017a24a3e70446096c09010453eede09010589e04fc101fffffbfffffffffffffffc46bc87d924c806938931d1d40589e051610378b0bd195189daed0d205a0589e05211231c0ac46ae3b901c3d46bb287adcef6cd04830000006aac0d08000023570ac46ae4b901c0f8f4becece38ae623e3f0000006a030c1c0000231f0c00e4a23906d70b1e467ff10bf3e4ac3916d589b158c07c010e0342c9a7000000000000490c067e0d4700000000000a24b91278d9a9010e0344ba03947134637b47ffffffffffffffffdc1a47e1fef8c0000229c717ba03947134637b47ffffffffffffffffdc1a47e1fef8c00003971e0cc9c6000000000001fc8ccc254b6700000000001548988fb4860303971e0ec275b37816b749b66affffffffffffffffb3afd9060c1a60000bd60722c201c89324ecbf867bfffffffffffffffffed7f934dae423db03a3cc8fc2322b1eaac33cc0cfffffffffffffffffdf78fc98ec308bfa03c5d197c241bfc647074d6f20ffffffffffffffffd55ee3384505b02c01bba0fbe943000000000000004f9c26095777f1fffffffffffffffffffffcd25474021967c5990613ad4cd34479a71cf4baa64d89aa86b6ea11021967c66102e2b4482a1b2ee4eb879bf8038dbb085103e8523f4cf16f1ed2dd0b625d544a0649d2c967d950000003971e2e4275b37816b749b66b0c67dee11305f003940b8649076b9d4ab2674d20000c67edc25103e8523f4cf16f1ed2dd0c67e2224a0121ca814a8dfd20000b3335bc030548bc6daa160000000000000015fe6b958a1def7b2cf821ff360548c0a861042836d62935a138f80f16550548c0aa11795d0548bc6f3a01152fa1b7813a0548bc70a937b364758d0e8b5f112f00000000273e350000000d08d000b56b0a0fd0cafba3ad4f70e7d61fc008d000b683ee58ddd1b8c2f74c59836726c83e71df08d000b7000100035ecc00000000000000000c69eedb60a6ee1c1836839a00000a2e57af1808c13d946bf79ddf75276a1261d2e8a4010308c13d958a58f4196928a34ef1e38bf9eb6e563960a908c13d9600010064a2c900000000000000013ccd5ffdf7f0100da967dad4000132804b730c09055b19720223674047a2a8812fc88d18197409055b1a8a544052657586fb99171be9ecfa6ba5eeff09055b1b0001006b52a80000000000000001498433241b4acccd421a55860001470d47ecae08e377ed7201d1dcd6d55189793a0ee38e0ec608e377ee8a4885c9fc86ada7510bef25bf71909cfd3508e377ef0001007a995f00000000000000015503947fe177358efb0cb881000176413e64a6090324767201e00c46e709866855c283a59175090324778a4aa365bf20a7829253d7578b234b063f6b09032478000100776396000000000000000153d079eca60d3516f8003da200016c518e770208b722047201b3e0ce972f08a410243fda658d08b722058a4416ffa7197831ba6277e542ecea53978308b722060001007f46ff00000000000000015883aee435fa37cc54002db9000184b7a9f43a08e3886a7201d0385e2708b91b559228c33a9b08e3886b8a485fbde0216f13213f417922fee6b9d68708e3886c0001007acf02000000000000000155f77a5323ed060f907a6318000176e312076308bb0e1f72021c48d97beb9eeadbad85fcec3408bb0e208a534efab3eddd71418465305ccb9ceea7dd08bb0e210001006c582300000000000000014c0467b830910343bd1c33f100014a307ee20e0969582a720225910be4fb3f4c8c90bba311ca0969582b8a5489cf1ee3eb5b7f2dab62b0361a6423d70969582c0001006b1766000000000000000148fecd25bc194a292d88d184000146576fdc5402db89f8410591d35e956cb20002db89f91a24665e02db89fa094802db8c965105fb1c190a119235e19002db8c97292715d230a902db8c984119092b04800c5cf00a6db00609010a6de0d709010aa19645030313f9b01a1e65060313f9b1411b2e51a2b6e9dc560000410431011321bd066c000041052901645ec45600004106421f8503008a9ac63600004107310174f70cbeee001a672829109c5d155b09a2bbf70303f40749419f325f4a4e0a91d90045800f39cccbbc3146ce8f0776079a429fff2b067f516068077603f30308086d3e09f108086d3f09eb08086d406a7996fa92b74084cfbc0180000008086d41f10835000010ec000000f0ffffffffffffff1452f91da725adde013a80000008086d42692e8af4824003cf2d4fcc00000008086d43f1173600002a78000000f10000000000000024f02b92d0e798e0114f40000008d02cf9096e08d02cfa292554ab87ef09093f3811414a09096aaa1113960903f1c21a91ae9e0c680873030bc36da2030c0bcf6a0a010c680996030bc36da403034a0510391719c7cf8f2a0408056dc803005484943a0d22f86191843d078be0f4a205d500a31e181944dac576d7972bbb392118112d04b5893e421a2aed139a1a95d80c67f8a0c904da8c9cf14366ebf8fffffffffffffffffff429dd2cc03f540c23c0a8d10553ccb59180a60ba9e700000000000000000005ab45276bb00904ccd0ccc151b1e495bd8db569000000000000000000000000000000000c67c2cfc908d4a393227c5018f2ffffffffffffffffe5dad340290462b60c67e53a22dbab80ad0591735a09760591735b29280593239805ba423c2101ca15e405ba70301129320597c1083209b6307c9ef40c6806d71b1beb8c08cddc7722026ab6f008cddc7839382f51fa27dfab08cddc79093308cdde5231116faa2d3eba08cdde5351019551bbe22fa1be472c08ce49ab210132320508ce49ac397510d063daac210a854fb3c93600000000002a21baf2469b0a0000000000021560470250760a854fb5caf3baacc5ef4619951effffffffffffff0c52eb6bea66efa0000aed1a22ca056050d42eed289e11fffffffffffffffa9ffbf025b034674e0c5e5208c2164927047cf102a3ffffffffffffffffe9b817330b3535660afaec0fca03760813504663a0cafffffffffffffffc8a29584733bc29b60a854fb9caeace0ab76b959c539effffffffffffff153f0e0c4a77c9d999034a051ad10456fffffffffffb1e59cdfadb8c00000000000566bd9b48d92d034a051cc14c5daf3ddfd8afffffffffffffffffffb3afd83bf3f024640366358eb9349d903cb1fbb7ffffffffffffffffffcb6bc2115c695f03686a39c102aabbc81b6feccbfffffffffffffffffd55bd2c5c15dc930356e057c14957ae340c0a9462ffffffffffffffffb6b55025dc36c2f2034a0524b926a7b17bac3315ffffffffffffffffffd95f27aa471b7e076d04484a01f9e8e7ffc272bce30458953c090103d01fd809010a6c2ff10901097c00680901054140020901052e746509010548532c090103bb90c00901070018080901056c5a8d090104cda0511a0bce710c5f58d9d103919a5f7f294feaedd3ffffffffffffffffffffffffffe19f250b8eab2b09010b9516e709010394b2b222047eaa720394b2b3490649d2c967d950000005865bd0222791efee05865bd12127939b3705865bd20933058bc6fe310bd3b219ac7b058bc6ff310ce03235a917058bcc2a292e761055cd00afaeac09090087fe09c10100000f000000000000000ed816fc6e728422594141ea35008825f9810b6f402e8d0e272e8fb5d3bd03b809d60852cbbeb91faeea7320a15c982557889e0000018f8a41950000844f04d0eac819b4ad700b4cee5cd9015f85daf9d2acb27b5c9b00000000000000000000000000b4ad700bc3a9e90303fa3823e9b6ffffffffffffff40caad84bf5e1e00000000000000000000083faf3f03fa55849910a46349a418ab5b0a0224d1e45227f5c8b91703fa55856107dc4d22178d82fa15c449ac0ba762f2090106bb6a91790e6ea4e5039aa3aae12cb7bb080d0106ba30c589b700000000000000000000000000000000036e1bd8c980ffffffffffffa430d578ee330000000000048a400bccaae0036e1bdab91b0028e44afffffffffffffffffffef134a81ab02db3b40c3496a6b124c297188c93fffffffffffffffffe8f536e0937ec42038aff47b913c2ffdfc4550bffffffffffffffff39ce58e97e69b119036e1bdfb90466e443e5afa6ffffffffffffffffd3da3152f4db9069074b456fb902b18229886eb5ffffffffffffffffe4fcca7033b085ee09e8e64809010c6809b709010b8f6f2f09020b9514db090202649d383a11d560af29644a02649d391176240c5ff8cc03028320874102fbe64019dd6535000021684101b9eafba6c4c7180000216f41e9251466e89f46320000217031343ab826e82900002171096b000021d4599d0409205c3e4991d20274000021d5510889add24f258c858ff1000021d631047aedee1eba000024f4212e1850350c556aac4101b9eafba6c4c7180c556aad3101d0af4b8c110c556ab009010c556ab13929c7d10b73563f00fa0672f108f2000000000000000aa87bee537fffffffffffffffffffffffff8b5c8500fa08af99d082926bbdd876495e4d2fb6317dec698f960a00fa08b061623e58cc4f9e902575730d0a03940c773a12c6b337e1696b03940c78490121ca814a8dfd20000bcfa5c9030b1eaeee122d1a0b17c8fa120c8f0a739ef712762402db8a611a24665e0a445449127cba02649d4e117624054bb595113d75078d41db1167af041f1455117cba0c6809bc030ab89d8712105b06c715ac03072eac8011f06a0bcfa280030a7db2bb0305876ee90b720a3e1fdec96700000000000c0435e82b4c5300000000000265646355344d0a3e1fe0ba4079d386312e30fffffffffffffffd79d5c1e1172380000a3e28f4ba37135f7bd40e4bfffffffffffffffdd80ac5edac06bcfc0a47afa7ba078f75e3ec7266ffffffffffffffffb43b2f1620112bc00c3f0b9faa1ecf3267d2fffffffffffffffffffecb3c045ca24c0a528342ba01d6df573e45abffffffffffffffffed9101a146aef4fa0a46cf6809010a4b40d409010c32a294090100ae07a6094700ae07a72911ad41501500b2155a3115220ce302d900b33dd531065703ddb40d00b1e60e3910786ceaf8a97f065117b1390c4611e2770114005b121f030b82a0e009060b7194b509010bcf6882090108b8450709020c07007e09010a6c4f1a09260a5ad61f0901059188b4e95200000000000000000000000000000000000000000000000000000000059188b5e9460000000000000000000000000000000000000000000000000000000005917581e95a0000000000000000000000000000000000000000000000000000000005917585e9760000000000000000000000000000000000000000000000000000000004f2809c4902117006df65270000049e222b3b14473ca46fac5e06c5b9240a0109fd90710309fd90720309fd90730309fd9075030c67ef2a12485009f421e91158ba0c6783500309e1e370210301632b09e1e3714a02bbc099d5fb6d812809e1e37211017209e1e4f829a6e77c559009e1e4f9519a2c2bda491472f295bc09e1e4fa191f8645004608fe22037bfcd3004608ff39514dc947af50000046090009280054801e3102ed2c26c7c80054801f49443c9c50dcbd675c200b835cea410142001cdc61ef770ba5d886030458957a0901052e74bf090103d020310901097c00e409010700185909010a6c303309010548538709010541404d0901000024fae957000000000000002ebbb29f84fa30fffffffffffffffffffffdfe9ad2000026759907e0e6c231b1c5abd756e3cb1f008c1d3f0645000026766103c0b69ad26b7f2f4913e62f00bcf87f0300ae083603002fc9584270f5f9d3e35fef0d0a21c87df1013b000000000000000b74c7f337512bffffffffffff2e0c3ed6a21ee9530a29749d71112bed02928d501af17b6c3597300a29749e8916927103ab543f0b242e7af7ee27264563029b18e8e94effffffffffffffffffffffbd0406000000000000000000000043498202b27be3794ee242faabd1e8658d4bde25c2d48102b27be4794f1dc83b5b375b1fdf53dd62f6fcfd022d576c29d71734a637022d576d215a90d0ca01aea60e4207a8c34d91966e19022d576e3101035c52116f022d7bb829056986fc3e0c5569380304cc98db6939c2c91aa2d5a9b4bf3f4d5c2004c7e178a96d000000000000000000000002e7cc2b9e42ae0f5304c7e638b10ef70093cc33ffffffffffffffffffffffcc245218d904c7e179421453716ffffffbd004cc98dc1903e83c057005b6a265fb552603d446648c1c202229b94f4bc564cdd4057005b77a0235312ac1af335d27a8ac6c8daabf0574bc0ca1387308e6a4b8eef0007353243e832c19a9a544b00574bc0d712e457710d1a7940319e8f5c7ebee057e18c3a13a83aaea30b52b770e72fb39550265b01f34687a057e18c471365c41a707e69641f4fb8b67750c09a2310b71047cc88526c5259f4fcd6d78fcfd08a6213a69dba95cbdace21dd664ba87d30e086b5809999796e90000000000000000000000000000000009a2310c11099908a6213b1101d603f407a7420b9163762a3984a7078d420f410b9163762a3984a70bf2a7450300bc4e240902000021b22137b6a3a4000021b342051164cdb7394731000021b40948000021da3901033b2e7650dd000021db511796012d3ab7bfa14b19000021dc2102dcb2ee09ea37f2030590b470c90100000000000000000000000000000000000000000000000005d04b102105ac35dd05d056503904a42ab2449f7605d04489410b1db9419116800001f466f30300ff318b03026e527b094f026e527c000004a77024a7e000000000008583b00000000000000000000000003bd209222105876f404119d3a06ac812971505876f410b7205876f4211184506420aa349345346dea2241209ad06420aa4198ba5050748c2a9593d93c0053d3ed733008f5a05876f4409010c242a70410e2715c359ff41840c1672bc420211426309d2f7d00b206baa410211426309d2f7d00c35718403072ecb739105593d58e3fc248eb7e4793283971984f2fc072eceab6972ba271dcc5da04324dea3123f072e9af5a90800000000000000000000000436225502d4b96091072eacd3a172a50ddb00000000000000000000000000000000072e9af642014b3169ffffffac072ecb743104322092fe90072eceac095900001d5dc202c90edcfffffffffba6e944ffffffffffffffffffffffa500001d5e5a053d71ffffffffff1628b80003ca1ab20f6600000000000001f9ffffffffffffffffffffffae0003ca1b4a81000000000000001503a7fe72e934fffffffffffffffffffffc95d26500000000000000000000037248d803b9330279350407badbb2daa07a29d924a0382f03b933037934fbf893929cf7679fd8fcb61df57309e8418509010c680b1f0901064160b5424563918244f4000006416bde424563918244f40000062baeec414563918244f4000004eb76400a010c519e2b1a0494510c52df89030c519e2c030c5973b8030c66990d1238740c519e2e0a010c519e2f030bbc8f632a03976cec230c5e0217030b2002f509010574fd36e94d00000000000000072d8e0e5b01abffffffffffffffffffffffb03ab105752c659906e86ea21b569a723471ac9a2a2e25674ac5e205752c6661035a49b78f46345a266966e807712d2e190f424007712d2f4a01f9e8e7ffc272bce307af4b71410b9163762a3984a70872e8451990b19f07af4b72326eb7f3ec9be0078d42321167af07711e8b3a92fa674c665b28078d42333a0fc0c6843deddf0872e8473a0ced5c4f71eb1207711e8c2106821e2101b72c92a9380d19109f0ffffffffffffffffffffffffd9791180ba6849609010badd37509010b01b8484904e6167b4922d798500afacf5c31048c273950000c680b244107dcad3d7bcb91cc0b97e0f46202af45109a024eb79eff9cf40b8e83d86102af45109a024eb79eff9cf40c680b27030c680b2809010b97e0f63225f9791ce2ed0c680b29091d0bdcf9ed190d59a80b8e83d93125f9791ce2ed09b685b13202499633c34809b42bdc29265627c61409a8729e2942a2fd6d8209a9a4353202412140cd8609a9a437298778adbc3709a861b822015f4fd409a861b922015d537b09a861ba095109b685b229845e3d01ab09a4fa08391fd7ab9a6e37eb09a4fa09391fd7ab9a6e37eb09a4fa0a095b09a4fb7c095109a4fa0c095b09a861bb1901fc59090b8eb80307b23db809010b8e905e09010b8f887e0901",
-    "expected_outputs": {
-        "kzg_commitment": "b3155be333f11f4ac0655292d3f7baf6b7c50fe15f2ae7509d8ad93a98c32adb82899f72b32fbcf77898a3e4a082c4b0",
-        "opening_point": "00000000000000000000000000000000b65574fcce3da68c6d7199110f1b5358",
-        "opening_value": "2e9ea79020c009e69d1d480ea0726dec69f43ab688f08c7852270dccbc7456c4",
-        "opening_proof": "ac2355d9a024ee3d77b8577c299b5384adcea34c205231bebb08ffa9fb5e33f2327f11ecde4fe46e0aaadce36b31c87d",
-        "versioned_hash": "01a70111f6ade45fdff137f00119dd45284d80e1af6bdad336419c07cec93f41",
-        "blob_proof": "a370bebe32974312600170a180d02aa0f44394b96221f95af357e696fdbc11ef917fe3b643ffc62c98d333385ab25b43",
-        "pubdata_commitment": "b65574fcce3da68c6d7199110f1b53582e9ea79020c009e69d1d480ea0726dec69f43ab688f08c7852270dccbc7456c4b3155be333f11f4ac0655292d3f7baf6b7c50fe15f2ae7509d8ad93a98c32adb82899f72b32fbcf77898a3e4a082c4b0ac2355d9a024ee3d77b8577c299b5384adcea34c205231bebb08ffa9fb5e33f2327f11ecde4fe46e0aaadce36b31c87d"
-    }
-}
diff --git a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/tests/mod.rs b/core/lib/l1_contract_interface/src/i_executor/commit/kzg/tests/mod.rs
deleted file mode 100644
index fb38bea90537..000000000000
--- a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/tests/mod.rs
+++ /dev/null
@@ -1,135 +0,0 @@
-//! Tests for KZG commitments.
-
-use kzg::{
-    boojum::pairing::{bls12_381::G1Compressed, EncodedPoint},
-    verify_kzg_proof, verify_proof_poly,
-    zkevm_circuits::eip_4844::ethereum_4844_data_into_zksync_pubdata,
-};
-use serde::{Deserialize, Serialize};
-
-use super::*;
-
-const KZG_TEST_JSON: &str = include_str!("kzg_test_0.json");
-
-#[serde_with::serde_as]
-#[derive(Debug, Serialize, Deserialize)]
-struct ExpectedOutputs {
-    #[serde_as(as = "serde_with::hex::Hex")]
-    versioned_hash: Vec<u8>,
-    #[serde_as(as = "serde_with::hex::Hex")]
-    kzg_commitment: Vec<u8>,
-    #[serde_as(as = "serde_with::hex::Hex")]
-    opening_point: Vec<u8>,
-    #[serde_as(as = "serde_with::hex::Hex")]
-    opening_value: Vec<u8>,
-    #[serde_as(as = "serde_with::hex::Hex")]
-    opening_proof: Vec<u8>,
-    #[serde_as(as = "serde_with::hex::Hex")]
-    blob_proof: Vec<u8>,
-    #[serde_as(as = "serde_with::hex::Hex")]
-    pubdata_commitment: Vec<u8>,
-}
-
-#[serde_with::serde_as]
-#[derive(Debug, Serialize, Deserialize)]
-struct KzgTest {
-    #[serde_as(as = "serde_with::hex::Hex")]
-    pubdata: Vec<u8>,
-    expected_outputs: ExpectedOutputs,
-}
-
-/// Copy of function from https://github.com/matter-labs/era-zkevm_test_harness/blob/99956050a7705e26e0e5aa0729348896a27846c7/src/kzg/mod.rs#L339
-fn u8_repr_to_fr(bytes: &[u8]) -> Fr {
-    assert_eq!(bytes.len(), 32);
-    let mut ret = [0u64; 4];
-
-    for (i, chunk) in bytes.chunks(8).enumerate() {
-        let mut repr = [0u8; 8];
-        repr.copy_from_slice(chunk);
-        ret[3 - i] = u64::from_be_bytes(repr);
-    }
-
-    Fr::from_repr(FrRepr(ret)).unwrap()
-}
-
-fn bytes_to_g1(data: &[u8]) -> G1Affine {
-    let mut compressed = G1Compressed::empty();
-    let v = compressed.as_mut();
-    v.copy_from_slice(data);
-    compressed.into_affine().unwrap()
-}
-
-#[test]
-fn kzg_test() {
-    let kzg_test: KzgTest = serde_json::from_str(KZG_TEST_JSON).unwrap();
-    let kzg_info = KzgInfo::new(&kzg_test.pubdata);
-
-    // Verify all the fields were correctly computed
-    assert_eq!(
-        hex::encode(kzg_info.kzg_commitment),
-        hex::encode(kzg_test.expected_outputs.kzg_commitment)
-    );
-    assert_eq!(
-        hex::encode(kzg_info.opening_point),
-        hex::encode(kzg_test.expected_outputs.opening_point)
-    );
-    assert_eq!(
-        hex::encode(kzg_info.opening_value),
-        hex::encode(kzg_test.expected_outputs.opening_value)
-    );
-    assert_eq!(
-        hex::encode(kzg_info.opening_proof),
-        hex::encode(kzg_test.expected_outputs.opening_proof)
-    );
-    assert_eq!(
-        hex::encode(kzg_info.versioned_hash),
-        hex::encode(kzg_test.expected_outputs.versioned_hash)
-    );
-    assert_eq!(
-        hex::encode(kzg_info.blob_proof),
-        hex::encode(kzg_test.expected_outputs.blob_proof)
-    );
-
-    // Verify data we need for blob commitment on L1 returns the correct data
-    assert_eq!(
-        hex::encode(kzg_info.to_pubdata_commitment()),
-        hex::encode(kzg_test.expected_outputs.pubdata_commitment)
-    );
-
-    // Verify that the blob, commitment, and proofs are all valid
-    let blob = ethereum_4844_data_into_zksync_pubdata(&kzg_info.blob);
-    let mut poly = zksync_pubdata_into_monomial_form_poly(&blob);
-    fft(&mut poly);
-    bitreverse(&mut poly);
-
-    let commitment = bytes_to_g1(&kzg_info.kzg_commitment);
-    let blob_proof = bytes_to_g1(&kzg_info.blob_proof);
-
-    let valid_blob_proof = verify_proof_poly(&KZG_SETTINGS, &poly, &commitment, &blob_proof);
-    assert!(valid_blob_proof);
-
-    let opening_point = u8_repr_to_fr(&kzg_info.opening_point);
-    let opening_value = u8_repr_to_fr(&kzg_info.opening_value);
-    let opening_proof = bytes_to_g1(&kzg_info.opening_proof);
-
-    let valid_opening_proof = verify_kzg_proof(
-        &KZG_SETTINGS,
-        &commitment,
-        &opening_point,
-        &opening_value,
-        &opening_proof,
-    );
-    assert!(valid_opening_proof);
-}
-
-#[test]
-fn bytes_test() {
-    let kzg_test: KzgTest = serde_json::from_str(KZG_TEST_JSON).unwrap();
-
-    let kzg_info = KzgInfo::new(&kzg_test.pubdata);
-    let encoded_info = kzg_info.to_bytes();
-    assert_eq!(KzgInfo::SERIALIZED_SIZE, encoded_info.len());
-
-    let decoded_kzg_info = KzgInfo::from_slice(&encoded_info);
-    assert_eq!(kzg_info, decoded_kzg_info);
-}
diff --git a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/trusted_setup.rs b/core/lib/l1_contract_interface/src/i_executor/commit/kzg/trusted_setup.rs
deleted file mode 100644
index 1aecea0fad39..000000000000
--- a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/trusted_setup.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use std::{convert::TryInto, iter};
-
-use kzg::{
-    boojum::pairing::{bls12_381::G2Compressed, EncodedPoint},
-    zkevm_circuits::{
-        boojum::pairing::{
-            bls12_381::{Fr, FrRepr, G1Compressed},
-            ff::{Field as _, PrimeField as _},
-            CurveAffine,
-        },
-        eip_4844::input::ELEMENTS_PER_4844_BLOCK,
-    },
-    KzgSettings,
-};
-use once_cell::sync::Lazy;
-
-const FIRST_ROOT_OF_UNITY: FrRepr = FrRepr([
-    0xe206da11a5d36306,
-    0x0ad1347b378fbf96,
-    0xfc3e8acfe0f8245f,
-    0x564c0a11a0f704f4,
-]);
-
-fn bit_reverse_slice_indices<T>(array: &mut [T]) {
-    assert_eq!(array.len(), ELEMENTS_PER_4844_BLOCK);
-    for idx in 0..ELEMENTS_PER_4844_BLOCK {
-        let reversed_idx = idx.reverse_bits() >> (usize::BITS - ELEMENTS_PER_4844_BLOCK.ilog2());
-        if idx < reversed_idx {
-            array.swap(idx, reversed_idx);
-        }
-    }
-}
-
-pub(super) static KZG_SETTINGS: Lazy<KzgSettings> = Lazy::new(|| {
-    // Taken from the C KZG library: https://github.com/ethereum/c-kzg-4844/blob/main/src/trusted_setup.txt
-    const TRUSTED_SETUP_STR: &str = include_str!("trusted_setup.txt");
-
-    // Skip 2 first lines (number of G1 and G2 points).
-    let mut lines = TRUSTED_SETUP_STR.lines().skip(2);
-
-    let first_root_of_unity =
-        Fr::from_repr(FIRST_ROOT_OF_UNITY).expect("invalid first root of unity");
-    let mut roots_of_unity: Box<[_]> = iter::successors(Some(Fr::one()), |prev| {
-        let mut next = first_root_of_unity;
-        next.mul_assign(prev);
-        Some(next)
-    })
-    .take(ELEMENTS_PER_4844_BLOCK)
-    .collect();
-    bit_reverse_slice_indices(&mut roots_of_unity);
-
-    let lagrange_setup = lines.by_ref().take(ELEMENTS_PER_4844_BLOCK).map(|line| {
-        let mut g1_bytes = [0_u8; 48];
-        hex::decode_to_slice(line, &mut g1_bytes).expect("failed decoding G1 point from hex");
-        let mut g1 = G1Compressed::empty();
-        g1.as_mut().copy_from_slice(&g1_bytes);
-        g1.into_affine().expect("invalid G1 point")
-    });
-    let mut lagrange_setup: Box<[_]> = lagrange_setup.collect();
-    bit_reverse_slice_indices(&mut lagrange_setup);
-
-    // Skip the 0th G2 point.
-    assert!(
-        lines.next().is_some(),
-        "KZG trusted setup doesn't contain G2 points"
-    );
-
-    let line = lines
-        .next()
-        .expect("KZG trusted setup doesn't contain G2 point #1");
-    let mut g2_bytes = [0_u8; 96];
-    hex::decode_to_slice(line, &mut g2_bytes).expect("failed decoding G2 point from hex");
-    let mut setup_g2_1 = G2Compressed::empty();
-
-    setup_g2_1.as_mut().copy_from_slice(&g2_bytes);
-    let setup_g2_1 = setup_g2_1
-        .into_affine()
-        .expect("invalid G2 point #1")
-        .into_projective();
-
-    KzgSettings {
-        roots_of_unity_brp: roots_of_unity.try_into().unwrap(),
-        setup_g2_1,
-        lagrange_setup_brp: lagrange_setup.try_into().unwrap(),
-    }
-});
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn kzg_roots_of_unity_are_correct() {
-        let mut value = Fr::from_repr(FIRST_ROOT_OF_UNITY).unwrap();
-        for _ in 0..ELEMENTS_PER_4844_BLOCK.ilog2() {
-            assert_ne!(value, Fr::one());
-            value.mul_assign(&value.clone());
-        }
-        assert_eq!(value, Fr::one());
-    }
-}
diff --git a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/trusted_setup.txt b/core/lib/l1_contract_interface/src/i_executor/commit/kzg/trusted_setup.txt
deleted file mode 100644
index d2519656fb2a..000000000000
--- a/core/lib/l1_contract_interface/src/i_executor/commit/kzg/trusted_setup.txt
+++ /dev/null
@@ -1,4163 +0,0 @@
-4096
-65
-a0413c0dcafec6dbc9f47d66785cf1e8c981044f7d13cfe3e4fcbb71b5408dfde6312493cb3c1d30516cb3ca88c03654
-8b997fb25730d661918371bb41f2a6e899cac23f04fc5365800b75433c0a953250e15e7a98fb5ca5cc56a8cd34c20c57
-83302852db89424d5699f3f157e79e91dc1380f8d5895c5a772bb4ea3a5928e7c26c07db6775203ce33e62a114adaa99
-a759c48b7e4a685e735c01e5aa6ef9c248705001f470f9ad856cd87806983e917a8742a3bd5ee27db8d76080269b7c83
-967f8dc45ebc3be14c8705f43249a30ff48e96205fb02ae28daeab47b72eb3f45df0625928582aa1eb4368381c33e127
-a418eb1e9fb84cb32b370610f56f3cb470706a40ac5a47c411c464299c45c91f25b63ae3fcd623172aa0f273c0526c13
-8f44e3f0387293bc7931e978165abbaed08f53acd72a0a23ac85f6da0091196b886233bcee5b4a194db02f3d5a9b3f78
-97173434b336be73c89412a6d70d416e170ea355bf1956c32d464090b107c090ef2d4e1a467a5632fbc332eeb679bf2d
-a24052ad8d55ad04bc5d951f78e14213435681594110fd18173482609d5019105b8045182d53ffce4fc29fc8810516c1
-b950768136b260277590b5bec3f56bbc2f7a8bc383d44ce8600e85bf8cf19f479898bcc999d96dfbd2001ede01d94949
-92ab8077871037bd3b57b95cbb9fb10eb11efde9191690dcac655356986fd02841d8fdb25396faa0feadfe3f50baf56d
-a79b096dff98038ac30f91112dd14b78f8ad428268af36d20c292e2b3b6d9ed4fb28480bb04e465071cc67d05786b6d1
-b9ff71461328f370ce68bf591aa7fb13027044f42a575517f3319e2be4aa4843fa281e756d0aa5645428d6dfa857cef2
-8d765808c00b3543ff182e2d159c38ae174b12d1314da88ea08e13bd9d1c37184cb515e6bf6420531b5d41767987d7ce
-b8c9a837d20c3b53e6f578e4a257bb7ef8fc43178614ec2a154915b267ad2be135981d01ed2ee1b5fbd9d9bb27f0800a
-a9773d92cf23f65f98ef68f6cf95c72b53d0683af2f9bf886bb9036e4a38184b1131b26fd24397910b494fbef856f3aa
-b41ebe38962d112da4a01bf101cb248d808fbd50aaf749fc7c151cf332032eb3e3bdbd716db899724b734d392f26c412
-90fbb030167fb47dcc13d604a726c0339418567c1d287d1d87423fa0cb92eec3455fbb46bcbe2e697144a2d3972142e4
-b11d298bd167464b35fb923520d14832bd9ed50ed841bf6d7618424fd6f3699190af21759e351b89142d355952149da1
-8bc36066f69dc89f7c4d1e58d67497675050c6aa002244cebd9fc957ec5e364c46bab4735ea3db02b73b3ca43c96e019
-ab7ab92c5d4d773068e485aa5831941ebd63db7118674ca38089635f3b4186833af2455a6fb9ed2b745df53b3ce96727
-af191ca3089892cb943cd97cf11a51f38e38bd9be50844a4e8da99f27e305e876f9ed4ab0628e8ae3939066b7d34a15f
-a3204c1747feabc2c11339a542195e7cb6628fd3964f846e71e2e3f2d6bb379a5e51700682ea1844eba12756adb13216
-903a29883846b7c50c15968b20e30c471aeac07b872c40a4d19eb1a42da18b649d5bbfde4b4cf6225d215a461b0deb6d
-8e6e9c15ffbf1e16e5865a5fef7ed751dc81957a9757b535cb38b649e1098cda25d42381dc4f776778573cdf90c3e6e0
-a8f6dd26100b512a8c96c52e00715c4b2cb9ac457f17aed8ffe1cf1ea524068fe5a1ddf218149845fc1417b789ecfc98
-a5b0ffc819451ea639cfd1c18cbc9365cc79368d3b2e736c0ae54eba2f0801e6eb0ee14a5f373f4a70ca463bdb696c09
-879f91ccd56a1b9736fbfd20d8747354da743fb121f0e308a0d298ff0d9344431890e41da66b5009af3f442c636b4f43
-81bf3a2d9755e206b515a508ac4d1109bf933c282a46a4ae4a1b4cb4a94e1d23642fad6bd452428845afa155742ade7e
-8de778d4742f945df40004964e165592f9c6b1946263adcdd5a88b00244bda46c7bb49098c8eb6b3d97a0dd46148a8ca
-b7a57b21d13121907ee28c5c1f80ee2e3e83a3135a8101e933cf57171209a96173ff5037f5af606e9fd6d066de6ed693
-b0877d1963fd9200414a38753dffd9f23a10eb3198912790d7eddbc9f6b477019d52ddd4ebdcb9f60818db076938a5a9
-88da2d7a6611bc16adc55fc1c377480c828aba4496c645e3efe0e1a67f333c05a0307f7f1d2df8ac013602c655c6e209
-95719eb02e8a9dede1a888c656a778b1c69b7716fbe3d1538fe8afd4a1bc972183c7d32aa7d6073376f7701df80116d8
-8e8a1ca971f2444b35af3376e85dccda3abb8e8e11d095d0a4c37628dfe5d3e043a377c3de68289ef142e4308e9941a0
-b720caaff02f6d798ac84c4f527203e823ff685869e3943c979e388e1c34c3f77f5c242c6daa7e3b30e511aab917b866
-86040d55809afeec10e315d1ad950d269d37cfee8c144cd8dd4126459e3b15a53b3e68df5981df3c2346d23c7b4baaf4
-82d8cabf13ab853db0377504f0aec00dba3a5cd3119787e8ad378ddf2c40b022ecfc67c642b7acc8c1e3dd03ab50993e
-b8d873927936719d2484cd03a6687d65697e17dcf4f0d5aed6f5e4750f52ef2133d4645894e7ebfc4ef6ce6788d404c8
-b1235594dbb15b674a419ff2b2deb644ad2a93791ca05af402823f87114483d6aa1689b7a9bea0f547ad12fe270e4344
-a53fda86571b0651f5affb74312551a082fffc0385cfd24c1d779985b72a5b1cf7c78b42b4f7e51e77055f8e5e915b00
-b579adcfd9c6ef916a5a999e77a0cb21d378c4ea67e13b7c58709d5da23a56c2e54218691fc4ac39a4a3d74f88cc31f7
-ab79e584011713e8a2f583e483a91a0c2a40771b77d91475825b5acbea82db4262132901cb3e4a108c46d7c9ee217a4e
-a0fe58ea9eb982d7654c8aaf9366230578fc1362f6faae0594f8b9e659bcb405dff4aac0c7888bbe07f614ecf0d800a6
-867e50e74281f28ecd4925560e2e7a6f8911b135557b688254623acce0dbc41e23ac3e706a184a45d54c586edc416eb0
-89f81b61adda20ea9d0b387a36d0ab073dc7c7cbff518501962038be19867042f11fcc7ff78096e5d3b68c6d8dc04d9b
-a58ee91bb556d43cf01f1398c5811f76dc0f11efdd569eed9ef178b3b0715e122060ec8f945b4dbf6eebfa2b90af6fa6
-ac460be540f4c840def2eef19fc754a9af34608d107cbadb53334cf194cc91138d53b9538fcd0ec970b5d4aa455b224a
-b09b91f929de52c09d48ca0893be6eb44e2f5210a6c394689dc1f7729d4be4e11d0474b178e80cea8c2ac0d081f0e811
-8d37a442a76b06a02a4e64c2504aea72c8b9b020ab7bcc94580fe2b9603c7c50d7b1e9d70d2a7daea19c68667e8f8c31
-a9838d4c4e3f3a0075a952cf7dd623307ec633fcc81a7cf9e52e66c31780de33dbb3d74c320dc7f0a4b72f7a49949515
-a44766b6251af458fe4f5f9ed1e02950f35703520b8656f09fc42d9a2d38a700c11a7c8a0436ac2e5e9f053d0bb8ff91
-ad78d9481c840f5202546bea0d13c776826feb8b1b7c72e83d99a947622f0bf38a4208551c4c41beb1270d7792075457
-b619ffa8733b470039451e224b777845021e8dc1125f247a4ff2476cc774657d0ff9c5279da841fc1236047de9d81c60
-af760b0a30a1d6af3bc5cd6686f396bd41779aeeb6e0d70a09349bd5da17ca2e7965afc5c8ec22744198fbe3f02fb331
-a0cc209abdb768b589fcb7b376b6e1cac07743288c95a1cf1a0354b47f0cf91fca78a75c1fcafa6f5926d6c379116608
-864add673c89c41c754eeb3cd8dcff5cdde1d739fce65c30e474a082bb5d813cba6412e61154ce88fdb6c12c5d9be35b
-b091443b0ce279327dc37cb484e9a5b69b257a714ce21895d67539172f95ffa326903747b64a3649e99aea7bb10d03f7
-a8c452b8c4ca8e0a61942a8e08e28f17fb0ef4c5b018b4e6d1a64038280afa2bf1169202f05f14af24a06ca72f448ccd
-a23c24721d18bc48d5dcf70effcbef89a7ae24e67158d70ae1d8169ee75d9a051d34b14e9cf06488bac324fe58549f26
-92a730e30eb5f3231feb85f6720489dbb1afd42c43f05a1610c6b3c67bb949ec8fde507e924498f4ffc646f7b07d9123
-8dbe5abf4031ec9ba6bb06d1a47dd1121fb9e03b652804069250967fd5e9577d0039e233441b7f837a7c9d67ba18c28e
-aa456bcfef6a21bb88181482b279df260297b3778e84594ebddbdf337e85d9e3d46ca1d0b516622fb0b103df8ec519b7
-a3b31ae621bd210a2b767e0e6f22eb28fe3c4943498a7e91753225426168b9a26da0e02f1dc5264da53a5ad240d9f51b
-aa8d66857127e6e71874ce2202923385a7d2818b84cb73a6c42d71afe70972a70c6bdd2aad1a6e8c5e4ca728382a8ea8
-ac7e8e7a82f439127a5e40558d90d17990f8229852d21c13d753c2e97facf077cf59582b603984c3dd3faebd80aff4f5
-93a8bcf4159f455d1baa73d2ef2450dcd4100420de84169bbe28b8b7a5d1746273f870091a87a057e834f754f34204b1
-89d0ebb287c3613cdcae7f5acc43f17f09c0213fc40c074660120b755d664109ffb9902ed981ede79e018ddb0c845698
-a87ccbfad431406aadbee878d9cf7d91b13649d5f7e19938b7dfd32645a43b114eef64ff3a13201398bd9b0337832e5a
-833c51d0d0048f70c3eefb4e70e4ff66d0809c41838e8d2c21c288dd3ae9d9dfaf26d1742bf4976dab83a2b381677011
-8bcd6b1c3b02fffead432e8b1680bad0a1ac5a712d4225e220690ee18df3e7406e2769e1f309e2e803b850bc96f0e768
-b61e3dbd88aaf4ff1401521781e2eea9ef8b66d1fac5387c83b1da9e65c2aa2a56c262dea9eceeb4ad86c90211672db0
-866d3090db944ecf190dd0651abf67659caafd31ae861bab9992c1e3915cb0952da7c561cc7e203560a610f48fae633b
-a5e8971543c14274a8dc892b0be188c1b4fbc75c692ed29f166e0ea80874bc5520c2791342b7c1d2fb5dd454b03b8a5b
-8f2f9fc50471bae9ea87487ebd1bc8576ef844cc42d606af5c4c0969670fdf2189afd643e4de3145864e7773d215f37f
-b1bb0f2527db6d51f42b9224383c0f96048bbc03d469bf01fe1383173ef8b1cc9455d9dd8ba04d46057f46949bfc92b5
-aa7c99d906b4d7922296cfe2520473fc50137c03d68b7865c5bfb8adbc316b1034310ec4b5670c47295f4a80fb8d61e9
-a5d1da4d6aba555919df44cbaa8ff79378a1c9e2cfdfbf9d39c63a4a00f284c5a5724e28ecbc2d9dba27fe4ee5018bd5
-a8db53224f70af4d991b9aae4ffe92d2aa5b618ad9137784b55843e9f16cefbfd25ada355d308e9bbf55f6d2f7976fb3
-b6536c4232bb20e22af1a8bb12de76d5fec2ad9a3b48af1f38fa67e0f8504ef60f305a73d19385095bb6a9603fe29889
-87f7e371a1817a63d6838a8cf4ab3a8473d19ce0d4f40fd013c03d5ddd5f4985df2956531cc9f187928ef54c68f4f9a9
-ae13530b1dbc5e4dced9d909ea61286ec09e25c12f37a1ed2f309b0eb99863d236c3b25ed3484acc8c076ad2fa8cd430
-98928d850247c6f7606190e687d5c94a627550198dbdbea0161ef9515eacdb1a0f195cae3bb293112179082daccf8b35
-918528bb8e6a055ad4db6230d3a405e9e55866da15c4721f5ddd1f1f37962d4904aad7a419218fe6d906fe191a991806
-b71e31a06afe065773dd3f4a6e9ef81c3292e27a3b7fdfdd452d03e05af3b6dd654c355f7516b2a93553360c6681a73a
-8870b83ab78a98820866f91ac643af9f3ff792a2b7fda34185a9456a63abdce42bfe8ad4dc67f08a6392f250d4062df4
-91eea1b668e52f7a7a5087fabf1cab803b0316f78d9fff469fbfde2162f660c250e4336a9eea4cb0450bd30ac067bc8b
-8b74990946de7b72a92147ceac1bd9d55999a8b576e8df68639e40ed5dc2062cfcd727903133de482b6dca19d0aaed82
-8ebad537fece090ebbab662bdf2618e21ca30cf6329c50935e8346d1217dcbe3c1fe1ea28efca369c6003ce0a94703c1
-a8640479556fb59ebd1c40c5f368fbd960932fdbb782665e4a0e24e2bdb598fc0164ce8c0726d7759cfc59e60a62e182
-a9a52a6bf98ee4d749f6d38be2c60a6d54b64d5cbe4e67266633dc096cf28c97fe998596707d31968cbe2064b72256bf
-847953c48a4ce6032780e9b39d0ed4384e0be202c2bbe2dfda3910f5d87aa5cd3c2ffbfcfae4dddce16d6ab657599b95
-b6f6e1485d3ec2a06abaecd23028b200b2e4a0096c16144d07403e1720ff8f9ba9d919016b5eb8dc5103880a7a77a1d3
-98dfc2065b1622f596dbe27131ea60bef7a193b12922cecb27f8c571404f483014f8014572e86ae2e341ab738e4887ef
-acb0d205566bacc87bbe2e25d10793f63f7a1f27fd9e58f4f653ceae3ffeba511eaf658e068fad289eeb28f9edbeb35b
-ae4411ed5b263673cee894c11fe4abc72a4bf642d94022a5c0f3369380fcdfc1c21e277f2902972252503f91ada3029a
-ac4a7a27ba390a75d0a247d93d4a8ef1f0485f8d373a4af4e1139369ec274b91b3464d9738eeaceb19cd6f509e2f8262
-87379c3bf231fdafcf6472a79e9e55a938d851d4dd662ab6e0d95fd47a478ed99e2ad1e6e39be3c0fc4f6d996a7dd833
-81316904b035a8bcc2041199a789a2e6879486ba9fddcba0a82c745cc8dd8374a39e523b91792170cd30be7aa3005b85
-b8206809c6cd027ed019f472581b45f7e12288f89047928ba32b4856b6560ad30395830d71e5e30c556f6f182b1fe690
-88d76c028f534a62e019b4a52967bb8642ede6becfa3807be68fdd36d366fc84a4ac8dc176e80a68bc59eb62caf5dff9
-8c3b8be685b0f8aad131ee7544d0e12f223f08a6f8edaf464b385ac644e0ddc9eff7cc7cb5c1b50ab5d71ea0f41d2213
-8d91410e004f76c50fdc05784157b4d839cb5090022c629c7c97a5e0c3536eeafee17a527b54b1165c3cd81774bb54ce
-b25c2863bc28ec5281ce800ddf91a7e1a53f4c6d5da1e6c86ef4616e93bcf55ed49e297216d01379f5c6e7b3c1e46728
-865f7b09ac3ca03f20be90c48f6975dd2588838c2536c7a3532a6aa5187ed0b709cd03d91ff4048061c10d0aa72b69ce
-b3f7477c90c11596eb4f8bbf34adbcb832638c4ff3cdd090d4d477ee50472ac9ddaf5be9ad7eca3f148960d362bbd098
-8db35fd53fca04faecd1c76a8227160b3ab46ac1af070f2492445a19d8ff7c25bbaef6c9fa0c8c088444561e9f7e4eb2
-a478b6e9d058a2e01d2fc053b739092e113c23a6a2770a16afbef044a3709a9e32f425ace9ba7981325f02667c3f9609
-98caa6bd38916c08cf221722a675a4f7577f33452623de801d2b3429595f988090907a7e99960fff7c076d6d8e877b31
-b79aaaacefc49c3038a14d2ac468cfec8c2161e88bdae91798d63552cdbe39e0e02f9225717436b9b8a40a022c633c6e
-845a31006c680ee6a0cc41d3dc6c0c95d833fcf426f2e7c573fa15b2c4c641fbd6fe5ebb0e23720cc3467d6ee1d80dc4
-a1bc287e272cf8b74dbf6405b3a5190883195806aa351f1dc8e525aa342283f0a35ff687e3b434324dedee74946dd185
-a4fd2dc8db75d3783a020856e2b3aa266dc6926e84f5c491ef739a3bddd46dc8e9e0fc1177937839ef1b18d062ffbb9e
-acbf0d3c697f57c202bb8c5dc4f3fc341b8fc509a455d44bd86acc67cad2a04495d5537bcd3e98680185e8aa286f2587
-a5caf423a917352e1b8e844f5968a6da4fdeae467d10c6f4bbd82b5eea46a660b82d2f5440d3641c717b2c3c9ed0be52
-8a39d763c08b926599ab1233219c49c825368fad14d9afc7c0c039224d37c00d8743293fd21645bf0b91eaf579a99867
-b2b53a496def0ba06e80b28f36530fbe0fb5d70a601a2f10722e59abee529369c1ae8fd0f2db9184dd4a2519bb832d94
-a73980fcef053f1b60ebbb5d78ba6332a475e0b96a0c724741a3abf3b59dd344772527f07203cf4c9cb5155ebed81fa0
-a070d20acce42518ece322c9db096f16aed620303a39d8d5735a0df6e70fbeceb940e8d9f5cc38f3314b2240394ec47b
-a50cf591f522f19ca337b73089557f75929d9f645f3e57d4f241e14cdd1ea3fb48d84bcf05e4f0377afbb789fbdb5d20
-82a5ffce451096aca8eeb0cd2ae9d83db3ed76da3f531a80d9a70a346359bf05d74863ce6a7c848522b526156a5e20cd
-88e0e84d358cbb93755a906f329db1537c3894845f32b9b0b691c29cbb455373d9452fadd1e77e20a623f6eaf624de6f
-aa07ac7b84a6d6838826e0b9e350d8ec75e398a52e9824e6b0da6ae4010e5943fec4f00239e96433f291fef9d1d1e609
-ac8887bf39366034bc63f6cc5db0c26fd27307cbc3d6cce47894a8a019c22dd51322fb5096edc018227edfafc053a8f6
-b7d26c26c5b33f77422191dca94977588ab1d4b9ce7d0e19c4a3b4cd1c25211b78c328dbf81e755e78cd7d1d622ad23e
-99a676d5af49f0ba44047009298d8474cabf2d5bca1a76ba21eff7ee3c4691a102fdefea27bc948ccad8894a658abd02
-b0d09a91909ab3620c183bdf1d53d43d39eb750dc7a722c661c3de3a1a5d383ad221f71bae374f8a71867505958a3f76
-84681a883de8e4b93d68ac10e91899c2bbb815ce2de74bb48a11a6113b2a3f4df8aceabda1f5f67bc5aacac8c9da7221
-9470259957780fa9b43521fab3644f555f5343281c72582b56d2efd11991d897b3b481cafa48681c5aeb80c9663b68f7
-ab1b29f7ece686e6fa968a4815da1d64f3579fed3bc92e1f3e51cd13a3c076b6cf695ed269d373300a62463dc98a4234
-8ab415bfcd5f1061f7687597024c96dd9c7cb4942b5989379a7a3b5742f7d394337886317659cbeacaf030234a24f972
-b9b524aad924f9acc63d002d617488f31b0016e0f0548f050cada285ce7491b74a125621638f19e9c96eabb091d945be
-8c4c373e79415061837dd0def4f28a2d5d74d21cb13a76c9049ad678ca40228405ab0c3941df49249847ecdefc1a5b78
-a8edf4710b5ab2929d3db6c1c0e3e242261bbaa8bcec56908ddadd7d2dad2dca9d6eb9de630b960b122ebeea41040421
-8d66bb3b50b9df8f373163629f9221b3d4b6980a05ea81dc3741bfe9519cf3ebba7ab98e98390bae475e8ede5821bd5c
-8d3c21bae7f0cfb97c56952bb22084b58e7bb718890935b73103f33adf5e4d99cd262f929c6eeab96209814f0dbae50a
-a5c66cfab3d9ebf733c4af24bebc97070e7989fe3c73e79ac85fb0e4d40ae44fb571e0fad4ad72560e13ed453900d14f
-9362e6b50b43dbefbc3254471372297b5dcce809cd3b60bf74a1268ab68bdb50e46e462cbd78f0d6c056330e982846af
-854630d08e3f0243d570cc2e856234cb4c1a158d9c1883bf028a76525aaa34be897fe918d5f6da9764a3735fa9ebd24a
-8c7d246985469ff252c3f4df6c7c9196fc79f05c1c66a609d84725c78001d0837c7a7049394ba5cf7e863e2d58af8417
-ae050271e01b528925302e71903f785b782f7bf4e4e7a7f537140219bc352dc7540c657ed03d3a297ad36798ecdb98cd
-8d2ae9179fcf2b0c69850554580b52c1f4a5bd865af5f3028f222f4acad9c1ad69a8ef6c7dc7b03715ee5c506b74325e
-b8ef8de6ce6369a8851cd36db0ccf00a85077e816c14c4e601f533330af9e3acf0743a95d28962ed8bfcfc2520ef3cfe
-a6ecad6fdfb851b40356a8b1060f38235407a0f2706e7b8bb4a13465ca3f81d4f5b99466ac2565c60af15f022d26732e
-819ff14cdea3ab89d98e133cd2d0379361e2e2c67ad94eeddcdb9232efd509f51d12f4f03ebd4dd953bd262a886281f7
-8561cd0f7a6dbcddd83fcd7f472d7dbcba95b2d4fb98276f48fccf69f76d284e626d7e41314b633352df8e6333fd52a1
-b42557ccce32d9a894d538c48712cb3e212d06ac05cd5e0527ccd2db1078ee6ae399bf6a601ffdab1f5913d35fc0b20c
-89b4008d767aad3c6f93c349d3b956e28307311a5b1cec237e8d74bb0dee7e972c24f347fd56afd915a2342bd7bc32f0
-877487384b207e53f5492f4e36c832c2227f92d1bb60542cfeb35e025a4a7afc2b885fae2528b33b40ab09510398f83e
-8c411050b63c9053dd0cd81dacb48753c3d7f162028098e024d17cd6348482703a69df31ad6256e3d25a8bbf7783de39
-a8506b54a88d17ac10fb1b0d1fe4aa40eae7553a064863d7f6b52ccc4236dd4b82d01dca6ba87da9a239e3069ba879fb
-b1a24caef9df64750c1350789bb8d8a0db0f39474a1c74ea9ba064b1516db6923f00af8d57c632d58844fb8786c3d47a
-959d6e255f212b0708c58a2f75cb1fe932248c9d93424612c1b8d1e640149656059737e4db2139afd5556bcdacf3eda2
-84525af21a8d78748680b6535bbc9dc2f0cf9a1d1740d12f382f6ecb2e73811d6c1da2ad9956070b1a617c61fcff9fe5
-b74417d84597a485d0a8e1be07bf78f17ebb2e7b3521b748f73935b9afbbd82f34b710fb7749e7d4ab55b0c7f9de127d
-a4a9aecb19a6bab167af96d8b9d9aa5308eab19e6bfb78f5a580f9bf89bdf250a7b52a09b75f715d651cb73febd08e84
-9777b30be2c5ffe7d29cc2803a562a32fb43b59d8c3f05a707ab60ec05b28293716230a7d264d7cd9dd358fc031cc13e
-95dce7a3d4f23ac0050c510999f5fbf8042f771e8f8f94192e17bcbfa213470802ebdbe33a876cb621cf42e275cbfc8b
-b0b963ebcbbee847ab8ae740478544350b3ac7e86887e4dfb2299ee5096247cd2b03c1de74c774d9bde94ae2ee2dcd59
-a4ab20bafa316030264e13f7ef5891a2c3b29ab62e1668fcb5881f50a9acac6adbe3d706c07e62f2539715db768f6c43
-901478a297669d608e406fe4989be75264b6c8be12169aa9e0ad5234f459ca377f78484ffd2099a2fe2db5e457826427
-88c76e5c250810c057004a03408b85cd918e0c8903dc55a0dd8bb9b4fc2b25c87f9b8cf5943eb19fbbe99d36490050c5
-91607322bbad4a4f03fc0012d0821eff5f8c516fda45d1ec1133bface6f858bf04b25547be24159cab931a7aa08344d4
-843203e07fce3c6c81f84bc6dc5fb5e9d1c50c8811ace522dc66e8658433a0ef9784c947e6a62c11bf705307ef05212e
-91dd8813a5d6dddcda7b0f87f672b83198cd0959d8311b2b26fb1fae745185c01f796fbd03aad9db9b58482483fdadd8
-8d15911aacf76c8bcd7136e958febd6963104addcd751ce5c06b6c37213f9c4fb0ffd4e0d12c8e40c36d658999724bfd
-8a36c5732d3f1b497ebe9250610605ee62a78eaa9e1a45f329d09aaa1061131cf1d9df00f3a7d0fe8ad614a1ff9caaae
-a407d06affae03660881ce20dab5e2d2d6cddc23cd09b95502a9181c465e57597841144cb34d22889902aff23a76d049
-b5fd856d0578620a7e25674d9503be7d97a2222900e1b4738c1d81ff6483b144e19e46802e91161e246271f90270e6cf
-91b7708869cdb5a7317f88c0312d103f8ce90be14fb4f219c2e074045a2a83636fdc3e69e862049fc7c1ef000e832541
-b64719cc5480709d1dae958f1d3082b32a43376da446c8f9f64cb02a301effc9c34d9102051733315a8179aed94d53cc
-94347a9542ff9d18f7d9eaa2f4d9b832d0e535fe49d52aa2de08aa8192400eddabdb6444a2a78883e27c779eed7fdf5a
-840ef44a733ff1376466698cd26f82cf56bb44811e196340467f932efa3ae1ef9958a0701b3b032f50fd9c1d2aed9ab5
-90ab3f6f67688888a31ffc2a882bb37adab32d1a4b278951a21646f90d03385fc976715fc639a785d015751171016f10
-b56f35d164c24b557dbcbc8a4bfa681ec916f8741ffcb27fb389c164f4e3ed2be325210ef5bdaeae7a172ca9599ab442
-a7921a5a80d7cf6ae81ba9ee05e0579b18c20cd2852762c89d6496aa4c8ca9d1ca2434a67b2c16d333ea8e382cdab1e3
-a506bcfbd7e7e5a92f68a1bd87d07ad5fe3b97aeee40af2bf2cae4efcd77fff03f872732c5b7883aa6584bee65d6f8cb
-a8c46cff58931a1ce9cbe1501e1da90b174cddd6d50f3dfdfb759d1d4ad4673c0a8feed6c1f24c7af32865a7d6c984e5
-b45686265a83bff69e312c5149db7bb70ac3ec790dc92e392b54d9c85a656e2bf58596ce269f014a906eafc97461aa5f
-8d4009a75ccb2f29f54a5f16684b93202c570d7a56ec1a8b20173269c5f7115894f210c26b41e8d54d4072de2d1c75d0
-aef8810af4fc676bf84a0d57b189760ddc3375c64e982539107422e3de2580b89bd27aa6da44e827b56db1b5555e4ee8
-888f0e1e4a34f48eb9a18ef4de334c27564d72f2cf8073e3d46d881853ac1424d79e88d8ddb251914890588937c8f711
-b64b0aa7b3a8f6e0d4b3499fe54e751b8c3e946377c0d5a6dbb677be23736b86a7e8a6be022411601dd75012012c3555
-8d57776f519f0dd912ea14f79fbab53a30624e102f9575c0bad08d2dc754e6be54f39b11278c290977d9b9c7c0e1e0ad
-a018fc00d532ceb2e4de908a15606db9b6e0665dd77190e2338da7c87a1713e6b9b61554e7c1462f0f6d4934b960b15c
-8c932be83ace46f65c78e145b384f58e41546dc0395270c1397874d88626fdeda395c8a289d602b4c312fe98c1311856
-89174838e21639d6bdd91a0621f04dc056907b88e305dd66e46a08f6d65f731dea72ae87ca5e3042d609e8de8de9aa26
-b7b7f508bb74f7a827ac8189daa855598ff1d96fa3a02394891fd105d8f0816224cd50ac4bf2ed1cf469ace516c48184
-b31877ad682583283baadd68dc1bebd83f5748b165aadd7fe9ef61a343773b88bcd3a022f36d6c92f339b7bfd72820a9
-b79d77260b25daf9126dab7a193df2d7d30542786fa1733ffaf6261734770275d3ca8bae1d9915d1181a78510b3439db
-91894fb94cd4c1dd2ceaf9c53a7020c5799ba1217cf2d251ea5bc91ed26e1159dd758e98282ebe35a0395ef9f1ed15a0
-ab59895cdafd33934ceedfc3f0d5d89880482cba6c99a6db93245f9e41987efd76e0640e80aef31782c9a8c7a83fccec
-aa22ea63654315e033e09d4d4432331904a6fc5fb1732557987846e3c564668ca67c60a324b4af01663a23af11a9ce4b
-b53ba3ef342601467e1f71aa280e100fbabbd38518fa0193e0099505036ee517c1ac78e96e9baeb549bb6879bb698fb0
-943fd69fd656f37487cca3605dc7e5a215fddd811caf228595ec428751fc1de484a0cb84c667fe4d7c35599bfa0e5e34
-9353128b5ebe0dddc555093cf3e5942754f938173541033e8788d7331fafc56f68d9f97b4131e37963ab7f1c8946f5f1
-a76cd3c566691f65cfb86453b5b31dbaf3cab8f84fe1f795dd1e570784b9b01bdd5f0b3c1e233942b1b5838290e00598
-983d84b2e53ffa4ae7f3ba29ef2345247ea2377686b74a10479a0ef105ecf90427bf53b74c96dfa346d0f842b6ffb25b
-92e0fe9063306894a2c6970c001781cff416c87e87cb5fbac927a3192655c3da4063e6fa93539f6ff58efac6adcc5514
-b00a81f03c2b8703acd4e2e4c21e06973aba696415d0ea1a648ace2b0ea19b242fede10e4f9d7dcd61c546ab878bc8f9
-b0d08d880f3b456a10bf65cff983f754f545c840c413aea90ce7101a66eb0a0b9b1549d6c4d57725315828607963f15a
-90cb64d03534f913b411375cce88a9e8b1329ce67a9f89ca5df8a22b8c1c97707fec727dbcbb9737f20c4cf751359277
-8327c2d42590dfcdb78477fc18dcf71608686ad66c49bce64d7ee874668be7e1c17cc1042a754bbc77c9daf50b2dae07
-8532171ea13aa7e37178e51a6c775da469d2e26ec854eb16e60f3307db4acec110d2155832c202e9ba525fc99174e3b0
-83ca44b15393d021de2a511fa5511c5bd4e0ac7d67259dce5a5328f38a3cce9c3a269405959a2486016bc27bb140f9ff
-b1d36e8ca812be545505c8214943b36cabee48112cf0de369957afa796d37f86bf7249d9f36e8e990f26f1076f292b13
-9803abf45be5271e2f3164c328d449efc4b8fc92dfc1225d38e09630909fe92e90a5c77618daa5f592d23fc3ad667094
-b268ad68c7bf432a01039cd889afae815c3e120f57930d463aece10af4fd330b5bd7d8869ef1bcf6b2e78e4229922edc
-a4c91a0d6f16b1553264592b4cbbbf3ca5da32ab053ffbdd3dbb1aed1afb650fb6e0dc5274f71a51d7160856477228db
-ad89d043c2f0f17806277ffdf3ecf007448e93968663f8a0b674254f36170447b7527d5906035e5e56f4146b89b5af56
-8b6964f757a72a22a642e4d69102951897e20c21449184e44717bd0681d75f7c5bfa5ee5397f6e53febf85a1810d6ed1
-b08f5cdaabec910856920cd6e836c830b863eb578423edf0b32529488f71fe8257d90aed4a127448204df498b6815d79
-af26bb3358be9d280d39b21d831bb53145c4527a642446073fee5a86215c4c89ff49a3877a7a549486262f6f57a0f476
-b4010b37ec4d7c2af20800e272539200a6b623ae4636ecbd0e619484f4ab9240d02bc5541ace3a3fb955dc0a3d774212
-82752ab52bdcc3cc2fc405cb05a2e694d3df4a3a68f2179ec0652536d067b43660b96f85f573f26fbd664a9ef899f650
-96d392dde067473a81faf2d1fea55b6429126b88b160e39b4210d31d0a82833ffd3a80e07d24d495aea2d96be7251547
-a76d8236d6671204d440c33ac5b8deb71fa389f6563d80e73be8b043ec77d4c9b06f9a586117c7f957f4af0331cbc871
-b6c90961f68b5e385d85c9830ec765d22a425f506904c4d506b87d8944c2b2c09615e740ed351df0f9321a7b93979cae
-a6ec5ea80c7558403485b3b1869cdc63bde239bafdf936d9b62a37031628402a36a2cfa5cfbb8e26ac922cb0a209b3ba
-8c3195bbdbf9bc0fc95fa7e3d7f739353c947f7767d1e3cb24d8c8602d8ea0a1790ac30b815be2a2ba26caa5227891e2
-a7f8a63d809f1155722c57f375ea00412b00147776ae4444f342550279ef4415450d6f400000a326bf11fea6c77bf941
-97fa404df48433a00c85793440e89bb1af44c7267588ae937a1f5d53e01e1c4d4fc8e4a6d517f3978bfdd6c2dfde012f
-a984a0a3836de3d8d909c4629a2636aacb85393f6f214a2ef68860081e9db05ad608024762db0dc35e895dc00e2d4cdd
-9526cf088ab90335add1db4d3a4ac631b58cbfbe88fa0845a877d33247d1cfeb85994522e1eb8f8874651bfb1df03e2a
-ac83443fd0afe99ad49de9bf8230158c118e2814c9c89db5ac951c240d6c2ce45e7677221279d9e97848ec466b99aafe
-aeeefdbaba612e971697798ceaf63b247949dc823a0ad771ae5b988a5e882b338a98d3d0796230f49d533ec5ba411b39
-ae3f248b5a7b0f92b7820a6c5ae21e5bd8f4265d4f6e21a22512079b8ee9be06393fd3133ce8ebac0faf23f4f8517e36
-a64a831b908eee784b8388b45447d2885ec0551b26b0c2b15e5f417d0a12c79e867fb7bd3d008d0af98b44336f8ec1ad
-b242238cd8362b6e440ba21806905714dd55172db25ec7195f3fc4937b2aba146d5cbf3cf691a1384b4752dc3b54d627
-819f97f337eea1ffb2a678cc25f556f1aab751c6b048993a1d430fe1a3ddd8bb411c152e12ca60ec6e057c190cd1db9a
-b9d7d187407380df54ee9fef224c54eec1bfabf17dc8abf60765b7951f538f59aa26fffd5846cfe05546c35f59b573f4
-aa6e3c14efa6a5962812e3f94f8ce673a433f4a82d07a67577285ea0eaa07f8be7115853122d12d6d4e1fdf64c504be1
-82268bee9c1662d3ddb5fb785abfae6fb8b774190f30267f1d47091d2cd4b3874db4372625aa36c32f27b0eee986269b
-b236459565b7b966166c4a35b2fa71030b40321821b8e96879d95f0e83a0baf33fa25721f30af4a631df209e25b96061
-8708d752632d2435d2d5b1db4ad1fa2558d776a013655f88e9a3556d86b71976e7dfe5b8834fdec97682cd94560d0d0d
-ae1424a68ae2dbfb0f01211f11773732a50510b5585c1fb005cb892b2c6a58f4a55490b5c5b4483c6fce40e9d3236a52
-b3f5f722af9dddb07293c871ce97abbccba0093ca98c8d74b1318fa21396fc1b45b69c15084f63d728f9908442024506
-9606f3ce5e63886853ca476dc0949e7f1051889d529365c0cb0296fdc02abd088f0f0318ecd2cf36740a3634132d36f6
-b11a833a49fa138db46b25ff8cdda665295226595bc212c0931b4931d0a55c99da972c12b4ef753f7e37c6332356e350
-afede34e7dab0a9e074bc19a7daddb27df65735581ca24ad70c891c98b1349fcebbcf3ba6b32c2617fe06a5818dabc2d
-97993d456e459e66322d01f8eb13918979761c3e8590910453944bdff90b24091bb018ac6499792515c9923be289f99f
-977e3e967eff19290a192cd11df3667d511b398fb3ac9a5114a0f3707e25a0edcb56105648b1b85a8b7519fc529fc6f6
-b873a7c88bf58731fe1bf61ff6828bf114cf5228f254083304a4570e854e83748fc98683ddba62d978fff7909f2c5c47
-ad4b2691f6f19da1d123aaa23cca3e876247ed9a4ab23c599afdbc0d3aa49776442a7ceaa996ac550d0313d9b9a36cee
-b9210713c78e19685608c6475bfa974b57ac276808a443f8b280945c5d5f9c39da43effa294bfb1a6c6f7b6b9f85bf6c
-a65152f376113e61a0e468759de38d742caa260291b4753391ee408dea55927af08a4d4a9918600a3bdf1df462dffe76
-8bf8c27ad5140dde7f3d2280fd4cc6b29ab76537e8d7aa7011a9d2796ee3e56e9a60c27b5c2da6c5e14fc866301dc195
-92fde8effc9f61393a2771155812b863cff2a0c5423d7d40aa04d621d396b44af94ddd376c28e7d2f53c930aea947484
-97a01d1dd9ee30553ce676011aea97fa93d55038ada95f0057d2362ae9437f3ed13de8290e2ff21e3167dd7ba10b9c3f
-89affffaa63cb2df3490f76f0d1e1d6ca35c221dd34057176ba739fa18d492355e6d2a5a5ad93a136d3b1fed0bb8aa19
-928b8e255a77e1f0495c86d3c63b83677b4561a5fcbbe5d3210f1e0fc947496e426d6bf3b49394a5df796c9f25673fc4
-842a0af91799c9b533e79ee081efe2a634cac6c584c2f054fb7d1db67dde90ae36de36cbf712ec9cd1a0c7ee79e151ea
-a65b946cf637e090baf2107c9a42f354b390e7316beb8913638130dbc67c918926eb87bec3b1fe92ef72bc77a170fa3b
-aafc0f19bfd71ab5ae4a8510c7861458b70ad062a44107b1b1dbacbfa44ba3217028c2824bd7058e2fa32455f624040b
-95269dc787653814e0be899c95dba8cfa384f575a25e671c0806fd80816ad6797dc819d30ae06e1d0ed9cb01c3950d47
-a1e760f7fa5775a1b2964b719ff961a92083c5c617f637fc46e0c9c20ab233f8686f7f38c3cb27d825c54dd95e93a59b
-ac3b8a7c2317ea967f229eddc3e23e279427f665c4705c7532ed33443f1243d33453c1088f57088d2ab1e3df690a9cc9
-b787beeddfbfe36dd51ec4efd9cf83e59e84d354c3353cc9c447be53ae53d366ed1c59b686e52a92f002142c8652bfe0
-b7a64198300cb6716aa7ac6b25621f8bdec46ad5c07a27e165b3f774cdf65bcfdbf31e9bae0c16b44de4b00ada7a4244
-b8ae9f1452909e0c412c7a7fe075027691ea8df1347f65a5507bc8848f1d2c833d69748076db1129e5b4fb912f65c86c
-9682e41872456b9fa67def89e71f06d362d6c8ca85c9c48536615bc401442711e1c9803f10ab7f8ab5feaec0f9df20a6
-88889ff4e271dc1c7e21989cc39f73cde2f0475acd98078281591ff6c944fadeb9954e72334319050205d745d4df73df
-8f79b5b8159e7fd0d93b0645f3c416464f39aec353b57d99ecf24f96272df8a068ad67a6c90c78d82c63b40bb73989bb
-838c01a009a3d8558a3f0bdd5e22de21af71ca1aefc8423c91dc577d50920e9516880e87dce3e6d086e11cd45c9052d9
-b97f1c6eee8a78f137c840667cc288256e39294268a3009419298a04a1d0087c9c9077b33c917c65caf76637702dda8a
-972284ce72f96a61c899260203dfa06fc3268981732bef74060641c1a5068ead723e3399431c247ca034b0dae861e8df
-945a8d52d6d3db6663dbd3110c6587f9e9c44132045eeffba15621576d178315cb52870fa5861669f84f0bee646183fe
-a0a547b5f0967b1c3e5ec6c6a9a99f0578521489180dfdfbb5561f4d166baac43a2f06f950f645ce991664e167537eed
-a0592cda5cdddf1340033a745fd13a6eff2021f2e26587116c61c60edead067e0f217bc2bef4172a3c9839b0b978ab35
-b9c223b65a3281587fa44ec829e609154b32f801fd1de6950e01eafb07a8324243b960d5735288d0f89f0078b2c42b5b
-99ebfc3b8f9f98249f4d37a0023149ed85edd7a5abe062c8fb30c8c84555258b998bdcdd1d400bc0fa2a4aaa8b224466
-955b68526e6cb3937b26843270f4e60f9c6c8ece2fa9308fe3e23afa433309c068c66a4bc16ee2cf04220f095e9afce4
-b766caeafcc00378135ae53397f8a67ed586f5e30795462c4a35853de6681b1f17401a1c40958de32b197c083b7279c1
-921bf87cad947c2c33fa596d819423c10337a76fe5a63813c0a9dc78a728207ae7b339407a402fc4d0f7cba3af6da6fc
-a74ba1f3bc3e6c025db411308f49b347ec91da1c916bda9da61e510ec8d71d25e0ac0f124811b7860e5204f93099af27
-a29b4d144e0bf17a7e8353f2824cef0ce85621396babe8a0b873ca1e8a5f8d508b87866cf86da348470649fceefd735c
-a8040e12ffc3480dd83a349d06741d1572ef91932c46f5cf03aee8454254156ee95786fd013d5654725e674c920cec32
-8c4cf34ca60afd33923f219ffed054f90cd3f253ffeb2204a3b61b0183417e366c16c07fae860e362b0f2bfe3e1a1d35
-8195eede4ddb1c950459df6c396b2e99d83059f282b420acc34220cadeed16ab65c856f2c52568d86d3c682818ed7b37
-91fff19e54c15932260aa990c7fcb3c3c3da94845cc5aa8740ef56cf9f58d19b4c3c55596f8d6c877f9f4d22921d93aa
-a3e0bf7e5d02a80b75cf75f2db7e66cb625250c45436e3c136d86297d652590ec97c2311bafe407ad357c79ab29d107b
-81917ff87e5ed2ae4656b481a63ced9e6e5ff653b8aa6b7986911b8bc1ee5b8ef4f4d7882c3f250f2238e141b227e510
-915fdbe5e7de09c66c0416ae14a8750db9412e11dc576cf6158755fdcaf67abdbf0fa79b554cac4fe91c4ec245be073f
-8df27eafb5c3996ba4dc5773c1a45ca77e626b52e454dc1c4058aa94c2067c18332280630cc3d364821ee53bf2b8c130
-934f8a17c5cbb827d7868f5c8ca00cb027728a841000a16a3428ab16aa28733f16b52f58c9c4fbf75ccc45df72d9c4df
-b83f4da811f9183c25de8958bc73b504cf790e0f357cbe74ef696efa7aca97ad3b7ead1faf76e9f982c65b6a4d888fc2
-87188213c8b5c268dc2b6da413f0501c95749e953791b727450af3e43714149c115b596b33b63a2f006a1a271b87efd0
-83e9e888ab9c3e30761de635d9aabd31248cdd92f7675fc43e4b21fd96a03ec1dc4ad2ec94fec857ffb52683ac98e360
-b4b9a1823fe2d983dc4ec4e3aaea297e581c3fc5ab4b4af5fa1370caa37af2d1cc7fc6bfc5e7da60ad8fdce27dfe4b24
-856388bc78aef465dbcdd1f559252e028c9e9a2225c37d645c138e78f008f764124522705822a61326a6d1c79781e189
-a6431b36db93c3b47353ba22e7c9592c9cdfb9cbdd052ecf2cc3793f5b60c1e89bc96e6bae117bfd047f2308da00dd2f
-b619972d48e7e4291542dcde08f7a9cdc883c892986ded2f23ccb216e245cd8d9ad1d285347b0f9d7611d63bf4cee2bc
-8845cca6ff8595955f37440232f8e61d5351500bd016dfadd182b9d39544db77a62f4e0102ff74dd4173ae2c181d24ef
-b2f5f7fa26dcd3b6550879520172db2d64ee6aaa213cbef1a12befbce03f0973a22eb4e5d7b977f466ac2bf8323dcedd
-858b7f7e2d44bdf5235841164aa8b4f3d33934e8cb122794d90e0c1cac726417b220529e4f896d7b77902ab0ccd35b3a
-80b0408a092dae2b287a5e32ea1ad52b78b10e9c12f49282976cd738f5d834e03d1ad59b09c5ccaccc39818b87d06092
-b996b0a9c6a2d14d984edcd6ab56bc941674102980d65b3ad9733455f49473d3f587c8cbf661228a7e125ddbe07e3198
-90224fcebb36865293bd63af786e0c5ade6b67c4938d77eb0cbae730d514fdd0fe2d6632788e858afd29d46310cf86df
-b71351fdfff7168b0a5ec48397ecc27ac36657a8033d9981e97002dcca0303e3715ce6dd3f39423bc8ef286fa2e9e669
-ae2a3f078b89fb753ce4ed87e0c1a58bb19b4f0cfb6586dedb9fcab99d097d659a489fb40e14651741e1375cfc4b6c5f
-8ef476b118e0b868caed297c161f4231bbeb863cdfa5e2eaa0fc6b6669425ce7af50dc374abceac154c287de50c22307
-92e46ab472c56cfc6458955270d3c72b7bde563bb32f7d4ab4d959db6f885764a3d864e1aa19802fefaa5e16b0cb0b54
-96a3f68323d1c94e73d5938a18a377af31b782f56212de3f489d22bc289cf24793a95b37f1d6776edf88114b5c1fa695
-962cc068cfce6faaa27213c4e43e44eeff0dfbb6d25b814e82c7da981fb81d7d91868fa2344f05fb552362f98cfd4a72
-895d4e4c4ad670abf66d43d59675b1add7afad7438ada8f42a0360c704cee2060f9ac15b4d27e9b9d0996bb801276fe3
-b3ad18d7ece71f89f2ef749b853c45dc56bf1c796250024b39a1e91ed11ca32713864049c9aaaea60cde309b47486bbf
-8f05404e0c0258fdbae50e97ccb9b72ee17e0bd2400d9102c0dad981dac8c4c71585f03e9b5d50086d0a2d3334cb55d1
-8bd877e9d4591d02c63c6f9fc9976c109de2d0d2df2bfa5f6a3232bab5b0b8b46e255679520480c2d7a318545efa1245
-8d4c16b5d98957c9da13d3f36c46f176e64e5be879f22be3179a2c0e624fe4758a82bf8c8027410002f973a3b84cd55a
-86e2a8dea86427b424fa8eada881bdff896907084a495546e66556cbdf070b78ba312bf441eb1be6a80006d25d5097a3
-8608b0c117fd8652fdab0495b08fadbeba95d9c37068e570de6fddfef1ba4a1773b42ac2be212836141d1bdcdef11a17
-a13d6febf5fb993ae76cae08423ca28da8b818d6ef0fde32976a4db57839cd45b085026b28ee5795f10a9a8e3098c683
-8e261967fa6de96f00bc94a199d7f72896a6ad8a7bbb1d6187cca8fad824e522880e20f766620f4f7e191c53321d70f9
-8b8e8972ac0218d7e3d922c734302803878ad508ca19f5f012bc047babd8a5c5a53deb5fe7c15a4c00fd6d1cb9b1dbd0
-b5616b233fb3574a2717d125a434a2682ff68546dccf116dd8a3b750a096982f185614b9fb6c7678107ff40a451f56fa
-aa6adf9b0c3334b0d0663f583a4914523b2ac2e7adffdb026ab9109295ff6af003ef8357026dbcf789896d2afded8d73
-acb72df56a0b65496cd534448ed4f62950bb1e11e50873b6ed349c088ee364441821294ce0f7c61bd7d38105bea3b442
-abae12df83e01ec947249fedd0115dc501d2b03ff7232092979eda531dbbca29ace1d46923427c7dde4c17bdf3fd7708
-820b4fc2b63a9fda7964acf5caf19a2fc4965007cb6d6b511fcafcb1f71c3f673a1c0791d3f86e3a9a1eb6955b191cc0
-af277259d78c6b0f4f030a10c53577555df5e83319ddbad91afbd7c30bc58e7671c56d00d66ec3ab5ef56470cd910cee
-ad4a861c59f1f5ca1beedd488fb3d131dea924fffd8e038741a1a7371fad7370ca5cf80dc01f177fbb9576713bb9a5b3
-b67a5162982ce6a55ccfb2f177b1ec26b110043cf18abd6a6c451cf140b5af2d634591eb4f28ad92177d8c7e5cd0a5e8
-96176d0a83816330187798072d449cbfccff682561e668faf6b1220c9a6535b32a6e4f852e8abb00f79abb87493df16b
-b0afe6e7cb672e18f0206e4423f51f8bd0017bf464c4b186d46332c5a5847647f89ff7fa4801a41c1b0b42f6135bcc92
-8fc5e7a95ef20c1278c645892811f6fe3f15c431ebc998a32ec0da44e7213ea934ed2be65239f3f49b8ec471e9914160
-b7793e41adda6c82ba1f2a31f656f6205f65bf8a3d50d836ee631bc7ce77c153345a2d0fc5c60edf8b37457c3729c4ec
-a504dd7e4d6b2f4379f22cc867c65535079c75ccc575955f961677fa63ecb9f74026fa2f60c9fb6323c1699259e5e9c8
-ab899d00ae693649cc1afdf30fb80d728973d2177c006e428bf61c7be01e183866614e05410041bc82cb14a33330e69c
-8a3bd8b0b1be570b65c4432a0f6dc42f48a2000e30ab089cf781d38f4090467b54f79c0d472fcbf18ef6a00df69cc6f3
-b4d7028f7f76a96a3d7803fca7f507ae11a77c5346e9cdfccb120a833a59bda1f4264e425aa588e7a16f8e7638061d84
-b9c7511a76ea5fb105de905d44b02edb17008335766ee357ed386b7b3cf19640a98b38785cb14603c1192bee5886c9b6
-8563afb12e53aed71ac7103ab8602bfa8371ae095207cb0d59e8fd389b6ad1aff0641147e53cb6a7ca16c7f37c9c5e6b
-8e108be614604e09974a9ed90960c28c4ea330a3d9a0cb4af6dd6f193f84ab282b243ecdf549b3131036bebc8905690c
-b794d127fbedb9c5b58e31822361706ffac55ce023fbfe55716c3c48c2fd2f2c7660a67346864dfe588812d369cb50b6
-b797a3442fc3b44f41baefd30346f9ac7f96e770d010d53c146ce74ce424c10fb62758b7e108b8abfdc5fafd89d745cb
-993bb71e031e8096442e6205625e1bfddfe6dd6a83a81f3e2f84fafa9e5082ab4cad80a099f21eff2e81c83457c725c3
-8711ab833fc03e37acf2e1e74cfd9133b101ff4144fe30260654398ae48912ab46549d552eb9d15d2ea57760d35ac62e
-b21321fd2a12083863a1576c5930e1aecb330391ef83326d9d92e1f6f0d066d1394519284ddab55b2cb77417d4b0292f
-877d98f731ffe3ee94b0b5b72d127630fa8a96f6ca4f913d2aa581f67732df6709493693053b3e22b0181632ac6c1e3b
-ae391c12e0eb8c145103c62ea64f41345973311c3bf7281fa6bf9b7faafac87bcf0998e5649b9ef81e288c369c827e07
-b83a2842f36998890492ab1cd5a088d9423d192681b9a3a90ec518d4c541bce63e6c5f4df0f734f31fbfdd87785a2463
-a21b6a790011396e1569ec5b2a423857b9bec16f543e63af28024e116c1ea24a3b96e8e4c75c6537c3e4611fd265e896
-b4251a9c4aab3a495da7a42e684ba4860dbcf940ad1da4b6d5ec46050cbe8dab0ab9ae6b63b5879de97b905723a41576
-8222f70aebfe6ac037f8543a08498f4cadb3edaac00336fc00437eb09f2cba758f6c38e887cc634b4d5b7112b6334836
-86f05038e060594c46b5d94621a1d9620aa8ba59a6995baf448734e21f58e23c1ea2993d3002ad5250d6edd5ba59b34f
-a7c0c749baef811ab31b973c39ceb1d94750e2bc559c90dc5eeb20d8bb6b78586a2b363c599ba2107d6be65cd435f24e
-861d46a5d70b38d6c1cd72817a2813803d9f34c00320c8b62f8b9deb67f5b5687bc0b37c16d28fd017367b92e05da9ca
-b3365d3dab639bffbe38e35383686a435c8c88b397b717cd4aeced2772ea1053ceb670f811f883f4e02975e5f1c4ac58
-a5750285f61ab8f64cd771f6466e2c0395e01b692fd878f2ef2d5c78bdd8212a73a3b1dfa5e4c8d9e1afda7c84857d3b
-835a10809ccf939bc46cf950a33b36d71be418774f51861f1cd98a016ade30f289114a88225a2c11e771b8b346cbe6ef
-a4f59473a037077181a0a62f1856ec271028546ca9452b45cedfcb229d0f4d1aabfc13062b07e536cc8a0d4b113156a2
-95cd14802180b224d44a73cc1ed599d6c4ca62ddcaa503513ccdc80aaa8be050cc98bd4b4f3b639549beb4587ac6caf9
-973b731992a3e69996253d7f36dd7a0af1982b5ed21624b77a7965d69e9a377b010d6dabf88a8a97eec2a476259859cc
-af8a1655d6f9c78c8eb9a95051aa3baaf9c811adf0ae8c944a8d3fcba87b15f61021f3baf6996fa0aa51c81b3cb69de1
-835aad5c56872d2a2d6c252507b85dd742bf9b8c211ccb6b25b52d15c07245b6d89b2a40f722aeb5083a47cca159c947
-abf4e970b02bef8a102df983e22e97e2541dd3650b46e26be9ee394a3ea8b577019331857241d3d12b41d4eacd29a3ac
-a13c32449dbedf158721c13db9539ae076a6ce5aeaf68491e90e6ad4e20e20d1cdcc4a89ed9fd49cb8c0dd50c17633c1
-8c8f78f88b7e22dd7e9150ab1c000f10c28e696e21d85d6469a6fe315254740f32e73d81ab1f3c1cf8f544c86df506e8
-b4b77f2acfe945abf81f2605f906c10b88fb4d28628487fb4feb3a09f17f28e9780445dfcee4878349d4c6387a9d17d4
-8d255c235f3812c6ecc646f855fa3832be5cb4dbb9c9e544989fafdf3f69f05bfd370732eaf954012f0044aa013fc9c6
-b982efd3f34b47df37c910148ac56a84e8116647bea24145a49e34e0a6c0176e3284d838dae6230cb40d0be91c078b85
-983f365aa09bd85df2a6a2ad8e4318996b1e27d02090755391d4486144e40d80b1fbfe1c798d626db92f52e33aa634da
-95fd1981271f3ea3a41d654cf497e6696730d9ff7369f26bc4d7d15c7adb4823dd0c42e4a005a810af12d234065e5390
-a9f5219bd4b913c186ef30c02f995a08f0f6f1462614ea5f236964e02bdaa33db9d9b816c4aee5829947840a9a07ba60
-9210e6ceb05c09b46fd09d036287ca33c45124ab86315e5d6911ff89054f1101faaa3e83d123b7805056d388bcec6664
-8ed9cbf69c6ff3a5c62dd9fe0d7264578c0f826a29e614bc2fb4d621d90c8c9992438accdd7a614b1dca5d1bb73dc315
-85cf2a8cca93e00da459e3cecd22c342d697eee13c74d5851634844fc215f60053cf84b0e03c327cb395f48d1c71a8a4
-8818a18e9a2ec90a271b784400c1903089ffb0e0b40bc5abbbe12fbebe0f731f91959d98c5519ef1694543e31e2016d4
-8dabc130f296fa7a82870bf9a8405aaf542b222ed9276bba9bd3c3555a0f473acb97d655ee7280baff766a827a8993f0
-ac7952b84b0dc60c4d858f034093b4d322c35959605a3dad2b806af9813a4680cb038c6d7f4485b4d6b2ff502aaeca25
-ad65cb6d57b48a2602568d2ec8010baed0eb440eec7638c5ec8f02687d764e9de5b5d42ad5582934e592b48471c22d26
-a02ab8bd4c3d114ea23aebdd880952f9495912817da8c0c08eabc4e6755439899d635034413d51134c72a6320f807f1c
-8319567764b8295402ec1ebef4c2930a138480b37e6d7d01c8b4c9cd1f2fc3f6e9a44ae6e380a0c469b25b06db23305f
-afec53b2301dc0caa8034cd9daef78c48905e6068d692ca23d589b84a6fa9ddc2ed24a39480597e19cb3e83eec213b3f
-ac0b4ffdb5ae08e586a9cdb98f9fe56f4712af3a97065e89e274feacfb52b53c839565aee93c4cfaaccfe51432c4fab0
-8972cbf07a738549205b1094c5987818124144bf187bc0a85287c94fdb22ce038c0f11df1aa16ec5992e91b44d1af793
-b7267aa6f9e3de864179b7da30319f1d4cb2a3560f2ea980254775963f1523b44c680f917095879bebfa3dc2b603efcf
-80f68f4bfc337952e29504ee5149f15093824ea7ab02507efd1317a670f6cbc3611201848560312e3e52e9d9af72eccf
-8897fee93ce8fc1e1122e46b6d640bba309384dbd92e46e185e6364aa8210ebf5f9ee7e5e604b6ffba99aa80a10dd7d0
-b58ea6c02f2360be60595223d692e82ee64874fda41a9f75930f7d28586f89be34b1083e03bbc1575bbfdda2d30db1ea
-85a523a33d903280d70ac5938770453a58293480170c84926457ac2df45c10d5ff34322ab130ef4a38c916e70d81af53
-a2cbf045e1bed38937492c1f2f93a5ba41875f1f262291914bc1fc40c60bd0740fb3fea428faf6da38b7c180fe8ac109
-8c09328770ed8eb17afc6ac7ddd87bb476de18ed63cab80027234a605806895959990c47bd10d259d7f3e2ecb50074c9
-b4b9e19edb4a33bde8b7289956568a5b6b6557404e0a34584b5721fe6f564821091013fbb158e2858c6d398293bb4b59
-8a47377df61733a2aa5a0e945fce00267f8e950f37e109d4487d92d878fb8b573317bb382d902de515b544e9e233458d
-b5804c9d97efeff5ca94f3689b8088c62422d92a1506fd1d8d3b1b30e8a866ad0d6dad4abfa051dfc4471250cac4c5d9
-9084a6ee8ec22d4881e9dcc8a9eb3c2513523d8bc141942370fd191ad2601bf9537a0b1e84316f3209b3d8a54368051e
-85447eea2fa26656a649f8519fa67279183044791d61cf8563d0783d46d747d96af31d0a93507bbb2242666aa87d3720
-97566a84481027b60116c751aec552adfff2d9038e68d48c4db9811fb0cbfdb3f1d91fc176a0b0d988a765f8a020bce1
-ae87e5c1b9e86c49a23dceda4ecfd1dcf08567f1db8e5b6ec752ebd45433c11e7da4988573cdaebbb6f4135814fc059e
-abee05cf9abdbc52897ac1ce9ed157f5466ed6c383d6497de28616238d60409e5e92619e528af8b62cc552bf09970dc2
-ae6d31cd7bf9599e5ee0828bab00ceb4856d829bba967278a73706b5f388465367aa8a6c7da24b5e5f1fdd3256ef8e63
-ac33e7b1ee47e1ee4af472e37ab9e9175260e506a4e5ce449788075da1b53c44cb035f3792d1eea2aa24b1f688cc6ed3
-80f65b205666b0e089bb62152251c48c380a831e5f277f11f3ef4f0d52533f0851c1b612267042802f019ec900dc0e8f
-858520ad7aa1c9fed738e3b583c84168f2927837ad0e1d326afe9935c26e9b473d7f8c382e82ef1fe37d2b39bb40a1ee
-b842dd4af8befe00a97c2d0f0c33c93974761e2cb9e5ab8331b25170318ddd5e4bdbc02d8f90cbfdd5f348f4f371c1f7
-8bf2cb79bc783cb57088aae7363320cbeaabd078ffdec9d41bc74ff49e0043d0dad0086a30e5112b689fd2f5a606365d
-982eb03bbe563e8850847cd37e6a3306d298ab08c4d63ab6334e6b8c1fa13fce80cf2693b09714c7621d74261a0ff306
-b143edb113dec9f1e5105d4a93fbe502b859e587640d3db2f628c09a17060e6aec9e900e2c8c411cda99bc301ff96625
-af472d9befa750dcebc5428fe1a024f18ec1c07bca0f95643ce6b5f4189892a910285afb03fd7ed7068fbe614e80d33c
-a97e3bc57ede73ecd1bbf02de8f51b4e7c1a067da68a3cd719f4ba26a0156cbf1cef2169fd35a18c5a4cced50d475998
-a862253c937cf3d75d7183e5f5be6a4385d526aeda5171c1c60a8381fea79f88f5f52a4fab244ecc70765d5765e6dfd5
-90cb776f8e5a108f1719df4a355bebb04bf023349356382cae55991b31720f0fd03206b895fa10c56c98f52453be8778
-a7614e8d0769dccd520ea4b46f7646e12489951efaef5176bc889e9eb65f6e31758df136b5bf1e9107e68472fa9b46ec
-ac3a9b80a3254c42e5ed3a090a0dd7aee2352f480de96ad187027a3bb6c791eddfc3074b6ffd74eea825188f107cda4d
-82a01d0168238ef04180d4b6e0a0e39024c02c2d75b065017c2928039e154d093e1af4503f4d1f3d8a948917abb5d09f
-8fab000a2b0eef851a483aec8d2dd85fe60504794411a2f73ed82e116960547ac58766cb73df71aea71079302630258d
-872451a35c6db61c63e9b8bb9f16b217f985c20be4451c14282c814adb29d7fb13f201367c664435c7f1d4d9375d7a58
-887d9ff54cc96b35d562df4a537ff972d7c4b3fd91ab06354969a4cfede0b9fc68bbffb61d0dbf1a58948dc701e54f5a
-8cb5c2a6bd956875d88f41ae24574434f1308514d44057b55c9c70f13a3366ed054150eed0955a38fda3f757be73d55f
-89ad0163cad93e24129d63f8e38422b7674632a8d0a9016ee8636184cab177659a676c4ee7efba3abe1a68807c656d60
-b9ec01c7cab6d00359b5a0b4a1573467d09476e05ca51a9227cd16b589a9943d161eef62dcc73f0de2ec504d81f4d252
-8031d17635d39dfe9705c485d2c94830b6fc9bc67b91300d9d2591b51e36a782e77ab5904662effa9382d9cca201f525
-8be5a5f6bc8d680e5092d6f9a6585acbaaaa2ddc671da560dcf5cfa4472f4f184b9597b5b539438accd40dda885687cc
-b1fc0f052fae038a2e3de3b3a96b0a1024b009de8457b8b3adb2d315ae68a89af905720108a30038e5ab8d0d97087785
-8b8bdc77bd3a6bc7ca5492b6f8c614852c39a70d6c8a74916eaca0aeb4533b11898b8820a4c2620a97bf35e275480029
-af35f4dc538d4ad5cdf710caa38fd1eb496c3fa890a047b6a659619c5ad3054158371d1e88e0894428282eed9f47f76b
-8166454a7089cc07758ad78724654f4e7a1a13e305bbf88ddb86f1a4b2904c4fc8ab872d7da364cdd6a6c0365239e2ad
-ab287c7d3addce74ce40491871c768abe01daaa0833481276ff2e56926b38a7c6d2681ffe837d2cc323045ad1a4414f9
-b90317f4505793094d89365beb35537f55a6b5618904236258dd04ca61f21476837624a2f45fef8168acf732cab65579
-98ae5ea27448e236b6657ab5ef7b1cccb5372f92ab25f5fa651fbac97d08353a1dae1b280b1cd42b17d2c6a70a63ab9d
-adcf54e752d32cbaa6cb98fbca48d8cd087b1db1d131d465705a0d8042c8393c8f4d26b59006eb50129b21e6240f0c06
-b591a3e4db18a7345fa935a8dd7994bbac5cc270b8ebd84c8304c44484c7a74afb45471fdbe4ab22156a30fae1149b40
-806b53ac049a42f1dcc1d6335505371da0bf27c614f441b03bbf2e356be7b2fb4eed7117eabcce9e427a542eaa2bf7d8
-800482e7a772d49210b81c4a907f5ce97f270b959e745621ee293cf8c71e8989363d61f66a98f2d16914439544ca84c7
-99de9eafdad3617445312341644f2bb888680ff01ce95ca9276b1d2e5ef83fa02dab5e948ebf66c17df0752f1bd37b70
-961ee30810aa4c93ae157fbe9009b8e443c082192bd36a73a6764ff9b2ad8b0948fe9a73344556e01399dd77badb4257
-ae0a361067c52efbe56c8adf982c00432cd478929459fc7f74052c8ee9531cd031fe1335418fde53f7c2ef34254eb7ac
-a3503d16b6b27eb20c1b177bcf90d13706169220523a6271b85b2ce35a9a2b9c5bed088540031c0a4ebfdae3a4c6ab04
-909420122c3e723289ca4e7b81c2df5aff312972a2203f4c45821b176e7c862bf9cac7f7df3adf1d59278f02694d06e7
-989f42380ae904b982f85d0c6186c1aef5d6bcba29bcfbb658e811b587eb2749c65c6e4a8cc6409c229a107499a4f5d7
-8037a6337195c8e26a27ea4ef218c6e7d79a9720aaab43932d343192abc2320fe72955f5e431c109093bda074103330a
-b312e168663842099b88445e940249cc508f080ab0c94331f672e7760258dbd86be5267e4cf25ea25facb80bff82a7e9
-aaa3ff8639496864fcdbfdda1ac97edc4f08e3c9288b768f6c8073038c9fbbf7e1c4bea169b4d45c31935cdf0680d45e
-97dbd3df37f0b481a311dfc5f40e59227720f367912200d71908ef6650f32cc985cb05b981e3eea38958f7e48d10a15d
-a89d49d1e267bb452d6cb621b9a90826fe55e9b489c0427b94442d02a16f390eed758e209991687f73f6b5a032321f42
-9530dea4e0e19d6496f536f2e75cf7d814d65fde567055eb20db48fd8d20d501cd2a22fb506db566b94c9ee10f413d43
-81a7009b9e67f1965fa7da6a57591c307de91bf0cd35ab4348dc4a98a4961e096d004d7e7ad318000011dc4342c1b809
-83440a9402b766045d7aca61a58bba2aa29cac1cf718199e472ba086f5d48093d9dda4d135292ba51d049a23964eceae
-a06c9ce5e802df14f6b064a3d1a0735d429b452f0e2e276042800b0a4f16df988fd94cf3945921d5dd3802ab2636f867
-b1359e358b89936dee9e678a187aad3e9ab14ac40e96a0a68f70ee2583cdcf467ae03bef4215e92893f4e12f902adec8
-835304f8619188b4d14674d803103d5a3fa594d48e96d9699e653115dd05fdc2dda6ba3641cf7ad53994d448da155f02
-8327cba5a9ff0d3f5cd0ae55e77167448926d5fcf76550c0ad978092a14122723090c51c415e88e42a2b62eb07cc3981
-b373dcdaea85f85ce9978b1426a7ef4945f65f2d3467a9f1cc551a99766aac95df4a09e2251d3f89ca8c9d1a7cfd7b0e
-ab1422dc41af2a227b973a6fd124dfcb2367e2a11a21faa1d381d404f51b7257e5bc82e9cf20cd7fe37d7ae761a2ab37
-a93774a03519d2f20fdf2ef46547b0a5b77c137d6a3434b48d56a2cbef9e77120d1b85d0092cf8842909213826699477
-8eb967a495a38130ea28711580b7e61bcd1d051cd9e4f2dbf62f1380bd86e0d60e978d72f6f31e909eb97b3b9a2b867c
-ae8213378da1287ba1fe4242e1acaec19b877b6fe872400013c6eac1084b8d03156792fa3020201725b08228a1e80f49
-b143daf6893d674d607772b3b02d8ac48f294237e2f2c87963c0d4e26d9227d94a2a13512457c3d5883544bbc259f0ef
-b343bd2aca8973888e42542218924e2dda2e938fd1150d06878af76f777546213912b7c7a34a0f94186817d80ffa185c
-b188ebc6a8c3007001aa347ae72cc0b15d09bc6c19a80e386ee4b334734ec0cc2fe8b493c2422f38d1e6d133cc3db6fe
-b795f6a8b9b826aaeee18ccd6baf6c5adeeec85f95eb5b6d19450085ec7217e95a2d9e221d77f583b297d0872073ba0e
-b1c7dbd998ad32ae57bfa95deafa147024afd57389e98992c36b6e52df915d3d5a39db585141ec2423173e85d212fed8
-812bcdeb9fe5f12d0e1df9964798056e1f1c3de3b17b6bd2919b6356c4b86d8e763c01933efbe0224c86a96d5198a4be
-b19ebeda61c23d255cbf472ef0b8a441f4c55b70f0d8ed47078c248b1d3c7c62e076b43b95c00a958ec8b16d5a7cb0d7
-b02adc9aaa20e0368a989c2af14ff48b67233d28ebee44ff3418bb0473592e6b681af1cc45450bd4b175df9051df63d9
-8d87f0714acee522eb58cec00360e762adc411901dba46adc9227124fa70ee679f9a47e91a6306d6030dd4eb8de2f3c1
-8be54cec21e74bcc71de29dc621444263737db15f16d0bb13670f64e42f818154e04b484593d19ef95f2ee17e4b3fe21
-ab8e20546c1db38d31493b5d5f535758afb17e459645c1b70813b1cf7d242fd5d1f4354a7c929e8f7259f6a25302e351
-89f035a1ed8a1e302ac893349ba8ddf967580fcb6e73d44af09e3929cde445e97ff60c87dafe489e2c0ab9c9986cfa00
-8b2b0851a795c19191a692af55f7e72ad2474efdc5401bc3733cfdd910e34c918aaebe69d5ea951bdddf3c01cabbfc67
-a4edb52c2b51495ccd1ee6450fc14b7b3ede8b3d106808929d02fb31475bacb403e112ba9c818d2857651e508b3a7dd1
-9569341fded45d19f00bcf3cbf3f20eb2b4d82ef92aba3c8abd95866398438a2387437e580d8b646f17cf6fde8c5af23
-aa4b671c6d20f72f2f18a939a6ff21cc37e0084b44b4a717f1be859a80b39fb1be026b3205adec2a66a608ec2bcd578f
-94902e980de23c4de394ad8aec91b46f888d18f045753541492bfbb92c59d3daa8de37ae755a6853744af8472ba7b72b
-af651ef1b2a0d30a7884557edfad95b6b5d445a7561caebdc46a485aedd25932c62c0798465c340a76f6feaa196dd712
-b7b669b8e5a763452128846dd46b530dca4893ace5cc5881c7ddcd3d45969d7e73fbebdb0e78aa81686e5f7b22ec5759
-82507fd4ebe9fa656a7f2e084d64a1fa6777a2b0bc106d686e2d9d2edafc58997e58cb6bfd0453b2bf415704aa82ae62
-b40bce2b42b88678400ecd52955bbdadd15f8b9e1b3751a1a3375dc0efb5ca3ee258cf201e1140b3c09ad41217d1d49e
-b0210d0cbb3fbf3b8cdb39e862f036b0ff941cd838e7aaf3a8354e24246e64778d22f3de34572e6b2a580614fb6425be
-876693cba4301b251523c7d034108831df3ce133d8be5a514e7a2ca494c268ca0556fa2ad8310a1d92a16b55bcd99ea9
-8660281406d22a4950f5ef050bf71dd3090edb16eff27fa29ef600cdea628315e2054211ed2cc6eaf8f2a1771ef689fd
-a610e7e41e41ab66955b809ba4ade0330b8e9057d8efc9144753caed81995edeb1a42a53f93ce93540feca1fae708dac
-a49e2c176a350251daef1218efaccc07a1e06203386ede59c136699d25ca5cb2ac1b800c25b28dd05678f14e78e51891
-83e0915aa2b09359604566080d411874af8c993beba97d4547782fdbe1a68e59324b800ff1f07b8db30c71adcbd102a8
-a19e84e3541fb6498e9bb8a099c495cbfcad113330e0262a7e4c6544495bb8a754b2208d0c2d895c93463558013a5a32
-87f2bd49859a364912023aca7b19a592c60214b8d6239e2be887ae80b69ebdeb59742bdebcfa73a586ab23b2c945586c
-b8e8fdddae934a14b57bc274b8dcd0d45ebb95ddbaabef4454e0f6ce7d3a5a61c86181929546b3d60c447a15134d08e1
-87e0c31dcb736ea4604727e92dc1d9a3cf00adcff79df3546e02108355260f3dd171531c3c0f57be78d8b28058fcc8c0
-9617d74e8f808a4165a8ac2e30878c349e1c3d40972006f0787b31ea62d248c2d9f3fc3da83181c6e57e95feedfd0e8c
-8949e2cee582a2f8db86e89785a6e46bc1565c2d8627d5b6bf43ba71ffadfab7e3c5710f88dcb5fb2fc6edf6f4fae216
-ad3fa7b0edceb83118972a2935a09f409d09a8db3869f30be3a76f67aa9fb379cabb3a3aff805ba023a331cad7d7eb64
-8c95718a4112512c4efbd496be38bf3ca6cdcaad8a0d128f32a3f9aae57f3a57bdf295a3b372a8c549fda8f4707cffed
-88f3261d1e28a58b2dee3fcc799777ad1c0eb68b3560f9b4410d134672d9533532a91ea7be28a041784872632d3c9d80
-b47472a41d72dd2e8b72f5c4f8ad626737dde3717f63d6bc776639ab299e564cbad0a2ad5452a07f02ff49a359c437e5
-9896d21dc2e8aad87b76d6df1654f10cd7bceed4884159d50a818bea391f8e473e01e14684814c7780235f28e69dca6e
-82d47c332bbd31bbe83b5eb44a23da76d4a7a06c45d7f80f395035822bc27f62f59281d5174e6f8e77cc9b5c3193d6f0
-95c74cd46206e7f70c9766117c34c0ec45c2b0f927a15ea167901a160e1530d8522943c29b61e03568aa0f9c55926c53
-a89d7757825ae73a6e81829ff788ea7b3d7409857b378ebccd7df73fdbe62c8d9073741cf038314971b39af6c29c9030
-8c1cd212d0b010905d560688cfc036ae6535bc334fa8b812519d810b7e7dcf1bb7c5f43deaa40f097158358987324a7f
-b86993c383c015ed8d847c6b795164114dd3e9efd25143f509da318bfba89389ea72a420699e339423afd68b6512fafb
-8d06bd379c6d87c6ed841d8c6e9d2d0de21653a073725ff74be1934301cc3a79b81ef6dd0aad4e7a9dc6eac9b73019bc
-81af4d2d87219985b9b1202d724fe39ef988f14fef07dfe3c3b11714e90ffba2a97250838e8535eb63f107abfe645e96
-8c5e0af6330a8becb787e4b502f34f528ef5756e298a77dc0c7467433454347f3a2e0bd2641fbc2a45b95e231c6e1c02
-8e2a8f0f04562820dc8e7da681d5cad9fe2e85dd11c785fb6fba6786c57a857e0b3bd838fb849b0376c34ce1665e4837
-a39be8269449bfdfc61b1f62077033649f18dae9bef7c6163b9314ca8923691fb832f42776f0160b9e8abd4d143aa4e1
-8c154e665706355e1cc98e0a4cabf294ab019545ba9c4c399d666e6ec5c869ca9e1faf8fb06cd9c0a5c2f51a7d51b70a
-a046a7d4de879d3ebd4284f08f24398e9e3bf006cd4e25b5c67273ade248689c69affff92ae810c07941e4904296a563
-afd94c1cb48758e5917804df03fb38a6da0e48cd9b6262413ea13b26973f9e266690a1b7d9d24bbaf7e82718e0e594b0
-859e21080310c8d6a38e12e2ac9f90a156578cdeb4bb2e324700e97d9a5511cd6045dc39d1d0de3f94aeed043a24119d
-a219fb0303c379d0ab50893264919f598e753aac9065e1f23ef2949abc992577ab43c636a1d2c089203ec9ddb941e27d
-b0fdb639d449588a2ca730afcba59334e7c387342d56defdfb7ef79c493f7fd0e5277eff18e7203e756c7bdda5803047
-87f9c3b7ed01f54368aca6dbcf2f6e06bff96e183c4b2c65f8baa23b377988863a0a125d5cdd41a072da8462ced4c070
-99ef7a5d5ac2f1c567160e1f8c95f2f38d41881850f30c461a205f7b1b9fb181277311333839b13fb3ae203447e17727
-aeaca9b1c2afd24e443326cc68de67b4d9cedb22ad7b501a799d30d39c85bb2ea910d4672673e39e154d699e12d9b3dc
-a11675a1721a4ba24dd3d0e4c3c33a6edf4cd1b9f6b471070b4386c61f77452266eae6e3f566a40cfc885eada9a29f23
-b228334445e37b9b49cb4f2cc56b454575e92173ddb01370a553bba665adadd52df353ad74470d512561c2c3473c7bb9
-a18177087c996572d76f81178d18ed1ceebc8362a396348ce289f1d8bd708b9e99539be6fccd4acb1112381cfc5749b4
-8e7b8bf460f0d3c99abb19803b9e43422e91507a1c0c22b29ee8b2c52d1a384da4b87c292e28eff040db5be7b1f8641f
-b03d038d813e29688b6e6f444eb56fec3abba64c3d6f890a6bcf2e916507091cdb2b9d2c7484617be6b26552ed1c56cb
-a1c88ccd30e934adfc5494b72655f8afe1865a84196abfb376968f22ddc07761210b6a9fb7638f1413d1b4073d430290
-961b714faebf172ad2dbc11902461e286e4f24a99a939152a53406117767682a571057044decbeb3d3feef81f4488497
-a03dc4059b46effdd786a0a03cc17cfee8585683faa35bb07936ded3fa3f3a097f518c0b8e2db92fd700149db1937789
-adf60180c99ca574191cbcc23e8d025b2f931f98ca7dfcebfc380226239b6329347100fcb8b0fcb12db108c6ad101c07
-805d4f5ef24d46911cbf942f62cb84b0346e5e712284f82b0db223db26d51aabf43204755eb19519b00e665c7719fcaa
-8dea7243e9c139662a7fe3526c6c601eee72fd8847c54c8e1f2ad93ef7f9e1826b170afe58817dac212427164a88e87f
-a2ba42356606d651b077983de1ad643650997bb2babb188c9a3b27245bb65d2036e46667c37d4ce02cb1be5ae8547abe
-af2ae50b392bdc013db2d12ce2544883472d72424fc767d3f5cb0ca2d973fc7d1f425880101e61970e1a988d0670c81b
-98e6bec0568d3939b31d00eb1040e9b8b2a35db46ddf4369bdaee41bbb63cc84423d29ee510a170fb5b0e2df434ba589
-822ff3cd12fbef4f508f3ca813c04a2e0b9b799c99848e5ad3563265979e753ee61a48f6adc2984a850f1b46c1a43d35
-891e8b8b92a394f36653d55725ef514bd2e2a46840a0a2975c76c2a935577f85289026aaa74384da0afe26775cbddfb9
-b2a3131a5d2fe7c8967047aa66e4524babae941d90552171cc109527f345f42aa0df06dcbb2fa01b33d0043917bbed69
-80c869469900431f3eeefafdbe07b8afd8cee7739e659e6d0109b397cacff85a88247698f87dc4e2fe39a592f250ac64
-9091594f488b38f9d2bb5df49fd8b4f8829d9c2f11a197dd1431ed5abbc5c954bbde3387088f9ee3a5a834beb7619bce
-b472e241e6956146cca57b97a8a204668d050423b4e76f857bad5b47f43b203a04c8391ba9d9c3e95093c071f9d376a1
-b7dd2de0284844392f7dfb56fe7ca3ede41e27519753ffc579a0a8d2d65ceb8108d06b6b0d4c3c1a2588951297bd1a1e
-902116ce70d0a079ac190321c1f48701318c05f8e69ee09694754885d33a835a849cafe56f499a2f49f6cda413ddf9a7
-b18105cc736787fafaf7c3c11c448bce9466e683159dff52723b7951dff429565e466e4841d982e3aaa9ee2066838666
-97ab9911f3f659691762d568ae0b7faa1047b0aed1009c319fa79d15d0db8db9f808fc385dc9a68fa388c10224985379
-b2a2cba65f5b927e64d2904ba412e2bac1cf18c9c3eda9c72fb70262497ecf505b640827e2afebecf10eebbcf48ccd3e
-b36a3fd677baa0d3ef0dac4f1548ff50a1730286b8c99d276a0a45d576e17b39b3cbadd2fe55e003796d370d4be43ce3
-a5dfec96ca3c272566e89dc453a458909247e3895d3e44831528130bc47cc9d0a0dac78dd3cad680a4351d399d241967
-8029382113909af6340959c3e61db27392531d62d90f92370a432aec3eb1e4c36ae1d4ef2ba8ec6edb4d7320c7a453f6
-971d85121ea108e6769d54f9c51299b0381ece8b51d46d49c89f65bedc123bab4d5a8bc14d6f67f4f680077529cbae4c
-98ff6afc01d0bec80a278f25912e1b1ebff80117adae72e31d5b9fa4d9624db4ba2065b444df49b489b0607c45e26c4c
-8fa29be10fb3ab30ce25920fec0187e6e91e458947009dabb869aade7136c8ba23602682b71e390c251f3743164cbdaa
-b3345c89eb1653418fe3940cf3e56a9a9c66526389b98f45ca02dd62bfb37baa69a4baaa7132d7320695f8ea6ad1fd94
-b72c7f5541c9ac6b60a7ec9f5415e7fb14da03f7164ea529952a29399f3a071576608dbbcc0d45994f21f92ddbeb1e19
-aa3450bb155a5f9043d0ef95f546a2e6ade167280bfb75c9f09c6f9cdb1fffb7ce8181436161a538433afa3681c7a141
-92a18fecaded7854b349f441e7102b638ababa75b1b0281dd0bded6541abe7aa37d96693595be0b01fe0a2e2133d50f9
-980756ddf9d2253cfe6c94960b516c94889d09e612810935150892627d2ecee9a2517e04968eea295d0106850c04ca44
-ae68c6ccc454318cdd92f32b11d89116a3b8350207a36d22a0f626718cad671d960090e054c0c77ac3162ae180ecfd4b
-99f31f66eaaa551749ad91d48a0d4e3ff4d82ef0e8b28f3184c54e852422ba1bdafd53b1e753f3a070f3b55f3c23b6a2
-a44eaeaa6589206069e9c0a45ff9fc51c68da38d4edff1d15529b7932e6f403d12b9387019c44a1488a5d5f27782a51f
-b80b5d54d4b344840e45b79e621bd77a3f83fb4ce6d8796b7d6915107b3f3c34d2e7d95bdafd120f285669e5acf2437a
-b36c069ec085a612b5908314d6b84c00a83031780261d1c77a0384c406867c9847d5b0845deddfa512cc04a8df2046fb
-b09dbe501583220f640d201acea7ee3e39bf9eda8b91aa07b5c50b7641d86d71acb619b38d27835ce97c3759787f08e9
-87403d46a2bf63170fff0b857acacf42ee801afe9ccba8e5b4aea967b68eac73a499a65ca46906c2eb4c8f27bc739faa
-82b93669f42a0a2aa5e250ffe6097269da06a9c02fcd1801abbad415a7729a64f830754bafc702e64600ba47671c2208
-8e3a3029be7edb8dd3ab1f8216664c8dc50d395f603736061d802cef77627db7b859ef287ed850382c13b4d22d6a2d80
-968e9ec7194ff424409d182ce0259acd950c384c163c04463bc8700a40b79beba6146d22b7fa7016875a249b7b31c602
-8b42c984bbe4996e0c20862059167c6bdc5164b1ffcd928f29512664459212d263e89f0f0e30eed4e672ffa5ed0b01b5
-96bac54062110dada905363211133f1f15dc7e4fd80a4c6e4a83bc9a0bcbbaba11cd2c7a13debcf0985e1a954c1da66b
-a16dc8a653d67a7cd7ae90b2fffac0bf1ca587005430fe5ba9403edd70ca33e38ba5661d2ed6e9d2864400d997626a62
-a68ab11a570a27853c8d67e491591dcba746bfbee08a2e75ae0790399130d027ed387f41ef1d7de8df38b472df309161
-92532b74886874447c0300d07eda9bbe4b41ed25349a3da2e072a93fe32c89d280f740d8ff70d5816793d7f2b97373cc
-88e35711b471e89218fd5f4d0eadea8a29405af1cd81974427bc4a5fb26ed60798daaf94f726c96e779b403a2cd82820
-b5c72aa4147c19f8c4f3a0a62d32315b0f4606e0a7025edc5445571eaf4daff64f4b7a585464821574dd50dbe1b49d08
-9305d9b4095258e79744338683fd93f9e657367b3ab32d78080e51d54eec331edbc224fad5093ebf8ee4bd4286757eb8
-b2a17abb3f6a05bcb14dc7b98321fa8b46d299626c73d7c6eb12140bf4c3f8e1795250870947af817834f033c88a59d6
-b3477004837dbd8ba594e4296f960fc91ab3f13551458445e6c232eb04b326da803c4d93e2e8dcd268b4413305ff84da
-924b4b2ebaafdcfdfedb2829a8bf46cd32e1407d8d725a5bd28bdc821f1bafb3614f030ea4352c671076a63494275a3f
-8b81b9ef6125c82a9bece6fdcb9888a767ac16e70527753428cc87c56a1236e437da8be4f7ecfe57b9296dc3ae7ba807
-906e19ec8b8edd58bdf9ae05610a86e4ea2282b1bbc1e8b00b7021d093194e0837d74cf27ac9916bdb8ec308b00da3da
-b41c5185869071760ac786078a57a2ab4e2af60a890037ac0c0c28d6826f15c2cf028fddd42a9b6de632c3d550bfbc14
-a646e5dec1b713ae9dfdf7bdc6cd474d5731a320403c7dfcfd666ffc9ae0cff4b5a79530e8df3f4aa9cb80568cb138e9
-b0efad22827e562bd3c3e925acbd0d9425d19057868608d78c2209a531cccd0f2c43dc5673acf9822247428ffa2bb821
-a94c19468d14b6f99002fc52ac06bbe59e5c472e4a0cdb225144a62f8870b3f10593749df7a2de0bd3c9476ce682e148
-803864a91162f0273d49271dafaab632d93d494d1af935aefa522768af058fce52165018512e8d6774976d52bd797e22
-a08711c2f7d45c68fb340ac23597332e1bcaec9198f72967b9921204b9d48a7843561ff318f87908c05a44fc35e3cc9d
-91c3cad94a11a3197ae4f9461faab91a669e0dddb0371d3cab3ed9aeb1267badc797d8375181130e461eadd05099b2a2
-81bdaaf48aae4f7b480fc13f1e7f4dd3023a41439ba231760409ce9292c11128ab2b0bdbbf28b98af4f97b3551f363af
-8d60f9df9fd303f625af90e8272c4ecb95bb94e6efc5da17b8ab663ee3b3f673e9f6420d890ccc94acf4d2cae7a860d8
-a7b75901520c06e9495ab983f70b61483504c7ff2a0980c51115d11e0744683ce022d76e3e09f4e99e698cbd21432a0d
-82956072df0586562fda7e7738226f694e1c73518dd86e0799d2e820d7f79233667192c9236dcb27637e4c65ef19d493
-a586beb9b6ffd06ad200957490803a7cd8c9bf76e782734e0f55e04a3dc38949de75dc607822ec405736c576cf83bca3
-a179a30d00def9b34a7e85607a447eea0401e32ab5abeee1a281f2acd1cf6ec81a178020666f641d9492b1bdf66f05a3
-83e129705c538787ed8e0fdc1275e6466a3f4ee21a1e6abedd239393b1df72244723b92f9d9d9339a0cab6ebf28f5a16
-811bd8d1e3722b64cd2f5b431167e7f91456e8bba2cc669d3fbbce7d553e29c3c19f629fcedd2498bc26d33a24891d17
-a243c030c858f1f60cccd26b45b024698cc6d9d9e6198c1ed4964a235d9f8d0baf9cde10c8e63dfaa47f8e74e51a6e85
-ab839eb82e23ca52663281f863b55b0a3d6d4425c33ffb4eeb1d7979488ab068bf99e2a60e82cea4dc42c56c26cbfebe
-8b896f9bb21d49343e67aec6ad175b58c0c81a3ca73d44d113ae4354a0065d98eb1a5cafedaf232a2bb9cdc62152f309
-af6230340cc0b66f5bf845540ed4fc3e7d6077f361d60762e488d57834c3e7eb7eacc1b0ed73a7d134f174a01410e50c
-88975e1b1af678d1b5179f72300a30900736af580dd748fd9461ef7afccc91ccd9bed33f9da55c8711a7635b800e831f
-a97486bb9047391661718a54b8dd5a5e363964e495eae6c692730264478c927cf3e66dd3602413189a3699fbeae26e15
-a5973c161ab38732885d1d2785fd74bf156ba34881980cba27fe239caef06b24a533ffe6dbbbeca5e6566682cc00300a
-a24776e9a840afda0003fa73b415d5bd6ecd9b5c2cc842b643ee51b8c6087f4eead4d0bfbd987eb174c489a7b952ff2a
-a8a6ee06e3af053b705a12b59777267c546f33ba8a0f49493af8e6df4e15cf8dd2d4fb4daf7e84c6b5d3a7363118ff03
-a28e59ce6ad02c2ce725067c0123117e12ac5a52c8f5af13eec75f4a9efc4f696777db18a374fa33bcae82e0734ebd16
-86dfc3b78e841c708aff677baa8ee654c808e5d257158715097c1025d46ece94993efe12c9d188252ad98a1e0e331fec
-a88d0275510f242eab11fdb0410ff6e1b9d7a3cbd3658333539815f1b450a84816e6613d15aa8a8eb15d87cdad4b27a2
-8440acea2931118a5b481268ff9f180ee4ede85d14a52c026adc882410825b8275caa44aff0b50c2b88d39f21b1a0696
-a7c3182eab25bd6785bacf12079d0afb0a9b165d6ed327814e2177148539f249eb9b5b2554538f54f3c882d37c0a8abe
-85291fbe10538d7da38efdd55a7acebf03b1848428a2f664c3ce55367aece60039f4f320b1771c9c89a35941797f717c
-a2c6414eeb1234728ab0de94aa98fc06433a58efa646ca3fcbd97dbfb8d98ae59f7ce6d528f669c8149e1e13266f69c9
-840c8462785591ee93aee2538d9f1ec44ba2ca61a569ab51d335ac873f5d48099ae8d7a7efa0725d9ff8f9475bfa4f56
-a7065a9d02fb3673acf7702a488fbc01aa69580964932f6f40b6c2d1c386b19e50b0e104fcac24ea26c4e723611d0238
-b72db6d141267438279e032c95e6106c2ccb3164b842ba857a2018f3a35f4b040da92680881eb17cd61d0920d5b8f006
-a8005d6c5960e090374747307ef0be2871a7a43fa4e76a16c35d2baab808e9777b496e9f57a4218b23390887c33a0b55
-8e152cea1e00a451ca47c20a1e8875873419700af15a5f38ee2268d3fbc974d4bd5f4be38008fa6f404dbdedd6e6e710
-a3391aed1fcd68761f06a7d1008ec62a09b1cb3d0203cd04e300a0c91adfed1812d8bc1e4a3fd7976dc0aae0e99f52f1
-967eb57bf2aa503ee0c6e67438098149eac305089c155f1762cf5e84e31f0fbf27c34a9af05621e34645c1ec96afaec8
-88af97ddc4937a95ec0dcd25e4173127260f91c8db2f6eac84afb789b363705fb3196235af631c70cafd09411d233589
-a32df75b3f2c921b8767638fd289bcfc61e08597170186637a7128ffedd52c798c434485ac2c7de07014f9e895c2c3d8
-b0a783832153650aa0d766a3a73ec208b6ce5caeb40b87177ffc035ab03c7705ecdd1090b6456a29f5fb7e90e2fa8930
-b59c8e803b4c3486777d15fc2311b97f9ded1602fa570c7b0200bada36a49ee9ef4d4c1474265af8e1c38a93eb66b18b
-982f2c85f83e852022998ff91bafbb6ff093ef22cf9d5063e083a48b29175ccbd51b9c6557151409e439096300981a6c
-939e3b5989fefebb9d272a954659a4eb125b98c9da6953f5e628d26266bd0525ec38304b8d56f08d65abc4d6da4a8dbb
-8898212fe05bc8de7d18503cb84a1c1337cc2c09d1eeef2b475aa79185b7322bf1f8e065f1bf871c0c927dd19faf1f6d
-94b0393a41cd00f724aee2d4bc72103d626a5aecb4b5486dd1ef8ac27528398edf56df9db5c3d238d8579af368afeb09
-96ac564450d998e7445dd2ea8e3fc7974d575508fa19e1c60c308d83b645864c029f2f6b7396d4ff4c1b24e92e3bac37
-8adf6638e18aff3eb3b47617da696eb6c4bdfbecbbc3c45d3d0ab0b12cbad00e462fdfbe0c35780d21aa973fc150285e
-b53f94612f818571b5565bbb295e74bada9b5f9794b3b91125915e44d6ddcc4da25510eab718e251a09c99534d6042d9
-8b96462508d77ee083c376cd90807aebad8de96bca43983c84a4a6f196d5faf6619a2351f43bfeec101864c3bf255519
-aeadf34657083fc71df33bd44af73bf5281c9ca6d906b9c745536e1819ea90b56107c55e2178ebad08f3ba75b3f81c86
-9784ba29b2f0057b5af1d3ab2796d439b8753f1f749c73e791037461bdfc3f7097394283105b8ab01788ea5255a96710
-8756241bda159d4a33bf74faba0d4594d963c370fb6a18431f279b4a865b070b0547a6d1613cf45b8cfb5f9236bbf831
-b03ebfd6b71421dfd49a30460f9f57063eebfe31b9ceaa2a05c37c61522b35bdc09d7db3ad75c76c253c00ba282d3cd2
-b34e7e6341fa9d854b2d3153bdda0c4ae2b2f442ab7af6f99a0975d45725aa48e36ae5f7011edd249862e91f499687d4
-b462ee09dc3963a14354244313e3444de5cc37ea5ccfbf14cd9aca8027b59c4cb2a949bc30474497cab8123e768460e6
-aea753290e51e2f6a21a9a0ee67d3a2713f95c2a5c17fe41116c87d3aa77b1683761264d704df1ac34f8b873bc88ef7b
-98430592afd414394f98ddfff9f280fcb1c322dbe3510f45e1e9c4bb8ee306b3e0cf0282c0ee73ebb8ba087d4d9e0858
-b95d3b5aaf54ffca11f4be8d57f76e14afdb20afc859dc7c7471e0b42031e8f3d461b726ecb979bdb2f353498dfe95ea
-984d17f9b11a683132e0b5a9ee5945e3ff7054c2d5c716be73b29078db1d36f54c6e652fd2f52a19da313112e97ade07
-ab232f756b3fff3262be418a1af61a7e0c95ceebbc775389622a8e10610508cd6784ab7960441917a83cc191c58829ea
-a28f41678d6e60de76b0e36ab10e4516e53e02e9c77d2b5af3cfeee3ce94cfa30c5797bd1daab20c98e1cad83ad0f633
-b55395fca84dd3ccc05dd480cb9b430bf8631ff06e24cb51d54519703d667268c2f8afcde4ba4ed16bece8cc7bc8c6e0
-8a8a5392a0e2ea3c7a8c51328fab11156004e84a9c63483b64e8f8ebf18a58b6ffa8fe8b9d95af0a2f655f601d096396
-ab480000fe194d23f08a7a9ec1c392334e9c687e06851f083845121ce502c06b54dda8c43092bcc1035df45cc752fe9b
-b265644c29f628d1c7e8e25a5e845cabb21799371814730a41a363e1bda8a7be50fee7c3996a365b7fcba4642add10db
-b8a915a3c685c2d4728f6931c4d29487cad764c5ce23c25e64b1a3259ac27235e41b23bfe7ae982921b4cb84463097df
-8efa7338442a4b6318145a5440fc213b97869647eeae41b9aa3c0a27ee51285b73e3ae3b4a9423df255e6add58864aa9
-9106d65444f74d217f4187dfc8fcf3810b916d1e4275f94f6a86d1c4f3565b131fd6cde1fa708bc05fe183c49f14941a
-948252dac8026bbbdb0a06b3c9d66ec4cf9532163bab68076fda1bd2357b69e4b514729c15aaa83b5618b1977bbc60c4
-ae6596ccfdf5cbbc5782efe3bb0b101bb132dbe1d568854ca24cacc0b2e0e9fabcb2ca7ab42aecec412efd15cf8cb7a2
-84a0b6c198ff64fd7958dfd1b40eac9638e8e0b2c4cd8cf5d8cdf80419baee76a05184bce6c5b635f6bf2d30055476a7
-8893118be4a055c2b3da593dbca51b1ae2ea2469911acfb27ee42faf3e6c3ad0693d3914c508c0b05b36a88c8b312b76
-b097479e967504deb6734785db7e60d1d8034d6ca5ba9552887e937f5e17bb413fccac2c1d1082154ed76609127860ad
-a0294e6b9958f244d29943debf24b00b538b3da1116269b6e452bb12dc742226712fd1a15b9c88195afeb5d2415f505c
-b3cc15f635080bc038f61b615f62b5b5c6f2870586191f59476e8368a73641d6ac2f7d0c1f54621982defdb318020230
-99856f49b9fe1604d917c94d09cc0ed753d13d015d30587a94e6631ffd964b214e607deb8a69a8b5e349a7edf4309206
-a8571e113ea22b4b4fce41a094da8c70de37830ae32e62c65c2fa5ad06a9bc29e884b945e73d448c72b176d6ecebfb58
-a9e9c6e52beb0013273c29844956b3ce291023678107cdc785f7b44eff5003462841ad8780761b86aefc6b734adde7cf
-80a784b0b27edb51ef2bad3aee80e51778dcaa0f3f5d3dcb5dc5d4f4b2cf7ae35b08de6680ea9dac53f8438b92eb09ef
-827b543e609ea328e97e373f70ad72d4915a2d1daae0c60d44ac637231070e164c43a2a58db80a64df1c624a042b38f9
-b449c65e8195202efdcb9bdb4e869a437313b118fef8b510cbbf8b79a4e99376adb749b37e9c20b51b31ed3310169e27
-8ea3028f4548a79a94c717e1ed28ad4d8725b8d6ab18b021063ce46f665c79da3c49440c6577319dab2d036b7e08f387
-897798431cfb17fe39f08f5f854005dc37b1c1ec1edba6c24bc8acb3b88838d0534a75475325a5ea98b326ad47dbad75
-89cf232e6303b0751561960fd4dea5754a28c594daf930326b4541274ffb03c7dd75938e411eb9a375006a70ce38097f
-9727c6ae7f0840f0b6c8bfb3a1a5582ceee705e0b5c59b97def7a7a2283edd4d3f47b7971e902a3a2079e40b53ff69b8
-b76ed72b122c48679d221072efc0eeea063cb205cbf5f9ef0101fd10cb1075b8628166c83577cced654e1c001c7882f7
-ae908c42d208759da5ee9b405df85a6532ea35c6f0f6a1288d22870f59d98edc896841b8ac890a538e6c8d1e8b02d359
-809d12fe4039a0ec80dc9be6a89acaab7797e5f7f9b163378f52f9a75a1d73b2e9ae6e3dd49e32ced439783c1cabbef5
-a4149530b7f85d1098ba534d69548c6c612c416e8d35992fc1f64f4deeb41e09e49c6cf7aadbed7e846b91299358fe2d
-a49342eacd1ec1148b8df1e253b1c015f603c39de11fa0a364ccb86ea32d69c34fd7aa6980a1fadcd8e785a57fa46f60
-87d43eff5a006dc4dddcf76cc96c656a1f3a68f19f124181feab86c6cc9a52cb9189cdbb423414defdd9bb0ca8ff1ddc
-861367e87a9aa2f0f68296ba50aa5dbc5713008d260cc2c7e62d407c2063064749324c4e8156dc21b749656cfebce26b
-b5303c2f72e84e170e66ae1b0fbd51b8c7a6f27476eaf5694b64e8737d5c84b51fe90100b256465a4c4156dd873cddb0
-b62849a4f891415d74f434cdc1d23c4a69074487659ca96e1762466b2b7a5d8525b056b891d0feea6fe6845cba8bc7fb
-923dd9e0d6590a9307e8c4c23f13bae3306b580e297a937711a8b13e8de85e41a61462f25b7d352b682e8437bf2b4ab3
-9147379860cd713cd46c94b8cdf75125d36c37517fbecf81ace9680b98ce6291cd1c3e472f84249cc3b2b445e314b1b6
-a808a4f17ac21e3fb5cfef404e61fae3693ca3e688d375f99b6116779696059a146c27b06de3ac36da349b0649befd56
-87787e9322e1b75e66c1f0d9ea0915722a232770930c2d2a95e9478c4b950d15ab767e30cea128f9ed65893bfc2d0743
-9036a6ee2577223be105defe1081c48ea7319e112fff9110eb9f61110c319da25a6cea0464ce65e858635b079691ef1f
-af5548c7c24e1088c23b57ee14d26c12a83484c9fd9296edf1012d8dcf88243f20039b43c8c548c265ef9a1ffe9c1c88
-a0fff520045e14065965fb8accd17e878d3fcaf9e0af2962c8954e50be6683d31fa0bf4816ab68f08630dbac6bfce52a
-b4c1b249e079f6ae1781af1d97a60b15855f49864c50496c09c91fe1946266915b799f0406084d7783f5b1039116dd8b
-8b0ffa5e7c498cb3879dddca34743b41eee8e2dea3d4317a6e961b58adb699ef0c92400c068d5228881a2b08121226bf
-852ae8b19a1d80aa8ae5382e7ee5c8e7670ceb16640871c56b20b96b66b3b60e00015a3dde039446972e57b49a999ddd
-a49942f04234a7d8492169da232cfff8051df86e8e1ba3db46aede02422c689c87dc1d99699c25f96cb763f5ca0983e5
-b04b597b7760cf5dcf411ef896d1661e6d5b0db3257ac2cf64b20b60c6cc18fa10523bb958a48d010b55bac7b02ab3b1
-a494591b51ea8285daecc194b5e5bd45ae35767d0246ac94fae204d674ee180c8e97ff15f71f28b7aeb175b8aea59710
-97d2624919e78406e7460730680dea8e71c8571cf988e11441aeea54512b95bd820e78562c99372d535d96f7e200d20d
-ac693ddb00e48f76e667243b9b6a7008424043fb779e4f2252330285232c3fccac4da25cbd6d95fe9ad959ff305a91f6
-8d20ca0a71a64a3f702a0825bb46bd810d03bebfb227683680d474a52f965716ff99e19a165ebaf6567987f4f9ee3c94
-a5c516a438f916d1d68ca76996404792e0a66e97b7f18fc54c917bf10cf3211b62387932756e39e67e47b0bd6e88385a
-b089614d830abc0afa435034cec7f851f2f095d479cacf1a3fb57272da826c499a52e7dcbc0eb85f4166fb94778e18e9
-a8dacc943765d930848288192f4c69e2461c4b9bc6e79e30eeef9a543318cf9ae9569d6986c65c5668a89d49993f8e07
-ab5a9361fa339eec8c621bdad0a58078983abd8942d4282b22835d7a3a47e132d42414b7c359694986f7db39386c2e19
-94230517fb57bd8eb26c6f64129b8b2abd0282323bf7b94b8bac7fab27b4ecc2c4290c294275e1a759de19f2216134f3
-b8f158ea5006bc3b90b285246625faaa6ac9b5f5030dc69701b12f3b79a53ec7e92eeb5a63bbd1f9509a0a3469ff3ffc
-8b6944fd8cb8540957a91a142fdcda827762aa777a31e8810ca6d026e50370ee1636fc351724767e817ca38804ebe005
-82d1ee40fe1569c29644f79fa6c4033b7ed45cd2c3b343881f6eb0de2e79548fded4787fae19bed6ee76ed76ff9f2f11
-a8924c7035e99eaed244ca165607e7e568b6c8085510dcdbaf6ebdbed405af2e6c14ee27d94ffef10d30aa52a60bf66d
-956f82a6c2ae044635e85812581e4866c5fa2f427b01942047d81f6d79a14192f66fbbe77c9ffeaef4e6147097fdd2b5
-b1100255a1bcf5e05b6aff1dfeb6e1d55b5d68d43a7457ba10cc76b61885f67f4d0d5179abda786e037ae95deb8eea45
-99510799025e3e5e8fbf06dedb14c060c6548ba2bda824f687d3999dc395e794b1fb6514b9013f3892b6cf65cb0d65aa
-8f9091cebf5e9c809aab415942172258f894e66e625d7388a05289183f01b8d994d52e05a8e69f784fba41db9ea357f0
-a13d2eeb0776bdee9820ecb6693536720232848c51936bb4ef4fe65588d3f920d08a21907e1fdb881c1ad70b3725e726
-a68b8f18922d550284c5e5dc2dda771f24c21965a6a4d5e7a71678178f46df4d8a421497aad8fcb4c7e241aba26378a0
-8b7601f0a3c6ad27f03f2d23e785c81c1460d60100f91ea9d1cab978aa03b523150206c6d52ce7c7769c71d2c8228e9e
-a8e02926430813caa851bb2b46de7f0420f0a64eb5f6b805401c11c9091d3b6d67d841b5674fa2b1dce0867714124cd8
-b7968ecba568b8193b3058400af02c183f0a6df995a744450b3f7e0af7a772454677c3857f99c140bbdb2a09e832e8e0
-8f20b1e9ba87d0a3f35309b985f3c18d2e8800f1ca7f0c52cadef773f1496b6070c936eea48c4a1cae83fd2524e9d233
-88aef260042db0d641a51f40639dbeeefa9e9811df30bee695f3791f88a2f84d318f04e8926b7f47bf25956cb9e3754f
-9725345893b647e9ba4e6a29e12f96751f1ae25fcaec2173e9a259921a1a7edb7a47159b3c8767e44d9e2689f5aa0f72
-8c281e6f72752cb11e239e4df9341c45106eb7993c160e54423c2bffe10bc39d42624b45a1f673936ef2e1a02fc92f1a
-90aba2f68bddb2fcce6c51430dacdfeec43ea8dc379660c99095df11017691ccf5faa27665cf4b9f0eea7728ae53c327
-b7022695c16521c5704f49b7ddbdbec9b5f57ce0ceebe537bc0ebb0906d8196cc855a9afeb8950a1710f6a654464d93f
-8fe1b9dd3c6a258116415d36e08374e094b22f0afb104385a5da48be17123e86fb8327baacc4f0d9ebae923d55d99bb5
-817e85d8e3d19a4cbc1dec31597142c2daa4871bda89c2177fa719c00eda3344eb08b82eb92d4aa91a9eaacb3fc09783
-b59053e1081d2603f1ca0ba553804d6fa696e1fd996631db8f62087b26a40dfef02098b0326bb75f99ec83b9267ca738
-990a173d857d3ba81ff3789b931bfc9f5609cde0169b7f055fa3cb56451748d593d62d46ba33f80f9cafffe02b68dd14
-b0c538dbba4954b809ab26f9f94a3cf1dcb77ce289eaec1d19f556c0ae4be1fa03af4a9b7057837541c3cc0a80538736
-ac3ba42f5f44f9e1fc453ce49c4ab79d0e1d5c42d3b30b1e098f3ab3f414c4c262fa12fb2be249f52d4aaf3c5224beb9
-af47467eb152e59870e21f0d4da2f43e093daf40180ab01438030684b114d025326928eaab12c41b81a066d94fce8436
-98d1b58ba22e7289b1c45c79a24624f19b1d89e00f778eef327ec4856a9a897278e6f1a9a7e673844b31dde949153000
-97ccb15dfadc7c59dca08cfe0d22df2e52c684cf97de1d94bc00d7ba24e020025130b0a39c0f4d46e4fc872771ee7875
-b699e4ed9a000ff96ca296b2f09dce278832bc8ac96851ff3cff99ed3f6f752cfc0fea8571be28cd9b5a7ec36f1a08ee
-b9f49f0edb7941cc296435ff0a912e3ad16848ee8765ab5f60a050b280d6ea585e5b34051b15f6b8934ef01ceb85f648
-ac3893df7b4ceab23c6b9054e48e8ba40d6e5beda8fbe90b814f992f52494186969b35d8c4cdc3c99890a222c9c09008
-a41293ad22fae81dea94467bc1488c3707f3d4765059173980be93995fa4fcc3c9340796e3eed0beeb0ba0d9bb4fa3aa
-a0543e77acd2aeecde13d18d258aeb2c7397b77f17c35a1992e8666ea7abcd8a38ec6c2741bd929abba2f766138618cc
-92e79b22bc40e69f6527c969500ca543899105837b6b1075fa1796755c723462059b3d1b028e0b3df2559fa440e09175
-a1fa1eac8f41a5197a6fb4aa1eae1a031c89f9c13ff9448338b222780cf9022e0b0925d930c37501a0ef7b2b00fdaf83
-b3cb29ff73229f0637335f28a08ad8c5f166066f27c6c175164d0f26766a927f843b987ee9b309ed71cbf0a65d483831
-84d4ab787f0ac00f104f4a734dc693d62d48c2aeb03913153da62c2ae2c27d11b1110dcef8980368dd84682ea2c1a308
-ab6a8e4bbc78d4a7b291ad3e9a8fe2d65f640524ba3181123b09d2d18a9e300e2509ccf7000fe47e75b65f3e992a2e7e
-b7805ebe4f1a4df414003dc10bca805f2ab86ca75820012653e8f9b79c405196b0e2cab099f2ab953d67f0d60d31a0f9
-b12c582454148338ea605d22bd00a754109063e22617f1f8ac8ddf5502c22a181c50c216c3617b9852aa5f26af56b323
-86333ad9f898947e31ce747728dc8c887479e18d36ff3013f69ebef807d82c6981543b5c3788af93c4d912ba084d3cba
-b514efa310dc4ad1258add138891e540d8c87142a881b5f46563cc58ecd1488e6d3a2fca54c0b72a929f3364ca8c333e
-aa0a30f92843cf2f484066a783a1d75a7aa6f41f00b421d4baf20a6ac7886c468d0eea7ca8b17dd22f4f74631b62b640
-b3b7dc63baec9a752e8433c0cdee4d0f9bc41f66f2b8d132faf925eef9cf89aae756fc132c45910f057122462605dc10
-b9b8190dac5bfdeb59fd44f4da41a57e7f1e7d2c21faba9da91fa45cbeca06dcf299c9ae22f0c89ece11ac46352d619f
-89f8cf36501ad8bdfeab863752a9090e3bfda57cf8fdeca2944864dc05925f501e252c048221bcc57136ab09a64b64b2
-b0cbfaf317f05f97be47fc9d69eda2dd82500e00d42612f271a1fe24626408c28881f171e855bd5bd67409f9847502b4
-a7c21a8fcede581bfd9847b6835eda62ba250bea81f1bb17372c800a19c732abe03064e64a2f865d974fb636cab4b859
-95f9df524ba7a4667351696c4176b505d8ea3659f5ff2701173064acc624af69a0fad4970963736383b979830cb32260
-856a74fe8b37a2e3afeac858c8632200485d438422a16ae3b29f359e470e8244995c63ad79c7e007ed063f178d0306fd
-b37faa4d78fdc0bb9d403674dbea0176c2014a171c7be8527b54f7d1a32a76883d3422a3e7a5f5fcc5e9b31b57822eeb
-8d37234d8594ec3fe75670b5c9cc1ec3537564d4739b2682a75b18b08401869a4264c0f264354219d8d896cded715db4
-b5289ee5737f0e0bde485d32096d23387d68dab8f01f47821ab4f06cc79a967afe7355e72dc0c751d96b2747b26f6255
-9085e1fdf9f813e9c3b8232d3c8863cd84ab30d45e8e0d3d6a0abd9ebc6fd70cdf749ff4d04390000e14c7d8c6655fc7
-93a388c83630331eca4da37ea4a97b3b453238af474817cc0a0727fd3138dcb4a22de38c04783ec829c22cb459cb4e8e
-a5377116027c5d061dbe24c240b891c08cdd8cd3f0899e848d682c873aff5b8132c1e7cfe76d2e5ed97ee0eb1d42cb68
-a274c84b04338ed28d74683e2a7519c2591a3ce37c294d6f6e678f7d628be2db8eff253ede21823e2df7183e6552f622
-8bc201147a842453a50bec3ac97671397bc086d6dfc9377fa38c2124cdc286abda69b7324f47d64da094ae011d98d9d9
-9842d0c066c524592b76fbec5132bc628e5e1d21c424bec4555efca8619cc1fd8ea3161febcb8b9e8ab54702f4e815e2
-a19191b713a07efe85c266f839d14e25660ee74452e6c691cd9997d85ae4f732052d802d3deb018bdd847caa298a894b
-a24f71fc0db504da4e287dd118a4a74301cbcd16033937ba2abc8417956fcb4ae19b8e63b931795544a978137eff51cb
-a90eec4a6a3a4b8f9a5b93d978b5026fcf812fe65585b008d7e08c4aaf21195a1d0699f12fc16f79b6a18a369af45771
-8b551cf89737d7d06d9b3b9c4c1c73b41f2ea0af4540999c70b82dabff8580797cf0a3caf34c86c59a7069eb2e38f087
-b8d312e6c635e7a216a1cda075ae77ba3e1d2fd501dc31e83496e6e81ed5d9c7799f8e578869c2e0e256fb29f5de10a7
-8d144bdb8cae0b2cdb5b33d44bbc96984a5925202506a8cc65eb67ac904b466f5a7fe3e1cbf04aa785bbb7348c4bb73c
-a101b3d58b7a98659244b88de0b478b3fb87dc5fc6031f6e689b99edf498abd43e151fd32bd4bbd240e0b3e59c440359
-907453abca7d8e7151a05cc3d506c988007692fe7401395dc93177d0d07d114ab6cca0cc658eb94c0223fe8658295cad
-825329ffbe2147ddb68f63a0a67f32d7f309657b8e5d9ab5bb34b3730bfa2c77a23eaaadb05def7d9f94a9e08fdc1e96
-88ee923c95c1dac99ae7ed6067906d734d793c5dc5d26339c1bb3314abe201c5dccb33b9007351885eb2754e9a8ea06c
-98bc9798543f5f1adc9f2cfcfa72331989420e9c3f6598c45269f0dc9b7c8607bbeaf03faa0aea2ddde2b8f17fdceff5
-8ee87877702a79aef923ab970db6fa81561b3c07d5bf1a072af0a7bad765b4cbaec910afe1a91703feacc7822fa38a94
-8060b9584aa294fe8adc2b22f67e988bc6da768eae91e429dcc43ddc53cfcc5d6753fdc1b420b268c7eb2fb50736a970
-b344a5524d80a2f051870c7001f74fcf348a70fcf78dbd20c6ff9ca85d81567d2318c8b8089f2c4f195d6aec9fc15fa6
-8f5a5d893e1936ed062149d20eb73d98b62b7f50ab5d93a6429c03656b36688d1c80cb5010e4977491e51fa0d7dd35d5
-86fa32ebbf97328c5f5f15564e1238297e289ec3219b9a741724e9f3ae8d5c15277008f555863a478b247ba5dc601d44
-9557e55377e279f4b6b5e0ffe01eca037cc13aac242d67dfcd0374a1e775c5ed5cb30c25fe21143fee54e3302d34a3ea
-8cb6bcbc39372d23464a416ea7039f57ba8413cf3f00d9a7a5b356ab20dcb8ed11b3561f7bce372b8534d2870c7ee270
-b5d59075cb5abde5391f64b6c3b8b50adc6e1f654e2a580b6d6d6eff3f4fbdd8fffc92e06809c393f5c8eab37f774c4b
-afcfb6903ef13e493a1f7308675582f15af0403b6553e8c37afb8b2808ad21b88b347dc139464367dc260df075fea1ad
-810fbbe808375735dd22d5bc7fc3828dc49fdd22cc2d7661604e7ac9c4535c1df578780affb3b895a0831640a945bcad
-8056b0c678803b416f924e09a6299a33cf9ad7da6fe1ad7accefe95c179e0077da36815fde3716711c394e2c5ea7127f
-8b67403702d06979be19f1d6dc3ec73cc2e81254d6b7d0cc49cd4fdda8cd51ab0835c1d2d26fc0ecab5df90585c2f351
-87f97f9e6d4be07e8db250e5dd2bffdf1390665bc5709f2b631a6fa69a7fca958f19bd7cc617183da1f50ee63e9352b5
-ae151310985940471e6803fcf37600d7fa98830613e381e00dab943aec32c14162d51c4598e8847148148000d6e5af5c
-81eb537b35b7602c45441cfc61b27fa9a30d3998fad35a064e05bc9479e9f10b62eba2b234b348219eea3cadcaac64bb
-8a441434934180ab6f5bc541f86ebd06eadbee01f438836d797e930fa803a51510e005c9248cecc231a775b74d12b5e9
-81f3c250a27ba14d8496a5092b145629eb2c2e6a5298438670375363f57e2798207832c8027c3e9238ad94ecdadfc4df
-a6217c311f2f3db02ceaa5b6096849fe92b6f4b6f1491535ef8525f6ccee6130bed2809e625073ecbaddd4a3eb3df186
-82d1c396f0388b942cf22b119d7ef1ad03d3dad49a74d9d01649ee284f377c8daddd095d596871669e16160299a210db
-a40ddf7043c5d72a7246bd727b07f7fff1549f0e443d611de6f9976c37448b21664c5089c57f20105102d935ab82f27b
-b6c03c1c97adf0c4bf4447ec71366c6c1bff401ba46236cd4a33d39291e7a1f0bb34bd078ba3a18d15c98993b153a279
-8a94f5f632068399c359c4b3a3653cb6df2b207379b3d0cdace51afdf70d6d5cce6b89a2b0fee66744eba86c98fb21c2
-b2f19e78ee85073f680c3bba1f07fd31b057c00b97040357d97855b54a0b5accb0d3b05b2a294568fcd6a4be6f266950
-a74632d13bbe2d64b51d7a9c3ae0a5a971c19f51cf7596a807cea053e6a0f3719700976d4e394b356c0329a2dced9aa2
-afef616d341a9bc94393b8dfba68ff0581436aa3a3adb7c26a1bbf2cf19fa877066191681f71f17f3cd6f9cf6bf70b5a
-8ce96d93ae217408acf7eb0f9cbb9563363e5c7002e19bbe1e80760bc9d449daee2118f3878b955163ed664516b97294
-8414f79b496176bc8b8e25f8e4cfee28f4f1c2ddab099d63d2aca1b6403d26a571152fc3edb97794767a7c4686ad557c
-b6c61d01fd8ce087ef9f079bf25bf10090db483dd4f88c4a786d31c1bdf52065651c1f5523f20c21e75cea17df69ab73
-a5790fd629be70545093631efadddc136661f63b65ec682609c38ef7d3d7fa4e56bdf94f06e263bc055b90cb1c6bcefe
-b515a767e95704fb7597bca9e46f1753abacdc0e56e867ee3c6f4cd382643c2a28e65312c05ad040eaa3a8cbe7217a65
-8135806a02ead6aa92e9adb6fefb91349837ab73105aaa7be488ef966aa8dfaafdfa64bbae30fcbfa55dd135a036a863
-8f22435702716d76b1369750694540742d909d5e72b54d0878245fab7c269953b1c6f2b29c66f08d5e0263ca3a731771
-8e0f8a8e8753e077dac95848212aeffd51c23d9b6d611df8b102f654089401954413ecbedc6367561ca599512ae5dda7
-815a9084e3e2345f24c5fa559deec21ee1352fb60f4025c0779be65057f2d528a3d91593bd30d3a185f5ec53a9950676
-967e6555ccba395b2cc1605f8484c5112c7b263f41ce8439a99fd1c71c5ed14ad02684d6f636364199ca48afbbde13be
-8cd0ccf17682950b34c796a41e2ea7dd5367aba5e80a907e01f4cdc611e4a411918215e5aebf4292f8b24765d73314a6
-a58bf1bbb377e4b3915df6f058a0f53b8fb8130fdec8c391f6bc82065694d0be59bb67ffb540e6c42cc8b380c6e36359
-92af3151d9e6bfb3383d85433e953c0160859f759b0988431ec5893542ba40288f65db43c78a904325ef8d324988f09d
-8011bbb05705167afb47d4425065630f54cb86cd462095e83b81dfebf348f846e4d8fbcf1c13208f5de1931f81da40b9
-81c743c104fc3cb047885c9fa0fb9705c3a83ee24f690f539f4985509c3dafd507af3f6a2128276f45d5939ef70c167f
-a2c9679b151c041aaf5efeac5a737a8f70d1631d931609fca16be1905682f35e291292874cb3b03f14994f98573c6f44
-a4949b86c4e5b1d5c82a337e5ce6b2718b1f7c215148c8bfb7e7c44ec86c5c9476048fc5c01f57cb0920876478c41ad6
-86c2495088bd1772152e527a1da0ef473f924ea9ab0e5b8077df859c28078f73c4e22e3a906b507fdf217c3c80808b5c
-892e0a910dcf162bcea379763c3e2349349e4cda9402949255ac4a78dd5a47e0bf42f5bd0913951576b1d206dc1e536a
-a7009b2c6b396138afe4754b7cc10dee557c51c7f1a357a11486b3253818531f781ea8107360c8d4c3b1cd96282353c0
-911763ef439c086065cc7b4e57484ed6d693ea44acee4b18c9fd998116da55fbe7dcb8d2a0f0f9b32132fca82d73dff6
-a722000b95a4a2d40bed81870793f15ba2af633f9892df507f2842e52452e02b5ea8dea6a043c2b2611d82376e33742a
-9387ac49477bd719c2f92240d0bdfcf9767aad247ca93dc51e56106463206bc343a8ec855eb803471629a66fffb565d6
-92819a1fa48ab4902939bb72a0a4e6143c058ea42b42f9bc6cea5df45f49724e2530daf3fc4f097cceefa2a8b9db0076
-98eac7b04537653bc0f4941aae732e4b1f84bd276c992c64a219b8715eb1fb829b5cbd997d57feb15c7694c468f95f70
-b275e7ba848ce21bf7996e12dbeb8dadb5d0e4f1cb5a0248a4f8f9c9fe6c74e3c93f4b61edbcb0a51af5a141e1c14bc7
-97243189285aba4d49c53770c242f2faf5fd3914451da4931472e3290164f7663c726cf86020f8f181e568c72fd172d1
-839b0b3c25dd412bee3dc24653b873cc65454f8f16186bb707bcd58259c0b6765fa4c195403209179192a4455c95f3b8
-8689d1a870514568a074a38232e2ceb4d7df30fabeb76cff0aed5b42bf7f02baea12c5fadf69f4713464dbd52aafa55f
-8958ae7b290f0b00d17c3e9fdb4dbf168432b457c7676829299dd428984aba892de1966fc106cfc58a772862ecce3976
-a422bc6bd68b8870cfa5bc4ce71781fd7f4368b564d7f1e0917f6013c8bbb5b240a257f89ecfdbecb40fe0f3aa31d310
-aa61f78130cebe09bc9a2c0a37f0dd57ed2d702962e37d38b1df7f17dc554b1d4b7a39a44182a452ce4c5eb31fa4cfcc
-b7918bd114f37869bf1a459023386825821bfadce545201929d13ac3256d92a431e34f690a55d944f77d0b652cefeffc
-819bba35fb6ace1510920d4dcff30aa682a3c9af9022e287751a6a6649b00c5402f14b6309f0aeef8fce312a0402915e
-8b7c9ad446c6f63c11e1c24e24014bd570862b65d53684e107ba9ad381e81a2eaa96731b4b33536efd55e0f055071274
-8fe79b53f06d33386c0ec7d6d521183c13199498594a46d44a8a716932c3ec480c60be398650bbfa044fa791c4e99b65
-9558e10fb81250b9844c99648cf38fa05ec1e65d0ccbb18aa17f2d1f503144baf59d802c25be8cc0879fff82ed5034ad
-b538a7b97fbd702ba84645ca0a63725be1e2891c784b1d599e54e3480e4670d0025526674ef5cf2f87dddf2290ba09f0
-92eafe2e869a3dd8519bbbceb630585c6eb21712b2f31e1b63067c0acb5f9bdbbcbdb612db4ea7f9cc4e7be83d31973f
-b40d21390bb813ab7b70a010dff64c57178418c62685761784e37d327ba3cb9ef62df87ecb84277c325a637fe3709732
-b349e6fbf778c4af35fbed33130bd8a7216ed3ba0a79163ebb556e8eb8e1a7dad3456ddd700dad9d08d202491c51b939
-a8fdaedecb251f892b66c669e34137f2650509ade5d38fbe8a05d9b9184bb3b2d416186a3640429bd1f3e4b903c159dd
-ac6167ebfee1dbab338eff7642f5e785fc21ef0b4ddd6660333fe398068cbd6c42585f62e81e4edbb72161ce852a1a4f
-874b1fbf2ebe140c683bd7e4e0ab017afa5d4ad38055aaa83ee6bbef77dbc88a6ce8eb0dcc48f0155244af6f86f34c2d
-903c58e57ddd9c446afab8256a6bb6c911121e6ccfb4f9b4ed3e2ed922a0e500a5cb7fa379d5285bc16e11dac90d1fda
-8dae7a0cffa2fd166859cd1bf10ff82dd1932e488af377366b7efc0d5dec85f85fe5e8150ff86a79a39cefc29631733a
-aa047857a47cc4dfc08585f28640420fcf105b881fd59a6cf7890a36516af0644d143b73f3515ab48faaa621168f8c31
-864508f7077c266cc0cb3f7f001cb6e27125ebfe79ab57a123a8195f2e27d3799ff98413e8483c533b46a816a3557f1f
-8bcd45ab1f9cbab36937a27e724af819838f66dfeb15923f8113654ff877bd8667c54f6307aaf0c35027ca11b6229bfd
-b21aa34da9ab0a48fcfdd291df224697ce0c1ebc0e9b022fdee8750a1a4b5ba421c419541ed5c98b461eecf363047471
-a9a18a2ab2fae14542dc336269fe612e9c1af6cf0c9ac933679a2f2cb77d3c304114f4d219ca66fe288adde30716775b
-b5205989b92c58bdda71817f9a897e84100b5c4e708de1fced5c286f7a6f01ae96b1c8d845f3a320d77c8e2703c0e8b1
-a364059412bbcc17b8907d43ac8e5df90bc87fd1724b5f99832d0d24559fae6fa76a74cff1d1eac8cbac6ec80b44af20
-ae709f2c339886b31450834cf29a38b26eb3b0779bd77c9ac269a8a925d1d78ea3837876c654b61a8fe834b3b6940808
-8802581bba66e1952ac4dab36af371f66778958f4612901d95e5cac17f59165e6064371d02de8fb6fccf89c6dc8bd118
-a313252df653e29c672cbcfd2d4f775089cb77be1077381cf4dc9533790e88af6cedc8a119158e7da5bf6806ad9b91a1
-992a065b4152c7ef11515cd54ba9d191fda44032a01aed954acff3443377ee16680c7248d530b746b8c6dee2d634e68c
-b627b683ee2b32c1ab4ccd27b9f6cce2fe097d96386fa0e5c182ad997c4c422ab8dfc03870cd830b8c774feb66537282
-b823cf8a9aee03dadd013eb9efe40a201b4b57ef67efaae9f99683005f5d1bf55e950bf4af0774f50859d743642d3fea
-b8a7449ffac0a3f206677097baf7ce00ca07a4d2bd9b5356fbcb83f3649b0fda07cfebad220c1066afba89e5a52abf4b
-b2dd1a2f986395bb4e3e960fbbe823dbb154f823284ebc9068502c19a7609790ec0073d08bfa63f71e30c7161b6ef966
-98e5236de4281245234f5d40a25b503505af140b503a035fc25a26159a9074ec81512b28f324c56ea2c9a5aa7ce90805
-89070847dc8bbf5bc4ed073aa2e2a1f699cf0c2ca226f185a0671cecc54e7d3e14cd475c7752314a7a8e7476829da4bc
-a9402dc9117fdb39c4734c0688254f23aed3dce94f5f53f5b7ef2b4bf1b71a67f85ab1a38ec224a59691f3bee050aeb3
-957288f9866a4bf56a4204218ccc583f717d7ce45c01ea27142a7e245ad04a07f289cc044f8cf1f21d35e67e39299e9c
-b2fb31ccb4e69113763d7247d0fc8edaae69b550c5c56aecacfd780c7217dc672f9fb7496edf4aba65dacf3361268e5b
-b44a4526b2f1d6eb2aa8dba23bfa385ff7634572ab2afddd0546c3beb630fbfe85a32f42dd287a7fec069041411537f7
-8db5a6660c3ac7fd7a093573940f068ee79a82bc17312af900b51c8c439336bc86ca646c6b7ab13aaaa008a24ca508ab
-8f9899a6d7e8eb4367beb5c060a1f8e94d8a21099033ae582118477265155ba9e72176a67f7f25d7bad75a152b56e21a
-a67de0e91ade8d69a0e00c9ff33ee2909b8a609357095fa12319e6158570c232e5b6f4647522efb7345ce0052aa9d489
-82eb2414898e9c3023d57907a2b17de8e7eea5269029d05a94bfd7bf5685ac4a799110fbb375eb5e0e2bd16acf6458ae
-94451fc7fea3c5a89ba701004a9693bab555cb622caf0896b678faba040409fdfd14a978979038b2a81e8f0abc4994d2
-ac879a5bb433998e289809a4a966bd02b4bf6a9c1cc276454e39c886efcf4fc68baebed575826bde577ab5aa71d735a9
-880c0f8f49c875dfd62b4ddedde0f5c8b19f5687e693717f7e5c031bc580e58e13ab497d48b4874130a18743c59fdce3
-b582af8d8ff0bf76f0a3934775e0b54c0e8fed893245d7d89cae65b03c8125b7237edc29dc45b4fe1a3fe6db45d280ee
-89f337882ed3ae060aaee98efa20d79b6822bde9708c1c5fcee365d0ec9297f694cae37d38fd8e3d49717c1e86f078e7
-826d2c1faea54061848b484e288a5f4de0d221258178cf87f72e14baaa4acc21322f8c9eab5dde612ef497f2d2e1d60b
-a5333d4f227543e9cd741ccf3b81db79f2f03ca9e649e40d6a6e8ff9073e06da83683566d3b3c8d7b258c62970fb24d1
-a28f08c473db06aaf4c043a2fae82b3c8cfaa160bce793a4c208e4e168fb1c65115ff8139dea06453c5963d95e922b94
-8162546135cc5e124e9683bdfaa45833c18553ff06a0861c887dc84a5b12ae8cd4697f6794c7ef6230492c32faba7014
-b23f0d05b74c08d6a7df1760792be83a761b36e3f8ae360f3c363fb196e2a9dd2de2e492e49d36561366e14daa77155c
-b6f70d6c546722d3907c708d630dbe289771d2c8bf059c2e32b77f224696d750b4dda9b3a014debda38e7d02c9a77585
-83bf4c4a9f3ca022c631017e7a30ea205ba97f7f5927cba8fc8489a4646eac6712cb821c5668c9ffe94d69d524374a27
-b0371475425a8076d0dd5f733f55aabbe42d20a7c8ea7da352e736d4d35a327b2beb370dfcb05284e22cfd69c5f6c4cc
-a0031ba7522c79211416c2cca3aa5450f96f8fee711552a30889910970ba13608646538781a2c08b834b140aadd7166f
-99d273c80c7f2dc6045d4ed355d9fc6f74e93549d961f4a3b73cd38683f905934d359058cd1fc4da8083c7d75070487f
-b0e4b0efa3237793e9dcce86d75aafe9879c5fa23f0d628649aef2130454dcf72578f9bf227b9d2b9e05617468e82588
-a5ab076fa2e1c5c51f3ae101afdd596ad9d106bba7882b359c43d8548b64f528af19afa76cd6f40da1e6c5fca4def3fa
-8ce2299e570331d60f6a6eff1b271097cd5f1c0e1113fc69b89c6a0f685dabea3e5bc2ac6bd789aa492ab189f89be494
-91b829068874d911a310a5f9dee001021f97471307b5a3de9ec336870ec597413e1d92010ce320b619f38bed7c4f7910
-b14fe91f4b07bf33b046e9285b66cb07927f3a8da0af548ac2569b4c4fb1309d3ced76d733051a20814e90dd5b75ffd1
-abaab92ea6152d40f82940277c725aa768a631ee0b37f5961667f82fb990fc11e6d3a6a2752b0c6f94563ed9bb28265c
-b7fe28543eca2a716859a76ab9092f135337e28109544f6bd2727728d0a7650428af5713171ea60bfc273d1c821d992c
-8a4917b2ab749fc7343fc64bdf51b6c0698ff15d740cc7baf248c030475c097097d5a473bcc00d8c25817563fe0447b4
-aa96156d1379553256350a0a3250166add75948fb9cde62aa555a0a9dc0a9cb7f2f7b8428aff66097bf6bfedaf14bbe2
-ae4ffeb9bdc76830d3eca2b705f30c1bdede6412fa064260a21562c8850c7fb611ec62bc68479fe48f692833e6f66d8d
-b96543caaba9d051600a14997765d49e4ab10b07c7a92cccf0c90b309e6da334fdd6d18c96806cbb67a7801024fbd3c7
-97b2b9ad76f19f500fcc94ca8e434176249f542ac66e5881a3dccd07354bdab6a2157018b19f8459437a68d8b86ba8e0
-a8d206f6c5a14c80005849474fde44b1e7bcf0b2d52068f5f97504c3c035b09e65e56d1cf4b5322791ae2c2fdbd61859
-936bad397ad577a70cf99bf9056584a61bd7f02d2d5a6cf219c05d770ae30a5cd902ba38366ce636067fc1dd10108d31
-a77e30195ee402b84f3882e2286bf5380c0ed374a112dbd11e16cef6b6b61ab209d4635e6f35cdaaa72c1a1981d5dabe
-a46ba4d3947188590a43c180757886a453a0503f79cc435322d92490446f37419c7b999fdf868a023601078070e03346
-80d8d4c5542f223d48240b445d4d8cf6a75d120b060bc08c45e99a13028b809d910b534d2ac47fb7068930c54efd8da9
-803be9c68c91b42b68e1f55e58917a477a9a6265e679ca44ee30d3eb92453f8c89c64eafc04c970d6831edd33d066902
-b14b2b3d0dfe2bb57cee4cd72765b60ac33c1056580950be005790176543826c1d4fbd737f6cfeada6c735543244ab57
-a9e480188bba1b8fb7105ff12215706665fd35bf1117bacfb6ab6985f4dbc181229873b82e5e18323c2b8f5de03258e0
-a66a0f0779436a9a3999996d1e6d3000f22c2cac8e0b29cddef9636393c7f1457fb188a293b6c875b05d68d138a7cc4a
-848397366300ab40c52d0dbbdafbafef6cd3dadf1503bb14b430f52bb9724188928ac26f6292a2412bc7d7aa620763c8
-95466cc1a78c9f33a9aaa3829a4c8a690af074916b56f43ae46a67a12bb537a5ac6dbe61590344a25b44e8512355a4a7
-8b5f7a959f818e3baf0887f140f4575cac093d0aece27e23b823cf421f34d6e4ff4bb8384426e33e8ec7b5eed51f6b5c
-8d5e1368ec7e3c65640d216bcc5d076f3d9845924c734a34f3558ac0f16e40597c1a775a25bf38b187213fbdba17c93b
-b4647c1b823516880f60d20c5cc38c7f80b363c19d191e8992226799718ee26b522a12ecb66556ed3d483aa4824f3326
-ac3abaea9cd283eb347efda4ed9086ea3acf495043e08d0d19945876329e8675224b685612a6badf8fd72fb6274902b1
-8eae1ce292d317aaa71bcf6e77e654914edd5090e2e1ebab78b18bb41b9b1bc2e697439f54a44c0c8aa0d436ebe6e1a9
-94dc7d1aec2c28eb43d93b111fa59aaa0d77d5a09501220bd411768c3e52208806abf973c6a452fd8292ff6490e0c9e2
-8fd8967f8e506fef27d17b435d6b86b232ec71c1036351f12e6fb8a2e12daf01d0ee04451fb944d0f1bf7fd20e714d02
-824e6865be55d43032f0fec65b3480ea89b0a2bf860872237a19a54bc186a85d2f8f9989cc837fbb325b7c72d9babe2c
-8bd361f5adb27fd6f4e3f5de866e2befda6a8454efeb704aacc606f528c03f0faae888f60310e49440496abd84083ce2
-b098a3c49f2aaa28b6b3e85bc40ce6a9cdd02134ee522ae73771e667ad7629c8d82c393fba9f27f5416986af4c261438
-b385f5ca285ff2cfe64dcaa32dcde869c28996ed091542600a0b46f65f3f5a38428cca46029ede72b6cf43e12279e3d3
-8196b03d011e5be5288196ef7d47137d6f9237a635ab913acdf9c595fa521d9e2df722090ec7eb0203544ee88178fc5f
-8ed1270211ef928db18e502271b7edf24d0bbd11d97f2786aee772d70c2029e28095cf8f650b0328cc8a4c38d045316d
-a52ab60e28d69b333d597a445884d44fd2a7e1923dd60f763951e1e45f83e27a4dac745f3b9eff75977b3280e132c15d
-91e9fe78cdac578f4a4687f71b800b35da54b824b1886dafec073a3c977ce7a25038a2f3a5b1e35c2c8c9d1a7312417c
-a42832173f9d9491c7bd93b21497fbfa4121687cd4d2ab572e80753d7edcbb42cfa49f460026fbde52f420786751a138
-97b947126d84dcc70c97be3c04b3de3f239b1c4914342fa643b1a4bb8c4fe45c0fcb585700d13a7ed50784790c54bef9
-860e407d353eac070e2418ef6cb80b96fc5f6661d6333e634f6f306779651588037be4c2419562c89c61f9aa2c4947f5
-b2c9d93c3ba4e511b0560b55d3501bf28a510745fd666b3cb532db051e6a8617841ea2f071dda6c9f15619c7bfd2737f
-8596f4d239aeeac78311207904d1bd863ef68e769629cc379db60e019aaf05a9d5cd31dc8e630b31e106a3a93e47cbc5
-8b26e14e2e136b65c5e9e5c2022cee8c255834ea427552f780a6ca130a6446102f2a6f334c3f9a0308c53df09e3dba7e
-b54724354eb515a3c8bed0d0677ff1db94ac0a07043459b4358cb90e3e1aa38ac23f2caa3072cf9647275d7cd61d0e80
-b7ce9fe0e515e7a6b2d7ddcb92bc0196416ff04199326aea57996eef8c5b1548bd8569012210da317f7c0074691d01b7
-a1a13549c82c877253ddefa36a29ea6a23695ee401fdd48e65f6f61e5ebd956d5e0edeff99484e9075cb35071fec41e2
-838ba0c1e5bd1a6da05611ff1822b8622457ebd019cb065ece36a2d176bd2d889511328120b8a357e44569e7f640c1e6
-b916eccff2a95519400bbf76b5f576cbe53cf200410370a19d77734dc04c05b585cfe382e8864e67142d548cd3c4c2f4
-a610447cb7ca6eea53a6ff1f5fe562377dcb7f4aaa7300f755a4f5e8eba61e863c51dc2aa9a29b35525b550fbc32a0fe
-9620e8f0f0ee9a4719aa9685eeb1049c5c77659ba6149ec4c158f999cfd09514794b23388879931fe26fea03fa471fd3
-a9dcf8b679e276583cf5b9360702a185470d09aea463dc474ee9c8aee91ef089dacb073e334e47fbc78ec5417c90465c
-8c9adee8410bdd99e5b285744cee61e2593b6300ff31a8a83b0ec28da59475a5c6fb9346fe43aadea2e6c3dad2a8e30a
-97d5afe9b3897d7b8bb628b7220cf02d8ee4e9d0b78f5000d500aaf4c1df9251aaaabfd1601626519f9d66f00a821d4e
-8a382418157b601ce4c3501d3b8409ca98136a4ef6abcbf62885e16e215b76b035c94d149cc41ff92e42ccd7c43b9b3d
-b64b8d11fb3b01abb2646ac99fdb9c02b804ce15d98f9fe0fbf1c9df8440c71417487feb6cdf51e3e81d37104b19e012
-849d7d044f9d8f0aab346a9374f0b3a5d14a9d1faa83dbacccbdc629ad1ef903a990940255564770537f8567521d17f0
-829dbb0c76b996c2a91b4cbbe93ba455ca0d5729755e5f0c92aaee37dff7f36fcdc06f33aca41f1b609c784127b67d88
-85a7c0069047b978422d264d831ab816435f63938015d2e977222b6b5746066c0071b7f89267027f8a975206ed25c1b0
-84b9fbc1cfb302df1acdcf3dc5d66fd1edfe7839f7a3b2fb3a0d5548656249dd556104d7c32b73967bccf0f5bdcf9e3b
-972220ac5b807f53eac37dccfc2ad355d8b21ea6a9c9b011c09fe440ddcdf7513e0b43d7692c09ded80d7040e26aa28f
-855885ed0b21350baeca890811f344c553cf9c21024649c722453138ba29193c6b02c4b4994cd414035486f923472e28
-841874783ae6d9d0e59daea03e96a01cbbe4ecaced91ae4f2c8386e0d87b3128e6d893c98d17c59e4de1098e1ad519dd
-827e50fc9ce56f97a4c3f2f4cbaf0b22f1c3ce6f844ff0ef93a9c57a09b8bf91ebfbd2ba9c7f83c442920bffdaf288cc
-a441f9136c7aa4c08d5b3534921b730e41ee91ab506313e1ba5f7c6f19fd2d2e1594e88c219834e92e6fb95356385aa7
-97d75b144471bf580099dd6842b823ec0e6c1fb86dd0da0db195e65524129ea8b6fd4a7a9bbf37146269e938a6956596
-a4b6fa87f09d5a29252efb2b3aaab6b3b6ea9fab343132a651630206254a25378e3e9d6c96c3d14c150d01817d375a8e
-a31a671876d5d1e95fe2b8858dc69967231190880529d57d3cab7f9f4a2b9b458ac9ee5bdaa3289158141bf18f559efb
-90bee6fff4338ba825974021b3b2a84e36d617e53857321f13d2b3d4a28954e6de3b3c0e629d61823d18a9763313b3bf
-96b622a63153f393bb419bfcf88272ea8b3560dbd46b0aa07ada3a6223990d0abdd6c2adb356ef4be5641688c8d83941
-84c202adeaff9293698022bc0381adba2cd959f9a35a4e8472288fd68f96f6de8be9da314c526d88e291c96b1f3d6db9
-8ca01a143b8d13809e5a8024d03e6bc9492e22226073ef6e327edf1328ef4aff82d0bcccee92cb8e212831fa35fe1204
-b2f970dbad15bfbefb38903c9bcc043d1367055c55dc1100a850f5eb816a4252c8c194b3132c929105511e14ea10a67d
-a5e36556472a95ad57eb90c3b6623671b03eafd842238f01a081997ffc6e2401f76e781d049bb4aa94d899313577a9cf
-8d1057071051772f7c8bedce53a862af6fd530dd56ae6321eaf2b9fc6a68beff5ed745e1c429ad09d5a118650bfd420a
-8aadc4f70ace4fcb8d93a78610779748dcffc36182d45b932c226dc90e48238ea5daa91f137c65ed532352c4c4d57416
-a2ea05ae37e673b4343232ae685ee14e6b88b867aef6dfac35db3589cbcd76f99540fed5c2641d5bb5a4a9f808e9bf0d
-947f1abad982d65648ae4978e094332b4ecb90f482c9be5741d5d1cf5a28acf4680f1977bf6e49dd2174c37f11e01296
-a27b144f1565e4047ba0e3f4840ef19b5095d1e281eaa463c5358f932114cbd018aa6dcf97546465cf2946d014d8e6d6
-8574e1fc3acade47cd4539df578ce9205e745e161b91e59e4d088711a7ab5aa3b410d517d7304b92109924d9e2af8895
-a48ee6b86b88015d6f0d282c1ae01d2a5b9e8c7aa3d0c18b35943dceb1af580d08a65f54dc6903cde82fd0d73ce94722
-8875650cec543a7bf02ea4f2848a61d167a66c91ffaefe31a9e38dc8511c6a25bde431007eefe27a62af3655aca208dc
-999b0a6e040372e61937bf0d68374e230346b654b5a0f591a59d33a4f95bdb2f3581db7c7ccb420cd7699ed709c50713
-878c9e56c7100c5e47bbe77dc8da5c5fe706cec94d37fa729633bca63cace7c40102eee780fcdabb655f5fa47a99600e
-865006fb5b475ada5e935f27b96f9425fc2d5449a3c106aa366e55ebed3b4ee42adc3c3f0ac19fd129b40bc7d6bc4f63
-b7a7da847f1202e7bc1672553e68904715e84fd897d529243e3ecda59faa4e17ba99c649a802d53f6b8dfdd51f01fb74
-8b2fb4432c05653303d8c8436473682933a5cb604da10c118ecfcd2c8a0e3132e125afef562bdbcc3df936164e5ce4f2
-808d95762d33ddfa5d0ee3d7d9f327de21a994d681a5f372e2e3632963ea974da7f1f9e5bac8ccce24293509d1f54d27
-932946532e3c397990a1df0e94c90e1e45133e347a39b6714c695be21aeb2d309504cb6b1dde7228ff6f6353f73e1ca2
-9705e7c93f0cdfaa3fa96821f830fe53402ad0806036cd1b48adc2f022d8e781c1fbdab60215ce85c653203d98426da3
-aa180819531c3ec1feb829d789cb2092964c069974ae4faad60e04a6afcce5c3a59aec9f11291e6d110a788d22532bc6
-88f755097f7e25cb7dd3c449520c89b83ae9e119778efabb54fbd5c5714b6f37c5f9e0346c58c6ab09c1aef2483f895d
-99fc03ab7810e94104c494f7e40b900f475fde65bdec853e60807ffd3f531d74de43335c3b2646b5b8c26804a7448898
-af2dea9683086bed1a179110efb227c9c00e76cd00a2015b089ccbcee46d1134aa18bda5d6cab6f82ae4c5cd2461ac21
-a500f87ba9744787fdbb8e750702a3fd229de6b8817594348dec9a723b3c4240ddfa066262d002844b9e38240ce55658
-924d0e45c780f5bc1c1f35d15dfc3da28036bdb59e4c5440606750ecc991b85be18bc9a240b6c983bc5430baa4c68287
-865b11e0157b8bf4c5f336024b016a0162fc093069d44ac494723f56648bc4ded13dfb3896e924959ea11c96321afefc
-93672d8607d4143a8f7894f1dcca83fb84906dc8d6dd7dd063bb0049cfc20c1efd933e06ca7bd03ea4cb5a5037990bfe
-826891efbdff0360446825a61cd1fa04326dd90dae8c33dfb1ed97b045e165766dd070bd7105560994d0b2044bdea418
-93c4a4a8bcbc8b190485cc3bc04175b7c0ed002c28c98a540919effd6ed908e540e6594f6db95cd65823017258fb3b1c
-aeb2a0af2d2239fda9aa6b8234b019708e8f792834ff0dd9c487fa09d29800ddceddd6d7929faa9a3edcb9e1b3aa0d6b
-87f11de7236d387863ec660d2b04db9ac08143a9a2c4dfff87727c95b4b1477e3bc473a91e5797313c58754905079643
-80dc1db20067a844fe8baceca77f80db171a5ca967acb24e2d480eae9ceb91a3343c31ad1c95b721f390829084f0eae6
-9825c31f1c18da0de3fa84399c8b40f8002c3cae211fb6a0623c76b097b4d39f5c50058f57a16362f7a575909d0a44a2
-a99fc8de0c38dbf7b9e946de83943a6b46a762167bafe2a603fb9b86f094da30d6de7ed55d639aafc91936923ee414b3
-ad594678b407db5d6ea2e90528121f84f2b96a4113a252a30d359a721429857c204c1c1c4ff71d8bb5768c833f82e80e
-b33d985e847b54510b9b007e31053732c8a495e43be158bd2ffcea25c6765bcbc7ca815f7c60b36ad088b955dd6e9350
-815f8dfc6f90b3342ca3fbd968c67f324dae8f74245cbf8bc3bef10e9440c65d3a2151f951e8d18959ba01c1b50b0ec1
-94c608a362dd732a1abc56e338637c900d59013db8668e49398b3c7a0cae3f7e2f1d1bf94c0299eeafe6af7f76c88618
-8ebd8446b23e5adfcc393adc5c52fe172f030a73e63cd2d515245ca0dd02782ceed5bcdd9ccd9c1b4c5953dfac9c340c
-820437f3f6f9ad0f5d7502815b221b83755eb8dc56cd92c29e9535eb0b48fb8d08c9e4fcc26945f9c8cca60d89c44710
-8910e4e8a56bf4be9cc3bbf0bf6b1182a2f48837a2ed3c2aaec7099bfd7f0c83e14e608876b17893a98021ff4ab2f20d
-9633918fde348573eec15ce0ad53ac7e1823aac86429710a376ad661002ae6d049ded879383faaa139435122f64047c6
-a1f5e3fa558a9e89318ca87978492f0fb4f6e54a9735c1b8d2ecfb1d1c57194ded6e0dd82d077b2d54251f3bee1279e1
-b208e22d04896abfd515a95c429ff318e87ff81a5d534c8ac2c33c052d6ffb73ef1dccd39c0bbe0734b596c384014766
-986d5d7d2b5bde6d16336f378bd13d0e671ad23a8ec8a10b3fc09036faeeb069f60662138d7a6df3dfb8e0d36180f770
-a2d4e6c5f5569e9cef1cddb569515d4b6ace38c8aed594f06da7434ba6b24477392cc67ba867c2b079545ca0c625c457
-b5ac32b1d231957d91c8b7fc43115ce3c5c0d8c13ca633374402fa8000b6d9fb19499f9181844f0c10b47357f3f757ce
-96b8bf2504b4d28fa34a4ec378e0e0b684890c5f44b7a6bb6e19d7b3db2ab27b1e2686389d1de9fbd981962833a313ea
-953bfd7f6c3a0469ad432072b9679a25486f5f4828092401eff494cfb46656c958641a4e6d0d97d400bc59d92dba0030
-876ab3cea7484bbfd0db621ec085b9ac885d94ab55c4bb671168d82b92e609754b86aaf472c55df3d81421d768fd108a
-885ff4e67d9ece646d02dd425aa5a087e485c3f280c3471b77532b0db6145b69b0fbefb18aa2e3fa5b64928b43a94e57
-b91931d93f806d0b0e6cc62a53c718c099526140f50f45d94b8bbb57d71e78647e06ee7b42aa5714aed9a5c05ac8533f
-a0313eeadd39c720c9c27b3d671215331ab8d0a794e71e7e690f06bcd87722b531d6525060c358f35f5705dbb7109ccb
-874c0944b7fedc6701e53344100612ddcb495351e29305c00ec40a7276ea5455465ffb7bded898886c1853139dfb1fc7
-8dc31701a01ee8137059ca1874a015130d3024823c0576aa9243e6942ec99d377e7715ed1444cd9b750a64b85dcaa3e5
-836d2a757405e922ec9a2dfdcf489a58bd48b5f9683dd46bf6047688f778c8dee9bc456de806f70464df0b25f3f3d238
-b30b0a1e454a503ea3e2efdec7483eaf20b0a5c3cefc42069e891952b35d4b2c955cf615f3066285ed8fafd9fcfbb8f6
-8e6d4044b55ab747e83ec8762ea86845f1785cc7be0279c075dadf08aca3ccc5a096c015bb3c3f738f647a4eadea3ba5
-ad7735d16ab03cbe09c029610aa625133a6daecfc990b297205b6da98eda8c136a7c50db90f426d35069708510d5ae9c
-8d62d858bbb59ec3c8cc9acda002e08addab4d3ad143b3812098f3d9087a1b4a1bb255dcb1635da2402487d8d0249161
-805beec33238b832e8530645a3254aeef957e8f7ea24bcfc1054f8b9c69421145ebb8f9d893237e8a001c857fedfc77e
-b1005644be4b085e3f5775aa9bd3e09a283e87ddada3082c04e7a62d303dcef3b8cf8f92944c200c7ae6bb6bdf63f832
-b4ba0e0790dc29063e577474ffe3b61f5ea2508169f5adc1e394934ebb473e356239413a17962bc3e5d3762d72cce8c2
-a157ba9169c9e3e6748d9f1dd67fbe08b9114ade4c5d8fc475f87a764fb7e6f1d21f66d7905cd730f28a1c2d8378682a
-913e52b5c93989b5d15e0d91aa0f19f78d592bc28bcfdfddc885a9980c732b1f4debb8166a7c4083c42aeda93a702898
-90fbfc1567e7cd4e096a38433704d3f96a2de2f6ed3371515ccc30bc4dd0721a704487d25a97f3c3d7e4344472702d8d
-89646043028ffee4b69d346907586fd12c2c0730f024acb1481abea478e61031966e72072ff1d5e65cb8c64a69ad4eb1
-b125a45e86117ee11d2fb42f680ab4a7894edd67ff927ae2c808920c66c3e55f6a9d4588eee906f33a05d592e5ec3c04
-aad47f5b41eae9be55fb4f67674ff1e4ae2482897676f964a4d2dcb6982252ee4ff56aac49578b23f72d1fced707525e
-b9ddff8986145e33851b4de54d3e81faa3352e8385895f357734085a1616ef61c692d925fe62a5ed3be8ca49f5d66306
-b3cb0963387ed28c0c0adf7fe645f02606e6e1780a24d6cecef5b7c642499109974c81a7c2a198b19862eedcea2c2d8c
-ac9c53c885457aaf5cb36c717a6f4077af701e0098eebd7aa600f5e4b14e6c1067255b3a0bc40e4a552025231be7de60
-8e1a8d823c4603f6648ec21d064101094f2a762a4ed37dd2f0a2d9aa97b2d850ce1e76f4a4b8cae58819b058180f7031
-b268b73bf7a179b6d22bd37e5e8cb514e9f5f8968c78e14e4f6d5700ca0d0ca5081d0344bb73b028970eebde3cb4124e
-a7f57d71940f0edbd29ed8473d0149cae71d921dd15d1ff589774003e816b54b24de2620871108cec1ab9fa956ad6ce6
-8053e6416c8b120e2b999cc2fc420a6a55094c61ac7f2a6c6f0a2c108a320890e389af96cbe378936132363c0d551277
-b3823f4511125e5aa0f4269e991b435a0d6ceb523ebd91c04d7add5534e3df5fc951c504b4fd412a309fd3726b7f940b
-ae6eb04674d04e982ca9a6add30370ab90e303c71486f43ed3efbe431af1b0e43e9d06c11c3412651f304c473e7dbf39
-96ab55e641ed2e677591f7379a3cd126449614181fce403e93e89b1645d82c4af524381ff986cae7f9cebe676878646d
-b52423b4a8c37d3c3e2eca8f0ddbf7abe0938855f33a0af50f117fab26415fb0a3da5405908ec5fdc22a2c1f2ca64892
-82a69ce1ee92a09cc709d0e3cd22116c9f69d28ea507fe5901f5676000b5179b9abe4c1875d052b0dd42d39925e186bb
-a84c8cb84b9d5cfb69a5414f0a5283a5f2e90739e9362a1e8c784b96381b59ac6c18723a4aa45988ee8ef5c1f45cc97d
-afd7efce6b36813082eb98257aae22a4c1ae97d51cac7ea9c852d4a66d05ef2732116137d8432e3f117119725a817d24
-a0f5fe25af3ce021b706fcff05f3d825384a272284d04735574ce5fb256bf27100fad0b1f1ba0e54ae9dcbb9570ecad3
-8751786cb80e2e1ff819fc7fa31c2833d25086534eb12b373d31f826382430acfd87023d2a688c65b5e983927e146336
-8cf5c4b17fa4f3d35c78ce41e1dc86988fd1135cd5e6b2bb0c108ee13538d0d09ae7102609c6070f39f937b439b31e33
-a9108967a2fedd7c322711eca8159c533dd561bedcb181b646de98bf5c3079449478eab579731bee8d215ae8852c7e21
-b54c5171704f42a6f0f4e70767cdb3d96ffc4888c842eece343a01557da405961d53ffdc34d2f902ea25d3e1ed867cad
-ae8d4b764a7a25330ba205bf77e9f46182cd60f94a336bbd96773cf8064e3d39caf04c310680943dc89ed1fbad2c6e0d
-aa5150e911a8e1346868e1b71c5a01e2a4bb8632c195861fb6c3038a0e9b85f0e09b3822e9283654a4d7bb17db2fc5f4
-9685d3756ce9069bf8bb716cf7d5063ebfafe37e15b137fc8c3159633c4e006ff4887ddd0ae90360767a25c3f90cba7f
-82155fd70f107ab3c8e414eadf226c797e07b65911508c76c554445422325e71af8c9a8e77fd52d94412a6fc29417cd3
-abfae52f53a4b6e00760468d973a267f29321997c3dbb5aee36dc1f20619551229c0c45b9d9749f410e7f531b73378e8
-81a76d921f8ef88e774fd985e786a4a330d779b93fad7def718c014685ca0247379e2e2a007ad63ee7f729cd9ed6ce1b
-81947c84bc5e28e26e2e533af5ae8fe10407a7b77436dbf8f1d5b0bbe86fc659eae10f974659dc7c826c6dabd03e3a4b
-92b8c07050d635b8dd4fd09df9054efe4edae6b86a63c292e73cc819a12a21dd7d104ce51fa56af6539dedf6dbe6f7b6
-b44c579e3881f32b32d20c82c207307eca08e44995dd2aac3b2692d2c8eb2a325626c80ac81c26eeb38c4137ff95add5
-97efab8941c90c30860926dea69a841f2dcd02980bf5413b9fd78d85904588bf0c1021798dbc16c8bbb32cce66c82621
-913363012528b50698e904de0588bf55c8ec5cf6f0367cfd42095c4468fcc64954fbf784508073e542fee242d0743867
-8ed203cf215148296454012bd10fddaf119203db1919a7b3d2cdc9f80e66729464fdfae42f1f2fc5af1ed53a42b40024
-ab84312db7b87d711e9a60824f4fe50e7a6190bf92e1628688dfcb38930fe87b2d53f9e14dd4de509b2216856d8d9188
-880726def069c160278b12d2258eac8fa63f729cd351a710d28b7e601c6712903c3ac1e7bbd0d21e4a15f13ca49db5aa
-980699cd51bac6283959765f5174e543ed1e5f5584b5127980cbc2ef18d984ecabba45042c6773b447b8e694db066028
-aeb019cb80dc4cb4207430d0f2cd24c9888998b6f21d9bf286cc638449668d2eec0018a4cf3fe6448673cd6729335e2b
-b29852f6aa6c60effdffe96ae88590c88abae732561d35cc19e82d3a51e26cb35ea00986193e07f90060756240f5346e
-a0fa855adc5ba469f35800c48414b8921455950a5c0a49945d1ef6e8f2a1881f2e2dfae47de6417270a6bf49deeb091d
-b6c7332e3b14813641e7272d4f69ecc7e09081df0037d6dab97ce13a9e58510f5c930d300633f208181d9205c5534001
-85a6c050f42fce560b5a8d54a11c3bbb8407abbadd859647a7b0c21c4b579ec65671098b74f10a16245dc779dff7838e
-8f3eb34bb68759d53c6677de4de78a6c24dd32c8962a7fb355ed362572ef8253733e6b52bc21c9f92ecd875020a9b8de
-a17dd44181e5dab4dbc128e1af93ec22624b57a448ca65d2d9e246797e4af7d079e09c6e0dfb62db3a9957ce92f098d5
-a56a1b854c3183082543a8685bb34cae1289f86cfa8123a579049dbd059e77982886bfeb61bf6e05b4b1fe4e620932e7
-aedae3033cb2fb7628cb4803435bdd7757370a86f808ae4cecb9a268ad0e875f308c048c80cbcac523de16b609683887
-9344905376aa3982b1179497fac5a1d74b14b7038fd15e3b002db4c11c8bfc7c39430db492cdaf58b9c47996c9901f28
-a3bfafdae011a19f030c749c3b071f83580dee97dd6f949e790366f95618ca9f828f1daaeabad6dcd664fcef81b6556d
-81c03d8429129e7e04434dee2c529194ddb01b414feda3adee2271eb680f6c85ec872a55c9fa9d2096f517e13ed5abcc
-98205ef3a72dff54c5a9c82d293c3e45d908946fa74bb749c3aabe1ab994ea93c269bcce1a266d2fe67a8f02133c5985
-85a70aeed09fda24412fadbafbbbf5ba1e00ac92885df329e147bfafa97b57629a3582115b780d8549d07d19b7867715
-b0fbe81c719f89a57d9ea3397705f898175808c5f75f8eb81c2193a0b555869ba7bd2e6bc54ee8a60cea11735e21c68c
-b03a0bd160495ee626ff3a5c7d95bc79d7da7e5a96f6d10116600c8fa20bedd1132f5170f25a22371a34a2d763f2d6d0
-a90ab04091fbca9f433b885e6c1d60ab45f6f1daf4b35ec22b09909d493a6aab65ce41a6f30c98239cbca27022f61a8b
-b66f92aa3bf2549f9b60b86f99a0bd19cbdd97036d4ae71ca4b83d669607f275260a497208f6476cde1931d9712c2402
-b08e1fdf20e6a9b0b4942f14fa339551c3175c1ffc5d0ab5b226b6e6a322e9eb0ba96adc5c8d59ca4259e2bdd04a7eb0
-a2812231e92c1ce74d4f5ac3ab6698520288db6a38398bb38a914ac9326519580af17ae3e27cde26607e698294022c81
-abfcbbcf1d3b9e84c02499003e490a1d5d9a2841a9e50c7babbef0b2dd20d7483371d4dc629ba07faf46db659459d296
-b0fe9f98c3da70927c23f2975a9dc4789194d81932d2ad0f3b00843dd9cbd7fb60747a1da8fe5a79f136a601becf279d
-b130a6dba7645165348cb90f023713bed0eefbd90a976b313521c60a36d34f02032e69a2bdcf5361e343ed46911297ec
-862f0cffe3020cea7a5fd4703353aa1eb1be335e3b712b29d079ff9f7090d1d8b12013011e1bdcbaa80c44641fd37c9f
-8c6f11123b26633e1abb9ed857e0bce845b2b3df91cc7b013b2fc77b477eee445da0285fc6fc793e29d5912977f40916
-91381846126ea819d40f84d3005e9fb233dc80071d1f9bb07f102bf015f813f61e5884ffffb4f5cd333c1b1e38a05a58
-8add7d908de6e1775adbd39c29a391f06692b936518db1f8fde74eb4f533fc510673a59afb86e3a9b52ade96e3004c57
-8780e086a244a092206edcde625cafb87c9ab1f89cc3e0d378bc9ee776313836160960a82ec397bc3800c0a0ec3da283
-a6cb4cd9481e22870fdd757fae0785edf4635e7aacb18072fe8dc5876d0bab53fb99ce40964a7d3e8bcfff6f0ab1332f
-af30ff47ecc5b543efba1ba4706921066ca8bb625f40e530fb668aea0551c7647a9d126e8aba282fbcce168c3e7e0130
-91b0bcf408ce3c11555dcb80c4410b5bc2386d3c05caec0b653352377efdcb6bab4827f2018671fc8e4a0e90d772acc1
-a9430b975ef138b6b2944c7baded8fe102d31da4cfe3bd3d8778bda79189c99d38176a19c848a19e2d1ee0bddd9a13c1
-aa5a4eef849d7c9d2f4b018bd01271c1dd83f771de860c4261f385d3bdcc130218495860a1de298f14b703ec32fa235f
-b0ce79e7f9ae57abe4ff366146c3b9bfb38b0dee09c28c28f5981a5d234c6810ad4d582751948affb480d6ae1c8c31c4
-b75122748560f73d15c01a8907d36d06dc068e82ce22b84b322ac1f727034493572f7907dec34ebc3ddcc976f2f89ed7
-b0fc7836369a3e4411d34792d6bd5617c14f61d9bba023dda64e89dc5fb0f423244e9b48ee64869258931daa9753a56f
-8956d7455ae9009d70c6e4a0bcd7610e55f37494cf9897a8f9e1b904cc8febc3fd2d642ebd09025cfff4609ad7e3bc52
-ad741efe9e472026aa49ae3d9914cb9c1a6f37a54f1a6fe6419bebd8c7d68dca105a751c7859f4389505ede40a0de786
-b52f418797d719f0d0d0ffb0846788b5cba5d0454a69a2925de4b0b80fa4dd7e8c445e5eac40afd92897ed28ca650566
-a0ab65fb9d42dd966cd93b1de01d7c822694669dd2b7a0c04d99cd0f3c3de795f387b9c92da11353412f33af5c950e9a
-a0052f44a31e5741a331f7cac515a08b3325666d388880162d9a7b97598fde8b61f9ff35ff220df224eb5c4e40ef0567
-a0101cfdc94e42b2b976c0d89612a720e55d145a5ef6ef6f1f78cf6de084a49973d9b5d45915349c34ce712512191e3c
-a0dd99fcf3f5cead5aaf08e82212df3a8bb543c407a4d6fab88dc5130c1769df3f147e934a46f291d6c1a55d92b86917
-a5939153f0d1931bbda5cf6bdf20562519ea55fbfa978d6dbc6828d298260c0da7a50c37c34f386e59431301a96c2232
-9568269f3f5257200f9ca44afe1174a5d3cf92950a7f553e50e279c239e156a9faaa2a67f288e3d5100b4142efe64856
-b746b0832866c23288e07f24991bbf687cad794e7b794d3d3b79367566ca617d38af586cdc8d6f4a85a34835be41d54f
-a871ce28e39ab467706e32fec1669fda5a4abba2f8c209c6745df9f7a0fa36bbf1919cf14cb89ea26fa214c4c907ae03
-a08dacdd758e523cb8484f6bd070642c0c20e184abdf8e2a601f61507e93952d5b8b0c723c34fcbdd70a8485eec29db2
-85bdb78d501382bb95f1166b8d032941005661aefd17a5ac32df9a3a18e9df2fc5dc2c1f07075f9641af10353cecc0c9
-98d730c28f6fa692a389e97e368b58f4d95382fad8f0baa58e71a3d7baaea1988ead47b13742ce587456f083636fa98e
-a557198c6f3d5382be9fb363feb02e2e243b0c3c61337b3f1801c4a0943f18e38ce1a1c36b5c289c8fa2aa9d58742bab
-89174f79201742220ac689c403fc7b243eed4f8e3f2f8aba0bf183e6f5d4907cb55ade3e238e3623d9885f03155c4d2b
-b891d600132a86709e06f3381158db300975f73ea4c1f7c100358e14e98c5fbe792a9af666b85c4e402707c3f2db321e
-b9e5b2529ef1043278c939373fc0dbafe446def52ddd0a8edecd3e4b736de87e63e187df853c54c28d865de18a358bb6
-8589b2e9770340c64679062c5badb7bbef68f55476289b19511a158a9a721f197da03ece3309e059fc4468b15ac33aa3
-aad8c6cd01d785a881b446f06f1e9cd71bca74ba98674c2dcddc8af01c40aa7a6d469037498b5602e76e9c91a58d3dbd
-abaccb1bd918a8465f1bf8dbe2c9ad4775c620b055550b949a399f30cf0d9eb909f3851f5b55e38f9e461e762f88f499
-ae62339d26db46e85f157c0151bd29916d5cc619bd4b832814b3fd2f00af8f38e7f0f09932ffe5bba692005dab2d9a74
-93a6ff30a5c0edf8058c89aba8c3259e0f1b1be1b80e67682de651e5346f7e1b4b4ac3d87cbaebf198cf779524aff6bf
-8980a2b1d8f574af45b459193c952400b10a86122b71fca2acb75ee0dbd492e7e1ef5b959baf609a5172115e371f3177
-8c2f49f3666faee6940c75e8c7f6f8edc3f704cca7a858bbb7ee5e96bba3b0cf0993996f781ba6be3b0821ef4cb75039
-b14b9e348215b278696018330f63c38db100b0542cfc5be11dc33046e3bca6a13034c4ae40d9cef9ea8b34fef0910c4e
-b59bc3d0a30d66c16e6a411cb641f348cb1135186d5f69fda8b0a0934a5a2e7f6199095ba319ec87d3fe8f1ec4a06368
-8874aca2a3767aa198e4c3fec2d9c62d496bc41ff71ce242e9e082b7f38cdf356089295f80a301a3cf1182bde5308c97
-b1820ebd61376d91232423fc20bf008b2ba37e761199f4ef0648ea2bd70282766799b4de814846d2f4d516d525c8daa7
-a6b202e5dedc16a4073e04a11af3a8509b23dfe5a1952f899adeb240e75c3f5bde0c424f811a81ea48d343591faffe46
-a69becee9c93734805523b92150a59a62eed4934f66056b645728740d42223f2925a1ad38359ba644da24d9414f4cdda
-ad72f0f1305e37c7e6b48c272323ee883320994cb2e0d850905d6655fafc9f361389bcb9c66b3ff8d2051dbb58c8aa96
-b563600bd56fad7c8853af21c6a02a16ed9d8a8bbeea2c31731d63b976d83cb05b9779372d898233e8fd597a75424797
-b0abb78ce465bf7051f563c62e8be9c57a2cc997f47c82819300f36e301fefd908894bb2053a9d27ce2d0f8c46d88b5b
-a071a85fb8274bac2202e0cb8e0e2028a5e138a82d6e0374d39ca1884a549c7c401312f00071b91f455c3a2afcfe0cda
-b931c271513a0f267b9f41444a5650b1918100b8f1a64959c552aff4e2193cc1b9927906c6fa7b8a8c68ef13d79aaa52
-a6a1bb9c7d32cb0ca44d8b75af7e40479fbce67d216b48a2bb680d3f3a772003a49d3cd675fc64e9e0f8fabeb86d6d61
-b98d609858671543e1c3b8564162ad828808bb50ded261a9f8690ded5b665ed8368c58f947365ed6e84e5a12e27b423d
-b3dca58cd69ec855e2701a1d66cad86717ff103ef862c490399c771ad28f675680f9500cb97be48de34bcdc1e4503ffd
-b34867c6735d3c49865e246ddf6c3b33baf8e6f164db3406a64ebce4768cb46b0309635e11be985fee09ab7a31d81402
-acb966c554188c5b266624208f31fab250b3aa197adbdd14aee5ab27d7fb886eb4350985c553b20fdf66d5d332bfd3fe
-943c36a18223d6c870d54c3b051ef08d802b85e9dd6de37a51c932f90191890656c06adfa883c87b906557ae32d09da0
-81bca7954d0b9b6c3d4528aadf83e4bc2ef9ea143d6209bc45ae9e7ae9787dbcd8333c41f12c0b6deee8dcb6805e826a
-aba176b92256efb68f574e543479e5cf0376889fb48e3db4ebfb7cba91e4d9bcf19dcfec444c6622d9398f06de29e2b9
-b9f743691448053216f6ece7cd699871fff4217a1409ceb8ab7bdf3312d11696d62c74b0664ba0a631b1e0237a8a0361
-a383c2b6276fa9af346b21609326b53fb14fdf6f61676683076e80f375b603645f2051985706d0401e6fbed7eb0666b6
-a9ef2f63ec6d9beb8f3d04e36807d84bda87bdd6b351a3e4a9bf7edcb5618c46c1f58cfbf89e64b40f550915c6988447
-a141b2d7a82f5005eaea7ae7d112c6788b9b95121e5b70b7168d971812f3381de8b0082ac1f0a82c7d365922ebd2d26a
-b1b76ef8120e66e1535c17038b75255a07849935d3128e3e99e56567b842fb1e8d56ef932d508d2fb18b82f7868fe1a9
-8e2e234684c81f21099f5c54f6bbe2dd01e3b172623836c77668a0c49ce1fe218786c3827e4d9ae2ea25c50a8924fb3c
-a5caf5ff948bfd3c4ca3ffbdfcd91eec83214a6c6017235f309a0bbf7061d3b0b466307c00b44a1009cf575163898b43
-986415a82ca16ebb107b4c50b0c023c28714281db0bcdab589f6cb13d80e473a3034b7081b3c358e725833f6d845cb14
-b94836bf406ac2cbacb10e6df5bcdfcc9d9124ae1062767ca4e322d287fd5e353fdcebd0e52407cb3cd68571258a8900
-83c6d70a640b33087454a4788dfd9ef3ed00272da084a8d36be817296f71c086b23b576f98178ab8ca6a74f04524b46b
-ad4115182ad784cfe11bcfc5ce21fd56229cc2ce77ac82746e91a2f0aa53ca6593a22efd2dc4ed8d00f84542643d9c58
-ab1434c5e5065da826d10c2a2dba0facccab0e52b506ce0ce42fbe47ced5a741797151d9ecc99dc7d6373cfa1779bbf6
-8a8b591d82358d55e6938f67ea87a89097ab5f5496f7260adb9f649abb289da12b498c5b2539c2f9614fb4e21b1f66b0
-964f355d603264bc1f44c64d6d64debca66f37dff39c971d9fc924f2bc68e6c187b48564a6dc82660a98b035f8addb5d
-b66235eaaf47456bc1dc4bde454a028e2ce494ece6b713a94cd6bf27cf18c717fd0c57a5681caaa2ad73a473593cdd7a
-9103e3bb74304186fa4e3e355a02da77da4aca9b7e702982fc2082af67127ebb23a455098313c88465bc9b7d26820dd5
-b6a42ff407c9dd132670cdb83cbad4b20871716e44133b59a932cd1c3f97c7ac8ff7f61acfaf8628372508d8dc8cad7c
-883a9c21c16a167a4171b0f084565c13b6f28ba7c4977a0de69f0a25911f64099e7bbb4da8858f2e93068f4155d04e18
-8dbb3220abc6a43220adf0331e3903d3bfd1d5213aadfbd8dfcdf4b2864ce2e96a71f35ecfb7a07c3bbabf0372b50271
-b4ad08aee48e176bda390b7d9acf2f8d5eb008f30d20994707b757dc6a3974b2902d29cd9b4d85e032810ad25ac49e97
-865bb0f33f7636ec501bb634e5b65751c8a230ae1fa807a961a8289bbf9c7fe8c59e01fbc4c04f8d59b7f539cf79ddd5
-86a54d4c12ad1e3605b9f93d4a37082fd26e888d2329847d89afa7802e815f33f38185c5b7292293d788ad7d7da1df97
-b26c8615c5e47691c9ff3deca3021714662d236c4d8401c5d27b50152ce7e566266b9d512d14eb63e65bc1d38a16f914
-827639d5ce7db43ba40152c8a0eaad443af21dc92636cc8cc2b35f10647da7d475a1e408901cd220552fddad79db74df
-a2b79a582191a85dbe22dc384c9ca3de345e69f6aa370aa6d3ff1e1c3de513e30b72df9555b15a46586bd27ea2854d9d
-ae0d74644aba9a49521d3e9553813bcb9e18f0b43515e4c74366e503c52f47236be92dfbd99c7285b3248c267b1de5a0
-80fb0c116e0fd6822a04b9c25f456bdca704e2be7bdc5d141dbf5d1c5eeb0a2c4f5d80db583b03ef3e47517e4f9a1b10
-ac3a1fa3b4a2f30ea7e0a114cdc479eb51773573804c2a158d603ad9902ae8e39ffe95df09c0d871725a5d7f9ba71a57
-b56b2b0d601cba7f817fa76102c68c2e518c6f20ff693aad3ff2e07d6c4c76203753f7f91686b1801e8c4659e4d45c48
-89d50c1fc56e656fb9d3915964ebce703cb723fe411ab3c9eaa88ccc5d2b155a9b2e515363d9c600d3c0cee782c43f41
-b24207e61462f6230f3cd8ccf6828357d03e725769f7d1de35099ef9ee4dca57dbce699bb49ed994462bee17059d25ce
-b886f17fcbcbfcd08ac07f04bb9543ef58510189decaccea4b4158c9174a067cb67d14b6be3c934e6e2a18c77efa9c9c
-b9c050ad9cafd41c6e2e192b70d080076eed59ed38ea19a12bd92fa17b5d8947d58d5546aaf5e8e27e1d3b5481a6ce51
-aaf7a34d3267e3b1ddbc54c641e3922e89303f7c86ebebc7347ebca4cffad5b76117dac0cbae1a133053492799cd936f
-a9ee604ada50adef82e29e893070649d2d4b7136cc24fa20e281ce1a07bd736bf0de7c420369676bcbcecff26fb6e900
-9855315a12a4b4cf80ab90b8bd13003223ba25206e52fd4fe6a409232fbed938f30120a3db23eab9c53f308bd8b9db81
-8cd488dd7a24f548a3cf03c54dec7ff61d0685cb0f6e5c46c2d728e3500d8c7bd6bba0156f4bf600466fda53e5b20444
-890ad4942ebac8f5b16c777701ab80c68f56fa542002b0786f8fea0fb073154369920ac3dbfc07ea598b82f4985b8ced
-8de0cf9ddc84c9b92c59b9b044387597799246b30b9f4d7626fc12c51f6e423e08ee4cbfe9289984983c1f9521c3e19d
-b474dfb5b5f4231d7775b3c3a8744956b3f0c7a871d835d7e4fd9cc895222c7b868d6c6ce250de568a65851151fac860
-86433b6135d9ed9b5ee8cb7a6c40e5c9d30a68774cec04988117302b8a02a11a71a1e03fd8e0264ef6611d219f103007
-80b9ed4adbe9538fb1ef69dd44ec0ec5b57cbfea820054d8d445b4261962624b4c70ac330480594bc5168184378379c3
-8b2e83562ccd23b7ad2d17f55b1ab7ef5fbef64b3a284e6725b800f3222b8bdf49937f4a873917ada9c4ddfb090938c2
-abe78cebc0f5a45d754140d1f685e387489acbfa46d297a8592aaa0d676a470654f417a4f7d666fc0b2508fab37d908e
-a9c5f8ff1f8568e252b06d10e1558326db9901840e6b3c26bbd0cd5e850cb5fb3af3f117dbb0f282740276f6fd84126f
-975f8dc4fb55032a5df3b42b96c8c0ffecb75456f01d4aef66f973cb7270d4eff32c71520ceefc1adcf38d77b6b80c67
-b043306ed2c3d8a5b9a056565afd8b5e354c8c4569fda66b0d797a50a3ce2c08cffbae9bbe292da69f39e89d5dc7911e
-8d2afc36b1e44386ba350c14a6c1bb31ff6ea77128a0c5287584ac3584282d18516901ce402b4644a53db1ed8e7fa581
-8c294058bed53d7290325c363fe243f6ec4f4ea2343692f4bac8f0cb86f115c069ccb8334b53d2e42c067691ad110dba
-b92157b926751aaf7ef82c1aa8c654907dccab6376187ee8b3e8c0c82811eae01242832de953faa13ebaff7da8698b3e
-a780c4bdd9e4ba57254b09d745075cecab87feda78c88ffee489625c5a3cf96aa6b3c9503a374a37927d9b78de9bd22b
-811f548ef3a2e6a654f7dcb28ac9378de9515ed61e5a428515d9594a83e80b35c60f96a5cf743e6fab0d3cb526149f49
-85a4dccf6d90ee8e094731eec53bd00b3887aec6bd81a0740efddf812fd35e3e4fe4f983afb49a8588691c202dabf942
-b152c2da6f2e01c8913079ae2b40a09b1f361a80f5408a0237a8131b429677c3157295e11b365b1b1841924b9efb922e
-849b9efee8742502ffd981c4517c88ed33e4dd518a330802caff168abae3cd09956a5ee5eda15900243bc2e829016b74
-955a933f3c18ec0f1c0e38fa931e4427a5372c46a3906ebe95082bcf878c35246523c23f0266644ace1fa590ffa6d119
-911989e9f43e580c886656377c6f856cdd4ff1bd001b6db3bbd86e590a821d34a5c6688a29b8d90f28680e9fdf03ba69
-b73b8b4f1fd6049fb68d47cd96a18fcba3f716e0a1061aa5a2596302795354e0c39dea04d91d232aec86b0bf2ba10522
-90f87456d9156e6a1f029a833bf3c7dbed98ca2f2f147a8564922c25ae197a55f7ea9b2ee1f81bf7383197c4bad2e20c
-903cba8b1e088574cb04a05ca1899ab00d8960580c884bd3c8a4c98d680c2ad11410f2b75739d6050f91d7208cac33a5
-9329987d42529c261bd15ecedd360be0ea8966e7838f32896522c965adfc4febf187db392bd441fb43bbd10c38fdf68b
-8178ee93acf5353baa349285067b20e9bb41aa32d77b5aeb7384fe5220c1fe64a2461bd7a83142694fe673e8bbf61b7c
-a06a8e53abcff271b1394bcc647440f81fb1c1a5f29c27a226e08f961c3353f4891620f2d59b9d1902bf2f5cc07a4553
-aaf5fe493b337810889e777980e6bbea6cac39ac66bc0875c680c4208807ac866e9fda9b5952aa1d04539b9f4a4bec57
-aa058abb1953eceac14ccfa7c0cc482a146e1232905dcecc86dd27f75575285f06bbae16a8c9fe8e35d8713717f5f19f
-8f15dd732799c879ca46d2763453b359ff483ca33adb1d0e0a57262352e0476c235987dc3a8a243c74bc768f93d3014c
-a61cc8263e9bc03cce985f1663b8a72928a607121005a301b28a278e9654727fd1b22bc8a949af73929c56d9d3d4a273
-98d6dc78502d19eb9f921225475a6ebcc7b44f01a2df6f55ccf6908d65b27af1891be2a37735f0315b6e0f1576c1f8d8
-8bd258b883f3b3793ec5be9472ad1ff3dc4b51bc5a58e9f944acfb927349ead8231a523cc2175c1f98e7e1e2b9f363b8
-aeacc2ecb6e807ad09bedd99654b097a6f39840e932873ace02eabd64ccfbb475abdcb62939a698abf17572d2034c51e
-b8ccf78c08ccd8df59fd6eda2e01de328bc6d8a65824d6f1fc0537654e9bc6bf6f89c422dd3a295cce628749da85c864
-8f91fd8cb253ba2e71cc6f13da5e05f62c2c3b485c24f5d68397d04665673167fce1fc1aec6085c69e87e66ec555d3fd
-a254baa10cb26d04136886073bb4c159af8a8532e3fd36b1e9c3a2e41b5b2b6a86c4ebc14dbe624ee07b7ccdaf59f9ab
-94e3286fe5cd68c4c7b9a7d33ae3d714a7f265cf77cd0e9bc19fc51015b1d1c34ad7e3a5221c459e89f5a043ee84e3a9
-a279da8878af8d449a9539bec4b17cea94f0242911f66fab275b5143ab040825f78c89cb32a793930609415cfa3a1078
-ac846ceb89c9e5d43a2991c8443079dc32298cd63e370e64149cec98cf48a6351c09c856f2632fd2f2b3d685a18bbf8b
-a847b27995c8a2e2454aaeb983879fb5d3a23105c33175839f7300b7e1e8ec3efd6450e9fa3f10323609dee7b98c6fd5
-a2f432d147d904d185ff4b2de8c6b82fbea278a2956bc406855b44c18041854c4f0ecccd472d1d0dff1d8aa8e281cb1d
-94a48ad40326f95bd63dff4755f863a1b79e1df771a1173b17937f9baba57b39e651e7695be9f66a472f098b339364fc
-a12a0ccd8f96e96e1bc6494341f7ebce959899341b3a084aa1aa87d1c0d489ac908552b7770b887bb47e7b8cbc3d8e66
-81a1f1681bda923bd274bfe0fbb9181d6d164fe738e54e25e8d4849193d311e2c4253614ed673c98af2c798f19a93468
-abf71106a05d501e84cc54610d349d7d5eae21a70bd0250f1bebbf412a130414d1c8dbe673ffdb80208fd72f1defa4d4
-96266dc2e0df18d8136d79f5b59e489978eee0e6b04926687fe389d4293c14f36f055c550657a8e27be4118b64254901
-8df5dcbefbfb4810ae3a413ca6b4bf08619ca53cd50eb1dde2a1c035efffc7b7ac7dff18d403253fd80104bd83dc029e
-9610b87ff02e391a43324a7122736876d5b3af2a137d749c52f75d07b17f19900b151b7f439d564f4529e77aa057ad12
-a90a5572198b40fe2fcf47c422274ff36c9624df7db7a89c0eb47eb48a73a03c985f4ac5016161c76ca317f64339bce1
-98e5e61a6ab6462ba692124dba7794b6c6bde4249ab4fcc98c9edd631592d5bc2fb5e38466691a0970a38e48d87c2e43
-918cefb8f292f78d4db81462c633daf73b395e772f47b3a7d2cea598025b1d8c3ec0cbff46cdb23597e74929981cde40
-a98918a5dc7cf610fe55f725e4fd24ce581d594cb957bb9b4e888672e9c0137003e1041f83e3f1d7b9caab06462c87d4
-b92b74ac015262ca66c33f2d950221e19d940ba3bf4cf17845f961dc1729ae227aa9e1f2017829f2135b489064565c29
-a053ee339f359665feb178b4e7ee30a85df37debd17cacc5a27d6b3369d170b0114e67ad1712ed26d828f1df641bcd99
-8c3c8bad510b35da5ce5bd84b35c958797fbea024ad1c97091d2ff71d9b962e9222f65a9b776e5b3cc29c36e1063d2ee
-af99dc7330fe7c37e850283eb47cc3257888e7c197cb0d102edf94439e1e02267b6a56306d246c326c4c79f9dc8c6986
-afecb2dc34d57a725efbd7eb93d61eb29dbe8409b668ab9ea040791f5b796d9be6d4fc10d7f627bf693452f330cf0435
-93334fedf19a3727a81a6b6f2459db859186227b96fe7a391263f69f1a0884e4235de64d29edebc7b99c44d19e7c7d7a
-89579c51ac405ad7e9df13c904061670ce4b38372492764170e4d3d667ed52e5d15c7cd5c5991bbfa3a5e4e3fa16363e
-9778f3e8639030f7ef1c344014f124e375acb8045bd13d8e97a92c5265c52de9d1ffebaa5bc3e1ad2719da0083222991
-88f77f34ee92b3d36791bdf3326532524a67d544297dcf1a47ff00b47c1b8219ff11e34034eab7d23b507caa2fd3c6b9
-a699c1e654e7c484431d81d90657892efeb4adcf72c43618e71ca7bd7c7a7ebbb1db7e06e75b75dc4c74efd306b5df3f
-81d13153baebb2ef672b5bdb069d3cd669ce0be96b742c94e04038f689ff92a61376341366b286eee6bf3ae85156f694
-81efb17de94400fdacc1deec2550cbe3eecb27c7af99d8207e2f9be397e26be24a40446d2a09536bb5172c28959318d9
-989b21ebe9ceab02488992673dc071d4d5edec24bff0e17a4306c8cb4b3c83df53a2063d1827edd8ed16d6e837f0d222
-8d6005d6536825661b13c5fdce177cb37c04e8b109b7eb2b6d82ea1cb70efecf6a0022b64f84d753d165edc2bba784a3
-a32607360a71d5e34af2271211652d73d7756d393161f4cf0da000c2d66a84c6826e09e759bd787d4fd0305e2439d342
-aaad8d6f6e260db45d51b2da723be6fa832e76f5fbcb77a9a31e7f090dd38446d3b631b96230d78208cae408c288ac4e
-abcfe425255fd3c5cffd3a818af7650190c957b6b07b632443f9e33e970a8a4c3bf79ac9b71f4d45f238a04d1c049857
-aeabf026d4c783adc4414b5923dbd0be4b039cc7201219f7260d321f55e9a5b166d7b5875af6129c034d0108fdc5d666
-af49e740c752d7b6f17048014851f437ffd17413c59797e5078eaaa36f73f0017c3e7da020310cfe7d3c85f94a99f203
-8854ca600d842566e3090040cd66bb0b3c46dae6962a13946f0024c4a8aca447e2ccf6f240045f1ceee799a88cb9210c
-b6c03b93b1ab1b88ded8edfa1b487a1ed8bdce8535244dddb558ffb78f89b1c74058f80f4db2320ad060d0c2a9c351cc
-b5bd7d17372faff4898a7517009b61a7c8f6f0e7ed4192c555db264618e3f6e57fb30a472d169fea01bf2bf0362a19a8
-96eb1d38319dc74afe7e7eb076fcd230d19983f645abd14a71e6103545c01301b31c47ae931e025f3ecc01fb3d2f31fa
-b55a8d30d4403067def9b65e16f867299f8f64c9b391d0846d4780bc196569622e7e5b64ce799b5aefac8f965b2a7a7b
-8356d199a991e5cbbff608752b6291731b6b6771aed292f8948b1f41c6543e4ab1bedc82dd26d10206c907c03508df06
-97f4137445c2d98b0d1d478049de952610ad698c91c9d0f0e7227d2aae690e9935e914ec4a2ea1fbf3fc1dddfeeacebb
-af5621707e0938320b15ddfc87584ab325fbdfd85c30efea36f8f9bd0707d7ec12c344eff3ec21761189518d192df035
-8ac7817e71ea0825b292687928e349da7140285d035e1e1abff0c3704fa8453faaae343a441b7143a74ec56539687cc4
-8a5e0a9e4758449489df10f3386029ada828d1762e4fb0a8ffe6b79e5b6d5d713cb64ed95960e126398b0cdb89002bc9
-81324be4a71208bbb9bca74b77177f8f1abb9d3d5d9db195d1854651f2cf333cd618d35400da0f060f3e1b025124e4b2
-849971d9d095ae067525b3cbc4a7dfae81f739537ade6d6cec1b42fb692d923176197a8770907c58069754b8882822d6
-89f830825416802477cc81fdf11084885865ee6607aa15aa4eb28e351c569c49b8a1b9b5e95ddc04fa0ebafe20071313
-9240aeeaff37a91af55f860b9badd466e8243af9e8c96a7aa8cf348cd270685ab6301bc135b246dca9eda696f8b0e350
-acf74db78cc33138273127599eba35b0fb4e7b9a69fe02dae18fc6692d748ca332bd00b22afa8e654ed587aab11833f3
-b091e6d37b157b50d76bd297ad752220cd5c9390fac16dc838f8557aed6d9833fc920b61519df21265406216315e883f
-a6446c429ebf1c7793c622250e23594c836b2fbcaf6c5b3d0995e1595a37f50ea643f3e549b0be8bbdadd69044d72ab9
-93e675353bd60e996bf1c914d5267eeaa8a52fc3077987ccc796710ef9becc6b7a00e3d82671a6bdfb8145ee3c80245a
-a2f731e43251d04ed3364aa2f072d05355f299626f2d71a8a38b6f76cf08c544133f7d72dd0ab4162814b674b9fc7fa6
-97a8b791a5a8f6e1d0de192d78615d73d0c38f1e557e4e15d15adc663d649e655bc8da3bcc499ef70112eafe7fb45c7a
-98cd624cbbd6c53a94469be4643c13130916b91143425bcb7d7028adbbfede38eff7a21092af43b12d4fab703c116359
-995783ce38fd5f6f9433027f122d4cf1e1ff3caf2d196ce591877f4a544ce9113ead60de2de1827eaff4dd31a20d79a8
-8cf251d6f5229183b7f3fe2f607a90b4e4b6f020fb4ba2459d28eb8872426e7be8761a93d5413640a661d73e34a5b81f
-b9232d99620652a3aa7880cad0876f153ff881c4ed4c0c2e7b4ea81d5d42b70daf1a56b869d752c3743c6d4c947e6641
-849716f938f9d37250cccb1bf77f5f9fde53096cdfc6f2a25536a6187029a8f1331cdbed08909184b201f8d9f04b792f
-80c7c4de098cbf9c6d17b14eba1805e433b5bc905f6096f8f63d34b94734f2e4ebf4bce8a177efd1186842a61204a062
-b790f410cf06b9b8daadceeb4fd5ff40a2deda820c8df2537e0a7554613ae3948e149504e3e79aa84889df50c8678eeb
-813aab8bd000299cd37485b73cd7cba06e205f8efb87f1efc0bae8b70f6db2bc7702eb39510ad734854fb65515fe9d0f
-94f0ab7388ac71cdb67f6b85dfd5945748afb2e5abb622f0b5ad104be1d4d0062b651f134ba22385c9e32c2dfdcccce1
-ab6223dca8bd6a4f969e21ccd9f8106fc5251d321f9e90cc42cea2424b3a9c4e5060a47eeef6b23c7976109b548498e8
-859c56b71343fce4d5c5b87814c47bf55d581c50fd1871a17e77b5e1742f5af639d0e94d19d909ec7dfe27919e954e0c
-aae0d632b6191b8ad71b027791735f1578e1b89890b6c22e37de0e4a6074886126988fe8319ae228ac9ef3b3bcccb730
-8ca9f32a27a024c3d595ecfaf96b0461de57befa3b331ab71dc110ec3be5824fed783d9516597537683e77a11d334338
-a061df379fb3f4b24816c9f6cd8a94ecb89b4c6dc6cd81e4b8096fa9784b7f97ab3540259d1de9c02eb91d9945af4823
-998603102ac63001d63eb7347a4bb2bf4cf33b28079bb48a169076a65c20d511ccd3ef696d159e54cc8e772fb5d65d50
-94444d96d39450872ac69e44088c252c71f46be8333a608a475147752dbb99db0e36acfc5198f158509401959c12b709
-ac1b51b6c09fe055c1d7c9176eea9adc33f710818c83a1fbfa073c8dc3a7eb3513cbdd3f5960b7845e31e3e83181e6ba
-803d530523fc9e1e0f11040d2412d02baef3f07eeb9b177fa9bfa396af42eea898a4276d56e1db998dc96ae47b644cb2
-85a3c9fc7638f5bf2c3e15ba8c2fa1ae87eb1ceb44c6598c67a2948667a9dfa41e61f66d535b4e7fda62f013a5a8b885
-a961cf5654c46a1a22c29baf7a4e77837a26b7f138f410e9d1883480ed5fa42411d522aba32040b577046c11f007388e
-ad1154142344f494e3061ef45a34fab1aaacf5fdf7d1b26adbb5fbc3d795655fa743444e39d9a4119b4a4f82a6f30441
-b1d6c30771130c77806e7ab893b73d4deb590b2ff8f2f8b5e54c2040c1f3e060e2bd99afc668cf706a2df666a508bbf6
-a00361fd440f9decabd98d96c575cd251dc94c60611025095d1201ef2dedde51cb4de7c2ece47732e5ed9b3526c2012c
-a85c5ab4d17d328bda5e6d839a9a6adcc92ff844ec25f84981e4f44a0e8419247c081530f8d9aa629c7eb4ca21affba6
-a4ddd3eab4527a2672cf9463db38bc29f61460e2a162f426b7852b7a7645fbd62084fd39a8e4d60e1958cce436dd8f57
-811648140080fe55b8618f4cf17f3c5a250adb0cd53d885f2ddba835d2b4433188e41fc0661faac88e4ff910b16278c0
-b85c7f1cfb0ed29addccf7546023a79249e8f15ac2d14a20accbfef4dd9dc11355d599815fa09d2b6b4e966e6ea8cff1
-a10b5d8c260b159043b020d5dd62b3467df2671afea6d480ca9087b7e60ed170c82b121819d088315902842d66c8fb45
-917e191df1bcf3f5715419c1e2191da6b8680543b1ba41fe84ed07ef570376e072c081beb67b375fca3565a2565bcabb
-881fd967407390bfd7badc9ab494e8a287559a01eb07861f527207c127eadea626e9bcc5aa9cca2c5112fbac3b3f0e9c
-959fd71149af82cc733619e0e5bf71760ca2650448c82984b3db74030d0e10f8ab1ce1609a6de6f470fe8b5bd90df5b3
-a3370898a1c5f33d15adb4238df9a6c945f18b9ada4ce2624fc32a844f9ece4c916a64e9442225b6592afa06d2e015f2
-817efb8a791435e4236f7d7b278181a5fa34587578c629dbc14fbf9a5c26772290611395eecd20222a4c58649fc256d8
-a04c9876acf2cfdc8ef96de4879742709270fa1d03fe4c8511fbef2d59eb0aaf0336fa2c7dfe41a651157377fa217813
-81e15875d7ea7f123e418edf14099f2e109d4f3a6ce0eb65f67fe9fb10d2f809a864a29f60ad3fc949f89e2596b21783
-b49f529975c09e436e6bc202fdc16e3fdcbe056db45178016ad6fdece9faad4446343e83aed096209690b21a6910724f
-879e8eda589e1a279f7f49f6dd0580788c040d973748ec4942dbe51ea8fbd05983cc919b78f0c6b92ef3292ae29db875
-81a2b74b2118923f34139a102f3d95e7eee11c4c2929c2576dee200a5abfd364606158535a6c9e4178a6a83dbb65f3c4
-8913f281d8927f2b45fc815d0f7104631cb7f5f7278a316f1327d670d15868daadd2a64e3eb98e1f53fe7e300338cc80
-a6f815fba7ef9af7fbf45f93bc952e8b351f5de6568a27c7c47a00cb39a254c6b31753794f67940fc7d2e9cc581529f4
-b3722a15c66a0014ce4d082de118def8d39190c15678a472b846225585f3a83756ae1b255b2e3f86a26168878e4773b2
-817ae61ab3d0dd5b6e24846b5a5364b1a7dc2e77432d9fed587727520ae2f307264ea0948c91ad29f0aea3a11ff38624
-b3db467464415fcad36dc1de2d6ba7686772a577cc2619242ac040d6734881a45d3b40ed4588db124e4289cfeec4bbf6
-ad66a14f5a54ac69603b16e5f1529851183da77d3cc60867f10aea41339dd5e06a5257982e9e90a352cdd32750f42ee4
-adafa3681ef45d685555601a25a55cf23358319a17f61e2179e704f63df83a73bdd298d12cf6cef86db89bd17119e11d
-a379dc44cb6dd3b9d378c07b2ec654fec7ca2f272de6ba895e3d00d20c9e4c5550498a843c8ac67e4221db2115bedc1c
-b7bf81c267a78efc6b9e5a904574445a6487678d7ef70054e3e93ea6a23f966c2b68787f9164918e3b16d2175459ed92
-b41d66a13a4afafd5760062b77f79de7e6ab8ccacde9c6c5116a6d886912fb491dc027af435b1b44aacc6af7b3c887f2
-9904d23a7c1c1d2e4bab85d69f283eb0a8e26d46e8b7b30224438015c936729b2f0af7c7c54c03509bb0500acb42d8a4
-ae30d65e9e20c3bfd603994ae2b175ff691d51f3e24b2d058b3b8556d12ca4c75087809062dddd4aaac81c94d15d8a17
-9245162fab42ac01527424f6013310c3eb462982518debef6c127f46ba8a06c705d7dc9f0a41e796ba8d35d60ae6cc64
-87fab853638d7a29a20f3ba2b1a7919d023e9415bfa78ebb27973d8cbc7626f584dc5665d2e7ad71f1d760eba9700d88
-85aac46ecd330608e5272430970e6081ff02a571e8ea444f1e11785ea798769634a22a142d0237f67b75369d3c484a8a
-938c85ab14894cc5dfce3d80456f189a2e98eddbc8828f4ff6b1df1dcb7b42b17ca2ff40226a8a1390a95d63dca698dd
-a18ce1f846e3e3c4d846822f60271eecf0f5d7d9f986385ac53c5ace9589dc7c0188910448c19b91341a1ef556652fa9
-8611608a9d844f0e9d7584ad6ccf62a5087a64f764caf108db648a776b5390feb51e5120f0ef0e9e11301af3987dd7dc
-8106333ba4b4de8d1ae43bc9735d3fea047392e88efd6a2fa6f7b924a18a7a265ca6123c3edc0f36307dd7fb7fe89257
-a91426fa500951ff1b051a248c050b7139ca30dde8768690432d597d2b3c4357b11a577be6b455a1c5d145264dcf81fc
-b7f9f90e0e450f37b081297f7f651bad0496a8b9afd2a4cf4120a2671aaaa8536dce1af301258bfbfdb122afa44c5048
-84126da6435699b0c09fa4032dec73d1fca21d2d19f5214e8b0bea43267e9a8dd1fc44f8132d8315e734c8e2e04d7291
-aff064708103884cb4f1a3c1718b3fc40a238d35cf0a7dc24bdf9823693b407c70da50df585bf5bc4e9c07d1c2d203e8
-a8b40fc6533752983a5329c31d376c7a5c13ce6879cc7faee648200075d9cd273537001fb4c86e8576350eaac6ba60c2
-a02db682bdc117a84dcb9312eb28fcbde12d49f4ce915cc92c610bb6965ec3cc38290f8c5b5ec70afe153956692cda95
-86decd22b25d300508472c9ce75d3e465b737e7ce13bc0fcce32835e54646fe12322ba5bc457be18bfd926a1a6ca4a38
-a18666ef65b8c2904fd598791f5627207165315a85ee01d5fb0e6b2e10bdd9b00babc447da5bd63445e3337de33b9b89
-89bb0c06effadefdaf34ffe4b123e1678a90d4451ee856c863df1e752eef41fd984689ded8f0f878bf8916d5dd8e8024
-97cfcba08ebec05d0073992a66b1d7d6fb9d95871f2cdc36db301f78bf8069294d1c259efef5c93d20dc937eedae3a1a
-ac2643b14ece79dcb2e289c96776a47e2bebd40dd6dc74fd035df5bb727b5596f40e3dd2d2202141e69b0993717ede09
-a5e6fd88a2f9174d9bd4c6a55d9c30974be414992f22aa852f552c7648f722ed8077acf5aba030abd47939bb451b2c60
-8ad40a612824a7994487731a40b311b7349038c841145865539c6ada75c56de6ac547a1c23df190e0caaafecddd80ccc
-953a7cea1d857e09202c438c6108060961f195f88c32f0e012236d7a4b39d840c61b162ec86436e8c38567328bea0246
-80d8b47a46dae1868a7b8ccfe7029445bbe1009dad4a6c31f9ef081be32e8e1ac1178c3c8fb68d3e536c84990cc035b1
-81ecd99f22b3766ce0aca08a0a9191793f68c754fdec78b82a4c3bdc2db122bbb9ebfd02fc2dcc6e1567a7d42d0cc16a
-b1dd0446bccc25846fb95d08c1c9cc52fb51c72c4c5d169ffde56ecfe800f108dc1106d65d5c5bd1087c656de3940b63
-b87547f0931e164e96de5c550ca5aa81273648fe34f6e193cd9d69cf729cb432e17aa02e25b1c27a8a0d20a3b795e94e
-820a94e69a927e077082aae66f6b292cfbe4589d932edf9e68e268c9bd3d71ef76cf7d169dd445b93967c25db11f58f1
-b0d07ddf2595270c39adfa0c8cf2ab1322979b0546aa4d918f641be53cd97f36c879bb75d205e457c011aca3bbd9f731
-8700b876b35b4b10a8a9372c5230acecd39539c1bb87515640293ad4464a9e02929d7d6a6a11112e8a29564815ac0de4
-a61a601c5bb27dcb97e37c8e2b9ce479c6b192a5e04d9ed5e065833c5a1017ee5f237b77d1a17be5d48f8e7cc0bcacf6
-92fb88fe774c1ba1d4a08cae3c0e05467ad610e7a3f1d2423fd47751759235fe0a3036db4095bd6404716aa03820f484
-b274f140d77a3ce0796f5e09094b516537ccaf27ae1907099bff172e6368ba85e7c3ef8ea2a07457cac48ae334da95b3
-b2292d9181f16581a9a9142490b2bdcdfb218ca6315d1effc8592100d792eb89d5356996c890441f04f2b4a95763503e
-8897e73f576d86bc354baa3bd96e553107c48cf5889dcc23c5ba68ab8bcd4e81f27767be2233fdfa13d39f885087e668
-a29eac6f0829791c728d71abc49569df95a4446ecbfc534b39f24f56c88fe70301838dfc1c19751e7f3c5c1b8c6af6a0
-9346dc3720adc5df500a8df27fd9c75ef38dc5c8f4e8ed66983304750e66d502c3c59b8e955be781b670a0afc70a2167
-9566d534e0e30a5c5f1428665590617e95fd05d45f573715f58157854ad596ece3a3cfec61356aee342308d623e029d5
-a464fb8bffe6bd65f71938c1715c6e296cc6d0311a83858e4e7eb5873b7f2cf0c584d2101e3407b85b64ca78b2ac93ce
-b54088f7217987c87e9498a747569ac5b2f8afd5348f9c45bf3fd9fbf713a20f495f49c8572d087efe778ac7313ad6d3
-91fa9f5f8000fe050f5b224d90b59fcce13c77e903cbf98ded752e5b3db16adb2bc1f8c94be48b69f65f1f1ad81d6264
-92d04a5b0ac5d8c8e313709b432c9434ecd3e73231f01e9b4e7952b87df60cbfa97b5dedd2200bd033b4b9ea8ba45cc1
-a94b90ad3c3d6c4bbe169f8661a790c40645b40f0a9d1c7220f01cf7fc176e04d80bab0ced9323fcafb93643f12b2760
-94d86149b9c8443b46196f7e5a3738206dd6f3be7762df488bcbb9f9ee285a64c997ed875b7b16b26604fa59020a8199
-82efe4ae2c50a2d7645240c173a047f238536598c04a2c0b69c96e96bd18e075a99110f1206bc213f39edca42ba00cc1
-ab8667685f831bc14d4610f84a5da27b4ea5b133b4d991741a9e64dceb22cb64a3ce8f1b6e101d52af6296df7127c9ad
-83ba433661c05dcc5d562f4a9a261c8110dac44b8d833ae1514b1fc60d8b4ee395b18804baea04cb10adb428faf713c3
-b5748f6f660cc5277f1211d2b8649493ed8a11085b871cd33a5aea630abd960a740f08c08be5f9c21574600ac9bf5737
-a5c8dd12af48fb710642ad65ebb97ca489e8206741807f7acfc334f8035d3c80593b1ff2090c9bb7bd138f0c48714ca8
-a2b382fd5744e3babf454b1d806cc8783efeb4761bc42b6914ea48a46a2eae835efbe0a18262b6bc034379e03cf1262b
-b3145ffaf603f69f15a64936d32e3219eea5ed49fdfd2f5bf40ea0dfd974b36fb6ff12164d4c2282d892db4cf3ff3ce1
-87a316fb213f4c5e30c5e3face049db66be4f28821bd96034714ec23d3e97849d7b301930f90a4323c7ccf53de23050c
-b9de09a919455070fed6220fc179c8b7a4c753062bcd27acf28f5b9947a659c0b364298daf7c85c4ca6fca7f945add1f
-806fbd98d411b76979464c40ad88bc07a151628a27fcc1012ba1dfbaf5b5cc9d962fb9b3386008978a12515edce934bc
-a15268877fae0d21610ae6a31061ed7c20814723385955fac09fdc9693a94c33dea11db98bb89fdfe68f933490f5c381
-8d633fb0c4da86b2e0b37d8fad5972d62bff2ac663c5ec815d095cd4b7e1fe66ebef2a2590995b57eaf941983c7ad7a4
-8139e5dd9cf405e8ef65f11164f0440827d98389ce1b418b0c9628be983a9ddd6cf4863036ccb1483b40b8a527acd9ed
-88b15fa94a08eac291d2b94a2b30eb851ff24addf2cc30b678e72e32cfcb3424cf4b33aa395d741803f3e578ddf524de
-b5eaf0c8506e101f1646bcf049ee38d99ea1c60169730da893fd6020fd00a289eb2f415947e44677af49e43454a7b1be
-8489822ad0647a7e06aa2aa5595960811858ddd4542acca419dd2308a8c5477648f4dd969a6740bb78aa26db9bfcc555
-b1e9a7b9f3423c220330d45f69e45fa03d7671897cf077f913c252e3e99c7b1b1cf6d30caad65e4228d5d7b80eb86e5e
-b28fe9629592b9e6a55a1406903be76250b1c50c65296c10c5e48c64b539fb08fe11f68cf462a6edcbba71b0cee3feb2
-a41acf96a02c96cd8744ff6577c244fc923810d17ade133587e4c223beb7b4d99fa56eae311a500d7151979267d0895c
-880798938fe4ba70721be90e666dfb62fcab4f3556fdb7b0dc8ec5bc34f6b4513df965eae78527136eb391889fe2caf9
-98d4d89d358e0fb7e212498c73447d94a83c1b66e98fc81427ab13acddb17a20f52308983f3a5a8e0aaacec432359604
-81430b6d2998fc78ba937a1639c6020199c52da499f68109da227882dc26d005b73d54c5bdcac1a04e8356a8ca0f7017
-a8d906a4786455eb74613aba4ce1c963c60095ffb8658d368df9266fdd01e30269ce10bf984e7465f34b4fd83beba26a
-af54167ac1f954d10131d44a8e0045df00d581dd9e93596a28d157543fbe5fb25d213806ed7fb3cba6b8f5b5423562db
-8511e373a978a12d81266b9afbd55035d7bc736835cfa921903a92969eeba3624437d1346b55382e61415726ab84a448
-8cf43eea93508ae586fa9a0f1354a1e16af659782479c2040874a46317f9e8d572a23238efa318fdfb87cc63932602b7
-b0bdd3bacff077173d302e3a9678d1d37936188c7ecc34950185af6b462b7c679815176f3cce5db19aac8b282f2d60ad
-a355e9b87f2f2672052f5d4d65b8c1c827d24d89b0d8594641fccfb69aef1b94009105f3242058bb31c8bf51caae5a41
-b8baa9e4b950b72ff6b88a6509e8ed1304bc6fd955748b2e59a523a1e0c5e99f52aec3da7fa9ff407a7adf259652466c
-840bc3dbb300ea6f27d1d6dd861f15680bd098be5174f45d6b75b094d0635aced539fa03ddbccb453879de77fb5d1fe9
-b4bc7e7e30686303856472bae07e581a0c0bfc815657c479f9f5931cff208d5c12930d2fd1ff413ebd8424bcd7a9b571
-89b5d514155d7999408334a50822508b9d689add55d44a240ff2bdde2eee419d117031f85e924e2a2c1ca77db9b91eea
-a8604b6196f87a04e1350302e8aa745bba8dc162115d22657b37a1d1a98cb14876ddf7f65840b5dbd77e80cd22b4256c
-83cb7acdb9e03247515bb2ce0227486ccf803426717a14510f0d59d45e998b245797d356f10abca94f7a14e1a2f0d552
-aeb3266a9f16649210ab2df0e1908ac259f34ce1f01162c22b56cf1019096ee4ea5854c36e30bb2feb06c21a71e8a45c
-89e72e86edf2aa032a0fc9acf4d876a40865fbb2c8f87cb7e4d88856295c4ac14583e874142fd0c314a49aba68c0aa3c
-8c3576eba0583c2a7884976b4ed11fe1fda4f6c32f6385d96c47b0e776afa287503b397fa516a455b4b8c3afeedc76db
-a31e5b633bda9ffa174654fee98b5d5930a691c3c42fcf55673d927dbc8d91c58c4e42e615353145431baa646e8bbb30
-89f2f3f7a8da1544f24682f41c68114a8f78c86bd36b066e27da13acb70f18d9f548773a16bd8e24789420e17183f137
-ada27fa4e90a086240c9164544d2528621a415a5497badb79f8019dc3dce4d12eb6b599597e47ec6ac39c81efda43520
-90dc1eb21bf21c0187f359566fc4bf5386abea52799306a0e5a1151c0817c5f5bc60c86e76b1929c092c0f3ff48cedd2
-b702a53ebcc17ae35d2e735a347d2c700e9cbef8eadbece33cac83df483b2054c126593e1f462cfc00a3ce9d737e2af5
-9891b06455ec925a6f8eafffba05af6a38cc5e193acaaf74ffbf199df912c5197106c5e06d72942bbb032ce277b6417f
-8c0ee71eb01197b019275bcf96cae94e81d2cdc3115dbf2d8e3080074260318bc9303597e8f72b18f965ad601d31ec43
-8aaf580aaf75c1b7a5f99ccf60503506e62058ef43b28b02f79b8536a96be3f019c9f71caf327b4e6730134730d1bef5
-ae6f9fc21dd7dfa672b25a87eb0a41644f7609fab5026d5cedb6e43a06dbbfd6d6e30322a2598c8dedde88c52eaed626
-8159b953ffece5693edadb2e906ebf76ff080ee1ad22698950d2d3bfc36ac5ea78f58284b2ca180664452d55bd54716c
-ab7647c32ca5e9856ac283a2f86768d68de75ceeba9e58b74c5324f8298319e52183739aba4340be901699d66ac9eb3f
-a4d85a5701d89bcfaf1572db83258d86a1a0717603d6f24ac2963ffcf80f1265e5ab376a4529ca504f4396498791253c
-816080c0cdbfe61b4d726c305747a9eb58ac26d9a35f501dd32ba43c098082d20faf3ccd41aad24600aa73bfa453dfac
-84f3afac024f576b0fd9acc6f2349c2fcefc3f77dbe5a2d4964d14b861b88e9b1810334b908cf3427d9b67a8aee74b18
-94b390655557b1a09110018e9b5a14490681ade275bdc83510b6465a1218465260d9a7e2a6e4ec700f58c31dc3659962
-a8c66826b1c04a2dd4c682543242e7a57acae37278bd09888a3d17747c5b5fec43548101e6f46d703638337e2fd3277b
-86e6f4608a00007fa533c36a5b054c5768ccafe41ad52521d772dcae4c8a4bcaff8f7609be30d8fab62c5988cbbb6830
-837da4cf09ae8aa0bceb16f8b3bfcc3b3367aecac9eed6b4b56d7b65f55981ef066490764fb4c108792623ecf8cad383
-941ff3011462f9b5bf97d8cbdb0b6f5d37a1b1295b622f5485b7d69f2cb2bcabc83630dae427f0259d0d9539a77d8424
-b99e5d6d82aa9cf7d5970e7f710f4039ac32c2077530e4c2779250c6b9b373bc380adb0a03b892b652f649720672fc8c
-a791c78464b2d65a15440b699e1e30ebd08501d6f2720adbc8255d989a82fcded2f79819b5f8f201bed84a255211b141
-84af7ad4a0e31fcbb3276ab1ad6171429cf39adcf78dc03750dc5deaa46536d15591e26d53e953dfb31e1622bc0743ab
-a833e62fe97e1086fae1d4917fbaf09c345feb6bf1975b5cb863d8b66e8d621c7989ab3dbecda36bc9eaffc5eaa6fa66
-b4ef79a46a2126f53e2ebe62770feb57fd94600be29459d70a77c5e9cc260fa892be06cd60f886bf48459e48eb50d063
-b43b8f61919ea380bf151c294e54d3a3ff98e20d1ee5efbfe38aa2b66fafbc6a49739793bd5cb1c809f8b30466277c3a
-ab37735af2412d2550e62df9d8b3b5e6f467f20de3890bf56faf1abf2bf3bd1d98dc3fa0ad5e7ab3fce0fa20409eb392
-82416b74b1551d484250d85bb151fabb67e29cce93d516125533df585bc80779ab057ea6992801a3d7d5c6dcff87a018
-8145d0787f0e3b5325190ae10c1d6bee713e6765fb6a0e9214132c6f78f4582bb2771aaeae40d3dad4bafb56bf7e36d8
-b6935886349ecbdd5774e12196f4275c97ec8279fdf28ccf940f6a022ebb6de8e97d6d2173c3fe402cbe9643bed3883b
-87ef9b4d3dc71ac86369f8ed17e0dd3b91d16d14ae694bc21a35b5ae37211b043d0e36d8ff07dcc513fb9e6481a1f37f
-ae1d0ded32f7e6f1dc8fef495879c1d9e01826f449f903c1e5034aeeabc5479a9e323b162b688317d46d35a42d570d86
-a40d16497004db4104c6794e2f4428d75bdf70352685944f3fbe17526df333e46a4ca6de55a4a48c02ecf0bde8ba03c0
-8d45121efba8cc308a498e8ee39ea6fa5cae9fb2e4aab1c2ff9d448aa8494ccbec9a078f978a86fcd97b5d5e7be7522a
-a8173865c64634ba4ac2fa432740f5c05056a9deaf6427cb9b4b8da94ca5ddbc8c0c5d3185a89b8b28878194de9cdfcd
-b6ec06a74d690f6545f0f0efba236e63d1fdfba54639ca2617408e185177ece28901c457d02b849fd00f1a53ae319d0a
-b69a12df293c014a40070e3e760169b6f3c627caf9e50b35a93f11ecf8df98b2bc481b410eecb7ab210bf213bbe944de
-97e7dc121795a533d4224803e591eef3e9008bab16f12472210b73aaf77890cf6e3877e0139403a0d3003c12c8f45636
-acdfa6fdd4a5acb7738cc8768f7cba84dbb95c639399b291ae8e4e63df37d2d4096900a84d2f0606bf534a9ccaa4993f
-86ee253f3a9446a33e4d1169719b7d513c6b50730988415382faaf751988c10a421020609f7bcdef91be136704b906e2
-aac9438382a856caf84c5a8a234282f71b5fc5f65219103b147e7e6cf565522285fbfd7417b513bdad8277a00f652ca1
-83f3799d8e5772527930f5dc071a2e0a65471618993ec8990a96ccdeee65270e490bda9d26bb877612475268711ffd80
-93f28a81ac8c0ec9450b9d762fae9c7f8feaace87a6ee6bd141ef1d2d0697ef1bbd159fe6e1de640dbdab2b0361fca8a
-a0825c95ba69999b90eac3a31a3fd830ea4f4b2b7409bde5f202b61d741d6326852ce790f41de5cb0eccec7af4db30c1
-83924b0e66233edd603c3b813d698daa05751fc34367120e3cf384ea7432e256ccee4d4daf13858950549d75a377107d
-956fd9fa58345277e06ba2ec72f49ed230b8d3d4ff658555c52d6cddeb84dd4e36f1a614f5242d5ca0192e8daf0543c2
-944869912476baae0b114cced4ff65c0e4c90136f73ece5656460626599051b78802df67d7201c55d52725a97f5f29fe
-865cb25b64b4531fb6fe4814d7c8cd26b017a6c6b72232ff53defc18a80fe3b39511b23f9e4c6c7249d06e03b2282ed2
-81e09ff55214960775e1e7f2758b9a6c4e4cd39edf7ec1adfaad51c52141182b79fe2176b23ddc7df9fd153e5f82d668
-b31006896f02bc90641121083f43c3172b1039334501fbaf1672f7bf5d174ddd185f945adf1a9c6cf77be34c5501483d
-88b92f6f42ae45e9f05b16e52852826e933efd0c68b0f2418ac90957fd018df661bc47c8d43c2a7d7bfcf669dab98c3c
-92fc68f595853ee8683930751789b799f397135d002eda244fe63ecef2754e15849edde3ba2f0cc8b865c9777230b712
-99ca06a49c5cd0bb097c447793fcdd809869b216a34c66c78c7e41e8c22f05d09168d46b8b1f3390db9452d91bc96dea
-b48b9490a5d65296802431852d548d81047bbefc74fa7dc1d4e2a2878faacdfcb365ae59209cb0ade01901a283cbd15d
-aff0fdbef7c188b120a02bc9085d7b808e88f73973773fef54707bf2cd772cd066740b1b6f4127b5c349f657bd97e738
-966fd4463b4f43dd8ccba7ad50baa42292f9f8b2e70da23bb6780e14155d9346e275ef03ddaf79e47020dcf43f3738bd
-9330c3e1fadd9e08ac85f4839121ae20bbeb0a5103d84fa5aadbd1213805bdcda67bf2fb75fc301349cbc851b5559d20
-993bb99867bd9041a71a55ad5d397755cfa7ab6a4618fc526179bfc10b7dc8b26e4372fe9a9b4a15d64f2b63c1052dda
-a29b59bcfab51f9b3c490a3b96f0bf1934265c315349b236012adbd64a56d7f6941b2c8cc272b412044bc7731f71e1dc
-a65c9cefe1fc35d089fe8580c2e7671ebefdb43014ac291528ff4deefd4883fd4df274af83711dad610dad0d615f9d65
-944c78c56fb227ae632805d448ca3884cd3d2a89181cead3d2b7835e63297e6d740aa79a112edb1d4727824991636df5
-a73d782da1db7e4e65d7b26717a76e16dd9fab4df65063310b8e917dc0bc24e0d6755df5546c58504d04d9e68c3b474a
-af80f0b87811ae3124f68108b4ca1937009403f87928bbc53480e7c5408d072053ace5eeaf5a5aba814dab8a45502085
-88aaf1acfc6e2e19b8387c97da707cb171c69812fefdd4650468e9b2c627bd5ccfb459f4d8e56bdfd84b09ddf87e128f
-92c97276ff6f72bab6e9423d02ad6dc127962dbce15a0dd1e4a393b4510c555df6aa27be0f697c0d847033a9ca8b8dfd
-a0e07d43d96e2d85b6276b3c60aadb48f0aedf2de8c415756dc597249ea64d2093731d8735231dadc961e5682ac59479
-adc9e6718a8f9298957d1da3842a7751c5399bbdf56f8de6c1c4bc39428f4aee6f1ba6613d37bf46b9403345e9d6fc81
-951da434da4b20d949b509ceeba02e24da7ed2da964c2fcdf426ec787779c696b385822c7dbea4df3e4a35921f1e912c
-a04cbce0d2b2e87bbf038c798a12ec828423ca6aca08dc8d481cf6466e3c9c73d4d4a7fa47df9a7e2e15aae9e9f67208
-8f855cca2e440d248121c0469de1f94c2a71b8ee2682bbad3a78243a9e03da31d1925e6760dbc48a1957e040fae9abe8
-b642e5b17c1df4a4e101772d73851180b3a92e9e8b26c918050f51e6dd3592f102d20b0a1e96f0e25752c292f4c903ff
-a92454c300781f8ae1766dbbb50a96192da7d48ef4cbdd72dd8cbb44c6eb5913c112cc38e9144615fdc03684deb99420
-8b74f7e6c2304f8e780df4649ef8221795dfe85fdbdaa477a1542d135b75c8be45bf89adbbb6f3ddf54ca40f02e733e9
-85cf66292cbb30cec5fd835ab10c9fcb3aea95e093aebf123e9a83c26f322d76ebc89c4e914524f6c5f6ee7d74fc917d
-ae0bfe0cdc97c09542a7431820015f2d16067b30dca56288013876025e81daa8c519e5e347268e19aa1a85fa1dc28793
-921322fc6a47dc091afa0ad6df18ed14cde38e48c6e71550aa513918b056044983aee402de21051235eecf4ce8040fbe
-96c030381e97050a45a318d307dcb3c8377b79b4dd5daf6337cded114de26eb725c14171b9b8e1b3c08fe1f5ea6b49e0
-90c23b86b6111818c8baaf53a13eaee1c89203b50e7f9a994bf0edf851919b48edbac7ceef14ac9414cf70c486174a77
-8bf6c301240d2d1c8d84c71d33a6dfc6d9e8f1cfae66d4d0f7a256d98ae12b0bcebfa94a667735ee89f810bcd7170cff
-a41a4ffbbea0e36874d65c009ee4c3feffff322f6fc0e30d26ee4dbc1f46040d05e25d9d0ecb378cef0d24a7c2c4b850
-a8d4cdd423986bb392a0a92c12a8bd4da3437eec6ef6af34cf5310944899287452a2eb92eb5386086d5063381189d10e
-a81dd26ec057c4032a4ed7ad54d926165273ed51d09a1267b2e477535cf6966835a257c209e4e92d165d74fa75695fa3
-8d7f708c3ee8449515d94fc26b547303b53d8dd55f177bc3b25d3da2768accd9bc8e9f09546090ebb7f15c66e6c9c723
-839ba65cffcd24cfffa7ab3b21faabe3c66d4c06324f07b2729c92f15cad34e474b0f0ddb16cd652870b26a756b731d3
-87f1a3968afec354d92d77e2726b702847c6afcabb8438634f9c6f7766de4c1504317dc4fa9a4a735acdbf985e119564
-91a8a7fd6542f3e0673f07f510d850864b34ac087eb7eef8845a1d14b2b1b651cbdc27fa4049bdbf3fea54221c5c8549
-aef3cf5f5e3a2385ead115728d7059e622146c3457d266c612e778324b6e06fbfb8f98e076624d2f3ce1035d65389a07
-819915d6232e95ccd7693fdd78d00492299b1983bc8f96a08dcb50f9c0a813ed93ae53c0238345d5bea0beda2855a913
-8e9ba68ded0e94935131b392b28218315a185f63bf5e3c1a9a9dd470944509ca0ba8f6122265f8da851b5cc2abce68f1
-b28468e9b04ee9d69003399a3cf4457c9bf9d59f36ab6ceeb8e964672433d06b58beeea198fedc7edbaa1948577e9fa2
-a633005e2c9f2fd94c8bce2dd5bb708fe946b25f1ec561ae65e54e15cdd88dc339f1a083e01f0d39610c8fe24151aaf0
-841d0031e22723f9328dd993805abd13e0c99b0f59435d2426246996b08d00ce73ab906f66c4eab423473b409e972ce0
-85758d1b084263992070ec8943f33073a2d9b86a8606672550c17545507a5b3c88d87382b41916a87ee96ff55a7aa535
-8581b06b0fc41466ef94a76a1d9fb8ae0edca6d018063acf6a8ca5f4b02d76021902feba58972415691b4bdbc33ae3b4
-83539597ff5e327357ee62bc6bf8c0bcaec2f227c55c7c385a4806f0d37fb461f1690bad5066b8a5370950af32fafbef
-aee3557290d2dc10827e4791d00e0259006911f3f3fce4179ed3c514b779160613eca70f720bff7804752715a1266ffa
-b48d2f0c4e90fc307d5995464e3f611a9b0ef5fe426a289071f4168ed5cc4f8770c9332960c2ca5c8c427f40e6bb389f
-847af8973b4e300bb06be69b71b96183fd1a0b9d51b91701bef6fcfde465068f1eb2b1503b07afda380f18d69de5c9e1
-a70a6a80ce407f07804c0051ac21dc24d794b387be94eb24e1db94b58a78e1bcfb48cd0006db8fc1f9bedaece7a44fbe
-b40e942b8fa5336910ff0098347df716bff9d1fa236a1950c16eeb966b3bc1a50b8f7b0980469d42e75ae13ced53cead
-b208fabaa742d7db3148515330eb7a3577487845abdb7bd9ed169d0e081db0a5816595c33d375e56aeac5b51e60e49d3
-b7c8194b30d3d6ef5ab66ec88ad7ebbc732a3b8a41731b153e6f63759a93f3f4a537eab9ad369705bd730184bdbbdc34
-9280096445fe7394d04aa1bc4620c8f9296e991cc4d6c131bd703cb1cc317510e6e5855ac763f4d958c5edfe7eebeed7
-abc2aa4616a521400af1a12440dc544e3c821313d0ab936c86af28468ef8bbe534837e364598396a81cf8d06274ed5a6
-b18ca8a3325adb0c8c18a666d4859535397a1c3fe08f95eebfac916a7a99bbd40b3c37b919e8a8ae91da38bc00fa56c0
-8a40c33109ecea2a8b3558565877082f79121a432c45ec2c5a5e0ec4d1c203a6788e6b69cb37f1fd5b8c9a661bc5476d
-88c47301dd30998e903c84e0b0f2c9af2e1ce6b9f187dab03528d44f834dc991e4c86d0c474a2c63468cf4020a1e24a0
-920c832853e6ab4c851eecfa9c11d3acc7da37c823be7aa1ab15e14dfd8beb5d0b91d62a30cec94763bd8e4594b66600
-98e1addbe2a6b8edc7f12ecb9be81c3250aeeca54a1c6a7225772ca66549827c15f3950d01b8eb44aecb56fe0fff901a
-8cfb0fa1068be0ec088402f5950c4679a2eb9218c729da67050b0d1b2d7079f3ddf4bf0f57d95fe2a8db04bc6bcdb20c
-b70f381aafe336b024120453813aeab70baac85b9c4c0f86918797b6aee206e6ed93244a49950f3d8ec9f81f4ac15808
-a4c8edf4aa33b709a91e1062939512419711c1757084e46f8f4b7ed64f8e682f4e78b7135920c12f0eb0422fe9f87a6a
-b4817e85fd0752d7ebb662d3a51a03367a84bac74ebddfba0e5af5e636a979500f72b148052d333b3dedf9edd2b4031b
-a87430169c6195f5d3e314ff2d1c2f050e766fd5d2de88f5207d72dba4a7745bb86d0baca6e9ae156582d0d89e5838c7
-991b00f8b104566b63a12af4826b61ce7aa40f4e5b8fff3085e7a99815bdb4471b6214da1e480214fac83f86a0b93cc5
-b39966e3076482079de0678477df98578377a094054960ee518ef99504d6851f8bcd3203e8da5e1d4f6f96776e1fe6eb
-a448846d9dc2ab7a0995fa44b8527e27f6b3b74c6e03e95edb64e6baa4f1b866103f0addb97c84bef1d72487b2e21796
-894bec21a453ae84b592286e696c35bc30e820e9c2fd3e63dd4fbe629e07df16439c891056070faa490155f255bf7187
-a9ec652a491b11f6a692064e955f3f3287e7d2764527e58938571469a1e29b5225b9415bd602a45074dfbfe9c131d6ca
-b39d37822e6cbe28244b5f42ce467c65a23765bd16eb6447c5b3e942278069793763483dafd8c4dd864f8917aad357fe
-88dba51133f2019cb266641c56101e3e5987d3b77647a2e608b5ff9113dfc5f85e2b7c365118723131fbc0c9ca833c9c
-b566579d904b54ecf798018efcb824dccbebfc6753a0fd2128ac3b4bd3b038c2284a7c782b5ca6f310eb7ea4d26a3f0a
-a97a55c0a492e53c047e7d6f9d5f3e86fb96f3dddc68389c0561515343b66b4bc02a9c0d5722dff1e3445308240b27f7
-a044028ab4bcb9e1a2b9b4ca4efbf04c5da9e4bf2fff0e8bd57aa1fc12a71e897999c25d9117413faf2f45395dee0f13
-a78dc461decbeaeed8ebd0909369b491a5e764d6a5645a7dac61d3140d7dc0062526f777b0eb866bff27608429ebbdde
-b2c2a8991f94c39ca35fea59f01a92cb3393e0eccb2476dfbf57261d406a68bd34a6cff33ed80209991688c183609ef4
-84189eefb521aff730a4fd3fd5b10ddfd29f0d365664caef63bb015d07e689989e54c33c2141dd64427805d37a7e546e
-85ac80bd734a52235da288ff042dea9a62e085928954e8eacd2c751013f61904ed110e5b3afe1ab770a7e6485efb7b5e
-9183a560393dcb22d0d5063e71182020d0fbabb39e32493eeffeb808df084aa243eb397027f150b55a247d1ed0c8513e
-81c940944df7ecc58d3c43c34996852c3c7915ed185d7654627f7af62abae7e0048dd444a6c09961756455000bd96d09
-aa8c34e164019743fd8284b84f06c3b449aae7996e892f419ee55d82ad548cb300fd651de329da0384243954c0ef6a60
-89a7b7bdfc7e300d06a14d463e573d6296d8e66197491900cc9ae49504c4809ff6e61b758579e9091c61085ba1237b83
-878d21809ba540f50bd11f4c4d9590fb6f3ab9de5692606e6e2ef4ed9d18520119e385be5e1f4b3f2e2b09c319f0e8fc
-8eb248390193189cf0355365e630b782cd15751e672dc478b39d75dc681234dcd9309df0d11f4610dbb249c1e6be7ef9
-a1d7fb3aecb896df3a52d6bd0943838b13f1bd039c936d76d03de2044c371d48865694b6f532393b27fd10a4cf642061
-a34bca58a24979be442238cbb5ece5bee51ae8c0794dd3efb3983d4db713bc6f28a96e976ac3bd9a551d3ed9ba6b3e22
-817c608fc8cacdd178665320b5a7587ca21df8bdd761833c3018b967575d25e3951cf3d498a63619a3cd2ad4406f5f28
-86c95707db0495689afd0c2e39e97f445f7ca0edffad5c8b4cacd1421f2f3cc55049dfd504f728f91534e20383955582
-99c3b0bb15942c301137765d4e19502f65806f3b126dc01a5b7820c87e8979bce6a37289a8f6a4c1e4637227ad5bf3bf
-8aa1518a80ea8b074505a9b3f96829f5d4afa55a30efe7b4de4e5dbf666897fdd2cf31728ca45921e21a78a80f0e0f10
-8d74f46361c79e15128ac399e958a91067ef4cec8983408775a87eca1eed5b7dcbf0ddf30e66f51780457413496c7f07
-a41cde4a786b55387458a1db95171aca4fd146507b81c4da1e6d6e495527c3ec83fc42fad1dfe3d92744084a664fd431
-8c352852c906fae99413a84ad11701f93f292fbf7bd14738814f4c4ceab32db02feb5eb70bc73898b0bc724a39d5d017
-a5993046e8f23b71ba87b7caa7ace2d9023fb48ce4c51838813174880d918e9b4d2b0dc21a2b9c6f612338c31a289df8
-83576d3324bf2d8afbfb6eaecdc5d767c8e22e7d25160414924f0645491df60541948a05e1f4202e612368e78675de8a
-b43749b8df4b15bc9a3697e0f1c518e6b04114171739ef1a0c9c65185d8ec18e40e6954d125cbc14ebc652cf41ad3109
-b4eebd5d80a7327a040cafb9ccdb12b2dfe1aa86e6bc6d3ac8a57fadfb95a5b1a7332c66318ff72ba459f525668af056
-9198be7f1d413c5029b0e1c617bcbc082d21abe2c60ec8ce9b54ca1a85d3dba637b72fda39dae0c0ae40d047eab9f55a
-8d96a0232832e24d45092653e781e7a9c9520766c3989e67bbe86b3a820c4bf621ea911e7cd5270a4bfea78b618411f6
-8d7160d0ea98161a2d14d46ef01dff72d566c330cd4fabd27654d300e1bc7644c68dc8eabf2a20a59bfe7ba276545f9b
-abb60fce29dec7ba37e3056e412e0ec3e05538a1fc0e2c68877378c867605966108bc5742585ab6a405ce0c962b285b6
-8fabffa3ed792f05e414f5839386f6449fd9f7b41a47595c5d71074bd1bb3784cc7a1a7e1ad6b041b455035957e5b2dc
-90ff017b4804c2d0533b72461436b10603ab13a55f86fd4ec11b06a70ef8166f958c110519ca1b4cc7beba440729fe2d
-b340cfd120f6a4623e3a74cf8c32bfd7cd61a280b59dfd17b15ca8fae4d82f64a6f15fbde4c02f424debc72b7db5fe67
-871311c9c7220c932e738d59f0ecc67a34356d1429fe570ca503d340c9996cb5ee2cd188fad0e3bd16e4c468ec1dbebd
-a772470262186e7b94239ba921b29f2412c148d6f97c4412e96d21e55f3be73f992f1ad53c71008f0558ec3f84e2b5a7
-b2a897dcb7ffd6257f3f2947ec966f2077d57d5191a88840b1d4f67effebe8c436641be85524d0a21be734c63ab5965d
-a044f6eacc48a4a061fa149500d96b48cbf14853469aa4d045faf3dca973be1bd4b4ce01646d83e2f24f7c486d03205d
-981af5dc2daa73f7fa9eae35a93d81eb6edba4a7f673b55d41f6ecd87a37685d31bb40ef4f1c469b3d72f2f18b925a17
-912d2597a07864de9020ac77083eff2f15ceb07600f15755aba61251e8ce3c905a758453b417f04d9c38db040954eb65
-9642b7f6f09394ba5e0805734ef6702c3eddf9eea187ba98c676d5bbaec0e360e3e51dc58433aaa1e2da6060c8659cb7
-8ab3836e0a8ac492d5e707d056310c4c8e0489ca85eb771bff35ba1d658360084e836a6f51bb990f9e3d2d9aeb18fbb5
-879e058e72b73bb1f4642c21ffdb90544b846868139c6511f299aafe59c2d0f0b944dffc7990491b7c4edcd6a9889250
-b9e60b737023f61479a4a8fd253ed0d2a944ea6ba0439bbc0a0d3abf09b0ad1f18d75555e4a50405470ae4990626f390
-b9c2535d362796dcd673640a9fa2ebdaec274e6f8b850b023153b0a7a30fffc87f96e0b72696f647ebe7ab63099a6963
-94aeff145386a087b0e91e68a84a5ede01f978f9dd9fe7bebca78941938469495dc30a96bba9508c0d017873aeea9610
-98b179f8a3d9f0d0a983c30682dd425a2ddc7803be59bd626c623c8951a5179117d1d2a68254c95c9952989877d0ee55
-889ecf5f0ee56938273f74eb3e9ecfb5617f04fb58e83fe4c0e4aef51615cf345bc56f3f61b17f6eed3249d4afd54451
-a0f2b2c39bcea4b50883e2587d16559e246248a66ecb4a4b7d9ab3b51fb39fe98d83765e087eee37a0f86b0ba4144c02
-b2a61e247ed595e8a3830f7973b07079cbda510f28ad8c78c220b26cb6acde4fbb5ee90c14a665f329168ee951b08cf0
-95bd0fcfb42f0d6d8a8e73d7458498a85bcddd2fb132fd7989265648d82ac2707d6d203fac045504977af4f0a2aca4b7
-843e5a537c298666e6cf50fcc044f13506499ef83c802e719ff2c90e85003c132024e04711be7234c04d4b0125512d5d
-a46d1797c5959dcd3a5cfc857488f4d96f74277c3d13b98b133620192f79944abcb3a361d939a100187f1b0856eae875
-a1c7786736d6707a48515c38660615fcec67eb8a2598f46657855215f804fd72ab122d17f94fcffad8893f3be658dca7
-b23dc9e610abc7d8bd21d147e22509a0fa49db5be6ea7057b51aae38e31654b3aa044df05b94b718153361371ba2f622
-b00cc8f257d659c22d30e6d641f79166b1e752ea8606f558e4cad6fc01532e8319ea4ee12265ba4140ac45aa4613c004
-ac7019af65221b0cc736287b32d7f1a3561405715ba9a6a122342e04e51637ba911c41573de53e4781f2230fdcb2475f
-81a630bc41b3da8b3eb4bf56cba10cd9f93153c3667f009dc332287baeb707d505fb537e6233c8e53d299ec0f013290c
-a6b7aea5c545bb76df0f230548539db92bc26642572cb7dd3d5a30edca2b4c386f44fc8466f056b42de2a452b81aff5b
-8271624ff736b7b238e43943c81de80a1612207d32036d820c11fc830c737972ccc9c60d3c2359922b06652311e3c994
-8a684106458cb6f4db478170b9ad595d4b54c18bf63b9058f095a2fa1b928c15101472c70c648873d5887880059ed402
-a5cc3c35228122f410184e4326cf61a37637206e589fcd245cb5d0cec91031f8f7586b80503070840fdfd8ce75d3c88b
-9443fc631aed8866a7ed220890911057a1f56b0afe0ba15f0a0e295ab97f604b134b1ed9a4245e46ee5f9a93aa74f731
-984b6f7d79835dffde9558c6bb912d992ca1180a2361757bdba4a7b69dc74b056e303adc69fe67414495dd9c2dd91e64
-b15a5c8cba5de080224c274d31c68ed72d2a7126d347796569aef0c4e97ed084afe3da4d4b590b9dda1a07f0c2ff3dfb
-991708fe9650a1f9a4e43938b91d45dc68c230e05ee999c95dbff3bf79b1c1b2bb0e7977de454237c355a73b8438b1d9
-b4f7edc7468b176a4a7c0273700c444fa95c726af6697028bed4f77eee887e3400f9c42ee15b782c0ca861c4c3b8c98a
-8c60dcc16c51087eb477c13e837031d6c6a3dc2b8bf8cb43c23f48006bc7173151807e866ead2234b460c2de93b31956
-83ad63e9c910d1fc44bc114accfb0d4d333b7ebe032f73f62d25d3e172c029d5e34a1c9d547273bf6c0fead5c8801007
-85de73213cc236f00777560756bdbf2b16841ba4b55902cf2cad9742ecaf5d28209b012ceb41f337456dfeca93010cd7
-a7561f8827ccd75b6686ba5398bb8fc3083351c55a589b18984e186820af7e275af04bcd4c28e1dc11be1e8617a0610b
-88c0a4febd4068850557f497ea888035c7fc9f404f6cc7794e7cc8722f048ad2f249e7dc62743e7a339eb7473ad3b0cd
-932b22b1d3e6d5a6409c34980d176feb85ada1bf94332ef5c9fc4d42b907dabea608ceef9b5595ef3feee195151f18d8
-a2867bb3f5ab88fbdae3a16c9143ab8a8f4f476a2643c505bb9f37e5b1fd34d216cab2204c9a017a5a67b7ad2dda10e8
-b573d5f38e4e9e8a3a6fd82f0880dc049efa492a946d00283019bf1d5e5516464cf87039e80aef667cb86fdea5075904
-b948f1b5ab755f3f5f36af27d94f503b070696d793b1240c1bdfd2e8e56890d69e6904688b5f8ff5a4bdf5a6abfe195f
-917eae95ebc4109a2e99ddd8fec7881d2f7aaa0e25fda44dec7ce37458c2ee832f1829db7d2dcfa4ca0f06381c7fe91d
-95751d17ed00a3030bce909333799bb7f4ab641acf585807f355b51d6976dceee410798026a1a004ef4dcdff7ec0f5b8
-b9b7bd266f449a79bbfe075e429613e76c5a42ac61f01c8f0bbbd34669650682efe01ff9dbbc400a1e995616af6aa278
-ac1722d097ce9cd7617161f8ec8c23d68f1fb1c9ca533e2a8b4f78516c2fd8fb38f23f834e2b9a03bb06a9d655693ca9
-a7ad9e96ffd98db2ecdb6340c5d592614f3c159abfd832fe27ee9293519d213a578e6246aae51672ee353e3296858873
-989b8814d5de7937c4acafd000eec2b4cd58ba395d7b25f98cafd021e8efa37029b29ad8303a1f6867923f5852a220eb
-a5bfe6282c771bc9e453e964042d44eff4098decacb89aecd3be662ea5b74506e1357ab26f3527110ba377711f3c9f41
-8900a7470b656639721d2abbb7b06af0ac4222ab85a1976386e2a62eb4b88bfb5b72cf7921ddb3cf3a395d7eeb192a2e
-95a71b55cd1f35a438cf5e75f8ff11c5ec6a2ebf2e4dba172f50bfad7d6d5dca5de1b1afc541662c81c858f7604c1163
-82b5d62fea8db8d85c5bc3a76d68dedd25794cf14d4a7bc368938ffca9e09f7e598fdad2a5aac614e0e52f8112ae62b9
-997173f07c729202afcde3028fa7f52cefc90fda2d0c8ac2b58154a5073140683e54c49ed1f254481070d119ce0ce02a
-aeffb91ccc7a72bbd6ffe0f9b99c9e66e67d59cec2e02440465e9636a613ab3017278cfa72ea8bc4aba9a8dc728cb367
-952743b06e8645894aeb6440fc7a5f62dd3acf96dab70a51e20176762c9751ea5f2ba0b9497ccf0114dc4892dc606031
-874c63baeddc56fbbca2ff6031f8634b745f6e34ea6791d7c439201aee8f08ef5ee75f7778700a647f3b21068513fce6
-85128fec9c750c1071edfb15586435cc2f317e3e9a175bb8a9697bcda1eb9375478cf25d01e7fed113483b28f625122d
-85522c9576fd9763e32af8495ae3928ed7116fb70d4378448926bc9790e8a8d08f98cf47648d7da1b6e40d6a210c7924
-97d0f37a13cfb723b848099ca1c14d83e9aaf2f7aeb71829180e664b7968632a08f6a85f557d74b55afe6242f2a36e7c
-abaa472d6ad61a5fccd1a57c01aa1bc081253f95abbcba7f73923f1f11c4e79b904263890eeb66926de3e2652f5d1c70
-b3c04945ba727a141e5e8aec2bf9aa3772b64d8fd0e2a2b07f3a91106a95cbcb249adcd074cbe498caf76fffac20d4ef
-82c46781a3d730d9931bcabd7434a9171372dde57171b6180e5516d4e68db8b23495c8ac3ab96994c17ddb1cf249b9fb
-a202d8b65613c42d01738ccd68ed8c2dbc021631f602d53f751966e04182743ebc8e0747d600b8a8676b1da9ae7f11ab
-ae73e7256e9459db04667a899e0d3ea5255211fb486d084e6550b6dd64ca44af6c6b2d59d7aa152de9f96ce9b58d940d
-b67d87b176a9722945ec7593777ee461809861c6cfd1b945dde9ee4ff009ca4f19cf88f4bbb5c80c9cbab2fe25b23ac8
-8f0b7a317a076758b0dac79959ee4a06c08b07d0f10538a4b53d3da2eda16e2af26922feb32c090330dc4d969cf69bd3
-90b36bf56adbd8c4b6cb32febc3a8d5f714370c2ac3305c10fa6d168dffb2a026804517215f9a2d4ec8310cdb6bb459b
-aa80c19b0682ead69934bf18cf476291a0beddd8ef4ed75975d0a472e2ab5c70f119722a8574ae4973aceb733d312e57
-a3fc9abb12574e5c28dcb51750b4339b794b8e558675eef7d26126edf1de920c35e992333bcbffcbf6a5f5c0d383ce62
-a1573ff23ab972acdcd08818853b111fc757fdd35aa070186d3e11e56b172fb49d840bf297ac0dd222e072fc09f26a81
-98306f2be4caa92c2b4392212d0cbf430b409b19ff7d5b899986613bd0e762c909fc01999aa94be3bd529d67f0113d7f
-8c1fc42482a0819074241746d17dc89c0304a2acdae8ed91b5009e9e3e70ff725ba063b4a3e68fdce05b74f5180c545e
-a6c6113ebf72d8cf3163b2b8d7f3fa24303b13f55752522c660a98cd834d85d8c79214d900fa649499365e2e7641f77a
-ab95eea424f8a2cfd9fb1c78bb724e5b1d71a0d0d1e4217c5d0f98b0d8bbd3f8400a2002abc0a0e4576d1f93f46fefad
-823c5a4fd8cf4a75fdc71d5f2dd511b6c0f189b82affeacd2b7cfcad8ad1a5551227dcc9bfdb2e34b2097eaa00efbb51
-b97314dfff36d80c46b53d87a61b0e124dc94018a0bb680c32765b9a2d457f833a7c42bbc90b3b1520c33a182580398d
-b17566ee3dcc6bb3b004afe4c0136dfe7dd27df9045ae896dca49fb36987501ae069eb745af81ba3fc19ff037e7b1406
-b0bdc0f55cfd98d331e3a0c4fbb776a131936c3c47c6bffdc3aaf7d8c9fa6803fbc122c2fefbb532e634228687d52174
-aa5d9e60cc9f0598559c28bb9bdd52aa46605ab4ffe3d192ba982398e72cec9a2a44c0d0d938ce69935693cabc0887ea
-802b6459d2354fa1d56c592ac1346c428dadea6b6c0a87bf7d309bab55c94e1cf31dd98a7a86bd92a840dd51f218b91b
-a526914efdc190381bf1a73dd33f392ecf01350b9d3f4ae96b1b1c3d1d064721c7d6eec5788162c933245a3943f5ee51
-b3b8fcf637d8d6628620a1a99dbe619eabb3e5c7ce930d6efd2197e261bf394b74d4e5c26b96c4b8009c7e523ccfd082
-8f7510c732502a93e095aba744535f3928f893f188adc5b16008385fb9e80f695d0435bfc5b91cdad4537e87e9d2551c
-97b90beaa56aa936c3ca45698f79273a68dd3ccd0076eab48d2a4db01782665e63f33c25751c1f2e070f4d1a8525bf96
-b9fb798324b1d1283fdc3e48288e3861a5449b2ab5e884b34ebb8f740225324af86e4711da6b5cc8361c1db15466602f
-b6d52b53cea98f1d1d4c9a759c25bf9d8a50b604b144e4912acbdbdc32aab8b9dbb10d64a29aa33a4f502121a6fb481c
-9174ffff0f2930fc228f0e539f5cfd82c9368d26b074467f39c07a774367ff6cccb5039ac63f107677d77706cd431680
-a33b6250d4ac9e66ec51c063d1a6a31f253eb29bbaed12a0d67e2eccfffb0f3a52750fbf52a1c2aaba8c7692346426e7
-a97025fd5cbcebe8ef865afc39cd3ea707b89d4e765ec817fd021d6438e02fa51e3544b1fd45470c58007a08efac6edd
-b32a78480edd9ff6ba2f1eec4088db5d6ceb2d62d7e59e904ecaef7bb4a2e983a4588e51692b3be76e6ffbc0b5f911a5
-b5ab590ef0bb77191f00495b33d11c53c65a819f7d0c1f9dc4a2caa147a69c77a4fff7366a602d743ee1f395ce934c1e
-b3fb0842f9441fb1d0ee0293b6efbc70a8f58d12d6f769b12872db726b19e16f0f65efbc891cf27a28a248b0ef9c7e75
-9372ad12856fefb928ccb0d34e198df99e2f8973b07e9d417a3134d5f69e12e79ff572c4e03ccd65415d70639bc7c73e
-aa8d6e83d09ce216bfe2009a6b07d0110d98cf305364d5529c170a23e693aabb768b2016befb5ada8dabdd92b4d012bb
-a954a75791eeb0ce41c85200c3763a508ed8214b5945a42c79bfdcfb1ec4f86ad1dd7b2862474a368d4ac31911a2b718
-8e2081cfd1d062fe3ab4dab01f68062bac802795545fede9a188f6c9f802cb5f884e60dbe866710baadbf55dc77c11a4
-a2f06003b9713e7dd5929501ed485436b49d43de80ea5b15170763fd6346badf8da6de8261828913ee0dacd8ff23c0e1
-98eecc34b838e6ffd1931ca65eec27bcdb2fdcb61f33e7e5673a93028c5865e0d1bf6d3bec040c5e96f9bd08089a53a4
-88cc16019741b341060b95498747db4377100d2a5bf0a5f516f7dec71b62bcb6e779de2c269c946d39040e03b3ae12b7
-ad1135ccbc3019d5b2faf59a688eef2500697642be8cfbdf211a1ab59abcc1f24483e50d653b55ff1834675ac7b4978f
-a946f05ed9972f71dfde0020bbb086020fa35b482cce8a4cc36dd94355b2d10497d7f2580541bb3e81b71ac8bba3c49f
-a83aeed488f9a19d8cfd743aa9aa1982ab3723560b1cd337fc2f91ad82f07afa412b3993afb845f68d47e91ba4869840
-95eebe006bfc316810cb71da919e5d62c2cebb4ac99d8e8ef67be420302320465f8b69873470982de13a7c2e23516be9
-a55f8961295a11e91d1e5deadc0c06c15dacbfc67f04ccba1d069cba89d72aa3b3d64045579c3ea8991b150ac29366ae
-b321991d12f6ac07a5de3c492841d1a27b0d3446082fbce93e7e1f9e8d8fe3b45d41253556261c21b70f5e189e1a7a6f
-a0b0822f15f652ce7962a4f130104b97bf9529797c13d6bd8e24701c213cc37f18157bd07f3d0f3eae6b7cd1cb40401f
-96e2fa4da378aa782cc2d5e6e465fc9e49b5c805ed01d560e9b98abb5c0de8b74a2e7bec3aa5e2887d25cccb12c66f0c
-97e4ab610d414f9210ed6f35300285eb3ccff5b0b6a95ed33425100d7725e159708ea78704497624ca0a2dcabce3a2f9
-960a375b17bdb325761e01e88a3ea57026b2393e1d887b34b8fa5d2532928079ce88dc9fd06a728b26d2bb41b12b9032
-8328a1647398e832aadc05bd717487a2b6fcdaa0d4850d2c4da230c6a2ed44c3e78ec4837b6094f3813f1ee99414713f
-aa283834ebd18e6c99229ce4b401eda83f01d904f250fedd4e24f1006f8fa0712a6a89a7296a9bf2ce8de30e28d1408e
-b29e097f2caadae3e0f0ae3473c072b0cd0206cf6d2e9b22c1a5ad3e07d433e32bd09ed1f4e4276a2da4268633357b7f
-9539c5cbba14538b2fe077ecf67694ef240da5249950baaabea0340718b882a966f66d97f08556b08a4320ceb2cc2629
-b4529f25e9b42ae8cf8338d2eface6ba5cd4b4d8da73af502d081388135c654c0b3afb3aa779ffc80b8c4c8f4425dd2b
-95be0739c4330619fbe7ee2249c133c91d6c07eab846c18c5d6c85fc21ac5528c5d56dcb0145af68ed0c6a79f68f2ccd
-ac0c83ea802227bfc23814a24655c9ff13f729619bcffdb487ccbbf029b8eaee709f8bddb98232ef33cd70e30e45ca47
-b503becb90acc93b1901e939059f93e671900ca52c6f64ae701d11ac891d3a050b505d89324ce267bc43ab8275da6ffe
-98e3811b55b1bacb70aa409100abb1b870f67e6d059475d9f278c751b6e1e2e2d6f2e586c81a9fb6597fda06e7923274
-b0b0f61a44053fa6c715dbb0731e35d48dba257d134f851ee1b81fd49a5c51a90ebf5459ec6e489fce25da4f184fbdb1
-b1d2117fe811720bb997c7c93fe9e4260dc50fca8881b245b5e34f724aaf37ed970cdad4e8fcb68e05ac8cf55a274a53
-a10f502051968f14b02895393271776dee7a06db9de14effa0b3471825ba94c3f805302bdddac4d397d08456f620999d
-a3dbad2ef060ae0bb7b02eaa4a13594f3f900450faa1854fc09620b01ac94ab896321dfb1157cf2374c27e5718e8026a
-b550fdec503195ecb9e079dcdf0cad559d64d3c30818ef369b4907e813e689da316a74ad2422e391b4a8c2a2bef25fc0
-a25ba865e2ac8f28186cea497294c8649a201732ecb4620c4e77b8e887403119910423df061117e5f03fc5ba39042db1
-b3f88174e03fdb443dd6addd01303cf88a4369352520187c739fc5ae6b22fa99629c63c985b4383219dab6acc5f6f532
-97a7503248e31e81b10eb621ba8f5210c537ad11b539c96dfb7cf72b846c7fe81bd7532c5136095652a9618000b7f8d3
-a8bcdc1ce5aa8bfa683a2fc65c1e79de8ff5446695dcb8620f7350c26d2972a23da22889f9e2b1cacb3f688c6a2953dc
-8458c111df2a37f5dd91a9bee6c6f4b79f4f161c93fe78075b24a35f9817da8dde71763218d627917a9f1f0c4709c1ed
-ac5f061a0541152b876cbc10640f26f1cc923c9d4ae1b6621e4bb3bf2cec59bbf87363a4eb72fb0e5b6d4e1c269b52d5
-a9a25ca87006e8a9203cbb78a93f50a36694aa4aad468b8d80d3feff9194455ca559fcc63838128a0ab75ad78c07c13a
-a450b85f5dfffa8b34dfd8bc985f921318efacf8857cf7948f93884ba09fb831482ee90a44224b1a41e859e19b74962f
-8ed91e7f92f5c6d7a71708b6132f157ac226ecaf8662af7d7468a4fa25627302efe31e4620ad28719318923e3a59bf82
-ab524165fd4c71b1fd395467a14272bd2b568592deafa039d8492e9ef36c6d3f96927c95c72d410a768dc0b6d1fbbc9b
-b662144505aa8432c75ffb8d10318526b6d5777ac7af9ebfad87d9b0866c364f7905a6352743bd8fd79ffd9d5dd4f3e6
-a48f1677550a5cd40663bb3ba8f84caaf8454f332d0ceb1d94dbea52d0412fe69c94997f7749929712fd3995298572f7
-8391cd6e2f6b0c242de1117a612be99776c3dc95cb800b187685ea5bf7e2722275eddb79fd7dfc8be8e389c4524cdf70
-875d3acb9af47833b72900bc0a2448999d638f153c5e97e8a14ec02d0c76f6264353a7e275e1f1a5855daced523d243b
-91f1823657d30b59b2f627880a9a9cb530f5aca28a9fd217fe6f2f5133690dfe7ad5a897872e400512db2e788b3f7628
-ad3564332aa56cea84123fc7ca79ea70bb4fef2009fa131cb44e4b15e8613bd11ca1d83b9d9bf456e4b7fee9f2e8b017
-8c530b84001936d5ab366c84c0b105241a26d1fb163669f17c8f2e94776895c2870edf3e1bc8ccd04d5e65531471f695
-932d01fa174fdb0c366f1230cffde2571cc47485f37f23ba5a1825532190cc3b722aeb1f15aed62cf83ccae9403ba713
-88b28c20585aca50d10752e84b901b5c2d58efef5131479fbbe53de7bce2029e1423a494c0298e1497669bd55be97a5d
-b914148ca717721144ebb3d3bf3fcea2cd44c30c5f7051b89d8001502f3856fef30ec167174d5b76265b55d70f8716b5
-81d0173821c6ddd2a068d70766d9103d1ee961c475156e0cbd67d54e668a796310474ef698c7ab55abe6f2cf76c14679
-8f28e8d78e2fe7fa66340c53718e0db4b84823c8cfb159c76eac032a62fb53da0a5d7e24ca656cf9d2a890cb2a216542
-8a26360335c73d1ab51cec3166c3cf23b9ea51e44a0ad631b0b0329ef55aaae555420348a544e18d5760969281759b61
-94f326a32ed287545b0515be9e08149eb0a565025074796d72387cc3a237e87979776410d78339e23ef3172ca43b2544
-a785d2961a2fa5e70bffa137858a92c48fe749fee91b02599a252b0cd50d311991a08efd7fa5e96b78d07e6e66ffe746
-94af9030b5ac792dd1ce517eaadcec1482206848bea4e09e55cc7f40fd64d4c2b3e9197027c5636b70d6122c51d2235d
-9722869f7d1a3992850fe7be405ec93aa17dc4d35e9e257d2e469f46d2c5a59dbd504056c85ab83d541ad8c13e8bcd54
-b13c4088b61a06e2c03ac9813a75ff1f68ffdfee9df6a8f65095179a475e29cc49119cad2ce05862c3b1ac217f3aace9
-8c64d51774753623666b10ca1b0fe63ae42f82ed6aa26b81dc1d48c86937c5772eb1402624c52a154b86031854e1fb9f
-b47e4df18002b7dac3fee945bf9c0503159e1b8aafcce2138818e140753011b6d09ef1b20894e08ba3006b093559061b
-93cb5970076522c5a0483693f6a35ffd4ea2aa7aaf3730c4eccd6af6d1bebfc1122fc4c67d53898ae13eb6db647be7e2
-a68873ef80986795ea5ed1a597d1cd99ed978ec25e0abb57fdcc96e89ef0f50aeb779ff46e3dce21dc83ada3157a8498
-8cab67f50949cc8eee6710e27358aea373aae3c92849f8f0b5531c080a6300cdf2c2094fe6fecfef6148de0d28446919
-993e932bcb616dbaa7ad18a4439e0565211d31071ef1b85a0627db74a05d978c60d507695eaeea5c7bd9868a21d06923
-acdadff26e3132d9478a818ef770e9fa0d2b56c6f5f48bd3bd674436ccce9bdfc34db884a73a30c04c5f5e9764cb2218
-a0d3e64c9c71f84c0eef9d7a9cb4fa184224b969db5514d678e93e00f98b41595588ca802643ea225512a4a272f5f534
-91c9140c9e1ba6e330cb08f6b2ce4809cd0d5a0f0516f70032bf30e912b0ed684d07b413b326ab531ee7e5b4668c799b
-87bc2ee7a0c21ba8334cd098e35cb703f9af57f35e091b8151b9b63c3a5b0f89bd7701dbd44f644ea475901fa6d9ef08
-9325ccbf64bf5d71b303e31ee85d486298f9802c5e55b2c3d75427097bf8f60fa2ab4fcaffa9b60bf922c3e24fbd4b19
-95d0506e898318f3dc8d28d16dfd9f0038b54798838b3c9be2a2ae3c2bf204eb496166353fc042220b0bd4f6673b9285
-811de529416331fe9c416726d45df9434c29dcd7e949045eb15740f47e97dde8f31489242200e19922cac2a8b7c6fd1f
-ade632d04a4c8bbab6ca7df370b2213cb9225023e7973f0e29f4f5e52e8aeaabc65171306bbdd12a67b195dfbb96d48f
-88b7f029e079b6ae956042c0ea75d53088c5d0efd750dd018adaeacf46be21bf990897c58578c491f41afd3978d08073
-91f477802de507ffd2be3f4319903119225b277ad24f74eb50f28b66c14d32fae53c7edb8c7590704741af7f7f3e3654
-809838b32bb4f4d0237e98108320d4b079ee16ed80c567e7548bd37e4d7915b1192880f4812ac0e00476d246aec1dbc8
-84183b5fc4a7997a8ae5afedb4d21dce69c480d5966b5cbdafd6dd10d29a9a6377f3b90ce44da0eb8b176ac3af0253bb
-8508abbf6d3739a16b9165caf0f95afb3b3ac1b8c38d6d374cf0c91296e2c1809a99772492b539cda184510bce8a0271
-8722054e59bab2062e6419a6e45fc803af77fde912ef2cd23055ad0484963de65a816a2debe1693d93c18218d2b8e81a
-8e895f80e485a7c4f56827bf53d34b956281cdc74856c21eb3b51f6288c01cc3d08565a11cc6f3e2604775885490e8c5
-afc92714771b7aa6e60f3aee12efd9c2595e9659797452f0c1e99519f67c8bc3ac567119c1ddfe82a3e961ee9defea9a
-818ff0fd9cefd32db87b259e5fa32967201016fc02ef44116cdca3c63ce5e637756f60477a408709928444a8ad69c471
-8251e29af4c61ae806fc5d032347fb332a94d472038149225298389495139ce5678fae739d02dfe53a231598a992e728
-a0ea39574b26643f6f1f48f99f276a8a64b5481989cfb2936f9432a3f8ef5075abfe5c067dc5512143ce8bf933984097
-af67a73911b372bf04e57e21f289fc6c3dfac366c6a01409b6e76fea4769bdb07a6940e52e8d7d3078f235c6d2f632c6
-b5291484ef336024dd2b9b4cf4d3a6b751133a40656d0a0825bcc6d41c21b1c79cb50b0e8f4693f90c29c8f4358641f9
-8bc0d9754d70f2cb9c63f991902165a87c6535a763d5eece43143b5064ae0bcdce7c7a8f398f2c1c29167b2d5a3e6867
-8d7faff53579ec8f6c92f661c399614cc35276971752ce0623270f88be937c414eddcb0997e14724a783905a026c8883
-9310b5f6e675fdf60796f814dbaa5a6e7e9029a61c395761e330d9348a7efab992e4e115c8be3a43d08e90d21290c892
-b5eb4f3eb646038ad2a020f0a42202532d4932e766da82b2c1002bf9c9c2e5336b54c8c0ffcc0e02d19dde2e6a35b6cc
-91dabfd30a66710f1f37a891136c9be1e23af4abf8cb751f512a40c022a35f8e0a4fb05b17ec36d4208de02d56f0d53a
-b3ded14e82d62ac7a5a036122a62f00ff8308498f3feae57d861babaff5a6628d43f0a0c5fc903f10936bcf4e2758ceb
-a88e8348fed2b26acca6784d19ef27c75963450d99651d11a950ea81d4b93acd2c43e0ecce100eaf7e78508263d5baf3
-b1f5bbf7c4756877b87bb42163ac570e08c6667c4528bf68b5976680e19beeff7c5effd17009b0718797077e2955457a
-ad2e7b516243f915d4d1415326e98b1a7390ae88897d0b03b66c2d9bd8c3fba283d7e8fe44ed3333296a736454cef6d8
-8f82eae096d5b11f995de6724a9af895f5e1c58d593845ad16ce8fcae8507e0d8e2b2348a0f50a1f66a17fd6fac51a5c
-890e4404d0657c6c1ee14e1aac132ecf7a568bb3e04137b85ac0f84f1d333bd94993e8750f88eee033a33fb00f85dcc7
-82ac7d3385e035115f1d39a99fc73e5919de44f5e6424579776d118d711c8120b8e5916372c6f27bed4cc64cac170b6c
-85ee16d8901c272cfbbe966e724b7a891c1bd5e68efd5d863043ad8520fc409080af61fd726adc680b3f1186fe0ac8b8
-86dc564c9b545567483b43a38f24c41c6551a49cabeebb58ce86404662a12dbfafd0778d30d26e1c93ce222e547e3898
-a29f5b4522db26d88f5f95f18d459f8feefab02e380c2edb65aa0617a82a3c1a89474727a951cef5f15050bcf7b380fb
-a1ce039c8f6cac53352899edb0e3a72c76da143564ad1a44858bd7ee88552e2fe6858d1593bbd74aeee5a6f8034b9b9d
-97f10d77983f088286bd7ef3e7fdd8fa275a56bec19919adf33cf939a90c8f2967d2b1b6fc51195cb45ad561202a3ed7
-a25e2772e8c911aaf8712bdac1dd40ee061c84d3d224c466cfaae8e5c99604053f940cde259bd1c3b8b69595781dbfec
-b31bb95a0388595149409c48781174c340960d59032ab2b47689911d03c68f77a2273576fbe0c2bf4553e330656058c7
-b8b2e9287ad803fb185a13f0d7456b397d4e3c8ad5078f57f49e8beb2e85f661356a3392dbd7bcf6a900baa5582b86a1
-a3d0893923455eb6e96cc414341cac33d2dbc88fba821ac672708cce131761d85a0e08286663a32828244febfcae6451
-82310cb42f647d99a136014a9f881eb0b9791efd2e01fc1841907ad3fc8a9654d3d1dab6689c3607214b4dc2aca01cee
-874022d99c16f60c22de1b094532a0bc6d4de700ad01a31798fac1d5088b9a42ad02bef8a7339af7ed9c0d4f16b186ee
-94981369e120265aed40910eebc37eded481e90f4596b8d57c3bec790ab7f929784bd33ddd05b7870aad6c02e869603b
-a4f1f50e1e2a73f07095e0dd31cb45154f24968dae967e38962341c1241bcd473102fff1ff668b20c6547e9732d11701
-ae2328f3b0ad79fcda807e69a1b5278145225083f150f67511dafc97e079f860c3392675f1752ae7e864c056e592205b
-875d8c971e593ca79552c43d55c8c73b17cd20c81ff2c2fed1eb19b1b91e4a3a83d32df150dbfd5db1092d0aebde1e1f
-add2e80aa46aae95da73a11f130f4bda339db028e24c9b11e5316e75ba5e63bc991d2a1da172c7c8e8fee038baae3433
-b46dbe1cb3424002aa7de51e82f600852248e251465c440695d52538d3f36828ff46c90ed77fc1d11534fe3c487df8ef
-a5e5045d28b4e83d0055863c30c056628c58d4657e6176fd0536f5933f723d60e851bb726d5bf3c546b8ce4ac4a57ef8
-91fec01e86dd1537e498fff7536ea3ca012058b145f29d9ada49370cd7b7193ac380e116989515df1b94b74a55c45df3
-a7428176d6918cd916a310bdc75483c72de660df48cac4e6e7478eef03205f1827ea55afc0df5d5fa7567d14bbea7fc9
-851d89bef45d9761fe5fdb62972209335193610015e16a675149519f9911373bac0919add226ef118d9f3669cfdf4734
-b74acf5c149d0042021cb2422ea022be4c4f72a77855f42393e71ffd12ebb3eec16bdf16f812159b67b79a9706e7156d
-99f35dce64ec99aa595e7894b55ce7b5a435851b396e79036ffb249c28206087db4c85379df666c4d95857db02e21ff9
-b6b9a384f70db9e298415b8ab394ee625dafff04be2886476e59df8d052ca832d11ac68a9b93fba7ab055b7bc36948a4
-898ee4aefa923ffec9e79f2219c7389663eb11eb5b49014e04ed4a336399f6ea1691051d86991f4c46ca65bcd4fdf359
-b0f948217b0d65df7599a0ba4654a5e43c84db477936276e6f11c8981efc6eaf14c90d3650107ed4c09af4cc8ec11137
-aa6286e27ac54f73e63dbf6f41865dd94d24bc0cf732262fcaff67319d162bb43af909f6f8ee27b1971939cfbba08141
-8bca7cdf730cf56c7b2c8a2c4879d61361a6e1dba5a3681a1a16c17a56e168ace0e99cf0d15826a1f5e67e6b8a8a049a
-a746d876e8b1ce225fcafca603b099b36504846961526589af977a88c60d31ba2cc56e66a3dec8a77b3f3531bf7524c9
-a11e2e1927e6704cdb8874c75e4f1842cef84d7d43d7a38e339e61dc8ba90e61bbb20dd3c12e0b11d2471d58eed245be
-a36395e22bc1d1ba8b0459a235203177737397da5643ce54ded3459d0869ff6d8d89f50c73cb62394bf66a959cde9b90
-8b49f12ba2fdf9aca7e5f81d45c07d47f9302a2655610e7634d1e4bd16048381a45ef2c95a8dd5b0715e4b7cf42273af
-91cffa2a17e64eb7f76bccbe4e87280ee1dd244e04a3c9eac12e15d2d04845d876eb24fe2ec6d6d266cce9efb281077f
-a6b8afabf65f2dee01788114e33a2f3ce25376fb47a50b74da7c3c25ff1fdc8aa9f41307534abbf48acb6f7466068f69
-8d13db896ccfea403bd6441191995c1a65365cab7d0b97fbe9526da3f45a877bd1f4ef2edef160e8a56838cd1586330e
-98c717de9e01bef8842c162a5e757fe8552d53269c84862f4d451e7c656ae6f2ae473767b04290b134773f63be6fdb9d
-8c2036ace1920bd13cf018e82848c49eb511fad65fd0ff51f4e4b50cf3bfc294afb63cba682c16f52fb595a98fa84970
-a3520fdff05dbad9e12551b0896922e375f9e5589368bcb2cc303bde252743b74460cb5caf99629325d3620f13adc796
-8d4f83a5bfec05caf5910e0ce538ee9816ee18d0bd44c1d0da2a87715a23cd2733ad4d47552c6dc0eb397687d611dd19
-a7b39a0a6a02823452d376533f39d35029867b3c9a6ad6bca181f18c54132d675613a700f9db2440fb1b4fa13c8bf18a
-80bcb114b2544b80f404a200fc36860ed5e1ad31fe551acd4661d09730c452831751baa9b19d7d311600d267086a70bc
-90dcce03c6f88fc2b08f2b42771eedde90cc5330fe0336e46c1a7d1b5a6c1641e5fcc4e7b3d5db00bd8afca9ec66ed81
-aec15f40805065c98e2965b1ae12a6c9020cfdb094c2d0549acfc7ea2401a5fb48d3ea7d41133cf37c4e096e7ff53eb9
-80e129b735dba49fa627a615d6c273119acec8e219b2f2c4373a332b5f98d66cbbdd688dfbe72a8f8bfefaccc02c50c1
-a9b596da3bdfe23e6799ece5f7975bf7a1979a75f4f546deeaf8b34dfe3e0d623217cb4cf4ccd504cfa3625b88cd53f1
-abcbbb70b16f6e517c0ab4363ab76b46e4ff58576b5f8340e5c0e8cc0e02621b6e23d742d73b015822a238b17cfd7665
-a046937cc6ea6a2e1adae543353a9fe929c1ae4ad655be1cc051378482cf88b041e28b1e9a577e6ccff2d3570f55e200
-831279437282f315e65a60184ef158f0a3dddc15a648dc552bdc88b3e6fe8288d3cfe9f0031846d81350f5e7874b4b33
-993d7916fa213c6d66e7c4cafafc1eaec9a2a86981f91c31eb8a69c5df076c789cbf498a24c84e0ee77af95b42145026
-823907a3b6719f8d49b3a4b7c181bd9bb29fcf842d7c70660c4f351852a1e197ca46cf5e879b47fa55f616fa2b87ce5e
-8d228244e26132b234930ee14c75d88df0943cdb9c276a8faf167d259b7efc1beec2a87c112a6c608ad1600a239e9aae
-ab6e55766e5bfb0cf0764ed909a8473ab5047d3388b4f46faeba2d1425c4754c55c6daf6ad4751e634c618b53e549529
-ab0cab6860e55a84c5ad2948a7e0989e2b4b1fd637605634b118361497332df32d9549cb854b2327ca54f2bcb85eed8f
-b086b349ae03ef34f4b25a57bcaa5d1b29bd94f9ebf87e22be475adfe475c51a1230c1ebe13506cb72c4186192451658
-8a0b49d8a254ca6d91500f449cbbfbb69bb516c6948ac06808c65595e46773e346f97a5ce0ef7e5a5e0de278af22709c
-ac49de11edaaf04302c73c578cc0824bdd165c0d6321be1c421c1950e68e4f3589aa3995448c9699e93c6ebae8803e27
-884f02d841cb5d8f4c60d1402469216b114ab4e93550b5bc1431756e365c4f870a9853449285384a6fa49e12ce6dc654
-b75f3a28fa2cc8d36b49130cb7448a23d73a7311d0185ba803ad55c8219741d451c110f48b786e96c728bc525903a54f
-80ae04dbd41f4a35e33f9de413b6ad518af0919e5a30cb0fa1b061b260420780bb674f828d37fd3b52b5a31673cbd803
-b9a8011eb5fcea766907029bf743b45262db3e49d24f84503687e838651ed11cb64c66281e20a0ae9f6aa51acc552263
-90bfdd75e2dc9cf013e22a5d55d2d2b8a754c96103a17524488e01206e67f8b6d52b1be8c4e3d5307d4fe06d0e51f54c
-b4af353a19b06203a815ec43e79a88578cc678c46f5a954b85bc5c53b84059dddba731f3d463c23bfd5273885c7c56a4
-aa125e96d4553b64f7140e5453ff5d2330318b69d74d37d283e84c26ad672fa00e3f71e530eb7e28be1e94afb9c4612e
-a18e060aee3d49cde2389b10888696436bb7949a79ca7d728be6456a356ea5541b55492b2138da90108bd1ce0e6f5524
-93e55f92bdbccc2de655d14b1526836ea2e52dba65eb3f87823dd458a4cb5079bf22ce6ef625cb6d6bfdd0995ab9a874
-89f5a683526b90c1c3ceebbb8dc824b21cff851ce3531b164f6626e326d98b27d3e1d50982e507d84a99b1e04e86a915
-83d1c38800361633a3f742b1cb2bfc528129496e80232611682ddbe403e92c2ac5373aea0bca93ecb5128b0b2b7a719e
-8ecba560ac94905e19ce8d9c7af217bf0a145d8c8bd38e2db82f5e94cc3f2f26f55819176376b51f154b4aab22056059
-a7e2a4a002b60291924850642e703232994acb4cfb90f07c94d1e0ecd2257bb583443283c20fc6017c37e6bfe85b7366
-93ed7316fa50b528f1636fc6507683a672f4f4403e55e94663f91221cc198199595bd02eef43d609f451acc9d9b36a24
-a1220a8ebc5c50ceed76a74bc3b7e0aa77f6884c71b64b67c4310ac29ce5526cb8992d6abc13ef6c8413ce62486a6795
-b2f6eac5c869ad7f4a25161d3347093e2f70e66cd925032747e901189355022fab3038bca4d610d2f68feb7e719c110b
-b703fa11a4d511ca01c7462979a94acb40b5d933759199af42670eb48f83df202fa0c943f6ab3b4e1cc54673ea3aab1e
-b5422912afbfcb901f84791b04f1ddb3c3fbdc76d961ee2a00c5c320e06d3cc5b5909c3bb805df66c5f10c47a292b13d
-ad0934368da823302e1ac08e3ede74b05dfdbfffca203e97ffb0282c226814b65c142e6e15ec1e754518f221f01b30f7
-a1dd302a02e37df15bf2f1147efe0e3c06933a5a767d2d030e1132f5c3ce6b98e216b6145eb39e1e2f74e76a83165b8d
-a346aab07564432f802ae44738049a36f7ca4056df2d8f110dbe7fef4a3e047684dea609b2d03dc6bf917c9c2a47608f
-b96c5f682a5f5d02123568e50f5d0d186e4b2c4c9b956ec7aabac1b3e4a766d78d19bd111adb5176b898e916e49be2aa
-8a96676d56876fc85538db2e806e1cba20fd01aeb9fa3cb43ca6ca94a2c102639f65660db330e5d74a029bb72d6a0b39
-ab0048336bd5c3def1a4064eadd49e66480c1f2abb4df46e03afbd8a3342c2c9d74ee35d79f08f4768c1646681440984
-888427bdf76caec90814c57ee1c3210a97d107dd88f7256f14f883ad0f392334b82be11e36dd8bfec2b37935177c7831
-b622b282becf0094a1916fa658429a5292ba30fb48a4c8066ce1ddcefb71037948262a01c95bab6929ed3a76ba5db9fe
-b5b9e005c1f456b6a368a3097634fb455723abe95433a186e8278dceb79d4ca2fbe21f8002e80027b3c531e5bf494629
-a3c6707117a1e48697ed41062897f55d8119403eea6c2ee88f60180f6526f45172664bfee96bf61d6ec0b7fbae6aa058
-b02a9567386a4fbbdb772d8a27057b0be210447348efe6feb935ceec81f361ed2c0c211e54787dc617cdffed6b4a6652
-a9b8364e40ef15c3b5902e5534998997b8493064fa2bea99600def58279bb0f64574c09ba11e9f6f669a8354dd79dc85
-9998a2e553a9aa9a206518fae2bc8b90329ee59ab23005b10972712389f2ec0ee746033c733092ffe43d73d33abbb8ef
-843a4b34d9039bf79df96d79f2d15e8d755affb4d83d61872daf540b68c0a3888cf8fc00d5b8b247b38524bcb3b5a856
-84f7128920c1b0bb40eee95701d30e6fc3a83b7bb3709f16d97e72acbb6057004ee7ac8e8f575936ca9dcb7866ab45f7
-918d3e2222e10e05edb34728162a899ad5ada0aaa491aeb7c81572a9c0d506e31d5390e1803a91ff3bd8e2bb15d47f31
-9442d18e2489613a7d47bb1cb803c8d6f3259d088cd079460976d87f7905ee07dea8f371b2537f6e1d792d36d7e42723
-b491976970fe091995b2ed86d629126523ccf3e9daf8145302faca71b5a71a5da92e0e05b62d7139d3efac5c4e367584
-aa628006235dc77c14cef4c04a308d66b07ac92d377df3de1a2e6ecfe3144f2219ad6d7795e671e1cb37a3641910b940
-99d386adaea5d4981d7306feecac9a555b74ffdc218c907c5aa7ac04abaead0ec2a8237300d42a3fbc464673e417ceed
-8f78e8b1556f9d739648ea3cab9606f8328b52877fe72f9305545a73b74d49884044ba9c1f1c6db7d9b7c7b7c661caba
-8fb357ae49932d0babdf74fc7aa7464a65d3b6a2b3acf4f550b99601d3c0215900cfd67f2b6651ef94cfc323bac79fae
-9906f2fa25c0290775aa001fb6198113d53804262454ae8b83ef371b5271bde189c0460a645829cb6c59f9ee3a55ce4d
-8f4379b3ebb50e052325b27655ca6a82e6f00b87bf0d2b680d205dd2c7afdc9ff32a9047ae71a1cdf0d0ce6b9474d878
-a85534e88c2bd43c043792eaa75e50914b21741a566635e0e107ae857aed0412035f7576cf04488ade16fd3f35fdbb87
-b4ce93199966d3c23251ca7f28ec5af7efea1763d376b0385352ffb2e0a462ef95c69940950278cf0e3dafd638b7bd36
-b10cb3d0317dd570aa73129f4acf63c256816f007607c19b423fb42f65133ce21f2f517e0afb41a5378cccf893ae14d0
-a9b231c9f739f7f914e5d943ed9bff7eba9e2c333fbd7c34eb1648a362ee01a01af6e2f7c35c9fe962b11152cddf35de
-99ff6a899e156732937fb81c0cced80ae13d2d44c40ba99ac183aa246103b31ec084594b1b7feb96da58f4be2dd5c0ed
-8748d15d18b75ff2596f50d6a9c4ce82f61ecbcee123a6ceae0e43cab3012a29b6f83cf67b48c22f6f9d757c6caf76b2
-b88ab05e4248b7fb634cf640a4e6a945d13e331237410f7217d3d17e3e384ddd48897e7a91e4516f1b9cbd30f35f238b
-8d826deaeeb84a3b2d2c04c2300ca592501f992810582d6ae993e0d52f6283a839dba66c6c72278cff5871802b71173b
-b36fed027c2f05a5ef625ca00b0364b930901e9e4420975b111858d0941f60e205546474bb25d6bfa6928d37305ae95f
-af2fcfc6b87967567e8b8a13a4ed914478185705724e56ce68fb2df6d1576a0cf34a61e880997a0d35dc2c3276ff7501
-ac351b919cd1fbf106feb8af2c67692bfcddc84762d18cea681cfa7470a5644839caace27efee5f38c87d3df306f4211
-8d6665fb1d4d8d1fa23bd9b8a86e043b8555663519caac214d1e3e3effbc6bee7f2bcf21e645f77de0ced279d69a8a8b
-a9fc1c2061756b2a1a169c1b149f212ff7f0d2488acd1c5a0197eba793cffa593fc6d1d1b40718aa75ca3ec77eff10e1
-aff64f0fa009c7a6cf0b8d7a22ddb2c8170c3cb3eec082e60d5aadb00b0040443be8936d728d99581e33c22178c41c87
-82e0b181adc5e3b1c87ff8598447260e839d53debfae941ebea38265575546c3a74a14b4325a030833a62ff6c52d9365
-b7ad43cbb22f6f892c2a1548a41dc120ab1f4e1b8dea0cb6272dd9cb02054c542ecabc582f7e16de709d48f5166cae86
-985e0c61094281532c4afb788ecb2dfcba998e974b5d4257a22040a161883908cdd068fe80f8eb49b8953cfd11acf43a
-ae46895c6d67ea6d469b6c9c07b9e5d295d9ae73b22e30da4ba2c973ba83a130d7eef39717ec9d0f36e81d56bf742671
-8600177ea1f7e7ef90514b38b219a37dedfc39cb83297e4c7a5b479817ef56479d48cf6314820960c751183f6edf8b0e
-b9208ec1c1d7a1e99b59c62d3e4e61dfb706b0e940d09d3abfc3454c19749083260614d89cfd7e822596c3cdbcc6bb95
-a1e94042c796c2b48bc724352d2e9f3a22291d9a34705993357ddb6adabd76da6fc25dac200a8cb0b5bbd99ecddb7af6
-b29c3adedd0bcad8a930625bc4dfdc3552a9afd5ca6dd9c0d758f978068c7982b50b711aa0eb5b97f2b84ee784637835
-af0632a238bb1f413c7ea8e9b4c3d68f2827bd2e38cd56024391fba6446ac5d19a780d0cfd4a78fe497d537b766a591a
-aaf6e7f7d54f8ef5e2e45dd59774ecbeecf8683aa70483b2a75be6a6071b5981bbaf1627512a65d212817acdfab2e428
-8c751496065da2e927cf492aa5ca9013b24f861d5e6c24b30bbf52ec5aaf1905f40f9a28175faef283dd4ed4f2182a09
-8952377d8e80a85cf67d6b45499f3bad5fd452ea7bcd99efc1b066c4720d8e5bff1214cea90fd1f972a7f0baac3d29be
-a1946ee543d1a6e21f380453be4d446e4130950c5fc3d075794eb8260f6f52d0a795c1ff91d028a648dc1ce7d9ab6b47
-89f3fefe37af31e0c17533d2ca1ce0884cc1dc97c15cbfab9c331b8debd94781c9396abef4bb2f163d09277a08d6adf0
-a2753f1e6e1a154fb117100a5bd9052137add85961f8158830ac20541ab12227d83887d10acf7fd36dcaf7c2596d8d23
-814955b4198933ee11c3883863b06ff98c7eceb21fc3e09df5f916107827ccf3323141983e74b025f46ae00284c9513b
-8cc5c6bb429073bfef47cae7b3bfccb0ffa076514d91a1862c6bda4d581e0df87db53cc6c130bf8a7826304960f5a34e
-909f22c1f1cdc87f7be7439c831a73484a49acbf8f23d47087d7cf867c64ef61da3bde85dc57d705682b4c3fc710d36e
-8048fee7f276fcd504aed91284f28e73693615e0eb3858fa44bcf79d7285a9001c373b3ef71d9a3054817ba293ebe28c
-94400e5cf5d2700ca608c5fe35ce14623f71cc24959f2bc27ca3684092850f76b67fb1f07ca9e5b2ca3062cf8ad17bd4
-81c2ae7d4d1b17f8b6de6a0430acc0d58260993980fe48dc2129c4948269cdc74f9dbfbf9c26b19360823fd913083d48
-8c41fe765128e63f6889d6a979f6a4342300327c8b245a8cfe3ecfbcac1e09c3da30e2a1045b24b78efc6d6d50c8c6ac
-a5dd4ae51ae48c8be4b218c312ade226cffce671cf121cb77810f6c0990768d6dd767badecb5c69921d5574d5e8433d3
-b7642e325f4ba97ae2a39c1c9d97b35aafd49d53dba36aed3f3cb0ca816480b3394079f46a48252d46596559c90f4d58
-ae87375b40f35519e7bd4b1b2f73cd0b329b0c2cb9d616629342a71c6c304338445eda069b78ea0fbe44087f3de91e09
-b08918cb6f736855e11d3daca1ddfbdd61c9589b203b5493143227bf48e2c77c2e8c94b0d1aa2fab2226e0eae83f2681
-ac36b84a4ac2ebd4d6591923a449c564e3be8a664c46092c09e875c2998eba16b5d32bfd0882fd3851762868e669f0b1
-a44800a3bb192066fa17a3f29029a23697240467053b5aa49b9839fb9b9b8b12bcdcbfc557f024b61f4f51a9aacdefcb
-9064c688fec23441a274cdf2075e5a449caf5c7363cc5e8a5dc9747183d2e00a0c69f2e6b3f6a7057079c46014c93b3b
-aa367b021469af9f5b764a79bb3afbe2d87fe1e51862221672d1a66f954b165778b7c27a705e0f93841fab4c8468344d
-a1a8bfc593d4ab71f91640bc824de5c1380ab2591cfdafcbc78a14b32de3c0e15f9d1b461d85c504baa3d4232c16bb53
-97df48da1799430f528184d30b6baa90c2a2f88f34cdfb342d715339c5ebd6d019aa693cea7c4993daafc9849063a3aa
-abd923831fbb427e06e0dd335253178a9e5791395c84d0ab1433c07c53c1209161097e9582fb8736f8a60bde62d8693e
-84cd1a43f1a438b43dc60ffc775f646937c4f6871438163905a3cebf1115f814ccd38a6ccb134130bff226306e412f32
-91426065996b0743c5f689eb3ca68a9f7b9e4d01f6c5a2652b57fa9a03d8dc7cd4bdbdab0ca5a891fee1e97a7f00cf02
-a4bee50249db3df7fd75162b28f04e57c678ba142ce4d3def2bc17bcb29e4670284a45f218dad3969af466c62a903757
-83141ebcc94d4681404e8b67a12a46374fded6df92b506aff3490d875919631408b369823a08b271d006d5b93136f317
-a0ea1c8883d58d5a784da3d8c8a880061adea796d7505c1f903d07c287c5467f71e4563fc0faafbc15b5a5538b0a7559
-89d9d480574f201a87269d26fb114278ed2c446328df431dc3556e3500e80e4cd01fcac196a2459d8646361ebda840df
-8bf302978973632dd464bec819bdb91304712a3ec859be071e662040620422c6e75eba6f864f764cffa2799272efec39
-922f666bc0fd58b6d7d815c0ae4f66d193d32fc8382c631037f59eeaeae9a8ca6c72d08e72944cf9e800b8d639094e77
-81ad8714f491cdff7fe4399f2eb20e32650cff2999dd45b9b3d996d54a4aba24cc6c451212e78c9e5550368a1a38fb3f
-b58fcf4659d73edb73175bd9139d18254e94c3e32031b5d4b026f2ed37aa19dca17ec2eb54c14340231615277a9d347e
-b365ac9c2bfe409b710928c646ea2fb15b28557e0f089d39878e365589b9d1c34baf5566d20bb28b33bb60fa133f6eff
-8fcae1d75b53ab470be805f39630d204853ca1629a14158bac2f52632277d77458dec204ff84b7b2d77e641c2045be65
-a03efa6bebe84f4f958a56e2d76b5ba4f95dd9ed7eb479edc7cc5e646c8d4792e5b0dfc66cc86aa4b4afe2f7a4850760
-af1c823930a3638975fb0cc5c59651771b2719119c3cd08404fbd4ce77a74d708cefbe3c56ea08c48f5f10e6907f338f
-8260c8299b17898032c761c325ac9cabb4c5b7e735de81eacf244f647a45fb385012f4f8df743128888c29aefcaaad16
-ab2f37a573c82e96a8d46198691cd694dfa860615625f477e41f91b879bc58a745784fccd8ffa13065834ffd150d881d
-986c746c9b4249352d8e5c629e8d7d05e716b3c7aab5e529ca969dd1e984a14b5be41528baef4c85d2369a42d7209216
-b25e32da1a8adddf2a6080725818b75bc67240728ad1853d90738485d8924ea1e202df0a3034a60ffae6f965ec55cf63
-a266e627afcebcefea6b6b44cbc50f5c508f7187e87d047b0450871c2a030042c9e376f3ede0afcf9d1952f089582f71
-86c3bbca4c0300606071c0a80dbdec21ce1dd4d8d4309648151c420854032dff1241a1677d1cd5de4e4de4385efda986
-b9a21a1fe2d1f3273a8e4a9185abf2ff86448cc98bfa435e3d68306a2b8b4a6a3ea33a155be3cb62a2170a86f77679a5
-b117b1ea381adce87d8b342cba3a15d492ff2d644afa28f22424cb9cbc820d4f7693dfc1a4d1b3697046c300e1c9b4c8
-9004c425a2e68870d6c69b658c344e3aa3a86a8914ee08d72b2f95c2e2d8a4c7bb0c6e7e271460c0e637cec11117bf8e
-86a18aa4783b9ebd9131580c8b17994825f27f4ac427b0929a1e0236907732a1c8139e98112c605488ee95f48bbefbfc
-84042243b955286482ab6f0b5df4c2d73571ada00716d2f737ca05a0d2e88c6349e8ee9e67934cfee4a1775dbf7f4800
-92c2153a4733a62e4e1d5b60369f3c26777c7d01cd3c8679212660d572bd3bac9b8a8a64e1f10f7dbf5eaa7579c4e423
-918454b6bb8e44a2afa144695ba8d48ae08d0cdfef4ad078f67709eddf3bb31191e8b006f04e82ea45a54715ef4d5817
-acf0b54f6bf34cf6ed6c2b39cf43194a40d68de6bcf1e4b82c34c15a1343e9ac3737885e1a30b78d01fa3a5125463db8
-a7d60dbe4b6a7b054f7afe9ee5cbbfeca0d05dc619e6041fa2296b549322529faddb8a11e949562309aecefb842ac380
-91ffb53e6d7e5f11159eaf13e783d6dbdfdb1698ed1e6dbf3413c6ea23492bbb9e0932230a9e2caac8fe899a17682795
-b6e8d7be5076ee3565d5765a710c5ecf17921dd3cf555c375d01e958a365ae087d4a88da492a5fb81838b7b92bf01143
-a8c6b763de2d4b2ed42102ef64eccfef31e2fb2a8a2776241c82912fa50fc9f77f175b6d109a97ede331307c016a4b1a
-99839f86cb700c297c58bc33e28d46b92931961548deac29ba8df91d3e11721b10ea956c8e16984f9e4acf1298a79b37
-8c2e2c338f25ea5c25756b7131cde0d9a2b35abf5d90781180a00fe4b8e64e62590dc63fe10a57fba3a31c76d784eb01
-9687d7df2f41319ca5469d91978fed0565a5f11f829ebadaa83db92b221755f76c6eacd7700735e75c91e257087512e3
-8795fdfb7ff8439c58b9bf58ed53873d2780d3939b902b9ddaaa4c99447224ced9206c3039a23c2c44bcc461e2bb637f
-a803697b744d2d087f4e2307218d48fa88620cf25529db9ce71e2e3bbcc65bac5e8bb9be04777ef7bfb5ed1a5b8e6170
-80f3d3efbbb9346ddd413f0a8e36b269eb5d7ff6809d5525ff9a47c4bcab2c01b70018b117f6fe05253775612ff70c6b
-9050e0e45bcc83930d4c505af35e5e4d7ca01cd8681cba92eb55821aececcebe32bb692ebe1a4daac4e7472975671067
-8d206812aac42742dbaf233e0c080b3d1b30943b54b60283515da005de05ea5caa90f91fedcfcba72e922f64d7040189
-a2d44faaeb2eff7915c83f32b13ca6f31a6847b1c1ce114ea240bac3595eded89f09b2313b7915ad882292e2b586d5b4
-961776c8576030c39f214ea6e0a3e8b3d32f023d2600958c098c95c8a4e374deeb2b9dc522adfbd6bda5949bdc09e2a2
-993fa7d8447407af0fbcd9e6d77f815fa5233ab00674efbcf74a1f51c37481445ae291cc7b76db7c178f9cb0e570e0fc
-abd5b1c78e05f9d7c8cc99bdaef8b0b6a57f2daf0f02bf492bec48ea4a27a8f1e38b5854da96efff11973326ff980f92
-8f15af4764bc275e6ccb892b3a4362cacb4e175b1526a9a99944e692fe6ccb1b4fc19abf312bb2a089cb1f344d91a779
-a09b27ccd71855512aba1d0c30a79ffbe7f6707a55978f3ced50e674b511a79a446dbc6d7946add421ce111135a460af
-94b2f98ce86a9271fbd4153e1fc37de48421fe3490fb3840c00f2d5a4d0ba8810c6a32880b002f6374b59e0a7952518b
-8650ac644f93bbcb88a6a0f49fee2663297fd4bc6fd47b6a89b9d8038d32370438ab3a4775ec9b58cb10aea8a95ef7b6
-95e5c2f2e84eed88c6980bbba5a1c0bb375d5a628bff006f7516d45bb7d723da676add4fdd45956f312e7bab0f052644
-b3278a3fa377ac93af7cfc9453f8cb594aae04269bbc99d2e0e45472ff4b6a2f97a26c4c57bf675b9d86f5e77a5d55d1
-b4bcbe6eb666a206e2ea2f877912c1d3b5bdbd08a989fc4490eb06013e1a69ad1ba08bcdac048bf29192312be399077b
-a76d70b78c99fffcbf9bb9886eab40f1ea4f99a309710b660b64cbf86057cbcb644d243f6e341711bb7ef0fedf0435a7
-b2093c1ee945dca7ac76ad5aed08eae23af31dd5a77c903fd7b6f051f4ab84425d33a03c3d45bf2907bc93c02d1f3ad8
-904b1f7534e053a265b22d20be859912b9c9ccb303af9a8d6f1d8f6ccdc5c53eb4a45a1762b880d8444d9be0cd55e7f9
-8f664a965d65bc730c9ef1ec7467be984d4b8eb46bd9b0d64e38e48f94e6e55dda19aeac82cbcf4e1473440e64c4ca18
-8bcee65c4cc7a7799353d07b114c718a2aae0cd10a3f22b7eead5185d159dafd64852cb63924bf87627d176228878bce
-8c78f2e3675096fef7ebaa898d2615cd50d39ca3d8f02b9bdfb07e67da648ae4be3da64838dffc5935fd72962c4b96c7
-8c40afd3701629421fec1df1aac4e849384ef2e80472c0e28d36cb1327acdf2826f99b357f3d7afdbc58a6347fc40b3c
-a197813b1c65a8ea5754ef782522a57d63433ef752215ecda1e7da76b0412ee619f58d904abd2e07e0c097048b6ae1dd
-a670542629e4333884ad7410f9ea3bd6f988df4a8f8a424ca74b9add2312586900cf9ae8bd50411f9146e82626b4af56
-a19875cc07ab84e569d98b8b67fb1dbbdfb59093c7b748fae008c8904a6fd931a63ca8d03ab5fea9bc8d263568125a9b
-b57e7f68e4eb1bd04aafa917b1db1bdab759a02aa8a9cdb1cba34ba8852b5890f655645c9b4e15d5f19bf37e9f2ffe9f
-8abe4e2a4f6462b6c64b3f10e45db2a53c2b0d3c5d5443d3f00a453e193df771eda635b098b6c8604ace3557514027af
-8459e4fb378189b22b870a6ef20183deb816cefbf66eca1dc7e86d36a2e011537db893729f500dc154f14ce24633ba47
-930851df4bc7913c0d8c0f7bd3b071a83668987ed7c397d3d042fdc0d9765945a39a3bae83da9c88cb6b686ed8aeeb26
-8078c9e5cd05e1a8c932f8a1d835f61a248b6e7133fcbb3de406bf4ffc0e584f6f9f95062740ba6008d98348886cf76b
-addff62bb29430983fe578e3709b0949cdc0d47a13a29bc3f50371a2cb5c822ce53e2448cfaa01bcb6e0aa850d5a380e
-9433add687b5a1e12066721789b1db2edf9b6558c3bdc0f452ba33b1da67426abe326e9a34d207bfb1c491c18811bde1
-822beda3389963428cccc4a2918fa9a8a51cf0919640350293af70821967108cded5997adae86b33cb917780b097f1ca
-a7a9f52bda45e4148ed56dd176df7bd672e9b5ed18888ccdb405f47920fdb0844355f8565cefb17010b38324edd8315f
-b35c3a872e18e607b2555c51f9696a17fa18da1f924d503b163b4ec9fe22ed0c110925275cb6c93ce2d013e88f173d6a
-adf34b002b2b26ab84fc1bf94e05bd8616a1d06664799ab149363c56a6e0c807fdc473327d25632416e952ea327fcd95
-ae4a6b9d22a4a3183fac29e2551e1124a8ce4a561a9a2afa9b23032b58d444e6155bb2b48f85c7b6d70393274e230db7
-a2ea3be4fc17e9b7ce3110284038d46a09e88a247b6971167a7878d9dcf36925d613c382b400cfa4f37a3ebea3699897
-8e5863786b641ce3140fbfe37124d7ad3925472e924f814ebfc45959aaf3f61dc554a597610b5defaecc85b59a99b50f
-aefde3193d0f700d0f515ab2aaa43e2ef1d7831c4f7859f48e52693d57f97fa9e520090f3ed700e1c966f4b76048e57f
-841a50f772956622798e5cd208dc7534d4e39eddee30d8ce133383d66e5f267e389254a0cdae01b770ecd0a9ca421929
-8fbc2bfd28238c7d47d4c03b1b910946c0d94274a199575e5b23242619b1de3497784e646a92aa03e3e24123ae4fcaba
-926999579c8eec1cc47d7330112586bdca20b4149c8b2d066f527c8b9f609e61ce27feb69db67eea382649c6905efcf9
-b09f31f305efcc65589adf5d3690a76cf339efd67cd43a4e3ced7b839507466e4be72dd91f04e89e4bbef629d46e68c0
-b917361f6b95f759642638e0b1d2b3a29c3bdef0b94faa30de562e6078c7e2d25976159df3edbacbf43614635c2640b4
-8e7e8a1253bbda0e134d62bfe003a2669d471b47bd2b5cde0ff60d385d8e62279d54022f5ac12053b1e2d3aaa6910b4c
-b69671a3c64e0a99d90b0ed108ce1912ff8ed983e4bddd75a370e9babde25ee1f5efb59ec707edddd46793207a8b1fe7
-910b2f4ebd37b7ae94108922b233d0920b4aba0bd94202c70f1314418b548d11d8e9caa91f2cd95aff51b9432d122b7f
-82f645c90dfb52d195c1020346287c43a80233d3538954548604d09fbab7421241cde8593dbc4acc4986e0ea39a27dd9
-8fee895f0a140d88104ce442fed3966f58ff9d275e7373483f6b4249d64a25fb5374bbdc6bce6b5ab0270c2847066f83
-84f5bd7aab27b2509397aeb86510dd5ac0a53f2c8f73799bf720f2f87a52277f8d6b0f77f17bc80739c6a7119b7eb062
-9903ceced81099d7e146e661bcf01cbaccab5ba54366b85e2177f07e2d8621e19d9c9c3eee14b9266de6b3f9b6ea75ae
-b9c16ea2a07afa32dd6c7c06df0dec39bca2067a9339e45475c98917f47e2320f6f235da353fd5e15b477de97ddc68dd
-9820a9bbf8b826bec61ebf886de2c4f404c1ebdc8bab82ee1fea816d9de29127ce1852448ff717a3fe8bbfe9e92012e5
-817224d9359f5da6f2158c2c7bf9165501424f063e67ba9859a07ab72ee2ee62eb00ca6da821cfa19065c3282ca72c74
-94b95c465e6cb00da400558a3c60cfec4b79b27e602ca67cbc91aead08de4b6872d8ea096b0dc06dca4525c8992b8547
-a2b539a5bccd43fa347ba9c15f249b417997c6a38c63517ca38394976baa08e20be384a360969ff54e7e721db536b3e5
-96caf707e34f62811ee8d32ccf28d8d6ec579bc33e424d0473529af5315c456fd026aa910c1fed70c91982d51df7d3ca
-8a77b73e890b644c6a142bdbac59b22d6a676f3b63ddafb52d914bb9d395b8bf5aedcbcc90429337df431ebd758a07a6
-8857830a7351025617a08bc44caec28d2fae07ebf5ffc9f01d979ce2a53839a670e61ae2783e138313929129790a51a1
-aa3e420321ed6f0aa326d28d1a10f13facec6f605b6218a6eb9cbc074801f3467bf013a456d1415a5536f12599efa3d3
-824aed0951957b00ea2f3d423e30328a3527bf6714cf9abbae84cf27e58e5c35452ba89ccc011de7c68c75d6e021d8f1
-a2e87cc06bf202e953fb1081933d8b4445527dde20e38ed1a4f440144fd8fa464a2b73e068b140562e9045e0f4bd3144
-ae3b8f06ad97d7ae3a5e5ca839efff3e4824dc238c0c03fc1a8d2fc8aa546cdfd165b784a31bb4dec7c77e9305b99a4b
-b30c3e12395b1fb8b776f3ec9f87c70e35763a7b2ddc68f0f60a4982a84017f27c891a98561c830038deb033698ed7fc
-874e507757cd1177d0dff0b0c62ce90130324442a33da3b2c8ee09dbca5d543e3ecfe707e9f1361e7c7db641c72794bb
-b53012dd10b5e7460b57c092eaa06d6502720df9edbbe3e3f61a9998a272bf5baaac4a5a732ad4efe35d6fac6feca744
-85e6509d711515534d394e6cacbed6c81da710074d16ef3f4950bf2f578d662a494d835674f79c4d6315bced4defc5f0
-b6132b2a34b0905dcadc6119fd215419a7971fe545e52f48b768006944b4a9d7db1a74b149e2951ea48c083b752d0804
-989867da6415036d19b4bacc926ce6f4df7a556f50a1ba5f3c48eea9cefbb1c09da81481c8009331ee83f0859185e164
-960a6c36542876174d3fbc1505413e29f053ed87b8d38fef3af180491c7eff25200b45dd5fe5d4d8e63c7e8c9c00f4c8
-9040b59bd739d9cc2e8f6e894683429e4e876a8106238689ff4c22770ae5fdae1f32d962b30301fa0634ee163b524f35
-af3fcd0a45fe9e8fe256dc7eab242ef7f582dd832d147444483c62787ac820fafc6ca55d639a73f76bfa5e7f5462ab8f
-b934c799d0736953a73d91e761767fdb78454355c4b15c680ce08accb57ccf941b13a1236980001f9e6195801cffd692
-8871e8e741157c2c326b22cf09551e78da3c1ec0fc0543136f581f1550f8bab03b0a7b80525c1e99812cdbf3a9698f96
-a8a977f51473a91d178ee8cfa45ffef8d6fd93ab1d6e428f96a3c79816d9c6a93cd70f94d4deda0125fd6816e30f3bea
-a7688b3b0a4fc1dd16e8ba6dc758d3cfe1b7cf401c31739484c7fa253cce0967df1b290769bcefc9d23d3e0cb19e6218
-8ae84322662a57c6d729e6ff9d2737698cc2da2daeb1f39e506618750ed23442a6740955f299e4a15dda6db3e534d2c6
-a04a961cdccfa4b7ef83ced17ab221d6a043b2c718a0d6cc8e6f798507a31f10bf70361f70a049bc8058303fa7f96864
-b463e39732a7d9daec8a456fb58e54b30a6e160aa522a18b9a9e836488cce3342bcbb2e1deab0f5e6ec0a8796d77197d
-b1434a11c6750f14018a2d3bcf94390e2948f4f187e93bb22070ca3e5393d339dc328cbfc3e48815f51929465ffe7d81
-84ff81d73f3828340623d7e3345553610aa22a5432217ef0ebd193cbf4a24234b190c65ca0873c22d10ea7b63bd1fbed
-b6fe2723f0c47757932c2ddde7a4f8434f665612f7b87b4009c2635d56b6e16b200859a8ade49276de0ef27a2b6c970a
-9742884ed7cd52b4a4a068a43d3faa02551a424136c85a9313f7cb58ea54c04aa83b0728fd741d1fe39621e931e88f8f
-b7d2d65ea4d1ad07a5dee39e40d6c03a61264a56b1585b4d76fc5b2a68d80a93a42a0181d432528582bf08d144c2d6a9
-88c0f66bada89f8a43e5a6ead2915088173d106c76f724f4a97b0f6758aed6ae5c37c373c6b92cdd4aea8f6261f3a374
-81f9c43582cb42db3900747eb49ec94edb2284999a499d1527f03315fd330e5a509afa3bff659853570e9886aab5b28b
-821f9d27d6beb416abf9aa5c79afb65a50ed276dbda6060103bc808bcd34426b82da5f23e38e88a55e172f5c294b4d40
-8ba307b9e7cb63a6c4f3851b321aebfdb6af34a5a4c3bd949ff7d96603e59b27ff4dc4970715d35f7758260ff942c9e9
-b142eb6c5f846de33227d0bda61d445a7c33c98f0a8365fe6ab4c1fabdc130849be597ef734305894a424ea715372d08
-a732730ae4512e86a741c8e4c87fee8a05ee840fec0e23b2e037d58dba8dde8d10a9bc5191d34d00598941becbbe467f
-adce6f7c30fd221f6b10a0413cc76435c4bb36c2d60bca821e5c67409fe9dbb2f4c36ef85eb3d734695e4be4827e9fd3
-a74f00e0f9b23aff7b2527ce69852f8906dab9d6abe62ecd497498ab21e57542e12af9918d4fd610bb09e10b0929c510
-a593b6b0ef26448ce4eb3ab07e84238fc020b3cb10d542ff4b16d4e2be1bcde3797e45c9cf753b8dc3b0ffdb63984232
-aed3913afccf1aa1ac0eb4980eb8426d0baccebd836d44651fd72af00d09fac488a870223c42aca3ceb39752070405ae
-b2c44c66a5ea7fde626548ba4cef8c8710191343d3dadfd3bb653ce715c0e03056a5303a581d47dde66e70ea5a2d2779
-8e5029b2ccf5128a12327b5103f7532db599846e422531869560ceaff392236434d87159f597937dbf4054f810c114f4
-82beed1a2c4477e5eb39fc5b0e773b30cfec77ef2b1bf17eadaf60eb35b6d0dd9d8cf06315c48d3546badb3f21cd0cca
-90077bd6cc0e4be5fff08e5d07a5a158d36cebd1d1363125bc4fae0866ffe825b26f933d4ee5427ba5cd0c33c19a7b06
-a7ec0d8f079970e8e34f0ef3a53d3e0e45428ddcef9cc776ead5e542ef06f3c86981644f61c5a637e4faf001fb8c6b3e
-ae6d4add6d1a6f90b22792bc9d40723ee6850c27d0b97eefafd5b7fd98e424aa97868b5287cc41b4fbd7023bca6a322c
-831aa917533d077da07c01417feaa1408846363ba2b8d22c6116bb858a95801547dd88b7d7fa1d2e3f0a02bdeb2e103d
-96511b860b07c8a5ed773f36d4aa9d02fb5e7882753bf56303595bcb57e37ccc60288887eb83bef08c657ec261a021a2
-921d2a3e7e9790f74068623de327443666b634c8443aba80120a45bba450df920b2374d96df1ce3fb1b06dd06f8cf6e3
-aa74451d51fe82b4581ead8e506ec6cd881010f7e7dd51fc388eb9a557db5d3c6721f81c151d08ebd9c2591689fbc13e
-a972bfbcf4033d5742d08716c927c442119bdae336bf5dff914523b285ccf31953da2733759aacaa246a9af9f698342c
-ad1fcd0cae0e76840194ce4150cb8a56ebed728ec9272035f52a799d480dfc85840a4d52d994a18b6edb31e79be6e8ad
-a2c69fe1d36f235215432dad48d75887a44c99dfa0d78149acc74087da215a44bdb5f04e6eef88ff7eff80a5a7decc77
-a94ab2af2b6ee1bc6e0d4e689ca45380d9fbd3c5a65b9bd249d266a4d4c07bf5d5f7ef2ae6000623aee64027892bf8fe
-881ec1fc514e926cdc66480ac59e139148ff8a2a7895a49f0dff45910c90cdda97b66441a25f357d6dd2471cddd99bb3
-884e6d3b894a914c8cef946a76d5a0c8351843b2bffa2d1e56c6b5b99c84104381dd1320c451d551c0b966f4086e60f9
-817c6c10ce2677b9fc5223500322e2b880583254d0bb0d247d728f8716f5e05c9ff39f135854342a1afecd9fbdcf7c46
-aaf4a9cb686a14619aa1fc1ac285dd3843ac3dd99f2b2331c711ec87b03491c02f49101046f3c5c538dc9f8dba2a0ac2
-97ecea5ce53ca720b5d845227ae61d70269a2f53540089305c86af35f0898bfd57356e74a8a5e083fa6e1ea70080bd31
-a22d811e1a20a75feac0157c418a4bfe745ccb5d29466ffa854dca03e395b6c3504a734341746b2846d76583a780b32e
-940cbaa0d2b2db94ae96b6b9cf2deefbfd059e3e5745de9aec4a25f0991b9721e5cd37ef71c631575d1a0c280b01cd5b
-ae33cb4951191258a11044682de861bf8d92d90ce751b354932dd9f3913f542b6a0f8a4dc228b3cd9244ac32c4582832
-a580df5e58c4274fe0f52ac2da1837e32f5c9db92be16c170187db4c358f43e5cfdda7c5911dcc79d77a5764e32325f5
-81798178cb9d8affa424f8d3be67576ba94d108a28ccc01d330c51d5a63ca45bb8ca63a2f569b5c5fe1303cecd2d777f
-89975b91b94c25c9c3660e4af4047a8bacf964783010820dbc91ff8281509379cb3b24c25080d5a01174dd9a049118d5
-a7327fcb3710ed3273b048650bde40a32732ef40a7e58cf7f2f400979c177944c8bc54117ba6c80d5d4260801dddab79
-92b475dc8cb5be4b90c482f122a51bcb3b6c70593817e7e2459c28ea54a7845c50272af38119406eaadb9bcb993368d0
-9645173e9ecefc4f2eae8363504f7c0b81d85f8949a9f8a6c01f2d49e0a0764f4eacecf3e94016dd407fc14494fce9f9
-9215fd8983d7de6ae94d35e6698226fc1454977ae58d42d294be9aad13ac821562ad37d5e7ee5cdfe6e87031d45cd197
-810360a1c9b88a9e36f520ab5a1eb8bed93f52deefbe1312a69225c0a08edb10f87cc43b794aced9c74220cefcc57e7d
-ad7e810efd61ed4684aeda9ed8bb02fb9ae4b4b63fda8217d37012b94ff1b91c0087043bfa4e376f961fff030c729f3b
-8b07c95c6a06db8738d10bb03ec11b89375c08e77f0cab7e672ce70b2685667ca19c7e1c8b092821d31108ea18dfd4c7
-968825d025ded899ff7c57245250535c732836f7565eab1ae23ee7e513201d413c16e1ba3f5166e7ac6cf74de8ceef4f
-908243370c5788200703ade8164943ad5f8c458219186432e74dbc9904a701ea307fd9b94976c866e6c58595fd891c4b
-959969d16680bc535cdc6339e6186355d0d6c0d53d7bbfb411641b9bf4b770fd5f575beef5deec5c4fa4d192d455c350
-ad177f4f826a961adeac76da40e2d930748effff731756c797eddc4e5aa23c91f070fb69b19221748130b0961e68a6bb
-82f8462bcc25448ef7e0739425378e9bb8a05e283ce54aae9dbebaf7a3469f57833c9171672ad43a79778366c72a5e37
-a28fb275b1845706c2814d9638573e9bc32ff552ebaed761fe96fdbce70395891ca41c400ae438369264e31a2713b15f
-8a9c613996b5e51dadb587a787253d6081ea446bf5c71096980bf6bd3c4b69905062a8e8a3792de2d2ece3b177a71089
-8d5aefef9f60cb27c1db2c649221204dda48bb9bf8bf48f965741da051340e8e4cab88b9d15c69f3f84f4c854709f48a
-93ebf2ca6ad85ab6deace6de1a458706285b31877b1b4d7dcb9d126b63047efaf8c06d580115ec9acee30c8a7212fa55
-b3ee46ce189956ca298057fa8223b7fd1128cf52f39159a58bca03c71dd25161ac13f1472301f72aef3e1993fe1ab269
-a24d7a8d066504fc3f5027ccb13120e2f22896860e02c45b5eba1dbd512d6a17c28f39155ea581619f9d33db43a96f92
-ae9ceacbfe12137db2c1a271e1b34b8f92e4816bad1b3b9b6feecc34df0f8b3b0f7ed0133acdf59c537d43d33fc8d429
-83967e69bf2b361f86361bd705dce0e1ad26df06da6c52b48176fe8dfcbeb03c462c1a4c9e649eff8c654b18c876fdef
-9148e6b814a7d779c19c31e33a068e97b597de1f8100513db3c581190513edc4d544801ce3dd2cf6b19e0cd6daedd28a
-94ccdafc84920d320ed22de1e754adea072935d3c5f8c2d1378ebe53d140ea29853f056fb3fb1e375846061a038cc9bc
-afb43348498c38b0fa5f971b8cdd3a62c844f0eb52bc33daf2f67850af0880fce84ecfb96201b308d9e6168a0d443ae3
-86d5736520a83538d4cd058cc4b4e84213ed00ebd6e7af79ae787adc17a92ba5359e28ba6c91936d967b4b28d24c3070
-b5210c1ff212c5b1e9ef9126e08fe120a41e386bb12c22266f7538c6d69c7fd8774f11c02b81fd4e88f9137b020801fe
-b78cfd19f94d24e529d0f52e18ce6185cb238edc6bd43086270fd51dd99f664f43dd4c7d2fe506762fbd859028e13fcf
-a6e7220598c554abdcc3fdc587b988617b32c7bb0f82c06205467dbedb58276cc07cae317a190f19d19078773f4c2bbb
-b88862809487ee430368dccd85a5d72fa4d163ca4aad15c78800e19c1a95be2192719801e315d86cff7795e0544a77e4
-87ecb13a03921296f8c42ceb252d04716f10e09c93962239fcaa0a7fef93f19ab3f2680bc406170108bc583e9ff2e721
-a810cd473832b6581c36ec4cb403f2849357ba2d0b54df98ef3004b8a530c078032922a81d40158f5fb0043d56477f6e
-a247b45dd85ca7fbb718b328f30a03f03c84aef2c583fbdc9fcc9eb8b52b34529e8c8f535505c10598b1b4dac3d7c647
-96ee0b91313c68bac4aa9e065ce9e1d77e51ca4cff31d6a438718c58264dee87674bd97fc5c6b8008be709521e4fd008
-837567ad073e42266951a9a54750919280a2ac835a73c158407c3a2b1904cf0d17b7195a393c71a18ad029cbd9cf79ee
-a6a469c44b67ebf02196213e7a63ad0423aab9a6e54acc6fcbdbb915bc043586993454dc3cd9e4be8f27d67c1050879b
-8712d380a843b08b7b294f1f06e2f11f4ad6bcc655fdde86a4d8bc739c23916f6fad2b902fe47d6212f03607907e9f0e
-920adfb644b534789943cdae1bdd6e42828dda1696a440af2f54e6b97f4f97470a1c6ea9fa6a2705d8f04911d055acd1
-a161c73adf584a0061e963b062f59d90faac65c9b3a936b837a10d817f02fcabfa748824607be45a183dd40f991fe83f
-874f4ecd408c76e625ea50bc59c53c2d930ee25baf4b4eca2440bfbffb3b8bc294db579caa7c68629f4d9ec24187c1ba
-8bff18087f112be7f4aa654e85c71fef70eee8ae480f61d0383ff6f5ab1a0508f966183bb3fc4d6f29cb7ca234aa50d3
-b03b46a3ca3bc743a173cbc008f92ab1aedd7466b35a6d1ca11e894b9482ea9dc75f8d6db2ddd1add99bfbe7657518b7
-8b4f3691403c3a8ad9e097f02d130769628feddfa8c2b3dfe8cff64e2bed7d6e5d192c1e2ba0ac348b8585e94acd5fa1
-a0d9ca4a212301f97591bf65d5ef2b2664766b427c9dd342e23cb468426e6a56be66b1cb41fea1889ac5d11a8e3c50a5
-8c93ed74188ca23b3df29e5396974b9cc135c91fdefdea6c0df694c8116410e93509559af55533a3776ac11b228d69b1
-82dd331fb3f9e344ebdeeb557769b86a2cc8cc38f6c298d7572a33aea87c261afa9dbd898989139b9fc16bc1e880a099
-a65faedf326bcfd8ef98a51410c78b021d39206704e8291cd1f09e096a66b9b0486be65ff185ca224c45918ac337ddeb
-a188b37d363ac072a766fd5d6fa27df07363feff1342217b19e3c37385e42ffde55e4be8355aceaa2f267b6d66b4ac41
-810fa3ba3e96d843e3bafd3f2995727f223d3567c8ba77d684c993ba1773c66551eb5009897c51b3fe9b37196984f5ec
-87631537541852da323b4353af45a164f68b304d24c01183bf271782e11687f3fcf528394e1566c2a26cb527b3148e64
-b721cb2b37b3c477a48e3cc0044167d51ff568a5fd2fb606e5aec7a267000f1ddc07d3db919926ae12761a8e017c767c
-904dfad4ba2cc1f6e60d1b708438a70b1743b400164cd981f13c064b8328d5973987d4fb9cf894068f29d3deaf624dfb
-a70491538893552c20939fae6be2f07bfa84d97e2534a6bbcc0f1729246b831103505e9f60e97a8fa7d2e6c1c2384579
-8726cf1b26b41f443ff7485adcfddc39ace2e62f4d65dd0bb927d933e262b66f1a9b367ded5fbdd6f3b0932553ac1735
-ae8a11cfdf7aa54c08f80cb645e3339187ab3886babe9fae5239ba507bb3dd1c0d161ca474a2df081dcd3d63e8fe445e
-92328719e97ce60e56110f30a00ac5d9c7a2baaf5f8d22355d53c1c77941e3a1fec7d1405e6fbf8959665fe2ba7a8cad
-8d9d6255b65798d0018a8cccb0b6343efd41dc14ff2058d3eed9451ceaad681e4a0fa6af67b0a04318aa628024e5553d
-b70209090055459296006742d946a513f0cba6d83a05249ee8e7a51052b29c0ca9722dc4af5f9816a1b7938a5dac7f79
-aab7b766b9bf91786dfa801fcef6d575dc6f12b77ecc662eb4498f0312e54d0de9ea820e61508fc8aeee5ab5db529349
-a8104b462337748b7f086a135d0c3f87f8e51b7165ca6611264b8fb639d9a2f519926cb311fa2055b5fadf03da70c678
-b0d2460747d5d8b30fc6c6bd0a87cb343ddb05d90a51b465e8f67d499cfc5e3a9e365da05ae233bbee792cdf90ec67d5
-aa55f5bf3815266b4a149f85ed18e451c93de9163575e3ec75dd610381cc0805bb0a4d7c4af5b1f94d10231255436d2c
-8d4c6a1944ff94426151909eb5b99cfd92167b967dabe2bf3aa66bb3c26c449c13097de881b2cfc1bf052862c1ef7b03
-8862296162451b9b6b77f03bf32e6df71325e8d7485cf3335d66fd48b74c2a8334c241db8263033724f26269ad95b395
-901aa96deb26cda5d9321190ae6624d357a41729d72ef1abfd71bebf6139af6d690798daba53b7bc5923462115ff748a
-96c195ec4992728a1eb38cdde42d89a7bce150db43adbc9e61e279ea839e538deec71326b618dd39c50d589f78fc0614
-b6ff8b8aa0837b99a1a8b46fb37f20ad4aecc6a98381b1308697829a59b8442ffc748637a88cb30c9b1f0f28a926c4f6
-8d807e3dca9e7bef277db1d2cfb372408dd587364e8048b304eff00eacde2c723bfc84be9b98553f83cba5c7b3cba248
-8800c96adb0195c4fc5b24511450dee503c32bf47044f5e2e25bd6651f514d79a2dd9b01cd8c09f3c9d3859338490f57
-89fe366096097e38ec28dd1148887112efa5306cc0c3da09562aafa56f4eb000bf46ff79bf0bdd270cbde6bf0e1c8957
-af409a90c2776e1e7e3760b2042507b8709e943424606e31e791d42f17873a2710797f5baaab4cc4a19998ef648556b0
-8d761863c9b6edbd232d35ab853d944f5c950c2b643f84a1a1327ebb947290800710ff01dcfa26dc8e9828481240e8b1
-90b95e9be1e55c463ed857c4e0617d6dc3674e99b6aa62ed33c8e79d6dfcf7d122f4f4cc2ee3e7c5a49170cb617d2e2e
-b3ff381efefabc4db38cc4727432e0301949ae4f16f8d1dea9b4f4de611cf5a36d84290a0bef160dac4e1955e516b3b0
-a8a84564b56a9003adcadb3565dc512239fc79572762cda7b5901a255bc82656bb9c01212ad33d6bef4fbbce18dacc87
-90a081890364b222eef54bf0075417f85e340d2fec8b7375995f598aeb33f26b44143ebf56fca7d8b4ebb36b5747b0eb
-ade6ee49e1293224ddf2d8ab7f14bb5be6bc6284f60fd5b3a1e0cf147b73cff57cf19763b8a36c5083badc79c606b103
-b2fa99806dd2fa3de09320b615a2570c416c9bcdb052e592b0aead748bbe407ec9475a3d932ae48b71c2627eb81986a6
-91f3b7b73c8ccc9392542711c45fe6f236057e6efad587d661ad5cb4d6e88265f86b807bb1151736b1009ab74fd7acb4
-8800e2a46af96696dfbdcbf2ca2918b3dcf28ad970170d2d1783b52b8d945a9167d052beeb55f56c126da7ffa7059baa
-9862267a1311c385956b977c9aa08548c28d758d7ba82d43dbc3d0a0fd1b7a221d39e8399997fea9014ac509ff510ac4
-b7d24f78886fd3e2d283e18d9ad5a25c1a904e7d9b9104bf47da469d74f34162e27e531380dbbe0a9d051e6ffd51d6e7
-b0f445f9d143e28b9df36b0f2c052da87ee2ca374d9d0fbe2eff66ca6fe5fe0d2c1951b428d58f7314b7e74e45d445ea
-b63fc4083eabb8437dafeb6a904120691dcb53ce2938b820bb553da0e1eecd476f72495aacb72600cf9cad18698fd3db
-b9ffd8108eaebd582d665f8690fe8bb207fd85185e6dd9f0b355a09bac1bbff26e0fdb172bc0498df025414e88fe2eda
-967ed453e1f1a4c5b7b6834cc9f75c13f6889edc0cc91dc445727e9f408487bbf05c337103f61397a10011dfbe25d61d
-98ceb673aff36e1987d5521a3984a07079c3c6155974bb8b413e8ae1ce84095fe4f7862fba7aefa14753eb26f2a5805f
-85f01d28603a8fdf6ce6a50cb5c44f8a36b95b91302e3f4cd95c108ce8f4d212e73aec1b8d936520d9226802a2bd9136
-88118e9703200ca07910345fbb789e7a8f92bd80bbc79f0a9e040e8767d33df39f6eded403a9b636eabf9101e588482a
-90833a51eef1b10ed74e8f9bbd6197e29c5292e469c854eed10b0da663e2bceb92539710b1858bbb21887bd538d28d89
-b513b905ec19191167c6193067b5cfdf5a3d3828375360df1c7e2ced5815437dfd37f0c4c8f009d7fb29ff3c8793f560
-b1b6d405d2d18f9554b8a358cc7e2d78a3b34269737d561992c8de83392ac9a2857be4bf15de5a6c74e0c9d0f31f393c
-b828bd3e452b797323b798186607849f85d1fb20c616833c0619360dfd6b3e3aa000fd09dafe4b62d74abc41072ff1a9
-8efde67d0cca56bb2c464731879c9ac46a52e75bac702a63200a5e192b4f81c641f855ca6747752b84fe469cb7113b6c
-b2762ba1c89ac3c9a983c242e4d1c2610ff0528585ed5c0dfc8a2c0253551142af9b59f43158e8915a1da7cc26b9df67
-8a3f1157fb820d1497ef6b25cd70b7e16bb8b961b0063ad340d82a79ee76eb2359ca9e15e6d42987ed7f154f5eeaa2da
-a75e29f29d38f09c879f971c11beb5368affa084313474a5ecafa2896180b9e47ea1995c2733ec46f421e395a1d9cffe
-8e8c3dd3e7196ef0b4996b531ec79e4a1f211db5d5635e48ceb80ff7568b2ff587e845f97ee703bb23a60945ad64314a
-8e7f32f4a3e3c584af5e3d406924a0aa34024c42eca74ef6cc2a358fd3c9efaf25f1c03aa1e66bb94b023a2ee2a1cace
-ab7dce05d59c10a84feb524fcb62478906b3fa045135b23afbede3bb32e0c678d8ebe59feabccb5c8f3550ea76cae44b
-b38bb4b44d827f6fd3bd34e31f9186c59e312dbfadd4a7a88e588da10146a78b1f8716c91ad8b806beb8da65cab80c4c
-9490ce9442bbbd05438c7f5c4dea789f74a7e92b1886a730544b55ba377840740a3ae4f2f146ee73f47c9278b0e233bc
-83c003fab22a7178eed1a668e0f65d4fe38ef3900044e9ec63070c23f2827d36a1e73e5c2b883ec6a2afe2450171b3b3
-9982f02405978ddc4fca9063ebbdb152f524c84e79398955e66fe51bc7c1660ec1afc3a86ec49f58d7b7dde03505731c
-ab337bd83ccdd2322088ffa8d005f450ced6b35790f37ab4534313315ee84312adc25e99cce052863a8bedee991729ed
-8312ce4bec94366d88f16127a17419ef64285cd5bf9e5eda010319b48085966ed1252ed2f5a9fd3e0259b91bb65f1827
-a60d5a6327c4041b0c00a1aa2f0af056520f83c9ce9d9ccd03a0bd4d9e6a1511f26a422ea86bd858a1f77438adf07e6c
-b84a0a0b030bdad83cf5202aa9afe58c9820e52483ab41f835f8c582c129ee3f34aa096d11c1cd922eda02ea1196a882
-8077d105317f4a8a8f1aadeb05e0722bb55f11abcb490c36c0904401107eb3372875b0ac233144829e734f0c538d8c1d
-9202503bd29a6ec198823a1e4e098f9cfe359ed51eb5174d1ca41368821bfeebcbd49debfd02952c41359d1c7c06d2b1
-abc28c155e09365cb77ffead8dc8f602335ef93b2f44e4ef767ce8fc8ef9dd707400f3a722e92776c2e0b40192c06354
-b0f6d1442533ca45c9399e0a63a11f85ff288d242cea6cb3b68c02e77bd7d158047cae2d25b3bcd9606f8f66d9b32855
-b01c3d56a0db84dc94575f4b6ee2de4beca3230e86bed63e2066beb22768b0a8efb08ebaf8ac3dedb5fe46708b084807
-8c8634b0432159f66feaabb165842d1c8ac378f79565b1b90c381aa8450eb4231c3dad11ec9317b9fc2b155c3a771e32
-8e67f623d69ecd430c9ee0888520b6038f13a2b6140525b056dc0951f0cfed2822e62cf11d952a483107c5c5acac4826
-9590bb1cba816dd6acd5ac5fba5142c0a19d53573e422c74005e0bcf34993a8138c83124cad35a3df65879dba6134edd
-801cd96cde0749021a253027118d3ea135f3fcdbe895db08a6c145641f95ebd368dd6a1568d995e1d0084146aebe224a
-848b5d196427f6fc1f762ee3d36e832b64a76ec1033cfedc8b985dea93932a7892b8ef1035c653fb9dcd9ab2d9a44ac8
-a1017eb83d5c4e2477e7bd2241b2b98c4951a3b391081cae7d75965cadc1acaec755cf350f1f3d29741b0828e36fedea
-8d6d2785e30f3c29aad17bd677914a752f831e96d46caf54446d967cb2432be2c849e26f0d193a60bee161ea5c6fe90a
-935c0ba4290d4595428e034b5c8001cbd400040d89ab00861108e8f8f4af4258e41f34a7e6b93b04bc253d3b9ffc13bf
-aac02257146246998477921cef2e9892228590d323b839f3e64ea893b991b463bc2f47e1e5092ddb47e70b2f5bce7622
-b921fde9412970a5d4c9a908ae8ce65861d06c7679af577cf0ad0d5344c421166986bee471fd6a6cecb7d591f06ec985
-8ef4c37487b139d6756003060600bb6ebac7ea810b9c4364fc978e842f13ac196d1264fbe5af60d76ff6d9203d8e7d3f
-94b65e14022b5cf6a9b95f94be5ace2711957c96f4211c3f7bb36206bd39cfbd0ea82186cab5ad0577a23214a5c86e9e
-a31c166d2a2ca1d5a75a5920fef7532681f62191a50d8555fdaa63ba4581c3391cc94a536fc09aac89f64eafceec3f90
-919a8cc128de01e9e10f5d83b08b52293fdd41bde2b5ae070f3d95842d4a16e5331cf2f3d61c765570c8022403610fa4
-b23d6f8331eef100152d60483cfa14232a85ee712c8538c9b6417a5a7c5b353c2ac401390c6c215cb101f5cee6b5f43e
-ab357160c08a18319510a571eafff154298ce1020de8e1dc6138a09fcb0fcbcdd8359f7e9386bda00b7b9cdea745ffdc
-ab55079aea34afa5c0bd1124b9cdfe01f325b402fdfa017301bf87812eaa811ea5798c3aaf818074d420d1c782b10ada
-ade616010dc5009e7fc4f8d8b00dc716686a5fa0a7816ad9e503e15839d3b909b69d9dd929b7575376434ffec0d2bea8
-863997b97ed46898a8a014599508fa3079f414b1f4a0c4fdc6d74ae8b444afa350f327f8bfc2a85d27f9e2d049c50135
-8d602ff596334efd4925549ed95f2aa762b0629189f0df6dbb162581657cf3ea6863cd2287b4d9c8ad52813d87fcd235
-b70f68c596dcdeed92ad5c6c348578b26862a51eb5364237b1221e840c47a8702f0fbc56eb520a22c0eed99795d3903e
-9628088f8e0853cefadee305a8bf47fa990c50fa96a82511bbe6e5dc81ef4b794e7918a109070f92fc8384d77ace226f
-97e26a46e068b605ce96007197ecd943c9a23881862f4797a12a3e96ba2b8d07806ad9e2a0646796b1889c6b7d75188c
-b1edf467c068cc163e2d6413cc22b16751e78b3312fe47b7ea82b08a1206d64415b2c8f2a677fa89171e82cc49797150
-a44d15ef18745b251429703e3cab188420e2d974de07251501799b016617f9630643fcd06f895634d8ecdd579e1bf000
-abd126df3917ba48c618ee4dbdf87df506193462f792874439043fa1b844466f6f4e0ff2e42516e63b5b23c0892b2695
-a2a67f57c4aa3c2aa1eeddbfd5009a89c26c2ce8fa3c96a64626aba19514beb125f27df8559506f737de3eae0f1fc18f
-a633e0132197e6038197304b296ab171f1d8e0d0f34dcf66fe9146ac385b0239232a8470b9205a4802ab432389f4836d
-a914b3a28509a906c3821463b936455d58ff45dcbe158922f9efb2037f2eb0ce8e92532d29b5d5a3fcd0d23fa773f272
-a0e1412ce4505daf1a2e59ce4f0fc0e0023e335b50d2b204422f57cd65744cc7a8ed35d5ef131a42c70b27111d3115b7
-a2339e2f2b6072e88816224fdd612c04d64e7967a492b9f8829db15367f565745325d361fd0607b0def1be384d010d9e
-a7309fc41203cb99382e8193a1dcf03ac190a7ce04835304eb7e341d78634e83ea47cb15b885601956736d04cdfcaa01
-81f3ccd6c7f5b39e4e873365f8c37b214e8ab122d04a606fbb7339dc3298c427e922ec7418002561d4106505b5c399ee
-92c121cf914ca549130e352eb297872a63200e99b148d88fbc9506ad882bec9d0203d65f280fb5b0ba92e336b7f932e8
-a4b330cf3f064f5b131578626ad7043ce2a433b6f175feb0b52d36134a454ca219373fd30d5e5796410e005b69082e47
-86fe5774112403ad83f9c55d58317eeb17ad8e1176d9f2f69c2afb7ed83bc718ed4e0245ceab4b377f5f062dcd4c00e7
-809d152a7e2654c7fd175b57f7928365a521be92e1ed06c05188a95864ddb25f7cab4c71db7d61bbf4cae46f3a1d96ce
-b82d663e55c2a5ada7e169e9b1a87bc1c0177baf1ec1c96559b4cb1c5214ce1ddf2ab8d345014cab6402f3774235cf5a
-86580af86df1bd2c385adb8f9a079e925981b7184db66fc5fe5b14cddb82e7d836b06eaeef14924ac529487b23dae111
-b5f5f4c5c94944ecc804df6ab8687d64e27d988cbfeae1ba7394e0f6adbf778c5881ead7cd8082dd7d68542b9bb4ecd5
-a6016916146c2685c46e8fdd24186394e2d5496e77e08c0c6a709d4cd7dfa97f1efcef94922b89196819076a91ad37b5
-b778e7367ded3b6eab53d5fc257f7a87e8faf74a593900f2f517220add2125be3f6142022660d8181df8d164ad9441ce
-8581b2d36abe6f553add4d24be761bec1b8efaa2929519114346615380b3c55b59e6ad86990e312f7e234d0203bdf59b
-9917e74fd45c3f71a829ff5498a7f6b5599b48c098dda2339bf04352bfc7f368ccf1a407f5835901240e76452ae807d7
-afd196ce6f9335069138fd2e3d133134da253978b4ce373152c0f26affe77a336505787594022e610f8feb722f7cc1fb
-a477491a1562e329764645e8f24d8e228e5ef28c9f74c6b5b3abc4b6a562c15ffb0f680d372aed04d9e1bf944dece7be
-9767440d58c57d3077319d3a330e5322b9ba16981ec74a5a14d53462eab59ae7fd2b14025bfc63b268862094acb444e6
-80986d921be3513ef69264423f351a61cb48390c1be8673aee0f089076086aaebea7ebe268fd0aa7182695606116f679
-a9554c5c921c07b450ee04e34ec58e054ac1541b26ce2ce5a393367a97348ba0089f53db6660ad76b60278b66fd12e3e
-95097e7d2999b3e84bf052c775581cf361325325f4a50192521d8f4693c830bed667d88f482dc1e3f833aa2bd22d2cbf
-9014c91d0f85aefd28436b5228c12f6353c055a9326c7efbf5e071e089e2ee7c070fcbc84c5fafc336cbb8fa6fec1ca1
-90f57ba36ee1066b55d37384942d8b57ae00f3cf9a3c1d6a3dfee1d1af42d4b5fa9baeb0cd7e46687d1d6d090ddb931d
-8e4b1db12fd760a17214c9e47f1fce6e43c0dbb4589a827a13ac61aaae93759345697bb438a00edab92e0b7b62414683
-8022a959a513cdc0e9c705e0fc04eafd05ff37c867ae0f31f6d01cddd5df86138a426cab2ff0ac8ff03a62e20f7e8f51
-914e9a38829834c7360443b8ed86137e6f936389488eccf05b4b4db7c9425611705076ecb3f27105d24b85c852be7511
-957fb10783e2bd0db1ba66b18e794df710bc3b2b05776be146fa5863c15b1ebdd39747b1a95d9564e1772cdfc4f37b8a
-b6307028444daed8ed785ac9d0de76bc3fe23ff2cc7e48102553613bbfb5afe0ebe45e4212a27021c8eb870721e62a1f
-8f76143597777d940b15a01b39c5e1b045464d146d9a30a6abe8b5d3907250e6c7f858ff2308f8591e8b0a7b3f3c568a
-96163138ac0ce5fd00ae9a289648fd9300a0ca0f63a88481d703ecd281c06a52a3b5178e849e331f9c85ca4ba398f4cc
-a63ef47c3e18245b0482596a09f488a716df3cbd0f9e5cfabed0d742843e65db8961c556f45f49762f3a6ac8b627b3ef
-8cb595466552e7c4d42909f232d4063e0a663a8ef6f6c9b7ce3a0542b2459cde04e0e54c7623d404acb5b82775ac04f6
-b47fe69960eb45f399368807cff16d941a5a4ebad1f5ec46e3dc8a2e4d598a7e6114d8f0ca791e9720fd786070524e2b
-89eb5ff83eea9df490e5beca1a1fbbbbcf7184a37e2c8c91ede7a1e654c81e8cd41eceece4042ea7918a4f4646b67fd6
-a84f5d155ed08b9054eecb15f689ba81e44589e6e7207a99790c598962837ca99ec12344105b16641ca91165672f7153
-a6cc8f25c2d5b2d2f220ec359e6a37a52b95fa6af6e173c65e7cd55299eff4aa9e6d9e6f2769e6459313f1f2aecb0fab
-afcde944411f017a9f7979755294981e941cc41f03df5e10522ef7c7505e5f1babdd67b3bf5258e8623150062eb41d9b
-8fab39f39c0f40182fcd996ade2012643fe7731808afbc53f9b26900b4d4d1f0f5312d9d40b3df8baa4739970a49c732
-ae193af9726da0ebe7df1f9ee1c4846a5b2a7621403baf8e66c66b60f523e719c30c6b4f897bb14b27d3ff3da8392eeb
-8ac5adb82d852eba255764029f42e6da92dcdd0e224d387d1ef94174038db9709ac558d90d7e7c57ad4ce7f89bbfc38c
-a2066b3458fdf678ee487a55dd5bfb74fde03b54620cb0e25412a89ee28ad0d685e309a51e3e4694be2fa6f1593a344c
-88d031745dd0ae07d61a15b594be5d4b2e2a29e715d081649ad63605e3404b0c3a5353f0fd9fad9c05c18e93ce674fa1
-8283cfb0ef743a043f2b77ecaeba3005e2ca50435585b5dd24777ee6bce12332f85e21b446b536da38508807f0f07563
-b376de22d5f6b0af0b59f7d9764561f4244cf8ffe22890ecd3dcf2ff1832130c9b821e068c9d8773136f4796721e5963
-ae3afc50c764f406353965363840bf28ee85e7064eb9d5f0bb3c31c64ab10f48c853e942ee2c9b51bae59651eaa08c2f
-948b204d103917461a01a6c57a88f2d66b476eae5b00be20ec8c747650e864bc8a83aee0aff59cb7584b7a3387e0ee48
-81ab098a082b07f896c5ffd1e4446cb7fb44804cbbf38d125208b233fc82f8ec9a6a8d8dd1c9a1162dc28ffeec0dde50
-a149c6f1312821ced2969268789a3151bdda213451760b397139a028da609c4134ac083169feb0ee423a0acafd10eceb
-b0ac9e27a5dadaf523010f730b28f0ebac01f460d3bbbe277dc9d44218abb5686f4fac89ae462682fef9edbba663520a
-8d0e0073cca273daaaa61b6fc54bfe5a009bc3e20ae820f6c93ba77b19eca517d457e948a2de5e77678e4241807157cb
-ad61d3a2edf7c7533a04964b97499503fd8374ca64286dba80465e68fe932e96749b476f458c6fc57cb1a7ca85764d11
-90eb5e121ae46bc01a30881eaa556f46bd8457a4e80787cf634aab355082de34ac57d7f497446468225f7721e68e2a47
-8cdac557de7c42d1f3780e33dec1b81889f6352279be81c65566cdd4952d4c15d79e656cbd46035ab090b385e90245ef
-82b67e61b88b84f4f4d4f65df37b3e3dcf8ec91ea1b5c008fdccd52da643adbe6468a1cfdb999e87d195afe2883a3b46
-8503b467e8f5d6048a4a9b78496c58493a462852cab54a70594ae3fd064cfd0deb4b8f336a262155d9fedcaa67d2f6fd
-8db56c5ac763a57b6ce6832930c57117058e3e5a81532b7d19346346205e2ec614eb1a2ee836ef621de50a7bc9b7f040
-ad344699198f3c6e8c0a3470f92aaffc805b76266734414c298e10b5b3797ca53578de7ccb2f458f5e0448203f55282b
-80602032c43c9e2a09154cc88b83238343b7a139f566d64cb482d87436b288a98f1ea244fd3bff8da3c398686a900c14
-a6385bd50ecd548cfb37174cdbb89e10025b5cadaf3cff164c95d7aef5a33e3d6a9bf0c681b9e11db9ef54ebeee2a0c1
-abf2d95f4aa34b0581eb9257a0cc8462b2213941a5deb8ba014283293e8b36613951b61261cc67bbd09526a54cbbff76
-a3d5de52f48df72c289ff713e445991f142390798cd42bd9d9dbefaee4af4f5faf09042d126b975cf6b98711c3072553
-8e627302ff3d686cff8872a1b7c2a57b35f45bf2fc9aa42b049d8b4d6996a662b8e7cbac6597f0cb79b0cc4e29fbf133
-8510702e101b39a1efbf4e504e6123540c34b5689645e70d0bac1ecc1baf47d86c05cef6c4317a4e99b4edaeb53f2d00
-aa173f0ecbcc6088f878f8726d317748c81ebf501bba461f163b55d66099b191ec7c55f7702f351a9c8eb42cfa3280e2
-b560a697eafab695bcef1416648a0a664a71e311ecbe5823ae903bd0ed2057b9d7574b9a86d3fe22aa3e6ddce38ea513
-8df6304a3d9cf40100f3f687575419c998cd77e5cc27d579cf4f8e98642de3609af384a0337d145dd7c5635172d26a71
-8105c7f3e4d30a29151849673853b457c1885c186c132d0a98e63096c3774bc9deb956cf957367e633d0913680bda307
-95373fc22c0917c3c2044ac688c4f29a63ed858a45c0d6d2d0fe97afd6f532dcb648670594290c1c89010ecc69259bef
-8c2fae9bcadab341f49b55230310df93cac46be42d4caa0d42e45104148a91e527af1b4209c0d972448162aed28fab64
-b05a77baab70683f76209626eaefdda2d36a0b66c780a20142d23c55bd479ddd4ad95b24579384b6cf62c8eb4c92d021
-8e6bc6a7ea2755b4aaa19c1c1dee93811fcde514f03485fdc3252f0ab7f032c315614f6336e57cea25dcfb8fb6084eeb
-b656a27d06aade55eadae2ad2a1059198918ea6cc3fd22c0ed881294d34d5ac7b5e4700cc24350e27d76646263b223aa
-a296469f24f6f56da92d713afcd4dd606e7da1f79dc4e434593c53695847eefc81c7c446486c4b3b8c8d00c90c166f14
-87a326f57713ac2c9dffeb3af44b9f3c613a8f952676fc46343299122b47ee0f8d792abaa4b5db6451ced5dd153aabd0
-b689e554ba9293b9c1f6344a3c8fcb6951d9f9eac4a2e2df13de021aade7c186be27500e81388e5b8bcab4c80f220a31
-87ae0aa0aa48eac53d1ca5a7b93917de12db9e40ceabf8fdb40884ae771cfdf095411deef7c9f821af0b7070454a2608
-a71ffa7eae8ace94e6c3581d4cb2ad25d48cbd27edc9ec45baa2c8eb932a4773c3272b2ffaf077b40f76942a1f3af7f2
-94c218c91a9b73da6b7a495b3728f3028df8ad9133312fc0c03e8c5253b7ccb83ed14688fd4602e2fd41f29a0bc698bd
-ae1e77b90ca33728af07a4c03fb2ef71cd92e2618e7bf8ed4d785ce90097fc4866c29999eb84a6cf1819d75285a03af2
-b7a5945b277dab9993cf761e838b0ac6eaa903d7111fca79f9fde3d4285af7a89bf6634a71909d095d7619d913972c9c
-8c43b37be02f39b22029b20aca31bff661abce4471dca88aa3bddefd9c92304a088b2dfc8c4795acc301ca3160656af2
-b32e5d0fba024554bd5fe8a793ebe8003335ddd7f585876df2048dcf759a01285fecb53daae4950ba57f3a282a4d8495
-85ea7fd5e10c7b659df5289b2978b2c89e244f269e061b9a15fcab7983fc1962b63546e82d5731c97ec74b6804be63ef
-96b89f39181141a7e32986ac02d7586088c5a9662cec39843f397f3178714d02f929af70630c12cbaba0268f8ba2d4fa
-929ab1a2a009b1eb37a2817c89696a06426529ebe3f306c586ab717bd34c35a53eca2d7ddcdef36117872db660024af9
-a696dccf439e9ca41511e16bf3042d7ec0e2f86c099e4fc8879d778a5ea79e33aa7ce96b23dc4332b7ba26859d8e674d
-a8fe69a678f9a194b8670a41e941f0460f6e2dbc60470ab4d6ae2679cc9c6ce2c3a39df2303bee486dbfde6844e6b31a
-95f58f5c82de2f2a927ca99bf63c9fc02e9030c7e46d0bf6b67fe83a448d0ae1c99541b59caf0e1ccab8326231af09a5
-a57badb2c56ca2c45953bd569caf22968f76ed46b9bac389163d6fe22a715c83d5e94ae8759b0e6e8c2f27bff7748f3f
-868726fd49963b24acb5333364dffea147e98f33aa19c7919dc9aca0fd26661cfaded74ede7418a5fadbe7f5ae67b67b
-a8d8550dcc64d9f1dd7bcdab236c4122f2b65ea404bb483256d712c7518f08bb028ff8801f1da6aed6cbfc5c7062e33b
-97e25a87dae23155809476232178538d4bc05d4ff0882916eb29ae515f2a62bfce73083466cc0010ca956aca200aeacc
-b4ea26be3f4bd04aa82d7c4b0913b97bcdf5e88b76c57eb1a336cbd0a3eb29de751e1bc47c0e8258adec3f17426d0c71
-99ee555a4d9b3cf2eb420b2af8e3bc99046880536116d0ce7193464ac40685ef14e0e3c442f604e32f8338cb0ef92558
-8c64efa1da63cd08f319103c5c7a761221080e74227bbc58b8fb35d08aa42078810d7af3e60446cbaff160c319535648
-8d9fd88040076c28420e3395cbdfea402e4077a3808a97b7939d49ecbcf1418fe50a0460e1c1b22ac3f6e7771d65169a
-ae3c19882d7a9875d439265a0c7003c8d410367627d21575a864b9cb4918de7dbdb58a364af40c5e045f3df40f95d337
-b4f7bfacab7b2cafe393f1322d6dcc6f21ffe69cd31edc8db18c06f1a2b512c27bd0618091fd207ba8df1808e9d45914
-94f134acd0007c623fb7934bcb65ef853313eb283a889a3ffa79a37a5c8f3665f3d5b4876bc66223610c21dc9b919d37
-aa15f74051171daacdc1f1093d3f8e2d13da2833624b80a934afec86fc02208b8f55d24b7d66076444e7633f46375c6a
-a32d6bb47ef9c836d9d2371807bafbbbbb1ae719530c19d6013f1d1f813c49a60e4fa51d83693586cba3a840b23c0404
-b61b3599145ea8680011aa2366dc511a358b7d67672d5b0c5be6db03b0efb8ca5a8294cf220ea7409621f1664e00e631
-859cafc3ee90b7ececa1ed8ef2b2fc17567126ff10ca712d5ffdd16aa411a5a7d8d32c9cab1fbf63e87dce1c6e2f5f53
-a2fef1b0b2874387010e9ae425f3a9676d01a095d017493648bcdf3b31304b087ccddb5cf76abc4e1548b88919663b6b
-939e18c73befc1ba2932a65ede34c70e4b91e74cc2129d57ace43ed2b3af2a9cc22a40fbf50d79a63681b6d98852866d
-b3b4259d37b1b14aee5b676c9a0dd2d7f679ab95c120cb5f09f9fbf10b0a920cb613655ddb7b9e2ba5af4a221f31303c
-997255fe51aaca6e5a9cb3359bcbf25b2bb9e30649bbd53a8a7c556df07e441c4e27328b38934f09c09d9500b5fabf66
-abb91be2a2d860fd662ed4f1c6edeefd4da8dc10e79251cf87f06029906e7f0be9b486462718f0525d5e049472692cb7
-b2398e593bf340a15f7801e1d1fbda69d93f2a32a889ec7c6ae5e8a37567ac3e5227213c1392ee86cfb3b56ec2787839
-8ddf10ccdd72922bed36829a36073a460c2118fc7a56ff9c1ac72581c799b15c762cb56cb78e3d118bb9f6a7e56cb25e
-93e6bc0a4708d16387cacd44cf59363b994dc67d7ada7b6d6dbd831c606d975247541b42b2a309f814c1bfe205681fc6
-b93fc35c05998cffda2978e12e75812122831523041f10d52f810d34ff71944979054b04de0117e81ddf5b0b4b3e13c0
-92221631c44d60d68c6bc7b287509f37ee44cbe5fdb6935cee36b58b17c7325098f98f7910d2c3ca5dc885ad1d6dabc7
-a230124424a57fad3b1671f404a94d7c05f4c67b7a8fbacfccea28887b78d7c1ed40b92a58348e4d61328891cd2f6cee
-a6a230edb8518a0f49d7231bc3e0bceb5c2ac427f045819f8584ba6f3ae3d63ed107a9a62aad543d7e1fcf1f20605706
-845be1fe94223c7f1f97d74c49d682472585d8f772762baad8a9d341d9c3015534cc83d102113c51a9dea2ab10d8d27b
-b44262515e34f2db597c8128c7614d33858740310a49cdbdf9c8677c5343884b42c1292759f55b8b4abc4c86e4728033
-805592e4a3cd07c1844bc23783408310accfdb769cca882ad4d07d608e590a288b7370c2cb327f5336e72b7083a0e30f
-95153e8b1140df34ee864f4ca601cb873cdd3efa634af0c4093fbaede36f51b55571ab271e6a133020cd34db8411241f
-82878c1285cfa5ea1d32175c9401f3cc99f6bb224d622d3fd98cc7b0a27372f13f7ab463ce3a33ec96f9be38dbe2dfe3
-b7588748f55783077c27fc47d33e20c5c0f5a53fc0ac10194c003aa09b9f055d08ec971effa4b7f760553997a56967b3
-b36b4de6d1883b6951f59cfae381581f9c6352fcfcf1524fccdab1571a20f80441d9152dc6b48bcbbf00371337ca0bd5
-89c5523f2574e1c340a955cbed9c2f7b5fbceb260cb1133160dabb7d41c2f613ec3f6e74bbfab3c4a0a6f0626dbe068f
-a52f58cc39f968a9813b1a8ddc4e83f4219e4dd82c7aa1dd083bea7edf967151d635aa9597457f879771759b876774e4
-8300a67c2e2e123f89704abfde095463045dbd97e20d4c1157bab35e9e1d3d18f1f4aaba9cbe6aa2d544e92578eaa1b6
-ac6a7f2918768eb6a43df9d3a8a04f8f72ee52f2e91c064c1c7d75cad1a3e83e5aba9fe55bb94f818099ac91ccf2e961
-8d64a2b0991cf164e29835c8ddef6069993a71ec2a7de8157bbfa2e00f6367be646ed74cbaf524f0e9fe13fb09fa15fd
-8b2ffe5a545f9f680b49d0a9797a4a11700a2e2e348c34a7a985fc278f0f12def6e06710f40f9d48e4b7fbb71e072229
-8ab8f71cd337fa19178924e961958653abf7a598e3f022138b55c228440a2bac4176cea3aea393549c03cd38a13eb3fc
-8419d28318c19ea4a179b7abb43669fe96347426ef3ac06b158d79c0acf777a09e8e770c2fb10e14b3a0421705990b23
-8bacdac310e1e49660359d0a7a17fe3d334eb820e61ae25e84cb52f863a2f74cbe89c2e9fc3283745d93a99b79132354
-b57ace3fa2b9f6b2db60c0d861ace7d7e657c5d35d992588aeed588c6ce3a80b6f0d49f8a26607f0b17167ab21b675e4
-83e265cde477f2ecc164f49ddc7fb255bb05ff6adc347408353b7336dc3a14fdedc86d5a7fb23f36b8423248a7a67ed1
-a60ada971f9f2d79d436de5d3d045f5ab05308cae3098acaf5521115134b2a40d664828bb89895840db7f7fb499edbc5
-a63eea12efd89b62d3952bf0542a73890b104dd1d7ff360d4755ebfa148fd62de668edac9eeb20507967ea37fb220202
-a0275767a270289adc991cc4571eff205b58ad6d3e93778ddbf95b75146d82517e8921bd0d0564e5b75fa0ccdab8e624
-b9b03fd3bf07201ba3a039176a965d736b4ef7912dd9e9bf69fe1b57c330a6aa170e5521fe8be62505f3af81b41d7806
-a95f640e26fb1106ced1729d6053e41a16e4896acac54992279ff873e5a969aad1dcfa10311e28b8f409ac1dab7f03bb
-b144778921742418053cb3c70516c63162c187f00db2062193bb2c14031075dbe055d020cde761b26e8c58d0ea6df2c1
-8432fbb799e0435ef428d4fefc309a05dd589bce74d7a87faf659823e8c9ed51d3e42603d878e80f439a38be4321c2fa
-b08ddef14e42d4fd5d8bf39feb7485848f0060d43b51ed5bdda39c05fe154fb111d29719ee61a23c392141358c0cfcff
-8ae3c5329a5e025b86b5370e06f5e61177df4bda075856fade20a17bfef79c92f54ed495f310130021ba94fb7c33632b
-92b6d3c9444100b4d7391febfc1dddaa224651677c3695c47a289a40d7a96d200b83b64e6d9df51f534564f272a2c6c6
-b432bc2a3f93d28b5e506d68527f1efeb2e2570f6be0794576e2a6ef9138926fdad8dd2eabfa979b79ab7266370e86bc
-8bc315eacedbcfc462ece66a29662ca3dcd451f83de5c7626ef8712c196208fb3d8a0faf80b2e80384f0dd9772f61a23
-a72375b797283f0f4266dec188678e2b2c060dfed5880fc6bb0c996b06e91a5343ea2b695adaab0a6fd183b040b46b56
-a43445036fbaa414621918d6a897d3692fdae7b2961d87e2a03741360e45ebb19fcb1703d23f1e15bb1e2babcafc56ac
-b9636b2ffe305e63a1a84bd44fb402442b1799bd5272638287aa87ca548649b23ce8ce7f67be077caed6aa2dbc454b78
-99a30bf0921d854c282b83d438a79f615424f28c2f99d26a05201c93d10378ab2cd94a792b571ddae5d4e0c0013f4006
-8648e3c2f93d70b392443be116b48a863e4b75991bab5db656a4ef3c1e7f645e8d536771dfe4e8d1ceda3be8d32978b0
-ab50dc9e6924c1d2e9d2e335b2d679fc7d1a7632e84964d3bac0c9fe57e85aa5906ec2e7b0399d98ddd022e9b19b5904
-ab729328d98d295f8f3272afaf5d8345ff54d58ff9884da14f17ecbdb7371857fdf2f3ef58080054e9874cc919b46224
-83fa5da7592bd451cad3ad7702b4006332b3aae23beab4c4cb887fa6348317d234bf62a359e665b28818e5410c278a09
-8bdbff566ae9d368f114858ef1f009439b3e9f4649f73efa946e678d6c781d52c69af195df0a68170f5f191b2eac286b
-91245e59b4425fd4edb2a61d0d47c1ccc83d3ced8180de34887b9655b5dcda033d48cde0bdc3b7de846d246c053a02e8
-a2cb00721e68f1cad8933947456f07144dc69653f96ceed845bd577d599521ba99cdc02421118971d56d7603ed118cbf
-af8cd66d303e808b22ec57860dd909ca64c27ec2c60e26ffecfdc1179d8762ffd2739d87b43959496e9fee4108df71df
-9954136812dffcd5d3f167a500e7ab339c15cfc9b3398d83f64b0daa3dd5b9a851204f424a3493b4e326d3de81e50a62
-93252254d12511955f1aa464883ad0da793f84d900fea83e1df8bca0f2f4cf5b5f9acbaec06a24160d33f908ab5fea38
-997cb55c26996586ba436a95566bd535e9c22452ca5d2a0ded2bd175376557fa895f9f4def4519241ff386a063f2e526
-a12c78ad451e0ac911260ade2927a768b50cb4125343025d43474e7f465cdc446e9f52a84609c5e7e87ae6c9b3f56cda
-a789d4ca55cbba327086563831b34487d63d0980ba8cf55197c016702ed6da9b102b1f0709ce3da3c53ff925793a3d73
-a5d76acbb76741ce85be0e655b99baa04f7f587347947c0a30d27f8a49ae78cce06e1cde770a8b618d3db402be1c0c4b
-873c0366668c8faddb0eb7c86f485718d65f8c4734020f1a18efd5fa123d3ea8a990977fe13592cd01d17e60809cb5ff
-b659b71fe70f37573ff7c5970cc095a1dc0da3973979778f80a71a347ef25ad5746b2b9608bad4ab9a4a53a4d7df42d7
-a34cbe05888e5e5f024a2db14cb6dcdc401a9cbd13d73d3c37b348f68688f87c24ca790030b8f84fef9e74b4eab5e412
-94ce8010f85875c045b0f014db93ef5ab9f1f6842e9a5743dce9e4cb872c94affd9e77c1f1d1ab8b8660b52345d9acb9
-adefa9b27a62edc0c5b019ddd3ebf45e4de846165256cf6329331def2e088c5232456d3de470fdce3fa758bfdd387512
-a6b83821ba7c1f83cc9e4529cf4903adb93b26108e3d1f20a753070db072ad5a3689643144bdd9c5ea06bb9a7a515cd0
-a3a9ddedc2a1b183eb1d52de26718151744db6050f86f3580790c51d09226bf05f15111691926151ecdbef683baa992c
-a64bac89e7686932cdc5670d07f0b50830e69bfb8c93791c87c7ffa4913f8da881a9d8a8ce8c1a9ce5b6079358c54136
-a77b5a63452cb1320b61ab6c7c2ef9cfbcade5fd4727583751fb2bf3ea330b5ca67757ec1f517bf4d503ec924fe32fbd
-8746fd8d8eb99639d8cd0ca34c0d9c3230ed5a312aab1d3d925953a17973ee5aeb66e68667e93caf9cb817c868ea8f3d
-88a2462a26558fc1fbd6e31aa8abdc706190a17c27fdc4217ffd2297d1b1f3321016e5c4b2384c5454d5717dc732ed03
-b78893a97e93d730c8201af2e0d3b31cb923d38dc594ffa98a714e627c473d42ea82e0c4d2eeb06862ee22a9b2c54588
-920cc8b5f1297cf215a43f6fc843e379146b4229411c44c0231f6749793d40f07b9af7699fd5d21fd69400b97febe027
-a0f0eafce1e098a6b58c7ad8945e297cd93aaf10bc55e32e2e32503f02e59fc1d5776936577d77c0b1162cb93b88518b
-98480ba0064e97a2e7a6c4769b4d8c2a322cfc9a3b2ca2e67e9317e2ce04c6e1108169a20bd97692e1cb1f1423b14908
-83dbbb2fda7e287288011764a00b8357753a6a44794cc8245a2275237f11affdc38977214e463ad67aec032f3dfa37e9
-86442fff37598ce2b12015ff19b01bb8a780b40ad353d143a0f30a06f6d23afd5c2b0a1253716c855dbf445cc5dd6865
-b8a4c60c5171189414887847b9ed9501bff4e4c107240f063e2d254820d2906b69ef70406c585918c4d24f1dd052142b
-919f33a98e84015b2034b57b5ffe9340220926b2c6e45f86fd79ec879dbe06a148ae68b77b73bf7d01bd638a81165617
-95c13e78d89474a47fbc0664f6f806744b75dede95a479bbf844db4a7f4c3ae410ec721cb6ffcd9fa9c323da5740d5ae
-ab7151acc41fffd8ec6e90387700bcd7e1cde291ea669567295bea1b9dd3f1df2e0f31f3588cd1a1c08af8120aca4921
-80e74c5c47414bd6eeef24b6793fb1fa2d8fb397467045fcff887c52476741d5bc4ff8b6d3387cb53ad285485630537f
-a296ad23995268276aa351a7764d36df3a5a3cffd7dbeddbcea6b1f77adc112629fdeffa0918b3242b3ccd5e7587e946
-813d2506a28a2b01cb60f49d6bd5e63c9b056aa56946faf2f33bd4f28a8d947569cfead3ae53166fc65285740b210f86
-924b265385e1646287d8c09f6c855b094daaee74b9e64a0dddcf9ad88c6979f8280ba30c8597b911ef58ddb6c67e9fe3
-8d531513c70c2d3566039f7ca47cd2352fd2d55b25675a65250bdb8b06c3843db7b2d29c626eed6391c238fc651cf350
-82b338181b62fdc81ceb558a6843df767b6a6e3ceedc5485664b4ea2f555904b1a45fbb35f6cf5d96f27da10df82a325
-92e62faaedea83a37f314e1d3cb4faaa200178371d917938e59ac35090be1db4b4f4e0edb78b9c991de202efe4f313d8
-99d645e1b642c2dc065bac9aaa0621bc648c9a8351efb6891559c3a41ba737bd155fb32d7731950514e3ecf4d75980e4
-b34a13968b9e414172fb5d5ece9a39cf2eb656128c3f2f6cc7a9f0c69c6bae34f555ecc8f8837dc34b5e470e29055c78
-a2a0bb7f3a0b23a2cbc6585d59f87cd7e56b2bbcb0ae48f828685edd9f7af0f5edb4c8e9718a0aaf6ef04553ba71f3b7
-8e1a94bec053ed378e524b6685152d2b52d428266f2b6eadd4bcb7c4e162ed21ab3e1364879673442ee2162635b7a4d8
-9944adaff14a85eab81c73f38f386701713b52513c4d4b838d58d4ffa1d17260a6d056b02334850ea9a31677c4b078bd
-a450067c7eceb0854b3eca3db6cf38669d72cb7143c3a68787833cbca44f02c0be9bfbe082896f8a57debb13deb2afb1
-8be4ad3ac9ef02f7df09254d569939757101ee2eda8586fefcd8c847adc1efe5bdcb963a0cafa17651befaafb376a531
-90f6de91ea50255f148ac435e08cf2ac00c772a466e38155bd7e8acf9197af55662c7b5227f88589b71abe9dcf7ba343
-86e5a24f0748b106dee2d4d54e14a3b0af45a96cbee69cac811a4196403ebbee17fd24946d7e7e1b962ac7f66dbaf610
-afdd96fbcda7aa73bf9eeb2292e036c25753d249caee3b9c013009cc22e10d3ec29e2aa6ddbb21c4e949b0c0bccaa7f4
-b5a4e7436d5473647c002120a2cb436b9b28e27ad4ebdd7c5f122b91597c507d256d0cbd889d65b3a908531936e53053
-b632414c3da704d80ac2f3e5e0e9f18a3637cdc2ebeb613c29300745582427138819c4e7b0bec3099c1b8739dac1807b
-a28df1464d3372ce9f37ef1db33cc010f752156afae6f76949d98cd799c0cf225c20228ae86a4da592d65f0cffe3951b
-898b93d0a31f7d3f11f253cb7a102db54b669fd150da302d8354d8e02b1739a47cb9bd88015f3baf12b00b879442464e
-96fb88d89a12049091070cb0048a381902965e67a8493e3991eaabe5d3b7ff7eecd5c94493a93b174df3d9b2c9511755
-b899cb2176f59a5cfba3e3d346813da7a82b03417cad6342f19cc8f12f28985b03bf031e856a4743fd7ebe16324805b0
-a60e2d31bc48e0c0579db15516718a03b73f5138f15037491f4dae336c904e312eda82d50862f4debd1622bb0e56d866
-979fc8b987b5cef7d4f4b58b53a2c278bd25a5c0ea6f41c715142ea5ff224c707de38451b0ad3aa5e749aa219256650a
-b2a75bff18e1a6b9cf2a4079572e41205741979f57e7631654a3c0fcec57c876c6df44733c9da3d863db8dff392b44a3
-b7a0f0e811222c91e3df98ff7f286b750bc3b20d2083966d713a84a2281744199e664879401e77470d44e5a90f3e5181
-82b74ba21c9d147fbc338730e8f1f8a6e7fc847c3110944eb17a48bea5e06eecded84595d485506d15a3e675fd0e5e62
-a7f44eef817d5556f0d1abcf420301217d23c69dd2988f44d91ea1f1a16c322263cbacd0f190b9ba22b0f141b9267b4f
-aadb68164ede84fc1cb3334b3194d84ba868d5a88e4c9a27519eef4923bc4abf81aab8114449496c073c2a6a0eb24114
-b5378605fabe9a8c12a5dc55ef2b1de7f51aedb61960735c08767a565793cea1922a603a6983dc25f7cea738d0f7c40d
-a97a4a5cd8d51302e5e670aee78fe6b5723f6cc892902bbb4f131e82ca1dfd5de820731e7e3367fb0c4c1922a02196e3
-8bdfeb15c29244d4a28896f2b2cb211243cd6a1984a3f5e3b0ebe5341c419beeab3304b390a009ffb47588018034b0ea
-a9af3022727f2aa2fca3b096968e97edad3f08edcbd0dbca107b892ae8f746a9c0485e0d6eb5f267999b23a845923ed0
-8e7594034feef412f055590fbb15b6322dc4c6ab7a4baef4685bd13d71a83f7d682b5781bdfa0d1c659489ce9c2b8000
-84977ca6c865ebee021c58106c1a4ad0c745949ecc5332948002fd09bd9b890524878d0c29da96fd11207621136421fe
-8687551a79158e56b2375a271136756313122132a6670fa51f99a1b5c229ed8eea1655a734abae13228b3ebfd2a825dd
-a0227d6708979d99edfc10f7d9d3719fd3fc68b0d815a7185b60307e4c9146ad2f9be2b8b4f242e320d4288ceeb9504c
-89f75583a16735f9dd8b7782a130437805b34280ccea8dac6ecaee4b83fe96947e7b53598b06fecfffdf57ffc12cc445
-a0056c3353227f6dd9cfc8e3399aa5a8f1d71edf25d3d64c982910f50786b1e395c508d3e3727ac360e3e040c64b5298
-b070e61a6d813626144b312ded1788a6d0c7cec650a762b2f8df6e4743941dd82a2511cd956a3f141fc81e15f4e092da
-b4e6db232e028a1f989bb5fc13416711f42d389f63564d60851f009dcffac01acfd54efa307aa6d4c0f932892d4e62b0
-89b5991a67db90024ddd844e5e1a03ef9b943ad54194ae0a97df775dde1addf31561874f4e40fbc37a896630f3bbda58
-ad0e8442cb8c77d891df49cdb9efcf2b0d15ac93ec9be1ad5c3b3cca1f4647b675e79c075335c1f681d56f14dc250d76
-b5d55a6ae65bb34dd8306806cb49b5ccb1c83a282ee47085cf26c4e648e19a52d9c422f65c1cd7e03ca63e926c5e92ea
-b749501347e5ec07e13a79f0cb112f1b6534393458b3678a77f02ca89dca973fa7b30e55f0b25d8b92b97f6cb0120056
-94144b4a3ffc5eec6ba35ce9c245c148b39372d19a928e236a60e27d7bc227d18a8cac9983851071935d8ffb64b3a34f
-92bb4f9f85bc8c028a3391306603151c6896673135f8a7aefedd27acb322c04ef5dac982fc47b455d6740023e0dd3ea3
-b9633a4a101461a782fc2aa092e9dbe4e2ad00987578f18cd7cf0021a909951d60fe79654eb7897806795f93c8ff4d1c
-809f0196753024821b48a016eca5dbb449a7c55750f25981bb7a4b4c0e0846c09b8f6128137905055fc43a3f0deb4a74
-a27dc9cdd1e78737a443570194a03d89285576d3d7f3a3cf15cc55b3013e42635d4723e2e8fe1d0b274428604b630db9
-861f60f0462e04cd84924c36a28163def63e777318d00884ab8cb64c8df1df0bce5900342163edb60449296484a6c5bf
-b7bc23fb4e14af4c4704a944253e760adefeca8caee0882b6bbd572c84434042236f39ae07a8f21a560f486b15d82819
-b9a6eb492d6dd448654214bd01d6dc5ff12067a11537ab82023fc16167507ee25eed2c91693912f4155d1c07ed9650b3
-97678af29c68f9a5e213bf0fb85c265303714482cfc4c2c00b4a1e8a76ed08834ee6af52357b143a1ca590fb0265ea5a
-8a15b499e9eca5b6cac3070b5409e8296778222018ad8b53a5d1f6b70ad9bb10c68a015d105c941ed657bf3499299e33
-b487fefede2e8091f2c7bfe85770db2edff1db83d4effe7f7d87bff5ab1ace35e9b823a71adfec6737fede8d67b3c467
-8b51b916402aa2c437fce3bcad6dad3be8301a1a7eab9d163085b322ffb6c62abf28637636fe6114573950117fc92898
-b06a2106d031a45a494adec0881cb2f82275dff9dcdd2bc16807e76f3bec28a6734edd3d54f0be8199799a78cd6228ad
-af0a185391bbe2315eb97feac98ad6dd2e5d931d012c621abd6e404a31cc188b286fef14871762190acf086482b2b5e2
-8e78ee8206506dd06eb7729e32fceda3bebd8924a64e4d8621c72e36758fda3d0001af42443851d6c0aea58562870b43
-a1ba52a569f0461aaf90b49b92be976c0e73ec4a2c884752ee52ffb62dd137770c985123d405dfb5de70692db454b54a
-8d51b692fa1543c51f6b62b9acb8625ed94b746ef96c944ca02859a4133a5629da2e2ce84e111a7af8d9a5b836401c64
-a7a20d45044cf6492e0531d0b8b26ffbae6232fa05a96ed7f06bdb64c2b0f5ca7ec59d5477038096a02579e633c7a3ff
-84df867b98c53c1fcd4620fef133ee18849c78d3809d6aca0fb6f50ff993a053a455993f216c42ab6090fa5356b8d564
-a7227c439f14c48e2577d5713c97a5205feb69acb0b449152842e278fa71e8046adfab468089c8b2288af1fc51fa945b
-855189b3a105670779997690876dfaa512b4a25a24931a912c2f0f1936971d2882fb4d9f0b3d9daba77eaf660e9d05d5
-b5696bd6706de51c502f40385f87f43040a5abf99df705d6aac74d88c913b8ecf7a99a63d7a37d9bdf3a941b9e432ff5
-ab997beb0d6df9c98d5b49864ef0b41a2a2f407e1687dfd6089959757ba30ed02228940b0e841afe6911990c74d536c4
-b36b65f85546ebfdbe98823d5555144f96b4ab39279facd19c0de3b8919f105ba0315a0784dce4344b1bc62d8bb4a5a3
-b8371f0e4450788720ac5e0f6cd3ecc5413d33895083b2c168d961ec2b5c3de411a4cc0712481cbe8df8c2fa1a7af006
-98325d8026b810a8b7a114171ae59a57e8bbc9848e7c3df992efc523621729fd8c9f52114ce01d7730541a1ada6f1df1
-8d0e76dbd37806259486cd9a31bc8b2306c2b95452dc395546a1042d1d17863ef7a74c636b782e214d3aa0e8d717f94a
-a4e15ead76da0214d702c859fb4a8accdcdad75ed08b865842bd203391ec4cba2dcc916455e685f662923b96ee0c023f
-8618190972086ebb0c4c1b4a6c94421a13f378bc961cc8267a301de7390c5e73c3333864b3b7696d81148f9d4843fd02
-85369d6cc7342e1aa15b59141517d8db8baaaeb7ab9670f3ba3905353948d575923d283b7e5a05b13a30e7baf1208a86
-87c51ef42233c24a6da901f28c9a075d9ba3c625687c387ad6757b72ca6b5a8885e6902a3082da7281611728b1e45f26
-aa6348a4f71927a3106ad0ea8b02fc8d8c65531e4ab0bd0a17243e66f35afe252e40ab8eef9f13ae55a72566ffdaff5c
-96a3bc976e9d03765cc3fee275fa05b4a84c94fed6b767e23ca689394501e96f56f7a97cffddc579a6abff632bf153be
-97dbf96c6176379fdb2b888be4e757b2bca54e74124bd068d3fa1dbd82a011bbeb75079da38e0cd22a761fe208ecad9b
-b70cf0a1d14089a4129ec4e295313863a59da8c7e26bf74cc0e704ed7f0ee4d7760090d0ddf7728180f1bf2c5ac64955
-882d664714cc0ffe53cbc9bef21f23f3649824f423c4dbad1f893d22c4687ab29583688699efc4d5101aa08b0c3e267a
-80ecb7cc963e677ccaddbe3320831dd6ee41209acf4ed41b16dc4817121a3d86a1aac9c4db3d8c08a55d28257088af32
-a25ba667d832b145f9ce18c3f9b1bd00737aa36db020e1b99752c8ef7d27c6c448982bd8d352e1b6df266b8d8358a8d5
-83734841c13dee12759d40bdd209b277e743b0d08cc0dd1e0b7afd2d65bfa640400eefcf6be4a52e463e5b3d885eeac6
-848d16505b04804afc773aebabb51b36fd8aacfbb0e09b36c0d5d57df3c0a3b92f33e7d5ad0a7006ec46ebb91df42b8c
-909a8d793f599e33bb9f1dc4792a507a97169c87cd5c087310bc05f30afcd247470b4b56dec59894c0fb1d48d39bb54e
-8e558a8559df84a1ba8b244ece667f858095c50bb33a5381e60fcc6ba586b69693566d8819b4246a27287f16846c1dfa
-84d6b69729f5aaa000cd710c2352087592cfbdf20d5e1166977e195818e593fa1a50d1e04566be23163a2523dc1612f1
-9536d262b7a42125d89f4f32b407d737ba8d9242acfc99d965913ab3e043dcac9f7072a43708553562cac4cba841df30
-9598548923ca119d6a15fd10861596601dd1dedbcccca97bb208cdc1153cf82991ea8cc17686fbaa867921065265970c
-b87f2d4af6d026e4d2836bc3d390a4a18e98a6e386282ce96744603bab74974272e97ac2da281afa21885e2cbb3a8001
-991ece62bf07d1a348dd22191868372904b9f8cf065ae7aa4e44fd24a53faf6d851842e35fb472895963aa1992894918
-a8c53dea4c665b30e51d22ca6bc1bc78aaf172b0a48e64a1d4b93439b053877ec26cb5221c55efd64fa841bbf7d5aff4
-93487ec939ed8e740f15335b58617c3f917f72d07b7a369befd479ae2554d04deb240d4a14394b26192efae4d2f4f35d
-a44793ab4035443f8f2968a40e043b4555960193ffa3358d22112093aadfe2c136587e4139ffd46d91ed4107f61ea5e0
-b13fe033da5f0d227c75927d3dacb06dbaf3e1322f9d5c7c009de75cdcba5e308232838785ab69a70f0bedea755e003f
-970a29b075faccd0700fe60d1f726bdebf82d2cc8252f4a84543ebd3b16f91be42a75c9719a39c4096139f0f31393d58
-a4c3eb1f7160f8216fc176fb244df53008ff32f2892363d85254002e66e2de21ccfe1f3b1047589abee50f29b9d507e3
-8c552885eab04ba40922a8f0c3c38c96089c95ff1405258d3f1efe8d179e39e1295cbf67677894c607ae986e4e6b1fb0
-b3671746fa7f848c4e2ae6946894defadd815230b906b419143523cc0597bc1d6c0a4c1e09d49b66b4a2c11cde3a4de3
-937a249a95813a5e2ef428e355efd202e15a37d73e56cfb7e57ea9f943f2ce5ca8026f2f1fd25bf164ba89d07077d858
-83646bdf6053a04aa9e2f112499769e5bd5d0d10f2e13db3ca89bd45c0b3b7a2d752b7d137fb3909f9c62b78166c9339
-b4eac4b91e763666696811b7ed45e97fd78310377ebea1674b58a2250973f80492ac35110ed1240cd9bb2d17493d708c
-82db43a99bc6573e9d92a3fd6635dbbb249ac66ba53099c3c0c8c8080b121dd8243cd5c6e36ba0a4d2525bae57f5c89c
-a64d6a264a681b49d134c655d5fc7756127f1ee7c93d328820f32bca68869f53115c0d27fef35fe71f7bc4fdaed97348
-8739b7a9e2b4bc1831e7f04517771bc7cde683a5e74e052542517f8375a2f64e53e0d5ac925ef722327e7bb195b4d1d9
-8f337cdd29918a2493515ebb5cf702bbe8ecb23b53c6d18920cc22f519e276ca9b991d3313e2d38ae17ae8bdfa4f8b7e
-b0edeab9850e193a61f138ef2739fc42ceec98f25e7e8403bfd5fa34a7bc956b9d0898250d18a69fa4625a9b3d6129da
-a9920f26fe0a6d51044e623665d998745c9eca5bce12051198b88a77d728c8238f97d4196f26e43b24f8841500b998d0
-86e655d61502b979eeeeb6f9a7e1d0074f936451d0a1b0d2fa4fb3225b439a3770767b649256fe481361f481a8dbc276
-84d3b32fa62096831cc3bf013488a9f3f481dfe293ae209ed19585a03f7db8d961a7a9dd0db82bd7f62d612707575d9c
-81c827826ec9346995ffccf62a241e3b2d32f7357acd1b1f8f7a7dbc97022d3eb51b8a1230e23ce0b401d2e535e8cd78
-94a1e40c151191c5b055b21e86f32e69cbc751dcbdf759a48580951834b96a1eed75914c0d19a38aefd21fb6c8d43d0c
-ab890222b44bc21b71f7c75e15b6c6e16bb03371acce4f8d4353ff3b8fcd42a14026589c5ed19555a3e15e4d18bfc3a3
-accb0be851e93c6c8cc64724cdb86887eea284194b10e7a43c90528ed97e9ec71ca69c6fac13899530593756dd49eab2
-b630220aa9e1829c233331413ee28c5efe94ea8ea08d0c6bfd781955078b43a4f92915257187d8526873e6c919c6a1de
-add389a4d358c585f1274b73f6c3c45b58ef8df11f9d11221f620e241bf3579fba07427b288c0c682885a700cc1fa28d
-a9fe6ca8bf2961a3386e8b8dcecc29c0567b5c0b3bcf3b0f9169f88e372b80151af883871fc5229815f94f43a6f5b2b0
-ad839ae003b92b37ea431fa35998b46a0afc3f9c0dd54c3b3bf7a262467b13ff3c323ada1c1ae02ac7716528bdf39e3e
-9356d3fd0edcbbb65713c0f2a214394f831b26f792124b08c5f26e7f734b8711a87b7c4623408da6a091c9aef1f6af3c
-896b25b083c35ac67f0af3784a6a82435b0e27433d4d74cd6d1eafe11e6827827799490fb1c77c11de25f0d75f14e047
-8bfa019391c9627e8e5f05c213db625f0f1e51ec68816455f876c7e55b8f17a4f13e5aae9e3fb9e1cf920b1402ee2b40
-8ba3a6faa6a860a8f3ce1e884aa8769ceded86380a86520ab177ab83043d380a4f535fe13884346c5e51bee68da6ab41
-a8292d0844084e4e3bb7af92b1989f841a46640288c5b220fecfad063ee94e86e13d3d08038ec2ac82f41c96a3bfe14d
-8229bb030b2fc566e11fd33c7eab7a1bb7b49fed872ea1f815004f7398cb03b85ea14e310ec19e1f23e0bdaf60f8f76c
-8cfbf869ade3ec551562ff7f63c2745cc3a1f4d4dc853a0cd42dd5f6fe54228f86195ea8fe217643b32e9f513f34a545
-ac52a3c8d3270ddfe1b5630159da9290a5ccf9ccbdef43b58fc0a191a6c03b8a5974cf6e2bbc7bd98d4a40a3581482d7
-ab13decb9e2669e33a7049b8eca3ca327c40dea15ad6e0e7fa63ed506db1d258bc36ac88b35f65cae0984e937eb6575d
-b5e748eb1a7a1e274ff0cc56311c198f2c076fe4b7e73e5f80396fe85358549df906584e6bb2c8195b3e2be7736850a5
-b5cb911325d8f963c41f691a60c37831c7d3bbd92736efa33d1f77a22b3fde7f283127256c2f47e197571e6fe0b46149
-8a01dc6ed1b55f26427a014faa347130738b191a06b800e32042a46c13f60b49534520214359d68eb2e170c31e2b8672
-a72fa874866e19b2efb8e069328362bf7921ec375e3bcd6b1619384c3f7ee980f6cf686f3544e9374ff54b4d17a1629c
-8db21092f7c5f110fba63650b119e82f4b42a997095d65f08f8237b02dd66fdf959f788df2c35124db1dbd330a235671
-8c65d50433d9954fe28a09fa7ba91a70a590fe7ba6b3060f5e4be0f6cef860b9897fa935fb4ebc42133524eb071dd169
-b4614058e8fa21138fc5e4592623e78b8982ed72aa35ee4391b164f00c68d277fa9f9eba2eeefc890b4e86eba5124591
-ab2ad3a1bce2fbd55ca6b7c23786171fe1440a97d99d6df4d80d07dd56ac2d7203c294b32fc9e10a6c259381a73f24a1
-812ae3315fdc18774a8da3713a4679e8ed10b9405edc548c00cacbe25a587d32040566676f135e4723c5dc25df5a22e9
-a464b75f95d01e5655b54730334f443c8ff27c3cb79ec7af4b2f9da3c2039c609908cd128572e1fd0552eb597e8cef8d
-a0db3172e93ca5138fe419e1c49a1925140999f6eff7c593e5681951ee0ec1c7e454c851782cbd2b8c9bc90d466e90e0
-806db23ba7d00b87d544eed926b3443f5f9c60da6b41b1c489fba8f73593b6e3b46ebfcab671ee009396cd77d5e68aa1
-8bfdf2c0044cc80260994e1c0374588b6653947b178e8b312be5c2a05e05767e98ea15077278506aee7df4fee1aaf89e
-827f6558c16841b5592ff089c9c31e31eb03097623524394813a2e4093ad2d3f8f845504e2af92195aaa8a1679d8d692
-925c4f8eab2531135cd71a4ec88e7035b5eea34ba9d799c5898856080256b4a15ed1a746e002552e2a86c9c157e22e83
-a9f9a368f0e0b24d00a35b325964c85b69533013f9c2cfad9708be5fb87ff455210f8cb8d2ce3ba58ca3f27495552899
-8ac0d3bebc1cae534024187e7c71f8927ba8fcc6a1926cb61c2b6c8f26bb7831019e635a376146c29872a506784a4aaa
-97c577be2cbbfdb37ad754fae9df2ada5fc5889869efc7e18a13f8e502fbf3f4067a509efbd46fd990ab47ce9a70f5a8
-935e7d82bca19f16614aa43b4a3474e4d20d064e4bfdf1cea2909e5c9ab72cfe3e54dc50030e41ee84f3588cebc524e9
-941aafc08f7c0d94cebfbb1f0aad5202c02e6e37f2c12614f57e727efa275f3926348f567107ee6d8914dd71e6060271
-af0fbc1ba05b4b5b63399686df3619968be5d40073de0313cbf5f913d3d4b518d4c249cdd2176468ccaa36040a484f58
-a0c414f23f46ca6d69ce74c6f8a00c036cb0edd098af0c1a7d39c802b52cfb2d5dbdf93fb0295453d4646e2af7954d45
-909cf39e11b3875bb63b39687ae1b5d1f5a15445e39bf164a0b14691b4ddb39a8e4363f584ef42213616abc4785b5d66
-a92bac085d1194fbd1c88299f07a061d0bdd3f980b663e81e6254dbb288bf11478c0ee880e28e01560f12c5ccb3c0103
-841705cd5cd76b943e2b7c5e845b9dd3c8defe8ef67e93078d6d5e67ade33ad4b0fd413bc196f93b0a4073c855cd97d4
-8e7eb8364f384a9161e81d3f1d52ceca9b65536ae49cc35b48c3e2236322ba4ae9973e0840802d9fa4f4d82ea833544f
-aed3ab927548bc8bec31467ba80689c71a168e34f50dcb6892f19a33a099f5aa6b3f9cb79f5c0699e837b9a8c7f27efe
-b8fbf7696210a36e20edabd77839f4dfdf50d6d015cdf81d587f90284a9bcef7d2a1ff520728d7cc69a4843d6c20dedd
-a9d533769ce6830211c884ae50a82a7bf259b44ac71f9fb11f0296fdb3981e6b4c1753fe744647b247ebc433a5a61436
-8b4bdf90d33360b7f428c71cde0a49fb733badba8c726876945f58c620ce7768ae0e98fc8c31fa59d8955a4823336bb1
-808d42238e440e6571c59e52a35ae32547d502dc24fd1759d8ea70a7231a95859baf30b490a4ba55fa2f3aaa11204597
-85594701f1d2fee6dc1956bc44c7b31db93bdeec2f3a7d622c1a08b26994760773e3d57521a44cfd7e407ac3fd430429
-a66de045ce7173043a6825e9dc440ac957e2efb6df0a337f4f8003eb0c719d873a52e6eba3cb0d69d977ca37d9187674
-87a1c6a1fdff993fa51efa5c3ba034c079c0928a7d599b906336af7c2dcab9721ceaf3108c646490af9dff9a754f54b3
-926424223e462ceb75aed7c22ade8a7911a903b7e5dd4bc49746ddce8657f4616325cd12667d4393ac52cdd866396d0e
-b5dc96106593b42b30f06f0b0a1e0c1aafc70432e31807252d3674f0b1ea5e58eac8424879d655c9488d85a879a3e572
-997ca0987735cc716507cb0124b1d266d218b40c9d8e0ecbf26a1d65719c82a637ce7e8be4b4815d307df717bde7c72a
-92994d3f57a569b7760324bb5ae4e8e14e1633d175dab06aa57b8e391540e05f662fdc08b8830f489a063f59b689a688
-a8087fcc6aa4642cb998bea11facfe87eb33b90a9aa428ab86a4124ad032fc7d2e57795311a54ec9f55cc120ebe42df1
-a9bd7d1de6c0706052ca0b362e2e70e8c8f70f1f026ea189b4f87a08ce810297ebfe781cc8004430776c54c1a05ae90c
-856d33282e8a8e33a3d237fb0a0cbabaf77ba9edf2fa35a831fdafcadf620561846aa6cbb6bdc5e681118e1245834165
-9524a7aa8e97a31a6958439c5f3339b19370f03e86b89b1d02d87e4887309dbbe9a3a8d2befd3b7ed5143c8da7e0a8ad
-824fdf433e090f8acbd258ac7429b21f36f9f3b337c6d0b71d1416a5c88a767883e255b2888b7c906dd2e9560c4af24c
-88c7fee662ca7844f42ed5527996b35723abffd0d22d4ca203b9452c639a5066031207a5ae763dbc0865b3299d19b1ec
-919dca5c5595082c221d5ab3a5bc230f45da7f6dec4eb389371e142c1b9c6a2c919074842479c2844b72c0d806170c0c
-b939be8175715e55a684578d8be3ceff3087f60fa875fff48e52a6e6e9979c955efef8ff67cfa2b79499ea23778e33b0
-873b6db725e7397d11bc9bed9ac4468e36619135be686790a79bc6ed4249058f1387c9a802ea86499f692cf635851066
-aeae06db3ec47e9e5647323fa02fac44e06e59b885ad8506bf71b184ab3895510c82f78b6b22a5d978e8218e7f761e9f
-b99c0a8359c72ab88448bae45d4bf98797a26bca48b0d4460cd6cf65a4e8c3dd823970ac3eb774ae5d0cea4e7fadf33e
-8f10c8ec41cdfb986a1647463076a533e6b0eec08520c1562401b36bb063ac972aa6b28a0b6ce717254e35940b900e3c
-a106d9be199636d7add43b942290269351578500d8245d4aae4c083954e4f27f64740a3138a66230391f2d0e6043a8de
-a469997908244578e8909ff57cffc070f1dbd86f0098df3cfeb46b7a085cfecc93dc69ee7cad90ff1dc5a34d50fe580c
-a4ef087bea9c20eb0afc0ee4caba7a9d29dfa872137828c721391273e402fb6714afc80c40e98bbd8276d3836bffa080
-b07a013f73cd5b98dae0d0f9c1c0f35bff8a9f019975c4e1499e9bee736ca6fcd504f9bc32df1655ff333062382cff04
-b0a77188673e87cc83348c4cc5db1eecf6b5184e236220c8eeed7585e4b928db849944a76ec60ef7708ef6dac02d5592
-b1284b37e59b529f0084c0dacf0af6c0b91fc0f387bf649a8c74819debf606f7b07fc3e572500016fb145ec2b24e9f17
-97b20b5b4d6b9129da185adfbf0d3d0b0faeba5b9715f10299e48ea0521709a8296a9264ce77c275a59c012b50b6519a
-b9d37e946fae5e4d65c1fbfacc8a62e445a1c9d0f882e60cca649125af303b3b23af53c81d7bac544fb7fcfc7a314665
-8e5acaac379f4bb0127efbef26180f91ff60e4c525bc9b798fc50dfaf4fe8a5aa84f18f3d3cfb8baead7d1e0499af753
-b0c0b8ab1235bf1cda43d4152e71efc1a06c548edb964eb4afceb201c8af24240bf8ab5cae30a08604e77432b0a5faf0
-8cc28d75d5c8d062d649cbc218e31c4d327e067e6dbd737ec0a35c91db44fbbd0d40ec424f5ed79814add16947417572
-95ae6219e9fd47efaa9cb088753df06bc101405ba50a179d7c9f7c85679e182d3033f35b00dbba71fdcd186cd775c52e
-b5d28fa09f186ebc5aa37453c9b4d9474a7997b8ae92748ecb940c14868792292ac7d10ade01e2f8069242b308cf97e5
-8c922a0faa14cc6b7221f302df3342f38fc8521ec6c653f2587890192732c6da289777a6cd310747ea7b7d104af95995
-b9ad5f660b65230de54de535d4c0fcae5bc6b59db21dea5500fdc12eea4470fb8ea003690fdd16d052523418d5e01e8c
-a39a9dd41a0ff78c82979483731f1cd68d3921c3e9965869662c22e02dde3877802e180ba93f06e7346f96d9fa9261d2
-8b32875977ec372c583b24234c27ed73aef00cdff61eb3c3776e073afbdeade548de9497c32ec6d703ff8ad0a5cb7fe4
-9644cbe755a5642fe9d26cfecf170d3164f1848c2c2e271d5b6574a01755f3980b3fc870b98cf8528fef6ecef4210c16
-81ea9d1fdd9dd66d60f40ce0712764b99da9448ae0b300f8324e1c52f154e472a086dda840cb2e0b9813dc8ce8afd4b5
-906aaa4a7a7cdf01909c5cfbc7ded2abc4b869213cbf7c922d4171a4f2e637e56f17020b852ad339d83b8ac92f111666
-939b5f11acbdeff998f2a080393033c9b9d8d5c70912ea651c53815c572d36ee822a98d6dfffb2e339f29201264f2cf4
-aba4898bf1ccea9b9e2df1ff19001e05891581659c1cbbde7ee76c349c7fc7857261d9785823c9463a8aea3f40e86b38
-83ca1a56b8a0be4820bdb5a9346357c68f9772e43f0b887729a50d2eb2a326bbcede676c8bf2e51d7c89bbd8fdb778a6
-94e86e9fe6addfe2c3ee3a547267ed921f4230d877a85bb4442c2d9350c2fa9a9c54e6fe662de82d1a2407e4ab1691c2
-a0cc3bdef671a59d77c6984338b023fa2b431b32e9ed2abe80484d73edc6540979d6f10812ecc06d4d0c5d4eaca7183c
-b5343413c1b5776b55ea3c7cdd1f3af1f6bd802ea95effe3f2b91a523817719d2ecc3f8d5f3cc2623ace7e35f99ca967
-92085d1ed0ed28d8cabe3e7ff1905ed52c7ceb1eac5503760c52fb5ee3a726aba7c90b483c032acc3f166b083d7ec370
-8ec679520455275cd957fca8122724d287db5df7d29f1702a322879b127bff215e5b71d9c191901465d19c86c8d8d404
-b65eb2c63d8a30332eb24ee8a0c70156fc89325ebbb38bacac7cf3f8636ad8a472d81ccca80423772abc00192d886d8a
-a9fe1c060b974bee4d590f2873b28635b61bfcf614e61ff88b1be3eee4320f4874e21e8d666d8ac8c9aba672efc6ecae
-b3fe2a9a389c006a831dea7e777062df84b5c2803f9574d7fbe10b7e1c125817986af8b6454d6be9d931a5ac94cfe963
-95418ad13b734b6f0d33822d9912c4c49b558f68d08c1b34a0127fcfa666bcae8e6fda8832d2c75bb9170794a20e4d7c
-a9a7df761e7f18b79494bf429572140c8c6e9d456c4d4e336184f3f51525a65eb9582bea1e601bdb6ef8150b7ca736a5
-a0de03b1e75edf7998c8c1ac69b4a1544a6fa675a1941950297917366682e5644a4bda9cdeedfaf9473d7fccd9080b0c
-a61838af8d95c95edf32663a68f007d95167bf6e41b0c784a30b22d8300cfdd5703bd6d16e86396638f6db6ae7e42a85
-8866d62084d905c145ff2d41025299d8b702ac1814a7dec4e277412c161bc9a62fed735536789cb43c88693c6b423882
-91da22c378c81497fe363e7f695c0268443abee50f8a6625b8a41e865638a643f07b157ee566de09ba09846934b4e2d7
-941d21dd57c9496aa68f0c0c05507405fdd413acb59bc668ce7e92e1936c68ec4b065c3c30123319884149e88228f0b2
-a77af9b094bc26966ddf2bf9e1520c898194a5ccb694915950dadc204facbe3066d3d89f50972642d76b14884cfbaa21
-8e76162932346869f4618bde744647f7ab52ab498ad654bdf2a4feeb986ac6e51370841e5acbb589e38b6e7142bb3049
-b60979ace17d6937ece72e4f015da4657a443dd01cebc7143ef11c09e42d4aa8855999a65a79e2ea0067f31c9fc2ab0f
-b3e2ffdd5ee6fd110b982fd4fad4b93d0fca65478f986d086eeccb0804960bfaa1919afa743c2239973ea65091fe57d2
-8ce0ce05e7d7160d44574011da687454dbd3c8b8290aa671731b066e2c82f8cf2d63cb8e932d78c6122ec610e44660e6
-ab005dd8d297045c39e2f72fb1c48edb501ccf3575d3d04b9817b3afee3f0bb0f3f53f64bda37d1d9cde545aae999bae
-95bd7edb4c4cd60e3cb8a72558845a3cce6bb7032ccdf33d5a49ebb6ddf203bc3c79e7b7e550735d2d75b04c8b2441e8
-889953ee256206284094e4735dbbb17975bafc7c3cb94c9fbfee4c3e653857bfd49e818f64a47567f721b98411a3b454
-b188423e707640ab0e75a061e0b62830cde8afab8e1ad3dae30db69ffae4e2fc005bababbdcbd7213b918ed4f70e0c14
-a97e0fafe011abd70d4f99a0b36638b3d6e7354284588f17a88970ed48f348f88392779e9a038c6cbc9208d998485072
-87db11014a91cb9b63e8dfaa82cdebca98272d89eb445ee1e3ff9dbaf2b3fad1a03b888cffc128e4fe208ed0dddece0f
-aad2e40364edd905d66ea4ac9d51f9640d6fda9a54957d26ba233809851529b32c85660fa401dbee3679ec54fa6dd966
-863e99336ca6edf03a5a259e59a2d0f308206e8a2fb320cfc0be06057366df8e0f94b33a28f574092736b3c5ada84270
-b34bcc56a057589f34939a1adc51de4ff6a9f4fee9c7fa9aa131e28d0cf0759a0c871b640162acdfbf91f3f1b59a3703
-935dd28f2896092995c5eff1618e5b6efe7a40178888d7826da9b0503c2d6e68a28e7fac1a334e166d0205f0695ef614
-b842cd5f8f5de5ca6c68cb4a5c1d7b451984930eb4cc18fd0934d52fdc9c3d2d451b1c395594d73bc3451432bfba653f
-9014537885ce2debad736bc1926b25fdab9f69b216bf024f589c49dc7e6478c71d595c3647c9f65ff980b14f4bb2283b
-8e827ccca1dd4cd21707140d10703177d722be0bbe5cac578db26f1ef8ad2909103af3c601a53795435b27bf95d0c9ed
-8a0b8ad4d466c09d4f1e9167410dbe2edc6e0e6229d4b3036d30f85eb6a333a18b1c968f6ca6d6889bb08fecde017ef4
-9241ee66c0191b06266332dc9161dede384c4bb4e116dbd0890f3c3790ec5566da4568243665c4725b718ac0f6b5c179
-aeb4d5fad81d2b505d47958a08262b6f1b1de9373c2c9ba6362594194dea3e002ab03b8cbb43f867be83065d3d370f19
-8781bc83bb73f7760628629fe19e4714b494dbed444c4e4e4729b7f6a8d12ee347841a199888794c2234f51fa26fc2b9
-b58864f0acd1c2afa29367e637cbde1968d18589245d9936c9a489c6c495f54f0113ecdcbe4680ac085dd3c397c4d0c3
-94a24284afaeead61e70f3e30f87248d76e9726759445ca18cdb9360586c60cc9f0ec1c397f9675083e0b56459784e2e
-aed358853f2b54dcbddf865e1816c2e89be12e940e1abfa661e2ee63ffc24a8c8096be2072fa83556482c0d89e975124
-b95374e6b4fc0765708e370bc881e271abf2e35c08b056a03b847e089831ef4fe3124b9c5849d9c276eb2e35b3daf264
-b834cdbcfb24c8f84bfa4c552e7fadc0028a140952fd69ed13a516e1314a4cd35d4b954a77d51a1b93e1f5d657d0315d
-8fb6d09d23bfa90e7443753d45a918d91d75d8e12ec7d016c0dfe94e5c592ba6aaf483d2f16108d190822d955ad9cdc3
-aa315cd3c60247a6ad4b04f26c5404c2713b95972843e4b87b5a36a89f201667d70f0adf20757ebe1de1b29ae27dda50
-a116862dca409db8beff5b1ccd6301cdd0c92ca29a3d6d20eb8b87f25965f42699ca66974dd1a355200157476b998f3b
-b4c2f5fe173c4dc8311b60d04a65ce1be87f070ac42e13cd19c6559a2931c6ee104859cc2520edebbc66a13dc7d30693
-8d4a02bf99b2260c334e7d81775c5cf582b00b0c982ce7745e5a90624919028278f5e9b098573bad5515ce7fa92a80c8
-8543493bf564ce6d97bd23be9bff1aba08bd5821ca834f311a26c9139c92a48f0c2d9dfe645afa95fec07d675d1fd53b
-9344239d13fde08f98cb48f1f87d34cf6abe8faecd0b682955382a975e6eed64e863fa19043290c0736261622e00045c
-aa49d0518f343005ca72b9e6c7dcaa97225ce6bb8b908ebbe7b1a22884ff8bfb090890364e325a0d414ad180b8f161d1
-907d7fd3e009355ab326847c4a2431f688627faa698c13c03ffdd476ecf988678407f029b8543a475dcb3dafdf2e7a9c
-845f1f10c6c5dad2adc7935f5cd2e2b32f169a99091d4f1b05babe7317b9b1cdce29b5e62f947dc621b9acbfe517a258
-8f3be8e3b380ea6cdf9e9c237f5e88fd5a357e5ded80ea1fc2019810814de82501273b4da38916881125b6fa0cfd4459
-b9c7f487c089bf1d20c822e579628db91ed9c82d6ca652983aa16d98b4270c4da19757f216a71b9c13ddee3e6e43705f
-8ba2d8c88ad2b872db104ea8ddbb006ec2f3749fd0e19298a804bb3a5d94de19285cc7fb19fee58a66f7851d1a66c39f
-9375ecd3ed16786fe161af5d5c908f56eeb467a144d3bbddfc767e90065b7c94fc53431adebecba2b6c9b5821184d36e
-a49e069bfadb1e2e8bff6a4286872e2a9765d62f0eaa4fcb0e5af4bbbed8be3510fb19849125a40a8a81d1e33e81c3eb
-9522cc66757b386aa6b88619525c8ce47a5c346d590bb3647d12f991e6c65c3ab3c0cfc28f0726b6756c892eae1672be
-a9a0f1f51ff877406fa83a807aeb17b92a283879f447b8a2159653db577848cc451cbadd01f70441e351e9ed433c18bc
-8ff7533dcff6be8714df573e33f82cf8e9f2bcaaa43e939c4759d52b754e502717950de4b4252fb904560fc31dce94a4
-959724671e265a28d67c29d95210e97b894b360da55e4cf16e6682e7912491ed8ca14bfaa4dce9c25a25b16af580494f
-92566730c3002f4046c737032487d0833c971e775de59fe02d9835c9858e2e3bc37f157424a69764596c625c482a2219
-a84b47ceff13ed9c3e5e9cdf6739a66d3e7c2bd8a6ba318fefb1a9aecf653bb2981da6733ddb33c4b0a4523acc429d23
-b4ddf571317e44f859386d6140828a42cf94994e2f1dcbcc9777f4eebbfc64fc1e160b49379acc27c4672b8e41835c5d
-8ab95c94072b853d1603fdd0a43b30db617d13c1d1255b99075198e1947bfa5f59aed2b1147548a1b5e986cd9173d15c
-89511f2eab33894fd4b3753d24249f410ff7263052c1fef6166fc63a79816656b0d24c529e45ccce6be28de6e375d916
-a0866160ca63d4f2be1b4ea050dac6b59db554e2ebb4e5b592859d8df339b46fd7cb89aaed0951c3ee540aee982c238a
-8fcc5cbba1b94970f5ff2eb1922322f5b0aa7d918d4b380c9e7abfd57afd8b247c346bff7b87af82efbce3052511cd1b
-99aeb2a5e846b0a2874cca02c66ed40d5569eb65ab2495bc3f964a092e91e1517941f2688e79f8cca49cd3674c4e06dc
-b7a096dc3bad5ca49bee94efd884aa3ff5615cf3825cf95fbe0ce132e35f46581d6482fa82666c7ef5f1643eaee8f1ca
-94393b1da6eaac2ffd186b7725eca582f1ddc8cdd916004657f8a564a7c588175cb443fc6943b39029f5bbe0add3fad8
-884b85fe012ccbcd849cb68c3ad832d83b3ef1c40c3954ffdc97f103b1ed582c801e1a41d9950f6bddc1d11f19d5ec76
-b00061c00131eded8305a7ce76362163deb33596569afb46fe499a7c9d7a0734c084d336b38d168024c2bb42b58e7660
-a439153ac8e6ca037381e3240e7ba08d056c83d7090f16ed538df25901835e09e27de2073646e7d7f3c65056af6e4ce7
-830fc9ca099097d1f38b90e6843dc86f702be9d20bdacc3e52cae659dc41df5b8d2c970effa6f83a5229b0244a86fe22
-b81ea2ffaaff2bb00dd59a9ab825ba5eed4db0d8ac9c8ed1a632ce8f086328a1cddd045fbe1ace289083c1325881b7e7
-b51ea03c58daf2db32c99b9c4789b183365168cb5019c72c4cc91ac30b5fb7311d3db76e6fa41b7cd4a8c81e2f6cdc94
-a4170b2c6d09ca5beb08318730419b6f19215ce6c631c854116f904be3bc30dd85a80c946a8ab054d3e307afaa3f8fbc
-897cc42ff28971ff54d2a55dd6b35cfb8610ac902f3c06e3a5cea0e0a257e870c471236a8e84709211c742a09c5601a6
-a18f2e98d389dace36641621488664ecbb422088ab03b74e67009b8b8acacaaa24fdcf42093935f355207d934adc52a8
-92adcfb678cc2ba19c866f3f2b988fdcb4610567f3ab436cc0cb9acaf5a88414848d71133ebdbec1983e38e6190f1b5f
-a86d43c2ce01b366330d3b36b3ca85f000c3548b8297e48478da1ee7d70d8576d4650cba7852ed125c0d7cb6109aa7f3
-8ed31ceed9445437d7732dce78a762d72ff32a7636bfb3fd7974b7ae15db414d8184a1766915244355deb354fbc5803b
-9268f70032584f416e92225d65af9ea18c466ebc7ae30952d56a4e36fd9ea811dde0a126da9220ba3c596ec54d8a335e
-9433b99ee94f2d3fbdd63b163a2bdf440379334c52308bd24537f7defd807145a062ff255a50d119a7f29f4b85d250e3
-90ce664f5e4628a02278f5cf5060d1a34f123854634b1870906e5723ac9afd044d48289be283b267d45fcbf3f4656aaf
-aaf21c4d59378bb835d42ae5c5e5ab7a3c8c36a59e75997989313197752b79a472d866a23683b329ea69b048b87fa13e
-b83c0589b304cec9ede549fde54f8a7c2a468c6657da8c02169a6351605261202610b2055c639b9ed2d5b8c401fb8f56
-9370f326ea0f170c2c05fe2c5a49189f20aec93b6b18a5572a818cd4c2a6adb359e68975557b349fb54f065d572f4c92
-ac3232fa5ce6f03fca238bef1ce902432a90b8afce1c85457a6bee5571c033d4bceefafc863af04d4e85ac72a4d94d51
-80d9ea168ff821b22c30e93e4c7960ce3ad3c1e6deeebedd342a36d01bd942419b187e2f382dbfd8caa34cca08d06a48
-a387a3c61676fb3381eefa2a45d82625635a666e999aba30e3b037ec9e040f414f9e1ad9652abd3bcad63f95d85038db
-a1b229fe32121e0b391b0f6e0180670b9dc89d79f7337de4c77ea7ad0073e9593846f06797c20e923092a08263204416
-92164a9d841a2b828cedf2511213268b698520f8d1285852186644e9a0c97512cafa4bfbe29af892c929ebccd102e998
-82ee2fa56308a67c7db4fd7ef539b5a9f26a1c2cc36da8c3206ba4b08258fbb3cec6fe5cdbd111433fb1ba2a1e275927
-8c77bfe9e191f190a49d46f05600603fa42345592539b82923388d72392404e0b29a493a15e75e8b068dddcd444c2928
-80b927f93ccf79dcf5c5b20bcf5a7d91d7a17bc0401bb7cc9b53a6797feac31026eb114257621f5a64a52876e4474cc1
-b6b68b6501c37804d4833d5a063dd108a46310b1400549074e3cac84acc6d88f73948b7ad48d686de89c1ec043ae8c1a
-ab3da00f9bdc13e3f77624f58a3a18fc3728956f84b5b549d62f1033ae4b300538e53896e2d943f160618e05af265117
-b6830e87233b8eace65327fdc764159645b75d2fd4024bf8f313b2dd5f45617d7ecfb4a0b53ccafb5429815a9a1adde6
-b9251cfe32a6dc0440615aadcd98b6b1b46e3f4e44324e8f5142912b597ee3526bea2431e2b0282bb58f71be5b63f65e
-af8d70711e81cdddfb39e67a1b76643292652584c1ce7ce4feb1641431ad596e75c9120e85f1a341e7a4da920a9cdd94
-98cd4e996594e89495c078bfd52a4586b932c50a449a7c8dfdd16043ca4cda94dafbaa8ad1b44249c99bbcc52152506e
-b9fc6d1c24f48404a4a64fbe3e43342738797905db46e4132aee5f086aaa4c704918ad508aaefa455cfe1b36572e6242
-a365e871d30ba9291cedaba1be7b04e968905d003e9e1af7e3b55c5eb048818ae5b913514fb08b24fb4fbdccbb35d0b8
-93bf99510971ea9af9f1e364f1234c898380677c8e8de9b0dd24432760164e46c787bc9ec42a7ad450500706cf247b2d
-b872f825a5b6e7b9c7a9ddfeded3516f0b1449acc9b4fd29fc6eba162051c17416a31e5be6d3563f424d28e65bab8b8f
-b06b780e5a5e8eb4f4c9dc040f749cf9709c8a4c9ef15e925f442b696e41e5095db0778a6c73bcd329b265f2c6955c8b
-848f1a981f5fc6cd9180cdddb8d032ad32cdfa614fc750d690dbae36cc0cd355cbf1574af9b3ffc8b878f1b2fafb9544
-a03f48cbff3e9e8a3a655578051a5ae37567433093ac500ed0021c6250a51b767afac9bdb194ee1e3eac38a08c0eaf45
-b5be78ce638ff8c4aa84352b536628231d3f7558c5be3bf010b28feac3022e64691fa672f358c8b663904aebe24a54ed
-a9d4da70ff676fa55d1728ba6ab03b471fa38b08854d99e985d88c2d050102d8ccffbe1c90249a5607fa7520b15fe791
-8fe9f7092ffb0b69862c8e972fb1ecf54308c96d41354ed0569638bb0364f1749838d6d32051fff1599112978c6e229c
-ae6083e95f37770ecae0df1e010456f165d96cfe9a7278c85c15cffd61034081ce5723e25e2bede719dc9341ec8ed481
-a260891891103089a7afbd9081ea116cfd596fd1015f5b65e10b0961eb37fab7d09c69b7ce4be8bf35e4131848fb3fe4
-8d729fa32f6eb9fd2f6a140bef34e8299a2f3111bffd0fe463aa8622c9d98bfd31a1df3f3e87cd5abc52a595f96b970e
-a30ec6047ae4bc7da4daa7f4c28c93aedb1112cfe240e681d07e1a183782c9ff6783ac077c155af23c69643b712a533f
-ac830726544bfe7b5467339e5114c1a75f2a2a8d89453ce86115e6a789387e23551cd64620ead6283dfa4538eb313d86
-8445c135b7a48068d8ed3e011c6d818cfe462b445095e2fbf940301e50ded23f272d799eea47683fc027430ce14613ef
-95785411715c9ae9d8293ce16a693a2aa83e3cb1b4aa9f76333d0da2bf00c55f65e21e42e50e6c5772ce213dd7b4f7a0
-b273b024fa18b7568c0d1c4d2f0c4e79ec509dafac8c5951f14192d63ddbcf2d8a7512c1c1b615cc38fa3e336618e0c5
-a78b9d3ea4b6a90572eb27956f411f1d105fdb577ee2ffeec9f221da9b45db84bfe866af1f29597220c75e0c37a628d8
-a4be2bf058c36699c41513c4d667681ce161a437c09d81383244fc55e1c44e8b1363439d0cce90a3e44581fb31d49493
-b6eef13040f17dd4eba22aaf284d2f988a4a0c4605db44b8d2f4bf9567ac794550b543cc513c5f3e2820242dd704152e
-87eb00489071fa95d008c5244b88e317a3454652dcb1c441213aa16b28cd3ecaa9b22fec0bdd483c1df71c37119100b1
-92d388acdcb49793afca329cd06e645544d2269234e8b0b27d2818c809c21726bc9cf725651b951e358a63c83dedee24
-ae27e219277a73030da27ab5603c72c8bd81b6224b7e488d7193806a41343dff2456132274991a4722fdb0ef265d04cd
-97583e08ecb82bbc27c0c8476d710389fa9ffbead5c43001bd36c1b018f29faa98de778644883e51870b69c5ffb558b5
-90a799a8ce73387599babf6b7da12767c0591cadd36c20a7990e7c05ea1aa2b9645654ec65308ee008816623a2757a6a
-a1b47841a0a2b06efd9ab8c111309cc5fc9e1d5896b3e42ed531f6057e5ade8977c29831ce08dbda40348386b1dcc06d
-b92b8ef59bbddb50c9457691bc023d63dfcc54e0fd88bd5d27a09e0d98ac290fc90e6a8f6b88492043bf7c87fac8f3e4
-a9d6240b07d62e22ec8ab9b1f6007c975a77b7320f02504fc7c468b4ee9cfcfd945456ff0128bc0ef2174d9e09333f8d
-8e96534c94693226dc32bca79a595ca6de503af635f802e86442c67e77564829756961d9b701187fe91318da515bf0e6
-b6ba290623cd8dd5c2f50931c0045d1cfb0c30877bc8fe58cbc3ff61ee8da100045a39153916efa1936f4aee0892b473
-b43baa7717fac02d4294f5b3bb5e58a65b3557747e3188b482410388daac7a9c177f762d943fd5dcf871273921213da8
-b9cf00f8fb5e2ef2b836659fece15e735060b2ea39b8e901d3dcbdcf612be8bf82d013833718c04cd46ffaa70b85f42e
-8017d0c57419e414cbba504368723e751ef990cc6f05dad7b3c2de6360adc774ad95512875ab8337d110bf39a42026fa
-ae7401048b838c0dcd4b26bb6c56d79d51964a0daba780970b6c97daee4ea45854ea0ac0e4139b3fe60dac189f84df65
-887b237b0cd0f816b749b21db0b40072f9145f7896c36916296973f9e6990ede110f14e5976c906d08987c9836cca57f
-a88c3d5770148aee59930561ca1223aceb2c832fb5417e188dca935905301fc4c6c2c9270bc1dff7add490a125eb81c6
-b6cf9b02c0cd91895ad209e38c54039523f137b5848b9d3ad33ae43af6c20c98434952db375fe378de7866f2d0e8b18a
-84ef3d322ff580c8ad584b1fe4fe346c60866eb6a56e982ba2cf3b021ecb1fdb75ecc6c29747adda86d9264430b3f816
-a0561c27224baf0927ad144cb71e31e54a064c598373fcf0d66aebf98ab7af1d8e2f343f77baefff69a6da750a219e11
-aa5cc43f5b8162b016f5e1b61214c0c9d15b1078911c650b75e6cdfb49b85ee04c6739f5b1687d15908444f691f732de
-ad4ac099b935589c7b8fdfdf3db332b7b82bb948e13a5beb121ebd7db81a87d278024a1434bcf0115c54ca5109585c3d
-8a00466abf3f109a1dcd19e643b603d3af23d42794ef8ca2514dd507ecea44a031ac6dbc18bd02f99701168b25c1791e
-b00b5900dfad79645f8bee4e5adc7b84eb22e5b1e67df77ccb505b7fc044a6c08a8ea5faca662414eb945f874f884cea
-950e204e5f17112250b22ea6bb8423baf522fc0af494366f18fe0f949f51d6e6812074a80875cf1ed9c8e7420058d541
-91e5cbf8bb1a1d50c81608c9727b414d0dd2fb467ebc92f100882a3772e54f94979cfdf8e373fdef7c7fcdd60fec9e00
-a093f6a857b8caaff80599c2e89c962b415ecbaa70d8fd973155fa976a284c6b29a855f5f7a3521134d00d2972755188
-b4d55a3551b00da54cc010f80d99ddd2544bde9219a3173dfaadf3848edc7e4056ab532fb75ac26f5f7141e724267663
-a03ea050fc9b011d1b04041b5765d6f6453a93a1819cd9bd6328637d0b428f08526466912895dcc2e3008ee58822e9a7
-99b12b3665e473d01bc6985844f8994fb65cb15745024fb7af518398c4a37ff215da8f054e8fdf3286984ae36a73ca5e
-9972c7e7a7fb12e15f78d55abcaf322c11249cd44a08f62c95288f34f66b51f146302bce750ff4d591707075d9123bd2
-a64b4a6d72354e596d87cda213c4fc2814009461570ccb27d455bbe131f8d948421a71925425b546d8cf63d5458cd64b
-91c215c73b195795ede2228b7ed1f6e37892e0c6b0f4a0b5a16c57aa1100c84df9239054a173b6110d6c2b7f4bf1ce52
-88807198910ec1303480f76a3683870246a995e36adaeadc29c22f0bdba8152fe705bd070b75de657b04934f7d0ccf80
-b37c0026c7b32eb02cacac5b55cb5fe784b8e48b2945c64d3037af83ece556a117f0ff053a5968c2f5fa230e291c1238
-94c768384ce212bc2387e91ce8b45e4ff120987e42472888a317abc9dcdf3563b62e7a61c8e98d7cdcbe272167d91fc6
-a10c2564936e967a390cb14ef6e8f8b04ea9ece5214a38837eda09e79e0c7970b1f83adf017c10efd6faa8b7ffa2c567
-a5085eed3a95f9d4b1269182ea1e0d719b7809bf5009096557a0674bde4201b0ddc1f0f16a908fc468846b3721748ce3
-87468eb620b79a0a455a259a6b4dfbc297d0d53336537b771254dd956b145dc816b195b7002647ea218552e345818a3f
-ace2b77ffb87366af0a9cb5d27d6fc4a14323dbbf1643f5f3c4559306330d86461bb008894054394cbfaefeaa0bc2745
-b27f56e840a54fbd793f0b7a7631aa4cee64b5947e4382b2dfb5eb1790270288884c2a19afebe5dc0c6ef335d4531c1c
-876e438633931f7f895062ee16c4b9d10428875f7bc79a8e156a64d379a77a2c45bf5430c5ab94330f03da352f1e9006
-a2512a252587d200d2092b44c914df54e04ff8bcef36bf631f84bde0cf5a732e3dc7f00f662842cfd74b0b0f7f24180e
-827f1bc8f54a35b7a4bd8154f79bcc055e45faed2e74adf7cf21cca95df44d96899e847bd70ead6bb27b9c0ed97bbd8b
-a0c92cf5a9ed843714f3aea9fe7b880f622d0b4a3bf66de291d1b745279accf6ba35097849691370f41732ba64b5966b
-a63f5c1e222775658421c487b1256b52626c6f79cb55a9b7deb2352622cedffb08502042d622eb3b02c97f9c09f9c957
-8cc093d52651e65fb390e186db6cc4de559176af4624d1c44cb9b0e836832419dacac7b8db0627b96288977b738d785d
-aa7b6a17dfcec146134562d32a12f7bd7fe9522e300859202a02939e69dbd345ed7ff164a184296268f9984f9312e8fc
-8ac76721f0d2b679f023d06cbd28c85ae5f4b43c614867ccee88651d4101d4fd352dbdb65bf36bfc3ebc0109e4b0c6f9
-8d350f7c05fc0dcd9a1170748846fb1f5d39453e4cb31e6d1457bed287d96fc393b2ecc53793ca729906a33e59c6834a
-b9913510dfc5056d7ec5309f0b631d1ec53e3a776412ada9aefdaf033c90da9a49fdde6719e7c76340e86599b1f0eec2
-94955626bf4ce87612c5cfffcf73bf1c46a4c11a736602b9ba066328dc52ad6d51e6d4f53453d4ed55a51e0aad810271
-b0fcab384fd4016b2f1e53f1aafd160ae3b1a8865cd6c155d7073ecc1664e05b1d8bca1def39c158c7086c4e1103345e
-827de3f03edfbde08570b72de6662c8bfa499b066a0a27ebad9b481c273097d17a5a0a67f01553da5392ec3f149b2a78
-ab7940384c25e9027c55c40df20bd2a0d479a165ced9b1046958353cd69015eeb1e44ed2fd64e407805ba42df10fc7bf
-8ad456f6ff8cd58bd57567d931f923d0c99141978511b17e03cab7390a72b9f62498b2893e1b05c7c22dd274e9a31919
-ac75399e999effe564672db426faa17a839e57c5ef735985c70cd559a377adec23928382767b55ed5a52f7b11b54b756
-b17f975a00b817299ac7af5f2024ea820351805df58b43724393bfb3920a8cd747a3bbd4b8286e795521489db3657168
-a2bed800a6d95501674d9ee866e7314063407231491d794f8cf57d5be020452729c1c7cefd8c50dc1540181f5caab248
-9743f5473171271ffdd3cc59a3ae50545901a7b45cd4bc3570db487865f3b73c0595bebabbfe79268809ee1862e86e4a
-b7eab77c2d4687b60d9d7b04e842b3880c7940140012583898d39fcc22d9b9b0a9be2c2e3788b3e6f30319b39c338f09
-8e2b8f797a436a1b661140e9569dcf3e1eea0a77c7ff2bc4ff0f3e49af04ed2de95e255df8765f1d0927fb456a9926b1
-8aefea201d4a1f4ff98ffce94e540bb313f2d4dfe7e9db484a41f13fc316ed02b282e1acc9bc6f56cad2dc2e393a44c9
-b950c17c0e5ca6607d182144aa7556bb0efe24c68f06d79d6413a973b493bfdf04fd147a4f1ab03033a32004cc3ea66f
-b7b8dcbb179a07165f2dc6aa829fad09f582a71b05c3e3ea0396bf9e6fe73076f47035c031c2101e8e38e0d597eadd30
-a9d77ed89c77ec1bf8335d08d41c3c94dcca9fd1c54f22837b4e54506b212aa38d7440126c80648ab7723ff18e65ed72
-a819d6dfd4aef70e52b8402fe5d135f8082d40eb7d3bb5c4d7997395b621e2bb10682a1bad2c9caa33dd818550fc3ec6
-8f6ee34128fac8bbf13ce2d68b2bb363eb4fd65b297075f88e1446ddeac242500eeb4ef0735e105882ff5ba8c44c139b
-b4440e48255c1644bcecf3a1e9958f1ec4901cb5b1122ee5b56ffd02cad1c29c4266999dbb85aa2605c1b125490074d4
-a43304a067bede5f347775d5811cf65a6380a8d552a652a0063580b5c5ef12a0867a39c7912fa219e184f4538eba1251
-a891ad67a790089ffc9f6d53e6a3d63d3556f5f693e0cd8a7d0131db06fd4520e719cfcc3934f0a8f62a95f90840f1d4
-aea6df8e9bb871081aa0fc5a9bafb00be7d54012c5baf653791907d5042a326aeee966fd9012a582cc16695f5baf7042
-8ffa2660dc52ed1cd4eff67d6a84a8404f358a5f713d04328922269bee1e75e9d49afeec0c8ad751620f22352a438e25
-87ec6108e2d63b06abed350f8b363b7489d642486f879a6c3aa90e5b0f335efc2ff2834eef9353951a42136f8e6a1b32
-865619436076c2760d9e87ddc905023c6de0a8d56eef12c98a98c87837f2ca3f27fd26a2ad752252dbcbe2b9f1d5a032
-980437dce55964293cb315c650c5586ffd97e7a944a83f6618af31c9d92c37b53ca7a21bb5bc557c151b9a9e217e7098
-95d128fc369df4ad8316b72aea0ca363cbc7b0620d6d7bb18f7076a8717a6a46956ff140948b0cc4f6d2ce33b5c10054
-8c7212d4a67b9ec70ebbca04358ad2d36494618d2859609163526d7b3acc2fc935ca98519380f55e6550f70a9bc76862
-893a2968819401bf355e85eee0f0ed0406a6d4a7d7f172d0017420f71e00bb0ba984f6020999a3cdf874d3cd8ebcd371
-9103c1af82dece25d87274e89ea0acd7e68c2921c4af3d8d7c82ab0ed9990a5811231b5b06113e7fa43a6bd492b4564f
-99cfd87a94eab7d35466caa4ed7d7bb45e5c932b2ec094258fb14bf205659f83c209b83b2f2c9ccb175974b2a33e7746
-874b6b93e4ee61be3f00c32dd84c897ccd6855c4b6251eb0953b4023634490ed17753cd3223472873cbc6095b2945075
-84a32c0dc4ea60d33aac3e03e70d6d639cc9c4cc435c539eff915017be3b7bdaba33349562a87746291ebe9bc5671f24
-a7057b24208928ad67914e653f5ac1792c417f413d9176ba635502c3f9c688f7e2ee81800d7e3dc0a340c464da2fd9c5
-a03fb9ed8286aacfa69fbd5d953bec591c2ae4153400983d5dbb6cd9ea37fff46ca9e5cceb9d117f73e9992a6c055ad2
-863b2de04e89936c9a4a2b40380f42f20aefbae18d03750fd816c658aee9c4a03df7b12121f795c85d01f415baaeaa59
-8526eb9bd31790fe8292360d7a4c3eed23be23dd6b8b8f01d2309dbfdc0cfd33ad1568ddd7f8a610f3f85a9dfafc6a92
-b46ab8c5091a493d6d4d60490c40aa27950574a338ea5bbc045be3a114af87bdcb160a8c80435a9b7ad815f3cb56a3f3
-aeadc47b41a8d8b4176629557646202f868b1d728b2dda58a347d937e7ffc8303f20d26d6c00b34c851b8aeec547885d
-aebb19fc424d72c1f1822aa7adc744cd0ef7e55727186f8df8771c784925058c248406ebeeaf3c1a9ee005a26e9a10c6
-8ff96e81c1a4a2ab1b4476c21018fae0a67e92129ee36120cae8699f2d7e57e891f5c624902cb1b845b944926a605cc3
-8251b8d2c43fadcaa049a9e7aff838dae4fb32884018d58d46403ac5f3beb5c518bfd45f03b8abb710369186075eb71c
-a8b2a64f865f51a5e5e86a66455c093407933d9d255d6b61e1fd81ffafc9538d73caaf342338a66ba8ee166372a3d105
-aad915f31c6ba7fdc04e2aaac62e84ef434b7ee76a325f07dc430d12c84081999720181067b87d792efd0117d7ee1eab
-a13db3bb60389883fd41d565c54fb5180d9c47ce2fe7a169ae96e01d17495f7f4fa928d7e556e7c74319c4c25d653eb2
-a4491b0198459b3f552855d680a59214eb74e6a4d6c5fa3b309887dc50ebea2ecf6d26c040550f7dc478b452481466fb
-8f017f13d4b1e3f0c087843582b52d5f8d13240912254d826dd11f8703a99a2f3166dfbdfdffd9a3492979d77524276b
-96c3d5dcd032660d50d7cd9db2914f117240a63439966162b10c8f1f3cf74bc83b0f15451a43b31dbd85e4a7ce0e4bb1
-b479ec4bb79573d32e0ec93b92bdd7ec8c26ddb5a2d3865e7d4209d119fd3499eaac527615ffac78c440e60ef3867ae0
-b2c49c4a33aa94b52b6410b599e81ff15490aafa7e43c8031c865a84e4676354a9c81eb4e7b8be6825fdcefd1e317d44
-906dc51d6a90c089b6704b47592805578a6eed106608eeb276832f127e1b8e858b72e448edcbefb497d152447e0e68ff
-b0e81c63b764d7dfbe3f3fddc9905aef50f3633e5d6a4af6b340495124abedcff5700dfd1577bbbed7b6bf97d02719cb
-9304c64701e3b4ed6d146e48a881f7d83a17f58357cca0c073b2bb593afd2d94f6e2a7a1ec511d0a67ad6ff4c3be5937
-b6fdbd12ba05aa598d80b83f70a15ef90e5cba7e6e75fa038540ee741b644cd1f408a6cecfd2a891ef8d902de586c6b5
-b80557871a6521b1b3c74a1ba083ae055b575df607f1f7b04c867ba8c8c181ea68f8d90be6031f4d25002cca27c44da2
-aa7285b8e9712e06b091f64163f1266926a36607f9d624af9996856ed2aaf03a580cb22ce407d1ade436c28b44ca173f
-8148d72b975238b51e6ea389e5486940d22641b48637d7dfadfa603a605bfc6d74a016480023945d0b85935e396aea5d
-8a014933a6aea2684b5762af43dcf4bdbb633cd0428d42d71167a2b6fc563ece5e618bff22f1db2ddb69b845b9a2db19
-990d91740041db770d0e0eb9d9d97d826f09fd354b91c41e0716c29f8420e0e8aac0d575231efba12fe831091ec38d5a
-9454d0d32e7e308ddec57cf2522fb1b67a2706e33fb3895e9e1f18284129ab4f4c0b7e51af25681d248d7832c05eb698
-a5bd434e75bac105cb3e329665a35bce6a12f71dd90c15165777d64d4c13a82bceedb9b48e762bd24034e0fc9fbe45f4
-b09e3b95e41800d4dc29c6ffdaab2cd611a0050347f6414f154a47ee20ee59bf8cf7181454169d479ebce1eb5c777c46
-b193e341d6a047d15eea33766d656d807b89393665a783a316e9ba10518e5515c8e0ade3d6e15641d917a8a172a5a635
-ade435ec0671b3621dde69e07ead596014f6e1daa1152707a8c18877a8b067bde2895dd47444ffa69db2bbef1f1d8816
-a7fd3d6d87522dfc56fb47aef9ce781a1597c56a8bbfd796baba907afdc872f753d732bfda1d3402aee6c4e0c189f52d
-a298cb4f4218d0464b2fab393e512bbc477c3225aa449743299b2c3572f065bc3a42d07e29546167ed9e1b6b3b3a3af3
-a9ee57540e1fd9c27f4f0430d194b91401d0c642456c18527127d1f95e2dba41c2c86d1990432eb38a692fda058fafde
-81d6c1a5f93c04e6d8e5a7e0678c1fc89a1c47a5c920bcd36180125c49fcf7c114866b90e90a165823560b19898a7c16
-a4b7a1ec9e93c899b9fd9aaf264c50e42c36c0788d68296a471f7a3447af4dbc81e4fa96070139941564083ec5b5b5a1
-b3364e327d381f46940c0e11e29f9d994efc6978bf37a32586636c0070b03e4e23d00650c1440f448809e1018ef9f6d8
-8056e0913a60155348300e3a62e28b5e30629a90f7dd4fe11289097076708110a1d70f7855601782a3cdc5bdb1ca9626
-b4980fd3ea17bac0ba9ee1c470b17e575bb52e83ebdd7d40c93f4f87bebeaff1c8a679f9d3d09d635f068d37d5bd28bd
-905a9299e7e1853648e398901dfcd437aa575c826551f83520df62984f5679cb5f0ea86aa45ed3e18b67ddc0dfafe809
-ab99553bf31a84f2e0264eb34a08e13d8d15e2484aa9352354becf9a15999c76cc568d68274b70a65e49703fc23540d0
-a43681597bc574d2dae8964c9a8dc1a07613d7a1272bdcb818d98c85d44e16d744250c33f3b5e4d552d97396b55e601f
-a54e5a31716fccb50245898c99865644405b8dc920ded7a11f3d19bdc255996054b268e16f2e40273f11480e7145f41e
-8134f3ad5ef2ad4ba12a8a4e4d8508d91394d2bcdc38b7c8c8c0b0a820357ac9f79d286c65220f471eb1adca1d98fc68
-94e2f755e60471578ab2c1adb9e9cea28d4eec9b0e92e0140770bca7002c365fcabfe1e5fb4fe6cfe79a0413712aa3ef
-ad48f8d0ce7eb3cc6e2a3086ad96f562e5bed98a360721492ae2e74dc158586e77ec8c35d5fd5927376301b7741bad2b
-8614f0630bdd7fbad3a31f55afd9789f1c605dc85e7dc67e2edfd77f5105f878bb79beded6e9f0b109e38ea7da67e8d5
-9804c284c4c5e77dabb73f655b12181534ca877c3e1e134aa3f47c23b7ec92277db34d2b0a5d38d2b69e5d1c3008a3e3
-a51b99c3088e473afdaa9e0a9f7e75a373530d3b04e44e1148da0726b95e9f5f0c7e571b2da000310817c36f84b19f7f
-ac4ff909933b3b76c726b0a382157cdc74ab851a1ac6cef76953c6444441804cc43abb883363f416592e8f6cfbc4550b
-ae7d915eb9fc928b65a29d6edbc75682d08584d0014f7bcf17d59118421ae07d26a02137d1e4de6938bcd1ab8ef48fad
-852f7e453b1af89b754df6d11a40d5d41ea057376e8ecacd705aacd2f917457f4a093d6b9a8801837fa0f62986ad7149
-92c6bf5ada5d0c3d4dd8058483de36c215fa98edab9d75242f3eff9db07c734ad67337da6f0eefe23a487bf75a600dee
-a2b42c09d0db615853763552a48d2e704542bbd786aae016eb58acbf6c0226c844f5fb31e428cb6450b9db855f8f2a6f
-880cc07968266dbfdcfbc21815cd69e0eddfee239167ac693fb0413912d816f2578a74f7716eecd6deefa68c6eccd394
-b885b3ace736cd373e8098bf75ba66fa1c6943ca1bc4408cd98ac7074775c4478594f91154b8a743d9c697e1b29f5840
-a51ce78de512bd87bfa0835de819941dffbf18bec23221b61d8096fc9436af64e0693c335b54e7bfc763f287bdca2db6
-a3c76166a3bdb9b06ef696e57603b58871bc72883ee9d45171a30fe6e1d50e30bc9c51b4a0f5a7270e19a77b89733850
-acefc5c6f8a1e7c24d7b41e0fc7f6f3dc0ede6cf3115ffb9a6e54b1d954cbca9bda8ad7a084be9be245a1b8e9770d141
-b420ed079941842510e31cfad117fa11fb6b4f97dfbc6298cb840f27ebaceba23eeaf3f513bcffbf5e4aae946310182d
-95c3bb5ef26c5ed2f035aa5d389c6b3c15a6705b9818a3fefaed28922158b35642b2e8e5a1a620fdad07e75ad4b43af4
-825149f9081ecf07a2a4e3e8b5d21bade86c1a882475d51c55ee909330b70c5a2ac63771c8600c6f38df716af61a3ea1
-873b935aae16d9f08adbc25353cee18af2f1b8d5f26dec6538d6bbddc515f2217ed7d235dcfea59ae61b428798b28637
-9294150843a2bedcedb3bb74c43eb28e759cf9499582c5430bccefb574a8ddd4f11f9929257ff4c153990f9970a2558f
-b619563a811cc531da07f4f04e5c4c6423010ff9f8ed7e6ec9449162e3d501b269fb1c564c09c0429431879b0f45df02
-91b509b87eb09f007d839627514658c7341bc76d468920fe8a740a8cb96a7e7e631e0ea584a7e3dc1172266f641d0f5c
-8b8aceace9a7b9b4317f1f01308c3904d7663856946afbcea141a1c615e21ccad06b71217413e832166e9dd915fbe098
-87b3b36e725833ea0b0f54753c3728c0dbc87c52d44d705ffc709f2d2394414c652d3283bab28dcce09799504996cee0
-b2670aad5691cbf308e4a6a77a075c4422e6cbe86fdba24e9f84a313e90b0696afb6a067eebb42ba2d10340d6a2f6e51
-876784a9aff3d54faa89b2bacd3ff5862f70195d0b2edc58e8d1068b3c9074c0da1cfa23671fe12f35e33b8a329c0ccd
-8b48b9e758e8a8eae182f5cbec96f67d20cca6d3eee80a2d09208eb1d5d872e09ef23d0df8ebbb9b01c7449d0e3e3650
-b79303453100654c04a487bdcadc9e3578bc80930c489a7069a52e8ca1dba36c492c8c899ce025f8364599899baa287d
-961b35a6111da54ece6494f24dacd5ea46181f55775b5f03df0e370c34a5046ac2b4082925855325bb42bc2a2c98381d
-a31feb1be3f5a0247a1f7d487987eb622e34fca817832904c6ee3ee60277e5847945a6f6ea1ac24542c72e47bdf647df
-a12a2aa3e7327e457e1aae30e9612715dd2cfed32892c1cd6dcda4e9a18203af8a44afb46d03b2eed89f6b9c5a2c0c23
-a08265a838e69a2ca2f80fead6ccf16f6366415b920c0b22ee359bcd8d4464ecf156f400a16a7918d52e6d733dd64211
-b723d6344e938d801cca1a00032af200e541d4471fd6cbd38fb9130daa83f6a1dffbbe7e67fc20f9577f884acd7594b2
-a6733d83ec78ba98e72ddd1e7ff79b7adb0e559e256760d0c590a986e742445e8cdf560d44b29439c26d87edd0b07c8c
-a61c2c27d3f7b9ff4695a17afedf63818d4bfba390507e1f4d0d806ce8778d9418784430ce3d4199fd3bdbc2504d2af3
-8332f3b63a6dc985376e8b1b25eeae68be6160fbe40053ba7bcf6f073204f682da72321786e422d3482fd60c9e5aa034
-a280f44877583fbb6b860d500b1a3f572e3ee833ec8f06476b3d8002058e25964062feaa1e5bec1536d734a5cfa09145
-a4026a52d277fcea512440d2204f53047718ebfcae7b48ac57ea7f6bfbc5de9d7304db9a9a6cbb273612281049ddaec5
-95cdf69c831ab2fad6c2535ede9c07e663d2ddccc936b64e0843d2df2a7b1c31f1759c3c20f1e7a57b1c8f0dbb21b540
-95c96cec88806469c277ab567863c5209027cecc06c7012358e5f555689c0d9a5ffb219a464f086b45817e8536b86d2f
-afe38d4684132a0f03d806a4c8df556bf589b25271fbc6fe2e1ed16de7962b341c5003755da758d0959d2e6499b06c68
-a9b77784fda64987f97c3a23c5e8f61b918be0f7c59ba285084116d60465c4a2aaafc8857eb16823282cc83143eb9126
-a830f05881ad3ce532a55685877f529d32a5dbe56cea57ffad52c4128ee0fad0eeaf0da4362b55075e77eda7babe70e5
-992b3ad190d6578033c13ed5abfee4ef49cbc492babb90061e3c51ee4b5790cdd4c8fc1abff1fa2c00183b6b64f0bbbe
-b1015424d9364aeff75de191652dc66484fdbec3e98199a9eb9671ec57bec6a13ff4b38446e28e4d8aedb58dd619cd90
-a745304604075d60c9db36cada4063ac7558e7ec2835d7da8485e58d8422e817457b8da069f56511b02601289fbb8981
-a5ba4330bc5cb3dbe0486ddf995632a7260a46180a08f42ae51a2e47778142132463cc9f10021a9ad36986108fefa1a9
-b419e9fd4babcaf8180d5479db188bb3da232ae77a1c4ed65687c306e6262f8083070a9ac32220cddb3af2ec73114092
-a49e23dc5f3468f3bf3a0bb7e4a114a788b951ff6f23a3396ae9e12cbff0abd1240878a3d1892105413dbc38818e807c
-b7ecc7b4831f650202987e85b86bc0053f40d983f252e9832ef503aea81c51221ce93279da4aa7466c026b2d2070e55d
-96a8c35cb87f84fa84dcd6399cc2a0fd79cc9158ef4bdde4bae31a129616c8a9f2576cd19baa3f497ca34060979aed7d
-8681b2c00aa62c2b519f664a95dcb8faef601a3b961bb4ce5d85a75030f40965e2983871d41ea394aee934e859581548
-85c229a07efa54a713d0790963a392400f55fbb1a43995a535dc6c929f20d6a65cf4efb434e0ad1cb61f689b8011a3bc
-90856f7f3444e5ad44651c28e24cc085a5db4d2ffe79aa53228c26718cf53a6e44615f3c5cda5aa752d5f762c4623c66
-978999b7d8aa3f28a04076f74d11c41ef9c89fdfe514936c4238e0f13c38ec97e51a5c078ebc6409e517bfe7ccb42630
-a099914dd7ed934d8e0d363a648e9038eb7c1ec03fa04dbcaa40f7721c618c3ef947afef7a16b4d7ac8c12aa46637f03
-ab2a104fed3c83d16f2cda06878fa5f30c8c9411de71bfb67fd2fc9aa454dcbcf3d299d72f8cc12e919466a50fcf7426
-a4471d111db4418f56915689482f6144efc4664cfb0311727f36c864648d35734351becc48875df96f4abd3cfcf820f9
-83be11727cd30ea94ccc8fa31b09b81c9d6a9a5d3a4686af9da99587332fe78c1f94282f9755854bafd6033549afec91
-88020ff971dc1a01a9e993cd50a5d2131ffdcbb990c1a6aaa54b20d8f23f9546a70918ea57a21530dcc440c1509c24ad
-ae24547623465e87905eaffa1fa5d52bb7c453a8dbd89614fa8819a2abcedaf455c2345099b7324ae36eb0ad7c8ef977
-b59b0c60997de1ee00b7c388bc7101d136c9803bf5437b1d589ba57c213f4f835a3e4125b54738e78abbc21b000f2016
-a584c434dfe194546526691b68fa968c831c31da42303a1d735d960901c74011d522246f37f299555416b8cf25c5a548
-80408ce3724f4837d4d52376d255e10f69eb8558399ae5ca6c11b78b98fe67d4b93157d2b9b639f1b5b64198bfe87713
-abb941e8d406c2606e0ddc35c113604fdd9d249eacc51cb64e2991e551b8639ce44d288cc92afa7a1e7fc599cfc84b22
-b223173f560cacb1c21dba0f1713839e348ad02cbfdef0626748604c86f89e0f4c919ed40b583343795bdd519ba952c8
-af1c70512ec3a19d98b8a1fc3ff7f7f5048a27d17d438d43f561974bbdd116fcd5d5c21040f3447af3f0266848d47a15
-8a44809568ebe50405bede19b4d2607199159b26a1b33e03d180e6840c5cf59d991a4fb150d111443235d75ecad085b7
-b06207cdca46b125a27b3221b5b50cf27af4c527dd7c80e2dbcebbb09778a96df3af67e50f07725239ce3583dad60660
-993352d9278814ec89b26a11c4a7c4941bf8f0e6781ae79559d14749ee5def672259792db4587f85f0100c7bb812f933
-9180b8a718b971fd27bc82c8582d19c4b4f012453e8c0ffeeeffe745581fc6c07875ab28be3af3fa3896d19f0c89ac5b
-8b8e1263eb48d0fe304032dd5ea1f30e73f0121265f7458ba9054d3626894e8a5fef665340abd2ede9653045c2665938
-99a2beee4a10b7941c24b2092192faf52b819afd033e4a2de050fd6c7f56d364d0cf5f99764c3357cf32399e60fc5d74
-946a4aad7f8647ea60bee2c5fcdeb6f9a58fb2cfca70c4d10e458027a04846e13798c66506151be3df9454b1e417893f
-a672a88847652d260b5472d6908d1d57e200f1e492d30dd1cecc441cdfc9b76e016d9bab560efd4d7f3c30801de884a9
-9414e1959c156cde1eb24e628395744db75fc24b9df4595350aaad0bc38e0246c9b4148f6443ef68b8e253a4a6bcf11c
-9316e9e4ec5fab4f80d6540df0e3a4774db52f1d759d2e5b5bcd3d7b53597bb007eb1887cb7dc61f62497d51ffc8d996
-902d6d77bb49492c7a00bc4b70277bc28c8bf9888f4307bb017ac75a962decdedf3a4e2cf6c1ea9f9ba551f4610cbbd7
-b07025a18b0e32dd5e12ec6a85781aa3554329ea12c4cd0d3b2c22e43d777ef6f89876dd90a9c8fb097ddf61cf18adc5
-b355a849ad3227caa4476759137e813505ec523cbc2d4105bc7148a4630f9e81918d110479a2d5f5e4cd9ccec9d9d3e3
-b49532cfdf02ee760109881ad030b89c48ee3bb7f219ccafc13c93aead754d29bdafe345be54c482e9d5672bd4505080
-9477802410e263e4f938d57fa8f2a6cac7754c5d38505b73ee35ea3f057aad958cb9722ba6b7b3cfc4524e9ca93f9cdc
-9148ea83b4436339580f3dbc9ba51509e9ab13c03063587a57e125432dd0915f5d2a8f456a68f8fff57d5f08c8f34d6e
-b00b6b5392b1930b54352c02b1b3b4f6186d20bf21698689bbfc7d13e86538a4397b90e9d5c93fd2054640c4dbe52a4f
-926a9702500441243cd446e7cbf15dde16400259726794694b1d9a40263a9fc9e12f7bcbf12a27cb9aaba9e2d5848ddc
-a0c6155f42686cbe7684a1dc327100962e13bafcf3db97971fc116d9f5c0c8355377e3d70979cdbd58fd3ea52440901c
-a277f899f99edb8791889d0817ea6a96c24a61acfda3ad8c3379e7c62b9d4facc4b965020b588651672fd261a77f1bfc
-8f528cebb866b501f91afa50e995234bef5bf20bff13005de99cb51eaac7b4f0bf38580cfd0470de40f577ead5d9ba0f
-963fc03a44e9d502cc1d23250efef44d299befd03b898d07ce63ca607bb474b5cf7c965a7b9b0f32198b04a8393821f7
-ab087438d0a51078c378bf4a93bd48ef933ff0f1fa68d02d4460820df564e6642a663b5e50a5fe509527d55cb510ae04
-b0592e1f2c54746bb076be0fa480e1c4bebc4225e1236bcda3b299aa3853e3afb401233bdbcfc4a007b0523a720fbf62
-851613517966de76c1c55a94dc4595f299398a9808f2d2f0a84330ba657ab1f357701d0895f658c18a44cb00547f6f57
-a2fe9a1dd251e72b0fe4db27be508bb55208f8f1616b13d8be288363ec722826b1a1fd729fc561c3369bf13950bf1fd6
-b896cb2bc2d0c77739853bc59b0f89b2e008ba1f701c9cbe3bef035f499e1baee8f0ff1e794854a48c320586a2dfc81a
-a1b60f98e5e5106785a9b81a85423452ee9ef980fa7fa8464f4366e73f89c50435a0c37b2906052b8e58e212ebd366cf
-a853b0ebd9609656636df2e6acd5d8839c0fda56f7bf9288a943b06f0b67901a32b95e016ca8bc99bd7b5eab31347e72
-b290fa4c1346963bd5225235e6bdf7c542174dab4c908ab483d1745b9b3a6015525e398e1761c90e4b49968d05e30eea
-b0f65a33ad18f154f1351f07879a183ad62e5144ad9f3241c2d06533dad09cbb2253949daff1bb02d24d16a3569f7ef0
-a00db59b8d4218faf5aeafcd39231027324408f208ec1f54d55a1c41228b463b88304d909d16b718cfc784213917b71e
-b8d695dd33dc2c3bc73d98248c535b2770ad7fa31aa726f0aa4b3299efb0295ba9b4a51c71d314a4a1bd5872307534d1
-b848057cca2ca837ee49c42b88422303e58ea7d2fc76535260eb5bd609255e430514e927cc188324faa8e657396d63ec
-92677836061364685c2aaf0313fa32322746074ed5666fd5f142a7e8f87135f45cd10e78a17557a4067a51dfde890371
-a854b22c9056a3a24ab164a53e5c5cf388616c33e67d8ebb4590cb16b2e7d88b54b1393c93760d154208b5ca822dc68f
-86fff174920388bfab841118fb076b2b0cdec3fdb6c3d9a476262f82689fb0ed3f1897f7be9dbf0932bb14d346815c63
-99661cf4c94a74e182752bcc4b98a8c2218a8f2765642025048e12e88ba776f14f7be73a2d79bd21a61def757f47f904
-8a8893144d771dca28760cba0f950a5d634195fd401ec8cf1145146286caffb0b1a6ba0c4c1828d0a5480ce49073c64c
-938a59ae761359ee2688571e7b7d54692848eb5dde57ffc572b473001ea199786886f8c6346a226209484afb61d2e526
-923f68a6aa6616714cf077cf548aeb845bfdd78f2f6851d8148cba9e33a374017f2f3da186c39b82d14785a093313222
-ac923a93d7da7013e73ce8b4a2b14b8fd0cc93dc29d5de941a70285bdd19be4740fedfe0c56b046689252a3696e9c5bc
-b49b32c76d4ec1a2c68d4989285a920a805993bc6fcce6dacd3d2ddae73373050a5c44ba8422a3781050682fa0ef6ba2
-8a367941c07c3bdca5712524a1411bad7945c7c48ffc7103b1d4dff2c25751b0624219d1ccde8c3f70c465f954be5445
-b838f029df455efb6c530d0e370bbbf7d87d61a9aea3d2fe5474c5fe0a39cf235ceecf9693c5c6c5820b1ba8f820bd31
-a8983b7c715eaac7f13a001d2abc462dfc1559dab4a6b554119c271aa8fe00ffcf6b6949a1121f324d6d26cb877bcbae
-a2afb24ad95a6f14a6796315fbe0d8d7700d08f0cfaf7a2abe841f5f18d4fecf094406cbd54da7232a159f9c5b6e805e
-87e8e95ad2d62f947b2766ff405a23f7a8afba14e7f718a691d95369c79955cdebe24c54662553c60a3f55e6322c0f6f
-87c2cbcecb754e0cc96128e707e5c5005c9de07ffd899efa3437cadc23362f5a1d3fcdd30a1f5bdc72af3fb594398c2a
-91afd6ee04f0496dc633db88b9370d41c428b04fd991002502da2e9a0ef051bcd7b760e860829a44fbe5539fa65f8525
-8c50e5d1a24515a9dd624fe08b12223a75ca55196f769f24748686315329b337efadca1c63f88bee0ac292dd0a587440
-8a07e8f912a38d94309f317c32068e87f68f51bdfa082d96026f5f5f8a2211621f8a3856dda8069386bf15fb2d28c18f
-94ad1dbe341c44eeaf4dc133eed47d8dbfe752575e836c075745770a6679ff1f0e7883b6aa917462993a7f469d74cab5
-8745f8bd86c2bb30efa7efb7725489f2654f3e1ac4ea95bd7ad0f3cfa223055d06c187a16192d9d7bdaea7b050c6a324
-900d149c8d79418cda5955974c450a70845e02e5a4ecbcc584a3ca64d237df73987c303e3eeb79da1af83bf62d9e579f
-8f652ab565f677fb1a7ba03b08004e3cda06b86c6f1b0b9ab932e0834acf1370abb2914c15b0d08327b5504e5990681c
-9103097d088be1f75ab9d3da879106c2f597e2cc91ec31e73430647bdd5c33bcfd771530d5521e7e14df6acda44f38a6
-b0fec7791cfb0f96e60601e1aeced9a92446b61fedab832539d1d1037558612d78419efa87ff5f6b7aab8fd697d4d9de
-b9d2945bdb188b98958854ba287eb0480ef614199c4235ce5f15fc670b8c5ffe8eeb120c09c53ea8a543a022e6a321ac
-a9461bb7d5490973ebaa51afc0bb4a5e42acdccb80e2f939e88b77ac28a98870e103e1042899750f8667a8cc9123bae9
-a37fdf11d4bcb2aed74b9f460a30aa34afea93386fa4cdb690f0a71bc58f0b8df60bec56e7a24f225978b862626fa00e
-a214420e183e03d531cf91661466ea2187d84b6e814b8b20b3730a9400a7d25cf23181bb85589ebc982cec414f5c2923
-ad09a45a698a6beb3e0915f540ef16e9af7087f53328972532d6b5dfe98ce4020555ece65c6cbad8bd6be8a4dfefe6fd
-ab6742800b02728c92d806976764cb027413d6f86edd08ad8bb5922a2969ee9836878cd39db70db0bd9a2646862acc4f
-974ca9305bd5ea1dc1755dff3b63e8bfe9f744321046c1395659bcea2a987b528e64d5aa96ac7b015650b2253b37888d
-84eee9d6bce039c52c2ebc4fccc0ad70e20c82f47c558098da4be2f386a493cbc76adc795b5488c8d11b6518c2c4fab8
-875d7bda46efcb63944e1ccf760a20144df3b00d53282b781e95f12bfc8f8316dfe6492c2efbf796f1150e36e436e9df
-b68a2208e0c587b5c31b5f6cb32d3e6058a9642e2d9855da4f85566e1412db528475892060bb932c55b3a80877ad7b4a
-ba006368ecab5febb6ab348644d9b63de202293085ed468df8bc24d992ae8ce468470aa37f36a73630c789fb9c819b30
-90a196035150846cd2b482c7b17027471372a8ce7d914c4d82b6ea7fa705d8ed5817bd42d63886242585baf7d1397a1c
-a223b4c85e0daa8434b015fd9170b5561fe676664b67064974a1e9325066ecf88fc81f97ab5011c59fad28cedd04b240
-82e8ec43139cf15c6bbeed484b62e06cded8a39b5ce0389e4cbe9c9e9c02f2f0275d8d8d4e8dfec8f69a191bef220408
-81a3fc07a7b68d92c6ee4b6d28f5653ee9ec85f7e2ee1c51c075c1b130a8c5097dc661cf10c5aff1c7114b1a6a19f11a
-8ed2ef8331546d98819a5dd0e6c9f8cb2630d0847671314a28f277faf68da080b53891dd75c82cbcf7788b255490785d
-acecabf84a6f9bbed6b2fc2e7e4b48f02ef2f15e597538a73aea8f98addc6badda15e4695a67ecdb505c1554e8f345ec
-b8f51019b2aa575f8476e03dcadf86cc8391f007e5f922c2a36b2daa63f5a503646a468990cd5c65148d323942193051
-aaa595a84b403ec65729bc1c8055a94f874bf9adddc6c507b3e1f24f79d3ad359595a672b93aab3394db4e2d4a7d8970
-895144c55fcbd0f64d7dd69e6855cfb956e02b5658eadf0f026a70703f3643037268fdd673b0d21b288578a83c6338dd
-a2e92ae6d0d237d1274259a8f99d4ea4912a299816350b876fba5ebc60b714490e198a916e1c38c6e020a792496fa23c
-a45795fda3b5bb0ad1d3c628f6add5b2a4473a1414c1a232e80e70d1cfffd7f8a8d9861f8df2946999d7dbb56bf60113
-b6659bf7f6f2fef61c39923e8c23b8c70e9c903028d8f62516d16755cd3fba2fe41c285aa9432dc75ab08f8a1d8a81fc
-a735609a6bc5bfd85e58234fc439ff1f58f1ff1dd966c5921d8b649e21f006bf2b8642ad8a75063c159aaf6935789293
-a3c622eb387c9d15e7bda2e3e84d007cb13a6d50d655c3f2f289758e49d3b37b9a35e4535d3cc53d8efd51f407281f19
-8afe147b53ad99220f5ef9d763bfc91f9c20caecbcf823564236fb0e6ede49414c57d71eec4772c8715cc65a81af0047
-b5f0203233cf71913951e9c9c4e10d9243e3e4a1f2cb235bf3f42009120ba96e04aa414c9938ea8873b63148478927e8
-93c52493361b458d196172d7ba982a90a4f79f03aa8008edc322950de3ce6acf4c3977807a2ffa9e924047e02072b229
-b9e72b805c8ac56503f4a86c82720afbd5c73654408a22a2ac0b2e5caccdfb0e20b59807433a6233bc97ae58cf14c70a
-af0475779b5cee278cca14c82da2a9f9c8ef222eb885e8c50cca2315fea420de6e04146590ed0dd5a29c0e0812964df5
-b430ccab85690db02c2d0eb610f3197884ca12bc5f23c51e282bf3a6aa7e4a79222c3d8761454caf55d6c01a327595f9
-830032937418b26ee6da9b5206f3e24dc76acd98589e37937e963a8333e5430abd6ce3dd93ef4b8997bd41440eed75d6
-8820a6d73180f3fe255199f3f175c5eb770461ad5cfdde2fb11508041ed19b8c4ce66ad6ecebf7d7e836cc2318df47ca
-aef1393e7d97278e77bbf52ef6e1c1d5db721ccf75fe753cf47a881fa034ca61eaa5098ee5a344c156d2b14ff9e284ad
-8a4a26c07218948c1196c45d927ef4d2c42ade5e29fe7a91eaebe34a29900072ce5194cf28d51f746f4c4c649daf4396
-84011dc150b7177abdcb715efbd8c201f9cb39c36e6069af5c50a096021768ba40cef45b659c70915af209f904ede3b6
-b1bd90675411389bb66910b21a4bbb50edce5330850c5ab0b682393950124252766fc81f5ecfc72fb7184387238c402e
-8dfdcd30583b696d2c7744655f79809f451a60c9ad5bf1226dc078b19f4585d7b3ef7fa9d54e1ac09520d95cbfd20928
-b351b4dc6d98f75b8e5a48eb7c6f6e4b78451991c9ba630e5a1b9874c15ac450cd409c1a024713bf2cf82dc400e025ef
-a462b8bc97ac668b97b28b3ae24b9f5de60e098d7b23ecb600d2194cd35827fb79f77c3e50d358f5bd72ee83fef18fa0
-a183753265c5f7890270821880cce5f9b2965b115ba783c6dba9769536f57a04465d7da5049c7cf8b3fcf48146173c18
-a8a771b81ed0d09e0da4d79f990e58eabcd2be3a2680419502dd592783fe52f657fe55125b385c41d0ba3b9b9cf54a83
-a71ec577db46011689d073245e3b1c3222a9b1fe6aa5b83629adec5733dd48617ebea91346f0dd0e6cdaa86e4931b168
-a334b8b244f0d598a02da6ae0f918a7857a54dce928376c4c85df15f3b0f2ba3ac321296b8b7c9dd47d770daf16c8f8c
-a29037f8ef925c417c90c4df4f9fb27fb977d04e2b3dd5e8547d33e92ab72e7a00f5461de21e28835319eae5db145eb7
-b91054108ae78b00e3298d667b913ebc44d8f26e531eae78a8fe26fdfb60271c97efb2dee5f47ef5a3c15c8228138927
-926c13efbe90604f6244be9315a34f72a1f8d1aab7572df431998949c378cddbf2fe393502c930fff614ff06ae98a0ce
-995c758fd5600e6537089b1baa4fbe0376ab274ff3e82a17768b40df6f91c2e443411de9cafa1e65ea88fb8b87d504f4
-9245ba307a7a90847da75fca8d77ec03fdfc812c871e7a2529c56a0a79a6de16084258e7a9ac4ae8a3756f394336e21c
-99e0cfa2bb57a7e624231317044c15e52196ecce020db567c8e8cb960354a0be9862ee0c128c60b44777e65ac315e59f
-ad4f6b3d27bbbb744126601053c3dc98c07ff0eb0b38a898bd80dce778372846d67e5ab8fb34fb3ad0ef3f235d77ba7f
-a0f12cae3722bbbca2e539eb9cc7614632a2aefe51410430070a12b5bc5314ecec5857b7ff8f41e9980cac23064f7c56
-b487f1bc59485848c98222fd3bc36c8c9bb3d2912e2911f4ceca32c840a7921477f9b1fe00877e05c96c75d3eecae061
-a6033db53925654e18ecb3ce715715c36165d7035db9397087ac3a0585e587998a53973d011ac6d48af439493029cee6
-a6b4d09cd01c70a3311fd131d3710ccf97bde3e7b80efd5a8c0eaeffeb48cca0f951ced905290267b115b06d46f2693b
-a9dff1df0a8f4f218a98b6f818a693fb0d611fed0fc3143537cbd6578d479af13a653a8155e535548a2a0628ae24fa58
-a58e469f65d366b519f9a394cacb7edaddac214463b7b6d62c2dbc1316e11c6c5184ce45c16de2d77f990dcdd8b55430
-989e71734f8119103586dc9a3c5f5033ddc815a21018b34c1f876cdfc112efa868d5751bf6419323e4e59fa6a03ece1c
-a2da00e05036c884369e04cf55f3de7d659cd5fa3f849092b2519dd263694efe0f051953d9d94b7e121f0aee8b6174d7
-968f3c029f57ee31c4e1adea89a7f92e28483af9a74f30fbdb995dc2d40e8e657dff8f8d340d4a92bf65f54440f2859f
-932778df6f60ac1639c1453ef0cbd2bf67592759dcccb3e96dcc743ff01679e4c7dd0ef2b0833dda548d32cb4eba49e2
-a805a31139f8e0d6dae1ac87d454b23a3dc9fc653d4ca18d4f8ebab30fc189c16e73981c2cb7dd6f8c30454a5208109d
-a9ba0991296caa2aaa4a1ceacfb205544c2a2ec97088eace1d84ee5e2767656a172f75d2f0c4e16a3640a0e0dec316e0
-b1e49055c968dced47ec95ae934cf45023836d180702e20e2df57e0f62fb85d7ac60d657ba3ae13b8560b67210449459
-a94e1da570a38809c71e37571066acabff7bf5632737c9ab6e4a32856924bf6211139ab3cedbf083850ff2d0e0c0fcfc
-88ef1bb322000c5a5515b310c838c9af4c1cdbb32eab1c83ac3b2283191cd40e9573747d663763a28dad0d64adc13840
-a987ce205f923100df0fbd5a85f22c9b99b9b9cbe6ddfa8dfda1b8fe95b4f71ff01d6c5b64ca02eb24edb2b255a14ef0
-84fe8221a9e95d9178359918a108de4763ebfa7a6487facb9c963406882a08a9a93f492f8e77cf9e7ea41ae079c45993
-aa1cf3dc7c5dcfa15bbbc811a4bb6dbac4fba4f97fb1ed344ab60264d7051f6eef19ea9773441d89929ee942ed089319
-8f6a7d610d59d9f54689bbe6a41f92d9f6096cde919c1ab94c3c7fcecf0851423bc191e5612349e10f855121c0570f56
-b5af1fa7894428a53ea520f260f3dc3726da245026b6d5d240625380bfb9c7c186df0204bb604efac5e613a70af5106e
-a5bce6055ff812e72ce105f147147c7d48d7a2313884dd1f488b1240ee320f13e8a33f5441953a8e7a3209f65b673ce1
-b9b55b4a1422677d95821e1d042ab81bbf0bf087496504021ec2e17e238c2ca6b44fb3b635a5c9eac0871a724b8d47c3
-941c38e533ce4a673a3830845b56786585e5fe49c427f2e5c279fc6db08530c8f91db3e6c7822ec6bb4f956940052d18
-a38e191d66c625f975313c7007bbe7431b5a06ed2da1290a7d5d0f2ec73770d476efd07b8e632de64597d47df175cbb0
-94ba76b667abf055621db4c4145d18743a368d951565632ed4e743dd50dd3333507c0c34f286a5c5fdbf38191a2255cd
-a5ca38c60be5602f2bfa6e00c687ac96ac36d517145018ddbee6f12eb0faa63dd57909b9eeed26085fe5ac44e55d10ab
-b00fea3b825e60c1ed1c5deb4b551aa65a340e5af36b17d5262c9cd2c508711e4dc50dc2521a2c16c7c901902266e64a
-971b86fc4033485e235ccb0997a236206ba25c6859075edbcdf3c943116a5030b7f75ebca9753d863a522ba21a215a90
-b3b31f52370de246ee215400975b674f6da39b2f32514fe6bd54e747752eedca22bb840493b44a67df42a3639c5f901f
-affbbfac9c1ba7cbfa1839d2ae271dd6149869b75790bf103230637da41857fc326ef3552ff31c15bda0694080198143
-a95d42aa7ef1962520845aa3688f2752d291926f7b0d73ea2ee24f0612c03b43f2b0fe3c9a9a99620ffc8d487b981bc2
-914a266065caf64985e8c5b1cb2e3f4e3fe94d7d085a1881b1fefa435afef4e1b39a98551d096a62e4f5cc1a7f0fdc2e
-81a0b4a96e2b75bc1bf2dbd165d58d55cfd259000a35504d1ffb18bc346a3e6f07602c683723864ffb980f840836fd8d
-91c1556631cddd4c00b65b67962b39e4a33429029d311c8acf73a18600e362304fb68bccb56fde40f49e95b7829e0b87
-8befbacc19e57f7c885d1b7a6028359eb3d80792fe13b92a8400df21ce48deb0bb60f2ddb50e3d74f39f85d7eab23adc
-92f9458d674df6e990789690ec9ca73dacb67fc9255b58c417c555a8cc1208ace56e8e538f86ba0f3615573a0fbac00d
-b4b1b3062512d6ae7417850c08c13f707d5838e43d48eb98dd4621baf62eee9e82348f80fe9b888a12874bfa538771f8
-a13c4a3ac642ede37d9c883f5319e748d2b938f708c9d779714108a449b343f7b71a6e3ef4080fee125b416762920273
-af44983d5fc8cceee0551ef934e6e653f2d3efa385e5c8a27a272463a6f333e290378cc307c2b664eb923c78994e706e
-a389fd6c59fe2b4031cc244e22d3991e541bd203dd5b5e73a6159e72df1ab41d49994961500dcde7989e945213184778
-8d2141e4a17836c548de9598d7b298b03f0e6c73b7364979a411c464e0628e21cff6ac3d6decdba5d1c4909eff479761
-980b22ef53b7bdf188a3f14bc51b0dbfdf9c758826daa3cbc1e3986022406a8aa9a6a79e400567120b88c67faa35ce5f
-a28882f0a055f96df3711de5d0aa69473e71245f4f3e9aa944e9d1fb166e02caa50832e46da6d3a03b4801735fd01b29
-8db106a37d7b88f5d995c126abb563934dd8de516af48e85695d02b1aea07f79217e3cdd03c6f5ca57421830186c772b
-b5a7e50da0559a675c472f7dfaee456caab6695ab7870541b2be8c2b118c63752427184aad81f0e1afc61aef1f28c46f
-9962118780e20fe291d10b64f28d09442a8e1b5cffd0f3dd68d980d0614050a626c616b44e9807fbee7accecae00686a
-b38ddf33745e8d2ad6a991aefaf656a33c5f8cbe5d5b6b6fd03bd962153d8fd0e01b5f8f96d80ae53ab28d593ab1d4e7
-857dc12c0544ff2c0c703761d901aba636415dee45618aba2e3454ff9cbc634a85c8b05565e88520ff9be2d097c8b2b1
-a80d465c3f8cc63af6d74a6a5086b626c1cb4a8c0fee425964c3bd203d9d7094e299f81ce96d58afc20c8c9a029d9dae
-89e1c8fbde8563763be483123a3ed702efac189c6d8ab4d16c85e74bbaf856048cc42d5d6e138633a38572ba5ec3f594
-893a594cf495535f6d216508f8d03c317dcf03446668cba688da90f52d0111ac83d76ad09bf5ea47056846585ee5c791
-aadbd8be0ae452f7f9450c7d2957598a20cbf10139a4023a78b4438172d62b18b0de39754dd2f8862dbd50a3a0815e53
-ae7d39670ecca3eb6db2095da2517a581b0e8853bdfef619b1fad9aacd443e7e6a40f18209fadd44038a55085c5fe8b2
-866ef241520eacb6331593cfcb206f7409d2f33d04542e6e52cba5447934e02d44c471f6c9a45963f9307e9809ab91d9
-b1a09911ad3864678f7be79a9c3c3eb5c84a0a45f8dcb52c67148f43439aeaaa9fd3ed3471276b7e588b49d6ebe3033a
-add07b7f0dbb34049cd8feeb3c18da5944bf706871cfd9f14ff72f6c59ad217ebb1f0258b13b167851929387e4e34cfe
-ae048892d5c328eefbdd4fba67d95901e3c14d974bfc0a1fc68155ca9f0d59e61d7ba17c6c9948b120cf35fd26e6fee9
-9185b4f3b7da0ddb4e0d0f09b8a9e0d6943a4611e43f13c3e2a767ed8592d31e0ba3ebe1914026a3627680274291f6e5
-a9c022d4e37b0802284ce3b7ee9258628ab4044f0db4de53d1c3efba9de19d15d65cc5e608dbe149c21c2af47d0b07b5
-b24dbd5852f8f24921a4e27013b6c3fa8885b973266cb839b9c388efad95821d5d746348179dcc07542bd0d0aefad1ce
-b5fb4f279300876a539a27a441348764908bc0051ebd66dc51739807305e73db3d2f6f0f294ffb91b508ab150eaf8527
-ace50841e718265b290c3483ed4b0fdd1175338c5f1f7530ae9a0e75d5f80216f4de37536adcbc8d8c95982e88808cd0
-b19cadcde0f63bd1a9c24bd9c2806f53c14c0b9735bf351601498408ba503ddbd2037c891041cbba47f58b8c483f3b21
-b6061e63558d312eb891b97b39aa552fa218568d79ee26fe6dd5b864aea9e3216d8f2e2f3b093503be274766dac41426
-89730fdb2876ab6f0fe780d695f6e12090259027e789b819956d786e977518057e5d1d7f5ab24a3ae3d5d4c97773bd2b
-b6fa841e81f9f2cad0163a02a63ae96dc341f7ae803b616efc6e1da2fbea551c1b96b11ad02c4afbdf6d0cc9f23da172
-8fb66187182629c861ddb6896d7ed3caf2ad050c3dba8ab8eb0d7a2c924c3d44c48d1a148f9e33fb1f061b86972f8d21
-86022ac339c1f84a7fa9e05358c1a5b316b4fc0b83dbe9c8c7225dc514f709d66490b539359b084ce776e301024345fa
-b50b9c321468da950f01480bb62b6edafd42f83c0001d6e97f2bd523a1c49a0e8574fb66380ea28d23a7c4d54784f9f0
-a31c05f7032f30d1dac06678be64d0250a071fd655e557400e4a7f4c152be4d5c7aa32529baf3e5be7c4bd49820054f6
-b95ac0848cd322684772119f5b682d90a66bbf9dac411d9d86d2c34844bbd944dbaf8e47aa41380455abd51687931a78
-ae4a6a5ce9553b65a05f7935e61e496a4a0f6fd8203367a2c627394c9ce1e280750297b74cdc48fd1d9a31e93f97bef4
-a22daf35f6e9b05e52e0b07f7bd1dbbebd2c263033fb0e1b2c804e2d964e2f11bc0ece6aca6af079dd3a9939c9c80674
-902150e0cb1f16b9b59690db35281e28998ce275acb313900da8b2d8dfd29fa1795f8ca3ff820c31d0697de29df347c1
-b17b5104a5dc665cdd7d47e476153d715eb78c6e5199303e4b5445c21a7fa7cf85fe7cfd08d7570f4e84e579b005428c
-a03f49b81c15433f121680aa02d734bb9e363af2156654a62bcb5b2ba2218398ccb0ff61104ea5d7df5b16ea18623b1e
-802101abd5d3c88876e75a27ffc2f9ddcce75e6b24f23dba03e5201281a7bd5cc7530b6a003be92d225093ca17d3c3bb
-a4d183f63c1b4521a6b52226fc19106158fc8ea402461a5cccdaa35fee93669df6a8661f45c1750cd01308149b7bf08e
-8d17c22e0c8403b69736364d460b3014775c591032604413d20a5096a94d4030d7c50b9fe3240e31d0311efcf9816a47
-947225acfcce5992eab96276f668c3cbe5f298b90a59f2bb213be9997d8850919e8f496f182689b5cbd54084a7332482
-8df6f4ed216fc8d1905e06163ba1c90d336ab991a18564b0169623eb39b84e627fa267397da15d3ed754d1f3423bff07
-83480007a88f1a36dea464c32b849a3a999316044f12281e2e1c25f07d495f9b1710b4ba0d88e9560e72433addd50bc2
-b3019d6e591cf5b33eb972e49e06c6d0a82a73a75d78d383dd6f6a4269838289e6e07c245f54fed67f5c9bb0fd5e1c5f
-92e8ce05e94927a9fb02debadb99cf30a26172b2705003a2c0c47b3d8002bf1060edb0f6a5750aad827c98a656b19199
-ac2aff801448dbbfc13cca7d603fd9c69e82100d997faf11f465323b97255504f10c0c77401e4d1890339d8b224f5803
-b0453d9903d08f508ee27e577445dc098baed6cde0ac984b42e0f0efed62760bd58d5816cf1e109d204607b7b175e30c
-ae68dc4ba5067e825d46d2c7c67f1009ceb49d68e8d3e4c57f4bcd299eb2de3575d42ea45e8722f8f28497a6e14a1cfe
-b22486c2f5b51d72335ce819bbafb7fa25eb1c28a378a658f13f9fc79cd20083a7e573248d911231b45a5cf23b561ca7
-89d1201d1dbd6921867341471488b4d2fd0fc773ae1d4d074c78ae2eb779a59b64c00452c2a0255826fca6b3d03be2b1
-a2998977c91c7a53dc6104f5bc0a5b675e5350f835e2f0af69825db8af4aeb68435bdbcc795f3dd1f55e1dd50bc0507f
-b0be4937a925b3c05056ed621910d535ccabf5ab99fd3b9335080b0e51d9607d0fd36cb5781ff340018f6acfca4a9736
-aea145a0f6e0ba9df8e52e84bb9c9de2c2dc822f70d2724029b153eb68ee9c17de7d35063dcd6a39c37c59fdd12138f7
-91cb4545d7165ee8ffbc74c874baceca11fdebbc7387908d1a25877ca3c57f2c5def424dab24148826832f1e880bede0
-b3b579cb77573f19c571ad5eeeb21f65548d7dff9d298b8d7418c11f3e8cd3727c5b467f013cb87d6861cfaceee0d2e3
-b98a1eeec2b19fecc8378c876d73645aa52fb99e4819903735b2c7a885b242787a30d1269a04bfb8573d72d9bbc5f0f0
-940c1f01ed362bd588b950c27f8cc1d52276c71bb153d47f07ec85b038c11d9a8424b7904f424423e714454d5e80d1cd
-aa343a8ecf09ce11599b8cf22f7279cf80f06dbf9f6d62cb05308dbbb39c46fd0a4a1240b032665fbb488a767379b91b
-87c3ac72084aca5974599d3232e11d416348719e08443acaba2b328923af945031f86432e170dcdd103774ec92e988c9
-91d6486eb5e61d2b9a9e742c20ec974a47627c6096b3da56209c2b4e4757f007e793ebb63b2b246857c9839b64dc0233
-aebcd3257d295747dd6fc4ff910d839dd80c51c173ae59b8b2ec937747c2072fa85e3017f9060aa509af88dfc7529481
-b3075ba6668ca04eff19efbfa3356b92f0ab12632dcda99cf8c655f35b7928c304218e0f9799d68ef9f809a1492ff7db
-93ba7468bb325639ec2abd4d55179c69fd04eaaf39fc5340709227bbaa4ad0a54ea8b480a1a3c8d44684e3be0f8d1980
-a6aef86c8c0d92839f38544d91b767c582568b391071228ff5a5a6b859c87bf4f81a7d926094a4ada1993ddbd677a920
-91dcd6d14207aa569194aa224d1e5037b999b69ade52843315ca61ba26abe9a76412c9e88259bc5cf5d7b95b97d9c3bc
-b3b483d31c88f78d49bd065893bc1e3d2aa637e27dedb46d9a7d60be7660ce7a10aaaa7deead362284a52e6d14021178
-8e5730070acf8371461ef301cc4523e8e672aa0e3d945d438a0e0aa6bdf8cb9c685dcf38df429037b0c8aff3955c6f5b
-b8c6d769890a8ee18dc4f9e917993315877c97549549b34785a92543cbeec96a08ae3a28d6e809c4aacd69de356c0012
-95ca86cd384eaceaa7c077c5615736ca31f36824bd6451a16142a1edc129fa42b50724aeed7c738f08d7b157f78b569e
-94df609c6d71e8eee7ab74226e371ccc77e01738fe0ef1a6424435b4570fe1e5d15797b66ed0f64eb88d4a3a37631f0e
-89057b9783212add6a0690d6bb99097b182738deff2bd9e147d7fd7d6c8eacb4c219923633e6309ad993c24572289901
-83a0f9f5f265c5a0e54defa87128240235e24498f20965009fef664f505a360b6fb4020f2742565dfc7746eb185bcec0
-91170da5306128931349bc3ed50d7df0e48a68b8cc8420975170723ac79d8773e4fa13c5f14dc6e3fafcad78379050b1
-b7178484d1b55f7e56a4cc250b6b2ec6040437d96bdfddfa7b35ed27435860f3855c2eb86c636f2911b012eb83b00db8
-ac0b00c4322d1e4208e09cd977b4e54d221133ff09551f75b32b0b55d0e2be80941dda26257b0e288c162e63c7e9cf68
-9690ed9e7e53ed37ff362930e4096b878b12234c332fd19d5d064824084245952eda9f979e0098110d6963e468cf513e
-b6fa547bb0bb83e5c5be0ed462a8783fba119041c136a250045c09d0d2af330c604331e7de960df976ff76d67f8000cd
-814603907c21463bcf4e59cfb43066dfe1a50344ae04ef03c87c0f61b30836c3f4dea0851d6fa358c620045b7f9214c8
-9495639e3939fad2a3df00a88603a5a180f3c3a0fe4d424c35060e2043e0921788003689887b1ed5be424d9a89bb18bb
-aba4c02d8d57f2c92d5bc765885849e9ff8393d6554f5e5f3e907e5bfac041193a0d8716d7861104a4295d5a03c36b03
-8ead0b56c1ca49723f94a998ba113b9058059321da72d9e395a667e6a63d5a9dac0f5717cec343f021695e8ced1f72af
-b43037f7e3852c34ed918c5854cd74e9d5799eeddfe457d4f93bb494801a064735e326a76e1f5e50a339844a2f4a8ec9
-99db8422bb7302199eb0ff3c3d08821f8c32f53a600c5b6fb43e41205d96adae72be5b460773d1280ad1acb806af9be8
-8a9be08eae0086c0f020838925984df345c5512ff32e37120b644512b1d9d4fecf0fd30639ca90fc6cf334a86770d536
-81b43614f1c28aa3713a309a88a782fb2bdfc4261dd52ddc204687791a40cf5fd6a263a8179388596582cccf0162efc2
-a9f3a8b76912deb61d966c75daf5ddb868702ebec91bd4033471c8e533183df548742a81a2671de5be63a502d827437d
-902e2415077f063e638207dc7e14109652e42ab47caccd6204e2870115791c9defac5425fd360b37ac0f7bd8fe7011f8
-aa18e4fdc1381b59c18503ae6f6f2d6943445bd00dd7d4a2ad7e5adad7027f2263832690be30d456e6d772ad76f22350
-a348b40ba3ba7d81c5d4631f038186ebd5e5f314f1ea737259151b07c3cc8cf0c6ed4201e71bcc1c22fefda81a20cde6
-aa1306f7ac1acbfc47dc6f7a0cb6d03786cec8c8dc8060388ccda777bca24bdc634d03e53512c23dba79709ff64f8620
-818ccfe46e700567b7f3eb400e5a35f6a5e39b3db3aa8bc07f58ace35d9ae5a242faf8dbccd08d9a9175bbce15612155
-b7e3da2282b65dc8333592bb345a473f03bd6df69170055fec60222de9897184536bf22b9388b08160321144d0940279
-a4d976be0f0568f4e57de1460a1729129252b44c552a69fceec44e5b97c96c711763360d11f9e5bf6d86b4976bf40d69
-85d185f0397c24c2b875b09b6328a23b87982b84ee880f2677a22ff4c9a1ba9f0fea000bb3f7f66375a00d98ebafce17
-b4ccbb8c3a2606bd9b87ce022704663af71d418351575f3b350d294f4efc68c26f9a2ce49ff81e6ff29c3b63d746294e
-93ffd3265fddb63724dfde261d1f9e22f15ecf39df28e4d89e9fea03221e8e88b5dd9b77628bacaa783c6f91802d47cc
-b1fd0f8d7a01378e693da98d03a2d2fda6b099d03454b6f2b1fa6472ff6bb092751ce6290059826b74ac0361eab00e1e
-a89f440c71c561641589796994dd2769616b9088766e983c873fae0716b95c386c8483ab8a4f367b6a68b72b7456dd32
-af4fe92b01d42d03dd5d1e7fa55e96d4bbcb7bf7d4c8c197acd16b3e0f3455807199f683dcd263d74547ef9c244b35cc
-a8227f6e0a344dfe76bfbe7a1861be32c4f4bed587ccce09f9ce2cf481b2dda8ae4f566154bc663d15f962f2d41761bd
-a7b361663f7495939ed7f518ba45ea9ff576c4e628995b7aea026480c17a71d63fc2c922319f0502eb7ef8f14a406882
-8ddcf382a9f39f75777160967c07012cfa89e67b19714a7191f0c68eaf263935e5504e1104aaabd0899348c972a8d3c6
-98c95b9f6f5c91f805fb185eedd06c6fc4457d37dd248d0be45a6a168a70031715165ea20606245cbdf8815dc0ac697f
-805b44f96e001e5909834f70c09be3efcd3b43632bcac5b6b66b6d227a03a758e4b1768ce2a723045681a1d34562aaeb
-b0e81b07cdc45b3dca60882676d9badb99f25c461b7efe56e3043b80100bb62d29e1873ae25eb83087273160ece72a55
-b0c53f0abe78ee86c7b78c82ae1f7c070bb0b9c45c563a8b3baa2c515d482d7507bb80771e60b38ac13f78b8af92b4a9
-a7838ef6696a9e4d2e5dfd581f6c8d6a700467e8fd4e85adabb5f7a56f514785dd4ab64f6f1b48366f7d94728359441b
-88c76f7700a1d23c30366a1d8612a796da57b2500f97f88fdf2d76b045a9d24e7426a8ffa2f4e86d3046937a841dad58
-ad8964baf98c1f02e088d1d9fcb3af6b1dfa44cdfe0ed2eae684e7187c33d3a3c28c38e8f4e015f9c04d451ed6f85ff6
-90e9d00a098317ececaa9574da91fc149eda5b772dedb3e5a39636da6603aa007804fa86358550cfeff9be5a2cb7845e
-a56ff4ddd73d9a6f5ab23bb77efa25977917df63571b269f6a999e1ad6681a88387fcc4ca3b26d57badf91b236503a29
-97ad839a6302c410a47e245df84c01fb9c4dfef86751af3f9340e86ff8fc3cd52fa5ff0b9a0bd1d9f453e02ca80658a6
-a4c8c44cbffa804129e123474854645107d1f0f463c45c30fd168848ebea94880f7c0c5a45183e9eb837f346270bdb35
-a72e53d0a1586d736e86427a93569f52edd2f42b01e78aee7e1961c2b63522423877ae3ac1227a2cf1e69f8e1ff15bc3
-8559f88a7ef13b4f09ac82ae458bbae6ab25671cfbf52dae7eac7280d6565dd3f0c3286aec1a56a8a16dc3b61d78ce47
-8221503f4cdbed550876c5dc118a3f2f17800c04e8be000266633c83777b039a432d576f3a36c8a01e8fd18289ebc10b
-99bfbe5f3e46d4d898a578ba86ed26de7ed23914bd3bcdf3c791c0bcd49398a52419077354a5ab75cea63b6c871c6e96
-aa134416d8ff46f2acd866c1074af67566cfcf4e8be8d97329dfa0f603e1ff208488831ce5948ac8d75bfcba058ddcaa
-b02609d65ebfe1fe8e52f21224a022ea4b5ea8c1bd6e7b9792eed8975fc387cdf9e3b419b8dd5bcce80703ab3a12a45f
-a4f14798508698fa3852e5cac42a9db9797ecee7672a54988aa74037d334819aa7b2ac7b14efea6b81c509134a6b7ad2
-884f01afecbcb987cb3e7c489c43155c416ed41340f61ecb651d8cba884fb9274f6d9e7e4a46dd220253ae561614e44c
-a05523c9e71dce1fe5307cc71bd721feb3e1a0f57a7d17c7d1c9fb080d44527b7dbaa1f817b1af1c0b4322e37bc4bb1e
-8560aec176a4242b39f39433dd5a02d554248c9e49d3179530815f5031fee78ba9c71a35ceeb2b9d1f04c3617c13d8f0
-996aefd402748d8472477cae76d5a2b92e3f092fc834d5222ae50194dd884c9fb8b6ed8e5ccf8f6ed483ddbb4e80c747
-8fd09900320000cbabc40e16893e2fcf08815d288ec19345ad7b6bb22f7d78a52b6575a3ca1ca2f8bc252d2eafc928ec
-939e51f73022bc5dc6862a0adf8fb8a3246b7bfb9943cbb4b27c73743926cc20f615a036c7e5b90c80840e7f1bfee0e7
-a0a6258700cadbb9e241f50766573bf9bdb7ad380b1079dc3afb4054363d838e177b869cad000314186936e40359b1f2
-972699a4131c8ed27a2d0e2104d54a65a7ff1c450ad9da3a325c662ab26869c21b0a84d0700b98c8b5f6ce3b746873d7
-a454c7fe870cb8aa6491eafbfb5f7872d6e696033f92e4991d057b59d70671f2acdabef533e229878b60c7fff8f748b1
-a167969477214201f09c79027b10221e4707662e0c0fde81a0f628249f2f8a859ce3d30a7dcc03b8ecca8f7828ad85c7
-8ff6b7265175beb8a63e1dbf18c9153fb2578c207c781282374f51b40d57a84fd2ef2ea2b9c6df4a54646788a62fd17f
-a3d7ebeccde69d73d8b3e76af0da1a30884bb59729503ff0fb0c3bccf9221651b974a6e72ea33b7956fc3ae758226495
-b71ef144c9a98ce5935620cb86c1590bd4f48e5a2815d25c0cdb008fde628cf628c31450d3d4f67abbfeb16178a74cfd
-b5e0a16d115134f4e2503990e3f2035ed66b9ccf767063fe6747870d97d73b10bc76ed668550cb82eedc9a2ca6f75524
-b30ffaaf94ee8cbc42aa2c413175b68afdb207dbf351fb20be3852cb7961b635c22838da97eaf43b103aff37e9e725cc
-98aa7d52284f6c1f22e272fbddd8c8698cf8f5fbb702d5de96452141fafb559622815981e50b87a72c2b1190f59a7deb
-81fbacda3905cfaf7780bb4850730c44166ed26a7c8d07197a5d4dcd969c09e94a0461638431476c16397dd7bdc449f9
-95e47021c1726eac2e5853f570d6225332c6e48e04c9738690d53e07c6b979283ebae31e2af1fc9c9b3e59f87e5195b1
-ac024a661ba568426bb8fce21780406537f518075c066276197300841e811860696f7588188bc01d90bace7bc73d56e3
-a4ebcaf668a888dd404988ab978594dee193dad2d0aec5cdc0ccaf4ec9a7a8228aa663db1da8ddc52ec8472178e40c32
-a20421b8eaf2199d93b083f2aff37fb662670bd18689d046ae976d1db1fedd2c2ff897985ecc6277b396db7da68bcb27
-8bc33d4b40197fd4d49d1de47489d10b90d9b346828f53a82256f3e9212b0cbc6930b895e879da9cec9fedf026aadb3e
-aaafdd1bec8b757f55a0433eddc0a39f818591954fd4e982003437fcceb317423ad7ee74dbf17a2960380e7067a6b4e2
-aad34277ebaed81a6ec154d16736866f95832803af28aa5625bf0461a71d02b1faba02d9d9e002be51c8356425a56867
-976e9c8b150d08706079945bd0e84ab09a648ecc6f64ded9eb5329e57213149ae409ae93e8fbd8eda5b5c69f5212b883
-8097fae1653247d2aed4111533bc378171d6b2c6d09cbc7baa9b52f188d150d645941f46d19f7f5e27b7f073c1ebd079
-83905f93b250d3184eaba8ea7d727c4464b6bdb027e5cbe4f597d8b9dc741dcbea709630bd4fd59ce24023bec32fc0f3
-8095030b7045cff28f34271386e4752f9a9a0312f8df75de4f424366d78534be2b8e1720a19cb1f9a2d21105d790a225
-a7b7b73a6ae2ed1009c49960374b0790f93c74ee03b917642f33420498c188a169724945a975e5adec0a1e83e07fb1b2
-856a41c54df393b6660b7f6354572a4e71c8bfca9cabaffb3d4ef2632c015e7ee2bc10056f3eccb3dbed1ad17d939178
-a8f7a55cf04b38cd4e330394ee6589da3a07dc9673f74804fdf67b364e0b233f14aec42e783200a2e4666f7c5ff62490
-82c529f4e543c6bca60016dc93232c115b359eaee2798a9cf669a654b800aafe6ab4ba58ea8b9cdda2b371c8d62fa845
-8caab020c1baddce77a6794113ef1dfeafc5f5000f48e97f4351b588bf02f1f208101745463c480d37f588d5887e6d8c
-8fa91b3cc400f48b77b6fd77f3b3fbfb3f10cdff408e1fd22d38f77e087b7683adad258804409ba099f1235b4b4d6fea
-8aa02787663d6be9a35677d9d8188b725d5fcd770e61b11b64e3def8808ea5c71c0a9afd7f6630c48634546088fcd8e2
-b5635b7b972e195cab878b97dea62237c7f77eb57298538582a330b1082f6207a359f2923864630136d8b1f27c41b9aa
-8257bb14583551a65975946980c714ecd6e5b629672bb950b9caacd886fbd22704bc9e3ba7d30778adab65dc74f0203a
-ab5fe1cd12634bfa4e5c60d946e2005cbd38f1063ec9a5668994a2463c02449a0a185ef331bd86b68b6e23a8780cb3ba
-a7d3487da56cda93570cc70215d438204f6a2709bfb5fda6c5df1e77e2efc80f4235c787e57fbf2c74aaff8cbb510a14
-b61cff7b4c49d010e133319fb828eb900f8a7e55114fc86b39c261a339c74f630e1a7d7e1350244ada566a0ff3d46c4b
-8d4d1d55d321d278db7a85522ccceca09510374ca81d4d73e3bb5249ace7674b73900c35a531ec4fa6448fabf7ad00dc
-966492248aee24f0f56c8cfca3c8ec6ba3b19abb69ae642041d4c3be8523d22c65c4dafcab4c58989ccc4e0bd2f77919
-b20c320a90cb220b86e1af651cdc1e21315cd215da69f6787e28157172f93fc8285dcd59b039c626ed8ca4633cba1a47
-aae9e6b22f018ceb5c0950210bb8182cb8cb61014b7e14581a09d36ebd1bbfebdb2b82afb7fdb0cf75e58a293d9c456d
-875547fb67951ad37b02466b79f0c9b985ccbc500cfb431b17823457dc79fb9597ec42cd9f198e15523fcd88652e63a4
-92afce49773cb2e20fb21e4f86f18e0959ebb9c33361547ddb30454ee8e36b1e234019cbdca0e964cb292f7f77df6b90
-8af85343dfe1821464c76ba11c216cbef697b5afc69c4d821342e55afdac047081ec2e3f7b09fc14b518d9a23b78c003
-b7de4a1648fd63f3a918096ea669502af5357438e69dac77cb8102b6e6c15c76e033cfaa80dafc806e535ede5c1a20aa
-ac80e9b545e8bd762951d96c9ce87f629d01ffcde07efc2ef7879ca011f1d0d8a745abf26c9d452541008871304fac00
-a4cf0f7ed724e481368016c38ea5816698a5f68eb21af4d3c422d2ba55f96a33e427c2aa40de1b56a7cfac7f7cf43ab0
-899b0a678bb2db2cae1b44e75a661284844ebcdd87abf308fedeb2e4dbe5c5920c07db4db7284a7af806a2382e8b111a
-af0588a2a4afce2b1b13c1230816f59e8264177e774e4a341b289a101dcf6af813638fed14fb4d09cb45f35d5d032609
-a4b8df79e2be76e9f5fc5845f06fe745a724cf37c82fcdb72719b77bdebea3c0e763f37909373e3a94480cc5e875cba0
-83e42c46d88930c8f386b19fd999288f142d325e2ebc86a74907d6d77112cb0d449bc511c95422cc810574031a8cbba9
-b5e39534070de1e5f6e27efbdd3dc917d966c2a9b8cf2d893f964256e95e954330f2442027dc148c776d63a95bcde955
-958607569dc28c075e658cd4ae3927055c6bc456eef6212a6fea8205e48ed8777a8064f584cda38fe5639c371e2e7fba
-812adf409fa63575113662966f5078a903212ffb65c9b0bbe62da0f13a133443a7062cb8fd70f5e5dd5559a32c26d2c8
-a679f673e5ce6a3cce7fa31f22ee3785e96bcb55e5a776e2dd3467bef7440e3555d1a9b87cb215e86ee9ed13a090344b
-afedbb34508b159eb25eb2248d7fe328f86ef8c7d84c62d5b5607d74aae27cc2cc45ee148eb22153b09898a835c58df4
-b75505d4f6b67d31e665cfaf5e4acdb5838ae069166b7fbcd48937c0608a59e40a25302fcc1873d2e81c1782808c70f0
-b62515d539ec21a155d94fc00ea3c6b7e5f6636937bce18ed5b618c12257fb82571886287fd5d1da495296c663ebc512
-ab8e1a9446bbdd588d1690243b1549d230e6149c28f59662b66a8391a138d37ab594df38e7720fae53217e5c3573b5be
-b31e8abf4212e03c3287bb2c0a153065a7290a16764a0bac8f112a72e632185a654bb4e88fdd6053e6c7515d9719fadb
-b55165477fe15b6abd2d0f4fddaa9c411710dcc4dd712daba3d30e303c9a3ee5415c256f9dc917ecf18c725b4dbab059
-a0939d4f57cacaae549b78e87cc234de4ff6a35dc0d9cd5d7410abc30ebcd34c135e008651c756e5a9d2ca79c40ef42b
-8cf10e50769f3443340844aad4d56ec790850fed5a41fcbd739abac4c3015f0a085a038fbe7fae9f5ad899cce5069f6b
-924055e804d82a99ea4bb160041ea4dc14b568abf379010bc1922fde5d664718c31d103b8b807e3a1ae809390e708c73
-8ec0f9d26f71b0f2e60a179e4fd1778452e2ffb129d50815e5d7c7cb9415fa69ae5890578086e8ef6bfde35ad2a74661
-98c7f12b15ec4426b59f737f73bf5faea4572340f4550b7590dfb7f7ffedb2372e3e555977c63946d579544c53210ad0
-8a935f7a955c78f69d66f18eee0092e5e833fa621781c9581058e219af4d7ceee48b84e472e159dda6199715fb2f9acf
-b78d4219f95a2dbfaa7d0c8a610c57c358754f4f43c2af312ab0fe8f10a5f0177e475332fb8fd23604e474fc2abeb051
-8d086a14803392b7318c28f1039a17e3cfdcece8abcaca3657ec3d0ac330842098a85c0212f889fabb296dfb133ce9aa
-a53249f417aac82f2c2a50c244ce21d3e08a5e5a8bd33bec2a5ab0d6cd17793e34a17edfa3690899244ce201e2fb9986
-8619b0264f9182867a1425be514dc4f1ababc1093138a728a28bd7e4ecc99b9faaff68c23792264bc6e4dce5f52a5c52
-8c171edbbbde551ec19e31b2091eb6956107dd9b1f853e1df23bff3c10a3469ac77a58335eee2b79112502e8e163f3de
-a9d19ec40f0ca07c238e9337c6d6a319190bdba2db76fb63902f3fb459aeeb50a1ac30db5b25ee1b4201f3ca7164a7f4
-b9c6ec14b1581a03520b8d2c1fbbc31fb8ceaef2c0f1a0d0080b6b96e18442f1734bea7ef7b635d787c691de4765d469
-8cb437beb4cfa013096f40ccc169a713dc17afee6daa229a398e45fd5c0645a9ad2795c3f0cd439531a7151945d7064d
-a6e8740cc509126e146775157c2eb278003e5bb6c48465c160ed27888ca803fa12eee1f6a8dd7f444f571664ed87fdc1
-b75c1fecc85b2732e96b3f23aefb491dbd0206a21d682aee0225838dc057d7ed3b576176353e8e90ae55663f79e986e4
-ad8d249b0aea9597b08358bce6c77c1fd552ef3fbc197d6a1cfe44e5e6f89b628b12a6fb04d5dcfcbacc51f46e4ae7bb
-b998b2269932cbd58d04b8e898d373ac4bb1a62e8567484f4f83e224061bc0f212459f1daae95abdbc63816ae6486a55
-827988ef6c1101cddc96b98f4a30365ff08eea2471dd949d2c0a9b35c3bbfa8c07054ad1f4c88c8fbf829b20bb5a9a4f
-8692e638dd60babf7d9f2f2d2ce58e0ac689e1326d88311416357298c6a2bffbfebf55d5253563e7b3fbbf5072264146
-a685d75b91aea04dbc14ab3c1b1588e6de96dae414c8e37b8388766029631b28dd860688079b12d09cd27f2c5af11adf
-b57eced93eec3371c56679c259b34ac0992286be4f4ff9489d81cf9712403509932e47404ddd86f89d7c1c3b6391b28c
-a1c8b4e42ebcbd8927669a97f1b72e236fb19249325659e72be7ddaaa1d9e81ca2abb643295d41a8c04a2c01f9c0efd7
-877c33de20d4ed31674a671ba3e8f01a316581e32503136a70c9c15bf0b7cb7b1cba6cd4eb641fad165fb3c3c6c235fd
-a2a469d84ec478da40838f775d11ad38f6596eb41caa139cc190d6a10b5108c09febae34ffdafac92271d2e73c143693
-972f817caedb254055d52e963ed28c206848b6c4cfdb69dbc961c891f8458eaf582a6d4403ce1177d87bc2ea410ef60a
-accbd739e138007422f28536381decc54bb6bd71d93edf3890e54f9ef339f83d2821697d1a4ac1f5a98175f9a9ecb9b5
-8940f8772e05389f823b62b3adc3ed541f91647f0318d7a0d3f293aeeb421013de0d0a3664ea53dd24e5fbe02d7efef6
-8ecce20f3ef6212edef07ec4d6183fda8e0e8cad2c6ccd0b325e75c425ee1faba00b5c26b4d95204238931598d78f49d
-97cc72c36335bd008afbed34a3b0c7225933faba87f7916d0a6d2161e6f82e0cdcda7959573a366f638ca75d30e9dab1
-9105f5de8699b5bdb6bd3bb6cc1992d1eac23929c29837985f83b22efdda92af64d9c574aa9640475087201bbbe5fd73
-8ffb33c4f6d05c413b9647eb6933526a350ed2e4278ca2ecc06b0e8026d8dbe829c476a40e45a6df63a633090a3f82ef
-8bfc6421fdc9c2d2aaa68d2a69b1a2728c25b84944cc3e6a57ff0c94bfd210d1cbf4ff3f06702d2a8257024d8be7de63
-a80e1dc1dddfb41a70220939b96dc6935e00b32fb8be5dff4eed1f1c650002ff95e4af481c43292e3827363b7ec4768a
-96f714ebd54617198bd636ba7f7a7f8995a61db20962f2165078d9ed8ee764d5946ef3cbdc7ebf8435bb8d5dd4c1deac
-8cdb0890e33144d66391d2ae73f5c71f5a861f72bc93bff6cc399fc25dd1f9e17d8772592b44593429718784802ac377
-8ccf9a7f80800ee770b92add734ed45a73ecc31e2af0e04364eefc6056a8223834c7c0dc9dfc52495bdec6e74ce69994
-aa0875f423bd68b5f10ba978ddb79d3b96ec093bfbac9ff366323193e339ed7c4578760fb60f60e93598bdf1e5cc4995
-a9214f523957b59c7a4cb61a40251ad72aba0b57573163b0dc0f33e41d2df483fb9a1b85a5e7c080e9376c866790f8cb
-b6224b605028c6673a536cc8ff9aeb94e7a22e686fda82cf16068d326469172f511219b68b2b3affb7933af0c1f80d07
-b6d58968d8a017c6a34e24c2c09852f736515a2c50f37232ac6b43a38f8faa7572cc31dade543b594b61b5761c4781d0
-8a97cefe5120020c38deeb861d394404e6c993c6cbd5989b6c9ebffe24f46ad11b4ba6348e2991cbf3949c28cfc3c99d
-95bf046f8c3a9c0ce2634be4de3713024daec3fc4083e808903b25ce3ac971145af90686b451efcc72f6b22df0216667
-a6a4e2f71b8fa28801f553231eff2794c0f10d12e7e414276995e21195abc9c2983a8997e41af41e78d19ff6fbb2680b
-8e5e62a7ca9c2f58ebaab63db2ff1fb1ff0877ae94b7f5e2897f273f684ae639dff44cc65718f78a9c894787602ab26a
-8542784383eec4f565fcb8b9fc2ad8d7a644267d8d7612a0f476fc8df3aff458897a38003d506d24142ad18f93554f2b
-b7db68ba4616ea072b37925ec4fb39096358c2832cc6d35169e032326b2d6614479f765ae98913c267105b84afcb9bf2
-8b31dbb9457d23d416c47542c786e07a489af35c4a87dadb8ee91bea5ac4a5315e65625d78dad2cf8f9561af31b45390
-a8545a1d91ac17257732033d89e6b7111db8242e9c6ebb0213a88906d5ef407a2c6fdb444e29504b06368b6efb4f4839
-b1bd85d29ebb28ccfb05779aad8674906b267c2bf8cdb1f9a0591dd621b53a4ee9f2942687ee3476740c0b4a7621a3ae
-a2b54534e152e46c50d91fff03ae9cd019ff7cd9f4168b2fe7ac08ef8c3bbc134cadd3f9d6bd33d20ae476c2a8596c8a
-b19b571ff4ae3e9f5d95acda133c455e72c9ea9973cae360732859836c0341c4c29ab039224dc5bc3deb824e031675d8
-940b5f80478648bac025a30f3efeb47023ce20ee98be833948a248bca6979f206bb28fc0f17b90acf3bb4abd3d14d731
-8f106b40588586ac11629b96d57808ad2808915d89539409c97414aded90b4ff23286a692608230a52bff696055ba5d6
-ae6bda03aa10da3d2abbc66d764ca6c8d0993e7304a1bdd413eb9622f3ca1913baa6da1e9f4f9e6cf847f14f44d6924d
-a18e7796054a340ef826c4d6b5a117b80927afaf2ebd547794c400204ae2caf277692e2eabb55bc2f620763c9e9da66d
-8d2d25180dc2c65a4844d3e66819ccfcf48858f0cc89e1c77553b463ec0f7feb9a4002ce26bc618d1142549b9850f232
-863f413a394de42cc8166c1c75d513b91d545fff1de6b359037a742c70b008d34bf8e587afa2d62c844d0c6f0ea753e7
-83cd0cf62d63475e7fcad18a2e74108499cdbf28af2113cfe005e3b5887794422da450b1944d0a986eb7e1f4c3b18f25
-b4f8b350a6d88fea5ab2e44715a292efb12eb52df738c9b2393da3f1ddee68d0a75b476733ccf93642154bceb208f2b8
-b3f52aaa4cd4221cb9fc45936cc67fd3864bf6d26bf3dd86aa85aa55ecfc05f5e392ecce5e7cf9406b4b1c4fce0398c8
-b33137084422fb643123f40a6df2b498065e65230fc65dc31791c330e898c51c3a65ff738930f32c63d78f3c9315f85b
-91452bfa75019363976bb7337fe3a73f1c10f01637428c135536b0cdc7da5ce558dae3dfc792aa55022292600814a8ef
-ad6ba94c787cd4361ca642c20793ea44f1f127d4de0bb4a77c7fbfebae0fcadbf28e2cb6f0c12c12a07324ec8c19761d
-890aa6248b17f1501b0f869c556be7bf2b1d31a176f9978bb97ab7a6bd4138eed32467951c5ef1871944b7f620542f43
-82111db2052194ee7dd22ff1eafffac0443cf969d3762cceae046c9a11561c0fdce9c0711f88ac01d1bed165f8a7cee3
-b1527b71df2b42b55832f72e772a466e0fa05743aacc7814f4414e4bcc8d42a4010c9e0fd940e6f254cafedff3cd6543
-922370fa49903679fc565f09c16a5917f8125e72acfeb060fcdbadbd1644eb9f4016229756019c93c6d609cda5d5d174
-aa4c7d98a96cab138d2a53d4aee8ebff6ef903e3b629a92519608d88b3bbd94de5522291a1097e6acf830270e64c8ee1
-b3dc21608a389a72d3a752883a382baaafc61ecc44083b832610a237f6a2363f24195acce529eb4aed4ef0e27a12b66e
-94619f5de05e07b32291e1d7ab1d8b7337a2235e49d4fb5f3055f090a65e932e829efa95db886b32b153bdd05a53ec8c
-ade1e92722c2ffa85865d2426fb3d1654a16477d3abf580cfc45ea4b92d5668afc9d09275d3b79283e13e6b39e47424d
-b7201589de7bed094911dd62fcd25c459a8e327ac447b69f541cdba30233063e5ddffad0b67e9c3e34adcffedfd0e13d
-809d325310f862d6549e7cb40f7e5fc9b7544bd751dd28c4f363c724a0378c0e2adcb5e42ec8f912f5f49f18f3365c07
-a79c20aa533de7a5d671c99eb9eb454803ba54dd4f2efa3c8fec1a38f8308e9905c71e9282955225f686146388506ff6
-a85eeacb5e8fc9f3ed06a3fe2dc3108ab9f8c5877b148c73cf26e4e979bf5795edbe2e63a8d452565fd1176ed40402b2
-97ef55662f8a1ec0842b22ee21391227540adf7708f491436044f3a2eb18c471525e78e1e14fa292507c99d74d7437c6
-93110d64ed5886f3d16ce83b11425576a3a7a9bb831cd0de3f9a0b0f2270a730d68136b4ef7ff035ede004358f419b5c
-ac9ed0a071517f0ae4f61ce95916a90ba9a77a3f84b0ec50ef7298acdcd44d1b94525d191c39d6bd1bb68f4471428760
-98abd6a02c7690f5a339adf292b8c9368dfc12e0f8069cf26a5e0ce54b4441638f5c66ea735142f3c28e00a0024267e6
-b51efb73ba6d44146f047d69b19c0722227a7748b0e8f644d0fc9551324cf034c041a2378c56ce8b58d06038fb8a78de
-8f115af274ef75c1662b588b0896b97d71f8d67986ae846792702c4742ab855952865ce236b27e2321967ce36ff93357
-b3c4548f14d58b3ab03c222da09e4381a0afe47a72d18d50a94e0008797f78e39e99990e5b4757be62310d400746e35a
-a9b1883bd5f31f909b8b1b6dcb48c1c60ed20aa7374b3ffa7f5b2ed036599b5bef33289d23c80a5e6420d191723b92f7
-85d38dffd99487ae5bb41ab4a44d80a46157bbbe8ef9497e68f061721f74e4da513ccc3422936b059575975f6787c936
-adf870fcb96e972c033ab7a35d28ae79ee795f82bc49c3bd69138f0e338103118d5529c53f2d72a9c0d947bf7d312af2
-ab4c7a44e2d9446c6ff303eb49aef0e367a58b22cc3bb27b4e69b55d1d9ee639c9234148d2ee95f9ca8079b1457d5a75
-a386420b738aba2d7145eb4cba6d643d96bda3f2ca55bb11980b318d43b289d55a108f4bc23a9606fb0bccdeb3b3bb30
-847020e0a440d9c4109773ecca5d8268b44d523389993b1f5e60e541187f7c597d79ebd6e318871815e26c96b4a4dbb1
-a530aa7e5ca86fcd1bec4b072b55cc793781f38a666c2033b510a69e110eeabb54c7d8cbcb9c61fee531a6f635ffa972
-87364a5ea1d270632a44269d686b2402da737948dac27f51b7a97af80b66728b0256547a5103d2227005541ca4b7ed04
-8816fc6e16ea277de93a6d793d0eb5c15e9e93eb958c5ef30adaf8241805adeb4da8ce19c3c2167f971f61e0b361077d
-8836a72d301c42510367181bb091e4be377777aed57b73c29ef2ce1d475feedd7e0f31676284d9a94f6db01cc4de81a2
-b0d9d8b7116156d9dde138d28aa05a33e61f8a85839c1e9071ccd517b46a5b4b53acb32c2edd7150c15bc1b4bd8db9e3
-ae931b6eaeda790ba7f1cd674e53dc87f6306ff44951fa0df88d506316a5da240df9794ccbd7215a6470e6b31c5ea193
-8c6d5bdf87bd7f645419d7c6444e244fe054d437ed1ba0c122fde7800603a5fadc061e5b836cb22a6cfb2b466f20f013
-90d530c6d0cb654999fa771b8d11d723f54b8a8233d1052dc1e839ea6e314fbed3697084601f3e9bbb71d2b4eaa596df
-b0d341a1422588c983f767b1ed36c18b141774f67ef6a43cff8e18b73a009da10fc12120938b8bba27f225bdfd3138f9
-a131b56f9537f460d304e9a1dd75702ace8abd68cb45419695cb8dee76998139058336c87b7afd6239dc20d7f8f940cc
-aa6c51fa28975f709329adee1bbd35d49c6b878041841a94465e8218338e4371f5cb6c17f44a63ac93644bf28f15d20f
-88440fb584a99ebd7f9ea04aaf622f6e44e2b43bbb49fb5de548d24a238dc8f26c8da2ccf03dd43102bda9f16623f609
-9777b8695b790e702159a4a750d5e7ff865425b95fa0a3c15495af385b91c90c00a6bd01d1b77bffe8c47d01baae846f
-8b9d764ece7799079e63c7f01690c8eff00896a26a0d095773dea7a35967a8c40db7a6a74692f0118bf0460c26739af4
-85808c65c485520609c9e61fa1bb67b28f4611d3608a9f7a5030ee61c3aa3c7e7dc17fff48af76b4aecee2cb0dbd22ac
-ad2783a76f5b3db008ef5f7e67391fda4e7e36abde6b3b089fc4835b5c339370287935af6bd53998bed4e399eda1136d
-96f18ec03ae47c205cc4242ca58e2eff185c9dca86d5158817e2e5dc2207ab84aadda78725f8dc080a231efdc093b940
-97de1ab6c6cc646ae60cf7b86df73b9cf56cc0cd1f31b966951ebf79fc153531af55ca643b20b773daa7cab784b832f7
-870ba266a9bfa86ef644b1ef025a0f1b7609a60de170fe9508de8fd53170c0b48adb37f19397ee8019b041ce29a16576
-ad990e888d279ac4e8db90619d663d5ae027f994a3992c2fbc7d262b5990ae8a243e19157f3565671d1cb0de17fe6e55
-8d9d5adcdd94c5ba3be4d9a7428133b42e485f040a28d16ee2384758e87d35528f7f9868de9bd23d1a42a594ce50a567
-85a33ed75d514ece6ad78440e42f7fcdb59b6f4cff821188236d20edae9050b3a042ce9bc7d2054296e133d033e45022
-92afd2f49a124aaba90de59be85ff269457f982b54c91b06650c1b8055f9b4b0640fd378df02a00e4fc91f7d226ab980
-8c0ee09ec64bd831e544785e3d65418fe83ed9c920d9bb4d0bf6dd162c1264eb9d6652d2def0722e223915615931581c
-8369bedfa17b24e9ad48ebd9c5afea4b66b3296d5770e09b00446c5b0a8a373d39d300780c01dcc1c6752792bccf5fd0
-8b9e960782576a59b2eb2250d346030daa50bbbec114e95cdb9e4b1ba18c3d34525ae388f859708131984976ca439d94
-b682bface862008fea2b5a07812ca6a28a58fd151a1d54c708fc2f8572916e0d678a9cb8dc1c10c0470025c8a605249e
-a38d5e189bea540a824b36815fc41e3750760a52be0862c4cac68214febdc1a754fb194a7415a8fb7f96f6836196d82a
-b9e7fbda650f18c7eb8b40e42cc42273a7298e65e8be524292369581861075c55299ce69309710e5b843cb884de171bd
-b6657e5e31b3193874a1bace08f42faccbd3c502fb73ad87d15d18a1b6c2a146f1baa929e6f517db390a5a47b66c0acf
-ae15487312f84ed6265e4c28327d24a8a0f4d2d17d4a5b7c29b974139cf93223435aaebe3af918f5b4bb20911799715f
-8bb4608beb06bc394e1a70739b872ce5a2a3ffc98c7547bf2698c893ca399d6c13686f6663f483894bccaabc3b9c56ad
-b58ac36bc6847077584308d952c5f3663e3001af5ecf2e19cb162e1c58bd6c49510205d453cffc876ca1dc6b8e04a578
-924f65ced61266a79a671ffb49b300f0ea44c50a0b4e3b02064faa99fcc3e4f6061ea8f38168ab118c5d47bd7804590e
-8d67d43b8a06b0ff4fafd7f0483fa9ed1a9e3e658a03fb49d9d9b74e2e24858dc1bed065c12392037b467f255d4e5643
-b4d4f87813125a6b355e4519a81657fa97c43a6115817b819a6caf4823f1d6a1169683fd68f8d025cdfa40ebf3069acb
-a7fd4d2c8e7b59b8eed3d4332ae94b77a89a2616347402f880bc81bde072220131e6dbec8a605be3a1c760b775375879
-8d4a7d8fa6f55a30df37bcf74952e2fa4fd6676a2e4606185cf154bdd84643fd01619f8fb8813a564f72e3f574f8ce30
-8086fb88e6260e9a9c42e9560fde76315ff5e5680ec7140f2a18438f15bc2cc7d7d43bfb5880b180b738c20a834e6134
-916c4c54721de03934fee6f43de50bb04c81f6f8dd4f6781e159e71c40c60408aa54251d457369d133d4ba3ed7c12cb4
-902e5bf468f11ed9954e2a4a595c27e34abe512f1d6dc08bbca1c2441063f9af3dc5a8075ab910a10ff6c05c1c644a35
-a1302953015e164bf4c15f7d4d35e3633425a78294406b861675667eec77765ff88472306531e5d3a4ec0a2ff0dd6a9e
-87874461df3c9aa6c0fa91325576c0590f367075f2f0ecfeb34afe162c04c14f8ce9d608c37ac1adc8b9985bc036e366
-84b50a8a61d3cc609bfb0417348133e698fe09a6d37357ce3358de189efcf35773d78c57635c2d26c3542b13cc371752
-acaed2cff8633d12c1d12bb7270c54d65b0b0733ab084fd47f81d0a6e1e9b6f300e615e79538239e6160c566d8bb8d29
-889e6a0e136372ca4bac90d1ab220d4e1cad425a710e8cdd48b400b73bb8137291ceb36a39440fa84305783b1d42c72f
-90952e5becec45b2b73719c228429a2c364991cf1d5a9d6845ae5b38018c2626f4308daa322cab1c72e0f6c621bb2b35
-8f5a97a801b6e9dcd66ccb80d337562c96f7914e7169e8ff0fda71534054c64bf2a9493bb830623d612cfe998789be65
-84f3df8b9847dcf1d63ca470dc623154898f83c25a6983e9b78c6d2d90a97bf5e622445be835f32c1e55e6a0a562ea78
-91d12095cd7a88e7f57f254f02fdb1a1ab18984871dead2f107404bcf8069fe68258c4e6f6ebd2477bddf738135400bb
-b771a28bc04baef68604d4723791d3712f82b5e4fe316d7adc2fc01b935d8e644c06d59b83bcb542afc40ebafbee0683
-872f6341476e387604a7e93ae6d6117e72d164e38ebc2b825bc6df4fcce815004d7516423c190c1575946b5de438c08d
-90d6b4aa7d40a020cdcd04e8b016d041795961a8e532a0e1f4041252131089114a251791bf57794cadb7d636342f5d1c
-899023ba6096a181448d927fed7a0fe858be4eac4082a42e30b3050ee065278d72fa9b9d5ce3bc1372d4cbd30a2f2976
-a28f176571e1a9124f95973f414d5bdbf5794d41c3839d8b917100902ac4e2171eb940431236cec93928a60a77ede793
-838dbe5bcd29c4e465d02350270fa0036cd46f8730b13d91e77afb7f5ed16525d0021d3b2ae173a76c378516a903e0cb
-8e105d012dd3f5d20f0f1c4a7e7f09f0fdd74ce554c3032e48da8cce0a77260d7d47a454851387770f5c256fa29bcb88
-8f4df0f9feeb7a487e1d138d13ea961459a6402fd8f8cabb226a92249a0d04ded5971f3242b9f90d08da5ff66da28af6
-ad1cfda4f2122a20935aa32fb17c536a3653a18617a65c6836700b5537122af5a8206befe9eaea781c1244c43778e7f1
-832c6f01d6571964ea383292efc8c8fa11e61c0634a25fa180737cc7ab57bc77f25e614aac9a2a03d98f27b3c1c29de2
-903f89cc13ec6685ac7728521898781fecb300e9094ef913d530bf875c18bcc3ceed7ed51e7b482d45619ab4b025c2e9
-a03c474bb915aad94f171e8d96f46abb2a19c9470601f4c915512ec8b9e743c3938450a2a5b077b4618b9df8809e1dc1
-83536c8456f306045a5f38ae4be2e350878fa7e164ea408d467f8c3bc4c2ee396bd5868008c089183868e4dfad7aa50b
-88f26b4ea1b236cb326cd7ad7e2517ec8c4919598691474fe15d09cabcfc37a8d8b1b818f4d112432ee3a716b0f37871
-a44324e3fe96e9c12b40ded4f0f3397c8c7ee8ff5e96441118d8a6bfad712d3ac990b2a6a23231a8f691491ac1fd480f
-b0de4693b4b9f932191a21ee88629964878680152a82996c0019ffc39f8d9369bbe2fe5844b68d6d9589ace54af947e4
-8e5d8ba948aea5fd26035351a960e87f0d23efddd8e13236cc8e4545a3dda2e9a85e6521efb8577e03772d3637d213d9
-93efc82d2017e9c57834a1246463e64774e56183bb247c8fc9dd98c56817e878d97b05f5c8d900acf1fbbbca6f146556
-8731176363ad7658a2862426ee47a5dce9434216cef60e6045fa57c40bb3ce1e78dac4510ae40f1f31db5967022ced32
-b10c9a96745722c85bdb1a693100104d560433d45b9ac4add54c7646a7310d8e9b3ca9abd1039d473ae768a18e489845
-a2ac374dfbb464bf850b4a2caf15b112634a6428e8395f9c9243baefd2452b4b4c61b0cb2836d8eae2d57d4900bf407e
-b69fe3ded0c4f5d44a09a0e0f398221b6d1bf5dbb8bc4e338b93c64f1a3cac1e4b5f73c2b8117158030ec03787f4b452
-8852cdbaf7d0447a8c6f211b4830711b3b5c105c0f316e3a6a18dcfbb9be08bd6f4e5c8ae0c3692da08a2dfa532f9d5c
-93bbf6d7432a7d98ade3f94b57bf9f4da9bc221a180a370b113066dd42601bb9e09edd79e2e6e04e00423399339eebda
-a80941c391f1eeafc1451c59e4775d6a383946ff22997aeaadf806542ba451d3b0f0c6864eeba954174a296efe2c1550
-a045fe2bb011c2a2f71a0181a8f457a3078470fb74c628eab8b59aef69ffd0d649723bf74d6885af3f028bc5a104fb39
-b9d8c35911009c4c8cad64692139bf3fc16b78f5a19980790cb6a7aea650a25df4231a4437ae0c351676a7e42c16134f
-94c79501ded0cfcbab99e1841abe4a00a0252b3870e20774c3da16c982d74c501916ec28304e71194845be6e3113c7ab
-900a66418b082a24c6348d8644ddb1817df5b25cb33044a519ef47cc8e1f7f1e38d2465b7b96d32ed472d2d17f8414c6
-b26f45d393b8b2fcb29bdbb16323dc7f4b81c09618519ab3a39f8ee5bd148d0d9f3c0b5dfab55b5ce14a1cb9206d777b
-aa1a87735fc493a80a96a9a57ca40a6d9c32702bfcaa9869ce1a116ae65d69cefe2f3e79a12454b4590353e96f8912b4
-a922b188d3d0b69b4e4ea2a2aa076566962844637da12c0832105d7b31dea4a309eee15d12b7a336be3ea36fcbd3e3b7
-8f3841fcf4105131d8c4d9885e6e11a46c448226401cf99356c291fadb864da9fa9d30f3a73c327f23f9fd99a11d633e
-9791d1183fae270e226379af6c497e7da803ea854bb20afa74b253239b744c15f670ee808f708ede873e78d79a626c9a
-a4cad52e3369491ada61bf28ada9e85de4516d21c882e5f1cd845bea9c06e0b2887b0c5527fcff6fc28acd3c04f0a796
-b9ac86a900899603452bd11a7892a9bfed8054970bfcbeaa8c9d1930db891169e38d6977f5258c25734f96c8462eee3b
-a3a154c28e5580656a859f4efc2f5ebfa7eaa84ca40e3f134fa7865e8581586db74992dbfa4036aa252fba103773ddde
-95cc2a0c1885a029e094f5d737e3ecf4d26b99036453a8773c77e360101f9f98676ee246f6f732a377a996702d55691f
-842651bbe99720438d8d4b0218feb60481280c05beb17750e9ca0d8c0599a60f873b7fbdcc7d8835ba9a6d57b16eec03
-81ee54699da98f5620307893dcea8f64670609fa20e5622265d66283adeac122d458b3308c5898e6c57c298db2c8b24f
-b97868b0b2bc98032d68352a535a1b341b9ff3c7af4e3a7f3ebc82d3419daa1b5859d6aedc39994939623c7cd878bd9b
-b60325cd5d36461d07ef253d826f37f9ee6474a760f2fff80f9873d01fd2b57711543cdc8d7afa1c350aa753c2e33dea
-8c205326c11d25a46717b780c639d89714c7736c974ae71287e3f4b02e6605ac2d9b4928967b1684f12be040b7bf2dd3
-95a392d82db51e26ade6c2ccd3396d7e40aff68fa570b5951466580d6e56dda51775dce5cf3a74a7f28c3cb2eb551c4d
-8f2cc8071eb56dffb70bda6dd433b556221dc8bba21c53353c865f00e7d4d86c9e39f119ea9a8a12ef583e9a55d9a6b6
-9449a71af9672aaf8856896d7e3d788b22991a7103f75b08c0abbcc2bfe60fda4ed8ce502cea4511ff0ea52a93e81222
-857090ab9fdb7d59632d068f3cc8cf27e61f0d8322d30e6b38e780a1f05227199b4cd746aac1311c36c659ef20931f28
-98a891f4973e7d9aaf9ac70854608d4f7493dffc7e0987d7be9dd6029f6ea5636d24ef3a83205615ca1ff403750058e1
-a486e1365bbc278dd66a2a25d258dc82f46b911103cb16aab3945b9c95ae87b386313a12b566df5b22322ede0afe25ad
-a9a1eb399ed95d396dccd8d1ac718043446f8b979ec62bdce51c617c97a312f01376ab7fb87d27034e5f5570797b3c33
-b7abc3858d7a74bb446218d2f5a037e0fae11871ed9caf44b29b69c500c1fa1dcfad64c9cdccc9d80d5e584f06213deb
-8cfb09fe2e202faa4cebad932b1d35f5ca204e1c2a0c740a57812ac9a6792130d1312aabd9e9d4c58ca168bfebd4c177
-a90a305c2cd0f184787c6be596fa67f436afd1f9b93f30e875f817ac2aae8bdd2e6e656f6be809467e6b3ad84adb86b1
-80a9ef993c2b009ae172cc8f7ec036f5734cf4f4dfa06a7db4d54725e7fbfae5e3bc6f22687bdbb6961939d6f0c87537
-848ade1901931e72b955d7db1893f07003e1708ff5d93174bac5930b9a732640f0578839203e9b77eb27965c700032d3
-93fdf4697609c5ae9c33b9ca2f5f1af44abeb2b98dc4fdf732cf7388de086f410730dc384d9b7a7f447bb009653c8381
-89ce3fb805aea618b5715c0d22a9f46da696b6fa86794f56fdf1d44155a33d42daf1920bcbe36cbacf3cf4c92df9cbc7
-829ce2c342cf82aa469c65f724f308f7a750bd1494adc264609cd790c8718b8b25b5cab5858cf4ee2f8f651d569eea67
-af2f0cee7bf413204be8b9df59b9e4991bc9009e0d6dbe6815181df0ec2ca93ab8f4f3135b1c14d8f53d74bff0bd6f27
-b87998cecf7b88cde93d1779f10a521edd5574a2fbd240102978639ec57433ba08cdb53849038a329cebbe74657268d2
-a64542a1261a6ed3d720c2c3a802303aad8c4c110c95d0f12e05c1065e66f42da494792b6bfc5b9272363f3b1d457f58
-86a6fd042e4f282fadf07a4bfee03fc96a3aea49f7a00f52bf249a20f1ec892326855410e61f37fbb27d9305eb2fc713
-967ea5bc403b6db269682f7fd0df90659350d7e1aa66bc4fab4c9dfcd75ed0bba4b52f1cebc5f34dc8ba810793727629
-a52990f9f3b8616ce3cdc2c74cd195029e6a969753dcf2d1630438700e7d6ebde36538532b3525ac516f5f2ce9dd27a3
-a64f7ff870bab4a8bf0d4ef6f5c744e9bf1021ed08b4c80903c7ad318e80ba1817c3180cc45cb5a1cae1170f0241655f
-b00f706fa4de1f663f021e8ad3d155e84ce6084a409374b6e6cd0f924a0a0b51bebaaaf1d228c77233a73b0a5a0df0e9
-8b882cc3bff3e42babdb96df95fb780faded84887a0a9bab896bef371cdcf169d909f5658649e93006aa3c6e1146d62e
-9332663ef1d1dcf805c3d0e4ce7a07d9863fb1731172e766b3cde030bf81682cc011e26b773fb9c68e0477b4ae2cfb79
-a8aa8151348dbd4ef40aaeb699b71b4c4bfd3218560c120d85036d14f678f6736f0ec68e80ce1459d3d35feccc575164
-a16cd8b729768f51881c213434aa28301fa78fcb554ddd5f9012ee1e4eae7b5cb3dd88d269d53146dea92d10790faf0b
-86844f0ef9d37142faf3b1e196e44fbe280a3ba4189aa05c356778cb9e3b388a2bff95eed305ada8769935c9974e4c57
-ae2eec6b328fccf3b47bcdac32901ac2744a51beb410b04c81dea34dee4912b619466a4f5e2780d87ecefaebbe77b46d
-915df4c38d301c8a4eb2dc5b1ba0ffaad67cbb177e0a80095614e9c711f4ef24a4cef133f9d982a63d2a943ba6c8669d
-ae6a2a4dedfc2d1811711a8946991fede972fdf2a389b282471280737536ffc0ac3a6d885b1f8bda0366eb0b229b9979
-a9b628c63d08b8aba6b1317f6e91c34b2382a6c85376e8ef2410a463c6796740ae936fc4e9e0737cb9455d1daa287bd8
-848e30bf7edf2546670b390d5cf9ab71f98fcb6add3c0b582cb34996c26a446dee5d1bde4fdcde4fc80c10936e117b29
-907d6096c7c8c087d1808dd995d5d2b9169b3768c3f433475b50c2e2bd4b082f4d543afd8b0b0ddffa9c66222a72d51d
-a59970a2493b07339124d763ac9d793c60a03354539ecbcf6035bc43d1ea6e35718202ae6d7060b7d388f483d971573c
-b9cfef2af9681b2318f119d8611ff6d9485a68d8044581b1959ab1840cbca576dbb53eec17863d2149966e9feb21122f
-ad47271806161f61d3afa45cdfe2babceef5e90031a21779f83dc8562e6076680525b4970b2f11fe9b2b23c382768323
-8e425a99b71677b04fe044625d338811fbb8ee32368a424f6ab2381c52e86ee7a6cecedf777dc97181519d41c351bc22
-86b55b54d7adefc12954a9252ee23ae83efe8b5b4b9a7dc307904413e5d69868c7087a818b2833f9b004213d629be8ad
-a14fda6b93923dd11e564ae4457a66f397741527166e0b16a8eb91c6701c244fd1c4b63f9dd3515193ec88fa6c266b35
-a9b17c36ae6cd85a0ed7f6cabc5b47dc8f80ced605db327c47826476dc1fb8f8669aa7a7dc679fbd4ee3d8e8b4bd6a6f
-82a0829469c1458d959c821148f15dacae9ea94bf56c59a6ab2d4dd8b3d16d73e313b5a3912a6c1f131d73a8f06730c4
-b22d56d549a53eaef549595924bdb621ff807aa4513feedf3fdcbf7ba8b6b9cfa4481c2f67fc642db397a6b794a8b63a
-974c59c24392e2cb9294006cbe3c52163e255f3bd0c2b457bdc68a6338e6d5b6f87f716854492f8d880a6b896ccf757c
-b70d247ba7cad97c50b57f526c2ba915786e926a94e8f8c3eebc2e1be6f4255411b9670e382060049c8f4184302c40b2
-ad80201fe75ef21c3ddbd98cf23591e0d7a3ba1036dfe77785c32f44755a212c31f0ceb0a0b6f5ee9b6dc81f358d30c3
-8c656e841f9bb90b9a42d425251f3fdbc022a604d75f5845f479ed4be23e02aaf9e6e56cde351dd7449c50574818a199
-8b88dd3fa209d3063b7c5b058f7249ee9900fbc2287d16da61a0704a0a1d71e45d9c96e1cda7fdf9654534ec44558b22
-961da00cc8750bd84d253c08f011970ae1b1158ad6778e8ed943d547bceaf52d6d5a212a7de3bf2706688c4389b827d2
-a5dd379922549a956033e3d51a986a4b1508e575042b8eaa1df007aa77cf0b8c2ab23212f9c075702788fa9c53696133
-ac8fcfde3a349d1e93fc8cf450814e842005c545c4844c0401bc80e6b96cdb77f29285a14455e167c191d4f312e866cd
-ac63d79c799783a8466617030c59dd5a8f92ee6c5204676fd8d881ce5f7f8663bdbeb0379e480ea9b6340ab0dc88e574
-805874fde19ce359041ae2bd52a39e2841acabfd31f965792f2737d7137f36d4e4722ede8340d8c95afa6af278af8acb
-8d2f323a228aa8ba7b7dc1399138f9e6b41df1a16a7069003ab8104b8b68506a45141bc5fe66acf430e23e13a545190b
-a1610c721a2d9af882bb6b39bea97cff1527a3aea041d25934de080214ae77c959e79957164440686d15ab301e897d4d
-aba16d29a47fc36f12b654fde513896723e2c700c4190f11b26aa4011da57737ad717daa02794aa3246e4ae5f0b0cc3a
-a406db2f15fdd135f346cc4846623c47edd195e80ba8c7cb447332095314d565e4040694ca924696bb5ee7f8996ea0ba
-8b30e2cd9b47d75ba57b83630e40f832249af6c058d4f490416562af451993eec46f3e1f90bc4d389e4c06abd1b32a46
-aacf9eb7036e248e209adbfc3dd7ce386569ea9b312caa4b240726549db3c68c4f1c8cbf8ed5ea9ea60c7e57c9df3b8e
-b20fcac63bf6f5ee638a42d7f89be847f348c085ddcbec3fa318f4323592d136c230495f188ef2022aa355cc2b0da6f9
-811eff750456a79ec1b1249d76d7c1547065b839d8d4aaad860f6d4528eb5b669473dcceeeea676cddbc3980b68461b7
-b52d14ae33f4ab422f953392ae76a19c618cc31afc96290bd3fe2fb44c954b5c92c4789f3f16e8793f2c0c1691ade444
-a7826dafeeba0db5b66c4dfcf2b17fd7b40507a5a53ac2e42942633a2cb30b95ba1739a6e9f3b7a0e0f1ec729bf274e2
-8acfd83ddf7c60dd7c8b20c706a3b972c65d336b8f9b3d907bdd8926ced271430479448100050b1ef17578a49c8fa616
-af0c69f65184bb06868029ad46f8465d75c36814c621ac20a5c0b06a900d59305584f5a6709683d9c0e4b6cd08d650a6
-b6cc8588191e00680ee6c3339bd0f0a17ad8fd7f4be57d5d7075bede0ea593a19e67f3d7c1a20114894ee5bfcab71063
-a82fd4f58635129dbb6cc3eb9391cf2d28400018b105fc41500fbbd12bd890b918f97d3d359c29dd3b4c4e34391dfab0
-92fc544ed65b4a3625cf03c41ddff7c039bc22d22c0d59dcc00efd5438401f2606adb125a1d5de294cca216ec8ac35a3
-906f67e4a32582b71f15940523c0c7ce370336935e2646bdaea16a06995256d25e99df57297e39d6c39535e180456407
-97510337ea5bbd5977287339197db55c60533b2ec35c94d0a460a416ae9f60e85cee39be82abeeacd5813cf54df05862
-87e6894643815c0ea48cb96c607266c5ee4f1f82ba5fe352fb77f9b6ed14bfc2b8e09e80a99ac9047dfcf62b2ae26795
-b6fd55dd156622ad7d5d51b7dde75e47bd052d4e542dd6449e72411f68275775c846dde301e84613312be8c7bce58b07
-b98461ac71f554b2f03a94e429b255af89eec917e208a8e60edf5fc43b65f1d17a20de3f31d2ce9f0cb573c25f2f4d98
-96f0dea40ca61cefbee41c4e1fe9a7d81fbe1f49bb153d083ab70f5d0488a1f717fd28cedcf6aa18d07cce2c62801898
-8d7c3ab310184f7dc34b6ce4684e4d29a31e77b09940448ea4daac730b7eb308063125d4dd229046cf11bfd521b771e0
-96f0564898fe96687918bbf0a6adead99cf72e3a35ea3347e124af9d006221f8e82e5a9d2fe80094d5e8d48e610f415e
-ad50fcb92c2675a398cf07d4c40a579e44bf8d35f27cc330b57e54d5ea59f7d898af0f75dccfe3726e5471133d70f92b
-828beed62020361689ae7481dd8f116902b522fb0c6c122678e7f949fdef70ead011e0e6bffd25678e388744e17cdb69
-8349decac1ca16599eee2efc95bcaabf67631107da1d34a2f917884bd70dfec9b4b08ab7bc4379d6c73b19c0b6e54fb8
-b2a6a2e50230c05613ace9e58bb2e98d94127f196f02d9dddc53c43fc68c184549ca12d713cb1b025d8260a41e947155
-94ff52181aadae832aed52fc3b7794536e2a31a21fc8be3ea312ca5c695750d37f08002f286b33f4023dba1e3253ecfa
-a21d56153c7e5972ee9a319501be4faff199fdf09bb821ea9ce64aa815289676c00f105e6f00311b3a5b627091b0d0fc
-a27a60d219f1f0c971db73a7f563b371b5c9fc3ed1f72883b2eac8a0df6698400c9954f4ca17d7e94e44bd4f95532afb
-a2fc56fae99b1f18ba5e4fe838402164ce82f8a7f3193d0bbd360c2bac07c46f9330c4c7681ffb47074c6f81ee6e7ac6
-b748e530cd3afb96d879b83e89c9f1a444f54e55372ab1dcd46a0872f95ce8f49cf2363fc61be82259e04f555937ed16
-8bf8993e81080c7cbba1e14a798504af1e4950b2f186ab3335b771d6acaee4ffe92131ae9c53d74379d957cb6344d9cd
-96774d0ef730d22d7ab6d9fb7f90b9ead44285219d076584a901960542756700a2a1603cdf72be4708b267200f6c36a9
-b47703c2ab17be1e823cc7bf3460db1d6760c0e33862c90ca058845b2ff234b0f9834ddba2efb2ee1770eb261e7d8ffd
-84319e67c37a9581f8b09b5e4d4ae88d0a7fb4cbb6908971ab5be28070c3830f040b1de83ee663c573e0f2f6198640e4
-96811875fa83133e0b3c0e0290f9e0e28bca6178b77fdf5350eb19344d453dbd0d71e55a0ef749025a5a2ca0ad251e81
-81a423423e9438343879f2bfd7ee9f1c74ebebe7ce3cfffc8a11da6f040cc4145c3b527bd3cf63f9137e714dbcb474ef
-b8c3535701ddbeec2db08e17a4fa99ba6752d32ece5331a0b8743676f421fcb14798afc7c783815484f14693d2f70db8
-81aee980c876949bf40782835eec8817d535f6f3f7e00bf402ddd61101fdcd60173961ae90a1cf7c5d060339a18c959d
-87e67b928d97b62c49dac321ce6cb680233f3a394d4c9a899ac2e8db8ccd8e00418e66cdfd68691aa3cb8559723b580c
-8eac204208d99a2b738648df96353bbb1b1065e33ee4f6bba174b540bbbd37d205855e1f1e69a6b7ff043ca377651126
-848e6e7a54ad64d18009300b93ea6f459ce855971dddb419b101f5ac4c159215626fadc20cc3b9ab1701d8f6dfaddd8b
-88aa123d9e0cf309d46dddb6acf634b1ade3b090a2826d6e5e78669fa1220d6df9a6697d7778cd9b627db17eea846126
-9200c2a629b9144d88a61151b661b6c4256cc5dadfd1e59a8ce17a013c2d8f7e754aabe61663c3b30f1bc47784c1f8cf
-b6e1a2827c3bdda91715b0e1b1f10dd363cef337e7c80cac1f34165fc0dea7c8b69747e310563db5818390146ce3e231
-92c333e694f89f0d306d54105b2a5dcc912dbe7654d9e733edab12e8537350815be472b063e56cfde5286df8922fdecb
-a6fac04b6d86091158ebb286586ccfec2a95c9786e14d91a9c743f5f05546073e5e3cc717635a0c602cad8334e922346
-a581b4af77feebc1fb897d49b5b507c6ad513d8f09b273328efbb24ef0d91eb740d01b4d398f2738125dacfe550330cd
-81c4860cccf76a34f8a2bc3f464b7bfd3e909e975cce0d28979f457738a56e60a4af8e68a3992cf273b5946e8d7f76e2
-8d1eaa09a3180d8af1cbaee673db5223363cc7229a69565f592fa38ba0f9d582cedf91e15dabd06ebbf2862fc0feba54
-9832f49b0147f4552402e54593cfa51f99540bffada12759b71fcb86734be8e500eea2d8b3d036710bdf04c901432de9
-8bdb0e8ec93b11e5718e8c13cb4f5de545d24829fd76161216340108098dfe5148ed25e3b57a89a516f09fa79043734d
-ab96f06c4b9b0b2c0571740b24fca758e6976315053a7ecb20119150a9fa416db2d3a2e0f8168b390bb063f0c1caf785
-ab777f5c52acd62ecf4d1f168b9cc8e1a9b45d4ec6a8ff52c583e867c2239aba98d7d3af977289b367edce03d9c2dfb1
-a09d3ce5e748da84802436951acc3d3ea5d8ec1d6933505ed724d6b4b0d69973ab0930daec9c6606960f6e541e4a3ce2
-8ef94f7be4d85d5ad3d779a5cf4d7b2fc3e65c52fb8e1c3c112509a4af77a0b5be994f251e5e40fabeeb1f7d5615c22b
-a7406a5bf5708d9e10922d3c5c45c03ef891b8d0d74ec9f28328a72be4cdc05b4f2703fa99366426659dfca25d007535
-b7f52709669bf92a2e070bfe740f422f0b7127392c5589c7f0af71bb5a8428697c762d3c0d74532899da24ea7d8695c2
-b9dfb0c8df84104dbf9239ccefa4672ef95ddabb8801b74997935d1b81a78a6a5669a3c553767ec19a1281f6e570f4ff
-ae4d5c872156061ce9195ac640190d8d71dd406055ee43ffa6f9893eb24b870075b74c94d65bc1d5a07a6573282b5520
-afe6bd3eb72266d333f1807164900dcfa02a7eb5b1744bb3c86b34b3ee91e3f05e38fa52a50dc64eeb4bdb1dd62874b8
-948043cf1bc2ef3c01105f6a78dc06487f57548a3e6ef30e6ebc51c94b71e4bf3ff6d0058c72b6f3ecc37efd7c7fa8c0
-a22fd17c2f7ffe552bb0f23fa135584e8d2d8d75e3f742d94d04aded2a79e22a00dfe7acbb57d44e1cdb962fb22ae170
-8cd0f4e9e4fb4a37c02c1bde0f69359c43ab012eb662d346487be0c3758293f1ca560122b059b091fddce626383c3a8f
-90499e45f5b9c81426f3d735a52a564cafbed72711d9279fdd88de8038e953bc48c57b58cba85c3b2e4ce56f1ddb0e11
-8c30e4c034c02958384564cac4f85022ef36ab5697a3d2feaf6bf105049675bbf23d01b4b6814711d3d9271abff04cac
-81f7999e7eeea30f3e1075e6780bbf054f2fb6f27628a2afa4d41872a385b4216dd5f549da7ce6cf39049b2251f27fb7
-b36a7191f82fc39c283ffe53fc1f5a9a00b4c64eee7792a8443475da9a4d226cf257f226ea9d66e329af15d8f04984ec
-aad4da528fdbb4db504f3041c747455baff5fcd459a2efd78f15bdf3aea0bdb808343e49df88fe7a7c8620009b7964a3
-99ebd8c6dd5dd299517fb6381cfc2a7f443e6e04a351440260dd7c2aee3f1d8ef06eb6c18820b394366ecdfd2a3ce264
-8873725b81871db72e4ec3643084b1cdce3cbf80b40b834b092767728605825c19b6847ad3dcf328438607e8f88b4410
-b008ee2f895daa6abd35bd39b6f7901ae4611a11a3271194e19da1cdcc7f1e1ea008fe5c5440e50d2c273784541ad9c5
-9036feafb4218d1f576ef89d0e99124e45dacaa6d816988e34d80f454d10e96809791d5b78f7fd65f569e90d4d7238c5
-92073c1d11b168e4fa50988b0288638b4868e48bbc668c5a6dddf5499875d53be23a285acb5e4bad60114f6cf6c556e9
-88c87dfcb8ba6cbfe7e1be081ccfadbd589301db2cb7c99f9ee5d7db90aa297ed1538d5a867678a763f2deede5fd219a
-b42a562805c661a50f5dea63108002c0f27c0da113da6a9864c9feb5552225417c0356c4209e8e012d9bcc9d182c7611
-8e6317d00a504e3b79cd47feb4c60f9df186467fe9ca0f35b55c0364db30528f5ff071109dabb2fc80bb9cd4949f0c24
-b7b1ea6a88694f8d2f539e52a47466695e39e43a5eb9c6f23bca15305fe52939d8755cc3ac9d6725e60f82f994a3772f
-a3cd55161befe795af93a38d33290fb642b8d80da8b786c6e6fb02d393ea308fbe87f486994039cbd7c7b390414594b6
-b416d2d45b44ead3b1424e92c73c2cf510801897b05d1724ff31cbd741920cd858282fb5d6040fe1f0aa97a65bc49424
-950ee01291754feace97c2e933e4681e7ddfbc4fcd079eb6ff830b0e481d929c93d0c7fb479c9939c28ca1945c40da09
-869bd916aee8d86efe362a49010382674825d49195b413b4b4018e88ce43fe091b475d0b863ff0ba2259400f280c2b23
-9782f38cd9c9d3385ec286ebbc7cba5b718d2e65a5890b0a5906b10a89dc8ed80d417d71d7c213bf52f2af1a1f513ea7
-91cd33bc2628d096269b23faf47ee15e14cb7fdc6a8e3a98b55e1031ea0b68d10ba30d97e660f7e967d24436d40fad73
-8becc978129cc96737034c577ae7225372dd855da8811ae4e46328e020c803833b5bdbc4a20a93270e2b8bd1a2feae52
-a36b1d8076783a9522476ce17f799d78008967728ce920531fdaf88303321bcaf97ecaa08e0c01f77bc32e53c5f09525
-b4720e744943f70467983aa34499e76de6d59aa6fadf86f6b787fdce32a2f5b535b55db38fe2da95825c51002cfe142d
-91ad21fc502eda3945f6de874d1b6bf9a9a7711f4d61354f9e5634fc73f9c06ada848de15ab0a75811d3250be862827d
-84f78e2ebf5fc077d78635f981712daf17e2475e14c2a96d187913006ad69e234746184a51a06ef510c9455b38acb0d7
-960aa7906e9a2f11db64a26b5892ac45f20d2ccb5480f4888d89973beb6fa0dfdc06d68d241ff5ffc7f1b82b1aac242d
-a99365dcd1a00c66c9db6924b97c920f5c723380e823b250db85c07631b320ec4e92e586f7319e67a522a0578f7b6d6c
-a25d92d7f70cf6a88ff317cfec071e13774516da664f5fac0d4ecaa65b8bf4eb87a64a4d5ef2bd97dfae98d388dbf5cc
-a7af47cd0041295798f9779020a44653007444e8b4ef0712982b06d0dcdd434ec4e1f7c5f7a049326602cb605c9105b7
-aefe172eac5568369a05980931cc476bebd9dea573ba276d59b9d8c4420784299df5a910033b7e324a6c2dfc62e3ef05
-b69bc9d22ffa645baa55e3e02522e9892bb2daa7fff7c15846f13517d0799766883ee09ae0869df4139150c5b843ca8a
-95a10856140e493354fdd12722c7fdded21b6a2ffbc78aa2697104af8ad0c8e2206f44b0bfee077ef3949d46bbf7c16b
-891f2fcd2c47cbea36b7fa715968540c233313f05333f09d29aba23c193f462ed490dd4d00969656e89c53155fdfe710
-a6c33e18115e64e385c843dde34e8a228222795c7ca90bc2cc085705d609025f3351d9be61822c69035a49fb3e48f2d5
-b87fb12f12c0533b005adad0487f03393ff682e13575e3cb57280c3873b2c38ba96a63c49eef7a442753d26b7005230b
-b905c02ba451bfd411c135036d92c27af3b0b1c9c2f1309d6948544a264b125f39dd41afeff4666b12146c545adc168a
-8b29c513f43a78951cf742231cf5457a6d9d55edf45df5481a0f299a418d94effef561b15d2c1a01d1b8067e7153fda9
-b9941cccd51dc645920d2781c81a317e5a33cb7cf76427b60396735912cb6d2ca9292bb4d36b6392467d390d2c58d9f3
-a8546b627c76b6ef5c93c6a98538d8593dbe21cb7673fd383d5401b0c935eea0bdeeefeb1af6ad41bad8464fb87bbc48
-aa286b27de2812de63108a1aec29d171775b69538dc6198640ac1e96767c2b83a50391f49259195957d457b493b667c9
-a932fb229f641e9abbd8eb2bd874015d97b6658ab6d29769fc23b7db9e41dd4f850382d4c1f08af8f156c5937d524473
-a1412840fcc86e2aeec175526f2fb36e8b3b8d21a78412b7266daf81e51b3f68584ed8bd42a66a43afdd8c297b320520
-89c78be9efb624c97ebca4fe04c7704fa52311d183ffd87737f76b7dadc187c12c982bd8e9ed7cd8beb48cdaafd2fd01
-a3f5ddec412a5bec0ce15e3bcb41c6214c2b05d4e9135a0d33c8e50a78eaba71e0a5a6ea8b45854dec5c2ed300971fc2
-9721f9cec7a68b7758e3887548790de49fa6a442d0396739efa20c2f50352a7f91d300867556d11a703866def2d5f7b5
-a23764e140a87e5991573521af039630dd28128bf56eed2edbed130fd4278e090b60cf5a1dca9de2910603d44b9f6d45
-a1a6494a994215e48ab55c70efa8ffdddce6e92403c38ae7e8dd2f8288cad460c6c7db526bbdf578e96ca04d9fe12797
-b1705ea4cb7e074efe0405fc7b8ee2ec789af0426142f3ec81241cacd4f7edcd88e39435e4e4d8e7b1df64f3880d6613
-85595d061d677116089a6064418b93eb44ff79e68d12bd9625078d3bbc440a60d0b02944eff6054433ee34710ae6fbb4
-9978d5e30bedb7526734f9a1febd973a70bfa20890490e7cc6f2f9328feab1e24f991285dbc3711d892514e2d7d005ad
-af30243c66ea43b9f87a061f947f7bce745f09194f6e95f379c7582b9fead920e5d6957eaf05c12ae1282ada4670652f
-a1930efb473f88001e47aa0b2b2a7566848cccf295792e4544096ecd14ee5d7927c173a8576b405bfa2eec551cd67eb5
-b0446d1c590ee5a45f7e22d269c044f3848c97aec1d226b44bfd0e94d9729c28a38bccddc3a1006cc5fe4e3c24f001f2
-b8a8380172df3d84b06176df916cf557966d4f2f716d3e9437e415d75b646810f79f2b2b71d857181b7fc944018883a3
-a563afec25b7817bfa26e19dc9908bc00aa8fc3d19be7d6de23648701659009d10e3e4486c28e9c6b13d48231ae29ac5
-a5a8e80579de886fb7d6408f542791876885947b27ad6fa99a8a26e381f052598d7b4e647b0115d4b5c64297e00ce28e
-8f87afcc7ad33c51ac719bade3cd92da671a37a82c14446b0a2073f4a0a23085e2c8d31913ed2d0be928f053297de8f6
-a43c455ce377e0bc434386c53c752880687e017b2f5ae7f8a15c044895b242dffde4c92fb8f8bb50b18470b17351b156
-8368f8b12a5bceb1dba25adb3a2e9c7dc9b1a77a1f328e5a693f5aec195cd1e06b0fe9476b554c1c25dac6c4a5b640a3
-919878b27f3671fc78396f11531c032f3e2bd132d04cc234fa4858676b15fb1db3051c0b1db9b4fc49038216f11321ce
-b48cd67fb7f1242696c1f877da4bdf188eac676cd0e561fbac1a537f7b8229aff5a043922441d603a26aae56a15faee4
-a3e0fdfd4d29ea996517a16f0370b54787fefe543c2fe73bfc6f9e560c1fd30dad8409859e2d7fa2d44316f24746c712
-8bb156ade8faf149df7bea02c140c7e392a4742ae6d0394d880a849127943e6f26312033336d3b9fdc0092d71b5efe87
-8845e5d5cc555ca3e0523244300f2c8d7e4d02aaebcb5bd749d791208856c209a6f84dd99fd55968c9f0ab5f82916707
-a3e90bb5c97b07789c2f32dff1aec61d0a2220928202f5ad5355ae71f8249237799d6c8a22602e32e572cb12eabe0c17
-b150bcc391884c996149dc3779ce71f15dda63a759ee9cc05871f5a8379dcb62b047098922c0f26c7bd04deb394c33f9
-95cd4ad88d51f0f2efcfd0c2df802fe252bb9704d1afbf9c26a248df22d55da87bdfaf41d7bc6e5df38bd848f0b13f42
-a05a49a31e91dff6a52ac8b9c2cfdd646a43f0d488253f9e3cfbce52f26667166bbb9b608fc358763a65cbf066cd6d05
-a59c3c1227fdd7c2e81f5e11ef5c406da44662987bac33caed72314081e2eed66055d38137e01b2268e58ec85dd986c0
-b7020ec3bd73a99861f0f1d88cf5a19abab1cbe14b7de77c9868398c84bb8e18dbbe9831838a96b6d6ca06e82451c67b
-98d1ff2525e9718ee59a21d8900621636fcd873d9a564b8dceb4be80a194a0148daf1232742730b3341514b2e5a5436c
-886d97b635975fc638c1b6afc493e5998ca139edba131b75b65cfe5a8e814f11bb678e0eeee5e6e5cd913ad3f2fefdfc
-8fb9fd928d38d5d813b671c924edd56601dd7163b686c13f158645c2f869d9250f3859aa5463a39258c90fef0f41190a
-aac35e1cd655c94dec3580bb3800bd9c2946c4a9856f7d725af15fbea6a2d8ca51c8ad2772abed60ee0e3fb9cb24046b
-b8d71fa0fa05ac9e443c9b4929df9e7f09a919be679692682e614d24227e04894bfc14a5c73a62fb927fedff4a0e4aa7
-a45a19f11fbbb531a704badbb813ed8088ab827c884ee4e4ebf363fa1132ff7cfa9d28be9c85b143e4f7cdbc94e7cf1a
-82b54703a4f295f5471b255ab59dce00f0fe90c9fb6e06b9ee48b15c91d43f4e2ef4a96c3118aeb03b08767be58181bb
-8283264c8e6d2a36558f0d145c18576b6600ff45ff99cc93eca54b6c6422993cf392668633e5df396b9331e873d457e5
-8c549c03131ead601bc30eb6b9537b5d3beb7472f5bb1bcbbfd1e9f3704477f7840ab3ab7f7dc13bbbbcdff886a462d4
-afbb0c520ac1b5486513587700ad53e314cb74bfbc12e0b5fbdcfdaac36d342e8b59856196a0d84a25cff6e6e1d17e76
-89e4c22ffb51f2829061b3c7c1983c5c750cad158e3a825d46f7cf875677da5d63f653d8a297022b5db5845c9271b32b
-afb27a86c4c2373088c96b9adf4433f2ebfc78ac5c526e9f0510670b6e4e5e0057c0a4f75b185e1a30331b9e805c1c15
-a18e16b57445f88730fc5d3567bf5a176861dc14c7a08ed2996fe80eed27a0e7628501bcb78a1727c5e9ac55f29c12c4
-93d61bf88b192d6825cf4e1120af1c17aa0f994d158b405e25437eaeefae049f7b721a206e7cc8a04fdc29d3c42580a1
-a99f2995a2e3ed2fd1228d64166112038de2f516410aa439f4c507044e2017ea388604e2d0f7121256fadf7fbe7023d1
-914fd91cffc23c32f1c6d0e98bf660925090d873367d543034654389916f65f552e445b0300b71b61b721a72e9a5983c
-b42a578a7787b71f924e7def425d849c1c777156b1d4170a8ee7709a4a914e816935131afd9a0412c4cb952957b20828
-82fb30590e84b9e45db1ec475a39971cf554dc01bcc7050bc89265740725c02e2be5a972168c5170c86ae83e5b0ad2c0
-b14f8d8e1e93a84976289e0cf0dfa6f3a1809e98da16ee5c4932d0e1ed6bf8a07697fdd4dd86a3df84fb0003353cdcc0
-85d7a2f4bda31aa2cb208b771fe03291a4ebdaf6f1dc944c27775af5caec412584c1f45bc741fca2a6a85acb3f26ad7d
-af02e56ce886ff2253bc0a68faad76f25ead84b2144e5364f3fb9b648f03a50ee9dc0b2c33ebacf7c61e9e43201ef9ef
-87e025558c8a0b0abd06dfc350016847ea5ced7af2d135a5c9eec9324a4858c4b21510fb0992ec52a73447f24945058e
-80fff0bafcd058118f5e7a4d4f1ae0912efeb281d2cbe4d34ba8945cc3dbe5d8baf47fb077343b90b8d895c90b297aca
-b6edcf3a40e7b1c3c0148f47a263cd819e585a51ef31c2e35a29ce6f04c53e413f743034c0d998d9c00a08ba00166f31
-abb87ed86098c0c70a76e557262a494ff51a30fb193f1c1a32f8e35eafa34a43fcc07aa93a3b7a077d9e35afa07b1a3d
-a280214cd3bb0fb7ecd2d8bcf518cbd9078417f2b91d2533ec2717563f090fb84f2a5fcfdbbeb2a2a1f8a71cc5aa5941
-a63083ca7238ea2b57d15a475963cf1d4f550d8cd76db290014a0461b90351f1f26a67d674c837b0b773b330c7c3d534
-a8fa39064cb585ece5263e2f42f430206476bf261bd50f18d2b694889bd79d04d56410664cecad62690e5c5a20b3f6ff
-85ba52ce9d700a5dcf6c5b00559acbe599d671ce5512467ff4b6179d7fad550567ce2a9c126a50964e3096458ea87920
-b913501e1008f076e5eac6d883105174f88b248e1c9801e568fefaffa1558e4909364fc6d9512aa4d125cbd7cc895f05
-8eb33b5266c8f2ed4725a6ad147a322e44c9264cf261c933cbbe230a43d47fca0f29ec39756b20561dabafadd5796494
-850ebc8b661a04318c9db5a0515066e6454fa73865aa4908767a837857ecd717387f614acb614a88e075d4edc53a2f5a
-a08d6b92d866270f29f4ce23a3f5d99b36b1e241a01271ede02817c8ec3f552a5c562db400766c07b104a331835c0c64
-8131804c89bb3e74e9718bfc4afa547c1005ff676bd4db9604335032b203390cfa54478d45c6c78d1fe31a436ed4be9f
-9106d94f23cc1eacec8316f16d6f0a1cc160967c886f51981fdb9f3f12ee1182407d2bb24e5b873de58cb1a3ee915a6b
-a13806bfc3eae7a7000c9d9f1bd25e10218d4e67f59ae798b145b098bca3edad2b1040e3fc1e6310e612fb8818f459ac
-8c69fbca502046cb5f6db99900a47b34117aef3f4b241690cdb3b84ca2a2fc7833e149361995dc41fa78892525bce746
-852c473150c91912d58ecb05769222fa18312800c3f56605ad29eec9e2d8667b0b81c379048d3d29100ed2773bb1f3c5
-b1767f6074426a00e01095dbb1795beb4e4050c6411792cbad6537bc444c3165d1058bafd1487451f9c5ddd209e0ae7e
-80c600a5fe99354ce59ff0f84c760923dc8ff66a30bf47dc0a086181785ceb01f9b951c4e66df800ea6d705e8bc47055
-b5cf19002fbc88a0764865b82afcb4d64a50196ea361e5c71dff7de084f4dcbbc34ec94a45cc9e0247bd51da565981aa
-93e67a254ea8ce25e112d93cc927fadaa814152a2c4ec7d9a56eaa1ed47aec99b7e9916b02e64452cc724a6641729bbb
-ace70b32491bda18eee4a4d041c3bc9effae9340fe7e6c2f5ad975ee0874c17f1a7da7c96bd85fccff9312c518fac6e9
-ab4cfa02065017dd7f1aadc66f2c92f78f0f11b8597c03a5d69d82cb2eaf95a4476a836ac102908f137662472c8d914b
-a40b8cd8deb8ae503d20364d64cab7c2801b7728a9646ed19c65edea6a842756a2f636283494299584ad57f4bb12cd0b
-8594e11d5fc2396bcd9dbf5509ce4816dbb2b7305168021c426171fb444d111da5a152d6835ad8034542277011c26c0e
-8024de98c26b4c994a66628dc304bb737f4b6859c86ded552c5abb81fd4c6c2e19d5a30beed398a694b9b2fdea1dd06a
-8843f5872f33f54df8d0e06166c1857d733995f67bc54abb8dfa94ad92407cf0179bc91b0a50bbb56cdc2b350d950329
-b8bab44c7dd53ef9edf497dcb228e2a41282c90f00ba052fc52d57e87b5c8ab132d227af1fcdff9a12713d1f980bcaae
-982b4d7b29aff22d527fd82d2a52601d95549bfb000429bb20789ed45e5abf1f4b7416c7b7c4b79431eb3574b29be658
-8eb1f571b6a1878e11e8c1c757e0bc084bab5e82e897ca9be9b7f4b47b91679a8190bf0fc8f799d9b487da5442415857
-a6e74b588e5af935c8b243e888582ef7718f8714569dd4992920740227518305eb35fab674d21a5551cca44b3e511ef2
-a30fc2f3a4cb4f50566e82307de73cd7bd8fe2c1184e9293c136a9b9e926a018d57c6e4f308c95b9eb8299e94d90a2a1
-a50c5869ca5d2b40722c056a32f918d47e0b65ca9d7863ca7d2fb4a7b64fe523fe9365cf0573733ceaadebf20b48fff8
-83bbdd32c04d17581418cf360749c7a169b55d54f2427390defd9f751f100897b2d800ce6636c5bbc046c47508d60c8c
-a82904bdf614de5d8deaff688c8a5e7ac5b3431687acbcda8fa53960b7c417a39c8b2e462d7af91ce6d79260f412db8e
-a4362e31ff4b05d278b033cf5eebea20de01714ae16d4115d04c1da4754269873afc8171a6f56c5104bfd7b0db93c3e7
-b5b8daa63a3735581e74a021b684a1038cea77168fdb7fdf83c670c2cfabcfc3ab2fc7359069b5f9048188351aef26b5
-b48d723894b7782d96ac8433c48faca1bdfa5238019c451a7f47d958097cce3ae599b876cf274269236b9d6ff8b6d7ca
-98ffff6a61a3a6205c7820a91ca2e7176fab5dba02bc194c4d14942ac421cb254183c705506ab279e4f8db066f941c6c
-ae7db24731da2eaa6efc4f7fcba2ecc26940ddd68038dce43acf2cee15b72dc4ef42a7bfdd32946d1ed78786dd7696b3
-a656db14f1de9a7eb84f6301b4acb2fbf78bfe867f48a270e416c974ab92821eb4df1cb881b2d600cfed0034ac784641
-aa315f8ecba85a5535e9a49e558b15f39520fce5d4bf43131bfbf2e2c9dfccc829074f9083e8d49f405fb221d0bc4c3c
-90bffba5d9ff40a62f6c8e9fc402d5b95f6077ed58d030c93e321b8081b77d6b8dac3f63a92a7ddc01585cf2c127d66c
-abdd733a36e0e0f05a570d0504e73801bf9b5a25ff2c78786f8b805704997acb2e6069af342538c581144d53149fa6d3
-b4a723bb19e8c18a01bd449b1bb3440ddb2017f10bb153da27deb7a6a60e9bb37619d6d5435fbb1ba617687838e01dd0
-870016b4678bab3375516db0187a2108b2e840bae4d264b9f4f27dbbc7cc9cac1d7dc582d7a04d6fd1ed588238e5e513
-80d33d2e20e8fc170aa3cb4f69fffb72aeafb3b5bb4ea0bc79ab55da14142ca19b2d8b617a6b24d537366e3b49cb67c3
-a7ee76aec273aaae03b3b87015789289551969fb175c11557da3ab77e39ab49d24634726f92affae9f4d24003050d974
-8415ea4ab69d779ebd42d0fe0c6aef531d6a465a5739e429b1fcf433ec45aa8296c527e965a20f0ec9f340c9273ea3cf
-8c7662520794e8b4405d0b33b5cac839784bc86a5868766c06cbc1fa306dbe334978177417b31baf90ce7b0052a29c56
-902b2abecc053a3dbdea9897ee21e74821f3a1b98b2d560a514a35799f4680322550fd3a728d4f6d64e1de98033c32b8
-a05e84ed9ecab8d508d670c39f2db61ad6e08d2795ec32a3c9d0d3737ef3801618f4fc2a95f90ec2f068606131e076c5
-8b9208ff4d5af0c2e3f53c9375da666773ac57197dfabb0d25b1c8d0588ba7f3c15ee9661bb001297f322ea2fbf6928b
-a3c827741b34a03254d4451b5ab74a96f2b9f7fb069e2f5adaf54fd97cc7a4d516d378db5ca07da87d8566d6eef13726
-8509d8a3f4a0ed378e0a1e28ea02f6bf1d7f6c819c6c2f5297c7df54c895b848f841653e32ba2a2c22c2ff739571acb8
-a0ce988b7d3c40b4e496aa83a09e4b5472a2d98679622f32bea23e6d607bc7de1a5374fb162bce0549a67dad948519be
-aa8a3dd12bd60e3d2e05f9c683cdcb8eab17fc59134815f8d197681b1bcf65108cba63ac5c58ee632b1e5ed6bba5d474
-8b955f1d894b3aefd883fb4b65f14cd37fc2b9db77db79273f1700bef9973bf3fd123897ea2b7989f50003733f8f7f21
-ac79c00ddac47f5daf8d9418d798d8af89fc6f1682e7e451f71ea3a405b0d36af35388dd2a332af790bc83ca7b819328
-a0d44dd2a4438b809522b130d0938c3fe7c5c46379365dbd1810a170a9aa5818e1c783470dd5d0b6d4ac7edbb7330910
-a30b69e39ad43dd540a43c521f05b51b5f1b9c4eed54b8162374ae11eac25da4f5756e7b70ce9f3c92c2eeceee7431ed
-ac43220b762c299c7951222ea19761ab938bf38e4972deef58ed84f4f9c68c230647cf7506d7cbfc08562fcca55f0485
-b28233b46a8fb424cfa386a845a3b5399d8489ceb83c8f3e05c22c934798d639c93718b7b68ab3ce24c5358339e41cbb
-ac30d50ee8ce59a10d4b37a3a35e62cdb2273e5e52232e202ca7d7b8d09d28958ee667fae41a7bb6cdc6fe8f6e6c9c85
-b199842d9141ad169f35cc7ff782b274cbaa645fdb727761e0a89edbf0d781a15f8218b4bf4eead326f2903dd88a9cc1
-85e018c7ddcad34bb8285a737c578bf741ccd547e68c734bdb3808380e12c5d4ef60fc896b497a87d443ff9abd063b38
-8c856e6ba4a815bdb891e1276f93545b7072f6cb1a9aa6aa5cf240976f29f4dee01878638500a6bf1daf677b96b54343
-b8a47555fa8710534150e1a3f13eab33666017be6b41005397afa647ea49708565f2b86b77ad4964d140d9ced6b4d585
-8cd1f1db1b2f4c85a3f46211599caf512d5439e2d8e184663d7d50166fd3008f0e9253272f898d81007988435f715881
-b1f34b14612c973a3eceb716dc102b82ab18afef9de7630172c2780776679a7706a4874e1df3eaadf541fb009731807f
-b25464af9cff883b55be2ff8daf610052c02df9a5e147a2cf4df6ce63edcdee6dc535c533590084cc177da85c5dc0baa
-91c3c4b658b42d8d3448ae1415d4541d02379a40dc51e36a59bd6e7b9ba3ea51533f480c7c6e8405250ee9b96a466c29
-86dc027b95deb74c36a58a1333a03e63cb5ae22d3b29d114cfd2271badb05268c9d0c819a977f5e0c6014b00c1512e3a
-ae0e6ff58eb5fa35da5107ebeacf222ab8f52a22bb1e13504247c1dfa65320f40d97b0e6b201cb6613476687cb2f0681
-8f13415d960b9d7a1d93ef28afc2223e926639b63bdefce0f85e945dfc81670a55df288893a0d8b3abe13c5708f82f91
-956f67ca49ad27c1e3a68c1faad5e7baf0160c459094bf6b7baf36b112de935fdfd79fa4a9ea87ea8de0ac07272969f4
-835e45e4a67df9fb51b645d37840b3a15c171d571a10b03a406dd69d3c2f22df3aa9c5cbe1e73f8d767ce01c4914ea9a
-919b938e56d4b32e2667469d0bdccb95d9dda3341aa907683ee70a14bbbe623035014511c261f4f59b318b610ac90aa3
-96b48182121ccd9d689bf1dfdc228175564cd68dc904a99c808a7f0053a6f636c9d953e12198bdf2ea49ea92772f2e18
-ac5e5a941d567fa38fdbcfa8cf7f85bb304e3401c52d88752bcd516d1fa9bac4572534ea2205e38423c1df065990790f
-ac0bd594fb85a8d4fc26d6df0fa81f11919401f1ecf9168b891ec7f061a2d9368af99f7fd8d9b43b2ce361e7b8482159
-83d92c69ca540d298fe80d8162a1c7af3fa9b49dfb69e85c1d136a3ec39fe419c9fa78e0bb6d96878771fbd37fe92e40
-b35443ae8aa66c763c2db9273f908552fe458e96696b90e41dd509c17a5c04ee178e3490d9c6ba2dc0b8f793c433c134
-923b2d25aa45b2e580ffd94cbb37dc8110f340f0f011217ee1bd81afb0714c0b1d5fb4db86006cdd2457563276f59c59
-96c9125d38fca1a61ac21257b696f8ac3dae78def50285e44d90ea293d591d1c58f703540a7e4e99e070afe4646bbe15
-b57946b2332077fbcdcb406b811779aefd54473b5559a163cd65cb8310679b7e2028aa55c12a1401fdcfcac0e6fae29a
-845daedc5cf972883835d7e13c937b63753c2200324a3b8082a6c4abb4be06c5f7c629d4abe4bfaf1d80a1f073eb6ce6
-91a55dfd0efefcd03dc6dacc64ec93b8d296cb83c0ee72400a36f27246e7f2a60e73b7b70ba65819e9cfb73edb7bd297
-8874606b93266455fe8fdd25df9f8d2994e927460af06f2e97dd4d2d90db1e6b06d441b72c2e76504d753badca87fb37
-8ee99e6d231274ff9252c0f4e84549da173041299ad1230929c3e3d32399731c4f20a502b4a307642cac9306ccd49d3c
-8836497714a525118e20849d6933bb8535fb6f72b96337d49e3133d936999c90a398a740f42e772353b5f1c63581df6d
-a6916945e10628f7497a6cdc5e2de113d25f7ade3e41e74d3de48ccd4fce9f2fa9ab69645275002e6f49399b798c40af
-9597706983107eb23883e0812e1a2c58af7f3499d50c6e29b455946cb9812fde1aa323d9ed30d1c0ffd455abe32303cd
-a24ee89f7f515cc33bdbdb822e7d5c1877d337f3b2162303cfc2dae028011c3a267c5cb4194afa63a4856a6e1c213448
-8cd25315e4318801c2776824ae6e7d543cb85ed3bc2498ba5752df2e8142b37653cf9e60104d674be3aeb0a66912e97a
-b5085ecbe793180b40dbeb879f4c976eaaccaca3a5246807dced5890e0ed24d35f3f86955e2460e14fb44ff5081c07ba
-960188cc0b4f908633a6840963a6fa2205fc42c511c6c309685234911c5304ef4c304e3ae9c9c69daa2fb6a73560c256
-a32d0a70bf15d569b4cda5aebe3e41e03c28bf99cdd34ffa6c5d58a097f322772acca904b3a47addb6c7492a7126ebac
-977f72d06ad72d4aa4765e0f1f9f4a3231d9f030501f320fe7714cc5d329d08112789fa918c60dd7fdb5837d56bb7fc6
-99fa038bb0470d45852bb871620d8d88520adb701712fcb1f278fed2882722b9e729e6cdce44c82caafad95e37d0e6f7
-b855e8f4fc7634ada07e83b6c719a1e37acb06394bc8c7dcab7747a8c54e5df3943915f021364bd019fdea103864e55f
-88bc2cd7458532e98c596ef59ea2cf640d7cc31b4c33cef9ed065c078d1d4eb49677a67de8e6229cc17ea48bace8ee5a
-aaa78a3feaa836d944d987d813f9b9741afb076e6aca1ffa42682ab06d46d66e0c07b8f40b9dbd63e75e81efa1ef7b08
-b7b080420cc4d808723b98b2a5b7b59c81e624ab568ecdfdeb8bf3aa151a581b6f56e983ef1b6f909661e25db40b0c69
-abee85c462ac9a2c58e54f06c91b3e5cd8c5f9ab5b5deb602b53763c54826ed6deb0d6db315a8d7ad88733407e8d35e2
-994d075c1527407547590df53e9d72dd31f037c763848d1662eebd4cefec93a24328c986802efa80e038cb760a5300f5
-ab8777640116dfb6678e8c7d5b36d01265dfb16321abbfc277da71556a34bb3be04bc4ae90124ed9c55386d2bfb3bda0
-967e3a828bc59409144463bcf883a3a276b5f24bf3cbfdd7a42343348cba91e00b46ac285835a9b91eef171202974204
-875a9f0c4ffe5bb1d8da5e3c8e41d0397aa6248422a628bd60bfae536a651417d4e8a7d2fb98e13f2dad3680f7bd86d3
-acaa330c3e8f95d46b1880126572b238dbb6d04484d2cd4f257ab9642d8c9fc7b212188b9c7ac9e0fd135c520d46b1bf
-aceb762edbb0f0c43dfcdb01ea7a1ac5918ca3882b1e7ebc4373521742f1ed5250d8966b498c00b2b0f4d13212e6dd0b
-81d072b4ad258b3646f52f399bced97c613b22e7ad76373453d80b1650c0ca87edb291a041f8253b649b6e5429bb4cff
-980a47d27416ac39c7c3a0ebe50c492f8c776ea1de44d5159ac7d889b6d554357f0a77f0e5d9d0ff41aae4369eba1fc2
-8b4dfd5ef5573db1476d5e43aacfb5941e45d6297794508f29c454fe50ea622e6f068b28b3debe8635cf6036007de2e3
-a60831559d6305839515b68f8c3bc7abbd8212cc4083502e19dd682d56ca37c9780fc3ce4ec2eae81ab23b221452dc57
-951f6b2c1848ced9e8a2339c65918e00d3d22d3e59a0a660b1eca667d18f8430d737884e9805865ef3ed0fe1638a22d9
-b02e38fe790b492aa5e89257c4986c9033a8b67010fa2add9787de857d53759170fdd67715ca658220b4e14b0ca48124
-a51007e4346060746e6b0e4797fc08ef17f04a34fe24f307f6b6817edbb8ce2b176f40771d4ae8a60d6152cbebe62653
-a510005b05c0b305075b27b243c9d64bcdce85146b6ed0e75a3178b5ff9608213f08c8c9246f2ca6035a0c3e31619860
-aaff4ef27a7a23be3419d22197e13676d6e3810ceb06a9e920d38125745dc68a930f1741c9c2d9d5c875968e30f34ab5
-864522a9af9857de9814e61383bebad1ba9a881696925a0ea6bfc6eff520d42c506bbe5685a9946ed710e889765be4a0
-b63258c080d13f3b7d5b9f3ca9929f8982a6960bdb1b0f8676f4dca823971601672f15e653917bf5d3746bb220504913
-b51ce0cb10869121ae310c7159ee1f3e3a9f8ad498827f72c3d56864808c1f21fa2881788f19ece884d3f705cd7bd0c5
-95d9cecfc018c6ed510e441cf84c712d9909c778c16734706c93222257f64dcd2a9f1bd0b400ca271e22c9c487014274
-8beff4d7d0140b86380ff4842a9bda94c2d2be638e20ac68a4912cb47dbe01a261857536375208040c0554929ced1ddc
-891ff49258749e2b57c1e9b8e04b12c77d79c3308b1fb615a081f2aacdfb4b39e32d53e069ed136fdbd43c53b87418fa
-9625cad224e163d387738825982d1e40eeff35fe816d10d7541d15fdc4d3eee48009090f3faef4024b249205b0b28f72
-8f3947433d9bd01aa335895484b540a9025a19481a1c40b4f72dd676bfcf332713714fd4010bde936eaf9470fd239ed0
-a00ec2d67789a7054b53f0e858a8a232706ccc29a9f3e389df7455f1a51a2e75801fd78469a13dbc25d28399ae4c6182
-a3f65884506d4a62b8775a0ea0e3d78f5f46bc07910a93cd604022154eabdf1d73591e304d61edc869e91462951975e1
-a14eef4fd5dfac311713f0faa9a60415e3d30b95a4590cbf95f2033dffb4d16c02e7ceff3dcd42148a4e3bc49cce2dd4
-8afa11c0eef3c540e1e3460bc759bb2b6ea90743623f88e62950c94e370fe4fd01c22b6729beba4dcd4d581198d9358f
-afb05548a69f0845ffcc5f5dc63e3cdb93cd270f5655173b9a950394b0583663f2b7164ba6df8d60c2e775c1d9f120af
-97f179e01a947a906e1cbeafa083960bc9f1bade45742a3afee488dfb6011c1c6e2db09a355d77f5228a42ccaa7bdf8e
-8447fca4d35f74b3efcbd96774f41874ca376bf85b79b6e66c92fa3f14bdd6e743a051f12a7fbfd87f319d1c6a5ce217
-a57ca39c23617cd2cf32ff93b02161bd7baf52c4effb4679d9d5166406e103bc8f3c6b5209e17c37dbb02deb8bc72ddd
-9667c7300ff80f0140be002b0e36caab07aaee7cce72679197c64d355e20d96196acaf54e06e1382167d081fe6f739c1
-828126bb0559ce748809b622677267ca896fa2ee76360fd2c02990e6477e06a667241379ca7e65d61a5b64b96d7867de
-8b8835dea6ba8cf61c91f01a4b3d2f8150b687a4ee09b45f2e5fc8f80f208ae5d142d8e3a18153f0722b90214e60c5a7
-a98e8ff02049b4da386e3ee93db23bbb13dfeb72f1cfde72587c7e6d962780b7671c63e8ac3fbaeb1a6605e8d79e2f29
-87a4892a0026d7e39ef3af632172b88337cb03669dea564bcdb70653b52d744730ebb5d642e20cb627acc9dbb547a26b
-877352a22fc8052878a57effc159dac4d75fe08c84d3d5324c0bab6d564cdf868f33ceee515eee747e5856b62cfa0cc7
-8b801ba8e2ff019ee62f64b8cb8a5f601fc35423eb0f9494b401050103e1307dc584e4e4b21249cd2c686e32475e96c3
-a9e7338d6d4d9bfec91b2af28a8ed13b09415f57a3a00e5e777c93d768fdb3f8e4456ae48a2c6626b264226e911a0e28
-99c05fedf40ac4726ed585d7c1544c6e79619a0d3fb6bda75a08c7f3c0008e8d5e19ed4da48de3216135f34a15eba17c
-a61cce8a1a8b13a4a650fdbec0eeea8297c352a8238fb7cac95a0df18ed16ee02a3daa2de108fa122aca733bd8ad7855
-b97f37da9005b440b4cb05870dd881bf8491fe735844f2d5c8281818583b38e02286e653d9f2e7fa5e74c3c3eb616540
-a72164a8554da8e103f692ac5ebb4aece55d5194302b9f74b6f2a05335b6e39beede0bf7bf8c5bfd4d324a784c5fb08c
-b87e8221c5341cd9cc8bb99c10fe730bc105550f25ed4b96c0d45e6142193a1b2e72f1b3857373a659b8c09be17b3d91
-a41fb1f327ef91dcb7ac0787918376584890dd9a9675c297c45796e32d6e5985b12f9b80be47fc3a8596c245f419d395
-90dafa3592bdbb3465c92e2a54c2531822ba0459d45d3e7a7092fa6b823f55af28357cb51896d4ec2d66029c82f08e26
-a0a9adc872ebc396557f484f1dd21954d4f4a21c4aa5eec543f5fa386fe590839735c01f236574f7ff95407cd12de103
-b8c5c940d58be7538acf8672852b5da3af34f82405ef2ce8e4c923f1362f97fc50921568d0fd2fe846edfb0823e62979
-85aaf06a8b2d0dac89dafd00c28533f35dbd074978c2aaa5bef75db44a7b12aeb222e724f395513b9a535809a275e30b
-81f3cbe82fbc7028c26a6c1808c604c63ba023a30c9f78a4c581340008dbda5ec07497ee849a2183fcd9124f7936af32
-a11ac738de75fd60f15a34209d3825d5e23385796a4c7fc5931822f3f380af977dd0f7b59fbd58eed7777a071e21b680
-85a279c493de03db6fa6c3e3c1b1b29adc9a8c4effc12400ae1128da8421954fa8b75ad19e5388fe4543b76fb0812813
-83a217b395d59ab20db6c4adb1e9713fc9267f5f31a6c936042fe051ce8b541f579442f3dcf0fa16b9e6de9fd3518191
-83a0b86e7d4ed8f9ccdc6dfc8ff1484509a6378fa6f09ed908e6ab9d1073f03011dc497e14304e4e3d181b57de06a5ab
-a63ad69c9d25704ce1cc8e74f67818e5ed985f8f851afa8412248b2df5f833f83b95b27180e9e7273833ed0d07113d3b
-99b1bc2021e63b561fe44ddd0af81fcc8627a91bfeecbbc989b642bc859abc0c8d636399701aad7bbaf6a385d5f27d61
-b53434adb66f4a807a6ad917c6e856321753e559b1add70824e5c1e88191bf6993fccb9b8b911fc0f473fb11743acacd
-97ed3b9e6fb99bf5f945d4a41f198161294866aa23f2327818cdd55cb5dc4c1a8eff29dd8b8d04902d6cd43a71835c82
-b1e808260e368a18d9d10bdea5d60223ba1713b948c782285a27a99ae50cc5fc2c53d407de07155ecc16fb8a36d744a0
-a3eb4665f18f71833fec43802730e56b3ee5a357ea30a888ad482725b169d6f1f6ade6e208ee081b2e2633079b82ba7d
-ab8beb2c8353fc9f571c18fdd02bdb977fc883313469e1277b0372fbbb33b80dcff354ca41de436d98d2ed710faa467e
-aa9071cfa971e4a335a91ad634c98f2be51544cb21f040f2471d01bb97e1df2277ae1646e1ea8f55b7ba9f5c8c599b39
-80b7dbfdcaf40f0678012acc634eba44ea51181475180d9deb2050dc4f2de395289edd0223018c81057ec79b04b04c49
-89623d7f6cb17aa877af14de842c2d4ab7fd576d61ddd7518b5878620a01ded40b6010de0da3cdf31d837eecf30e9847
-a773bb024ae74dd24761f266d4fb27d6fd366a8634febe8235376b1ae9065c2fe12c769f1d0407867dfbe9f5272c352f
-8455a561c3aaa6ba64c881a5e13921c592b3a02e968f4fb24a2243c36202795d0366d9cc1a24e916f84d6e158b7aeac7
-81d8bfc4b283cf702a40b87a2b96b275bdbf0def17e67d04842598610b67ea08c804d400c3e69fa09ea001eaf345b276
-b8f8f82cb11fea1c99467013d7e167ff03deb0c65a677fab76ded58826d1ba29aa7cf9fcd7763615735ea3ad38e28719
-89a6a04baf9cccc1db55179e1650b1a195dd91fb0aebc197a25143f0f393524d2589975e3fbfc2547126f0bced7fd6f2
-b81b2162df045390f04df07cbd0962e6b6ca94275a63edded58001a2f28b2ae2af2c7a6cba4ecd753869684e77e7e799
-a3757f722776e50de45c62d9c4a2ee0f5655a512344c4cbec542d8045332806568dd626a719ef21a4eb06792ca70f204
-8c5590df96ec22179a4e8786de41beb44f987a1dcc508eb341eecbc0b39236fdfad47f108f852e87179ccf4e10091e59
-87502f026ed4e10167419130b88c3737635c5b9074c364e1dd247cef5ef0fc064b4ae99b187e33301e438bbd2fe7d032
-af925a2165e980ced620ff12289129fe17670a90ae0f4db9d4b39bd887ccb1f5d2514ac9ecf910f6390a8fc66bd5be17
-857fca899828cf5c65d26e3e8a6e658542782fc72762b3b9c73514919f83259e0f849a9d4838b40dc905fe43024d0d23
-87ffebdbfb69a9e1007ebac4ffcb4090ff13705967b73937063719aa97908986effcb7262fdadc1ae0f95c3690e3245d
-a9ff6c347ac6f4c6ab993b748802e96982eaf489dc69032269568412fc9a79e7c2850dfc991b28211b3522ee4454344b
-a65b3159df4ec48bebb67cb3663cd744027ad98d970d620e05bf6c48f230fa45bf17527fe726fdf705419bb7a1bb913e
-84b97b1e6408b6791831997b03cd91f027e7660fd492a93d95daafe61f02427371c0e237c75706412f442991dfdff989
-ab761c26527439b209af0ae6afccd9340bbed5fbe098734c3145b76c5d2cd7115d9227b2eb523882b7317fbb09180498
-a0479a8da06d7a69c0b0fee60df4e691c19c551f5e7da286dab430bfbcabf31726508e20d26ea48c53365a7f00a3ad34
-a732dfc9baa0f4f40b5756d2e8d8937742999623477458e0bc81431a7b633eefc6f53b3b7939fe0a020018549c954054
-901502436a1169ba51dc479a5abe7c8d84e0943b16bc3c6a627b49b92cd46263c0005bc324c67509edd693f28e612af1
-b627aee83474e7f84d1bab9b7f6b605e33b26297ac6bbf52d110d38ba10749032bd551641e73a383a303882367af429b
-95108866745760baef4a46ef56f82da6de7e81c58b10126ebd2ba2cd13d339f91303bf2fb4dd104a6956aa3b13739503
-899ed2ade37236cec90056f3569bc50f984f2247792defafcceb49ad0ca5f6f8a2f06573705300e07f0de0c759289ff5
-a9f5eee196d608efe4bcef9bf71c646d27feb615e21252cf839a44a49fd89da8d26a758419e0085a05b1d59600e2dc42
-b36c6f68fed6e6c85f1f4a162485f24817f2843ec5cbee45a1ebfa367d44892e464949c6669f7972dc7167af08d55d25
-aaaede243a9a1b6162afbc8f571a52671a5a4519b4062e3f26777664e245ba873ed13b0492c5dbf0258c788c397a0e9e
-972b4fb39c31cbe127bf9a32a5cc10d621ebdd9411df5e5da3d457f03b2ab2cd1f6372d8284a4a9400f0b06ecdbfd38e
-8f6ca1e110e959a4b1d9a5ce5f212893cec21db40d64d5ac4d524f352d72198f923416a850bf845bc5a22a79c0ea2619
-a0f3c93b22134f66f04b2553a53b738644d1665ceb196b8494b315a4c28236fb492017e4a0de4224827c78e42f9908b7
-807fb5ee74f6c8735b0b5ca07e28506214fe4047dbeb00045d7c24f7849e98706aea79771241224939cb749cf1366c7d
-915eb1ff034224c0b645442cdb7d669303fdc00ca464f91aaf0b6fde0b220a3a74ff0cb043c26c9f3a5667b3fdaa9420
-8fda6cef56ed33fefffa9e6ac8e6f76b1af379f89761945c63dd448801f7bb8ca970504a7105fac2f74f652ccff32327
-87380cffdcffb1d0820fa36b63cc081e72187f86d487315177d4d04da4533eb19a0e2ff6115ceab528887819c44a5164
-8cd89e03411a18e7f16f968b89fb500c36d47d229f6487b99e62403a980058db5925ce249206743333538adfad168330
-974451b1df33522ce7056de9f03e10c70bf302c44b0741a59df3d6877d53d61a7394dcee1dd46e013d7cb9d73419c092
-98c35ddf645940260c490f384a49496a7352bb8e3f686feed815b1d38f59ded17b1ad6e84a209e773ed08f7b8ff1e4c2
-963f386cf944bb9b2ddebb97171b64253ea0a2894ac40049bdd86cda392292315f3a3d490ca5d9628c890cfb669f0acb
-8d507712152babd6d142ee682638da8495a6f3838136088df9424ef50d5ec28d815a198c9a4963610b22e49b4cdf95e9
-83d4bc6b0be87c8a4f1e9c53f257719de0c73d85b490a41f7420e777311640937320557ff2f1d9bafd1daaa54f932356
-82f5381c965b7a0718441131c4d13999f4cdce637698989a17ed97c8ea2e5bdb5d07719c5f7be8688edb081b23ede0f4
-a6ebecab0b72a49dfd01d69fa37a7f74d34fb1d4fef0aa10e3d6fceb9eccd671225c230af89f6eb514250e41a5f91f52
-846d185bdad6e11e604df7f753b7a08a28b643674221f0e750ebdb6b86ec584a29c869e131bca868972a507e61403f6a
-85a98332292acb744bd1c0fd6fdcf1f889a78a2c9624d79413ffa194cc8dfa7821a4b60cde8081d4b5f71f51168dd67f
-8f7d97c3b4597880d73200d074eb813d95432306e82dafc70b580b8e08cb8098b70f2d07b4b3ac6a4d77e92d57035031
-8185439c8751e595825d7053518cbe121f191846a38d4dbcb558c3f9d7a3104f3153401adaaaf27843bbe2edb504bfe3
-b3c00d8ece1518fca6b1215a139b0a0e26d9cba1b3a424f7ee59f30ce800a5db967279ed60958dd1f3ee69cf4dd1b204
-a2e6cb6978e883f9719c3c0d44cfe8de0cc6f644b98f98858433bea8bbe7b612c8aca5952fccce4f195f9d54f9722dc2
-99663087e3d5000abbec0fbda4e7342ec38846cc6a1505191fb3f1a337cb369455b7f8531a6eb8b0f7b2c4baf83cbe2b
-ab0836c6377a4dbc7ca6a4d6cf021d4cd60013877314dd05f351706b128d4af6337711ed3443cb6ca976f40d74070a9a
-87abfd5126152fd3bac3c56230579b489436755ea89e0566aa349490b36a5d7b85028e9fb0710907042bcde6a6f5d7e3
-974ba1033f75f60e0cf7c718a57ae1da3721cf9d0fb925714c46f027632bdd84cd9e6de4cf4d00bc55465b1c5ebb7384
-a607b49d73689ac64f25cec71221d30d53e781e1100d19a2114a21da6507a60166166369d860bd314acb226596525670
-a7c2b0b915d7beba94954f2aa7dd08ec075813661e2a3ecca5d28a0733e59583247fed9528eb28aba55b972cdbaf06eb
-b8b3123e44128cc8efbe3270f2f94e50ca214a4294c71c3b851f8cbb70cb67fe9536cf07d04bf7fe380e5e3a29dd3c15
-a59a07e343b62ad6445a0859a32b58c21a593f9ddbfe52049650f59628c93715aa1f4e1f45b109321756d0eeec8a5429
-94f51f8a4ed18a6030d0aaa8899056744bd0e9dc9ac68f62b00355cddab11da5da16798db75f0bfbce0e5bdfe750c0b6
-97460a97ca1e1fa5ce243b81425edc0ec19b7448e93f0b55bc9785eedeeafe194a3c8b33a61a5c72990edf375f122777
-8fa859a089bc17d698a7ee381f37ce9beadf4e5b44fce5f6f29762bc04f96faff5d58c48c73631290325f05e9a1ecf49
-abdf38f3b20fc95eff31de5aa9ef1031abfa48f1305ee57e4d507594570401503476d3bcc493838fc24d6967a3082c7f
-b8914bfb82815abb86da35c64d39ab838581bc0bf08967192697d9663877825f2b9d6fbdcf9b410463482b3731361aef
-a8187f9d22b193a5f578999954d6ec9aa9b32338ccadb8a3e1ce5bad5ea361d69016e1cdfac44e9d6c54e49dd88561b9
-aac262cb7cba7fd62c14daa7b39677cabc1ef0947dd06dd89cac8570006a200f90d5f0353e84f5ff03179e3bebe14231
-a630ef5ece9733b8c46c0a2df14a0f37647a85e69c63148e79ffdcc145707053f9f9d305c3f1cf3c7915cb46d33abd07
-b102c237cb2e254588b6d53350dfda6901bd99493a3fbddb4121d45e0b475cf2663a40d7b9a75325eda83e4ba1e68cb3
-86a930dd1ddcc16d1dfa00aa292cb6c2607d42c367e470aa920964b7c17ab6232a7108d1c2c11fc40fb7496547d0bbf8
-a832fdc4500683e72a96cce61e62ac9ee812c37fe03527ad4cf893915ca1962cee80e72d4f82b20c8fc0b764376635a1
-88ad985f448dabb04f8808efd90f273f11f5e6d0468b5489a1a6a3d77de342992a73eb842d419034968d733f101ff683
-98a8538145f0d86f7fbf9a81c9140f6095c5bdd8960b1c6f3a1716428cd9cca1bf8322e6d0af24e6169abcf7df2b0ff6
-9048c6eba5e062519011e177e955a200b2c00b3a0b8615bdecdebc217559d41058d3315f6d05617be531ef0f6aef0e51
-833bf225ab6fc68cdcacf1ec1b50f9d05f5410e6cdcd8d56a3081dc2be8a8d07b81534d1ec93a25c2e270313dfb99e3b
-a84bcd24c3da5e537e64a811b93c91bfc84d7729b9ead7f79078989a6eb76717d620c1fad17466a0519208651e92f5ff
-b7cdd0a3fbd79aed93e1b5a44ca44a94e7af5ed911e4492f332e3a5ed146c7286bde01b52276a2fcc02780d2109874dd
-8a19a09854e627cb95750d83c20c67442b66b35896a476358f993ba9ac114d32c59c1b3d0b8787ee3224cf3888b56c64
-a9abd5afb8659ee52ada8fa5d57e7dd355f0a7350276f6160bec5fbf70d5f99234dd179eb221c913e22a49ec6d267846
-8c13c4274c0d30d184e73eaf812200094bbbd57293780bdadbceb262e34dee5b453991e7f37c7333a654fc71c69d6445
-a4320d73296ff8176ce0127ca1921c450e2a9c06eff936681ebaffb5a0b05b17fded24e548454de89aca2dcf6d7a9de4
-b2b8b3e15c1f645f07783e5628aba614e60157889db41d8161d977606788842b67f83f361eae91815dc0abd84e09abd5
-ad26c3aa35ddfddc15719b8bb6c264aaec7065e88ac29ba820eb61f220fef451609a7bb037f3722d022e6c86e4f1dc88
-b8615bf43e13ae5d7b8dd903ce37190800cd490f441c09b22aa29d7a29ed2c0417b7a08ead417868f1de2589deaadd80
-8d3425e1482cd1e76750a76239d33c06b3554c3c3c87c15cb7ab58b1cee86a4c5c4178b44e23f36928365a1b484bde02
-806893a62e38c941a7dd6f249c83af16596f69877cc737d8f73f6b8cd93cbc01177a7a276b2b8c6b0e5f2ad864db5994
-86618f17fa4b0d65496b661bbb5ba3bc3a87129d30a4b7d4f515b904f4206ca5253a41f49fd52095861e5e065ec54f21
-9551915da1304051e55717f4c31db761dcdcf3a1366c89a4af800a9e99aca93a357bf928307f098e62b44a02cb689a46
-8f79c4ec0ec1146cb2a523b52fe33def90d7b5652a0cb9c2d1c8808a32293e00aec6969f5b1538e3a94cd1efa3937f86
-a0c03e329a707300081780f1e310671315b4c6a4cedcb29697aedfabb07a9d5df83f27b20e9c44cf6b16e39d9ded5b98
-86a7cfa7c8e7ce2c01dd0baec2139e97e8e090ad4e7b5f51518f83d564765003c65968f85481bbb97cb18f005ccc7d9f
-a33811770c6dfda3f7f74e6ad0107a187fe622d61b444bbd84fd7ef6e03302e693b093df76f6ab39bb4e02afd84a575a
-85480f5c10d4162a8e6702b5e04f801874d572a62a130be94b0c02b58c3c59bdcd48cd05f0a1c2839f88f06b6e3cd337
-8e181011564b17f7d787fe0e7f3c87f6b62da9083c54c74fd6c357a1f464c123c1d3d8ade3cf72475000b464b14e2be3
-8ee178937294b8c991337e0621ab37e9ffa4ca2bdb3284065c5e9c08aad6785d50cf156270ff9daf9a9127289710f55b
-8bd1e8e2d37379d4b172f1aec96f2e41a6e1393158d7a3dbd9a95c8dd4f8e0b05336a42efc11a732e5f22b47fc5c271d
-8f3da353cd487c13136a85677de8cedf306faae0edec733cf4f0046f82fa4639db4745b0095ff33a9766aba50de0cbcf
-8d187c1e97638df0e4792b78e8c23967dac43d98ea268ca4aabea4e0fa06cb93183fd92d4c9df74118d7cc27bf54415e
-a4c992f08c2f8bac0b74b3702fb0c75c9838d2ce90b28812019553d47613c14d8ce514d15443159d700b218c5a312c49
-a6fd1874034a34c3ea962a316c018d9493d2b3719bb0ec4edbc7c56b240802b2228ab49bee6f04c8a3e9f6f24a48c1c2
-b2efed8e799f8a15999020900dc2c58ece5a3641c90811b86a5198e593d7318b9d53b167818ccdfbe7df2414c9c34011
-995ff7de6181ddf95e3ead746089c6148da3508e4e7a2323c81785718b754d356789b902e7e78e2edc6b0cbd4ff22c78
-944073d24750a9068cbd020b834afc72d2dde87efac04482b3287b40678ad07588519a4176b10f2172a2c463d063a5cd
-99db4b1bb76475a6fd75289986ef40367960279524378cc917525fb6ba02a145a218c1e9caeb99332332ab486a125ac0
-89fce4ecd420f8e477af4353b16faabb39e063f3f3c98fde2858b1f2d1ef6eed46f0975a7c08f233b97899bf60ccd60a
-8c09a4f07a02b80654798bc63aada39fd638d3e3c4236ccd8a5ca280350c31e4a89e5f4c9aafb34116e71da18c1226b8
-85325cfa7ded346cc51a2894257eab56e7488dbff504f10f99f4cd2b630d913003761a50f175ed167e8073f1b6b63fb0
-b678b4fbec09a8cc794dcbca185f133578f29e354e99c05f6d07ac323be20aecb11f781d12898168e86f2e0f09aca15e
-a249cfcbca4d9ba0a13b5f6aac72bf9b899adf582f9746bb2ad043742b28915607467eb794fca3704278f9136f7642be
-9438e036c836a990c5e17af3d78367a75b23c37f807228362b4d13e3ddcb9e431348a7b552d09d11a2e9680704a4514f
-925ab70450af28c21a488bfb5d38ac994f784cf249d7fd9ad251bb7fd897a23e23d2528308c03415074d43330dc37ef4
-a290563904d5a8c0058fc8330120365bdd2ba1fdbaef7a14bc65d4961bb4217acfaed11ab82669e359531f8bf589b8db
-a7e07a7801b871fc9b981a71e195a3b4ba6b6313bc132b04796a125157e78fe5c11a3a46cf731a255ac2d78a4ae78cd0
-b26cd2501ee72718b0eebab6fb24d955a71f363f36e0f6dff0ab1d2d7836dab88474c0cef43a2cc32701fca7e82f7df3
-a1dc3b6c968f3de00f11275092290afab65b2200afbcfa8ddc70e751fa19dbbc300445d6d479a81bda3880729007e496
-a9bc213e28b630889476a095947d323b9ac6461dea726f2dc9084473ae8e196d66fb792a21905ad4ec52a6d757863e7d
-b25d178df8c2df8051e7c888e9fa677fde5922e602a95e966db9e4a3d6b23ce043d7dc48a5b375c6b7c78e966893e8c3
-a1c8d88d72303692eaa7adf68ea41de4febec40cc14ae551bb4012afd786d7b6444a3196b5d9d5040655a3366d96b7cd
-b22bd44f9235a47118a9bbe2ba5a2ba9ec62476061be2e8e57806c1a17a02f9a51403e849e2e589520b759abd0117683
-b8add766050c0d69fe81d8d9ea73e1ed05f0135d093ff01debd7247e42dbb86ad950aceb3b50b9af6cdc14ab443b238f
-af2cf95f30ef478f018cf81d70d47d742120b09193d8bb77f0d41a5d2e1a80bfb467793d9e2471b4e0ad0cb2c3b42271
-8af5ef2107ad284e246bb56e20fef2a255954f72de791cbdfd3be09f825298d8466064f3c98a50496c7277af32b5c0bc
-85dc19558572844c2849e729395a0c125096476388bd1b14fa7f54a7c38008fc93e578da3aac6a52ff1504d6ca82db05
-ae8c9b43c49572e2e166d704caf5b4b621a3b47827bb2a3bcd71cdc599bba90396fd9a405261b13e831bb5d44c0827d7
-a7ba7efede25f02e88f6f4cbf70643e76784a03d97e0fbd5d9437c2485283ad7ca3abb638a5f826cd9f6193e5dec0b6c
-94a9d122f2f06ef709fd8016fd4b712d88052245a65a301f5f177ce22992f74ad05552b1f1af4e70d1eac62cef309752
-82d999b3e7cf563833b8bc028ff63a6b26eb357dfdb3fd5f10e33a1f80a9b2cfa7814d871b32a7ebfbaa09e753e37c02
-aec6edcde234df502a3268dd2c26f4a36a2e0db730afa83173f9c78fcb2b2f75510a02b80194327b792811caefda2725
-94c0bfa66c9f91d462e9194144fdd12d96f9bbe745737e73bab8130607ee6ea9d740e2cfcbbd00a195746edb6369ee61
-ab7573dab8c9d46d339e3f491cb2826cabe8b49f85f1ede78d845fc3995537d1b4ab85140b7d0238d9c24daf0e5e2a7e
-87e8b16832843251fe952dadfd01d41890ed4bb4b8fa0254550d92c8cced44368225eca83a6c3ad47a7f81ff8a80c984
-9189d2d9a7c64791b19c0773ad4f0564ce6bea94aa275a917f78ad987f150fdb3e5e26e7fef9982ac184897ecc04683f
-b3661bf19e2da41415396ae4dd051a9272e8a2580b06f1a1118f57b901fa237616a9f8075af1129af4eabfefedbe2f1c
-af43c86661fb15daf5d910a4e06837225e100fb5680bd3e4b10f79a2144c6ec48b1f8d6e6b98e067d36609a5d038889a
-82ac0c7acaa83ddc86c5b4249aae12f28155989c7c6b91e5137a4ce05113c6cbc16f6c44948b0efd8665362d3162f16a
-8f268d1195ab465beeeb112cd7ffd5d5548559a8bc01261106d3555533fc1971081b25558d884d552df0db1cddda89d8
-8ef7caa5521f3e037586ce8ac872a4182ee20c7921c0065ed9986c047e3dda08294da1165f385d008b40d500f07d895f
-8c2f98f6880550573fad46075d3eba26634b5b025ce25a0b4d6e0193352c8a1f0661064027a70fe8190b522405f9f4e3
-b7653f353564feb164f0f89ec7949da475b8dad4a4d396d252fc2a884f6932d027b7eb2dc4d280702c74569319ed701a
-a026904f4066333befd9b87a8fad791d014096af60cdd668ef919c24dbe295ff31f7a790e1e721ba40cf5105abca67f4
-988f982004ada07a22dd345f2412a228d7a96b9cae2c487de42e392afe1e35c2655f829ce07a14629148ce7079a1f142
-9616add009067ed135295fb74d5b223b006b312bf14663e547a0d306694ff3a8a7bb9cfc466986707192a26c0bce599f
-ad4c425de9855f6968a17ee9ae5b15e0a5b596411388cf976df62ecc6c847a6e2ddb2cea792a5f6e9113c2445dba3e5c
-b698ac9d86afa3dc69ff8375061f88e3b0cff92ff6dfe747cebaf142e813c011851e7a2830c10993b715e7fd594604a9
-a386fa189847bb3b798efca917461e38ead61a08b101948def0f82cd258b945ed4d45b53774b400af500670149e601b7
-905c95abda2c68a6559d8a39b6db081c68cef1e1b4be63498004e1b2f408409be9350b5b5d86a30fd443e2b3e445640a
-9116dade969e7ce8954afcdd43e5cab64dc15f6c1b8da9d2d69de3f02ba79e6c4f6c7f54d6bf586d30256ae405cd1e41
-a3084d173eacd08c9b5084a196719b57e47a0179826fda73466758235d7ecdb87cbcf097bd6b510517d163a85a7c7edd
-85bb00415ad3c9be99ff9ba83672cc59fdd24356b661ab93713a3c8eab34e125d8867f628a3c3891b8dc056e69cd0e83
-8d58541f9f39ed2ee4478acce5d58d124031338ec11b0d55551f00a5a9a6351faa903a5d7c132dc5e4bb026e9cbd18e4
-a622adf72dc250e54f672e14e128c700166168dbe0474cecb340da175346e89917c400677b1bc1c11fcc4cc26591d9db
-b3f865014754b688ca8372e8448114fff87bf3ca99856ab9168894d0c4679782c1ced703f5b74e851b370630f5e6ee86
-a7e490b2c40c2446fcd91861c020da9742c326a81180e38110558bb5d9f2341f1c1885e79b364e6419023d1cbdc47380
-b3748d472b1062e54572badbb8e87ac36534407f74932e7fc5b8392d008e8e89758f1671d1e4d30ab0fa40551b13bb5e
-89898a5c5ec4313aabc607b0049fd1ebad0e0c074920cf503c9275b564d91916c2c446d3096491c950b7af3ac5e4b0ed
-8eb8c83fef2c9dd30ea44e286e9599ec5c20aba983f702e5438afe2e5b921884327ad8d1566c72395587efac79ca7d56
-b92479599e806516ce21fb0bd422a1d1d925335ebe2b4a0a7e044dd275f30985a72b97292477053ac5f00e081430da80
-a34ae450a324fe8a3c25a4d653a654f9580ed56bbea213b8096987bbad0f5701d809a17076435e18017fea4d69f414bc
-81381afe6433d62faf62ea488f39675e0091835892ecc238e02acf1662669c6d3962a71a3db652f6fe3bc5f42a0e5dc5
-a430d475bf8580c59111103316fe1aa79c523ea12f1d47a976bbfae76894717c20220e31cf259f08e84a693da6688d70
-b842814c359754ece614deb7d184d679d05d16f18a14b288a401cef5dad2cf0d5ee90bad487b80923fc5573779d4e4e8
-971d9a2627ff2a6d0dcf2af3d895dfbafca28b1c09610c466e4e2bff2746f8369de7f40d65b70aed135fe1d72564aa88
-8f4ce1c59e22b1ce7a0664caaa7e53735b154cfba8d2c5cc4159f2385843de82ab58ed901be876c6f7fce69cb4130950
-86cc9dc321b6264297987000d344fa297ef45bcc2a4df04e458fe2d907ad304c0ea2318e32c3179af639a9a56f3263cf
-8229e0876dfe8f665c3fb19b250bd89d40f039bbf1b331468b403655be7be2e104c2fd07b9983580c742d5462ca39a43
-99299d73066e8eb128f698e56a9f8506dfe4bd014931e86b6b487d6195d2198c6c5bf15cccb40ccf1f8ddb57e9da44a2
-a3a3be37ac554c574b393b2f33d0a32a116c1a7cfeaf88c54299a4da2267149a5ecca71f94e6c0ef6e2f472b802f5189
-a91700d1a00387502cdba98c90f75fbc4066fefe7cc221c8f0e660994c936badd7d2695893fde2260c8c11d5bdcdd951
-8e03cae725b7f9562c5c5ab6361644b976a68bada3d7ca508abca8dfc80a469975689af1fba1abcf21bc2a190dab397d
-b01461ad23b2a8fa8a6d241e1675855d23bc977dbf4714add8c4b4b7469ccf2375cec20e80cedfe49361d1a30414ac5b
-a2673bf9bc621e3892c3d7dd4f1a9497f369add8cbaa3472409f4f86bd21ac67cfac357604828adfee6ada1835365029
-a042dff4bf0dfc33c178ba1b335e798e6308915128de91b12e5dbbab7c4ac8d60a01f6aea028c3a6d87b9b01e4e74c01
-86339e8a75293e4b3ae66b5630d375736b6e6b6b05c5cda5e73fbf7b2f2bd34c18a1d6cefede08625ce3046e77905cb8
-af2ebe1b7d073d03e3d98bc61af83bf26f7a8c130fd607aa92b75db22d14d016481b8aa231e2c9757695f55b7224a27f
-a00ee882c9685e978041fd74a2c465f06e2a42ffd3db659053519925be5b454d6f401e3c12c746e49d910e4c5c9c5e8c
-978a781c0e4e264e0dad57e438f1097d447d891a1e2aa0d5928f79a9d5c3faae6f258bc94fdc530b7b2fa6a9932bb193
-aa4b7ce2e0c2c9e9655bf21e3e5651c8503bce27483017b0bf476be743ba06db10228b3a4c721219c0779747f11ca282
-b003d1c459dacbcf1a715551311e45d7dbca83a185a65748ac74d1800bbeaba37765d9f5a1a221805c571910b34ebca8
-95b6e531b38648049f0d19de09b881baa1f7ea3b2130816b006ad5703901a05da57467d1a3d9d2e7c73fb3f2e409363c
-a6cf9c06593432d8eba23a4f131bb7f72b9bd51ab6b4b772a749fe03ed72b5ced835a349c6d9920dba2a39669cb7c684
-aa3d59f6e2e96fbb66195bc58c8704e139fa76cd15e4d61035470bd6e305db9f98bcbf61ac1b95e95b69ba330454c1b3
-b57f97959c208361de6d7e86dff2b873068adb0f158066e646f42ae90e650079798f165b5cd713141cd3a2a90a961d9a
-a76ee8ed9052f6a7a8c69774bb2597be182942f08115baba03bf8faaeaee526feba86120039fe8ca7b9354c3b6e0a8e6
-95689d78c867724823f564627d22d25010f278674c6d2d0cdb10329169a47580818995d1d727ce46c38a1e47943ebb89
-ab676d2256c6288a88e044b3d9ffd43eb9d5aaee00e8fc60ac921395fb835044c71a26ca948e557fed770f52d711e057
-96351c72785c32e5d004b6f4a1259fb8153d631f0c93fed172f18e8ba438fbc5585c1618deeabd0d6d0b82173c2e6170
-93dd8d3db576418e22536eba45ab7f56967c6c97c64260d6cddf38fb19c88f2ec5cd0e0156f50e70855eee8a2b879ffd
-ad6ff16f40f6de3d7a737f8e6cebd8416920c4ff89dbdcd75eabab414af9a6087f83ceb9aff7680aa86bff98bd09c8cc
-84de53b11671abc9c38710e19540c5c403817562aeb22a88404cdaff792c1180f717dbdfe8f54940c062c4d032897429
-872231b9efa1cdd447b312099a5c164c560440a9441d904e70f5abfc3b2a0d16be9a01aca5e0a2599a61e19407587e3d
-88f44ac27094a2aa14e9dc40b099ee6d68f97385950f303969d889ee93d4635e34dff9239103bdf66a4b7cbba3e7eb7a
-a59afebadf0260e832f6f44468443562f53fbaf7bcb5e46e1462d3f328ac437ce56edbca617659ac9883f9e13261fad7
-b1990e42743a88de4deeacfd55fafeab3bc380cb95de43ed623d021a4f2353530bcab9594389c1844b1c5ea6634c4555
-85051e841149a10e83f56764e042182208591396d0ce78c762c4a413e6836906df67f38c69793e158d64fef111407ba3
-9778172bbd9b1f2ec6bbdd61829d7b39a7df494a818e31c654bf7f6a30139899c4822c1bf418dd4f923243067759ce63
-9355005b4878c87804fc966e7d24f3e4b02bed35b4a77369d01f25a3dcbff7621b08306b1ac85b76fe7b4a3eb5f839b1
-8f9dc6a54fac052e236f8f0e1f571ac4b5308a43acbe4cc8183bce26262ddaf7994e41cf3034a4cbeca2c505a151e3b1
-8cc59c17307111723fe313046a09e0e32ea0cce62c13814ab7c6408c142d6a0311d801be4af53fc9240523f12045f9ef
-8e6057975ed40a1932e47dd3ac778f72ee2a868d8540271301b1aa6858de1a5450f596466494a3e0488be4fbeb41c840
-812145efbd6559ae13325d56a15940ca4253b17e72a9728986b563bb5acc13ec86453796506ac1a8f12bd6f9e4a288c3
-911da0a6d6489eb3dab2ec4a16e36127e8a291ae68a6c2c9de33e97f3a9b1f00da57a94e270a0de79ecc5ecb45d19e83
-b72ea85973f4b2a7e6e71962b0502024e979a73c18a9111130e158541fa47bbaaf53940c8f846913a517dc69982ba9e1
-a7a56ad1dbdc55f177a7ad1d0af78447dc2673291e34e8ab74b26e2e2e7d8c5fe5dc89e7ef60f04a9508847b5b3a8188
-b52503f6e5411db5d1e70f5fb72ccd6463fa0f197b3e51ca79c7b5a8ab2e894f0030476ada72534fa4eb4e06c3880f90
-b51c7957a3d18c4e38f6358f2237b3904618d58b1de5dec53387d25a63772e675a5b714ad35a38185409931157d4b529
-b86b4266e719d29c043d7ec091547aa6f65bbf2d8d831d1515957c5c06513b72aa82113e9645ad38a7bc3f5383504fa6
-b95b547357e6601667b0f5f61f261800a44c2879cf94e879def6a105b1ad2bbf1795c3b98a90d588388e81789bd02681
-a58fd4c5ae4673fa350da6777e13313d5d37ed1dafeeb8f4f171549765b84c895875d9d3ae6a9741f3d51006ef81d962
-9398dc348d078a604aadc154e6eef2c0be1a93bb93ba7fe8976edc2840a3a318941338cc4d5f743310e539d9b46613d2
-902c9f0095014c4a2f0dccaaab543debba6f4cc82c345a10aaf4e72511725dbed7a34cd393a5f4e48a3e5142b7be84ed
-a7c0447849bb44d04a0393a680f6cd390093484a79a147dd238f5d878030d1c26646d88211108e59fe08b58ad20c6fbd
-80db045535d6e67a422519f5c89699e37098449d249698a7cc173a26ccd06f60238ae6cc7242eb780a340705c906790c
-8e52b451a299f30124505de2e74d5341e1b5597bdd13301cc39b05536c96e4380e7f1b5c7ef076f5b3005a868657f17c
-824499e89701036037571761e977654d2760b8ce21f184f2879fda55d3cda1e7a95306b8abacf1caa79d3cc075b9d27f
-9049b956b77f8453d2070607610b79db795588c0cec12943a0f5fe76f358dea81e4f57a4692112afda0e2c05c142b26f
-81911647d818a4b5f4990bfd4bc13bf7be7b0059afcf1b6839333e8569cdb0172fd2945410d88879349f677abaed5eb3
-ad4048f19b8194ed45b6317d9492b71a89a66928353072659f5ce6c816d8f21e69b9d1817d793effe49ca1874daa1096
-8d22f7b2ddb31458661abd34b65819a374a1f68c01fc6c9887edeba8b80c65bceadb8f57a3eb686374004b836261ef67
-92637280c259bc6842884db3d6e32602a62252811ae9b019b3c1df664e8809ffe86db88cfdeb8af9f46435c9ee790267
-a2f416379e52e3f5edc21641ea73dc76c99f7e29ea75b487e18bd233856f4c0183429f378d2bfc6cd736d29d6cadfa49
-882cb6b76dbdc188615dcf1a8439eba05ffca637dd25197508156e03c930b17b9fed2938506fdd7b77567cb488f96222
-b68b621bb198a763fb0634eddb93ed4b5156e59b96c88ca2246fd1aea3e6b77ed651e112ac41b30cd361fadc011d385e
-a3cb22f6b675a29b2d1f827cacd30df14d463c93c3502ef965166f20d046af7f9ab7b2586a9c64f4eae4fad2d808a164
-8302d9ce4403f48ca217079762ce42cee8bc30168686bb8d3a945fbd5acd53b39f028dce757b825eb63af2d5ae41169d
-b2eef1fbd1a176f1f4cd10f2988c7329abe4eb16c7405099fb92baa724ab397bc98734ef7d4b24c0f53dd90f57520d04
-a1bbef0bd684a3f0364a66bde9b29326bac7aa3dde4caed67f14fb84fed3de45c55e406702f1495a3e2864d4ee975030
-976acdb0efb73e3a3b65633197692dedc2adaed674291ae3df76b827fc866d214e9cac9ca46baefc4405ff13f953d936
-b9fbf71cc7b6690f601f0b1c74a19b7d14254183a2daaafec7dc3830cba5ae173d854bbfebeca985d1d908abe5ef0cda
-90591d7b483598c94e38969c4dbb92710a1a894bcf147807f1bcbd8aa3ac210b9f2be65519aa829f8e1ccdc83ad9b8cf
-a30568577c91866b9c40f0719d46b7b3b2e0b4a95e56196ac80898a2d89cc67880e1229933f2cd28ee3286f8d03414d7
-97589a88c3850556b359ec5e891f0937f922a751ac7c95949d3bbc7058c172c387611c0f4cb06351ef02e5178b3dd9e4
-98e7bbe27a1711f4545df742f17e3233fbcc63659d7419e1ca633f104cb02a32c84f2fac23ca2b84145c2672f68077ab
-a7ddb91636e4506d8b7e92aa9f4720491bb71a72dadc47c7f4410e15f93e43d07d2b371951a0e6a18d1bd087aa96a5c4
-a7c006692227a06db40bceac3d5b1daae60b5692dd9b54772bedb5fea0bcc91cbcdb530cac31900ffc70c5b3ffadc969
-8d3ec6032778420dfa8be52066ba0e623467df33e4e1901dbadd586c5d750f4ccde499b5197e26b9ea43931214060f69
-8d9a8410518ea64f89df319bfd1fc97a0971cdb9ad9b11d1f8fe834042ea7f8dce4db56eeaf179ff8dda93b6db93e5ce
-a3c533e9b3aa04df20b9ff635cb1154ce303e045278fcf3f10f609064a5445552a1f93989c52ce852fd0bbd6e2b6c22e
-81934f3a7f8c1ae60ec6e4f212986bcc316118c760a74155d06ce0a8c00a9b9669ec4e143ca214e1b995e41271774fd9
-ab8e2d01a71192093ef8fafa7485e795567cc9db95a93fb7cc4cf63a391ef89af5e2bfad4b827fffe02b89271300407f
-83064a1eaa937a84e392226f1a60b7cfad4efaa802f66de5df7498962f7b2649924f63cd9962d47906380b97b9fe80e1
-b4f5e64a15c6672e4b55417ee5dc292dcf93d7ea99965a888b1cc4f5474a11e5b6520eacbcf066840b343f4ceeb6bf33
-a63d278b842456ef15c278b37a6ea0f27c7b3ffffefca77c7a66d2ea06c33c4631eb242bbb064d730e70a8262a7b848a
-83a41a83dbcdf0d22dc049de082296204e848c453c5ab1ba75aa4067984e053acf6f8b6909a2e1f0009ed051a828a73b
-819485b036b7958508f15f3c19436da069cbe635b0318ebe8c014cf1ef9ab2df038c81161b7027475bcfa6fff8dd9faf
-aa40e38172806e1e045e167f3d1677ef12d5dcdc89b43639a170f68054bd196c4fae34c675c1644d198907a03f76ba57
-969bae484883a9ed1fbed53b26b3d4ee4b0e39a6c93ece5b3a49daa01444a1c25727dabe62518546f36b047b311b177c
-80a9e73a65da99664988b238096a090d313a0ee8e4235bc102fa79bb337b51bb08c4507814eb5baec22103ec512eaab0
-86604379aec5bddda6cbe3ef99c0ac3a3c285b0b1a15b50451c7242cd42ae6b6c8acb717dcca7917838432df93a28502
-a23407ee02a495bed06aa7e15f94cfb05c83e6d6fba64456a9bbabfa76b2b68c5c47de00ba169e710681f6a29bb41a22
-98cff5ecc73b366c6a01b34ac9066cb34f7eeaf4f38a5429bad2d07e84a237047e2a065c7e8a0a6581017dadb4695deb
-8de9f68a938f441f3b7ab84bb1f473c5f9e5c9e139e42b7ccee1d254bd57d0e99c2ccda0f3198f1fc5737f6023dd204e
-b0ce48d815c2768fb472a315cad86aa033d0e9ca506f146656e2941829e0acb735590b4fbc713c2d18d3676db0a954ac
-82f485cdefd5642a6af58ac6817991c49fac9c10ace60f90b27f1788cc026c2fe8afc83cf499b3444118f9f0103598a8
-82c24550ed512a0d53fc56f64cc36b553823ae8766d75d772dacf038c460f16f108f87a39ceef7c66389790f799dbab3
-859ffcf1fe9166388316149b9acc35694c0ea534d43f09dae9b86f4aa00a23b27144dda6a352e74b9516e8c8d6fc809c
-b8f7f353eec45da77fb27742405e5ad08d95ec0f5b6842025be9def3d9892f85eb5dd0921b41e6eff373618dba215bca
-8ccca4436f9017e426229290f5cd05eac3f16571a4713141a7461acfe8ae99cd5a95bf5b6df129148693c533966145da
-a2c67ecc19c0178b2994846fea4c34c327a5d786ac4b09d1d13549d5be5996d8a89021d63d65cb814923388f47cc3a03
-aa0ff87d676b418ec08f5cbf577ac7e744d1d0e9ebd14615b550eb86931eafd2a36d4732cc5d6fab1713fd7ab2f6f7c0
-8aef4730bb65e44efd6bb9441c0ae897363a2f3054867590a2c2ecf4f0224e578c7a67f10b40f8453d9f492ac15a9b2d
-86a187e13d8fba5addcfdd5b0410cedd352016c930f913addd769ee09faa6be5ca3e4b1bdb417a965c643a99bd92be42
-a0a4e9632a7a094b14b29b78cd9c894218cdf6783e61671e0203865dc2a835350f465fbaf86168f28af7c478ca17bc89
-a8c7b02d8deff2cd657d8447689a9c5e2cd74ef57c1314ac4d69084ac24a7471954d9ff43fe0907d875dcb65fd0d3ce5
-97ded38760aa7be6b6960b5b50e83b618fe413cbf2bcc1da64c05140bcc32f5e0e709cd05bf8007949953fac5716bad9
-b0d293835a24d64c2ae48ce26e550b71a8c94a0883103757fb6b07e30747f1a871707d23389ba2b2065fa6bafe220095
-8f9e291bf849feaa575592e28e3c8d4b7283f733d41827262367ea1c40f298c7bcc16505255a906b62bf15d9f1ba85fb
-998f4e2d12708b4fd85a61597ca2eddd750f73c9e0c9b3cf0825d8f8e01f1628fd19797dcaed3b16dc50331fc6b8b821
-b30d1f8c115d0e63bf48f595dd10908416774c78b3bbb3194192995154d80ea042d2e94d858de5f8aa0261b093c401fd
-b5d9c75bb41f964cbff3f00e96d9f1480c91df8913f139f0d385d27a19f57a820f838eb728e46823cbff00e21c660996
-a6edec90b5d25350e2f5f0518777634f9e661ec9d30674cf5b156c4801746d62517751d90074830ac0f4b09911c262f1
-82f98da1264b6b75b8fbeb6a4d96d6a05b25c24db0d57ba3a38efe3a82d0d4e331b9fc4237d6494ccfe4727206457519
-b89511843453cf4ecd24669572d6371b1e529c8e284300c43e0d5bb6b3aaf35aeb634b3cb5c0a2868f0d5e959c1d0772
-a82bf065676583e5c1d3b81987aaae5542f522ba39538263a944bb33ea5b514c649344a96c0205a3b197a3f930fcda6c
-a37b47ea527b7e06c460776aa662d9a49ff4149d3993f1a974b0dd165f7171770d189b0e2ea54fd5fccb6a14b116e68a
-a1017677f97dda818274d47556d09d0e4ccacb23a252f82a6cfe78c630ad46fb9806307445a59fb61262182de3a2b29c
-b01e9fcac239ba270e6877b79273ddd768bf8a51d2ed8a051b1c11e18eff3de5920e2fcbfbd26f06d381eddd3b1f1e1b
-82fcd53d803b1c8e4ed76adc339b7f3a5962d37042b9683aabac7513ac68775d4a566a9460183926a6a95dbe7d551a1f
-a763e78995d55cd21cdb7ef75d9642d6e1c72453945e346ab6690c20a4e1eeec61bb848ef830ae4b56182535e3c71d8f
-b769f4db602251d4b0a1186782799bdcef66de33c110999a5775c50b349666ffd83d4c89714c4e376f2efe021a5cfdb2
-a59cbd1b785efcfa6e83fc3b1d8cf638820bc0c119726b5368f3fba9dce8e3414204fb1f1a88f6c1ff52e87961252f97
-95c8c458fd01aa23ecf120481a9c6332ebec2e8bb70a308d0576926a858457021c277958cf79017ddd86a56cacc2d7db
-82eb41390800287ae56e77f2e87709de5b871c8bdb67c10a80fc65f3acb9f7c29e8fa43047436e8933f27449ea61d94d
-b3ec25e3545eb83aed2a1f3558d1a31c7edde4be145ecc13b33802654b77dc049b4f0065069dd9047b051e52ab11dcdd
-b78a0c715738f56f0dc459ab99e252e3b579b208142836b3c416b704ca1de640ca082f29ebbcee648c8c127df06f6b1e
-a4083149432eaaf9520188ebf4607d09cf664acd1f471d4fb654476e77a9eaae2251424ffda78d09b6cb880df35c1219
-8c52857d68d6e9672df3db2df2dbf46b516a21a0e8a18eec09a6ae13c1ef8f369d03233320dd1c2c0bbe00abfc1ea18b
-8c856089488803066bff3f8d8e09afb9baf20cecc33c8823c1c0836c3d45498c3de37e87c016b705207f60d2b00f8609
-831a3df39be959047b2aead06b4dcd3012d7b29417f642b83c9e8ce8de24a3dbbd29c6fdf55e2db3f7ea04636c94e403
-aed84d009f66544addabe404bf6d65af7779ce140dc561ff0c86a4078557b96b2053b7b8a43432ffb18cd814f143b9da
-93282e4d72b0aa85212a77b336007d8ba071eea17492da19860f1ad16c1ea8867ccc27ef5c37c74b052465cc11ea4f52
-a7b78b8c8d057194e8d68767f1488363f77c77bddd56c3da2bc70b6354c7aa76247c86d51f7371aa38a4aa7f7e3c0bb7
-b1c77283d01dcd1bde649b5b044eac26befc98ff57cbee379fb5b8e420134a88f2fc7f0bf04d15e1fbd45d29e7590fe6
-a4aa8de70330a73b2c6458f20a1067eed4b3474829b36970a8df125d53bbdda4f4a2c60063b7cccb0c80fc155527652f
-948a6c79ba1b8ad7e0bed2fae2f0481c4e41b4d9bbdd9b58164e28e9065700e83f210c8d5351d0212e0b0b68b345b3a5
-86a48c31dcbbf7b082c92d28e1f613a2378a910677d7db3a349dc089e4a1e24b12eee8e8206777a3a8c64748840b7387
-976adb1af21e0fc34148917cf43d933d7bfd3fd12ed6c37039dcd5a4520e3c6cf5868539ba5bf082326430deb8a4458d
-b93e1a4476f2c51864bb4037e7145f0635eb2827ab91732b98d49b6c07f6ac443111aa1f1da76d1888665cb897c3834e
-8afd46fb23bf869999fa19784b18a432a1f252d09506b8dbb756af900518d3f5f244989b3d7c823d9029218c655d3dc6
-83f1e59e3abeed18cdc632921672673f1cb6e330326e11c4e600e13e0d5bc11bdc970ae12952e15103a706fe720bf4d6
-90ce4cc660714b0b673d48010641c09c00fc92a2c596208f65c46073d7f349dd8e6e077ba7dcef9403084971c3295b76
-8b09b0f431a7c796561ecf1549b85048564de428dac0474522e9558b6065fede231886bc108539c104ce88ebd9b5d1b0
-85d6e742e2fb16a7b0ba0df64bc2c0dbff9549be691f46a6669bca05e89c884af16822b85faefefb604ec48c8705a309
-a87989ee231e468a712c66513746fcf03c14f103aadca0eac28e9732487deb56d7532e407953ab87a4bf8961588ef7b0
-b00da10efe1c29ee03c9d37d5918e391ae30e48304e294696b81b434f65cf8c8b95b9d1758c64c25e534d045ba28696f
-91c0e1fb49afe46c7056400baa06dbb5f6e479db78ee37e2d76c1f4e88994357e257b83b78624c4ef6091a6c0eb8254d
-883fb797c498297ccbf9411a3e727c3614af4eccde41619b773dc7f3259950835ee79453debf178e11dec4d3ada687a0
-a14703347e44eb5059070b2759297fcfcfc60e6893c0373eea069388eba3950aa06f1c57cd2c30984a2d6f9e9c92c79e
-afebc7585b304ceba9a769634adff35940e89cd32682c78002822aab25eec3edc29342b7f5a42a56a1fec67821172ad5
-aea3ff3822d09dba1425084ca95fd359718d856f6c133c5fabe2b2eed8303b6e0ba0d8698b48b93136a673baac174fd9
-af2456a09aa777d9e67aa6c7c49a1845ea5cdda2e39f4c935c34a5f8280d69d4eec570446998cbbe31ede69a91e90b06
-82cada19fed16b891ef3442bafd49e1f07c00c2f57b2492dd4ee36af2bd6fd877d6cb41188a4d6ce9ec8d48e8133d697
-82a21034c832287f616619a37c122cee265cc34ae75e881fcaea4ea7f689f3c2bc8150bbf7dbcfd123522bfb7f7b1d68
-86877217105f5d0ec3eeff0289fc2a70d505c9fdf7862e8159553ef60908fb1a27bdaf899381356a4ef4649072a9796c
-82b196e49c6e861089a427c0b4671d464e9d15555ffb90954cd0d630d7ae02eb3d98ceb529d00719c2526cd96481355a
-a29b41d0d43d26ce76d4358e0db2b77df11f56e389f3b084d8af70a636218bd3ac86b36a9fe46ec9058c26a490f887f7
-a4311c4c20c4d7dd943765099c50f2fd423e203ccfe98ff00087d205467a7873762510cac5fdce7a308913ed07991ed7
-b1f040fc5cc51550cb2c25cf1fd418ecdd961635a11f365515f0cb4ffb31da71f48128c233e9cc7c0cf3978d757ec84e
-a9ebae46f86d3bd543c5f207ed0d1aed94b8375dc991161d7a271f01592912072e083e2daf30c146430894e37325a1b9
-826418c8e17ad902b5fe88736323a47e0ca7a44bce4cbe27846ec8fe81de1e8942455dda6d30e192cdcc73e11df31256
-85199db563427c5edcbac21f3d39fec2357be91fb571982ddcdc4646b446ad5ced84410de008cb47b3477ee0d532daf8
-b7eed9cd400b2ca12bf1d9ae008214b8561fb09c8ad9ff959e626ffde00fee5ff2f5b6612e231f2a1a9b1646fcc575e3
-8b40bf12501dcbac78f5a314941326bfcddf7907c83d8d887d0bb149207f85d80cd4dfbd7935439ea7b14ea39a3fded7
-83e3041af302485399ba6cd5120e17af61043977083887e8d26b15feec4a6b11171ac5c06e6ad0971d4b58a81ff12af3
-8f5b9a0eecc589dbf8c35a65d5e996a659277ef6ea509739c0cb7b3e2da9895e8c8012de662e5b23c5fa85d4a8f48904
-835d71ed5e919d89d8e6455f234f3ff215462c4e3720c371ac8c75e83b19dfe3ae15a81547e4dc1138e5f5997f413cc9
-8b7d2e4614716b1db18e9370176ea483e6abe8acdcc3dcdf5fb1f4d22ca55d652feebdccc171c6de38398d9f7bfdec7a
-93eace72036fe57d019676a02acf3d224cf376f166658c1bf705db4f24295881d477d6fdd7916efcfceff8c7a063deda
-b1ac460b3d516879a84bc886c54f020a9d799e7c49af3e4d7de5bf0d2793c852254c5d8fe5616147e6659512e5ccb012
-acd0947a35cb167a48bcd9667620464b54ac0e78f9316b4aa92dcaab5422d7a732087e52e1c827faa847c6b2fe6e7766
-94ac33d21c3d12ff762d32557860e911cd94d666609ddcc42161b9c16f28d24a526e8b10bb03137257a92cec25ae637d
-832e02058b6b994eadd8702921486241f9a19e68ed1406dad545e000a491ae510f525ccf9d10a4bba91c68f2c53a0f58
-9471035d14f78ff8f463b9901dd476b587bb07225c351161915c2e9c6114c3c78a501379ab6fb4eb03194c457cbd22bf
-ab64593e034c6241d357fcbc32d8ea5593445a5e7c24cac81ad12bd2ef01843d477a36dc1ba21dbe63b440750d72096a
-9850f3b30045e927ad3ec4123a32ed2eb4c911f572b6abb79121873f91016f0d80268de8b12e2093a4904f6e6cab7642
-987212c36b4722fe2e54fa30c52b1e54474439f9f35ca6ad33c5130cd305b8b54b532dd80ffd2c274105f20ce6d79f6e
-8b4d0c6abcb239b5ed47bef63bc17efe558a27462c8208fa652b056e9eae9665787cd1aee34fbb55beb045c8bfdb882b
-a9f3483c6fee2fe41312d89dd4355d5b2193ac413258993805c5cbbf0a59221f879386d3e7a28e73014f10e65dd503d9
-a2225da3119b9b7c83d514b9f3aeb9a6d9e32d9cbf9309cbb971fd53c4b2c001d10d880a8ad8a7c281b21d85ceca0b7c
-a050be52e54e676c151f7a54453bbb707232f849beab4f3bf504b4d620f59ed214409d7c2bd3000f3ff13184ccda1c35
-adbccf681e15b3edb6455a68d292b0a1d0f5a4cb135613f5e6db9943f02181341d5755875db6ee474e19ace1c0634a28
-8b6eff675632a6fad0111ec72aacc61c7387380eb87933fd1d098856387d418bd38e77d897e65d6fe35951d0627c550b
-aabe2328ddf90989b15e409b91ef055cb02757d34987849ae6d60bef2c902bf8251ed21ab30acf39e500d1d511e90845
-92ba4eb1f796bc3d8b03515f65c045b66e2734c2da3fc507fdd9d6b5d1e19ab3893726816a32141db7a31099ca817d96
-8a98b3cf353138a1810beb60e946183803ef1d39ac4ea92f5a1e03060d35a4774a6e52b14ead54f6794d5f4022b8685c
-909f8a5c13ec4a59b649ed3bee9f5d13b21d7f3e2636fd2bb3413c0646573fdf9243d63083356f12f5147545339fcd55
-9359d914d1267633141328ed0790d81c695fea3ddd2d406c0df3d81d0c64931cf316fe4d92f4353c99ff63e2aefc4e34
-b88302031681b54415fe8fbfa161c032ea345c6af63d2fb8ad97615103fd4d4281c5a9cae5b0794c4657b97571a81d3b
-992c80192a519038082446b1fb947323005b275e25f2c14c33cc7269e0ec038581cc43705894f94bad62ae33a8b7f965
-a78253e3e3eece124bef84a0a8807ce76573509f6861d0b6f70d0aa35a30a123a9da5e01e84969708c40b0669eb70aa6
-8d5724de45270ca91c94792e8584e676547d7ac1ac816a6bb9982ee854eb5df071d20545cdfd3771cd40f90e5ba04c8e
-825a6f586726c68d45f00ad0f5a4436523317939a47713f78fd4fe81cd74236fdac1b04ecd97c2d0267d6f4981d7beb1
-93e02b6052719f607dacd3a088274f65596bd0d09920b61ab5da61bbdc7f5049334cf11213945d57e5ac7d055d042b7e024aa2b2f08f0a91260805272dc51051c6e47ad4fa403b02b4510b647ae3d1770bac0326a805bbefd48056c8c121bdb8
-b5bfd7dd8cdeb128843bc287230af38926187075cbfbefa81009a2ce615ac53d2914e5870cb452d2afaaab24f3499f72185cbfee53492714734429b7b38608e23926c911cceceac9a36851477ba4c60b087041de621000edc98edada20c1def2
-b5337ba0ce5d37224290916e268e2060e5c14f3f9fc9e1ec3af5a958e7a0303122500ce18f1a4640bf66525bd10e763501fe986d86649d8d45143c08c3209db3411802c226e9fe9a55716ac4a0c14f9dcef9e70b2bb309553880dc5025eab3cc
-b3c1dcdc1f62046c786f0b82242ef283e7ed8f5626f72542aa2c7a40f14d9094dd1ebdbd7457ffdcdac45fd7da7e16c51200b06d791e5e43e257e45efdf0bd5b06cd2333beca2a3a84354eb48662d83aef5ecf4e67658c851c10b13d8d87c874
-954d91c7688983382609fca9e211e461f488a5971fd4e40d7e2892037268eacdfd495cfa0a7ed6eb0eb11ac3ae6f651716757e7526abe1e06c64649d80996fd3105c20c4c94bc2b22d97045356fe9d791f21ea6428ac48db6f9e68e30d875280
-88a6b6bb26c51cf9812260795523973bb90ce80f6820b6c9048ab366f0fb96e48437a7f7cb62aedf64b11eb4dfefebb0147608793133d32003cb1f2dc47b13b5ff45f1bb1b2408ea45770a08dbfaec60961acb8119c47b139a13b8641e2c9487
-85cd7be9728bd925d12f47fb04b32d9fad7cab88788b559f053e69ca18e463113ecc8bbb6dbfb024835f901b3a957d3108d6770fb26d4c8be0a9a619f6e3a4bf15cbfd48e61593490885f6cee30e4300c5f9cf5e1c08e60a2d5b023ee94fcad0
-80477dba360f04399821a48ca388c0fa81102dd15687fea792ee8c1114e00d1bc4839ad37ac58900a118d863723acfbe08126ea883be87f50e4eabe3b5e72f5d9e041db8d9b186409fd4df4a7dde38c0e0a3b1ae29b098e5697e7f110b6b27e4
-b7a6aec08715a9f8672a2b8c367e407be37e59514ac19dd4f0942a68007bba3923df22da48702c63c0d6b3efd3c2d04e0fe042d8b5a54d562f9f33afc4865dcbcc16e99029e25925580e87920c399e710d438ac1ce3a6dc9b0d76c064a01f6f7
-ac1b001edcea02c8258aeffbf9203114c1c874ad88dae1184fadd7d94cd09053649efd0ca413400e6e9b5fa4eac33261000af88b6bd0d2abf877a4f0355d2fb4d6007adb181695201c5432e50b850b51b3969f893bddf82126c5a71b042b7686
-90043fda4de53fb364fab2c04be5296c215599105ecff0c12e4917c549257125775c29f2507124d15f56e30447f367db0596c33237242c02d83dfd058735f1e3c1ff99069af55773b6d51d32a68bf75763f59ec4ee7267932ae426522b8aaab6
-a8660ce853e9dc08271bf882e29cd53397d63b739584dda5263da4c7cc1878d0cf6f3e403557885f557e184700575fee016ee8542dec22c97befe1d10f414d22e84560741cdb3e74c30dda9b42eeaaf53e27822de2ee06e24e912bf764a9a533
-8fe3921a96d0d065e8aa8fce9aa42c8e1461ca0470688c137be89396dd05103606dab6cdd2a4591efd6addf72026c12e065da7be276dee27a7e30afa2bd81c18f1516e7f068f324d0bad9570b95f6bd02c727cd2343e26db0887c3e4e26dceda
-8ae1ad97dcb9c192c9a3933541b40447d1dc4eebf380151440bbaae1e120cc5cdf1bcea55180b128d8e180e3af623815191d063cc0d7a47d55fb7687b9d87040bf7bc1a7546b07c61db5ccf1841372d7c2fe4a5431ffff829f3c2eb590b0b710
-8c2fa96870a88150f7876c931e2d3cc2adeaaaf5c73ef5fa1cf9dfa0991ae4819f9321af7e916e5057d87338e630a2f21242c29d76963cf26035b548d2a63d8ad7bd6efefa01c1df502cbdfdfe0334fb21ceb9f686887440f713bf17a89b8081
-b9aa98e2f02bb616e22ee5dd74c7d1049321ac9214d093a738159850a1dbcc7138cb8d26ce09d8296368fd5b291d74fa17ac7cc1b80840fdd4ee35e111501e3fa8485b508baecda7c1ab7bd703872b7d64a2a40b3210b6a70e8a6ffe0e5127e3
-9292db67f8771cdc86854a3f614a73805bf3012b48f1541e704ea4015d2b6b9c9aaed36419769c87c49f9e3165f03edb159c23b3a49c4390951f78e1d9b0ad997129b17cdb57ea1a6638794c0cca7d239f229e589c5ae4f9fe6979f7f8cba1d7
-91cd9e86550f230d128664f7312591fee6a84c34f5fc7aed557bcf986a409a6de722c4330453a305f06911d2728626e611acfdf81284f77f60a3a1595053a9479964fd713117e27c0222cc679674b03bc8001501aaf9b506196c56de29429b46
-a9516b73f605cc31b89c68b7675dc451e6364595243d235339437f556cf22d745d4250c1376182273be2d99e02c10eee047410a43eff634d051aeb784e76cb3605d8e079b9eb6ad1957dfdf77e1cd32ce4a573c9dfcc207ca65af6eb187f6c3d
-a9667271f7d191935cc8ad59ef3ec50229945faea85bfdfb0d582090f524436b348aaa0183b16a6231c00332fdac2826125b8c857a2ed9ec66821cfe02b3a2279be2412441bc2e369b255eb98614e4be8490799c4df22f18d47d24ec70bba5f7
-a4371144d2aa44d70d3cb9789096d3aa411149a6f800cb46f506461ee8363c8724667974252f28aea61b6030c05930ac039c1ee64bb4bd56532a685cae182bf2ab935eee34718cffcb46cae214c77aaca11dbb1320faf23c47247db1da04d8dc
-89a7eb441892260b7e81168c386899cd84ffc4a2c5cad2eae0d1ab9e8b5524662e6f660fe3f8bfe4c92f60b060811bc605b14c5631d16709266886d7885a5eb5930097127ec6fb2ebbaf2df65909cf48f253b3d5e22ae48d3e9a2fd2b01f447e
-9648c42ca97665b5eccb49580d8532df05eb5a68db07f391a2340769b55119eaf4c52fe4f650c09250fa78a76c3a1e271799b8333cc2628e3d4b4a6a3e03da1f771ecf6516dd63236574a7864ff07e319a6f11f153406280d63af9e2b5713283
-9663bf6dd446ea7a90658ee458578d4196dc0b175ef7fcfa75f44d41670850774c2e46c5a6be132a2c072a3c0180a24f0305d1acac49d2d79878e5cda80c57feda3d01a6af12e78b5874e2a4b3717f11c97503b41a4474e2e95b179113726199
-b212aeb4814e0915b432711b317923ed2b09e076aaf558c3ae8ef83f9e15a83f9ea3f47805b2750ab9e8106cb4dc6ad003522c84b03dc02829978a097899c773f6fb31f7fe6b8f2d836d96580f216fec20158f1590c3e0d7850622e15194db05
-925f005059bf07e9ceccbe66c711b048e236ade775720d0fe479aebe6e23e8af281225ad18e62458dc1b03b42ad4ca290d4aa176260604a7aad0d9791337006fbdebe23746f8060d42876f45e4c83c3643931392fde1cd13ff8bddf8111ef974
-9553edb22b4330c568e156a59ef03b26f5c326424f830fe3e8c0b602f08c124730ffc40bc745bec1a22417adb22a1a960243a10565c2be3066bfdb841d1cd14c624cd06e0008f4beb83f972ce6182a303bee3fcbcabc6cfe48ec5ae4b7941bfc
-935f5a404f0a78bdcce709899eda0631169b366a669e9b58eacbbd86d7b5016d044b8dfc59ce7ed8de743ae16c2343b50e2f925e88ba6319e33c3fc76b314043abad7813677b4615c8a97eb83cc79de4fedf6ccbcfa4d4cbf759a5a84e4d9742
-a5b014ab936eb4be113204490e8b61cd38d71da0dec7215125bcd131bf3ab22d0a32ce645bca93e7b3637cf0c2db3d6601a0ddd330dc46f9fae82abe864ffc12d656c88eb50c20782e5bb6f75d18760666f43943abb644b881639083e122f557
-935b7298ae52862fa22bf03bfc1795b34c70b181679ae27de08a9f5b4b884f824ef1b276b7600efa0d2f1d79e4a470d51692fd565c5cf8343dd80e5d3336968fc21c09ba9348590f6206d4424eb229e767547daefa98bc3aa9f421158dee3f2a
-9830f92446e708a8f6b091cc3c38b653505414f8b6507504010a96ffda3bcf763d5331eb749301e2a1437f00e2415efb01b799ad4c03f4b02de077569626255ac1165f96ea408915d4cf7955047620da573e5c439671d1fa5c833fb11de7afe6
-840dcc44f673fff3e387af2bb41e89640f2a70bcd2b92544876daa92143f67c7512faf5f90a04b7191de01f3e2b1bde00622a20dc62ca23bbbfaa6ad220613deff43908382642d4d6a86999f662efd64b1df448b68c847cfa87630a3ffd2ec76
-92950c895ed54f7f876b2fda17ecc9c41b7accfbdd42c210cc5b475e0737a7279f558148531b5c916e310604a1de25a80940c94fe5389ae5d6a5e9c371be67bceea1877f5401725a6595bcf77ece60905151b6dfcb68b75ed2e708c73632f4fd
-8010246bf8e94c25fd029b346b5fbadb404ef6f44a58fd9dd75acf62433d8cc6db66974f139a76e0c26dddc1f329a88214dbb63276516cf325c7869e855d07e0852d622c332ac55609ba1ec9258c45746a2aeb1af0800141ee011da80af175d4
-b0f1bad257ebd187bdc3f37b23f33c6a5d6a8e1f2de586080d6ada19087b0e2bf23b79c1b6da1ee82271323f5bdf3e1b018586b54a5b92ab6a1a16bb3315190a3584a05e6c37d5ca1e05d702b9869e27f513472bcdd00f4d0502a107773097da
-9636d24f1ede773ce919f309448dd7ce023f424afd6b4b69cb98c2a988d849a283646dc3e469879daa1b1edae91ae41f009887518e7eb5578f88469321117303cd3ac2d7aee4d9cb5f82ab9ae3458e796dfe7c24284b05815acfcaa270ff22e2
-b373feb5d7012fd60578d7d00834c5c81df2a23d42794fed91aa9535a4771fde0341c4da882261785e0caca40bf83405143085e7f17e55b64f6c5c809680c20b050409bf3702c574769127c854d27388b144b05624a0e24a1cbcc4d08467005b
-b15680648949ce69f82526e9b67d9b55ce5c537dc6ab7f3089091a9a19a6b90df7656794f6edc87fb387d21573ffc847062623685931c2790a508cbc8c6b231dd2c34f4d37d4706237b1407673605a604bcf6a50cc0b1a2db20485e22b02c17e
-8817e46672d40c8f748081567b038a3165f87994788ec77ee8daea8587f5540df3422f9e120e94339be67f186f50952504cb44f61e30a5241f1827e501b2de53c4c64473bcc79ab887dd277f282fbfe47997a930dd140ac08b03efac88d81075
-a6e4ef6c1d1098f95aae119905f87eb49b909d17f9c41bcfe51127aa25fee20782ea884a7fdf7d5e9c245b5a5b32230b07e0dbf7c6743bf52ee20e2acc0b269422bd6cf3c07115df4aa85b11b2c16630a07c974492d9cdd0ec325a3fabd95044
-8634aa7c3d00e7f17150009698ce440d8e1b0f13042b624a722ace68ead870c3d2212fbee549a2c190e384d7d6ac37ce14ab962c299ea1218ef1b1489c98906c91323b94c587f1d205a6edd5e9d05b42d591c26494a6f6a029a2aadb5f8b6f67
-821a58092900bdb73decf48e13e7a5012a3f88b06288a97b855ef51306406e7d867d613d9ec738ebacfa6db344b677d21509d93f3b55c2ebf3a2f2a6356f875150554c6fff52e62e3e46f7859be971bf7dd9d5b3e1d799749c8a97c2e04325df
-8dba356577a3a388f782e90edb1a7f3619759f4de314ad5d95c7cc6e197211446819c4955f99c5fc67f79450d2934e3c09adefc91b724887e005c5190362245eec48ce117d0a94d6fa6db12eda4ba8dde608fbbd0051f54dcf3bb057adfb2493
-a32a690dc95c23ed9fb46443d9b7d4c2e27053a7fcc216d2b0020a8cf279729c46114d2cda5772fd60a97016a07d6c5a0a7eb085a18307d34194596f5b541cdf01b2ceb31d62d6b55515acfd2b9eec92b27d082fbc4dc59fc63b551eccdb8468
-a040f7f4be67eaf0a1d658a3175d65df21a7dbde99bfa893469b9b43b9d150fc2e333148b1cb88cfd0447d88fa1a501d126987e9fdccb2852ecf1ba907c2ca3d6f97b055e354a9789854a64ecc8c2e928382cf09dda9abde42bbdf92280cdd96
-864baff97fa60164f91f334e0c9be00a152a416556b462f96d7c43b59fe1ebaff42f0471d0bf264976f8aa6431176eb905bd875024cf4f76c13a70bede51dc3e47e10b9d5652d30d2663b3af3f08d5d11b9709a0321aba371d2ef13174dcfcaf
-95a46f32c994133ecc22db49bad2c36a281d6b574c83cfee6680b8c8100466ca034b815cfaedfbf54f4e75188e661df901abd089524e1e0eb0bf48d48caa9dd97482d2e8c1253e7e8ac250a32fd066d5b5cb08a8641bdd64ecfa48289dca83a3
-a2cce2be4d12144138cb91066e0cd0542c80b478bf467867ebef9ddaf3bd64e918294043500bf5a9f45ee089a8d6ace917108d9ce9e4f41e7e860cbce19ac52e791db3b6dde1c4b0367377b581f999f340e1d6814d724edc94cb07f9c4730774
-b145f203eee1ac0a1a1731113ffa7a8b0b694ef2312dabc4d431660f5e0645ef5838e3e624cfe1228cfa248d48b5760501f93e6ab13d3159fc241427116c4b90359599a4cb0a86d0bb9190aa7fabff482c812db966fd2ce0a1b48cb8ac8b3bca
-adabe5d215c608696e03861cbd5f7401869c756b3a5aadc55f41745ad9478145d44393fec8bb6dfc4ad9236dc62b9ada0f7ca57fe2bae1b71565dbf9536d33a68b8e2090b233422313cc96afc7f1f7e0907dc7787806671541d6de8ce47c4cd0
-ae7845fa6b06db53201c1080e01e629781817f421f28956589c6df3091ec33754f8a4bd4647a6bb1c141ac22731e3c1014865d13f3ed538dcb0f7b7576435133d9d03be655f8fbb4c9f7d83e06d1210aedd45128c2b0c9bab45a9ddde1c862a5
-9159eaa826a24adfa7adf6e8d2832120ebb6eccbeb3d0459ffdc338548813a2d239d22b26451fda98cc0c204d8e1ac69150b5498e0be3045300e789bcb4e210d5cd431da4bdd915a21f407ea296c20c96608ded0b70d07188e96e6c1a7b9b86b
-a9fc6281e2d54b46458ef564ffaed6944bff71e389d0acc11fa35d3fcd8e10c1066e0dde5b9b6516f691bb478e81c6b20865281104dcb640e29dc116daae2e884f1fe6730d639dbe0e19a532be4fb337bf52ae8408446deb393d224eee7cfa50
-84291a42f991bfb36358eedead3699d9176a38f6f63757742fdbb7f631f2c70178b1aedef4912fed7b6cf27e88ddc7eb0e2a6aa4b999f3eb4b662b93f386c8d78e9ac9929e21f4c5e63b12991fcde93aa64a735b75b535e730ff8dd2abb16e04
-a1b7fcacae181495d91765dfddf26581e8e39421579c9cbd0dd27a40ea4c54af3444a36bf85a11dda2114246eaddbdd619397424bb1eb41b5a15004b902a590ede5742cd850cf312555be24d2df8becf48f5afba5a8cd087cb7be0a521728386
-92feaaf540dbd84719a4889a87cdd125b7e995a6782911931fef26da9afcfbe6f86aaf5328fe1f77631491ce6239c5470f44c7791506c6ef1626803a5794e76d2be0af92f7052c29ac6264b7b9b51f267ad820afc6f881460521428496c6a5f1
-a525c925bfae1b89320a5054acc1fa11820f73d0cf28d273092b305467b2831fab53b6daf75fb926f332782d50e2522a19edcd85be5eb72f1497193c952d8cd0bcc5d43b39363b206eae4cb1e61668bde28a3fb2fc1e0d3d113f6dfadb799717
-98752bb6f5a44213f40eda6aa4ff124057c1b13b6529ab42fe575b9afa66e59b9c0ed563fb20dff62130c436c3e905ee17dd8433ba02c445b1d67182ab6504a90bbe12c26a754bbf734665c622f76c62fe2e11dd43ce04fd2b91a8463679058b
-a9aa9a84729f7c44219ff9e00e651e50ddea3735ef2a73fdf8ed8cd271961d8ed7af5cd724b713a89a097a3fe65a3c0202f69458a8b4c157c62a85668b12fc0d3957774bc9b35f86c184dd03bfefd5c325da717d74192cc9751c2073fe9d170e
-b221c1fd335a4362eff504cd95145f122bf93ea02ae162a3fb39c75583fc13a932d26050e164da97cff3e91f9a7f6ff80302c19dd1916f24acf6b93b62f36e9665a8785413b0c7d930c7f1668549910f849bca319b00e59dd01e5dec8d2edacc
-a71e2b1e0b16d754b848f05eda90f67bedab37709550171551050c94efba0bfc282f72aeaaa1f0330041461f5e6aa4d11537237e955e1609a469d38ed17f5c2a35a1752f546db89bfeff9eab78ec944266f1cb94c1db3334ab48df716ce408ef
-b990ae72768779ba0b2e66df4dd29b3dbd00f901c23b2b4a53419226ef9232acedeb498b0d0687c463e3f1eead58b20b09efcefa566fbfdfe1c6e48d32367936142d0a734143e5e63cdf86be7457723535b787a9cfcfa32fe1d61ad5a2617220
-8d27e7fbff77d5b9b9bbc864d5231fecf817238a6433db668d5a62a2c1ee1e5694fdd90c3293c06cc0cb15f7cbeab44d0d42be632cb9ff41fc3f6628b4b62897797d7b56126d65b694dcf3e298e3561ac8813fbd7296593ced33850426df42db
-a92039a08b5502d5b211a7744099c9f93fa8c90cedcb1d05e92f01886219dd464eb5fb0337496ad96ed09c987da4e5f019035c5b01cc09b2a18b8a8dd419bc5895388a07e26958f6bd26751929c25f89b8eb4a299d822e2d26fec9ef350e0d3c
-92dcc5a1c8c3e1b28b1524e3dd6dbecd63017c9201da9dbe077f1b82adc08c50169f56fc7b5a3b28ec6b89254de3e2fd12838a761053437883c3e01ba616670cea843754548ef84bcc397de2369adcca2ab54cd73c55dc68d87aec3fc2fe4f10
diff --git a/core/lib/l1_contract_interface/src/i_executor/methods/commit_batches.rs b/core/lib/l1_contract_interface/src/i_executor/methods/commit_batches.rs
index 2e55d9ed7cb9..883804f0bd6f 100644
--- a/core/lib/l1_contract_interface/src/i_executor/methods/commit_batches.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/methods/commit_batches.rs
@@ -1,46 +1,30 @@
-use zksync_types::{commitment::L1BatchWithMetadata, ethabi::Token, pubdata_da::PubdataDA};
+use zksync_types::{
+    commitment::{L1BatchCommitmentMode, L1BatchWithMetadata},
+    ethabi::Token,
+    pubdata_da::PubdataDA,
+};
 
 use crate::{
-    i_executor::structures::{CommitBatchInfoRollup, CommitBatchInfoValidium, StoredBatchInfo},
+    i_executor::structures::{CommitBatchInfo, StoredBatchInfo},
     Tokenizable, Tokenize,
 };
 
-/// Input required to encode `commitBatches` call for a contract running in rollup mode.
-#[derive(Debug, Clone)]
-pub struct CommitBatchesRollup {
-    pub last_committed_l1_batch: L1BatchWithMetadata,
-    pub l1_batches: Vec<L1BatchWithMetadata>,
-    pub pubdata_da: PubdataDA,
-}
-
-impl Tokenize for CommitBatchesRollup {
-    fn into_tokens(self) -> Vec<Token> {
-        let stored_batch_info = StoredBatchInfo(&self.last_committed_l1_batch).into_token();
-        let l1_batches_to_commit = self
-            .l1_batches
-            .iter()
-            .map(|batch| CommitBatchInfoRollup::new(batch, self.pubdata_da).into_token())
-            .collect();
-
-        vec![stored_batch_info, Token::Array(l1_batches_to_commit)]
-    }
-}
-
-/// Input required to encode `commitBatches` call for a contract running in validium mode.
-#[derive(Debug, Clone)]
-pub struct CommitBatchesValidium {
-    pub last_committed_l1_batch: L1BatchWithMetadata,
-    pub l1_batches: Vec<L1BatchWithMetadata>,
+/// Input required to encode `commitBatches` call for a contract
+#[derive(Debug)]
+pub struct CommitBatches<'a> {
+    pub last_committed_l1_batch: &'a L1BatchWithMetadata,
+    pub l1_batches: &'a [L1BatchWithMetadata],
     pub pubdata_da: PubdataDA,
+    pub mode: L1BatchCommitmentMode,
 }
 
-impl Tokenize for CommitBatchesValidium {
+impl Tokenize for CommitBatches<'_> {
     fn into_tokens(self) -> Vec<Token> {
-        let stored_batch_info = StoredBatchInfo(&self.last_committed_l1_batch).into_token();
+        let stored_batch_info = StoredBatchInfo::from(self.last_committed_l1_batch).into_token();
         let l1_batches_to_commit = self
             .l1_batches
             .iter()
-            .map(|batch| CommitBatchInfoValidium::new(batch, self.pubdata_da).into_token())
+            .map(|batch| CommitBatchInfo::new(self.mode, batch, self.pubdata_da).into_token())
             .collect();
 
         vec![stored_batch_info, Token::Array(l1_batches_to_commit)]
diff --git a/core/lib/l1_contract_interface/src/i_executor/methods/execute_batches.rs b/core/lib/l1_contract_interface/src/i_executor/methods/execute_batches.rs
index 9da78ea08e6e..fe5213d8c561 100644
--- a/core/lib/l1_contract_interface/src/i_executor/methods/execute_batches.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/methods/execute_batches.rs
@@ -8,12 +8,12 @@ pub struct ExecuteBatches {
     pub l1_batches: Vec<L1BatchWithMetadata>,
 }
 
-impl Tokenize for ExecuteBatches {
+impl Tokenize for &ExecuteBatches {
     fn into_tokens(self) -> Vec<Token> {
         vec![Token::Array(
             self.l1_batches
                 .iter()
-                .map(|batch| StoredBatchInfo(batch).into_token())
+                .map(|batch| StoredBatchInfo::from(batch).into_token())
                 .collect(),
         )]
     }
diff --git a/core/lib/l1_contract_interface/src/i_executor/methods/mod.rs b/core/lib/l1_contract_interface/src/i_executor/methods/mod.rs
index 9981656ba38f..765586edb3fa 100644
--- a/core/lib/l1_contract_interface/src/i_executor/methods/mod.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/methods/mod.rs
@@ -1,9 +1,7 @@
 //! Utilities for encoding input data for methods defined in `IExecutor.sol`.
 
 pub use self::{
-    commit_batches::{CommitBatchesRollup, CommitBatchesValidium},
-    execute_batches::ExecuteBatches,
-    prove_batches::ProveBatches,
+    commit_batches::CommitBatches, execute_batches::ExecuteBatches, prove_batches::ProveBatches,
 };
 
 mod commit_batches;
diff --git a/core/lib/l1_contract_interface/src/i_executor/methods/prove_batches.rs b/core/lib/l1_contract_interface/src/i_executor/methods/prove_batches.rs
index 35f95201402e..935d8a44e0b7 100644
--- a/core/lib/l1_contract_interface/src/i_executor/methods/prove_batches.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/methods/prove_batches.rs
@@ -13,13 +13,13 @@ pub struct ProveBatches {
     pub should_verify: bool,
 }
 
-impl Tokenize for ProveBatches {
+impl Tokenize for &ProveBatches {
     fn into_tokens(self) -> Vec<Token> {
-        let prev_l1_batch = StoredBatchInfo(&self.prev_l1_batch).into_token();
+        let prev_l1_batch = StoredBatchInfo::from(&self.prev_l1_batch).into_token();
         let batches_arg = self
             .l1_batches
             .iter()
-            .map(|batch| StoredBatchInfo(batch).into_token())
+            .map(|batch| StoredBatchInfo::from(batch).into_token())
             .collect();
         let batches_arg = Token::Array(batches_arg);
 
@@ -31,6 +31,7 @@ impl Tokenize for ProveBatches {
             let L1BatchProofForL1 {
                 aggregation_result_coords,
                 scheduler_proof,
+                ..
             } = self.proofs.first().unwrap();
 
             let (_, proof) = serialize_proof(scheduler_proof);
diff --git a/core/lib/l1_contract_interface/src/i_executor/structures/commit_batch_info.rs b/core/lib/l1_contract_interface/src/i_executor/structures/commit_batch_info.rs
index e40d4e61c66f..b5d77ff60c16 100644
--- a/core/lib/l1_contract_interface/src/i_executor/structures/commit_batch_info.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/structures/commit_batch_info.rs
@@ -1,5 +1,8 @@
 use zksync_types::{
-    commitment::{pre_boojum_serialize_commitments, serialize_commitments, L1BatchWithMetadata},
+    commitment::{
+        pre_boojum_serialize_commitments, serialize_commitments, L1BatchCommitmentMode,
+        L1BatchWithMetadata,
+    },
     ethabi::Token,
     pubdata_da::PubdataDA,
     web3::contract::Error as ContractError,
@@ -14,17 +17,24 @@ use crate::{
 /// These are used by the L1 Contracts to indicate what DA layer is used for pubdata
 const PUBDATA_SOURCE_CALLDATA: u8 = 0;
 const PUBDATA_SOURCE_BLOBS: u8 = 1;
+const PUBDATA_SOURCE_CUSTOM: u8 = 2;
 
 /// Encoding for `CommitBatchInfo` from `IExecutor.sol` for a contract running in rollup mode.
 #[derive(Debug)]
-pub struct CommitBatchInfoRollup<'a> {
-    pub l1_batch_with_metadata: &'a L1BatchWithMetadata,
-    pub pubdata_da: PubdataDA,
+pub struct CommitBatchInfo<'a> {
+    mode: L1BatchCommitmentMode,
+    l1_batch_with_metadata: &'a L1BatchWithMetadata,
+    pubdata_da: PubdataDA,
 }
 
-impl<'a> CommitBatchInfoRollup<'a> {
-    pub fn new(l1_batch_with_metadata: &'a L1BatchWithMetadata, pubdata_da: PubdataDA) -> Self {
+impl<'a> CommitBatchInfo<'a> {
+    pub fn new(
+        mode: L1BatchCommitmentMode,
+        l1_batch_with_metadata: &'a L1BatchWithMetadata,
+        pubdata_da: PubdataDA,
+    ) -> Self {
         Self {
+            mode,
             l1_batch_with_metadata,
             pubdata_da,
         }
@@ -162,7 +172,7 @@ impl<'a> CommitBatchInfoRollup<'a> {
     }
 }
 
-impl<'a> Tokenizable for CommitBatchInfoRollup<'a> {
+impl Tokenizable for CommitBatchInfo<'_> {
     fn from_token(_token: Token) -> Result<Self, ContractError> {
         // Currently there is no need to decode this struct.
         // We still want to implement `Tokenizable` trait for it, so that *once* it's needed
@@ -184,227 +194,50 @@ impl<'a> Tokenizable for CommitBatchInfoRollup<'a> {
         }
 
         if protocol_version.is_pre_1_4_2() {
-            tokens.push(
-                // `totalL2ToL1Pubdata` without pubdata source byte
-                Token::Bytes(self.pubdata_input()),
-            );
+            tokens.push(Token::Bytes(match self.mode {
+                L1BatchCommitmentMode::Rollup => self.pubdata_input(),
+                // Here we're not pushing any pubdata on purpose; no pubdata is sent in Validium mode.
+                L1BatchCommitmentMode::Validium => vec![],
+            }));
         } else {
-            let pubdata = self.pubdata_input();
-            match self.pubdata_da {
-                PubdataDA::Calldata => {
+            tokens.push(Token::Bytes(match (self.mode, self.pubdata_da) {
+                // Here we're not pushing any pubdata on purpose; no pubdata is sent in Validium mode.
+                (L1BatchCommitmentMode::Validium, PubdataDA::Calldata) => {
+                    vec![PUBDATA_SOURCE_CALLDATA]
+                }
+                (L1BatchCommitmentMode::Validium, PubdataDA::Blobs) => {
+                    vec![PUBDATA_SOURCE_BLOBS]
+                }
+
+                (L1BatchCommitmentMode::Rollup, PubdataDA::Custom) => {
+                    panic!("Custom pubdata DA is incompatible with Rollup mode")
+                }
+                (L1BatchCommitmentMode::Validium, PubdataDA::Custom) => {
+                    vec![PUBDATA_SOURCE_CUSTOM]
+                }
+
+                (L1BatchCommitmentMode::Rollup, PubdataDA::Calldata) => {
                     // We compute and add the blob commitment to the pubdata payload so that we can verify the proof
                     // even if we are not using blobs.
+                    let pubdata = self.pubdata_input();
                     let blob_commitment = KzgInfo::new(&pubdata).to_blob_commitment();
-
-                    let result = std::iter::once(PUBDATA_SOURCE_CALLDATA)
+                    std::iter::once(PUBDATA_SOURCE_CALLDATA)
                         .chain(pubdata)
                         .chain(blob_commitment)
-                        .collect();
-
-                    tokens.push(Token::Bytes(result));
+                        .collect()
                 }
-                PubdataDA::Blobs => {
+                (L1BatchCommitmentMode::Rollup, PubdataDA::Blobs) => {
+                    let pubdata = self.pubdata_input();
                     let pubdata_commitments =
                         pubdata.chunks(ZK_SYNC_BYTES_PER_BLOB).flat_map(|blob| {
                             let kzg_info = KzgInfo::new(blob);
                             kzg_info.to_pubdata_commitment()
                         });
-                    let result = std::iter::once(PUBDATA_SOURCE_BLOBS)
+                    std::iter::once(PUBDATA_SOURCE_BLOBS)
                         .chain(pubdata_commitments)
-                        .collect();
-
-                    tokens.push(Token::Bytes(result));
-                }
-            }
-        }
-
-        Token::Tuple(tokens)
-    }
-}
-
-/// Encoding for `CommitBatchInfo` from `IExecutor.sol` for a contract running in validium mode.
-#[derive(Debug)]
-pub struct CommitBatchInfoValidium<'a> {
-    pub l1_batch_with_metadata: &'a L1BatchWithMetadata,
-    pub pubdata_da: PubdataDA,
-}
-
-impl<'a> CommitBatchInfoValidium<'a> {
-    pub fn new(l1_batch_with_metadata: &'a L1BatchWithMetadata, pubdata_da: PubdataDA) -> Self {
-        Self {
-            l1_batch_with_metadata,
-            pubdata_da,
-        }
-    }
-
-    fn base_tokens(&self) -> Vec<Token> {
-        if self
-            .l1_batch_with_metadata
-            .header
-            .protocol_version
-            .unwrap_or_else(ProtocolVersionId::last_potentially_undefined)
-            .is_pre_boojum()
-        {
-            vec![
-                Token::Uint(U256::from(self.l1_batch_with_metadata.header.number.0)),
-                Token::Uint(U256::from(self.l1_batch_with_metadata.header.timestamp)),
-                Token::Uint(U256::from(
-                    self.l1_batch_with_metadata.metadata.rollup_last_leaf_index,
-                )),
-                Token::FixedBytes(
-                    self.l1_batch_with_metadata
-                        .metadata
-                        .root_hash
-                        .as_bytes()
-                        .to_vec(),
-                ),
-                Token::Uint(U256::from(self.l1_batch_with_metadata.header.l1_tx_count)),
-                Token::FixedBytes(
-                    self.l1_batch_with_metadata
-                        .metadata
-                        .l2_l1_merkle_root
-                        .as_bytes()
-                        .to_vec(),
-                ),
-                Token::FixedBytes(
-                    self.l1_batch_with_metadata
-                        .header
-                        .priority_ops_onchain_data_hash()
-                        .as_bytes()
-                        .to_vec(),
-                ),
-                Token::Bytes(
-                    self.l1_batch_with_metadata
-                        .metadata
-                        .initial_writes_compressed
-                        .clone()
-                        .unwrap(),
-                ),
-                Token::Bytes(
-                    self.l1_batch_with_metadata
-                        .metadata
-                        .repeated_writes_compressed
-                        .clone()
-                        .unwrap(),
-                ),
-                Token::Bytes(pre_boojum_serialize_commitments(
-                    &self.l1_batch_with_metadata.header.l2_to_l1_logs,
-                )),
-                Token::Array(
-                    self.l1_batch_with_metadata
-                        .header
-                        .l2_to_l1_messages
-                        .iter()
-                        .map(|message| Token::Bytes(message.to_vec()))
-                        .collect(),
-                ),
-                Token::Array(
-                    self.l1_batch_with_metadata
-                        .raw_published_factory_deps
-                        .iter()
-                        .map(|bytecode| Token::Bytes(bytecode.to_vec()))
-                        .collect(),
-                ),
-            ]
-        } else {
-            vec![
-                // `batchNumber`
-                Token::Uint(U256::from(self.l1_batch_with_metadata.header.number.0)),
-                // `timestamp`
-                Token::Uint(U256::from(self.l1_batch_with_metadata.header.timestamp)),
-                // `indexRepeatedStorageChanges`
-                Token::Uint(U256::from(
-                    self.l1_batch_with_metadata.metadata.rollup_last_leaf_index,
-                )),
-                // `newStateRoot`
-                Token::FixedBytes(
-                    self.l1_batch_with_metadata
-                        .metadata
-                        .root_hash
-                        .as_bytes()
-                        .to_vec(),
-                ),
-                // `numberOfLayer1Txs`
-                Token::Uint(U256::from(self.l1_batch_with_metadata.header.l1_tx_count)),
-                // `priorityOperationsHash`
-                Token::FixedBytes(
-                    self.l1_batch_with_metadata
-                        .header
-                        .priority_ops_onchain_data_hash()
-                        .as_bytes()
-                        .to_vec(),
-                ),
-                // `bootloaderHeapInitialContentsHash`
-                Token::FixedBytes(
-                    self.l1_batch_with_metadata
-                        .metadata
-                        .bootloader_initial_content_commitment
-                        .unwrap()
-                        .as_bytes()
-                        .to_vec(),
-                ),
-                // `eventsQueueStateHash`
-                Token::FixedBytes(
-                    self.l1_batch_with_metadata
-                        .metadata
-                        .events_queue_commitment
-                        .unwrap()
-                        .as_bytes()
-                        .to_vec(),
-                ),
-                // `systemLogs`
-                Token::Bytes(serialize_commitments(
-                    &self.l1_batch_with_metadata.header.system_logs,
-                )),
-            ]
-        }
-    }
-}
-
-impl<'a> Tokenizable for CommitBatchInfoValidium<'a> {
-    fn from_token(_token: Token) -> Result<Self, ContractError> {
-        // Currently there is no need to decode this struct.
-        // We still want to implement `Tokenizable` trait for it, so that *once* it's needed
-        // the implementation is provided here and not in some other inconsistent way.
-        Err(ContractError::Other("Not implemented".into()))
-    }
-
-    fn into_token(self) -> Token {
-        let mut tokens = self.base_tokens();
-
-        let protocol_version = self
-            .l1_batch_with_metadata
-            .header
-            .protocol_version
-            .unwrap_or_else(ProtocolVersionId::last_potentially_undefined);
-
-        if protocol_version.is_pre_boojum() {
-            return Token::Tuple(tokens);
-        }
-
-        if protocol_version.is_pre_1_4_2() {
-            tokens.push(
-                // Here we're not pushing any pubdata on purpose.
-                // We are not sending pubdata in Validium mode.
-                Token::Bytes(Vec::default()),
-            );
-        } else {
-            match self.pubdata_da {
-                PubdataDA::Calldata => {
-                    // Here we're not pushing any pubdata on purpose.
-                    // We are not sending pubdata in Validium mode.
-                    let result = vec![PUBDATA_SOURCE_CALLDATA];
-
-                    tokens.push(Token::Bytes(result));
-                }
-                PubdataDA::Blobs => {
-                    // Here we're not pushing any pubdata on purpose.
-                    // We are not sending pubdata in Validium mode.
-                    let result = vec![PUBDATA_SOURCE_BLOBS];
-
-                    tokens.push(Token::Bytes(result));
+                        .collect()
                 }
-            }
+            }));
         }
 
         Token::Tuple(tokens)
diff --git a/core/lib/l1_contract_interface/src/i_executor/structures/mod.rs b/core/lib/l1_contract_interface/src/i_executor/structures/mod.rs
index 8d9ecd931095..d1ed57e41f2e 100644
--- a/core/lib/l1_contract_interface/src/i_executor/structures/mod.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/structures/mod.rs
@@ -3,7 +3,4 @@
 mod commit_batch_info;
 mod stored_batch_info;
 
-pub use self::{
-    commit_batch_info::{CommitBatchInfoRollup, CommitBatchInfoValidium},
-    stored_batch_info::StoredBatchInfo,
-};
+pub use self::{commit_batch_info::CommitBatchInfo, stored_batch_info::StoredBatchInfo};
diff --git a/core/lib/l1_contract_interface/src/i_executor/structures/stored_batch_info.rs b/core/lib/l1_contract_interface/src/i_executor/structures/stored_batch_info.rs
index 929b860beffb..8373c46e36bb 100644
--- a/core/lib/l1_contract_interface/src/i_executor/structures/stored_batch_info.rs
+++ b/core/lib/l1_contract_interface/src/i_executor/structures/stored_batch_info.rs
@@ -1,14 +1,51 @@
 use zksync_types::{
-    commitment::L1BatchWithMetadata, ethabi::Token, web3::contract::Error as ContractError, U256,
+    commitment::L1BatchWithMetadata,
+    ethabi::{self, Token},
+    web3,
+    web3::contract::Error as ContractError,
+    H256, U256,
 };
 
 use crate::Tokenizable;
 
-/// Encoding for `StoredBatchInfo` from `IExecutor.sol`
-#[derive(Debug)]
-pub struct StoredBatchInfo<'a>(pub &'a L1BatchWithMetadata);
+/// `StoredBatchInfo` from `IExecutor.sol`.
+#[derive(Debug, Clone)]
+pub struct StoredBatchInfo {
+    pub batch_number: u64,
+    pub batch_hash: H256,
+    pub index_repeated_storage_changes: u64,
+    pub number_of_layer1_txs: U256,
+    pub priority_operations_hash: H256,
+    pub l2_logs_tree_root: H256,
+    pub timestamp: U256,
+    pub commitment: H256,
+}
+
+impl StoredBatchInfo {
+    /// `_hashStoredBatchInfo` from `Executor.sol`.
+    pub fn hash(&self) -> H256 {
+        H256(web3::keccak256(&ethabi::encode(&[self
+            .clone()
+            .into_token()])))
+    }
+}
+
+impl From<&L1BatchWithMetadata> for StoredBatchInfo {
+    fn from(x: &L1BatchWithMetadata) -> Self {
+        Self {
+            batch_number: x.header.number.0.into(),
+            batch_hash: x.metadata.root_hash,
+            index_repeated_storage_changes: x.metadata.rollup_last_leaf_index,
+            number_of_layer1_txs: x.header.l1_tx_count.into(),
+            priority_operations_hash: x.header.priority_ops_onchain_data_hash(),
+            l2_logs_tree_root: x.metadata.l2_l1_merkle_root,
+            timestamp: x.header.timestamp.into(),
+            commitment: x.metadata.commitment,
+        }
+    }
+}
 
-impl<'a> Tokenizable for StoredBatchInfo<'a> {
+impl Tokenizable for StoredBatchInfo {
     fn from_token(_token: Token) -> Result<Self, ContractError> {
         // Currently there is no need to decode this struct.
         // We still want to implement `Tokenizable` trait for it, so that *once* it's needed
@@ -18,28 +55,14 @@ impl<'a> Tokenizable for StoredBatchInfo<'a> {
 
     fn into_token(self) -> Token {
         Token::Tuple(vec![
-            // `batchNumber`
-            Token::Uint(U256::from(self.0.header.number.0)),
-            // `batchHash`
-            Token::FixedBytes(self.0.metadata.root_hash.as_bytes().to_vec()),
-            // `indexRepeatedStorageChanges`
-            Token::Uint(U256::from(self.0.metadata.rollup_last_leaf_index)),
-            // `numberOfLayer1Txs`
-            Token::Uint(U256::from(self.0.header.l1_tx_count)),
-            // `priorityOperationsHash`
-            Token::FixedBytes(
-                self.0
-                    .header
-                    .priority_ops_onchain_data_hash()
-                    .as_bytes()
-                    .to_vec(),
-            ),
-            // `l2LogsTreeRoot`
-            Token::FixedBytes(self.0.metadata.l2_l1_merkle_root.as_bytes().to_vec()),
-            // timestamp
-            Token::Uint(U256::from(self.0.header.timestamp)),
-            // commitment
-            Token::FixedBytes(self.0.metadata.commitment.as_bytes().to_vec()),
+            Token::Uint(self.batch_number.into()),
+            Token::FixedBytes(self.batch_hash.as_bytes().to_vec()),
+            Token::Uint(self.index_repeated_storage_changes.into()),
+            Token::Uint(self.number_of_layer1_txs),
+            Token::FixedBytes(self.priority_operations_hash.as_bytes().to_vec()),
+            Token::FixedBytes(self.l2_logs_tree_root.as_bytes().to_vec()),
+            Token::Uint(self.timestamp),
+            Token::FixedBytes(self.commitment.as_bytes().to_vec()),
         ])
     }
 }
diff --git a/core/lib/l1_contract_interface/src/lib.rs b/core/lib/l1_contract_interface/src/lib.rs
index fc96347bf70b..26a9aefa9f1e 100644
--- a/core/lib/l1_contract_interface/src/lib.rs
+++ b/core/lib/l1_contract_interface/src/lib.rs
@@ -1,4 +1,4 @@
-//! Utilities for interacting with the zkSync L1 contract
+//! Utilities for interacting with the ZKsync L1 contract
 //!
 //! Provides utilities both to encode input data for the contract and to decode
 //! the data provided by the contract.
diff --git a/core/lib/mempool/src/mempool_store.rs b/core/lib/mempool/src/mempool_store.rs
index 51a8d708a740..334a4783a76c 100644
--- a/core/lib/mempool/src/mempool_store.rs
+++ b/core/lib/mempool/src/mempool_store.rs
@@ -124,7 +124,7 @@ impl MempoolStore {
 
     /// Returns `true` if there is a transaction in the mempool satisfying the filter.
     pub fn has_next(&self, filter: &L2TxFilter) -> bool {
-        self.l1_transactions.get(&self.next_priority_id).is_some()
+        self.l1_transactions.contains_key(&self.next_priority_id)
             || self
                 .l2_priority_queue
                 .iter()
diff --git a/core/lib/mempool/src/tests.rs b/core/lib/mempool/src/tests.rs
index 656d90c63d14..6ea1be3b514b 100644
--- a/core/lib/mempool/src/tests.rs
+++ b/core/lib/mempool/src/tests.rs
@@ -377,7 +377,7 @@ fn gen_l2_tx_with_timestamp(address: Address, nonce: Nonce, received_at_ms: u64)
         Fee::default(),
         address,
         U256::zero(),
-        None,
+        vec![],
         Default::default(),
     );
     txn.received_timestamp_ms = received_at_ms;
@@ -388,13 +388,12 @@ fn gen_l1_tx(priority_id: PriorityOpId) -> Transaction {
     let execute = Execute {
         contract_address: Address::repeat_byte(0x11),
         calldata: vec![1, 2, 3],
-        factory_deps: None,
+        factory_deps: vec![],
         value: U256::zero(),
     };
     let op_data = L1TxCommonData {
         sender: Address::random(),
         serial_id: priority_id,
-        deadline_block: 100000,
         layer_2_tip_fee: U256::zero(),
         full_fee: U256::zero(),
         gas_limit: U256::zero(),
@@ -402,8 +401,7 @@ fn gen_l1_tx(priority_id: PriorityOpId) -> Transaction {
         gas_per_pubdata_limit: U256::one(),
         op_processing_type: OpProcessingType::Common,
         priority_queue_type: PriorityQueueType::Deque,
-        eth_hash: H256::zero(),
-        eth_block: 1,
+        eth_block: 0,
         canonical_tx_hash: H256::zero(),
         to_mint: U256::zero(),
         refund_recipient: Address::random(),
diff --git a/core/lib/merkle_tree/examples/loadtest/batch.rs b/core/lib/merkle_tree/examples/loadtest/batch.rs
index 1e044082a242..f128acaf417c 100644
--- a/core/lib/merkle_tree/examples/loadtest/batch.rs
+++ b/core/lib/merkle_tree/examples/loadtest/batch.rs
@@ -49,14 +49,15 @@ impl Database for WithBatching<'_> {
         self.inner.start_profiling(operation)
     }
 
-    fn apply_patch(&mut self, patch: PatchSet) {
-        self.inner.apply_patch(patch);
+    fn apply_patch(&mut self, patch: PatchSet) -> anyhow::Result<()> {
+        self.inner.apply_patch(patch)?;
 
         self.in_memory_batch_size += 1;
         if self.in_memory_batch_size >= self.batch_size {
             println!("Flushing changes to underlying DB");
-            self.inner.flush();
+            self.inner.flush()?;
             self.in_memory_batch_size = 0;
         }
+        Ok(())
     }
 }
diff --git a/core/lib/merkle_tree/examples/loadtest/main.rs b/core/lib/merkle_tree/examples/loadtest/main.rs
index 0e51a0d956a7..2560124842b0 100644
--- a/core/lib/merkle_tree/examples/loadtest/main.rs
+++ b/core/lib/merkle_tree/examples/loadtest/main.rs
@@ -4,10 +4,11 @@
 //! prohibitively slow.
 
 use std::{
-    thread,
+    any, thread,
     time::{Duration, Instant},
 };
 
+use anyhow::Context as _;
 use clap::Parser;
 use rand::{rngs::StdRng, seq::IteratorRandom, SeedableRng};
 use tempfile::TempDir;
@@ -24,6 +25,17 @@ use crate::batch::WithBatching;
 
 mod batch;
 
+fn panic_to_error(panic: Box<dyn any::Any + Send>) -> anyhow::Error {
+    let panic_message = if let Some(&panic_string) = panic.downcast_ref::<&'static str>() {
+        panic_string.to_string()
+    } else if let Some(panic_string) = panic.downcast_ref::<String>() {
+        panic_string.to_string()
+    } else {
+        "(unknown panic)".to_string()
+    };
+    anyhow::Error::msg(panic_message)
+}
+
 /// CLI for load-testing for the Merkle tree implementation.
 #[derive(Debug, Parser)]
 #[command(author, version, about, long_about = None)]
@@ -78,7 +90,7 @@ impl Cli {
             .init();
     }
 
-    fn run(self) {
+    fn run(self) -> anyhow::Result<()> {
         Self::init_logging();
         tracing::info!("Launched with options: {self:?}");
 
@@ -89,7 +101,7 @@ impl Cli {
             mock_db = PatchSet::default();
             &mut mock_db
         } else {
-            let dir = TempDir::new().expect("failed creating temp dir for RocksDB");
+            let dir = TempDir::new().context("failed creating temp dir for RocksDB")?;
             tracing::info!(
                 "Created temp dir for RocksDB: {}",
                 dir.path().to_string_lossy()
@@ -99,7 +111,8 @@ impl Cli {
                 include_indices_and_filters_in_block_cache: self.cache_indices,
                 ..RocksDBOptions::default()
             };
-            let db = RocksDB::with_options(dir.path(), db_options).unwrap();
+            let db =
+                RocksDB::with_options(dir.path(), db_options).context("failed creating RocksDB")?;
             rocksdb = RocksDBWrapper::from(db);
 
             if let Some(chunk_size) = self.chunk_size {
@@ -125,7 +138,7 @@ impl Cli {
         let hasher: &dyn HashTree = if self.no_hashing { &() } else { &Blake2Hasher };
         let mut rng = StdRng::seed_from_u64(self.rng_seed);
 
-        let mut tree = MerkleTree::with_hasher(db, hasher);
+        let mut tree = MerkleTree::with_hasher(db, hasher).context("cannot create tree")?;
         let mut next_key_idx = 0_u64;
         let mut next_value_idx = 0_u64;
         for version in 0..self.commit_count {
@@ -154,10 +167,14 @@ impl Cli {
                 let reads =
                     Self::generate_keys(read_indices.into_iter()).map(TreeInstruction::Read);
                 let instructions = kvs.map(TreeInstruction::Write).chain(reads).collect();
-                let output = tree.extend_with_proofs(instructions);
-                output.root_hash().unwrap()
+                let output = tree
+                    .extend_with_proofs(instructions)
+                    .context("failed extending tree")?;
+                output.root_hash().context("tree update is empty")?
             } else {
-                let output = tree.extend(kvs.collect());
+                let output = tree
+                    .extend(kvs.collect())
+                    .context("failed extending tree")?;
                 output.root_hash
             };
 
@@ -165,8 +182,11 @@ impl Cli {
                 if pruner_handle.set_target_retained_version(version).is_err() {
                     tracing::error!("Pruner unexpectedly stopped");
                     let (_, pruner_thread) = pruner_handles.unwrap();
-                    pruner_thread.join().expect("Pruner panicked");
-                    return; // unreachable
+                    pruner_thread
+                        .join()
+                        .map_err(panic_to_error)
+                        .context("pruner thread panicked")??;
+                    return Ok(()); // unreachable
                 }
             }
 
@@ -177,14 +197,18 @@ impl Cli {
         tracing::info!("Verifying tree consistency...");
         let start = Instant::now();
         tree.verify_consistency(self.commit_count - 1, false)
-            .expect("tree consistency check failed");
+            .context("tree consistency check failed")?;
         let elapsed = start.elapsed();
         tracing::info!("Verified tree consistency in {elapsed:?}");
 
         if let Some((pruner_handle, pruner_thread)) = pruner_handles {
             drop(pruner_handle);
-            pruner_thread.join().expect("Pruner panicked");
+            pruner_thread
+                .join()
+                .map_err(panic_to_error)
+                .context("pruner thread panicked")??;
         }
+        Ok(())
     }
 
     fn generate_keys(key_indexes: impl Iterator<Item = u64>) -> impl Iterator<Item = U256> {
@@ -197,6 +221,6 @@ impl Cli {
     }
 }
 
-fn main() {
-    Cli::parse().run();
+fn main() -> anyhow::Result<()> {
+    Cli::parse().run()
 }
diff --git a/core/lib/merkle_tree/examples/recovery.rs b/core/lib/merkle_tree/examples/recovery.rs
index 8769f9a64acc..882bfe9d9823 100644
--- a/core/lib/merkle_tree/examples/recovery.rs
+++ b/core/lib/merkle_tree/examples/recovery.rs
@@ -2,6 +2,7 @@
 
 use std::time::Instant;
 
+use anyhow::Context as _;
 use clap::Parser;
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use tempfile::TempDir;
@@ -31,6 +32,9 @@ struct Cli {
     /// Perform testing on in-memory DB rather than RocksDB (i.e., with focus on hashing logic).
     #[arg(long = "in-memory", short = 'M')]
     in_memory: bool,
+    /// Parallelize DB persistence with processing.
+    #[arg(long = "parallelize", conflicts_with = "in_memory")]
+    parallelize: bool,
     /// Block cache capacity for RocksDB in bytes.
     #[arg(long = "block-cache", conflicts_with = "in_memory")]
     block_cache: Option<usize>,
@@ -47,17 +51,19 @@ impl Cli {
             .init();
     }
 
-    fn run(self) {
+    fn run(self) -> anyhow::Result<()> {
         Self::init_logging();
         tracing::info!("Launched with options: {self:?}");
 
-        let (mut mock_db, mut rocksdb);
-        let mut _temp_dir = None;
-        let db: &mut dyn PruneDatabase = if self.in_memory {
-            mock_db = PatchSet::default();
-            &mut mock_db
+        let hasher: &dyn HashTree = if self.no_hashing { &() } else { &Blake2Hasher };
+        let recovered_version = 123;
+
+        if self.in_memory {
+            let recovery =
+                MerkleTreeRecovery::with_hasher(PatchSet::default(), recovered_version, hasher)?;
+            self.recover_tree(recovery, recovered_version)
         } else {
-            let dir = TempDir::new().expect("failed creating temp dir for RocksDB");
+            let dir = TempDir::new().context("failed creating temp dir for RocksDB")?;
             tracing::info!(
                 "Created temp dir for RocksDB: {}",
                 dir.path().to_string_lossy()
@@ -66,16 +72,24 @@ impl Cli {
                 block_cache_capacity: self.block_cache,
                 ..RocksDBOptions::default()
             };
-            let db = RocksDB::with_options(dir.path(), db_options).unwrap();
-            rocksdb = RocksDBWrapper::from(db);
-            _temp_dir = Some(dir);
-            &mut rocksdb
-        };
+            let db =
+                RocksDB::with_options(dir.path(), db_options).context("failed creating RocksDB")?;
+            let db = RocksDBWrapper::from(db);
+            let mut recovery = MerkleTreeRecovery::with_hasher(db, recovered_version, hasher)?;
+            if self.parallelize {
+                recovery.parallelize_persistence(4)?;
+            }
+            self.recover_tree(recovery, recovered_version)
+        }
+    }
 
-        let hasher: &dyn HashTree = if self.no_hashing { &() } else { &Blake2Hasher };
+    fn recover_tree<DB: PruneDatabase>(
+        self,
+        mut recovery: MerkleTreeRecovery<DB, &dyn HashTree>,
+        recovered_version: u64,
+    ) -> anyhow::Result<()> {
         let mut rng = StdRng::seed_from_u64(self.rng_seed);
 
-        let recovered_version = 123;
         let key_step =
             Key::MAX / (Key::from(self.update_count) * Key::from(self.writes_per_update));
         assert!(key_step > Key::from(u64::MAX));
@@ -83,7 +97,6 @@ impl Cli {
 
         let mut last_key = Key::zero();
         let mut last_leaf_index = 0;
-        let mut recovery = MerkleTreeRecovery::with_hasher(db, recovered_version, hasher);
         let recovery_started_at = Instant::now();
         for updated_idx in 0..self.update_count {
             let started_at = Instant::now();
@@ -108,9 +121,13 @@ impl Cli {
                 })
                 .collect();
             if self.random {
-                recovery.extend_random(recovery_entries);
+                recovery
+                    .extend_random(recovery_entries)
+                    .context("failed extending tree during recovery")?;
             } else {
-                recovery.extend_linear(recovery_entries);
+                recovery
+                    .extend_linear(recovery_entries)
+                    .context("failed extending tree during recovery")?;
             }
             tracing::info!(
                 "Updated tree with recovery chunk #{updated_idx} in {:?}",
@@ -118,17 +135,22 @@ impl Cli {
             );
         }
 
-        let tree = MerkleTree::new(recovery.finalize());
+        let db = recovery
+            .finalize()
+            .context("failed finalizing tree recovery")?;
+        let tree = MerkleTree::new(db).context("tree has invalid metadata after recovery")?;
         tracing::info!(
             "Recovery finished in {:?}; verifying consistency...",
             recovery_started_at.elapsed()
         );
         let started_at = Instant::now();
-        tree.verify_consistency(recovered_version, true).unwrap();
+        tree.verify_consistency(recovered_version, true)
+            .context("tree is inconsistent")?;
         tracing::info!("Verified consistency in {:?}", started_at.elapsed());
+        Ok(())
     }
 }
 
-fn main() {
-    Cli::parse().run();
+fn main() -> anyhow::Result<()> {
+    Cli::parse().run()
 }
diff --git a/core/lib/merkle_tree/src/consistency.rs b/core/lib/merkle_tree/src/consistency.rs
index 7b30e8b44e01..daf508692b4f 100644
--- a/core/lib/merkle_tree/src/consistency.rs
+++ b/core/lib/merkle_tree/src/consistency.rs
@@ -283,11 +283,12 @@ mod tests {
     const SECOND_KEY: Key = U256([0, 0, 0, 0x_dead_beef_0100_0000]);
 
     fn prepare_database() -> PatchSet {
-        let mut tree = MerkleTree::new(PatchSet::default());
+        let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
         tree.extend(vec![
             TreeEntry::new(FIRST_KEY, 1, H256([1; 32])),
             TreeEntry::new(SECOND_KEY, 2, H256([2; 32])),
-        ]);
+        ])
+        .unwrap();
         tree.db
     }
 
@@ -315,7 +316,7 @@ mod tests {
             .num_threads(1)
             .build()
             .expect("failed initializing `rayon` thread pool");
-        thread_pool.install(|| MerkleTree::new(db).verify_consistency(0, true))
+        thread_pool.install(|| MerkleTree::new(db).unwrap().verify_consistency(0, true))
     }
 
     #[test]
diff --git a/core/lib/merkle_tree/src/domain.rs b/core/lib/merkle_tree/src/domain.rs
index ecd9b4c1fbe4..5cb53355765c 100644
--- a/core/lib/merkle_tree/src/domain.rs
+++ b/core/lib/merkle_tree/src/domain.rs
@@ -15,6 +15,20 @@ use crate::{
     BlockOutput, HashTree, MerkleTree, MerkleTreePruner, MerkleTreePrunerHandle, NoVersionError,
 };
 
+impl TreeInstruction<StorageKey> {
+    /// Maps the key preimage in this instruction to a hashed key used by the Merkle tree.
+    pub fn with_hashed_key(self) -> TreeInstruction {
+        match self {
+            Self::Read(key) => TreeInstruction::Read(key.hashed_key_u256()),
+            Self::Write(entry) => TreeInstruction::Write(TreeEntry {
+                key: entry.key.hashed_key_u256(),
+                value: entry.value,
+                leaf_index: entry.leaf_index,
+            }),
+        }
+    }
+}
+
 /// Metadata for the current tree state.
 #[derive(Debug, Clone)]
 pub struct TreeMetadata {
@@ -47,6 +61,11 @@ pub struct ZkSyncTree {
 }
 
 impl ZkSyncTree {
+    /// Returns a hash of an empty tree. This is a constant value.
+    pub fn empty_tree_hash() -> ValueHash {
+        Blake2Hasher.empty_tree_hash()
+    }
+
     fn create_thread_pool(thread_count: usize) -> ThreadPool {
         ThreadPoolBuilder::new()
             .thread_name(|idx| format!("new-merkle-tree-{idx}"))
@@ -57,20 +76,17 @@ impl ZkSyncTree {
 
     /// Returns metadata based on `storage_logs` generated by the genesis L1 batch. This does not
     /// create a persistent tree.
-    pub fn process_genesis_batch(storage_logs: &[TreeInstruction<StorageKey>]) -> BlockOutput {
+    #[allow(clippy::missing_panics_doc)] // false positive
+    pub fn process_genesis_batch(storage_logs: &[TreeInstruction]) -> BlockOutput {
         let kvs = Self::filter_write_instructions(storage_logs);
         tracing::info!(
-            "Creating Merkle tree for genesis batch with {instr_count} writes",
+            "Creating Merkle tree for genesis batch with {instr_count}  writes",
             instr_count = kvs.len()
         );
 
-        let kvs: Vec<_> = kvs
-            .iter()
-            .map(|instr| instr.map_key(StorageKey::hashed_key_u256))
-            .collect();
-
-        let mut in_memory_tree = MerkleTree::new(PatchSet::default());
-        let output = in_memory_tree.extend(kvs);
+        // `unwrap()`s are safe: in-memory trees never raise I/O errors
+        let mut in_memory_tree = MerkleTree::new(PatchSet::default()).unwrap();
+        let output = in_memory_tree.extend(kvs).unwrap();
 
         tracing::info!(
             "Processed genesis batch; root hash is {root_hash}, {leaf_count} leaves in total",
@@ -81,22 +97,30 @@ impl ZkSyncTree {
     }
 
     /// Creates a tree with the full processing mode.
-    pub fn new(db: RocksDBWrapper) -> Self {
+    ///
+    /// # Errors
+    ///
+    /// Errors if sanity checks fail.
+    pub fn new(db: RocksDBWrapper) -> anyhow::Result<Self> {
         Self::new_with_mode(db, TreeMode::Full)
     }
 
     /// Creates a tree with the lightweight processing mode.
-    pub fn new_lightweight(db: RocksDBWrapper) -> Self {
+    ///
+    /// # Errors
+    ///
+    /// Errors if sanity checks fail.
+    pub fn new_lightweight(db: RocksDBWrapper) -> anyhow::Result<Self> {
         Self::new_with_mode(db, TreeMode::Lightweight)
     }
 
-    fn new_with_mode(db: RocksDBWrapper, mode: TreeMode) -> Self {
-        Self {
-            tree: MerkleTree::new(Patched::new(db)),
+    fn new_with_mode(db: RocksDBWrapper, mode: TreeMode) -> anyhow::Result<Self> {
+        Ok(Self {
+            tree: MerkleTree::new(Patched::new(db))?,
             thread_pool: None,
             mode,
             pruning_enabled: false,
-        }
+        })
     }
 
     /// Returns tree pruner and a handle to stop it.
@@ -119,7 +143,7 @@ impl ZkSyncTree {
     /// only ones flushed to RocksDB.
     pub fn reader(&self) -> ZkSyncTreeReader {
         let db = self.tree.db.inner().clone();
-        ZkSyncTreeReader(MerkleTree::new(db))
+        ZkSyncTreeReader(MerkleTree::new_unchecked(db))
     }
 
     /// Sets the chunk size for multi-get operations. The requested keys will be split
@@ -151,6 +175,12 @@ impl ZkSyncTree {
         self.tree.latest_root_hash()
     }
 
+    /// Returns the root hash and leaf count at the specified L1 batch.
+    pub fn root_info(&self, l1_batch_number: L1BatchNumber) -> Option<(ValueHash, u64)> {
+        let root = self.tree.root(l1_batch_number.0.into())?;
+        Some((root.hash(&Blake2Hasher), root.leaf_count()))
+    }
+
     /// Checks whether this tree is empty.
     pub fn is_empty(&self) -> bool {
         let Some(version) = self.tree.latest_version() else {
@@ -173,23 +203,26 @@ impl ZkSyncTree {
     /// Verifies tree consistency. `l1_batch_number` specifies the version of the tree
     /// to be checked, expressed as the number of latest L1 batch applied to the tree.
     ///
-    /// # Panics
+    /// # Errors
     ///
-    /// Panics if an inconsistency is detected.
-    pub fn verify_consistency(&self, l1_batch_number: L1BatchNumber) {
+    /// Errors if an inconsistency is detected.
+    pub fn verify_consistency(
+        &self,
+        l1_batch_number: L1BatchNumber,
+    ) -> Result<(), ConsistencyError> {
         let version = u64::from(l1_batch_number.0);
-        self.tree
-            .verify_consistency(version, true)
-            .unwrap_or_else(|err| {
-                panic!("Tree at version {version} is inconsistent: {err}");
-            });
+        self.tree.verify_consistency(version, true)
     }
 
     /// Processes an iterator of storage logs comprising a single L1 batch.
+    ///
+    /// # Errors
+    ///
+    /// Proxies database I/O errors.
     pub fn process_l1_batch(
         &mut self,
-        storage_logs: &[TreeInstruction<StorageKey>],
-    ) -> TreeMetadata {
+        storage_logs: &[TreeInstruction],
+    ) -> anyhow::Result<TreeMetadata> {
         match self.mode {
             TreeMode::Full => self.process_l1_batch_full(storage_logs),
             TreeMode::Lightweight => self.process_l1_batch_lightweight(storage_logs),
@@ -198,27 +231,22 @@ impl ZkSyncTree {
 
     fn process_l1_batch_full(
         &mut self,
-        instructions: &[TreeInstruction<StorageKey>],
-    ) -> TreeMetadata {
+        instructions: &[TreeInstruction],
+    ) -> anyhow::Result<TreeMetadata> {
         let l1_batch_number = self.next_l1_batch_number();
         let starting_leaf_count = self.tree.latest_root().leaf_count();
         let starting_root_hash = self.tree.latest_root_hash();
 
-        let instructions_with_hashed_keys: Vec<_> = instructions
-            .iter()
-            .map(|instr| instr.map_key(StorageKey::hashed_key_u256))
-            .collect();
-
         tracing::info!(
             "Extending Merkle tree with batch #{l1_batch_number} with {instr_count} ops in full mode",
             instr_count = instructions.len()
         );
 
         let output = if let Some(thread_pool) = &self.thread_pool {
-            thread_pool.install(|| self.tree.extend_with_proofs(instructions_with_hashed_keys))
+            thread_pool.install(|| self.tree.extend_with_proofs(instructions.to_vec()))
         } else {
-            self.tree.extend_with_proofs(instructions_with_hashed_keys)
-        };
+            self.tree.extend_with_proofs(instructions.to_vec())
+        }?;
 
         let mut witness = PrepareBasicCircuitsJob::new(starting_leaf_count + 1);
         witness.reserve(output.logs.len());
@@ -241,7 +269,7 @@ impl ZkSyncTree {
                 is_write: !log.base.is_read(),
                 first_write: matches!(log.base, TreeLogEntry::Inserted),
                 merkle_paths,
-                leaf_hashed_key: instruction.key().hashed_key_u256(),
+                leaf_hashed_key: instruction.key(),
                 leaf_enumeration_index: match instruction {
                     TreeInstruction::Write(entry) => entry.leaf_index,
                     TreeInstruction::Read(_) => match log.base {
@@ -274,17 +302,17 @@ impl ZkSyncTree {
             leaf_count = output.leaf_count,
         );
 
-        TreeMetadata {
+        Ok(TreeMetadata {
             root_hash,
             rollup_last_leaf_index: output.leaf_count + 1,
             witness: Some(witness),
-        }
+        })
     }
 
     fn process_l1_batch_lightweight(
         &mut self,
-        instructions: &[TreeInstruction<StorageKey>],
-    ) -> TreeMetadata {
+        instructions: &[TreeInstruction],
+    ) -> anyhow::Result<TreeMetadata> {
         let kvs = Self::filter_write_instructions(instructions);
         let l1_batch_number = self.next_l1_batch_number();
         tracing::info!(
@@ -293,16 +321,11 @@ impl ZkSyncTree {
             kv_count = kvs.len()
         );
 
-        let kvs_with_derived_key: Vec<_> = kvs
-            .iter()
-            .map(|entry| entry.map_key(StorageKey::hashed_key_u256))
-            .collect();
-
         let output = if let Some(thread_pool) = &self.thread_pool {
-            thread_pool.install(|| self.tree.extend(kvs_with_derived_key.clone()))
+            thread_pool.install(|| self.tree.extend(kvs))
         } else {
-            self.tree.extend(kvs_with_derived_key.clone())
-        };
+            self.tree.extend(kvs)
+        }?;
 
         tracing::info!(
             "Processed batch #{l1_batch_number}; root hash is {root_hash}, \
@@ -311,16 +334,14 @@ impl ZkSyncTree {
             leaf_count = output.leaf_count,
         );
 
-        TreeMetadata {
+        Ok(TreeMetadata {
             root_hash: output.root_hash,
             rollup_last_leaf_index: output.leaf_count + 1,
             witness: None,
-        }
+        })
     }
 
-    fn filter_write_instructions(
-        instructions: &[TreeInstruction<StorageKey>],
-    ) -> Vec<TreeEntry<StorageKey>> {
+    fn filter_write_instructions(instructions: &[TreeInstruction]) -> Vec<TreeEntry> {
         let kvs = instructions
             .iter()
             .filter_map(|instruction| match instruction {
@@ -330,21 +351,27 @@ impl ZkSyncTree {
         kvs.collect()
     }
 
-    /// Rolls back this tree to a previous state.
+    /// Rolls back this tree to a previous state. This method will overwrite all unsaved changes in the tree.
     ///
-    /// This method will overwrite all unsaved changes in the tree.
-    pub fn roll_back_logs(&mut self, last_l1_batch_to_keep: L1BatchNumber) {
+    /// # Errors
+    ///
+    /// Proxies database I/O errors.
+    pub fn roll_back_logs(&mut self, last_l1_batch_to_keep: L1BatchNumber) -> anyhow::Result<()> {
         self.tree.db.reset();
         let retained_version_count = u64::from(last_l1_batch_to_keep.0 + 1);
-        self.tree.truncate_recent_versions(retained_version_count);
+        self.tree.truncate_recent_versions(retained_version_count)
     }
 
     /// Saves the accumulated changes in the tree to RocksDB.
-    pub fn save(&mut self) {
+    ///
+    /// # Errors
+    ///
+    /// Proxies database I/O errors.
+    pub fn save(&mut self) -> anyhow::Result<()> {
         let mut l1_batch_numbers = self.tree.db.patched_versions();
         l1_batch_numbers.sort_unstable();
         tracing::info!("Flushing L1 batches #{l1_batch_numbers:?} to RocksDB");
-        self.tree.db.flush();
+        self.tree.db.flush()
     }
 
     /// Resets the tree to the latest database state.
@@ -360,14 +387,18 @@ pub struct ZkSyncTreeReader(MerkleTree<RocksDBWrapper>);
 // While cloning `MerkleTree` is logically unsound, cloning a reader is reasonable since it is readonly.
 impl Clone for ZkSyncTreeReader {
     fn clone(&self) -> Self {
-        Self(MerkleTree::new(self.0.db.clone()))
+        Self(MerkleTree::new_unchecked(self.0.db.clone()))
     }
 }
 
 impl ZkSyncTreeReader {
     /// Creates a tree reader based on the provided database.
-    pub fn new(db: RocksDBWrapper) -> Self {
-        Self(MerkleTree::new(db))
+    ///
+    /// # Errors
+    ///
+    /// Errors if sanity checks fail.
+    pub fn new(db: RocksDBWrapper) -> anyhow::Result<Self> {
+        MerkleTree::new(db).map(Self)
     }
 
     /// Returns a reference to the database this.
@@ -375,9 +406,10 @@ impl ZkSyncTreeReader {
         &self.0.db
     }
 
-    /// Returns the current root hash of this tree.
-    pub fn root_hash(&self) -> ValueHash {
-        self.0.latest_root_hash()
+    /// Returns the root hash and leaf count at the specified L1 batch.
+    pub fn root_info(&self, l1_batch_number: L1BatchNumber) -> Option<(ValueHash, u64)> {
+        let root = self.0.root(l1_batch_number.0.into())?;
+        Some((root.hash(&Blake2Hasher), root.leaf_count()))
     }
 
     /// Returns the next L1 batch number that should be processed by the tree.
@@ -397,11 +429,6 @@ impl ZkSyncTreeReader {
         })
     }
 
-    /// Returns the number of leaves in the tree.
-    pub fn leaf_count(&self) -> u64 {
-        self.0.latest_root().leaf_count()
-    }
-
     /// Reads entries together with Merkle proofs with the specified keys from the tree. The entries are returned
     /// in the same order as requested.
     ///
diff --git a/core/lib/merkle_tree/src/getters.rs b/core/lib/merkle_tree/src/getters.rs
index 8a26292a7d6f..34978f5dc6a8 100644
--- a/core/lib/merkle_tree/src/getters.rs
+++ b/core/lib/merkle_tree/src/getters.rs
@@ -120,8 +120,8 @@ mod tests {
 
     #[test]
     fn entries_in_empty_tree() {
-        let mut tree = MerkleTree::new(PatchSet::default());
-        tree.extend(vec![]);
+        let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
+        tree.extend(vec![]).unwrap();
         let missing_key = Key::from(123);
 
         let entries = tree.entries(0, &[missing_key]).unwrap();
@@ -131,14 +131,18 @@ mod tests {
         let entries = tree.entries_with_proofs(0, &[missing_key]).unwrap();
         assert_eq!(entries.len(), 1);
         assert!(entries[0].base.is_empty());
-        entries[0].verify(&tree.hasher, tree.hasher.empty_tree_hash());
+        entries[0]
+            .verify(&tree.hasher, tree.hasher.empty_tree_hash())
+            .unwrap();
     }
 
     #[test]
     fn entries_in_single_node_tree() {
-        let mut tree = MerkleTree::new(PatchSet::default());
+        let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
         let key = Key::from(987_654);
-        let output = tree.extend(vec![TreeEntry::new(key, 1, ValueHash::repeat_byte(1))]);
+        let output = tree
+            .extend(vec![TreeEntry::new(key, 1, ValueHash::repeat_byte(1))])
+            .unwrap();
         let missing_key = Key::from(123);
 
         let entries = tree.entries(0, &[key, missing_key]).unwrap();
@@ -149,8 +153,8 @@ mod tests {
         let entries = tree.entries_with_proofs(0, &[key, missing_key]).unwrap();
         assert_eq!(entries.len(), 2);
         assert!(!entries[0].base.is_empty());
-        entries[0].verify(&tree.hasher, output.root_hash);
+        entries[0].verify(&tree.hasher, output.root_hash).unwrap();
         assert!(entries[1].base.is_empty());
-        entries[1].verify(&tree.hasher, output.root_hash);
+        entries[1].verify(&tree.hasher, output.root_hash).unwrap();
     }
 }
diff --git a/core/lib/merkle_tree/src/hasher/nodes.rs b/core/lib/merkle_tree/src/hasher/nodes.rs
index 6e1c007bc423..6172d9088126 100644
--- a/core/lib/merkle_tree/src/hasher/nodes.rs
+++ b/core/lib/merkle_tree/src/hasher/nodes.rs
@@ -4,7 +4,8 @@ use std::slice;
 
 use crate::{
     hasher::HasherWithStats,
-    types::{ChildRef, InternalNode, LeafNode, Node, ValueHash, TREE_DEPTH},
+    types::{ChildRef, InternalNode, LeafNode, Node, Root, ValueHash, TREE_DEPTH},
+    HashTree,
 };
 
 impl LeafNode {
@@ -256,6 +257,15 @@ impl Node {
     }
 }
 
+impl Root {
+    pub(crate) fn hash(&self, hasher: &dyn HashTree) -> ValueHash {
+        let Self::Filled { node, .. } = self else {
+            return hasher.empty_tree_hash();
+        };
+        node.hash(&mut HasherWithStats::new(&hasher), 0)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use zksync_crypto::hasher::{blake2::Blake2Hasher, Hasher};
diff --git a/core/lib/merkle_tree/src/hasher/proofs.rs b/core/lib/merkle_tree/src/hasher/proofs.rs
index 3e61c9e1d864..9af732af489d 100644
--- a/core/lib/merkle_tree/src/hasher/proofs.rs
+++ b/core/lib/merkle_tree/src/hasher/proofs.rs
@@ -81,18 +81,26 @@ impl BlockOutputWithProofs {
 impl TreeEntryWithProof {
     /// Verifies this proof.
     ///
-    /// # Panics
+    /// # Errors
     ///
-    /// Panics if the proof doesn't verify.
-    pub fn verify(&self, hasher: &dyn HashTree, trusted_root_hash: ValueHash) {
+    /// Returns an error <=> proof is invalid.
+    pub fn verify(
+        &self,
+        hasher: &dyn HashTree,
+        trusted_root_hash: ValueHash,
+    ) -> anyhow::Result<()> {
         if self.base.leaf_index == 0 {
-            assert!(
+            ensure!(
                 self.base.value.is_zero(),
                 "Invalid missing value specification: leaf index is zero, but value is non-default"
             );
         }
         let root_hash = hasher.fold_merkle_path(&self.merkle_path, self.base);
-        assert_eq!(root_hash, trusted_root_hash, "Root hash mismatch");
+        ensure!(
+            root_hash == trusted_root_hash,
+            "Root hash mismatch: got {root_hash}, want {trusted_root_hash}"
+        );
+        Ok(())
     }
 }
 
diff --git a/core/lib/merkle_tree/src/lib.rs b/core/lib/merkle_tree/src/lib.rs
index caa965751578..0e6dd7793260 100644
--- a/core/lib/merkle_tree/src/lib.rs
+++ b/core/lib/merkle_tree/src/lib.rs
@@ -61,7 +61,7 @@ pub use crate::{
         TreeLogEntry, TreeLogEntryWithProof, ValueHash,
     },
 };
-use crate::{hasher::HasherWithStats, storage::Storage, types::Root};
+use crate::{storage::Storage, types::Root};
 
 mod consistency;
 pub mod domain;
@@ -136,40 +136,44 @@ pub struct MerkleTree<DB, H = Blake2Hasher> {
 impl<DB: Database> MerkleTree<DB> {
     /// Loads a tree with the default Blake2 hasher.
     ///
-    /// # Panics
+    /// # Errors
     ///
-    /// Panics in the same situations as [`Self::with_hasher()`].
-    pub fn new(db: DB) -> Self {
+    /// Errors in the same situations as [`Self::with_hasher()`].
+    pub fn new(db: DB) -> anyhow::Result<Self> {
         Self::with_hasher(db, Blake2Hasher)
     }
+
+    pub(crate) fn new_unchecked(db: DB) -> Self {
+        Self {
+            db,
+            hasher: Blake2Hasher,
+        }
+    }
 }
 
 impl<DB: Database, H: HashTree> MerkleTree<DB, H> {
     /// Loads a tree with the specified hasher.
     ///
-    /// # Panics
+    /// # Errors
     ///
-    /// Panics if the hasher or basic tree parameters (e.g., the tree depth)
+    /// Errors if the hasher or basic tree parameters (e.g., the tree depth)
     /// do not match those of the tree loaded from the database.
-    pub fn with_hasher(db: DB, hasher: H) -> Self {
+    pub fn with_hasher(db: DB, hasher: H) -> anyhow::Result<Self> {
         let tags = db.manifest().and_then(|manifest| manifest.tags);
         if let Some(tags) = tags {
-            tags.assert_consistency(&hasher, false);
+            tags.ensure_consistency(&hasher, false)?;
         }
         // If there are currently no tags in the tree, we consider that it fits
         // for backward compatibility. The tags will be added the next time the tree is saved.
 
-        Self { db, hasher }
+        Ok(Self { db, hasher })
     }
 
     /// Returns the root hash of a tree at the specified `version`, or `None` if the version
     /// was not written yet.
     pub fn root_hash(&self, version: u64) -> Option<ValueHash> {
         let root = self.root(version)?;
-        let Root::Filled { node, .. } = root else {
-            return Some(self.hasher.empty_tree_hash());
-        };
-        Some(node.hash(&mut HasherWithStats::new(&self.hasher), 0))
+        Some(root.hash(&self.hasher))
     }
 
     pub(crate) fn root(&self, version: u64) -> Option<Root> {
@@ -200,13 +204,18 @@ impl<DB: Database, H: HashTree> MerkleTree<DB, H> {
     ///
     /// The current implementation does not actually remove node data for the removed versions
     /// since it's likely to be reused in the future (especially upper-level internal nodes).
-    pub fn truncate_recent_versions(&mut self, retained_version_count: u64) {
+    ///
+    /// # Errors
+    ///
+    /// Proxies database I/O errors.
+    pub fn truncate_recent_versions(&mut self, retained_version_count: u64) -> anyhow::Result<()> {
         let mut manifest = self.db.manifest().unwrap_or_default();
         if manifest.version_count > retained_version_count {
             manifest.version_count = retained_version_count;
             let patch = PatchSet::from_manifest(manifest);
-            self.db.apply_patch(patch);
+            self.db.apply_patch(patch)?;
         }
+        Ok(())
     }
 
     /// Extends this tree by creating its new version.
@@ -214,12 +223,16 @@ impl<DB: Database, H: HashTree> MerkleTree<DB, H> {
     /// # Return value
     ///
     /// Returns information about the update such as the final tree hash.
-    pub fn extend(&mut self, entries: Vec<TreeEntry>) -> BlockOutput {
+    ///
+    /// # Errors
+    ///
+    /// Proxies database I/O errors.
+    pub fn extend(&mut self, entries: Vec<TreeEntry>) -> anyhow::Result<BlockOutput> {
         let next_version = self.db.manifest().unwrap_or_default().version_count;
         let storage = Storage::new(&self.db, &self.hasher, next_version, true);
         let (output, patch) = storage.extend(entries);
-        self.db.apply_patch(patch);
-        output
+        self.db.apply_patch(patch)?;
+        Ok(output)
     }
 
     /// Extends this tree by creating its new version, computing an authenticity Merkle proof
@@ -229,15 +242,19 @@ impl<DB: Database, H: HashTree> MerkleTree<DB, H> {
     ///
     /// Returns information about the update such as the final tree hash and proofs for each input
     /// instruction.
+    ///
+    /// # Errors
+    ///
+    /// Proxies database I/O errors.
     pub fn extend_with_proofs(
         &mut self,
         instructions: Vec<TreeInstruction>,
-    ) -> BlockOutputWithProofs {
+    ) -> anyhow::Result<BlockOutputWithProofs> {
         let next_version = self.db.manifest().unwrap_or_default().version_count;
         let storage = Storage::new(&self.db, &self.hasher, next_version, true);
         let (output, patch) = storage.extend_with_proofs(instructions);
-        self.db.apply_patch(patch);
-        output
+        self.db.apply_patch(patch)?;
+        Ok(output)
     }
 }
 
@@ -256,11 +273,12 @@ impl<DB: PruneDatabase> MerkleTree<DB> {
 
 #[cfg(test)]
 mod tests {
+    use std::collections::HashMap;
+
     use super::*;
     use crate::types::TreeTags;
 
     #[test]
-    #[should_panic(expected = "Unsupported tree architecture `AR64MT`, expected `AR16MT`")]
     fn tree_architecture_mismatch() {
         let mut db = PatchSet::default();
         db.manifest_mut().tags = Some(TreeTags {
@@ -268,13 +286,17 @@ mod tests {
             depth: 256,
             hasher: "blake2s256".to_string(),
             is_recovering: false,
+            custom: HashMap::new(),
         });
 
-        MerkleTree::new(db);
+        let err = MerkleTree::new(db).unwrap_err().to_string();
+        assert!(
+            err.contains("Unsupported tree architecture `AR64MT`, expected `AR16MT`"),
+            "{err}"
+        );
     }
 
     #[test]
-    #[should_panic(expected = "Unexpected tree depth: expected 256, got 128")]
     fn tree_depth_mismatch() {
         let mut db = PatchSet::default();
         db.manifest_mut().tags = Some(TreeTags {
@@ -282,13 +304,17 @@ mod tests {
             depth: 128,
             hasher: "blake2s256".to_string(),
             is_recovering: false,
+            custom: HashMap::new(),
         });
 
-        MerkleTree::new(db);
+        let err = MerkleTree::new(db).unwrap_err().to_string();
+        assert!(
+            err.contains("Unexpected tree depth: expected 256, got 128"),
+            "{err}"
+        );
     }
 
     #[test]
-    #[should_panic(expected = "Mismatch between the provided tree hasher `blake2s256`")]
     fn hasher_mismatch() {
         let mut db = PatchSet::default();
         db.manifest_mut().tags = Some(TreeTags {
@@ -296,8 +322,13 @@ mod tests {
             depth: 256,
             hasher: "sha256".to_string(),
             is_recovering: false,
+            custom: HashMap::new(),
         });
 
-        MerkleTree::new(db);
+        let err = MerkleTree::new(db).unwrap_err().to_string();
+        assert!(
+            err.contains("Mismatch between the provided tree hasher `blake2s256`"),
+            "{err}"
+        );
     }
 }
diff --git a/core/lib/merkle_tree/src/metrics.rs b/core/lib/merkle_tree/src/metrics.rs
index 8c8fdc4aeaa4..99757a2580cb 100644
--- a/core/lib/merkle_tree/src/metrics.rs
+++ b/core/lib/merkle_tree/src/metrics.rs
@@ -67,37 +67,37 @@ const LEAF_LEVEL_BUCKETS: Buckets = Buckets::linear(20.0..=40.0, 4.0);
 #[metrics(prefix = "merkle_tree_extend_patch")]
 struct TreeUpdateMetrics {
     // Metrics related to the AR16MT tree architecture
-    /// Number of new leaves inserted during tree traversal while processing a single block.
+    /// Number of new leaves inserted during tree traversal while processing a single batch.
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     new_leaves: Histogram<u64>,
-    /// Number of new internal nodes inserted during tree traversal while processing a single block.
+    /// Number of new internal nodes inserted during tree traversal while processing a single batch.
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     new_internal_nodes: Histogram<u64>,
-    /// Number of existing leaves moved to a new location while processing a single block.
+    /// Number of existing leaves moved to a new location while processing a single batch.
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     moved_leaves: Histogram<u64>,
-    /// Number of existing leaves updated while processing a single block.
+    /// Number of existing leaves updated while processing a single batch.
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     updated_leaves: Histogram<u64>,
-    /// Average level of leaves moved or created while processing a single block.
+    /// Average level of leaves moved or created while processing a single batch.
     #[metrics(buckets = LEAF_LEVEL_BUCKETS)]
     avg_leaf_level: Histogram<f64>,
-    /// Maximum level of leaves moved or created while processing a single block.
+    /// Maximum level of leaves moved or created while processing a single batch.
     #[metrics(buckets = LEAF_LEVEL_BUCKETS)]
     max_leaf_level: Histogram<u64>,
 
     // Metrics related to input instructions
-    /// Number of keys read while processing a single block (only applicable to the full operation mode).
+    /// Number of keys read while processing a single batch (only applicable to the full operation mode).
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     key_reads: Histogram<u64>,
-    /// Number of missing keys read while processing a single block (only applicable to the full
+    /// Number of missing keys read while processing a single batch (only applicable to the full
     /// operation mode).
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     missing_key_reads: Histogram<u64>,
-    /// Number of nodes of previous versions read from the DB while processing a single block.
+    /// Number of nodes of previous versions read from the DB while processing a single batch.
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     db_reads: Histogram<u64>,
-    /// Number of nodes of the current version re-read from the patch set while processing a single block.
+    /// Number of nodes of the current version re-read from the patch set while processing a single batch.
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     patch_reads: Histogram<u64>,
 }
@@ -194,13 +194,13 @@ impl ops::AddAssign for TreeUpdaterStats {
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "merkle_tree")]
 pub(crate) struct BlockTimings {
-    /// Time spent loading tree nodes from DB per block.
+    /// Time spent loading tree nodes from DB per batch.
     #[metrics(buckets = Buckets::LATENCIES)]
     pub load_nodes: Histogram<Duration>,
-    /// Time spent traversing the tree and creating new nodes per block.
+    /// Time spent traversing the tree and creating new nodes per batch.
     #[metrics(buckets = Buckets::LATENCIES)]
     pub extend_patch: Histogram<Duration>,
-    /// Time spent finalizing the block (mainly hash computations).
+    /// Time spent finalizing a batch (mainly hash computations).
     #[metrics(buckets = Buckets::LATENCIES)]
     pub finalize_patch: Histogram<Duration>,
 }
@@ -233,13 +233,13 @@ impl fmt::Display for NibbleCount {
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "merkle_tree_apply_patch")]
 struct ApplyPatchMetrics {
-    /// Total number of nodes included into a RocksDB patch per block.
+    /// Total number of nodes included into a RocksDB patch per batch.
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     nodes: Histogram<u64>,
-    /// Number of nodes included into a RocksDB patch per block, grouped by the key nibble count.
+    /// Number of nodes included into a RocksDB patch per batch, grouped by the key nibble count.
     #[metrics(buckets = NODE_COUNT_BUCKETS)]
     nodes_by_nibble_count: Family<NibbleCount, Histogram<u64>>,
-    /// Total byte size of nodes included into a RocksDB patch per block, grouped by the key nibble count.
+    /// Total byte size of nodes included into a RocksDB patch per batch, grouped by the key nibble count.
     #[metrics(buckets = BYTE_SIZE_BUCKETS)]
     node_bytes: Family<NibbleCount, Histogram<u64>>,
     /// Number of hashes in child references copied from previous tree versions. Allows to estimate
@@ -295,7 +295,7 @@ impl ApplyPatchStats {
         for (nibble_count, stats) in node_bytes {
             let label = NibbleCount::new(nibble_count);
             metrics.nodes_by_nibble_count[&label].observe(stats.count);
-            metrics.nodes_by_nibble_count[&label].observe(stats.bytes);
+            metrics.node_bytes[&label].observe(stats.bytes);
         }
 
         metrics.copied_hashes.observe(self.copied_hashes);
@@ -309,6 +309,21 @@ enum Bound {
     End,
 }
 
+const LARGE_NODE_COUNT_BUCKETS: Buckets = Buckets::values(&[
+    1_000.0,
+    2_000.0,
+    5_000.0,
+    10_000.0,
+    20_000.0,
+    50_000.0,
+    100_000.0,
+    200_000.0,
+    500_000.0,
+    1_000_000.0,
+    2_000_000.0,
+    5_000_000.0,
+]);
+
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "merkle_tree_pruning")]
 struct PruningMetrics {
@@ -316,7 +331,7 @@ struct PruningMetrics {
     /// may not remove all stale keys to this version if there are too many.
     target_retained_version: Gauge<u64>,
     /// Number of pruned node keys on a specific pruning iteration.
-    #[metrics(buckets = NODE_COUNT_BUCKETS)]
+    #[metrics(buckets = LARGE_NODE_COUNT_BUCKETS)]
     key_count: Histogram<usize>,
     /// Lower and upper boundaries on the new stale key versions deleted
     /// during a pruning iteration. The lower boundary is inclusive, the upper one is exclusive.
@@ -359,3 +374,27 @@ pub(crate) struct PruningTimings {
 
 #[vise::register]
 pub(crate) static PRUNING_TIMINGS: Global<PruningTimings> = Global::new();
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
+#[metrics(label = "stage", rename_all = "snake_case")]
+pub(crate) enum RecoveryStage {
+    Extend,
+    ApplyPatch,
+    ParallelPersistence,
+}
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "merkle_tree_recovery")]
+pub(crate) struct RecoveryMetrics {
+    /// Number of entries in a recovered chunk.
+    #[metrics(buckets = LARGE_NODE_COUNT_BUCKETS)]
+    pub chunk_size: Histogram<usize>,
+    /// Latency of a specific stage of recovery for a single chunk.
+    #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
+    pub stage_latency: Family<RecoveryStage, Histogram<Duration>>,
+    /// Number of buffered commands if parallel persistence is used.
+    pub parallel_persistence_buffer_size: Gauge<usize>,
+}
+
+#[vise::register]
+pub(crate) static RECOVERY_METRICS: Global<RecoveryMetrics> = Global::new();
diff --git a/core/lib/merkle_tree/src/pruning.rs b/core/lib/merkle_tree/src/pruning.rs
index 5ab578621005..a74db40ef5e6 100644
--- a/core/lib/merkle_tree/src/pruning.rs
+++ b/core/lib/merkle_tree/src/pruning.rs
@@ -132,23 +132,27 @@ impl<DB: PruneDatabase> MerkleTreePruner<DB> {
 
     #[doc(hidden)] // Used in integration tests; logically private
     #[allow(clippy::range_plus_one)] // exclusive range is required by `PrunePatchSet` constructor
-    pub fn prune_up_to(&mut self, target_retained_version: u64) -> Option<PruningStats> {
-        let min_stale_key_version = self.db.min_stale_key_version()?;
+    pub fn prune_up_to(
+        &mut self,
+        target_retained_version: u64,
+    ) -> anyhow::Result<Option<PruningStats>> {
+        let Some(min_stale_key_version) = self.db.min_stale_key_version() else {
+            return Ok(None);
+        };
 
         // We must retain at least one tree version.
-        let last_prunable_version = self.last_prunable_version();
-        if last_prunable_version.is_none() {
+        let Some(last_prunable_version) = self.last_prunable_version() else {
             tracing::debug!("Nothing to prune; skipping");
-            return None;
-        }
-        let target_retained_version = last_prunable_version?.min(target_retained_version);
+            return Ok(None);
+        };
+        let target_retained_version = last_prunable_version.min(target_retained_version);
         let stale_key_new_versions = min_stale_key_version..=target_retained_version;
         if stale_key_new_versions.is_empty() {
             tracing::debug!(
                 "No Merkle tree versions can be pruned; min stale key version is {min_stale_key_version}, \
                  target retained version is {target_retained_version}"
             );
-            return None;
+            return Ok(None);
         }
         tracing::info!("Collecting stale keys with new versions in {stale_key_new_versions:?}");
 
@@ -162,15 +166,15 @@ impl<DB: PruneDatabase> MerkleTreePruner<DB> {
                 break;
             }
         }
-        load_stale_keys_latency.observe();
+        let load_stale_keys_latency = load_stale_keys_latency.observe();
 
         if pruned_keys.is_empty() {
             tracing::debug!("No stale keys to remove; skipping");
-            return None;
+            return Ok(None);
         }
         let deleted_stale_key_versions = min_stale_key_version..(max_stale_key_version + 1);
         tracing::info!(
-            "Collected {} stale keys with new versions in {deleted_stale_key_versions:?}",
+            "Collected {} stale keys with new versions in {deleted_stale_key_versions:?} in {load_stale_keys_latency:?}",
             pruned_keys.len()
         );
 
@@ -181,9 +185,10 @@ impl<DB: PruneDatabase> MerkleTreePruner<DB> {
         };
         let patch = PrunePatchSet::new(pruned_keys, deleted_stale_key_versions);
         let apply_patch_latency = PRUNING_TIMINGS.apply_patch.start();
-        self.db.prune(patch);
-        apply_patch_latency.observe();
-        Some(stats)
+        self.db.prune(patch)?;
+        let apply_patch_latency = apply_patch_latency.observe();
+        tracing::info!("Pruned stale keys in {apply_patch_latency:?}: {stats:?}");
+        Ok(Some(stats))
     }
 
     fn wait_for_abort(&mut self, timeout: Duration) -> bool {
@@ -196,14 +201,18 @@ impl<DB: PruneDatabase> MerkleTreePruner<DB> {
         }
     }
 
-    /// Runs this pruner indefinitely until it is aborted.
-    pub fn run(mut self) {
+    /// Runs this pruner indefinitely until it is aborted, or a database error occurs.
+    ///
+    /// # Errors
+    ///
+    /// Propagates database I/O errors.
+    pub fn run(mut self) -> anyhow::Result<()> {
         tracing::info!("Started Merkle tree pruner {self:?}");
 
         let mut wait_interval = Duration::ZERO;
         while !self.wait_for_abort(wait_interval) {
             let retained_version = self.target_retained_version.load(Ordering::Relaxed);
-            wait_interval = if let Some(stats) = self.prune_up_to(retained_version) {
+            wait_interval = if let Some(stats) = self.prune_up_to(retained_version)? {
                 tracing::debug!(
                     "Performed pruning for target retained version {retained_version}: {stats:?}"
                 );
@@ -222,6 +231,8 @@ impl<DB: PruneDatabase> MerkleTreePruner<DB> {
                 self.poll_interval
             };
         }
+        tracing::info!("Stop signal received, tree pruning is shut down");
+        Ok(())
     }
 }
 
@@ -247,7 +258,10 @@ mod tests {
         for i in 0..5 {
             let key = Key::from(i);
             let value = ValueHash::from_low_u64_be(i);
-            MerkleTree::new(&mut db).extend(vec![TreeEntry::new(key, i + 1, value)]);
+            MerkleTree::new(&mut db)
+                .unwrap()
+                .extend(vec![TreeEntry::new(key, i + 1, value)])
+                .unwrap();
         }
         db
     }
@@ -255,12 +269,16 @@ mod tests {
     #[test]
     fn pruner_basics() {
         let mut db = create_db();
-        assert_eq!(MerkleTree::new(&mut db).first_retained_version(), Some(0));
+        assert_eq!(
+            MerkleTree::new(&mut db).unwrap().first_retained_version(),
+            Some(0)
+        );
 
         let (mut pruner, _handle) = MerkleTreePruner::new(&mut db);
         let stats = pruner
             .prune_up_to(pruner.last_prunable_version().unwrap())
-            .unwrap();
+            .unwrap()
+            .expect("tree was not pruned");
         assert!(stats.pruned_key_count > 0);
         assert_eq!(stats.deleted_stale_key_versions, 1..5);
         assert_eq!(stats.target_retained_version, 4);
@@ -272,7 +290,10 @@ mod tests {
         }
         assert!(db.root_mut(4).is_some());
 
-        assert_eq!(MerkleTree::new(&mut db).first_retained_version(), Some(4));
+        assert_eq!(
+            MerkleTree::new(&mut db).unwrap().first_retained_version(),
+            Some(4)
+        );
     }
 
     #[test]
@@ -284,7 +305,8 @@ mod tests {
         for i in 1..5 {
             let stats = pruner
                 .prune_up_to(pruner.last_prunable_version().unwrap())
-                .unwrap();
+                .unwrap()
+                .expect("tree was not pruned");
             assert!(stats.pruned_key_count > 0);
             assert_eq!(stats.deleted_stale_key_versions, i..(i + 1));
             assert_eq!(stats.target_retained_version, 4);
@@ -300,7 +322,7 @@ mod tests {
 
         drop(pruner_handle);
         let start = Instant::now();
-        join_handle.join().unwrap();
+        join_handle.join().unwrap().unwrap();
         assert!(start.elapsed() < Duration::from_secs(10));
     }
 
@@ -312,17 +334,18 @@ mod tests {
 
     fn test_tree_is_consistent_after_pruning(past_versions_to_keep: u64) {
         let mut db = PatchSet::default();
-        let mut tree = MerkleTree::new(&mut db);
+        let mut tree = MerkleTree::new(&mut db).unwrap();
         let kvs = generate_key_value_pairs(0..100);
         for chunk in kvs.chunks(20) {
-            tree.extend(chunk.to_vec());
+            tree.extend(chunk.to_vec()).unwrap();
         }
         let latest_version = tree.latest_version().unwrap();
 
         let (mut pruner, _handle) = MerkleTreePruner::new(&mut db);
         let stats = pruner
             .prune_up_to(pruner.last_prunable_version().unwrap() - past_versions_to_keep)
-            .unwrap();
+            .unwrap()
+            .expect("tree was not pruned");
         assert!(stats.pruned_key_count > 0);
         let first_retained_version = latest_version.saturating_sub(past_versions_to_keep);
         assert_eq!(stats.target_retained_version, first_retained_version);
@@ -332,7 +355,7 @@ mod tests {
         );
         assert_no_stale_keys(&db, first_retained_version);
 
-        let mut tree = MerkleTree::new(&mut db);
+        let mut tree = MerkleTree::new(&mut db).unwrap();
         assert_eq!(tree.first_retained_version(), Some(first_retained_version));
         for version in first_retained_version..=latest_version {
             tree.verify_consistency(version, true).unwrap();
@@ -340,19 +363,20 @@ mod tests {
 
         let kvs = generate_key_value_pairs(100..200);
         for chunk in kvs.chunks(10) {
-            tree.extend(chunk.to_vec());
+            tree.extend(chunk.to_vec()).unwrap();
         }
         let latest_version = tree.latest_version().unwrap();
 
         let (mut pruner, _handle) = MerkleTreePruner::new(&mut db);
         let stats = pruner
             .prune_up_to(pruner.last_prunable_version().unwrap() - past_versions_to_keep)
-            .unwrap();
+            .unwrap()
+            .expect("tree was not pruned");
         assert!(stats.pruned_key_count > 0);
         let first_retained_version = latest_version.saturating_sub(past_versions_to_keep);
         assert_eq!(stats.target_retained_version, first_retained_version);
 
-        let tree = MerkleTree::new(&mut db);
+        let tree = MerkleTree::new(&mut db).unwrap();
         for version in first_retained_version..=latest_version {
             tree.verify_consistency(version, true).unwrap();
         }
@@ -388,11 +412,14 @@ mod tests {
 
         let batch_count = if initialize_iteratively {
             for chunk in kvs.chunks(ITERATIVE_BATCH_COUNT) {
-                MerkleTree::new(&mut db).extend(chunk.to_vec());
+                MerkleTree::new(&mut db)
+                    .unwrap()
+                    .extend(chunk.to_vec())
+                    .unwrap();
             }
             ITERATIVE_BATCH_COUNT
         } else {
-            MerkleTree::new(&mut db).extend(kvs);
+            MerkleTree::new(&mut db).unwrap().extend(kvs).unwrap();
             1
         };
         let keys_in_db: HashSet<_> = db.nodes_mut().map(|(key, _)| *key).collect();
@@ -402,7 +429,7 @@ mod tests {
         let new_kvs = (0_u64..100)
             .map(|i| TreeEntry::new(Key::from(i), i + 1, new_value_hash))
             .collect();
-        MerkleTree::new(&mut db).extend(new_kvs);
+        MerkleTree::new(&mut db).unwrap().extend(new_kvs).unwrap();
 
         // Sanity check: before pruning, all old keys should be present.
         let new_keys_in_db: HashSet<_> = db.nodes_mut().map(|(key, _)| *key).collect();
@@ -411,7 +438,8 @@ mod tests {
         let (mut pruner, _handle) = MerkleTreePruner::new(&mut db);
         let stats = pruner
             .prune_up_to(pruner.last_prunable_version().unwrap())
-            .unwrap();
+            .unwrap()
+            .expect("tree was not pruned");
         assert_eq!(stats.pruned_key_count, keys_in_db.len() + batch_count);
         // ^ roots are not counted in `keys_in_db`
 
@@ -434,7 +462,7 @@ mod tests {
         let kvs: Vec<_> = (0_u64..100)
             .map(|i| TreeEntry::new(Key::from(i), i + 1, ValueHash::zero()))
             .collect();
-        MerkleTree::new(&mut db).extend(kvs);
+        MerkleTree::new(&mut db).unwrap().extend(kvs).unwrap();
         let leaf_keys_in_db = leaf_keys(&mut db);
 
         // Completely overwrite all keys in several batches.
@@ -443,7 +471,10 @@ mod tests {
             .map(|i| TreeEntry::new(Key::from(i), i + 1, new_value_hash))
             .collect();
         for chunk in new_kvs.chunks(20) {
-            MerkleTree::new(&mut db).extend(chunk.to_vec());
+            MerkleTree::new(&mut db)
+                .unwrap()
+                .extend(chunk.to_vec())
+                .unwrap();
             if prune_iteratively {
                 let (mut pruner, _handle) = MerkleTreePruner::new(&mut db);
                 pruner
diff --git a/core/lib/merkle_tree/src/recovery.rs b/core/lib/merkle_tree/src/recovery/mod.rs
similarity index 59%
rename from core/lib/merkle_tree/src/recovery.rs
rename to core/lib/merkle_tree/src/recovery/mod.rs
index aecda593a254..87a601f32f97 100644
--- a/core/lib/merkle_tree/src/recovery.rs
+++ b/core/lib/merkle_tree/src/recovery/mod.rs
@@ -35,20 +35,26 @@
 //! before extending the tree; these nodes are guaranteed to be the *only* DB reads necessary
 //! to insert new entries.
 
-use std::time::Instant;
+use std::{collections::HashMap, time::Instant};
 
+use anyhow::Context as _;
 use zksync_crypto::hasher::blake2::Blake2Hasher;
 
+pub use crate::storage::PersistenceThreadHandle;
 use crate::{
     hasher::{HashTree, HasherWithStats},
-    storage::{PatchSet, PruneDatabase, PrunePatchSet, Storage},
+    metrics::{RecoveryStage, RECOVERY_METRICS},
+    storage::{Database, MaybeParallel, PatchSet, PruneDatabase, PrunePatchSet, Storage},
     types::{Key, Manifest, Root, TreeEntry, TreeTags, ValueHash},
 };
 
+#[cfg(test)]
+mod tests;
+
 /// Handle to a Merkle tree during its recovery.
 #[derive(Debug)]
 pub struct MerkleTreeRecovery<DB, H = Blake2Hasher> {
-    pub(crate) db: DB,
+    pub(crate) db: MaybeParallel<DB>,
     hasher: H,
     recovered_version: u64,
 }
@@ -56,10 +62,10 @@ pub struct MerkleTreeRecovery<DB, H = Blake2Hasher> {
 impl<DB: PruneDatabase> MerkleTreeRecovery<DB> {
     /// Creates tree recovery with the default Blake2 hasher.
     ///
-    /// # Panics
+    /// # Errors
     ///
-    /// Panics in the same situations as [`Self::with_hasher()`].
-    pub fn new(db: DB, recovered_version: u64) -> Self {
+    /// Errors in the same situations as [`Self::with_hasher()`].
+    pub fn new(db: DB, recovered_version: u64) -> anyhow::Result<Self> {
         Self::with_hasher(db, recovered_version, Blake2Hasher)
     }
 }
@@ -67,20 +73,19 @@ impl<DB: PruneDatabase> MerkleTreeRecovery<DB> {
 impl<DB: PruneDatabase, H: HashTree> MerkleTreeRecovery<DB, H> {
     /// Loads a tree with the specified hasher.
     ///
-    /// # Panics
+    /// # Errors
     ///
-    /// - Panics if the tree DB exists and it's not being recovered, or if it's being recovered
+    /// - Errors if the tree DB exists and it's not being recovered, or if it's being recovered
     ///   for a different tree version.
-    /// - Panics if the hasher or basic tree parameters (e.g., the tree depth)
+    /// - Errors if the hasher or basic tree parameters (e.g., the tree depth)
     ///   do not match those of the tree loaded from the database.
-    pub fn with_hasher(mut db: DB, recovered_version: u64, hasher: H) -> Self {
+    pub fn with_hasher(mut db: DB, recovered_version: u64, hasher: H) -> anyhow::Result<Self> {
         let manifest = db.manifest();
         let mut manifest = if let Some(manifest) = manifest {
             if manifest.version_count > 0 {
                 let expected_version = manifest.version_count - 1;
-                assert_eq!(
-                    recovered_version,
-                    expected_version,
+                anyhow::ensure!(
+                    recovered_version == expected_version,
                     "Requested to recover tree version {recovered_version}, but it is currently being recovered \
                     for version {expected_version}"
                 );
@@ -95,19 +100,40 @@ impl<DB: PruneDatabase, H: HashTree> MerkleTreeRecovery<DB, H> {
 
         manifest.version_count = recovered_version + 1;
         if let Some(tags) = &manifest.tags {
-            tags.assert_consistency(&hasher, true);
+            tags.ensure_consistency(&hasher, true)?;
         } else {
             let mut tags = TreeTags::new(&hasher);
             tags.is_recovering = true;
             manifest.tags = Some(tags);
         }
-        db.apply_patch(PatchSet::from_manifest(manifest));
+        db.apply_patch(PatchSet::from_manifest(manifest))?;
 
-        Self {
-            db,
+        Ok(Self {
+            db: MaybeParallel::Sequential(db),
             hasher,
             recovered_version,
-        }
+        })
+    }
+
+    /// Updates custom tags for the tree using the provided closure. The update is atomic and unconditional.
+    ///
+    /// # Errors
+    ///
+    /// Propagates database I/O errors.
+    pub fn update_custom_tags<R>(
+        &mut self,
+        update: impl FnOnce(&mut HashMap<String, String>) -> R,
+    ) -> anyhow::Result<R> {
+        let mut manifest = self
+            .db
+            .manifest()
+            .context("Merkle tree manifest disappeared")?;
+        let tags = manifest
+            .tags
+            .get_or_insert_with(|| TreeTags::new(&self.hasher));
+        let output = update(&mut tags.custom);
+        self.db.apply_patch(PatchSet::from_manifest(manifest))?;
+        Ok(output)
     }
 
     /// Returns the version of the tree being recovered.
@@ -147,17 +173,21 @@ impl<DB: PruneDatabase, H: HashTree> MerkleTreeRecovery<DB, H> {
             %entries.key_range = entries_key_range(&entries),
         ),
     )]
-    pub fn extend_linear(&mut self, entries: Vec<TreeEntry>) {
+    pub fn extend_linear(&mut self, entries: Vec<TreeEntry>) -> anyhow::Result<()> {
         tracing::debug!("Started extending tree");
+        RECOVERY_METRICS.chunk_size.observe(entries.len());
 
-        let started_at = Instant::now();
+        let stage_latency = RECOVERY_METRICS.stage_latency[&RecoveryStage::Extend].start();
         let storage = Storage::new(&self.db, &self.hasher, self.recovered_version, false);
         let patch = storage.extend_during_linear_recovery(entries);
-        tracing::debug!("Finished processing keys; took {:?}", started_at.elapsed());
+        let stage_latency = stage_latency.observe();
+        tracing::debug!("Finished processing keys; took {stage_latency:?}");
 
-        let started_at = Instant::now();
-        self.db.apply_patch(patch);
-        tracing::debug!("Finished persisting to DB; took {:?}", started_at.elapsed());
+        let stage_latency = RECOVERY_METRICS.stage_latency[&RecoveryStage::ApplyPatch].start();
+        self.db.apply_patch(patch)?;
+        let stage_latency = stage_latency.observe();
+        tracing::debug!("Finished persisting to DB; took {stage_latency:?}");
+        Ok(())
     }
 
     /// Extends a tree with a chunk of entries. Unlike [`Self::extend_linear()`], entries may be
@@ -170,17 +200,21 @@ impl<DB: PruneDatabase, H: HashTree> MerkleTreeRecovery<DB, H> {
             entries.len = entries.len(),
         ),
     )]
-    pub fn extend_random(&mut self, entries: Vec<TreeEntry>) {
+    pub fn extend_random(&mut self, entries: Vec<TreeEntry>) -> anyhow::Result<()> {
         tracing::debug!("Started extending tree");
+        RECOVERY_METRICS.chunk_size.observe(entries.len());
 
-        let started_at = Instant::now();
+        let stage_latency = RECOVERY_METRICS.stage_latency[&RecoveryStage::Extend].start();
         let storage = Storage::new(&self.db, &self.hasher, self.recovered_version, false);
         let patch = storage.extend_during_random_recovery(entries);
-        tracing::debug!("Finished processing keys; took {:?}", started_at.elapsed());
+        let stage_latency = stage_latency.observe();
+        tracing::debug!("Finished processing keys; took {stage_latency:?}");
 
-        let started_at = Instant::now();
-        self.db.apply_patch(patch);
-        tracing::debug!("Finished persisting to DB; took {:?}", started_at.elapsed());
+        let stage_latency = RECOVERY_METRICS.stage_latency[&RecoveryStage::ApplyPatch].start();
+        self.db.apply_patch(patch)?;
+        let stage_latency = stage_latency.observe();
+        tracing::debug!("Finished persisting to DB; took {stage_latency:?}");
+        Ok(())
     }
 
     /// Finalizes the recovery process marking it as complete in the tree manifest.
@@ -190,7 +224,7 @@ impl<DB: PruneDatabase, H: HashTree> MerkleTreeRecovery<DB, H> {
         fields(recovered_version = self.recovered_version),
     )]
     #[allow(clippy::missing_panics_doc, clippy::range_plus_one)]
-    pub fn finalize(mut self) -> DB {
+    pub fn finalize(mut self) -> anyhow::Result<DB> {
         let mut manifest = self.db.manifest().unwrap();
         // ^ `unwrap()` is safe: manifest is inserted into the DB on creation
 
@@ -199,7 +233,7 @@ impl<DB: PruneDatabase, H: HashTree> MerkleTreeRecovery<DB, H> {
         } else {
             // Marginal case: an empty tree is recovered (i.e., `extend()` was never called).
             let patch = PatchSet::for_empty_root(manifest.clone(), self.recovered_version);
-            self.db.apply_patch(patch);
+            self.db.apply_patch(patch)?;
             0
         };
         tracing::debug!(
@@ -214,7 +248,7 @@ impl<DB: PruneDatabase, H: HashTree> MerkleTreeRecovery<DB, H> {
             stale_keys,
             self.recovered_version..self.recovered_version + 1,
         );
-        self.db.prune(prune_patch);
+        self.db.prune(prune_patch)?;
         tracing::debug!(
             "Pruned {stale_keys_len} stale keys in {:?}",
             started_at.elapsed()
@@ -224,10 +258,57 @@ impl<DB: PruneDatabase, H: HashTree> MerkleTreeRecovery<DB, H> {
             .tags
             .get_or_insert_with(|| TreeTags::new(&self.hasher))
             .is_recovering = false;
-        self.db.apply_patch(PatchSet::from_manifest(manifest));
+        self.db.apply_patch(PatchSet::from_manifest(manifest))?;
         tracing::debug!("Updated tree manifest to mark recovery as complete");
 
+        self.db.join()
+    }
+}
+
+impl<DB: 'static + Clone + PruneDatabase, H: HashTree> MerkleTreeRecovery<DB, H> {
+    /// Offloads database persistence to a background thread, so that it can run at the same time as processing of the following chunks.
+    /// Chunks are still guaranteed to be persisted atomically and in order.
+    ///
+    /// # Arguments
+    ///
+    /// - `buffer_capacity` determines how many chunks can be buffered before persistence blocks (i.e., back-pressure).
+    ///   Also controls memory usage, since each chunk translates into a non-trivial database patch (order of 1 kB / entry;
+    ///   i.e., a chunk with 200,000 entries would translate to a 200 MB patch).
+    ///
+    /// # Return value
+    ///
+    /// On success, returns a handle allowing to control background persistence thread. For now, it can only be used to emulate persistence crashes;
+    /// the handle can be dropped otherwise.
+    ///
+    /// # Safety
+    ///
+    /// If recovery is interrupted (e.g., its process crashes), then some of the latest chunks may not be persisted,
+    /// and will need to be processed again. It is **unsound** to restart recovery while a persistence thread may be active;
+    /// this may lead to a corrupted database state.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if `buffer_capacity` is 0, or if persistence was already parallelized.
+    pub fn parallelize_persistence(
+        &mut self,
+        buffer_capacity: usize,
+    ) -> anyhow::Result<PersistenceThreadHandle> {
+        anyhow::ensure!(buffer_capacity > 0, "Buffer capacity must be positive");
         self.db
+            .parallelize(self.recovered_version, buffer_capacity)
+            .context("persistence is already parallelized")
+    }
+
+    /// Waits until all changes in the underlying database are persisted, i.e. all chunks are flushed into it.
+    /// This is only relevant if [persistence was parallelized](Self::parallelize_persistence()) earlier;
+    /// otherwise, this method will return immediately.
+    ///
+    /// # Errors
+    ///
+    /// Propagates database I/O errors, should they occur during persistence.
+    pub fn wait_for_persistence(self) -> anyhow::Result<()> {
+        self.db.join()?;
+        Ok(())
     }
 }
 
@@ -237,49 +318,3 @@ fn entries_key_range(entries: &[TreeEntry]) -> String {
     };
     format!("{:0>64x}..={:0>64x}", first.key, last.key)
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::{hasher::HasherWithStats, types::LeafNode, MerkleTree};
-
-    #[test]
-    #[should_panic(expected = "Tree is expected to be in the process of recovery")]
-    fn recovery_for_initialized_tree() {
-        let mut db = PatchSet::default();
-        MerkleTreeRecovery::new(&mut db, 123).finalize();
-        MerkleTreeRecovery::new(db, 123);
-    }
-
-    #[test]
-    #[should_panic(expected = "Requested to recover tree version 42")]
-    fn recovery_for_different_version() {
-        let mut db = PatchSet::default();
-        MerkleTreeRecovery::new(&mut db, 123);
-        MerkleTreeRecovery::new(&mut db, 42);
-    }
-
-    #[test]
-    fn recovering_empty_tree() {
-        let db = MerkleTreeRecovery::new(PatchSet::default(), 42).finalize();
-        let tree = MerkleTree::new(db);
-        assert_eq!(tree.latest_version(), Some(42));
-        assert_eq!(tree.root(42), Some(Root::Empty));
-    }
-
-    #[test]
-    fn recovering_tree_with_single_node() {
-        let mut recovery = MerkleTreeRecovery::new(PatchSet::default(), 42);
-        let recovery_entry = TreeEntry::new(Key::from(123), 1, ValueHash::repeat_byte(1));
-        recovery.extend_linear(vec![recovery_entry]);
-        let tree = MerkleTree::new(recovery.finalize());
-
-        assert_eq!(tree.latest_version(), Some(42));
-        let mut hasher = HasherWithStats::new(&Blake2Hasher);
-        assert_eq!(
-            tree.latest_root_hash(),
-            LeafNode::new(recovery_entry).hash(&mut hasher, 0)
-        );
-        tree.verify_consistency(42, true).unwrap();
-    }
-}
diff --git a/core/lib/merkle_tree/src/recovery/tests.rs b/core/lib/merkle_tree/src/recovery/tests.rs
new file mode 100644
index 000000000000..601b56269b65
--- /dev/null
+++ b/core/lib/merkle_tree/src/recovery/tests.rs
@@ -0,0 +1,56 @@
+use super::*;
+use crate::{hasher::HasherWithStats, types::LeafNode, MerkleTree};
+
+#[test]
+fn recovery_for_initialized_tree() {
+    let mut db = PatchSet::default();
+    MerkleTreeRecovery::new(&mut db, 123)
+        .unwrap()
+        .finalize()
+        .unwrap();
+    let err = MerkleTreeRecovery::new(db, 123).unwrap_err().to_string();
+    assert!(
+        err.contains("Tree is expected to be in the process of recovery"),
+        "{err}"
+    );
+}
+
+#[test]
+fn recovery_for_different_version() {
+    let mut db = PatchSet::default();
+    MerkleTreeRecovery::new(&mut db, 123).unwrap();
+    let err = MerkleTreeRecovery::new(&mut db, 42)
+        .unwrap_err()
+        .to_string();
+    assert!(
+        err.contains("Requested to recover tree version 42"),
+        "{err}"
+    );
+}
+
+#[test]
+fn recovering_empty_tree() {
+    let db = MerkleTreeRecovery::new(PatchSet::default(), 42)
+        .unwrap()
+        .finalize()
+        .unwrap();
+    let tree = MerkleTree::new(db).unwrap();
+    assert_eq!(tree.latest_version(), Some(42));
+    assert_eq!(tree.root(42), Some(Root::Empty));
+}
+
+#[test]
+fn recovering_tree_with_single_node() {
+    let mut recovery = MerkleTreeRecovery::new(PatchSet::default(), 42).unwrap();
+    let recovery_entry = TreeEntry::new(Key::from(123), 1, ValueHash::repeat_byte(1));
+    recovery.extend_linear(vec![recovery_entry]).unwrap();
+    let tree = MerkleTree::new(recovery.finalize().unwrap()).unwrap();
+
+    assert_eq!(tree.latest_version(), Some(42));
+    let mut hasher = HasherWithStats::new(&Blake2Hasher);
+    assert_eq!(
+        tree.latest_root_hash(),
+        LeafNode::new(recovery_entry).hash(&mut hasher, 0)
+    );
+    tree.verify_consistency(42, true).unwrap();
+}
diff --git a/core/lib/merkle_tree/src/storage/database.rs b/core/lib/merkle_tree/src/storage/database.rs
index 0ffc7a66543a..a6e8a36c7084 100644
--- a/core/lib/merkle_tree/src/storage/database.rs
+++ b/core/lib/merkle_tree/src/storage/database.rs
@@ -81,7 +81,11 @@ pub trait Database: Send + Sync {
     fn start_profiling(&self, operation: ProfiledTreeOperation) -> Box<dyn Any>;
 
     /// Applies changes in the `patch` to this database. This operation should be atomic.
-    fn apply_patch(&mut self, patch: PatchSet);
+    ///
+    /// # Errors
+    ///
+    /// Returns I/O errors.
+    fn apply_patch(&mut self, patch: PatchSet) -> anyhow::Result<()>;
 }
 
 impl<DB: Database + ?Sized> Database for &mut DB {
@@ -109,8 +113,8 @@ impl<DB: Database + ?Sized> Database for &mut DB {
         (**self).start_profiling(operation)
     }
 
-    fn apply_patch(&mut self, patch: PatchSet) {
-        (**self).apply_patch(patch);
+    fn apply_patch(&mut self, patch: PatchSet) -> anyhow::Result<()> {
+        (**self).apply_patch(patch)
     }
 }
 
@@ -150,11 +154,11 @@ impl Database for PatchSet {
         Box::new(()) // no stats are collected
     }
 
-    fn apply_patch(&mut self, mut other: PatchSet) {
+    fn apply_patch(&mut self, mut other: PatchSet) -> anyhow::Result<()> {
         if let Some(other_updated_version) = other.updated_version {
             if let Some(updated_version) = self.updated_version {
-                assert_eq!(
-                    other_updated_version, updated_version,
+                anyhow::ensure!(
+                    other_updated_version == updated_version,
                     "Cannot merge patches with different updated versions"
                 );
 
@@ -163,7 +167,7 @@ impl Database for PatchSet {
                 // ^ `unwrap()`s are safe by design.
                 patch.merge(other_patch);
             } else {
-                assert!(
+                anyhow::ensure!(
                     self.patches_by_version.keys().all(|&ver| ver > other_updated_version),
                     "Cannot update {self:?} from {other:?}; this would break the update version invariant \
                      (the update version being lesser than all inserted versions)"
@@ -188,6 +192,7 @@ impl Database for PatchSet {
         }
         // `PatchSet` invariants hold by construction: the updated version (if set) is still lower
         // than all other versions by design.
+        Ok(())
     }
 }
 
@@ -244,10 +249,15 @@ impl<DB: Database> Patched<DB> {
     }
 
     /// Flushes changes from RAM to the wrapped database.
-    pub fn flush(&mut self) {
+    ///
+    /// # Errors
+    ///
+    /// Proxies database I/O errors.
+    pub fn flush(&mut self) -> anyhow::Result<()> {
         if let Some(patch) = self.patch.take() {
-            self.inner.apply_patch(patch);
+            self.inner.apply_patch(patch)?;
         }
+        Ok(())
     }
 
     /// Forgets about changes held in RAM.
@@ -343,12 +353,13 @@ impl<DB: Database> Database for Patched<DB> {
         self.inner.start_profiling(operation)
     }
 
-    fn apply_patch(&mut self, patch: PatchSet) {
+    fn apply_patch(&mut self, patch: PatchSet) -> anyhow::Result<()> {
         if let Some(existing_patch) = &mut self.patch {
-            existing_patch.apply_patch(patch);
+            existing_patch.apply_patch(patch)?;
         } else {
             self.patch = Some(patch);
         }
+        Ok(())
     }
 }
 
@@ -384,7 +395,11 @@ pub trait PruneDatabase: Database {
     fn stale_keys(&self, version: u64) -> Vec<NodeKey>;
 
     /// Atomically prunes the tree and updates information about the minimum retained version.
-    fn prune(&mut self, patch: PrunePatchSet);
+    ///
+    /// # Errors
+    ///
+    /// Propagates database I/O errors.
+    fn prune(&mut self, patch: PrunePatchSet) -> anyhow::Result<()>;
 }
 
 impl<T: PruneDatabase + ?Sized> PruneDatabase for &mut T {
@@ -396,8 +411,8 @@ impl<T: PruneDatabase + ?Sized> PruneDatabase for &mut T {
         (**self).stale_keys(version)
     }
 
-    fn prune(&mut self, patch: PrunePatchSet) {
-        (**self).prune(patch);
+    fn prune(&mut self, patch: PrunePatchSet) -> anyhow::Result<()> {
+        (**self).prune(patch)
     }
 }
 
@@ -416,7 +431,7 @@ impl PruneDatabase for PatchSet {
             .unwrap_or_default()
     }
 
-    fn prune(&mut self, patch: PrunePatchSet) {
+    fn prune(&mut self, patch: PrunePatchSet) -> anyhow::Result<()> {
         for key in &patch.pruned_node_keys {
             let Some(patch) = self.patches_by_version.get_mut(&key.version) else {
                 continue;
@@ -430,6 +445,7 @@ impl PruneDatabase for PatchSet {
 
         self.stale_keys_by_version
             .retain(|version, _| !patch.deleted_stale_key_versions.contains(version));
+        Ok(())
     }
 }
 
@@ -479,7 +495,7 @@ mod tests {
             vec![],
             Operation::Insert,
         );
-        patch.apply_patch(new_patch);
+        patch.apply_patch(new_patch).unwrap();
 
         for ver in (0..9).chain(11..20) {
             assert!(patch.root(ver).is_none());
@@ -518,7 +534,7 @@ mod tests {
             vec![],
             Operation::Update,
         );
-        patch.apply_patch(new_patch);
+        patch.apply_patch(new_patch).unwrap();
 
         for ver in (0..9).chain(10..20) {
             assert!(patch.root(ver).is_none());
@@ -542,7 +558,7 @@ mod tests {
         let new_root = Root::new(3, Node::Internal(InternalNode::default()));
         let new_nodes = generate_nodes(1, &[3, 4, 5]);
         let patch = create_patch(1, new_root, new_nodes.clone());
-        patched.apply_patch(patch);
+        patched.apply_patch(patch).unwrap();
 
         let (&old_key, expected_node) = old_nodes.iter().next().unwrap();
         let node = patched.tree_node(&old_key, true).unwrap();
@@ -619,7 +635,7 @@ mod tests {
             vec![],
             Operation::Update,
         );
-        patched.apply_patch(new_patch);
+        patched.apply_patch(new_patch).unwrap();
 
         for ver in (0..9).chain(10..20) {
             assert!(patched.root(ver).is_none());
diff --git a/core/lib/merkle_tree/src/storage/mod.rs b/core/lib/merkle_tree/src/storage/mod.rs
index 9728f99d57bb..b70485b93188 100644
--- a/core/lib/merkle_tree/src/storage/mod.rs
+++ b/core/lib/merkle_tree/src/storage/mod.rs
@@ -1,11 +1,15 @@
 //! Storage-related logic.
 
-pub(crate) use self::patch::{LoadAncestorsResult, WorkingPatchSet};
 pub use self::{
     database::{Database, NodeKeys, Patched, PruneDatabase, PrunePatchSet},
+    parallel::PersistenceThreadHandle,
     patch::PatchSet,
     rocksdb::{MerkleTreeColumnFamily, RocksDBWrapper},
 };
+pub(crate) use self::{
+    parallel::MaybeParallel,
+    patch::{LoadAncestorsResult, WorkingPatchSet},
+};
 use crate::{
     hasher::HashTree,
     metrics::{TreeUpdaterStats, BLOCK_TIMINGS, GENERAL_METRICS},
@@ -16,6 +20,7 @@ use crate::{
 };
 
 mod database;
+mod parallel;
 mod patch;
 mod proofs;
 mod rocksdb;
diff --git a/core/lib/merkle_tree/src/storage/parallel.rs b/core/lib/merkle_tree/src/storage/parallel.rs
new file mode 100644
index 000000000000..c5368c4561d2
--- /dev/null
+++ b/core/lib/merkle_tree/src/storage/parallel.rs
@@ -0,0 +1,625 @@
+//! Parallel storage implementation.
+
+use std::{
+    any::Any,
+    collections::{HashMap, VecDeque},
+    error::Error as StdError,
+    mem,
+    sync::{mpsc, Arc},
+    thread,
+    time::Duration,
+};
+
+use anyhow::Context as _;
+
+use super::{patch::PartialPatchSet, Database, NodeKeys, PatchSet};
+use crate::{
+    errors::DeserializeError,
+    metrics::{RecoveryStage, RECOVERY_METRICS},
+    types::{Manifest, Node, NodeKey, ProfiledTreeOperation, Root},
+    PruneDatabase, PrunePatchSet,
+};
+
+/// Persistence command passed to a persistence thread over a bounded channel.
+#[derive(Debug, Clone)]
+struct PersistenceCommand {
+    manifest: Manifest,
+    patch: Arc<PartialPatchSet>,
+    stale_keys: Vec<NodeKey>,
+}
+
+/// Command to a background persistence thread.
+#[derive(Debug)]
+enum Command {
+    Persist(PersistenceCommand),
+    Stop(mpsc::SyncSender<()>),
+}
+
+/// Handle allowing to control background persistence for Merkle tree.
+#[derive(Debug)]
+pub struct PersistenceThreadHandle {
+    command_sender: mpsc::SyncSender<Command>,
+}
+
+impl PersistenceThreadHandle {
+    /// Emulates stopping persisting updates; any updates afterwards will not actually be persisted.
+    ///
+    /// This method should only be used in tests. It is blocking (waits until all previous persistence commands are processed).
+    pub fn test_stop_processing(self) {
+        let (stop_sender, stop_receiver) = mpsc::sync_channel(0);
+        self.command_sender.send(Command::Stop(stop_sender)).ok();
+        stop_receiver.recv().ok();
+    }
+}
+
+/// Thread join handle, or an error produced by the thread.
+#[derive(Debug, Default)]
+enum HandleOrError {
+    #[default]
+    Nothing,
+    Handle(thread::JoinHandle<anyhow::Result<()>>),
+    Err(Arc<dyn StdError + Send + Sync>),
+}
+
+impl HandleOrError {
+    /// Checks whether the thread handle has exited, and returns an error if it exited with an error.
+    /// If `join` is set, waits for the thread handle to exit.
+    fn check(&mut self, join: bool) -> anyhow::Result<()> {
+        let err_arc = match self {
+            Self::Handle(handle) if join || handle.is_finished() => {
+                let Self::Handle(handle) = mem::take(self) else {
+                    unreachable!("just checked variant earlier");
+                };
+                let err = match handle.join() {
+                    Err(_) => anyhow::anyhow!("persistence thread panicked"),
+                    // Handling normal exits depends on whether we expect the thread to exit.
+                    Ok(Ok(())) if join => return Ok(()),
+                    Ok(Ok(())) => anyhow::anyhow!("persistence thread unexpectedly stopped"),
+                    Ok(Err(err)) => err,
+                };
+                let err: Box<dyn StdError + Send + Sync> = err.into();
+                let err: Arc<dyn StdError + Send + Sync> = err.into();
+                *self = Self::Err(err.clone());
+                err
+            }
+            Self::Handle(_) => return Ok(()),
+            Self::Err(err) => err.clone(),
+            Self::Nothing => unreachable!("only used temporarily to take out `JoinHandle`"),
+        };
+        Err(anyhow::Error::new(err_arc))
+    }
+
+    fn join(mut self) -> anyhow::Result<()> {
+        self.check(true)
+    }
+}
+
+/// Database implementation that persists changes in a background thread. Not yet applied changes
+/// are queued up and are used in `Database` methods. A queue can sometimes be stale (i.e., changes
+/// at its head may have been applied), but this is fine as long as changes are applied atomically and sequentially.
+///
+/// The only use case where this struct is used right now is tree recovery. Correspondingly, some reported metrics
+/// are specific to recovery and would need to be reworked if this struct is eventually used for other use cases.
+///
+/// # Assumptions
+///
+/// - This is the only mutable database instance.
+/// - All database updates update the same tree version.
+/// - The application supports latest changes being dropped.
+#[derive(Debug)]
+pub(crate) struct ParallelDatabase<DB> {
+    inner: DB,
+    updated_version: u64,
+    command_sender: mpsc::SyncSender<Command>,
+    persistence_handle: HandleOrError,
+    commands: VecDeque<PersistenceCommand>,
+}
+
+impl<DB: Database + Clone + 'static> ParallelDatabase<DB> {
+    fn new(inner: DB, updated_version: u64, buffer_capacity: usize) -> Self {
+        let (command_sender, command_receiver) = mpsc::sync_channel(buffer_capacity);
+        let persistence_database = inner.clone();
+        Self {
+            inner,
+            updated_version,
+            command_sender,
+            persistence_handle: HandleOrError::Handle(thread::spawn(move || {
+                Self::run_persistence(persistence_database, updated_version, command_receiver)
+            })),
+            commands: VecDeque::with_capacity(buffer_capacity),
+        }
+    }
+
+    fn persistence_thread_handle(&self) -> PersistenceThreadHandle {
+        PersistenceThreadHandle {
+            command_sender: self.command_sender.clone(),
+        }
+    }
+
+    fn run_persistence(
+        mut database: DB,
+        updated_version: u64,
+        command_receiver: mpsc::Receiver<Command>,
+    ) -> anyhow::Result<()> {
+        let mut persisted_count = 0;
+        while let Ok(command) = command_receiver.recv() {
+            let command = match command {
+                Command::Persist(command) => command,
+                Command::Stop(_sender) => {
+                    // Ensure that `PersistenceThreadHandle::test_stop_processing()` returns after the processing loop terminates.
+                    drop(command_receiver);
+                    anyhow::bail!("emulated persistence crash");
+                }
+            };
+
+            tracing::debug!(
+                "Persisting patch #{persisted_count} with {} nodes and {} stale keys",
+                command.patch.nodes.len(),
+                command.stale_keys.len()
+            );
+            // Reconstitute a `PatchSet` and apply it to the underlying database.
+            let patch = PatchSet {
+                manifest: command.manifest,
+                patches_by_version: HashMap::from([(updated_version, command.patch.cloned())]),
+                updated_version: Some(updated_version),
+                stale_keys_by_version: HashMap::from([(updated_version, command.stale_keys)]),
+            };
+            let stage_latency =
+                RECOVERY_METRICS.stage_latency[&RecoveryStage::ParallelPersistence].start();
+            database.apply_patch(patch)?;
+            let stage_latency = stage_latency.observe();
+            tracing::debug!("Persisted patch #{persisted_count} in {stage_latency:?}");
+            persisted_count += 1;
+        }
+        Ok(())
+    }
+}
+
+impl<DB: Database> ParallelDatabase<DB> {
+    fn wait_sync(&mut self) -> anyhow::Result<()> {
+        while !self.commands.is_empty() {
+            self.commands
+                .retain(|command| Arc::strong_count(&command.patch) > 1);
+            thread::sleep(Duration::from_millis(50)); // TODO: more intelligent approach
+        }
+        RECOVERY_METRICS.parallel_persistence_buffer_size.set(0);
+
+        // Check that the persistence thread hasn't panicked
+        self.persistence_handle.check(false)
+    }
+
+    fn join(self) -> anyhow::Result<DB> {
+        drop(self.command_sender);
+        drop(self.commands);
+        RECOVERY_METRICS.parallel_persistence_buffer_size.set(0);
+        self.persistence_handle.join()?;
+        Ok(self.inner)
+    }
+}
+
+impl<DB: Database> Database for ParallelDatabase<DB> {
+    fn try_manifest(&self) -> Result<Option<Manifest>, DeserializeError> {
+        let latest_command = self.commands.iter().next_back();
+        if let Some(command) = latest_command {
+            Ok(Some(command.manifest.clone()))
+        } else {
+            self.inner.try_manifest()
+        }
+    }
+
+    fn try_root(&self, version: u64) -> Result<Option<Root>, DeserializeError> {
+        if version != self.updated_version {
+            return self.inner.try_root(version);
+        }
+        let root = self
+            .commands
+            .iter()
+            .rev()
+            .find_map(|command| command.patch.root.clone());
+        if let Some(root) = root {
+            Ok(Some(root))
+        } else {
+            self.inner.try_root(version)
+        }
+    }
+
+    fn try_tree_node(
+        &self,
+        key: &NodeKey,
+        is_leaf: bool,
+    ) -> Result<Option<Node>, DeserializeError> {
+        if key.version != self.updated_version {
+            return self.inner.try_tree_node(key, is_leaf);
+        }
+
+        let node = self
+            .commands
+            .iter()
+            .rev()
+            .find_map(|command| command.patch.nodes.get(key).cloned());
+        if let Some(node) = node {
+            debug_assert_eq!(matches!(node, Node::Leaf(_)), is_leaf);
+            Ok(Some(node))
+        } else {
+            self.inner.try_tree_node(key, is_leaf)
+        }
+    }
+
+    fn tree_nodes(&self, keys: &NodeKeys) -> Vec<Option<Node>> {
+        let mut nodes = vec![None; keys.len()];
+        for command in self.commands.iter().rev() {
+            for (key_idx, (key, is_leaf)) in keys.iter().enumerate() {
+                if nodes[key_idx].is_some() {
+                    continue;
+                }
+                if let Some(node) = command.patch.nodes.get(key) {
+                    debug_assert_eq!(matches!(node, Node::Leaf(_)), *is_leaf);
+                    nodes[key_idx] = Some(node.clone());
+                }
+            }
+        }
+
+        // Load missing nodes from the underlying database
+        let (key_indexes, missing_keys): (Vec<_>, Vec<_>) = keys
+            .iter()
+            .copied()
+            .enumerate()
+            .filter(|(i, _)| nodes[*i].is_none())
+            .unzip();
+        let inner_nodes = self.inner.tree_nodes(&missing_keys);
+        for (key_idx, node) in key_indexes.into_iter().zip(inner_nodes) {
+            nodes[key_idx] = node;
+        }
+        nodes
+    }
+
+    fn start_profiling(&self, operation: ProfiledTreeOperation) -> Box<dyn Any> {
+        self.inner.start_profiling(operation)
+    }
+
+    fn apply_patch(&mut self, mut patch: PatchSet) -> anyhow::Result<()> {
+        let partial_patch = if let Some(updated_version) = patch.updated_version {
+            anyhow::ensure!(
+                updated_version == self.updated_version,
+                "Unsupported update: must update predefined version {}",
+                self.updated_version
+            );
+            anyhow::ensure!(
+                patch.patches_by_version.len() == 1,
+                "Unsupported update: must *only* update version {updated_version}"
+            );
+
+            // Garbage-collect patches already applied by the persistence thread. This will remove all patches
+            // if the persistence thread has failed, but this is OK because we'll propagate the failure below anyway.
+            self.commands
+                .retain(|command| Arc::strong_count(&command.patch) > 1);
+            RECOVERY_METRICS
+                .parallel_persistence_buffer_size
+                .set(self.commands.len());
+            tracing::debug!(
+                "Retained {} buffered persistence command(s)",
+                self.commands.len()
+            );
+
+            patch
+                .patches_by_version
+                .remove(&updated_version)
+                .context("PatchSet invariant violated: missing patch for the updated version")?
+        } else {
+            // We only support manifest updates.
+            anyhow::ensure!(
+                patch.patches_by_version.is_empty(),
+                "Invalid update: {patch:?}"
+            );
+            PartialPatchSet::empty()
+        };
+
+        let mut stale_keys_by_version = patch.stale_keys_by_version;
+        anyhow::ensure!(
+            stale_keys_by_version.is_empty()
+                || (stale_keys_by_version.len() == 1
+                    && stale_keys_by_version.contains_key(&self.updated_version)),
+            "Invalid stale keys update: {stale_keys_by_version:?}"
+        );
+        let stale_keys = stale_keys_by_version
+            .remove(&self.updated_version)
+            .unwrap_or_default();
+
+        let command = PersistenceCommand {
+            manifest: patch.manifest,
+            patch: Arc::new(partial_patch),
+            stale_keys,
+        };
+        if self
+            .command_sender
+            .send(Command::Persist(command.clone()))
+            .is_err()
+        {
+            self.persistence_handle.check(true)?;
+            anyhow::bail!(
+                "persistence thread never exits normally when `ParallelDatabase` is alive"
+            );
+        }
+        self.commands.push_back(command);
+        RECOVERY_METRICS.parallel_persistence_buffer_size.inc_by(1);
+        Ok(())
+    }
+}
+
+impl<DB: PruneDatabase> PruneDatabase for ParallelDatabase<DB> {
+    fn min_stale_key_version(&self) -> Option<u64> {
+        let commands_have_stale_keys = self
+            .commands
+            .iter()
+            .any(|command| !command.stale_keys.is_empty());
+        if commands_have_stale_keys {
+            return Some(self.updated_version);
+        }
+        self.inner.min_stale_key_version()
+    }
+
+    fn stale_keys(&self, version: u64) -> Vec<NodeKey> {
+        if version != self.updated_version {
+            return self.inner.stale_keys(version);
+        }
+        self.commands
+            .iter()
+            .flat_map(|command| command.stale_keys.clone())
+            .chain(self.inner.stale_keys(version))
+            .collect()
+    }
+
+    fn prune(&mut self, patch: PrunePatchSet) -> anyhow::Result<()> {
+        // Require the underlying database to be fully synced.
+        self.wait_sync()
+            .context("failed synchronizing database before pruning")?;
+        self.inner.prune(patch)
+    }
+}
+
+/// Database with either sequential or parallel persistence.
+#[derive(Debug)]
+pub(crate) enum MaybeParallel<DB> {
+    Sequential(DB),
+    Parallel(ParallelDatabase<DB>),
+}
+
+impl<DB: PruneDatabase> MaybeParallel<DB> {
+    pub fn join(self) -> anyhow::Result<DB> {
+        match self {
+            Self::Sequential(db) => Ok(db),
+            Self::Parallel(db) => db.join(),
+        }
+    }
+}
+
+impl<DB: 'static + Clone + PruneDatabase> MaybeParallel<DB> {
+    pub fn parallelize(
+        &mut self,
+        updated_version: u64,
+        buffer_capacity: usize,
+    ) -> Option<PersistenceThreadHandle> {
+        if let Self::Sequential(db) = self {
+            let db = ParallelDatabase::new(db.clone(), updated_version, buffer_capacity);
+            let handle = db.persistence_thread_handle();
+            *self = Self::Parallel(db);
+            Some(handle)
+        } else {
+            None
+        }
+    }
+}
+
+impl<DB: Database> Database for MaybeParallel<DB> {
+    fn try_manifest(&self) -> Result<Option<Manifest>, DeserializeError> {
+        match self {
+            Self::Sequential(db) => db.try_manifest(),
+            Self::Parallel(db) => db.try_manifest(),
+        }
+    }
+
+    fn try_root(&self, version: u64) -> Result<Option<Root>, DeserializeError> {
+        match self {
+            Self::Sequential(db) => db.try_root(version),
+            Self::Parallel(db) => db.try_root(version),
+        }
+    }
+
+    fn try_tree_node(
+        &self,
+        key: &NodeKey,
+        is_leaf: bool,
+    ) -> Result<Option<Node>, DeserializeError> {
+        match self {
+            Self::Sequential(db) => db.try_tree_node(key, is_leaf),
+            Self::Parallel(db) => db.try_tree_node(key, is_leaf),
+        }
+    }
+
+    fn tree_nodes(&self, keys: &NodeKeys) -> Vec<Option<Node>> {
+        match self {
+            Self::Sequential(db) => db.tree_nodes(keys),
+            Self::Parallel(db) => db.tree_nodes(keys),
+        }
+    }
+
+    fn start_profiling(&self, operation: ProfiledTreeOperation) -> Box<dyn Any> {
+        match self {
+            Self::Sequential(db) => db.start_profiling(operation),
+            Self::Parallel(db) => db.start_profiling(operation),
+        }
+    }
+
+    fn apply_patch(&mut self, patch: PatchSet) -> anyhow::Result<()> {
+        match self {
+            Self::Sequential(db) => db.apply_patch(patch),
+            Self::Parallel(db) => db.apply_patch(patch),
+        }
+    }
+}
+
+impl<DB: PruneDatabase> PruneDatabase for MaybeParallel<DB> {
+    fn min_stale_key_version(&self) -> Option<u64> {
+        match self {
+            Self::Sequential(db) => db.min_stale_key_version(),
+            Self::Parallel(db) => db.min_stale_key_version(),
+        }
+    }
+
+    fn stale_keys(&self, version: u64) -> Vec<NodeKey> {
+        match self {
+            Self::Sequential(db) => db.stale_keys(version),
+            Self::Parallel(db) => db.stale_keys(version),
+        }
+    }
+
+    fn prune(&mut self, patch: PrunePatchSet) -> anyhow::Result<()> {
+        match self {
+            Self::Sequential(db) => db.prune(patch),
+            Self::Parallel(db) => db.prune(patch),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use assert_matches::assert_matches;
+    use tempfile::TempDir;
+
+    use super::*;
+    use crate::{
+        storage::Operation,
+        types::{ChildRef, InternalNode, LeafNode, Nibbles},
+        Key, RocksDBWrapper, TreeEntry, ValueHash,
+    };
+
+    const UPDATED_VERSION: u64 = 10;
+
+    fn mock_patch_set(start: u64, leaf_count: u64) -> PatchSet {
+        assert!(start <= leaf_count);
+
+        let manifest = Manifest::new(UPDATED_VERSION, &());
+        let mut root_node = InternalNode::default();
+        root_node.insert_child_ref(0, ChildRef::leaf(UPDATED_VERSION));
+        let root = Root::new(leaf_count, Node::Internal(root_node));
+        let nodes = (start..leaf_count)
+            .map(|i| {
+                let key = Key::from(i);
+                let node_key = Nibbles::new(&key, 64).with_version(UPDATED_VERSION);
+                let leaf = LeafNode::new(TreeEntry {
+                    key,
+                    value: ValueHash::zero(),
+                    leaf_index: i + 1,
+                });
+                (node_key, Node::from(leaf))
+            })
+            .collect();
+        PatchSet::new(
+            manifest,
+            UPDATED_VERSION,
+            root,
+            nodes,
+            vec![],
+            Operation::Update,
+        )
+    }
+
+    #[test]
+    fn database_methods_with_parallel_persistence() {
+        let temp_dir = TempDir::new().unwrap();
+        let db = RocksDBWrapper::new(temp_dir.path()).unwrap();
+
+        let mut parallel_db = ParallelDatabase::new(db.clone(), UPDATED_VERSION, 1);
+        assert!(parallel_db.manifest().is_none());
+        let manifest = Manifest::new(UPDATED_VERSION, &());
+        parallel_db
+            .apply_patch(PatchSet::from_manifest(manifest))
+            .unwrap();
+        assert_eq!(parallel_db.commands.len(), 1);
+        assert_eq!(
+            parallel_db.manifest().unwrap().version_count,
+            UPDATED_VERSION
+        );
+
+        parallel_db.apply_patch(mock_patch_set(0, 10)).unwrap();
+        assert_eq!(parallel_db.root(UPDATED_VERSION).unwrap().leaf_count(), 10);
+
+        let keys: Vec<_> = (0..20)
+            .map(|i| {
+                (
+                    Nibbles::new(&Key::from(i), 64).with_version(UPDATED_VERSION),
+                    true,
+                )
+            })
+            .collect();
+
+        let nodes = parallel_db.tree_nodes(&keys);
+        for (i, node) in nodes[..10].iter().enumerate() {
+            assert_matches!(
+                node.as_ref().unwrap(),
+                Node::Leaf(leaf) if leaf.leaf_index == i as u64 + 1
+            );
+        }
+        for node in &nodes[10..] {
+            assert!(node.is_none(), "{node:?}");
+        }
+
+        parallel_db.apply_patch(mock_patch_set(10, 15)).unwrap();
+
+        let nodes = parallel_db.tree_nodes(&keys);
+        for (i, node) in nodes[..15].iter().enumerate() {
+            assert_matches!(
+                node.as_ref().unwrap(),
+                Node::Leaf(leaf) if leaf.leaf_index == i as u64 + 1
+            );
+        }
+        for node in &nodes[15..] {
+            assert!(node.is_none(), "{node:?}");
+        }
+
+        parallel_db.wait_sync().unwrap();
+
+        let nodes = parallel_db.tree_nodes(&keys);
+        for (i, node) in nodes[..15].iter().enumerate() {
+            assert_matches!(
+                node.as_ref().unwrap(),
+                Node::Leaf(leaf) if leaf.leaf_index == i as u64 + 1
+            );
+        }
+        for node in &nodes[15..] {
+            assert!(node.is_none(), "{node:?}");
+        }
+
+        parallel_db.join().unwrap();
+    }
+
+    #[test]
+    fn fault_injection_with_parallel_persistence() {
+        let temp_dir = TempDir::new().unwrap();
+        let db = RocksDBWrapper::new(temp_dir.path()).unwrap();
+
+        let mut parallel_db = ParallelDatabase::new(db.clone(), UPDATED_VERSION, 4);
+        let handle = parallel_db.persistence_thread_handle();
+
+        // Queue up a couple of patch sets
+        parallel_db.apply_patch(mock_patch_set(0, 5)).unwrap();
+        assert_eq!(parallel_db.root(UPDATED_VERSION).unwrap().leaf_count(), 5);
+        parallel_db.apply_patch(mock_patch_set(5, 10)).unwrap();
+        assert_eq!(parallel_db.root(UPDATED_VERSION).unwrap().leaf_count(), 10);
+        // Emulate the persistence thread stopping (e.g., due to the process crashing)
+        handle.test_stop_processing();
+
+        // Queue another patch set.
+        let err = parallel_db
+            .apply_patch(mock_patch_set(10, 15))
+            .unwrap_err()
+            .to_string();
+        assert!(err.contains("emulated persistence crash"), "{err}");
+
+        let err = parallel_db.join().unwrap_err().to_string();
+        assert!(err.contains("emulated persistence crash"), "{err}");
+
+        // Check that the last patch set was dropped.
+        assert_eq!(db.root(UPDATED_VERSION).unwrap().leaf_count(), 10);
+    }
+}
diff --git a/core/lib/merkle_tree/src/storage/patch.rs b/core/lib/merkle_tree/src/storage/patch.rs
index f0b06c83bf2a..5f3e44c8bef0 100644
--- a/core/lib/merkle_tree/src/storage/patch.rs
+++ b/core/lib/merkle_tree/src/storage/patch.rs
@@ -3,6 +3,7 @@
 use std::{
     collections::{hash_map::Entry, HashMap},
     iter,
+    sync::Arc,
     time::Instant,
 };
 
@@ -31,10 +32,24 @@ pub(super) struct PartialPatchSet {
 }
 
 impl PartialPatchSet {
+    pub fn empty() -> Self {
+        Self {
+            root: None,
+            nodes: HashMap::new(),
+        }
+    }
+
     pub fn merge(&mut self, other: Self) {
         self.root = other.root;
         self.nodes.extend(other.nodes);
     }
+
+    pub fn cloned(self: &Arc<Self>) -> Self {
+        Self {
+            root: self.root.clone(),
+            nodes: self.nodes.clone(),
+        }
+    }
 }
 
 /// Raw set of database changes.
@@ -305,7 +320,7 @@ impl WorkingPatchSet {
             if nibble_count == 0 {
                 // Copy the root node to all parts.
                 for part in &mut parts {
-                    part.changes_by_nibble_count[0] = level.clone();
+                    part.changes_by_nibble_count[0].clone_from(&level);
                 }
             } else {
                 for (nibbles, node) in level {
@@ -744,7 +759,7 @@ mod tests {
         let key = Key::from(1234_u64);
         let (_, patch) =
             Storage::new(&db, &(), 0, true).extend(vec![TreeEntry::new(key, 1, ValueHash::zero())]);
-        db.apply_patch(patch);
+        db.apply_patch(patch).unwrap();
 
         let mut patch = WorkingPatchSet::new(1, db.root(0).unwrap());
         let (greatest_leaf, load_result) = patch.load_greatest_key(&db).unwrap();
@@ -760,7 +775,7 @@ mod tests {
             2,
             ValueHash::zero(),
         )]);
-        db.apply_patch(patch);
+        db.apply_patch(patch).unwrap();
 
         let mut patch = WorkingPatchSet::new(2, db.root(1).unwrap());
         let (greatest_leaf, load_result) = patch.load_greatest_key(&db).unwrap();
@@ -775,7 +790,7 @@ mod tests {
             3,
             ValueHash::zero(),
         )]);
-        db.apply_patch(patch);
+        db.apply_patch(patch).unwrap();
 
         let mut patch = WorkingPatchSet::new(3, db.root(2).unwrap());
         let (greatest_leaf, load_result) = patch.load_greatest_key(&db).unwrap();
diff --git a/core/lib/merkle_tree/src/storage/rocksdb.rs b/core/lib/merkle_tree/src/storage/rocksdb.rs
index 1a9c5eafbbef..711ccaa6137e 100644
--- a/core/lib/merkle_tree/src/storage/rocksdb.rs
+++ b/core/lib/merkle_tree/src/storage/rocksdb.rs
@@ -2,6 +2,7 @@
 
 use std::{any::Any, cell::RefCell, path::Path, sync::Arc};
 
+use anyhow::Context as _;
 use rayon::prelude::*;
 use thread_local::ThreadLocal;
 use zksync_storage::{
@@ -237,8 +238,8 @@ impl Database for RocksDBWrapper {
         })
     }
 
-    #[allow(clippy::missing_panics_doc)]
-    fn apply_patch(&mut self, patch: PatchSet) {
+    #[allow(clippy::missing_errors_doc)] // this is a trait implementation method
+    fn apply_patch(&mut self, patch: PatchSet) -> anyhow::Result<()> {
         let tree_cf = MerkleTreeColumnFamily::Tree;
         let mut write_batch = self.db.new_write_batch();
         let mut node_bytes = Vec::with_capacity(128);
@@ -288,8 +289,9 @@ impl Database for RocksDBWrapper {
 
         self.db
             .write(write_batch)
-            .expect("Failed writing a batch to RocksDB");
+            .context("Failed writing a batch to RocksDB")?;
         metrics.report();
+        Ok(())
     }
 }
 
@@ -315,7 +317,7 @@ impl PruneDatabase for RocksDBWrapper {
         keys.collect()
     }
 
-    fn prune(&mut self, patch: PrunePatchSet) {
+    fn prune(&mut self, patch: PrunePatchSet) -> anyhow::Result<()> {
         let mut write_batch = self.db.new_write_batch();
 
         let tree_cf = MerkleTreeColumnFamily::Tree;
@@ -330,7 +332,7 @@ impl PruneDatabase for RocksDBWrapper {
 
         self.db
             .write(write_batch)
-            .expect("Failed writing a batch to RocksDB");
+            .context("Failed writing a batch to RocksDB")
     }
 }
 
@@ -355,7 +357,7 @@ mod tests {
         let nodes = generate_nodes(0, &[1, 2]);
         expected_keys.extend(nodes.keys().copied());
         let patch = create_patch(0, root, nodes);
-        db.apply_patch(patch);
+        db.apply_patch(patch).unwrap();
 
         assert_contains_exactly_keys(&db, &expected_keys);
 
@@ -372,16 +374,16 @@ mod tests {
         expected_keys.insert(NodeKey::empty(1));
         let nodes = generate_nodes(1, &[6]);
         expected_keys.extend(nodes.keys().copied());
-        patch.apply_patch(create_patch(1, root, nodes));
-        db.apply_patch(patch);
+        patch.apply_patch(create_patch(1, root, nodes)).unwrap();
+        db.apply_patch(patch).unwrap();
 
         assert_contains_exactly_keys(&db, &expected_keys);
 
         // Overwrite both versions of the tree again.
         let patch = create_patch(0, Root::Empty, HashMap::new());
-        db.apply_patch(patch);
+        db.apply_patch(patch).unwrap();
         let patch = create_patch(1, Root::Empty, HashMap::new());
-        db.apply_patch(patch);
+        db.apply_patch(patch).unwrap();
 
         let expected_keys = HashSet::from_iter([NodeKey::empty(0), NodeKey::empty(1)]);
         assert_contains_exactly_keys(&db, &expected_keys);
diff --git a/core/lib/merkle_tree/src/storage/serialization.rs b/core/lib/merkle_tree/src/storage/serialization.rs
index 6ad6e1ff0b2f..f21fece94e09 100644
--- a/core/lib/merkle_tree/src/storage/serialization.rs
+++ b/core/lib/merkle_tree/src/storage/serialization.rs
@@ -1,6 +1,6 @@
 //! Serialization of node types in the database.
 
-use std::str;
+use std::{collections::HashMap, str};
 
 use crate::{
     errors::{DeserializeError, DeserializeErrorKind, ErrorContext},
@@ -206,12 +206,14 @@ impl Node {
 impl TreeTags {
     /// Tags are serialized as a length-prefixed list of `(&str, &str)` tuples, where each
     /// `&str` is length-prefixed as well. All lengths are encoded using LEB128.
+    /// Custom tag keys are prefixed with `custom.` to ensure they don't intersect with standard tags.
     fn deserialize(bytes: &mut &[u8]) -> Result<Self, DeserializeError> {
         let tag_count = leb128::read::unsigned(bytes).map_err(DeserializeErrorKind::Leb128)?;
         let mut architecture = None;
         let mut hasher = None;
         let mut depth = None;
         let mut is_recovering = false;
+        let mut custom = HashMap::new();
 
         for _ in 0..tag_count {
             let key = Self::deserialize_str(bytes)?;
@@ -237,7 +239,13 @@ impl TreeTags {
                     })?;
                     is_recovering = parsed;
                 }
-                _ => return Err(DeserializeErrorKind::UnknownTag(key.to_owned()).into()),
+                key => {
+                    if let Some(custom_key) = key.strip_prefix("custom.") {
+                        custom.insert(custom_key.to_owned(), value.to_owned());
+                    } else {
+                        return Err(DeserializeErrorKind::UnknownTag(key.to_owned()).into());
+                    }
+                }
             }
         }
         Ok(Self {
@@ -245,6 +253,7 @@ impl TreeTags {
             hasher: hasher.ok_or(DeserializeErrorKind::MissingTag("hasher"))?,
             depth: depth.ok_or(DeserializeErrorKind::MissingTag("depth"))?,
             is_recovering,
+            custom,
         })
     }
 
@@ -266,8 +275,9 @@ impl TreeTags {
     }
 
     fn serialize(&self, buffer: &mut Vec<u8>) {
-        let entry_count = 3 + u64::from(self.is_recovering);
+        let entry_count = 3 + u64::from(self.is_recovering) + self.custom.len() as u64;
         leb128::write::unsigned(buffer, entry_count).unwrap();
+
         Self::serialize_str(buffer, "architecture");
         Self::serialize_str(buffer, &self.architecture);
         Self::serialize_str(buffer, "depth");
@@ -278,6 +288,11 @@ impl TreeTags {
             Self::serialize_str(buffer, "is_recovering");
             Self::serialize_str(buffer, "true");
         }
+
+        for (custom_key, value) in &self.custom {
+            Self::serialize_str(buffer, &format!("custom.{custom_key}"));
+            Self::serialize_str(buffer, value);
+        }
     }
 }
 
@@ -347,6 +362,40 @@ mod tests {
         assert_eq!(manifest_copy, manifest);
     }
 
+    #[test]
+    fn serializing_manifest_with_custom_tags() {
+        let mut manifest = Manifest::new(42, &());
+        // Test a single custom tag first to not deal with non-determinism when enumerating tags.
+        manifest.tags.as_mut().unwrap().custom =
+            HashMap::from([("test".to_owned(), "1".to_owned())]);
+        let mut buffer = vec![];
+        manifest.serialize(&mut buffer);
+        assert_eq!(buffer[0], 42); // version count
+        assert_eq!(buffer[1], 4); // number of tags (3 standard + 1 custom)
+        assert_eq!(
+            buffer[2..],
+            *b"\x0Carchitecture\x06AR16MT\x05depth\x03256\x06hasher\x08no_op256\x0Bcustom.test\x011"
+        );
+
+        let manifest_copy = Manifest::deserialize(&buffer).unwrap();
+        assert_eq!(manifest_copy, manifest);
+
+        // Test multiple tags.
+        let tags = manifest.tags.as_mut().unwrap();
+        tags.is_recovering = true;
+        tags.custom = HashMap::from([
+            ("test".to_owned(), "1".to_owned()),
+            ("other.long.tag".to_owned(), "123456!!!".to_owned()),
+        ]);
+        let mut buffer = vec![];
+        manifest.serialize(&mut buffer);
+        assert_eq!(buffer[0], 42); // version count
+        assert_eq!(buffer[1], 6); // number of tags (4 standard + 2 custom)
+
+        let manifest_copy = Manifest::deserialize(&buffer).unwrap();
+        assert_eq!(manifest_copy, manifest);
+    }
+
     #[test]
     fn manifest_serialization_errors() {
         let manifest = Manifest::new(42, &());
diff --git a/core/lib/merkle_tree/src/storage/tests.rs b/core/lib/merkle_tree/src/storage/tests.rs
index 8bcaab710814..8656c471905e 100644
--- a/core/lib/merkle_tree/src/storage/tests.rs
+++ b/core/lib/merkle_tree/src/storage/tests.rs
@@ -187,7 +187,7 @@ fn inserting_node_in_non_empty_database() {
         TreeEntry::new(SECOND_KEY, 2, H256([2; 32])),
     ];
     let (_, patch) = storage.extend(kvs);
-    db.apply_patch(patch);
+    db.apply_patch(patch).unwrap();
 
     let mut updater = TreeUpdater::new(1, db.root(0).unwrap());
     let sorted_keys = SortedKeys::new([THIRD_KEY, E_KEY, SECOND_KEY].into_iter());
@@ -238,7 +238,7 @@ fn inserting_node_in_non_empty_database_with_moved_key() {
         TreeEntry::new(THIRD_KEY, 2, H256([3; 32])),
     ];
     let (_, patch) = storage.extend(kvs);
-    db.apply_patch(patch);
+    db.apply_patch(patch).unwrap();
 
     let mut updater = TreeUpdater::new(1, db.root(0).unwrap());
     let sorted_keys = SortedKeys::new([SECOND_KEY].into_iter());
@@ -314,7 +314,7 @@ fn reading_keys_does_not_change_child_version() {
         TreeEntry::new(SECOND_KEY, 2, H256([1; 32])),
     ];
     let (_, patch) = storage.extend(kvs);
-    db.apply_patch(patch);
+    db.apply_patch(patch).unwrap();
 
     let storage = Storage::new(&db, &(), 1, true);
     let instructions = vec![
@@ -344,7 +344,7 @@ fn read_ops_are_not_reflected_in_patch() {
         TreeEntry::new(SECOND_KEY, 2, H256([1; 32])),
     ];
     let (_, patch) = storage.extend(kvs);
-    db.apply_patch(patch);
+    db.apply_patch(patch).unwrap();
 
     let storage = Storage::new(&db, &(), 1, true);
     let instructions = vec![TreeInstruction::Read(FIRST_KEY)];
@@ -369,7 +369,7 @@ fn read_instructions_do_not_lead_to_copied_nodes(writes_per_block: u64) {
         .map(|i| TreeEntry::new(big_endian_key(i), i + 1, H256::zero()))
         .collect();
     let (_, patch) = storage.extend(kvs);
-    database.apply_patch(patch);
+    database.apply_patch(patch).unwrap();
 
     let mut rng = StdRng::seed_from_u64(RNG_SEED);
     for _ in 0..100 {
@@ -389,7 +389,7 @@ fn read_instructions_do_not_lead_to_copied_nodes(writes_per_block: u64) {
         let storage = Storage::new(&database, &(), 1, true);
         let (_, patch) = storage.extend_with_proofs(instructions);
         assert_no_copied_nodes(&database, &patch);
-        database.apply_patch(patch);
+        database.apply_patch(patch).unwrap();
     }
 }
 
@@ -421,7 +421,7 @@ fn replaced_keys_are_correctly_tracked(writes_per_block: usize, with_proofs: boo
     let (_, patch) = storage.extend(kvs);
 
     assert!(patch.stale_keys_by_version[&0].is_empty());
-    database.apply_patch(patch);
+    database.apply_patch(patch).unwrap();
 
     let mut rng = StdRng::seed_from_u64(RNG_SEED);
     for new_version in 1..=100 {
@@ -438,7 +438,7 @@ fn replaced_keys_are_correctly_tracked(writes_per_block: usize, with_proofs: boo
             storage.extend(updates.collect()).1
         };
         assert_replaced_keys(&database, &patch);
-        database.apply_patch(patch);
+        database.apply_patch(patch).unwrap();
     }
 }
 
@@ -474,7 +474,7 @@ fn tree_handles_keys_at_terminal_level() {
         .map(|i| TreeEntry::new(Key::from(i), i + 1, ValueHash::zero()))
         .collect();
     let (_, patch) = Storage::new(&db, &(), 0, true).extend(kvs);
-    db.apply_patch(patch);
+    db.apply_patch(patch).unwrap();
 
     // Overwrite a key and check that we don't panic.
     let new_kvs = vec![TreeEntry::new(
@@ -547,7 +547,7 @@ fn recovery_with_node_hierarchy(chunk_size: usize) {
     for recovery_chunk in recovery_entries.chunks(chunk_size) {
         let patch = Storage::new(&db, &(), recovery_version, false)
             .extend_during_linear_recovery(recovery_chunk.to_vec());
-        db.apply_patch(patch);
+        db.apply_patch(patch).unwrap();
     }
     assert_eq!(db.updated_version, Some(recovery_version));
     let patch = db.patches_by_version.remove(&recovery_version).unwrap();
@@ -598,7 +598,7 @@ fn recovery_with_deep_node_hierarchy(chunk_size: usize) {
     for recovery_chunk in recovery_entries.chunks(chunk_size) {
         let patch = Storage::new(&db, &(), recovery_version, false)
             .extend_during_linear_recovery(recovery_chunk.to_vec());
-        db.apply_patch(patch);
+        db.apply_patch(patch).unwrap();
     }
     let mut patch = db.patches_by_version.remove(&recovery_version).unwrap();
     // Manually remove all stale keys from the patch
@@ -658,7 +658,7 @@ fn recovery_workflow_with_multiple_stages() {
     let patch = Storage::new(&db, &(), recovery_version, false)
         .extend_during_linear_recovery(recovery_entries.collect());
     assert_eq!(patch.root(recovery_version).unwrap().leaf_count(), 100);
-    db.apply_patch(patch);
+    db.apply_patch(patch).unwrap();
 
     let more_recovery_entries = (100_u64..200).map(|i| TreeEntry {
         key: Key::from(i),
@@ -669,7 +669,7 @@ fn recovery_workflow_with_multiple_stages() {
     let patch = Storage::new(&db, &(), recovery_version, false)
         .extend_during_linear_recovery(more_recovery_entries.collect());
     assert_eq!(patch.root(recovery_version).unwrap().leaf_count(), 200);
-    db.apply_patch(patch);
+    db.apply_patch(patch).unwrap();
 
     // Check that all entries can be accessed
     let storage = Storage::new(&db, &(), recovery_version + 1, true);
@@ -717,7 +717,7 @@ fn test_recovery_pruning_equivalence(
     let mut db = PatchSet::default();
     for (version, chunk) in entries.chunks(chunk_size).enumerate() {
         let (_, patch) = Storage::new(&db, hasher, version as u64, true).extend(chunk.to_vec());
-        db.apply_patch(patch);
+        db.apply_patch(patch).unwrap();
     }
     // Unite all remaining nodes to a map and manually remove all stale keys.
     let recovered_version = db.manifest.version_count - 1;
@@ -753,7 +753,7 @@ fn test_recovery_pruning_equivalence(
             RecoveryKind::Linear => storage.extend_during_linear_recovery(recovery_chunk.to_vec()),
             RecoveryKind::Random => storage.extend_during_random_recovery(recovery_chunk.to_vec()),
         };
-        recovered_db.apply_patch(patch);
+        recovered_db.apply_patch(patch).unwrap();
     }
     let sub_patch = recovered_db
         .patches_by_version
diff --git a/core/lib/merkle_tree/src/types/internal.rs b/core/lib/merkle_tree/src/types/internal.rs
index e8d307517363..399f6c840a3c 100644
--- a/core/lib/merkle_tree/src/types/internal.rs
+++ b/core/lib/merkle_tree/src/types/internal.rs
@@ -2,7 +2,7 @@
 //! some of these types are declared as public and can be even exported using the `unstable` module.
 //! Still, logically these types are private, so adding them to new public APIs etc. is a logical error.
 
-use std::{fmt, num::NonZeroU64};
+use std::{collections::HashMap, fmt, num::NonZeroU64};
 
 use crate::{
     hasher::{HashTree, InternalNodeCache},
@@ -25,6 +25,8 @@ pub(crate) struct TreeTags {
     pub depth: usize,
     pub hasher: String,
     pub is_recovering: bool,
+    /// Custom / user-defined tags.
+    pub custom: HashMap<String, String>,
 }
 
 impl TreeTags {
@@ -36,25 +38,28 @@ impl TreeTags {
             hasher: hasher.name().to_owned(),
             depth: TREE_DEPTH,
             is_recovering: false,
+            custom: HashMap::new(),
         }
     }
 
-    pub fn assert_consistency(&self, hasher: &dyn HashTree, expecting_recovery: bool) {
-        assert_eq!(
-            self.architecture,
-            Self::ARCHITECTURE,
+    pub fn ensure_consistency(
+        &self,
+        hasher: &dyn HashTree,
+        expecting_recovery: bool,
+    ) -> anyhow::Result<()> {
+        anyhow::ensure!(
+            self.architecture == Self::ARCHITECTURE,
             "Unsupported tree architecture `{}`, expected `{}`",
             self.architecture,
             Self::ARCHITECTURE
         );
-        assert_eq!(
-            self.depth, TREE_DEPTH,
+        anyhow::ensure!(
+            self.depth == TREE_DEPTH,
             "Unexpected tree depth: expected {TREE_DEPTH}, got {}",
             self.depth
         );
-        assert_eq!(
-            hasher.name(),
-            self.hasher,
+        anyhow::ensure!(
+            hasher.name() == self.hasher,
             "Mismatch between the provided tree hasher `{}` and the hasher `{}` used \
              in the database",
             hasher.name(),
@@ -62,16 +67,17 @@ impl TreeTags {
         );
 
         if expecting_recovery {
-            assert!(
+            anyhow::ensure!(
                 self.is_recovering,
                 "Tree is expected to be in the process of recovery, but it is not"
             );
         } else {
-            assert!(
+            anyhow::ensure!(
                 !self.is_recovering,
                 "Tree is being recovered; cannot access it until recovery finishes"
             );
         }
+        Ok(())
     }
 }
 
diff --git a/core/lib/merkle_tree/src/types/mod.rs b/core/lib/merkle_tree/src/types/mod.rs
index bd59099a3a65..807ae0238769 100644
--- a/core/lib/merkle_tree/src/types/mod.rs
+++ b/core/lib/merkle_tree/src/types/mod.rs
@@ -38,13 +38,6 @@ impl<K: Copy> TreeInstruction<K> {
             Self::Write(entry) => entry.key,
         }
     }
-
-    pub(crate) fn map_key<U>(&self, map_fn: impl FnOnce(&K) -> U) -> TreeInstruction<U> {
-        match self {
-            Self::Read(key) => TreeInstruction::Read(map_fn(key)),
-            Self::Write(entry) => TreeInstruction::Write(entry.map_key(map_fn)),
-        }
-    }
 }
 
 /// Entry in a Merkle tree associated with a key.
@@ -77,10 +70,6 @@ impl<K> TreeEntry<K> {
             leaf_index,
         }
     }
-
-    pub(crate) fn map_key<U>(&self, map_fn: impl FnOnce(&K) -> U) -> TreeEntry<U> {
-        TreeEntry::new(map_fn(&self.key), self.leaf_index, self.value)
-    }
 }
 
 impl TreeEntry {
diff --git a/core/lib/merkle_tree/tests/integration/consistency.rs b/core/lib/merkle_tree/tests/integration/consistency.rs
index 33ad521bc940..e3fba54025a8 100644
--- a/core/lib/merkle_tree/tests/integration/consistency.rs
+++ b/core/lib/merkle_tree/tests/integration/consistency.rs
@@ -22,10 +22,10 @@ fn five_thousand_angry_monkeys_vs_merkle_tree() {
 
     let dir = TempDir::new().expect("failed creating temporary dir for RocksDB");
     let mut db = RocksDBWrapper::new(dir.path()).unwrap();
-    let mut tree = MerkleTree::new(&mut db);
+    let mut tree = MerkleTree::new(&mut db).unwrap();
 
     let kvs = generate_key_value_pairs(0..100);
-    tree.extend(kvs);
+    tree.extend(kvs).unwrap();
     tree.verify_consistency(0, true).unwrap();
 
     let mut raw_db = db.into_inner();
@@ -54,6 +54,7 @@ fn five_thousand_angry_monkeys_vs_merkle_tree() {
 
         let mut db = RocksDBWrapper::from(raw_db);
         let err = MerkleTree::new(&mut db)
+            .unwrap()
             .verify_consistency(0, true)
             .unwrap_err();
         println!("{err}");
diff --git a/core/lib/merkle_tree/tests/integration/domain.rs b/core/lib/merkle_tree/tests/integration/domain.rs
index 50a4a74afdcb..85b761f7b4b8 100644
--- a/core/lib/merkle_tree/tests/integration/domain.rs
+++ b/core/lib/merkle_tree/tests/integration/domain.rs
@@ -12,7 +12,7 @@ use zksync_storage::RocksDB;
 use zksync_system_constants::ACCOUNT_CODE_STORAGE_ADDRESS;
 use zksync_types::{AccountTreeId, Address, L1BatchNumber, StorageKey, H256};
 
-fn gen_storage_logs() -> Vec<TreeInstruction<StorageKey>> {
+fn gen_storage_logs() -> Vec<TreeInstruction> {
     let addrs = vec![
         "4b3af74f66ab1f0da3f2e4ec7a3cb99baf1af7b2",
         "ef4bb7b21c5fe7432a7d63876cc59ecc23b46636",
@@ -32,7 +32,7 @@ fn gen_storage_logs() -> Vec<TreeInstruction<StorageKey>> {
         .zip(proof_values)
         .enumerate()
         .map(|(i, (proof_key, proof_value))| {
-            let entry = TreeEntry::new(proof_key, i as u64 + 1, proof_value);
+            let entry = TreeEntry::new(proof_key.hashed_key_u256(), i as u64 + 1, proof_value);
             TreeInstruction::Write(entry)
         })
         .collect()
@@ -45,10 +45,10 @@ fn basic_workflow() {
 
     let (metadata, expected_root_hash) = {
         let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-        let mut tree = ZkSyncTree::new_lightweight(db.into());
-        let metadata = tree.process_l1_batch(&logs);
-        tree.save();
-        tree.verify_consistency(L1BatchNumber(0));
+        let mut tree = ZkSyncTree::new_lightweight(db.into()).unwrap();
+        let metadata = tree.process_l1_batch(&logs).unwrap();
+        tree.save().unwrap();
+        tree.verify_consistency(L1BatchNumber(0)).unwrap();
         (metadata, tree.root_hash())
     };
 
@@ -64,8 +64,8 @@ fn basic_workflow() {
     );
 
     let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-    let tree = ZkSyncTree::new_lightweight(db.into());
-    tree.verify_consistency(L1BatchNumber(0));
+    let tree = ZkSyncTree::new_lightweight(db.into()).unwrap();
+    tree.verify_consistency(L1BatchNumber(0)).unwrap();
     assert_eq!(tree.root_hash(), expected_root_hash);
     assert_eq!(tree.next_l1_batch_number(), L1BatchNumber(1));
 }
@@ -78,12 +78,12 @@ fn basic_workflow_multiblock() {
 
     let expected_root_hash = {
         let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-        let mut tree = ZkSyncTree::new_lightweight(db.into());
+        let mut tree = ZkSyncTree::new_lightweight(db.into()).unwrap();
         tree.use_dedicated_thread_pool(2);
         for block in blocks {
-            tree.process_l1_batch(block);
+            tree.process_l1_batch(block).unwrap();
         }
-        tree.save();
+        tree.save().unwrap();
         tree.root_hash()
     };
 
@@ -96,7 +96,7 @@ fn basic_workflow_multiblock() {
     );
 
     let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-    let tree = ZkSyncTree::new_lightweight(db.into());
+    let tree = ZkSyncTree::new_lightweight(db.into()).unwrap();
     assert_eq!(tree.root_hash(), expected_root_hash);
     assert_eq!(tree.next_l1_batch_number(), L1BatchNumber(12));
 }
@@ -107,17 +107,17 @@ fn tree_with_single_leaf_works_correctly() {
     let storage_logs = gen_storage_logs();
     let db = RocksDB::new(temp_dir.as_ref()).unwrap();
     {
-        let mut tree = ZkSyncTree::new(db.clone().into());
-        tree.process_l1_batch(&storage_logs[0..1]);
-        tree.save();
+        let mut tree = ZkSyncTree::new(db.clone().into()).unwrap();
+        tree.process_l1_batch(&storage_logs[0..1]).unwrap();
+        tree.save().unwrap();
     }
-    let mut tree = ZkSyncTree::new(db.into());
-    tree.verify_consistency(L1BatchNumber(0));
+    let mut tree = ZkSyncTree::new(db.into()).unwrap();
+    tree.verify_consistency(L1BatchNumber(0)).unwrap();
 
     // Add more logs to the tree.
     for single_log_slice in storage_logs[1..].chunks(1) {
-        tree.process_l1_batch(single_log_slice);
-        tree.save();
+        tree.process_l1_batch(single_log_slice).unwrap();
+        tree.save().unwrap();
     }
     assert_eq!(
         tree.root_hash(),
@@ -132,13 +132,13 @@ fn tree_with_single_leaf_works_correctly() {
 fn filtering_out_no_op_writes() {
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
     let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-    let mut tree = ZkSyncTree::new(db.into());
+    let mut tree = ZkSyncTree::new(db.into()).unwrap();
     let mut logs = gen_storage_logs();
-    let root_hash = tree.process_l1_batch(&logs).root_hash;
-    tree.save();
+    let root_hash = tree.process_l1_batch(&logs).unwrap().root_hash;
+    tree.save().unwrap();
 
     // All writes are no-op updates and thus must be filtered out.
-    let new_metadata = tree.process_l1_batch(&logs);
+    let new_metadata = tree.process_l1_batch(&logs).unwrap();
     assert_eq!(new_metadata.root_hash, root_hash);
     let merkle_paths = new_metadata.witness.unwrap().into_merkle_paths();
     assert_eq!(merkle_paths.len(), 0);
@@ -152,7 +152,7 @@ fn filtering_out_no_op_writes() {
         entry.value = H256::repeat_byte(0xff);
         expected_writes_count += 1;
     }
-    let new_metadata = tree.process_l1_batch(&logs);
+    let new_metadata = tree.process_l1_batch(&logs).unwrap();
     assert_ne!(new_metadata.root_hash, root_hash);
     let merkle_paths = new_metadata.witness.unwrap().into_merkle_paths();
     assert_eq!(merkle_paths.len(), expected_writes_count);
@@ -171,11 +171,12 @@ fn revert_blocks() {
     // Produce 4 blocks with distinct values and 1 block with modified values from first block
     let block_size: usize = 25;
     let address: Address = "4b3af74f66ab1f0da3f2e4ec7a3cb99baf1af7b2".parse().unwrap();
-    let proof_keys = (0..100)
-        .map(move |i| StorageKey::new(AccountTreeId::new(address), H256::from_low_u64_be(i)));
+    let proof_keys = (0..100).map(move |i| {
+        StorageKey::new(AccountTreeId::new(address), H256::from_low_u64_be(i)).hashed_key_u256()
+    });
     let proof_values = (0..100).map(H256::from_low_u64_be);
 
-    // Add couple of blocks of distinct keys/values
+    // Add a couple of blocks of distinct keys/values
     let mut logs: Vec<_> = proof_keys
         .zip(proof_values)
         .map(|(proof_key, proof_value)| {
@@ -185,7 +186,8 @@ fn revert_blocks() {
         .collect();
     // Add a block with repeated keys
     let extra_logs = (0..block_size).map(move |i| {
-        let key = StorageKey::new(AccountTreeId::new(address), H256::from_low_u64_be(i as u64));
+        let key = StorageKey::new(AccountTreeId::new(address), H256::from_low_u64_be(i as u64))
+            .hashed_key_u256();
         let entry = TreeEntry::new(key, i as u64 + 1, H256::from_low_u64_be(i as u64 + 1));
         TreeInstruction::Write(entry)
     });
@@ -193,10 +195,10 @@ fn revert_blocks() {
 
     let mirror_logs = logs.clone();
     let tree_metadata: Vec<_> = {
-        let mut tree = ZkSyncTree::new(storage.into());
+        let mut tree = ZkSyncTree::new(storage.into()).unwrap();
         let metadata = logs.chunks(block_size).map(|chunk| {
-            let metadata = tree.process_l1_batch(chunk);
-            tree.save();
+            let metadata = tree.process_l1_batch(chunk).unwrap();
+            tree.save().unwrap();
             metadata
         });
         metadata.collect()
@@ -228,43 +230,43 @@ fn revert_blocks() {
     // Revert the last block.
     let storage = RocksDB::new(temp_dir.as_ref()).unwrap();
     {
-        let mut tree = ZkSyncTree::new_lightweight(storage.into());
+        let mut tree = ZkSyncTree::new_lightweight(storage.into()).unwrap();
         assert_eq!(tree.root_hash(), tree_metadata.last().unwrap().root_hash);
-        tree.roll_back_logs(L1BatchNumber(3));
+        tree.roll_back_logs(L1BatchNumber(3)).unwrap();
         assert_eq!(tree.root_hash(), tree_metadata[3].root_hash);
-        tree.save();
+        tree.save().unwrap();
     }
 
     // Revert two more blocks.
     let storage = RocksDB::new(temp_dir.as_ref()).unwrap();
     {
-        let mut tree = ZkSyncTree::new_lightweight(storage.into());
-        tree.roll_back_logs(L1BatchNumber(1));
+        let mut tree = ZkSyncTree::new_lightweight(storage.into()).unwrap();
+        tree.roll_back_logs(L1BatchNumber(1)).unwrap();
         assert_eq!(tree.root_hash(), tree_metadata[1].root_hash);
-        tree.save();
+        tree.save().unwrap();
     }
 
     // Revert two more blocks second time; the result should be the same
     let storage = RocksDB::new(temp_dir.as_ref()).unwrap();
     {
-        let mut tree = ZkSyncTree::new_lightweight(storage.into());
-        tree.roll_back_logs(L1BatchNumber(1));
+        let mut tree = ZkSyncTree::new_lightweight(storage.into()).unwrap();
+        tree.roll_back_logs(L1BatchNumber(1)).unwrap();
         assert_eq!(tree.root_hash(), tree_metadata[1].root_hash);
-        tree.save();
+        tree.save().unwrap();
     }
 
     // Reapply one of the reverted logs
     let storage = RocksDB::new(temp_dir.as_ref()).unwrap();
     {
         let storage_log = mirror_logs.get(3 * block_size).unwrap();
-        let mut tree = ZkSyncTree::new_lightweight(storage.into());
-        tree.process_l1_batch(slice::from_ref(storage_log));
-        tree.save();
+        let mut tree = ZkSyncTree::new_lightweight(storage.into()).unwrap();
+        tree.process_l1_batch(slice::from_ref(storage_log)).unwrap();
+        tree.save().unwrap();
     }
 
     // check saved block number
     let storage = RocksDB::new(temp_dir.as_ref()).unwrap();
-    let tree = ZkSyncTree::new_lightweight(storage.into());
+    let tree = ZkSyncTree::new_lightweight(storage.into()).unwrap();
     assert_eq!(tree.next_l1_batch_number(), L1BatchNumber(3));
 }
 
@@ -273,16 +275,16 @@ fn reset_tree() {
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
     let storage = RocksDB::new(temp_dir.as_ref()).unwrap();
     let logs = gen_storage_logs();
-    let mut tree = ZkSyncTree::new_lightweight(storage.into());
+    let mut tree = ZkSyncTree::new_lightweight(storage.into()).unwrap();
     let empty_root_hash = tree.root_hash();
 
     logs.chunks(5).fold(empty_root_hash, |hash, chunk| {
-        tree.process_l1_batch(chunk);
+        tree.process_l1_batch(chunk).unwrap();
         tree.reset();
         assert_eq!(tree.root_hash(), hash);
 
-        tree.process_l1_batch(chunk);
-        tree.save();
+        tree.process_l1_batch(chunk).unwrap();
+        tree.save().unwrap();
         tree.root_hash()
     });
 }
@@ -295,19 +297,19 @@ fn read_logs() {
 
     let write_metadata = {
         let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-        let mut tree = ZkSyncTree::new_lightweight(db.into());
-        let metadata = tree.process_l1_batch(&logs);
-        tree.save();
+        let mut tree = ZkSyncTree::new_lightweight(db.into()).unwrap();
+        let metadata = tree.process_l1_batch(&logs).unwrap();
+        tree.save().unwrap();
         metadata
     };
 
     let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-    let mut tree = ZkSyncTree::new_lightweight(db.into());
+    let mut tree = ZkSyncTree::new_lightweight(db.into()).unwrap();
     let read_logs: Vec<_> = logs
         .into_iter()
         .map(|instr| TreeInstruction::Read(instr.key()))
         .collect();
-    let read_metadata = tree.process_l1_batch(&read_logs);
+    let read_metadata = tree.process_l1_batch(&read_logs).unwrap();
 
     assert_eq!(read_metadata.root_hash, write_metadata.root_hash);
 }
@@ -317,9 +319,13 @@ fn create_write_log(
     address: Address,
     address_storage_key: [u8; 32],
     value: [u8; 32],
-) -> TreeInstruction<StorageKey> {
+) -> TreeInstruction {
     let key = StorageKey::new(AccountTreeId::new(address), H256(address_storage_key));
-    TreeInstruction::Write(TreeEntry::new(key, leaf_index, H256(value)))
+    TreeInstruction::Write(TreeEntry::new(
+        key.hashed_key_u256(),
+        leaf_index,
+        H256(value),
+    ))
 }
 
 fn subtract_from_max_value(diff: u8) -> [u8; 32] {
@@ -332,7 +338,7 @@ fn subtract_from_max_value(diff: u8) -> [u8; 32] {
 fn root_hash_compatibility() {
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
     let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-    let mut tree = ZkSyncTree::new_lightweight(db.into());
+    let mut tree = ZkSyncTree::new_lightweight(db.into()).unwrap();
     assert_eq!(
         tree.root_hash(),
         H256([
@@ -375,7 +381,7 @@ fn root_hash_compatibility() {
         ),
     ];
 
-    let metadata = tree.process_l1_batch(&storage_logs);
+    let metadata = tree.process_l1_batch(&storage_logs).unwrap();
     assert_eq!(
         metadata.root_hash,
         H256([
@@ -389,13 +395,13 @@ fn root_hash_compatibility() {
 fn process_block_idempotency_check() {
     let temp_dir = TempDir::new().expect("failed to get temporary directory for RocksDB");
     let rocks_db = RocksDB::new(temp_dir.as_ref()).unwrap();
-    let mut tree = ZkSyncTree::new_lightweight(rocks_db.into());
+    let mut tree = ZkSyncTree::new_lightweight(rocks_db.into()).unwrap();
     let logs = gen_storage_logs();
-    let tree_metadata = tree.process_l1_batch(&logs);
+    let tree_metadata = tree.process_l1_batch(&logs).unwrap();
 
     // Simulate server restart by calling `process_block` again on the same tree
     tree.reset();
-    let repeated_tree_metadata = tree.process_l1_batch(&logs);
+    let repeated_tree_metadata = tree.process_l1_batch(&logs).unwrap();
     assert_eq!(repeated_tree_metadata.root_hash, tree_metadata.root_hash);
     assert_eq!(
         repeated_tree_metadata.rollup_last_leaf_index,
@@ -448,8 +454,8 @@ fn witness_workflow() {
     let (first_chunk, _) = logs.split_at(logs.len() / 2);
 
     let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-    let mut tree = ZkSyncTree::new(db.into());
-    let metadata = tree.process_l1_batch(first_chunk);
+    let mut tree = ZkSyncTree::new(db.into()).unwrap();
+    let metadata = tree.process_l1_batch(first_chunk).unwrap();
     let job = metadata.witness.unwrap();
     assert_eq!(job.next_enumeration_index(), 1);
     let merkle_paths: Vec<_> = job.into_merkle_paths().collect();
@@ -478,13 +484,13 @@ fn witnesses_with_multiple_blocks() {
     let logs = gen_storage_logs();
 
     let db = RocksDB::new(temp_dir.as_ref()).unwrap();
-    let mut tree = ZkSyncTree::new(db.into());
+    let mut tree = ZkSyncTree::new(db.into()).unwrap();
     let empty_tree_hashes: Vec<_> = (0..256)
         .map(|i| Blake2Hasher.empty_subtree_hash(i))
         .collect();
 
     let non_empty_levels_by_block = logs.chunks(10).map(|block| {
-        let metadata = tree.process_l1_batch(block);
+        let metadata = tree.process_l1_batch(block).unwrap();
         let witness = metadata.witness.unwrap();
 
         let non_empty_levels = witness.into_merkle_paths().map(|log| {
diff --git a/core/lib/merkle_tree/tests/integration/merkle_tree.rs b/core/lib/merkle_tree/tests/integration/merkle_tree.rs
index 823f5be21303..a83b982cc497 100644
--- a/core/lib/merkle_tree/tests/integration/merkle_tree.rs
+++ b/core/lib/merkle_tree/tests/integration/merkle_tree.rs
@@ -34,10 +34,10 @@ const KV_COUNTS: [u64; 8] = [1, 2, 3, 5, 8, 13, 21, 100];
 
 #[test_casing(8, KV_COUNTS)]
 fn root_hash_is_computed_correctly_on_empty_tree(kv_count: u64) {
-    let mut tree = MerkleTree::new(PatchSet::default());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
     let kvs = generate_key_value_pairs(0..kv_count);
     let expected_hash = compute_tree_hash(kvs.iter().copied());
-    let output = tree.extend(kvs);
+    let output = tree.extend(kvs).unwrap();
     assert_eq!(output.root_hash, expected_hash);
 }
 
@@ -47,11 +47,11 @@ fn output_proofs_are_computed_correctly_on_empty_tree(kv_count: u64) {
 
     let mut rng = StdRng::seed_from_u64(RNG_SEED);
     let empty_tree_hash = Blake2Hasher.empty_subtree_hash(256);
-    let mut tree = MerkleTree::new(PatchSet::default());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
     let kvs = generate_key_value_pairs(0..kv_count);
     let expected_hash = compute_tree_hash(kvs.iter().copied());
     let instructions = convert_to_writes(&kvs);
-    let output = tree.extend_with_proofs(instructions.clone());
+    let output = tree.extend_with_proofs(instructions.clone()).unwrap();
 
     assert_eq!(output.root_hash(), Some(expected_hash));
     assert_eq!(output.logs.len(), instructions.len());
@@ -65,7 +65,7 @@ fn output_proofs_are_computed_correctly_on_empty_tree(kv_count: u64) {
         .map(|instr| TreeInstruction::Read(instr.key()));
     let mut reads: Vec<_> = reads.collect();
     reads.shuffle(&mut rng);
-    let output = tree.extend_with_proofs(reads.clone());
+    let output = tree.extend_with_proofs(reads.clone()).unwrap();
     output
         .verify_proofs(&Blake2Hasher, root_hash, &reads)
         .unwrap();
@@ -77,16 +77,16 @@ fn entry_proofs_are_computed_correctly_on_empty_tree(kv_count: u64) {
     const RNG_SEED: u64 = 123;
 
     let mut rng = StdRng::seed_from_u64(RNG_SEED);
-    let mut tree = MerkleTree::new(PatchSet::default());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
     let kvs = generate_key_value_pairs(0..kv_count);
     let expected_hash = compute_tree_hash(kvs.iter().copied());
-    tree.extend(kvs.clone());
+    tree.extend(kvs.clone()).unwrap();
 
     let existing_keys: Vec<_> = kvs.iter().map(|entry| entry.key).collect();
     let entries = tree.entries_with_proofs(0, &existing_keys).unwrap();
     assert_eq!(entries.len(), existing_keys.len());
     for (input_entry, entry) in kvs.iter().zip(entries) {
-        entry.verify(&Blake2Hasher, expected_hash);
+        entry.verify(&Blake2Hasher, expected_hash).unwrap();
         assert_eq!(entry.base, *input_entry);
     }
 
@@ -110,7 +110,7 @@ fn entry_proofs_are_computed_correctly_on_empty_tree(kv_count: u64) {
     for (key, entry) in missing_keys.iter().zip(entries) {
         assert!(entry.base.is_empty());
         assert_eq!(entry.base.key, *key);
-        entry.verify(&Blake2Hasher, expected_hash);
+        entry.verify(&Blake2Hasher, expected_hash).unwrap();
     }
 }
 
@@ -119,9 +119,9 @@ fn proofs_are_computed_correctly_for_mixed_instructions() {
     const RNG_SEED: u64 = 123;
 
     let mut rng = StdRng::seed_from_u64(RNG_SEED);
-    let mut tree = MerkleTree::new(PatchSet::default());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
     let kvs = generate_key_value_pairs(0..20);
-    let output = tree.extend(kvs.clone());
+    let output = tree.extend(kvs.clone()).unwrap();
     let old_root_hash = output.root_hash;
 
     let reads = kvs.iter().map(|entry| TreeInstruction::Read(entry.key));
@@ -135,7 +135,7 @@ fn proofs_are_computed_correctly_for_mixed_instructions() {
     instructions.extend(convert_to_writes(&writes));
     instructions.shuffle(&mut rng);
 
-    let output = tree.extend_with_proofs(instructions.clone());
+    let output = tree.extend_with_proofs(instructions.clone()).unwrap();
     // Check that there are some read ops recorded.
     assert!(output
         .logs
@@ -161,8 +161,8 @@ fn proofs_are_computed_correctly_for_missing_keys() {
     instructions.extend(missing_reads);
     instructions.shuffle(&mut rng);
 
-    let mut tree = MerkleTree::new(PatchSet::default());
-    let output = tree.extend_with_proofs(instructions.clone());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
+    let output = tree.extend_with_proofs(instructions.clone()).unwrap();
     let read_misses = output
         .logs
         .iter()
@@ -177,9 +177,9 @@ fn proofs_are_computed_correctly_for_missing_keys() {
 fn test_intermediate_commits(db: &mut impl Database, chunk_size: usize) {
     let (kvs, expected_hash) = &*ENTRIES_AND_HASH;
     let mut final_hash = H256::zero();
-    let mut tree = MerkleTree::new(db);
+    let mut tree = MerkleTree::new(db).unwrap();
     for chunk in kvs.chunks(chunk_size) {
-        let output = tree.extend(chunk.to_vec());
+        let output = tree.extend(chunk.to_vec()).unwrap();
         final_hash = output.root_hash;
     }
     assert_eq!(final_hash, *expected_hash);
@@ -199,11 +199,11 @@ fn root_hash_is_computed_correctly_with_intermediate_commits(chunk_size: usize)
 fn output_proofs_are_computed_correctly_with_intermediate_commits(chunk_size: usize) {
     let (kvs, expected_hash) = &*ENTRIES_AND_HASH;
 
-    let mut tree = MerkleTree::new(PatchSet::default());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
     let mut root_hash = Blake2Hasher.empty_subtree_hash(256);
     for chunk in kvs.chunks(chunk_size) {
         let instructions = convert_to_writes(chunk);
-        let output = tree.extend_with_proofs(instructions.clone());
+        let output = tree.extend_with_proofs(instructions.clone()).unwrap();
         output
             .verify_proofs(&Blake2Hasher, root_hash, &instructions)
             .unwrap();
@@ -216,10 +216,10 @@ fn output_proofs_are_computed_correctly_with_intermediate_commits(chunk_size: us
 fn entry_proofs_are_computed_correctly_with_intermediate_commits(chunk_size: usize) {
     let (kvs, _) = &*ENTRIES_AND_HASH;
     let all_keys: Vec<_> = kvs.iter().map(|entry| entry.key).collect();
-    let mut tree = MerkleTree::new(PatchSet::default());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
     let mut root_hashes = vec![];
     for chunk in kvs.chunks(chunk_size) {
-        let output = tree.extend(chunk.to_vec());
+        let output = tree.extend(chunk.to_vec()).unwrap();
         root_hashes.push(output.root_hash);
 
         let version = root_hashes.len() - 1;
@@ -228,7 +228,7 @@ fn entry_proofs_are_computed_correctly_with_intermediate_commits(chunk_size: usi
         for (i, (key, entry)) in all_keys.iter().zip(entries).enumerate() {
             assert_eq!(entry.base.key, *key);
             assert_eq!(entry.base.is_empty(), i >= (version + 1) * chunk_size);
-            entry.verify(&Blake2Hasher, output.root_hash);
+            entry.verify(&Blake2Hasher, output.root_hash).unwrap();
         }
     }
 
@@ -239,7 +239,7 @@ fn entry_proofs_are_computed_correctly_with_intermediate_commits(chunk_size: usi
         for (i, (key, entry)) in all_keys.iter().zip(entries).enumerate() {
             assert_eq!(entry.base.key, *key);
             assert_eq!(entry.base.is_empty(), i >= (version + 1) * chunk_size);
-            entry.verify(&Blake2Hasher, root_hash);
+            entry.verify(&Blake2Hasher, root_hash).unwrap();
         }
     }
 }
@@ -249,15 +249,15 @@ fn test_accumulated_commits<DB: Database>(db: DB, chunk_size: usize) -> DB {
     let mut db = Patched::new(db);
     let mut final_hash = H256::zero();
     for chunk in kvs.chunks(chunk_size) {
-        let mut tree = MerkleTree::new(&mut db);
-        let output = tree.extend(chunk.to_vec());
+        let mut tree = MerkleTree::new(&mut db).unwrap();
+        let output = tree.extend(chunk.to_vec()).unwrap();
         final_hash = output.root_hash;
     }
     assert_eq!(final_hash, *expected_hash);
 
-    db.flush();
+    db.flush().unwrap();
     let mut db = db.into_inner();
-    let tree = MerkleTree::new(&mut db);
+    let tree = MerkleTree::new(&mut db).unwrap();
     let latest_version = tree.latest_version().unwrap();
     for version in 0..=latest_version {
         tree.verify_consistency(version, true).unwrap();
@@ -279,26 +279,26 @@ fn test_root_hash_computing_with_reverts(db: &mut impl Database) {
         .collect();
     let key_inserts = generate_key_value_pairs(100..200);
 
-    let mut tree = MerkleTree::new(db);
-    let initial_output = tree.extend(initial_update.to_vec());
+    let mut tree = MerkleTree::new(db).unwrap();
+    let initial_output = tree.extend(initial_update.to_vec()).unwrap();
 
     // Try rolling back one block at a time.
     let reverted_updates = key_updates.chunks(25).chain(key_inserts.chunks(25));
     for reverted_update in reverted_updates {
-        let reverted_output = tree.extend(reverted_update.to_vec());
+        let reverted_output = tree.extend(reverted_update.to_vec()).unwrap();
         assert_ne!(reverted_output, initial_output);
 
-        tree.truncate_recent_versions(1);
+        tree.truncate_recent_versions(1).unwrap();
         assert_eq!(tree.latest_version(), Some(0));
         assert_eq!(tree.root_hash(0), Some(initial_output.root_hash));
 
-        let final_output = tree.extend(final_update.to_vec());
+        let final_output = tree.extend(final_update.to_vec()).unwrap();
         assert_eq!(final_output.root_hash, *expected_hash);
         assert_eq!(tree.latest_version(), Some(1));
         assert_eq!(tree.root_hash(0), Some(initial_output.root_hash));
         assert_eq!(tree.root_hash(1), Some(final_output.root_hash));
 
-        tree.truncate_recent_versions(1);
+        tree.truncate_recent_versions(1).unwrap();
     }
 }
 
@@ -313,9 +313,9 @@ fn test_root_hash_computing_with_key_updates(db: impl Database) {
     // ^ Scaling factor for probabilities (to avoid floating-point conversions)
 
     let mut kvs = generate_key_value_pairs(0..50);
-    let mut tree = MerkleTree::new(db);
+    let mut tree = MerkleTree::new(db).unwrap();
     let expected_hash = compute_tree_hash(kvs.iter().copied());
-    let output = tree.extend(kvs.clone());
+    let output = tree.extend(kvs.clone()).unwrap();
     assert_eq!(output.root_hash, expected_hash);
 
     // Overwrite some `kvs` entries and add some new ones.
@@ -338,20 +338,20 @@ fn test_root_hash_computing_with_key_updates(db: impl Database) {
     let mut update = Vec::with_capacity(changed_kvs.len() + new_kvs.len());
     update.extend_from_slice(&changed_kvs);
     update.extend_from_slice(&new_kvs);
-    let output = tree.extend(update.clone());
+    let output = tree.extend(update.clone()).unwrap();
     assert_eq!(output.root_hash, expected_hash);
 
     // All changed KVs (randomly shuffled), then all new KVs.
     let mut rng = StdRng::seed_from_u64(RNG_SEED);
     update[..changed_kvs.len()].shuffle(&mut rng);
-    let output = tree.extend(update);
+    let output = tree.extend(update).unwrap();
     assert_eq!(output.root_hash, expected_hash);
 
     // All new KVs, then all changed KVs.
     let mut update = Vec::with_capacity(changed_kvs.len() + new_kvs.len());
     update.extend_from_slice(&new_kvs);
     update.extend_from_slice(&changed_kvs);
-    let output = tree.extend(update);
+    let output = tree.extend(update).unwrap();
     assert_eq!(output.root_hash, expected_hash);
 
     // New KVs and changed KVs randomly spliced.
@@ -369,7 +369,7 @@ fn test_root_hash_computing_with_key_updates(db: impl Database) {
     }
     update.extend(changed_kvs.chain(new_kvs));
 
-    let output = tree.extend(update);
+    let output = tree.extend(update).unwrap();
     assert_eq!(output.root_hash, expected_hash);
 }
 
@@ -397,15 +397,15 @@ fn proofs_are_computed_correctly_with_key_updates(updated_keys: usize) {
         instructions.insert(idx, updated_kv);
     }
 
-    let mut tree = MerkleTree::new(PatchSet::default());
-    let output = tree.extend_with_proofs(old_instructions.clone());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
+    let output = tree.extend_with_proofs(old_instructions.clone()).unwrap();
     let empty_tree_hash = Blake2Hasher.empty_subtree_hash(256);
     output
         .verify_proofs(&Blake2Hasher, empty_tree_hash, &old_instructions)
         .unwrap();
 
     let root_hash = output.root_hash().unwrap();
-    let output = tree.extend_with_proofs(instructions.clone());
+    let output = tree.extend_with_proofs(instructions.clone()).unwrap();
     assert_eq!(output.root_hash(), Some(*expected_hash));
     output
         .verify_proofs(&Blake2Hasher, root_hash, &instructions)
@@ -415,7 +415,7 @@ fn proofs_are_computed_correctly_with_key_updates(updated_keys: usize) {
     let proofs = tree.entries_with_proofs(1, &keys).unwrap();
     for (entry, proof) in kvs.iter().zip(proofs) {
         assert_eq!(proof.base, *entry);
-        proof.verify(&Blake2Hasher, *expected_hash);
+        proof.verify(&Blake2Hasher, *expected_hash).unwrap();
     }
 }
 
@@ -451,9 +451,9 @@ fn test_root_hash_equals_to_previous_implementation(db: &mut impl Database) {
     let expected_hash = compute_tree_hash(kvs.iter().copied());
     assert_eq!(expected_hash, PREV_IMPL_HASH);
 
-    let mut tree = MerkleTree::new(db);
+    let mut tree = MerkleTree::new(db).unwrap();
     assert!(tree.latest_version().is_none());
-    let output = tree.extend(kvs);
+    let output = tree.extend(kvs).unwrap();
     assert_eq!(output.root_hash, PREV_IMPL_HASH);
     assert_eq!(tree.latest_version(), Some(0));
     assert_eq!(tree.root_hash(0), Some(PREV_IMPL_HASH));
@@ -469,8 +469,8 @@ fn range_proofs_with_multiple_existing_items(range_size: usize) {
     let (kvs, expected_hash) = &*ENTRIES_AND_HASH;
     assert!(range_size >= 2 && range_size <= kvs.len());
 
-    let mut tree = MerkleTree::new(PatchSet::default());
-    tree.extend(kvs.clone());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
+    tree.extend(kvs.clone()).unwrap();
 
     let mut sorted_keys: Vec<_> = kvs.iter().map(|entry| entry.key).collect();
     sorted_keys.sort_unstable();
@@ -509,8 +509,8 @@ fn range_proofs_with_random_ranges() {
 
     let mut rng = StdRng::seed_from_u64(RNG_SEED);
     let (kvs, expected_hash) = &*ENTRIES_AND_HASH;
-    let mut tree = MerkleTree::new(PatchSet::default());
-    tree.extend(kvs.clone());
+    let mut tree = MerkleTree::new(PatchSet::default()).unwrap();
+    tree.extend(kvs.clone()).unwrap();
 
     for _ in 0..ITER_COUNT {
         let mut start_key = U256([rng.gen(), rng.gen(), rng.gen(), rng.gen()]);
@@ -623,7 +623,9 @@ mod rocksdb {
         let Harness { mut db, dir: _dir } = Harness::new();
         test_intermediate_commits(&mut db, chunk_size);
         let (mut pruner, _handle) = MerkleTreePruner::new(&mut db);
-        pruner.prune_up_to(pruner.last_prunable_version().unwrap());
+        pruner
+            .prune_up_to(pruner.last_prunable_version().unwrap())
+            .unwrap();
 
         let raw_db = db.into_inner();
         let snapshot_name = format!("db-snapshot-{chunk_size}-chunked-commits-pruned");
@@ -637,9 +639,9 @@ mod rocksdb {
         let Harness { mut db, dir: _dir } = Harness::new();
         test_root_hash_computing_with_reverts(&mut db);
 
-        let mut tree = MerkleTree::new(&mut db);
+        let mut tree = MerkleTree::new(&mut db).unwrap();
         assert_eq!(tree.latest_version(), Some(0));
-        tree.extend(vec![]);
+        tree.extend(vec![]).unwrap();
 
         // Check that reverted data is not present in the database.
         let raw_db = db.into_inner();
@@ -658,24 +660,34 @@ mod rocksdb {
     }
 
     #[test]
-    #[should_panic(expected = "Mismatch between the provided tree hasher `no_op256`")]
     fn tree_tags_mismatch() {
         let Harness { mut db, dir: _dir } = Harness::new();
-        let mut tree = MerkleTree::new(&mut db);
-        tree.extend(vec![TreeEntry::new(U256::zero(), 1, H256::zero())]);
+        let mut tree = MerkleTree::new(&mut db).unwrap();
+        tree.extend(vec![TreeEntry::new(U256::zero(), 1, H256::zero())])
+            .unwrap();
 
-        MerkleTree::with_hasher(&mut db, ());
+        let err = MerkleTree::with_hasher(&mut db, ())
+            .unwrap_err()
+            .to_string();
+        assert!(
+            err.contains("Mismatch between the provided tree hasher `no_op256`"),
+            "{err}"
+        );
     }
 
     #[test]
-    #[should_panic(expected = "Mismatch between the provided tree hasher `no_op256`")]
     fn tree_tags_mismatch_with_cold_restart() {
         let Harness { db, dir } = Harness::new();
-        let mut tree = MerkleTree::new(db);
-        tree.extend(vec![TreeEntry::new(U256::zero(), 1, H256::zero())]);
+        let mut tree = MerkleTree::new(db).unwrap();
+        tree.extend(vec![TreeEntry::new(U256::zero(), 1, H256::zero())])
+            .unwrap();
         drop(tree);
 
         let db = RocksDBWrapper::new(dir.path()).unwrap();
-        MerkleTree::with_hasher(db, ());
+        let err = MerkleTree::with_hasher(db, ()).unwrap_err().to_string();
+        assert!(
+            err.contains("Mismatch between the provided tree hasher `no_op256`"),
+            "{err}"
+        );
     }
 }
diff --git a/core/lib/merkle_tree/tests/integration/recovery.rs b/core/lib/merkle_tree/tests/integration/recovery.rs
index c94d4b085573..0bed36185d7c 100644
--- a/core/lib/merkle_tree/tests/integration/recovery.rs
+++ b/core/lib/merkle_tree/tests/integration/recovery.rs
@@ -27,13 +27,13 @@ fn recovery_basics() {
     let greatest_key = recovery_entries[99].key;
 
     let recovered_version = 123;
-    let mut recovery = MerkleTreeRecovery::new(PatchSet::default(), recovered_version);
-    recovery.extend_linear(recovery_entries);
+    let mut recovery = MerkleTreeRecovery::new(PatchSet::default(), recovered_version).unwrap();
+    recovery.extend_linear(recovery_entries).unwrap();
 
     assert_eq!(recovery.last_processed_key(), Some(greatest_key));
     assert_eq!(recovery.root_hash(), *expected_hash);
 
-    let tree = MerkleTree::new(recovery.finalize());
+    let tree = MerkleTree::new(recovery.finalize().unwrap()).unwrap();
     tree.verify_consistency(recovered_version, true).unwrap();
 }
 
@@ -50,14 +50,14 @@ fn test_recovery_in_chunks(mut db: impl PruneDatabase, kind: RecoveryKind, chunk
         .unwrap();
 
     let recovered_version = 123;
-    let mut recovery = MerkleTreeRecovery::new(&mut db, recovered_version);
+    let mut recovery = MerkleTreeRecovery::new(&mut db, recovered_version).unwrap();
     for (i, chunk) in recovery_entries.chunks(chunk_size).enumerate() {
         match kind {
-            RecoveryKind::Linear => recovery.extend_linear(chunk.to_vec()),
-            RecoveryKind::Random => recovery.extend_random(chunk.to_vec()),
+            RecoveryKind::Linear => recovery.extend_linear(chunk.to_vec()).unwrap(),
+            RecoveryKind::Random => recovery.extend_random(chunk.to_vec()).unwrap(),
         }
         if i % 3 == 1 {
-            recovery = MerkleTreeRecovery::new(&mut db, recovered_version);
+            recovery = MerkleTreeRecovery::new(&mut db, recovered_version).unwrap();
             // ^ Simulate recovery interruption and restart
         }
     }
@@ -65,7 +65,7 @@ fn test_recovery_in_chunks(mut db: impl PruneDatabase, kind: RecoveryKind, chunk
     assert_eq!(recovery.last_processed_key(), Some(greatest_key));
     assert_eq!(recovery.root_hash(), *expected_hash);
 
-    let mut tree = MerkleTree::new(recovery.finalize());
+    let mut tree = MerkleTree::new(recovery.finalize().unwrap()).unwrap();
     tree.verify_consistency(recovered_version, true).unwrap();
     // Check that new tree versions can be built and function as expected.
     test_tree_after_recovery(&mut tree, recovered_version, *expected_hash);
@@ -101,11 +101,11 @@ fn test_tree_after_recovery<DB: Database>(
         tree_map.extend(chunk);
 
         let new_root_hash = if i % 2 == 0 {
-            let output = tree.extend(chunk.to_vec());
+            let output = tree.extend(chunk.to_vec()).unwrap();
             output.root_hash
         } else {
             let instructions = convert_to_writes(chunk);
-            let output = tree.extend_with_proofs(instructions.clone());
+            let output = tree.extend_with_proofs(instructions.clone()).unwrap();
             output
                 .verify_proofs(&Blake2Hasher, prev_root_hash, &instructions)
                 .unwrap();
@@ -119,6 +119,39 @@ fn test_tree_after_recovery<DB: Database>(
     }
 }
 
+fn test_parallel_recovery_in_chunks<DB>(db: DB, kind: RecoveryKind, chunk_size: usize)
+where
+    DB: PruneDatabase + Clone + 'static,
+{
+    let (kvs, expected_hash) = &*ENTRIES_AND_HASH;
+    let mut recovery_entries = kvs.clone();
+    if matches!(kind, RecoveryKind::Linear) {
+        recovery_entries.sort_unstable_by_key(|entry| entry.key);
+    }
+
+    let recovered_version = 123;
+    let mut recovery = MerkleTreeRecovery::new(db.clone(), recovered_version).unwrap();
+    recovery.parallelize_persistence(4).unwrap();
+    for (i, chunk) in recovery_entries.chunks(chunk_size).enumerate() {
+        match kind {
+            RecoveryKind::Linear => recovery.extend_linear(chunk.to_vec()).unwrap(),
+            RecoveryKind::Random => recovery.extend_random(chunk.to_vec()).unwrap(),
+        }
+        if i % 3 == 1 {
+            // need this to ensure that the old persistence thread doesn't corrupt DB
+            recovery.wait_for_persistence().unwrap();
+            recovery = MerkleTreeRecovery::new(db.clone(), recovered_version).unwrap();
+            recovery.parallelize_persistence(4).unwrap();
+            // ^ Simulate recovery interruption and restart.
+        }
+    }
+
+    let mut tree = MerkleTree::new(recovery.finalize().unwrap()).unwrap();
+    tree.verify_consistency(recovered_version, true).unwrap();
+    // Check that new tree versions can be built and function as expected.
+    test_tree_after_recovery(&mut tree, recovered_version, *expected_hash);
+}
+
 #[test_casing(8, test_casing::Product((RecoveryKind::ALL, [6, 10, 17, 42])))]
 fn recovery_in_chunks(kind: RecoveryKind, chunk_size: usize) {
     test_recovery_in_chunks(PatchSet::default(), kind, chunk_size);
@@ -136,4 +169,11 @@ mod rocksdb {
         let db = RocksDBWrapper::new(temp_dir.path()).unwrap();
         test_recovery_in_chunks(db, kind, chunk_size);
     }
+
+    #[test_casing(8, test_casing::Product((RecoveryKind::ALL, [6, 10, 17, 42])))]
+    fn parallel_recovery_in_chunks(kind: RecoveryKind, chunk_size: usize) {
+        let temp_dir = TempDir::new().unwrap();
+        let db = RocksDBWrapper::new(temp_dir.path()).unwrap();
+        test_parallel_recovery_in_chunks(db, kind, chunk_size);
+    }
 }
diff --git a/core/lib/mini_merkle_tree/benches/tree.rs b/core/lib/mini_merkle_tree/benches/tree.rs
index 8ea4128ac34d..78d9f8dcd55f 100644
--- a/core/lib/mini_merkle_tree/benches/tree.rs
+++ b/core/lib/mini_merkle_tree/benches/tree.rs
@@ -1,8 +1,6 @@
 //! Basic benchmarks for `MiniMerkleTree`.
 
-use criterion::{
-    criterion_group, criterion_main, BatchSize, Bencher, BenchmarkId, Criterion, Throughput,
-};
+use criterion::{criterion_group, criterion_main, Bencher, BenchmarkId, Criterion, Throughput};
 use zksync_mini_merkle_tree::MiniMerkleTree;
 
 const TREE_SIZES: &[usize] = &[32, 64, 128, 256, 512, 1_024];
@@ -10,21 +8,13 @@ const TREE_SIZES: &[usize] = &[32, 64, 128, 256, 512, 1_024];
 fn compute_merkle_root(bencher: &mut Bencher<'_>, tree_size: usize) {
     let leaves = (0..tree_size).map(|i| [i as u8; 88]);
     let tree = MiniMerkleTree::new(leaves, None);
-    bencher.iter_batched(
-        || tree.clone(),
-        MiniMerkleTree::merkle_root,
-        BatchSize::SmallInput,
-    );
+    bencher.iter(|| tree.merkle_root());
 }
 
 fn compute_merkle_path(bencher: &mut Bencher<'_>, tree_size: usize) {
     let leaves = (0..tree_size).map(|i| [i as u8; 88]);
     let tree = MiniMerkleTree::new(leaves, None);
-    bencher.iter_batched(
-        || tree.clone(),
-        |tree| tree.merkle_root_and_path(tree_size / 3),
-        BatchSize::SmallInput,
-    );
+    bencher.iter(|| tree.merkle_root_and_path(tree_size / 3));
 }
 
 fn basic_benches(criterion: &mut Criterion) {
diff --git a/core/lib/mini_merkle_tree/src/lib.rs b/core/lib/mini_merkle_tree/src/lib.rs
index f4f66d8fe61b..3d4ff3cf561c 100644
--- a/core/lib/mini_merkle_tree/src/lib.rs
+++ b/core/lib/mini_merkle_tree/src/lib.rs
@@ -5,9 +5,9 @@
 #![warn(clippy::all, clippy::pedantic)]
 #![allow(clippy::must_use_candidate, clippy::similar_names)]
 
-use std::iter;
+use std::{collections::VecDeque, iter, marker::PhantomData};
 
-use once_cell::sync::Lazy;
+use once_cell::sync::OnceCell;
 
 #[cfg(test)]
 mod tests;
@@ -19,21 +19,44 @@ use zksync_crypto::hasher::{keccak::KeccakHasher, Hasher};
 /// we unlikely to ever hit.
 const MAX_TREE_DEPTH: usize = 32;
 
-/// In-memory Merkle tree of bounded depth (no more than 10).
+/// In-memory Merkle tree of bounded depth (no more than 32).
 ///
 /// The tree is left-leaning, meaning that during its initialization, the size of a tree
 /// can be specified larger than the number of provided leaves. In this case, the remaining leaves
 /// will be considered to equal `[0_u8; LEAF_SIZE]`.
+///
+/// The tree has dynamic size, meaning that it can grow by a factor of 2 when the number of leaves
+/// exceeds the current tree size. It does not shrink.
+///
+/// The tree is optimized for the case when the queries are performed on the rightmost leaves
+/// and the leftmost leaves are cached (trimmed). Caching enables the merkle roots and paths to be computed
+/// in `O(max(n, depth))` time, where `n` is the number of uncached leaves (in contrast to the total number of
+/// leaves). Cache itself only takes up `O(depth)` space. However, caching prevents the retrieval of paths to the
+/// cached leaves.
 #[derive(Debug, Clone)]
-pub struct MiniMerkleTree<const LEAF_SIZE: usize, H = KeccakHasher> {
+pub struct MiniMerkleTree<L, H = KeccakHasher> {
     hasher: H,
-    hashes: Box<[H256]>,
+    /// Stores untrimmed (uncached) leaves of the tree.
+    hashes: VecDeque<H256>,
+    /// Size of the tree. Always a power of 2.
+    /// If it is greater than `self.start_index + self.hashes.len()`, the remaining leaves are empty.
     binary_tree_size: usize,
+    /// Index of the leftmost untrimmed leaf.
+    start_index: usize,
+    /// Left subset of the Merkle path to the first untrimmed leaf (i.e., a leaf with index `self.start_index`).
+    /// Merkle path starts from the bottom of the tree and goes up.
+    /// Used to fill in data for trimmed tree leaves when computing Merkle paths and the root hash.
+    /// Because only the left subset of the path is used, the cache is not invalidated when new leaves are
+    /// pushed into the tree. If all leaves are trimmed, cache is the left subset of the Merkle path to
+    /// the next leaf to be inserted, which still has index `self.start_index`.
+    cache: Vec<Option<H256>>,
+    /// Leaf type marker
+    _leaf: PhantomData<L>,
 }
 
-impl<const LEAF_SIZE: usize> MiniMerkleTree<LEAF_SIZE>
+impl<L: AsRef<[u8]>> MiniMerkleTree<L>
 where
-    KeccakHasher: HashEmptySubtree<LEAF_SIZE>,
+    KeccakHasher: HashEmptySubtree<L>,
 {
     /// Creates a new Merkle tree from the supplied leaves. If `min_tree_size` is supplied and is larger
     /// than the number of the supplied leaves, the leaves are padded to `min_tree_size` with `[0_u8; LEAF_SIZE]` entries.
@@ -42,32 +65,52 @@ where
     /// # Panics
     ///
     /// Panics in the same situations as [`Self::with_hasher()`].
-    pub fn new(
-        leaves: impl Iterator<Item = [u8; LEAF_SIZE]>,
-        min_tree_size: Option<usize>,
-    ) -> Self {
+    pub fn new(leaves: impl Iterator<Item = L>, min_tree_size: Option<usize>) -> Self {
         Self::with_hasher(KeccakHasher, leaves, min_tree_size)
     }
 }
 
-impl<const LEAF_SIZE: usize, H> MiniMerkleTree<LEAF_SIZE, H>
+impl<L: AsRef<[u8]>, H> MiniMerkleTree<L, H>
 where
-    H: HashEmptySubtree<LEAF_SIZE>,
+    H: HashEmptySubtree<L>,
 {
     /// Creates a new Merkle tree from the supplied leaves. If `min_tree_size` is supplied and is larger than the
-    /// number of the supplied leaves, the leaves are padded to `min_tree_size` with `[0_u8; LEAF_SIZE]` entries.
+    /// number of the supplied leaves, the leaves are padded to `min_tree_size` with `[0_u8; LEAF_SIZE]` entries,
+    /// but are deemed empty.
     ///
     /// # Panics
     ///
     /// Panics if any of the following conditions applies:
     ///
     /// - `min_tree_size` (if supplied) is not a power of 2.
+    /// - The number of leaves is greater than `2^32`.
     pub fn with_hasher(
         hasher: H,
-        leaves: impl Iterator<Item = [u8; LEAF_SIZE]>,
+        leaves: impl Iterator<Item = L>,
+        min_tree_size: Option<usize>,
+    ) -> Self {
+        let hashes: Vec<_> = leaves
+            .map(|bytes| hasher.hash_bytes(bytes.as_ref()))
+            .collect();
+        Self::from_hashes(hasher, hashes.into_iter(), min_tree_size)
+    }
+
+    /// Creates a new Merkle tree from the supplied raw hashes. If `min_tree_size` is supplied and is larger than the
+    /// number of the supplied leaves, the leaves are padded to `min_tree_size` with zero-hash entries,
+    /// but are deemed empty.
+    ///
+    /// # Panics
+    ///
+    /// Panics if any of the following conditions applies:
+    ///
+    /// - `min_tree_size` (if supplied) is not a power of 2.
+    /// - The number of leaves is greater than `2^32`.
+    pub fn from_hashes(
+        hasher: H,
+        hashes: impl Iterator<Item = H256>,
         min_tree_size: Option<usize>,
     ) -> Self {
-        let hashes: Box<[H256]> = leaves.map(|bytes| hasher.hash_bytes(&bytes)).collect();
+        let hashes: VecDeque<_> = hashes.collect();
         let mut binary_tree_size = hashes.len().next_power_of_two();
         if let Some(min_tree_size) = min_tree_size {
             assert!(
@@ -76,77 +119,165 @@ where
             );
             binary_tree_size = min_tree_size.max(binary_tree_size);
         }
+
+        let depth = tree_depth_by_size(binary_tree_size);
         assert!(
-            tree_depth_by_size(binary_tree_size) <= MAX_TREE_DEPTH,
+            depth <= MAX_TREE_DEPTH,
             "Tree contains more than {} items; this is not supported",
-            1 << MAX_TREE_DEPTH
+            1u64 << MAX_TREE_DEPTH
         );
 
         Self {
             hasher,
             hashes,
             binary_tree_size,
+            start_index: 0,
+            cache: vec![None; depth],
+            _leaf: PhantomData,
         }
     }
 
+    /// Returns `true` if the tree is empty.
+    pub fn is_empty(&self) -> bool {
+        self.start_index == 0 && self.hashes.is_empty()
+    }
+
     /// Returns the root hash of this tree.
-    /// # Panics
-    /// Will panic if the constant below is invalid.
-    pub fn merkle_root(self) -> H256 {
+    #[allow(clippy::missing_panics_doc)] // Should never panic, unless there is a bug.
+    pub fn merkle_root(&self) -> H256 {
         if self.hashes.is_empty() {
             let depth = tree_depth_by_size(self.binary_tree_size);
-            self.hasher.empty_subtree_hash(depth)
-        } else {
-            self.compute_merkle_root_and_path(0, None)
+            if self.start_index == 0 {
+                return self.hasher.empty_subtree_hash(depth);
+            } else if self.start_index == self.binary_tree_size {
+                return self.cache[depth].expect("cache is invalid");
+            }
         }
+        self.compute_merkle_root_and_path(0, None, None)
     }
 
     /// Returns the root hash and the Merkle proof for a leaf with the specified 0-based `index`.
-    pub fn merkle_root_and_path(self, index: usize) -> (H256, Vec<H256>) {
-        let mut merkle_path = vec![];
-        let root_hash = self.compute_merkle_root_and_path(index, Some(&mut merkle_path));
-        (root_hash, merkle_path)
+    /// `index` is relative to the leftmost uncached leaf.
+    /// # Panics
+    /// Panics if `index` is >= than the number of leaves in the tree.
+    pub fn merkle_root_and_path(&self, index: usize) -> (H256, Vec<H256>) {
+        assert!(index < self.hashes.len(), "leaf index out of bounds");
+        let mut end_path = vec![];
+        let root_hash = self.compute_merkle_root_and_path(index, Some(&mut end_path), None);
+        (
+            root_hash,
+            end_path.into_iter().map(Option::unwrap).collect(),
+        )
+    }
+
+    /// Returns the root hash and the Merkle proofs for a range of leafs.
+    /// The range is 0..length, where `0` is the leftmost untrimmed leaf (i.e. leaf under `self.start_index`).
+    /// # Panics
+    /// Panics if `length` is 0 or greater than the number of leaves in the tree.
+    pub fn merkle_root_and_paths_for_range(
+        &self,
+        length: usize,
+    ) -> (H256, Vec<Option<H256>>, Vec<Option<H256>>) {
+        assert!(length > 0, "range must not be empty");
+        assert!(length <= self.hashes.len(), "not enough leaves in the tree");
+        let mut right_path = vec![];
+        let root_hash =
+            self.compute_merkle_root_and_path(length - 1, Some(&mut right_path), Some(Side::Right));
+        (root_hash, self.cache.clone(), right_path)
     }
 
+    /// Adds a raw hash to the tree (replaces leftmost empty leaf).
+    /// If the tree is full, its size is doubled.
+    /// Note: empty leaves != zero leaves.
+    pub fn push_hash(&mut self, leaf_hash: H256) {
+        self.hashes.push_back(leaf_hash);
+        if self.start_index + self.hashes.len() > self.binary_tree_size {
+            self.binary_tree_size *= 2;
+            if self.cache.len() < tree_depth_by_size(self.binary_tree_size) {
+                self.cache.push(None);
+            }
+        }
+    }
+
+    /// Adds a new leaf to the tree (replaces leftmost empty leaf).
+    /// If the tree is full, its size is doubled.
+    /// Note: empty leaves != zero leaves.
+    pub fn push(&mut self, leaf: L) {
+        let leaf_hash = self.hasher.hash_bytes(leaf.as_ref());
+        self.push_hash(leaf_hash);
+    }
+
+    /// Trims and caches the leftmost `count` leaves.
+    /// Does not affect the root hash, but makes it impossible to get the paths to the cached leaves.
+    /// # Panics
+    /// Panics if `count` is greater than the number of untrimmed leaves in the tree.
+    pub fn trim_start(&mut self, count: usize) {
+        assert!(self.hashes.len() >= count, "not enough leaves to trim");
+        let mut new_cache = vec![];
+        // Cache is a left subset of the path to the first untrimmed leaf.
+        let root = self.compute_merkle_root_and_path(count, Some(&mut new_cache), Some(Side::Left));
+        self.hashes.drain(..count);
+        self.start_index += count;
+        if self.start_index == self.binary_tree_size {
+            // If the tree is completely trimmed *and* will grow on the next push,
+            // we need to cache the root.
+            new_cache.push(Some(root));
+        }
+        self.cache = new_cache;
+    }
+
+    /// Computes the Merkle root hash.
+    /// If `path` is `Some`, also computes the Merkle path to the leaf with the specified
+    /// `index` (relative to `self.start_index`).
+    /// If `side` is `Some`, only the corresponding side subset of the path is computed
+    /// (`Some` for elements in the `side` subset of the path, `None` for the other elements).
     fn compute_merkle_root_and_path(
-        self,
+        &self,
         mut index: usize,
-        mut merkle_path: Option<&mut Vec<H256>>,
+        mut path: Option<&mut Vec<Option<H256>>>,
+        side: Option<Side>,
     ) -> H256 {
-        assert!(index < self.hashes.len(), "invalid tree leaf index");
-
         let depth = tree_depth_by_size(self.binary_tree_size);
-        if let Some(merkle_path) = merkle_path.as_deref_mut() {
-            merkle_path.reserve(depth);
+        if let Some(path) = path.as_deref_mut() {
+            path.reserve(depth);
         }
 
-        let mut hashes = self.hashes;
-        let mut level_len = hashes.len();
+        let mut hashes = self.hashes.clone();
+        let mut absolute_start_index = self.start_index;
+
         for level in 0..depth {
-            let empty_hash_at_level = self.hasher.empty_subtree_hash(level);
-
-            if let Some(merkle_path) = merkle_path.as_deref_mut() {
-                let adjacent_idx = index ^ 1;
-                let adjacent_hash = if adjacent_idx < level_len {
-                    hashes[adjacent_idx]
-                } else {
-                    empty_hash_at_level
+            // If the first untrimmed leaf is a right sibling,
+            // add it's left sibling to `hashes` from cache for convenient iteration later.
+            if absolute_start_index % 2 == 1 {
+                hashes.push_front(self.cache[level].expect("cache is invalid"));
+                index += 1;
+            }
+            // At this point `hashes` always starts from the left sibling node.
+            // If it ends on the left sibling node, add the right sibling node to `hashes`
+            // for convenient iteration later.
+            if hashes.len() % 2 == 1 {
+                hashes.push_back(self.hasher.empty_subtree_hash(level));
+            }
+            if let Some(path) = path.as_deref_mut() {
+                let hash = match side {
+                    Some(Side::Left) if index % 2 == 0 => None,
+                    Some(Side::Right) if index % 2 == 1 => None,
+                    _ => hashes.get(index ^ 1).copied(),
                 };
-                merkle_path.push(adjacent_hash);
+                path.push(hash);
             }
 
-            for i in 0..(level_len / 2) {
+            let level_len = hashes.len() / 2;
+            // Since `hashes` has an even number of elements, we can simply iterate over the pairs.
+            for i in 0..level_len {
                 hashes[i] = self.hasher.compress(&hashes[2 * i], &hashes[2 * i + 1]);
             }
-            if level_len % 2 == 1 {
-                hashes[level_len / 2] = self
-                    .hasher
-                    .compress(&hashes[level_len - 1], &empty_hash_at_level);
-            }
 
+            hashes.truncate(level_len);
             index /= 2;
-            level_len = level_len / 2 + level_len % 2;
+            absolute_start_index /= 2;
         }
+
         hashes[0]
     }
 }
@@ -156,24 +287,34 @@ fn tree_depth_by_size(tree_size: usize) -> usize {
     tree_size.trailing_zeros() as usize
 }
 
-/// Hashing of empty binary Merkle trees.
-pub trait HashEmptySubtree<const LEAF_SIZE: usize>:
-    'static + Send + Sync + Hasher<Hash = H256>
-{
-    /// Returns the hash of an empty subtree with the given depth. Implementations
-    /// are encouraged to cache the returned values.
-    fn empty_subtree_hash(&self, depth: usize) -> H256;
+/// Used to represent subsets of a Merkle path.
+/// `Left` are the left sibling nodes, `Right` are the right sibling nodes.
+#[derive(Debug, Clone, Copy)]
+enum Side {
+    Left,
+    Right,
 }
 
-impl HashEmptySubtree<88> for KeccakHasher {
+/// Hashing of empty binary Merkle trees.
+pub trait HashEmptySubtree<L>: 'static + Send + Sync + Hasher<Hash = H256> {
+    /// Returns the hash of an empty subtree with the given depth.
+    /// Implementations are encouraged to cache the returned values.
     fn empty_subtree_hash(&self, depth: usize) -> H256 {
-        static EMPTY_TREE_HASHES: Lazy<Vec<H256>> = Lazy::new(compute_empty_tree_hashes::<88>);
-        EMPTY_TREE_HASHES[depth]
+        static EMPTY_TREE_HASHES: OnceCell<Vec<H256>> = OnceCell::new();
+        EMPTY_TREE_HASHES.get_or_init(|| compute_empty_tree_hashes(self.empty_leaf_hash()))[depth]
+    }
+
+    /// Returns an empty hash
+    fn empty_leaf_hash(&self) -> H256;
+}
+
+impl HashEmptySubtree<[u8; 88]> for KeccakHasher {
+    fn empty_leaf_hash(&self) -> H256 {
+        self.hash_bytes(&[0_u8; 88])
     }
 }
 
-fn compute_empty_tree_hashes<const LEAF_SIZE: usize>() -> Vec<H256> {
-    let empty_leaf_hash = KeccakHasher.hash_bytes(&[0_u8; LEAF_SIZE]);
+fn compute_empty_tree_hashes(empty_leaf_hash: H256) -> Vec<H256> {
     iter::successors(Some(empty_leaf_hash), |hash| {
         Some(KeccakHasher.compress(hash, hash))
     })
diff --git a/core/lib/mini_merkle_tree/src/tests.rs b/core/lib/mini_merkle_tree/src/tests.rs
index c534c87523cd..5aadab1d4e6f 100644
--- a/core/lib/mini_merkle_tree/src/tests.rs
+++ b/core/lib/mini_merkle_tree/src/tests.rs
@@ -1,5 +1,7 @@
 //! Tests for `MiniMerkleTree`.
 
+use std::collections::VecDeque;
+
 use super::*;
 
 #[test]
@@ -156,24 +158,85 @@ fn verify_merkle_proof(
     assert_eq!(hash, merkle_root);
 }
 
+fn verify_range_merkle_proof(
+    items: &[[u8; 88]],
+    mut start_index: usize,
+    start_path: &[Option<H256>],
+    end_path: &[Option<H256>],
+    merkle_root: H256,
+) {
+    assert_eq!(start_path.len(), end_path.len());
+
+    let hasher = KeccakHasher;
+    let mut hashes: VecDeque<_> = items.iter().map(|item| hasher.hash_bytes(item)).collect();
+
+    for (start_item, end_item) in start_path.iter().zip(end_path.iter()) {
+        if start_index % 2 == 1 {
+            hashes.push_front(start_item.unwrap());
+        } else {
+            assert_eq!(start_item, &None);
+        }
+        if hashes.len() % 2 == 1 {
+            hashes.push_back(end_item.unwrap());
+        } else {
+            assert_eq!(end_item, &None);
+        }
+
+        let next_level_len = hashes.len() / 2;
+        for i in 0..next_level_len {
+            hashes[i] = hasher.compress(&hashes[2 * i], &hashes[2 * i + 1]);
+        }
+
+        hashes.truncate(next_level_len);
+        start_index /= 2;
+    }
+
+    assert_eq!(hashes[0], merkle_root);
+}
+
 #[test]
 fn merkle_proofs_are_valid_in_small_tree() {
     let leaves = (1_u8..=50).map(|byte| [byte; 88]);
     let tree = MiniMerkleTree::new(leaves.clone(), None);
 
     for (i, item) in leaves.enumerate() {
-        let (merkle_root, path) = tree.clone().merkle_root_and_path(i);
+        let (merkle_root, path) = tree.merkle_root_and_path(i);
         verify_merkle_proof(&item, i, 50, &path, merkle_root);
     }
 }
 
+#[test]
+fn merkle_proofs_are_valid_for_ranges() {
+    let mut leaves: Vec<_> = (1_u8..=50).map(|byte| [byte; 88]).collect();
+    let mut tree = MiniMerkleTree::new(leaves.clone().into_iter(), None);
+    let mut start_index = 0;
+
+    for trimmed_count in 1..10 {
+        tree.trim_start(trimmed_count);
+        leaves.drain(..trimmed_count);
+        start_index += trimmed_count;
+        let tree_len = tree.hashes.len();
+
+        for i in 1..=tree_len {
+            let (merkle_root, start_path, end_path) = tree.merkle_root_and_paths_for_range(i);
+            verify_range_merkle_proof(
+                &leaves[..i],
+                start_index,
+                &start_path,
+                &end_path,
+                merkle_root,
+            );
+        }
+    }
+}
+
 #[test]
 fn merkle_proofs_are_valid_in_larger_tree() {
     let leaves = (1_u8..=255).map(|byte| [byte; 88]);
     let tree = MiniMerkleTree::new(leaves.clone(), Some(512));
 
     for (i, item) in leaves.enumerate() {
-        let (merkle_root, path) = tree.clone().merkle_root_and_path(i);
+        let (merkle_root, path) = tree.merkle_root_and_path(i);
         verify_merkle_proof(&item, i, 512, &path, merkle_root);
     }
 }
@@ -185,14 +248,14 @@ fn merkle_proofs_are_valid_in_very_large_tree() {
 
     let tree = MiniMerkleTree::new(leaves.clone(), None);
     for (i, item) in leaves.clone().enumerate().step_by(61) {
-        let (merkle_root, path) = tree.clone().merkle_root_and_path(i);
+        let (merkle_root, path) = tree.merkle_root_and_path(i);
         verify_merkle_proof(&item, i, 1 << 14, &path, merkle_root);
     }
 
     let tree_with_min_size = MiniMerkleTree::new(leaves.clone(), Some(512));
-    assert_eq!(tree_with_min_size.clone().merkle_root(), tree.merkle_root());
+    assert_eq!(tree_with_min_size.merkle_root(), tree.merkle_root());
     for (i, item) in leaves.enumerate().step_by(61) {
-        let (merkle_root, path) = tree_with_min_size.clone().merkle_root_and_path(i);
+        let (merkle_root, path) = tree_with_min_size.merkle_root_and_path(i);
         verify_merkle_proof(&item, i, 1 << 14, &path, merkle_root);
     }
 }
@@ -205,15 +268,132 @@ fn merkle_proofs_are_valid_in_very_small_trees() {
         let tree = MiniMerkleTree::new(leaves.clone(), None);
         let item_count = usize::from(item_count).next_power_of_two();
         for (i, item) in leaves.clone().enumerate() {
-            let (merkle_root, path) = tree.clone().merkle_root_and_path(i);
+            let (merkle_root, path) = tree.merkle_root_and_path(i);
             verify_merkle_proof(&item, i, item_count, &path, merkle_root);
         }
 
         let tree_with_min_size = MiniMerkleTree::new(leaves.clone(), Some(512));
-        assert_ne!(tree_with_min_size.clone().merkle_root(), tree.merkle_root());
+        assert_ne!(tree_with_min_size.merkle_root(), tree.merkle_root());
         for (i, item) in leaves.enumerate() {
-            let (merkle_root, path) = tree_with_min_size.clone().merkle_root_and_path(i);
+            let (merkle_root, path) = tree_with_min_size.merkle_root_and_path(i);
             verify_merkle_proof(&item, i, 512, &path, merkle_root);
         }
     }
 }
+
+#[test]
+fn dynamic_merkle_tree_growth() {
+    let mut tree = MiniMerkleTree::new(iter::empty(), None);
+    assert_eq!(tree.binary_tree_size, 1);
+    assert_eq!(tree.merkle_root(), KeccakHasher.empty_subtree_hash(0));
+
+    for len in 1..=8_usize {
+        tree.push([0; 88]);
+        assert_eq!(tree.binary_tree_size, len.next_power_of_two());
+
+        let depth = tree_depth_by_size(tree.binary_tree_size);
+        assert_eq!(tree.merkle_root(), KeccakHasher.empty_subtree_hash(depth));
+    }
+
+    // Shouldn't shrink after caching
+    tree.trim_start(6);
+    assert_eq!(tree.binary_tree_size, 8);
+    assert_eq!(tree.merkle_root(), KeccakHasher.empty_subtree_hash(3));
+}
+
+#[test]
+fn caching_leaves() {
+    let leaves = (1..=50).map(|byte| [byte; 88]);
+    let mut tree = MiniMerkleTree::new(leaves.clone(), None);
+
+    let expected_root_hash: H256 =
+        "0x2da23c4270b612710106f3e02e9db9fa42663751869f48d952fa7a0eaaa92475"
+            .parse()
+            .unwrap();
+
+    let expected_path = [
+        "0x39f19437665159060317aab8b417352df18779f50b68a6bf6bc9c94dff8c98ca",
+        "0xc3d03eebfd83049991ea3d3e358b6712e7aa2e2e63dc2d4b438987cec28ac8d0",
+        "0xe3697c7f33c31a9b0f0aeb8542287d0d21e8c4cf82163d0c44c7a98aa11aa111",
+        "0x199cc5812543ddceeddd0fc82807646a4899444240db2c0d2f20c3cceb5f51fa",
+        "0x6edd774c0492cb4c825e4684330fd1c3259866606d47241ebf2a29af0190b5b1",
+        "0x29694afc5d76ad6ee48e9382b1cf724c503c5742aa905700e290845c56d1b488",
+    ]
+    .map(|s| s.parse::<H256>().unwrap());
+
+    for i in 0..50 {
+        let (root_hash, path) = tree.merkle_root_and_path(49 - i);
+        assert_eq!(root_hash, expected_root_hash);
+        assert_eq!(path, expected_path);
+        tree.trim_start(1);
+    }
+
+    let mut tree = MiniMerkleTree::new(leaves, None);
+    for i in 0..10 {
+        let (root_hash, path) = tree.merkle_root_and_path(49 - i * 5);
+        assert_eq!(root_hash, expected_root_hash);
+        assert_eq!(path, expected_path);
+        tree.trim_start(5);
+    }
+}
+
+#[test]
+#[allow(clippy::cast_possible_truncation)] // truncation is intentional
+fn pushing_new_leaves() {
+    let mut tree = MiniMerkleTree::new(iter::empty(), None);
+
+    let expected_roots = [
+        "0x6f7a80e6ee852bd309ee9153c6157535092aa706f5c6e51ff199a4be012be1fd",
+        "0xda895440272a4c4a0b950753c77fd08db0ce57e21c98b75d154c341cbe5f31ac",
+        "0x74e62d47c142e2a5b0f2c71ea0f8bcca8d767f0edf7ec7b9134371f5bfef7b8a",
+        "0xe44bb0f3915370e8f432de0830c52d5dc7bbf1a46a21cccb462cefaf3f4cce4d",
+        "0x88443c3b1b9206955625b5722c06bca3207d39f6044780af885d5f09f6e615a1",
+    ]
+    .map(|s| s.parse::<H256>().unwrap());
+
+    for (i, expected_root) in expected_roots.iter().enumerate() {
+        let number = i as u8 + 1;
+        tree.push([number; 88]);
+        tree.push([number; 88]);
+        tree.push([number; 88]);
+
+        let (root, start_path, end_path) = tree.merkle_root_and_paths_for_range(1);
+        assert_eq!(root, *expected_root);
+        assert_eq!(start_path.len(), end_path.len());
+
+        tree.trim_start(2);
+
+        let (root, start_path, end_path) = tree.merkle_root_and_paths_for_range(1);
+        assert_eq!(root, *expected_root);
+        assert_eq!(start_path.len(), end_path.len());
+    }
+}
+
+#[test]
+fn trim_all_and_grow() {
+    let mut tree = MiniMerkleTree::new(iter::repeat([1; 88]).take(4), None);
+    tree.trim_start(4);
+    tree.push([1; 88]);
+    let expected_root = "0xfa4c924185122254742622b10b68df8de89d33f685ee579f37a50c552b0d245d"
+        .parse()
+        .unwrap();
+    assert_eq!(tree.merkle_root(), expected_root);
+}
+
+#[test]
+fn trim_all_and_check_root() {
+    for len in 1..=50 {
+        let mut tree = MiniMerkleTree::new(iter::repeat([1; 88]).take(len), None);
+        let root = tree.merkle_root();
+        tree.trim_start(len);
+        assert_eq!(tree.merkle_root(), root);
+
+        let mut tree = MiniMerkleTree::new(
+            iter::repeat([1; 88]).take(len),
+            Some(len.next_power_of_two() * 2),
+        );
+        let root = tree.merkle_root();
+        tree.trim_start(len);
+        assert_eq!(tree.merkle_root(), root);
+    }
+}
diff --git a/core/lib/multivm/Cargo.toml b/core/lib/multivm/Cargo.toml
index 670da1ed5ed7..0555a3e8961d 100644
--- a/core/lib/multivm/Cargo.toml
+++ b/core/lib/multivm/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "multivm"
+name = "zksync_multivm"
 version = "0.1.0"
 edition.workspace = true
 authors.workspace = true
@@ -33,6 +33,7 @@ anyhow.workspace = true
 hex.workspace = true
 itertools.workspace = true
 once_cell.workspace = true
+serde.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 vise.workspace = true
diff --git a/core/lib/multivm/src/glue/types/vm/mod.rs b/core/lib/multivm/src/glue/types/vm/mod.rs
index 47cddc2b8dd4..5cf5a61a9a7b 100644
--- a/core/lib/multivm/src/glue/types/vm/mod.rs
+++ b/core/lib/multivm/src/glue/types/vm/mod.rs
@@ -1,4 +1,5 @@
 mod block_context_mode;
+mod storage_log;
 mod storage_query;
 mod tx_execution_mode;
 mod tx_revert_reason;
diff --git a/core/lib/multivm/src/glue/types/vm/storage_log.rs b/core/lib/multivm/src/glue/types/vm/storage_log.rs
new file mode 100644
index 000000000000..322bc491e9ab
--- /dev/null
+++ b/core/lib/multivm/src/glue/types/vm/storage_log.rs
@@ -0,0 +1,29 @@
+use zksync_types::{
+    zk_evm_types::LogQuery, StorageLog, StorageLogQuery, StorageLogWithPreviousValue,
+};
+use zksync_utils::u256_to_h256;
+
+use crate::glue::{GlueFrom, GlueInto};
+
+impl<T: GlueInto<LogQuery>> GlueFrom<T> for StorageLog {
+    fn glue_from(value: T) -> Self {
+        StorageLog::from_log_query(&value.glue_into())
+    }
+}
+
+impl<T: GlueInto<StorageLogQuery>> GlueFrom<T> for StorageLogWithPreviousValue {
+    fn glue_from(value: T) -> Self {
+        let query = value.glue_into();
+        StorageLogWithPreviousValue {
+            log: StorageLog {
+                kind: query.log_type,
+                ..StorageLog::from_log_query(&query.log_query)
+            },
+            previous_value: u256_to_h256(if query.log_query.rollback {
+                query.log_query.written_value
+            } else {
+                query.log_query.read_value
+            }),
+        }
+    }
+}
diff --git a/core/lib/multivm/src/glue/types/vm/vm_block_result.rs b/core/lib/multivm/src/glue/types/vm/vm_block_result.rs
index 3f94157b7c73..1ee9f5ea90f4 100644
--- a/core/lib/multivm/src/glue/types/vm/vm_block_result.rs
+++ b/core/lib/multivm/src/glue/types/vm/vm_block_result.rs
@@ -19,19 +19,18 @@ use crate::{
 impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::FinishedL1Batch {
     fn glue_from(value: crate::vm_m5::vm_instance::VmBlockResult) -> Self {
         let storage_log_queries = value.full_result.storage_log_queries.clone();
-        let deduplicated_storage_log_queries: Vec<LogQuery_1_3_1> =
-            sort_storage_access_queries_1_3_3(
-                &storage_log_queries
-                    .iter()
-                    .map(|log| {
-                        GlueInto::<zk_evm_1_3_3::aux_structures::LogQuery>::glue_into(log.log_query)
-                    })
-                    .collect_vec(),
-            )
-            .1
-            .into_iter()
-            .map(GlueInto::<LogQuery_1_3_1>::glue_into)
-            .collect();
+        let deduplicated_storage_logs: Vec<LogQuery_1_3_1> = sort_storage_access_queries_1_3_3(
+            &storage_log_queries
+                .iter()
+                .map(|log| {
+                    GlueInto::<zk_evm_1_3_3::aux_structures::LogQuery>::glue_into(log.log_query)
+                })
+                .collect_vec(),
+        )
+        .1
+        .into_iter()
+        .map(GlueInto::<LogQuery_1_3_1>::glue_into)
+        .collect();
 
         crate::interface::FinishedL1Batch {
             block_tip_execution_result: VmExecutionResultAndLogs {
@@ -51,7 +50,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::Fi
             },
             final_execution_state: CurrentExecutionState {
                 events: value.full_result.events,
-                deduplicated_storage_log_queries: deduplicated_storage_log_queries
+                deduplicated_storage_logs: deduplicated_storage_logs
                     .into_iter()
                     .map(GlueInto::glue_into)
                     .collect(),
@@ -71,7 +70,7 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::Fi
             },
             final_bootloader_memory: None,
             pubdata_input: None,
-            initially_written_slots: None,
+            state_diffs: None,
         }
     }
 }
@@ -79,19 +78,18 @@ impl GlueFrom<crate::vm_m5::vm_instance::VmBlockResult> for crate::interface::Fi
 impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult> for crate::interface::FinishedL1Batch {
     fn glue_from(value: crate::vm_m6::vm_instance::VmBlockResult) -> Self {
         let storage_log_queries = value.full_result.storage_log_queries.clone();
-        let deduplicated_storage_log_queries: Vec<LogQuery_1_3_1> =
-            sort_storage_access_queries_1_3_3(
-                &storage_log_queries
-                    .iter()
-                    .map(|log| {
-                        GlueInto::<zk_evm_1_3_3::aux_structures::LogQuery>::glue_into(log.log_query)
-                    })
-                    .collect_vec(),
-            )
-            .1
-            .into_iter()
-            .map(GlueInto::<LogQuery_1_3_1>::glue_into)
-            .collect();
+        let deduplicated_storage_logs: Vec<LogQuery_1_3_1> = sort_storage_access_queries_1_3_3(
+            &storage_log_queries
+                .iter()
+                .map(|log| {
+                    GlueInto::<zk_evm_1_3_3::aux_structures::LogQuery>::glue_into(log.log_query)
+                })
+                .collect_vec(),
+        )
+        .1
+        .into_iter()
+        .map(GlueInto::<LogQuery_1_3_1>::glue_into)
+        .collect();
 
         crate::interface::FinishedL1Batch {
             block_tip_execution_result: VmExecutionResultAndLogs {
@@ -111,7 +109,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult> for crate::interface::Fi
             },
             final_execution_state: CurrentExecutionState {
                 events: value.full_result.events,
-                deduplicated_storage_log_queries: deduplicated_storage_log_queries
+                deduplicated_storage_logs: deduplicated_storage_logs
                     .into_iter()
                     .map(GlueInto::glue_into)
                     .collect(),
@@ -131,7 +129,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult> for crate::interface::Fi
             },
             final_bootloader_memory: None,
             pubdata_input: None,
-            initially_written_slots: None,
+            state_diffs: None,
         }
     }
 }
@@ -139,7 +137,7 @@ impl GlueFrom<crate::vm_m6::vm_instance::VmBlockResult> for crate::interface::Fi
 impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult> for crate::interface::FinishedL1Batch {
     fn glue_from(value: crate::vm_1_3_2::vm_instance::VmBlockResult) -> Self {
         let storage_log_queries = value.full_result.storage_log_queries.clone();
-        let deduplicated_storage_log_queries =
+        let deduplicated_storage_logs =
             circuit_sequencer_api_1_3_3::sort_storage_access::sort_storage_access_queries(
                 storage_log_queries.iter().map(|log| &log.log_query),
             )
@@ -169,7 +167,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult> for crate::interface:
             },
             final_execution_state: CurrentExecutionState {
                 events: value.full_result.events,
-                deduplicated_storage_log_queries: deduplicated_storage_log_queries
+                deduplicated_storage_logs: deduplicated_storage_logs
                     .into_iter()
                     .map(GlueInto::glue_into)
                     .collect(),
@@ -189,7 +187,7 @@ impl GlueFrom<crate::vm_1_3_2::vm_instance::VmBlockResult> for crate::interface:
             },
             final_bootloader_memory: None,
             pubdata_input: None,
-            initially_written_slots: None,
+            state_diffs: None,
         }
     }
 }
diff --git a/core/lib/multivm/src/interface/traits/vm.rs b/core/lib/multivm/src/interface/traits/vm.rs
index 14047b4381d3..499c46a7b52d 100644
--- a/core/lib/multivm/src/interface/traits/vm.rs
+++ b/core/lib/multivm/src/interface/traits/vm.rs
@@ -19,7 +19,7 @@
 //!     sync::Arc
 //! };
 //! use once_cell::sync::OnceCell;
-//! use multivm::{
+//! use zksync_multivm::{
 //!     interface::{L1BatchEnv, SystemEnv, VmInterface},
 //!     tracers::CallTracer ,
 //!     vm_latest::ToTracerPointer
@@ -143,7 +143,7 @@ pub trait VmInterface<S, H: HistoryMode> {
             final_execution_state: execution_state,
             final_bootloader_memory: Some(bootloader_memory),
             pubdata_input: None,
-            initially_written_slots: None,
+            state_diffs: None,
         }
     }
 }
diff --git a/core/lib/multivm/src/interface/types/errors/vm_revert_reason.rs b/core/lib/multivm/src/interface/types/errors/vm_revert_reason.rs
index 25b394ce2582..6b211d543a92 100644
--- a/core/lib/multivm/src/interface/types/errors/vm_revert_reason.rs
+++ b/core/lib/multivm/src/interface/types/errors/vm_revert_reason.rs
@@ -111,7 +111,7 @@ impl VmRevertReason {
                     function_selector: function_selector.to_vec(),
                     data: bytes.to_vec(),
                 };
-                tracing::warn!("Unsupported error type: {}", result);
+                tracing::debug!("Unsupported error type: {}", result);
                 Ok(result)
             }
         }
diff --git a/core/lib/multivm/src/interface/types/inputs/l1_batch_env.rs b/core/lib/multivm/src/interface/types/inputs/l1_batch_env.rs
index 1258e6b472f9..dbc942476170 100644
--- a/core/lib/multivm/src/interface/types/inputs/l1_batch_env.rs
+++ b/core/lib/multivm/src/interface/types/inputs/l1_batch_env.rs
@@ -1,3 +1,4 @@
+use serde::{Deserialize, Serialize};
 use zksync_types::{fee_model::BatchFeeInput, Address, L1BatchNumber, H256};
 
 use super::L2BlockEnv;
@@ -7,7 +8,7 @@ use super::L2BlockEnv;
 /// Eventually, most of these parameters (`l1_gas_price`, `fair_l2_gas_price`, `fee_account`,
 /// `enforced_base_fee`) will be moved to [`L2BlockEnv`]. For now, the VM doesn't support changing
 /// them in the middle of execution; that's why these params are specified here.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct L1BatchEnv {
     // If previous batch hash is None, then this is the first batch
     pub previous_batch_hash: Option<H256>,
diff --git a/core/lib/multivm/src/interface/types/inputs/l2_block.rs b/core/lib/multivm/src/interface/types/inputs/l2_block.rs
index 249a9a63445e..7c9a028bbad7 100644
--- a/core/lib/multivm/src/interface/types/inputs/l2_block.rs
+++ b/core/lib/multivm/src/interface/types/inputs/l2_block.rs
@@ -1,6 +1,7 @@
+use serde::{Deserialize, Serialize};
 use zksync_types::{block::L2BlockExecutionData, H256};
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 pub struct L2BlockEnv {
     pub number: u32,
     pub timestamp: u64,
diff --git a/core/lib/multivm/src/interface/types/inputs/system_env.rs b/core/lib/multivm/src/interface/types/inputs/system_env.rs
index a59ecbdb86b9..5a0496752d54 100644
--- a/core/lib/multivm/src/interface/types/inputs/system_env.rs
+++ b/core/lib/multivm/src/interface/types/inputs/system_env.rs
@@ -1,10 +1,11 @@
 use std::fmt::Debug;
 
+use serde::{Deserialize, Serialize};
 use zksync_contracts::BaseSystemContracts;
 use zksync_types::{L2ChainId, ProtocolVersionId};
 
 /// Params related to the execution process, not batch it self
-#[derive(Clone)]
+#[derive(Clone, PartialEq, Serialize, Deserialize)]
 pub struct SystemEnv {
     // Always false for VM
     pub zk_porter_available: bool,
@@ -44,7 +45,7 @@ impl Debug for SystemEnv {
 /// With `VerifyExecute` mode, transaction will be executed normally.
 /// With `EstimateFee`, the bootloader will be used that has the same behavior
 /// as the full `VerifyExecute` block, but errors in the account validation will be ignored.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub enum TxExecutionMode {
     VerifyExecute,
     EstimateFee,
diff --git a/core/lib/multivm/src/interface/types/outputs/execution_result.rs b/core/lib/multivm/src/interface/types/outputs/execution_result.rs
index 3ce7d31f212e..19ce9b599c80 100644
--- a/core/lib/multivm/src/interface/types/outputs/execution_result.rs
+++ b/core/lib/multivm/src/interface/types/outputs/execution_result.rs
@@ -3,7 +3,7 @@ use zksync_types::{
     event::{extract_long_l2_to_l1_messages, extract_published_bytecodes},
     l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
     tx::ExecutionMetrics,
-    StorageLogQuery, Transaction, VmEvent,
+    StorageLogWithPreviousValue, Transaction, VmEvent,
 };
 use zksync_utils::bytecode::bytecode_len_in_bytes;
 
@@ -19,7 +19,7 @@ pub struct Refunds {
 /// Events/storage logs/l2->l1 logs created within transaction execution.
 #[derive(Debug, Clone, Default, PartialEq)]
 pub struct VmExecutionLogs {
-    pub storage_logs: Vec<StorageLogQuery>,
+    pub storage_logs: Vec<StorageLogWithPreviousValue>,
     pub events: Vec<VmEvent>,
     // For pre-boojum VMs, there was no distinction between user logs and system
     // logs and so all the outputted logs were treated as user_l2_to_l1_logs.
@@ -64,12 +64,7 @@ impl ExecutionResult {
 impl VmExecutionResultAndLogs {
     pub fn get_execution_metrics(&self, tx: Option<&Transaction>) -> ExecutionMetrics {
         let contracts_deployed = tx
-            .map(|tx| {
-                tx.execute
-                    .factory_deps
-                    .as_ref()
-                    .map_or(0, |deps| deps.len() as u16)
-            })
+            .map(|tx| tx.execute.factory_deps.len() as u16)
             .unwrap_or(0);
 
         // We published the data as ABI-encoded `bytes`, so the total length is:
diff --git a/core/lib/multivm/src/interface/types/outputs/execution_state.rs b/core/lib/multivm/src/interface/types/outputs/execution_state.rs
index 581bf32bc453..cc7bb64d4030 100644
--- a/core/lib/multivm/src/interface/types/outputs/execution_state.rs
+++ b/core/lib/multivm/src/interface/types/outputs/execution_state.rs
@@ -1,7 +1,7 @@
 use zksync_types::{
     l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
     zk_evm_types::LogQuery,
-    VmEvent, U256,
+    StorageLog, VmEvent, U256,
 };
 
 /// State of the VM since the start of the batch execution.
@@ -10,7 +10,7 @@ pub struct CurrentExecutionState {
     /// Events produced by the VM.
     pub events: Vec<VmEvent>,
     /// The deduplicated storage logs produced by the VM.
-    pub deduplicated_storage_log_queries: Vec<LogQuery>,
+    pub deduplicated_storage_logs: Vec<StorageLog>,
     /// Hashes of the contracts used by the VM.
     pub used_contract_hashes: Vec<U256>,
     /// L2 to L1 logs produced by the VM.
diff --git a/core/lib/multivm/src/interface/types/outputs/finished_l1batch.rs b/core/lib/multivm/src/interface/types/outputs/finished_l1batch.rs
index 90cd0d195620..9c0afc6659f0 100644
--- a/core/lib/multivm/src/interface/types/outputs/finished_l1batch.rs
+++ b/core/lib/multivm/src/interface/types/outputs/finished_l1batch.rs
@@ -1,4 +1,4 @@
-use zksync_types::H256;
+use zksync_types::writes::StateDiffRecord;
 
 use super::{BootloaderMemory, CurrentExecutionState, VmExecutionResultAndLogs};
 
@@ -13,7 +13,6 @@ pub struct FinishedL1Batch {
     pub final_bootloader_memory: Option<BootloaderMemory>,
     /// Pubdata to be published on L1. Could be none for old versions of the VM.
     pub pubdata_input: Option<Vec<u8>>,
-    /// List of hashed keys of slots that were initially written in the batch.
-    /// Could be none for old versions of the VM.
-    pub initially_written_slots: Option<Vec<H256>>,
+    /// List of state diffs. Could be none for old versions of the VM.
+    pub state_diffs: Option<Vec<StateDiffRecord>>,
 }
diff --git a/core/lib/multivm/src/utils.rs b/core/lib/multivm/src/utils.rs
index 1f4d55ea66ae..a15fdba6b703 100644
--- a/core/lib/multivm/src/utils.rs
+++ b/core/lib/multivm/src/utils.rs
@@ -441,8 +441,35 @@ pub fn get_max_batch_gas_limit(version: VmVersion) -> u64 {
         }
         VmVersion::Vm1_4_1 => crate::vm_1_4_1::constants::BLOCK_GAS_LIMIT as u64,
         VmVersion::Vm1_4_2 => crate::vm_1_4_2::constants::BLOCK_GAS_LIMIT as u64,
-        VmVersion::Vm1_5_0SmallBootloaderMemory => crate::vm_latest::constants::BATCH_GAS_LIMIT,
-        VmVersion::Vm1_5_0IncreasedBootloaderMemory => crate::vm_latest::constants::BATCH_GAS_LIMIT,
+        VmVersion::Vm1_5_0SmallBootloaderMemory | VmVersion::Vm1_5_0IncreasedBootloaderMemory => {
+            crate::vm_latest::constants::BATCH_GAS_LIMIT
+        }
+    }
+}
+
+pub fn get_eth_call_gas_limit(version: VmVersion) -> u64 {
+    match version {
+        VmVersion::M5WithRefunds | VmVersion::M5WithoutRefunds => {
+            crate::vm_m5::utils::ETH_CALL_GAS_LIMIT as u64
+        }
+        VmVersion::M6Initial | VmVersion::M6BugWithCompressionFixed => {
+            crate::vm_m6::utils::ETH_CALL_GAS_LIMIT as u64
+        }
+        VmVersion::Vm1_3_2 => crate::vm_1_3_2::utils::ETH_CALL_GAS_LIMIT as u64,
+        VmVersion::VmVirtualBlocks => {
+            crate::vm_virtual_blocks::constants::ETH_CALL_GAS_LIMIT as u64
+        }
+        VmVersion::VmVirtualBlocksRefundsEnhancement => {
+            crate::vm_refunds_enhancement::constants::ETH_CALL_GAS_LIMIT as u64
+        }
+        VmVersion::VmBoojumIntegration => {
+            crate::vm_boojum_integration::constants::ETH_CALL_GAS_LIMIT as u64
+        }
+        VmVersion::Vm1_4_1 => crate::vm_1_4_1::constants::ETH_CALL_GAS_LIMIT as u64,
+        VmVersion::Vm1_4_2 => crate::vm_1_4_2::constants::ETH_CALL_GAS_LIMIT as u64,
+        VmVersion::Vm1_5_0SmallBootloaderMemory | VmVersion::Vm1_5_0IncreasedBootloaderMemory => {
+            crate::vm_latest::constants::ETH_CALL_GAS_LIMIT
+        }
     }
 }
 
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/event_sink.rs b/core/lib/multivm/src/versions/vm_1_3_2/event_sink.rs
index b9aea7e09afc..7f7b44071a1a 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/event_sink.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/event_sink.rs
@@ -74,7 +74,8 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         // since if rollbacks of parents were not appended anywhere we just still keep them
         for el in history {
             // we are time ordered here in terms of rollbacks
-            if tmp.get(&el.timestamp.0).is_some() {
+            #[allow(clippy::map_entry)]
+            if tmp.contains_key(&el.timestamp.0) {
                 assert!(el.rollback);
                 tmp.remove(&el.timestamp.0);
             } else {
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/oracles/storage.rs b/core/lib/multivm/src/versions/vm_1_3_2/oracles/storage.rs
index 3b72f89fcbd6..692a0496751a 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/oracles/storage.rs
@@ -7,7 +7,7 @@ use zk_evm_1_3_3::{
 };
 use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::{
-    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogQueryType,
+    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogKind,
     BOOTLOADER_ADDRESS, U256,
 };
 use zksync_utils::u256_to_h256;
@@ -84,7 +84,7 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         self.frames_stack.push_forward(
             Box::new(StorageLogQuery {
                 log_query: query,
-                log_type: StorageLogQueryType::Read,
+                log_type: StorageLogKind::Read,
             }),
             query.timestamp,
         );
@@ -100,9 +100,9 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
 
         let is_initial_write = self.storage.get_ptr().borrow_mut().is_write_initial(&key);
         let log_query_type = if is_initial_write {
-            StorageLogQueryType::InitialWrite
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
 
         query.read_value = current_value;
@@ -284,12 +284,12 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
             // perform actual rollback
             for query in self.frames_stack.rollback().current_frame().iter().rev() {
                 let read_value = match query.log_type {
-                    StorageLogQueryType::Read => {
+                    StorageLogKind::Read => {
                         // Having Read logs in rollback is not possible
                         tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
-                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                    StorageLogKind::InitialWrite | StorageLogKind::RepeatedWrite => {
                         query.log_query.read_value
                     }
                 };
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/oracles/tracer/utils.rs b/core/lib/multivm/src/versions/vm_1_3_2/oracles/tracer/utils.rs
index 5ee8d8554b65..86ed02365a94 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/oracles/tracer/utils.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/oracles/tracer/utils.rs
@@ -88,7 +88,7 @@ pub(crate) fn get_debug_log<H: HistoryMode>(
     let data = U256::from_big_endian(&data);
 
     // For long data, it is better to use hex-encoding for greater readability
-    let data_str = if data > U256::from(u64::max_value()) {
+    let data_str = if data > U256::from(u64::MAX) {
         let mut bytes = [0u8; 32];
         data.to_big_endian(&mut bytes);
         format!("0x{}", hex::encode(bytes))
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/test_utils.rs b/core/lib/multivm/src/versions/vm_1_3_2/test_utils.rs
index 375a8bdb7ade..603725790f8d 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/test_utils.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/test_utils.rs
@@ -155,7 +155,7 @@ pub fn get_create_execute(code: &[u8], calldata: &[u8]) -> Execute {
     Execute {
         contract_address: CONTRACT_DEPLOYER_ADDRESS,
         calldata,
-        factory_deps: Some(vec![code.to_vec()]),
+        factory_deps: vec![code.to_vec()],
         value: U256::zero(),
     }
 }
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/transaction_data.rs b/core/lib/multivm/src/versions/vm_1_3_2/transaction_data.rs
index 896af8d84f40..788a52206e80 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/transaction_data.rs
@@ -89,7 +89,7 @@ impl From<Transaction> for TransactionData {
                     ],
                     data: execute_tx.execute.calldata,
                     signature: common_data.signature,
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: common_data.paymaster_params.paymaster_input,
                     reserved_dynamic: vec![],
                 }
@@ -118,7 +118,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                 }
@@ -147,7 +147,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                 }
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/utils.rs b/core/lib/multivm/src/versions/vm_1_3_2/utils.rs
index bd07e256a443..0be7a2837af0 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/utils.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/utils.rs
@@ -8,7 +8,7 @@ use zk_evm_1_3_3::{
 use zksync_contracts::{read_zbin_bytecode, BaseSystemContracts};
 use zksync_state::WriteStorage;
 use zksync_system_constants::ZKPORTER_IS_AVAILABLE;
-use zksync_types::{Address, StorageLogQueryType, H160, MAX_L2_TX_GAS_LIMIT, U256};
+use zksync_types::{Address, StorageLogKind, H160, MAX_L2_TX_GAS_LIMIT, U256};
 use zksync_utils::h256_to_u256;
 
 use crate::vm_1_3_2::{
@@ -257,5 +257,5 @@ pub(crate) fn calculate_computational_gas_used<
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
diff --git a/core/lib/multivm/src/versions/vm_1_3_2/vm.rs b/core/lib/multivm/src/versions/vm_1_3_2/vm.rs
index a672811cefa8..5721f4e2185e 100644
--- a/core/lib/multivm/src/versions/vm_1_3_2/vm.rs
+++ b/core/lib/multivm/src/versions/vm_1_3_2/vm.rs
@@ -164,7 +164,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         CurrentExecutionState {
             events,
-            deduplicated_storage_log_queries: deduped_storage_log_queries
+            deduplicated_storage_logs: deduped_storage_log_queries
                 .into_iter()
                 .map(GlueInto::glue_into)
                 .collect(),
@@ -196,7 +196,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
         }
         self.last_tx_compressed_bytecodes = vec![];
         let bytecodes = if with_compression {
-            let deps = tx.execute.factory_deps.as_deref().unwrap_or_default();
+            let deps = &tx.execute.factory_deps;
             let mut deps_hashes = HashSet::with_capacity(deps.len());
             let mut bytecode_hashes = vec![];
             let filtered_deps = deps.iter().filter_map(|bytecode| {
@@ -213,7 +213,8 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             });
             let compressed_bytecodes: Vec<_> = filtered_deps.collect();
 
-            self.last_tx_compressed_bytecodes = compressed_bytecodes.clone();
+            self.last_tx_compressed_bytecodes
+                .clone_from(&compressed_bytecodes);
             crate::vm_1_3_2::vm_with_bootloader::push_transaction_to_bootloader_memory(
                 &mut self.vm,
                 &tx,
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/implementation/logs.rs b/core/lib/multivm/src/versions/vm_1_4_1/implementation/logs.rs
index c35dfd666f21..fb1b6f3625db 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/implementation/logs.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/implementation/logs.rs
@@ -46,10 +46,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             storage_logs_count + log_queries.len() + precompile_calls_count;
 
         VmExecutionLogs {
-            storage_logs: storage_logs
-                .into_iter()
-                .map(|log| log.glue_into())
-                .collect(),
+            storage_logs: storage_logs.into_iter().map(GlueInto::glue_into).collect(),
             events,
             user_l2_to_l1_logs: user_logs
                 .into_iter()
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/old_vm/event_sink.rs b/core/lib/multivm/src/versions/vm_1_4_1/old_vm/event_sink.rs
index 5886ea067760..0c9d1bb01cb2 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/old_vm/event_sink.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/old_vm/event_sink.rs
@@ -164,7 +164,8 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         // since if rollbacks of parents were not appended anywhere we just still keep them
         for el in history {
             // we are time ordered here in terms of rollbacks
-            if tmp.get(&el.timestamp.0).is_some() {
+            #[allow(clippy::map_entry)]
+            if tmp.contains_key(&el.timestamp.0) {
                 assert!(el.rollback);
                 tmp.remove(&el.timestamp.0);
             } else {
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/old_vm/utils.rs b/core/lib/multivm/src/versions/vm_1_4_1/old_vm/utils.rs
index 3f63e9377c90..ef73f9a54c1d 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/old_vm/utils.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/old_vm/utils.rs
@@ -16,6 +16,7 @@ pub(crate) enum VmExecutionResult {
     Ok(Vec<u8>),
     Revert(Vec<u8>),
     Panic,
+    #[allow(dead_code)]
     MostLikelyDidNotFinish(Address, u16),
 }
 
@@ -31,6 +32,7 @@ pub(crate) const fn aux_heap_page_from_base(base: MemoryPage) -> MemoryPage {
     MemoryPage(base.0 + 3)
 }
 
+#[allow(dead_code)]
 pub(crate) trait FixedLengthIterator<'a, I: 'a, const N: usize>: Iterator<Item = I>
 where
     Self: 'a,
@@ -42,6 +44,7 @@ where
 
 pub(crate) trait IntoFixedLengthByteIterator<const N: usize> {
     type IntoIter: FixedLengthIterator<'static, u8, N>;
+    #[allow(dead_code)]
     fn into_le_iter(self) -> Self::IntoIter;
     fn into_be_iter(self) -> Self::IntoIter;
 }
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/oracles/storage.rs b/core/lib/multivm/src/versions/vm_1_4_1/oracles/storage.rs
index df0283c6bcc8..a5ff6b8883a6 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/oracles/storage.rs
@@ -12,7 +12,7 @@ use zksync_types::{
         compression::compress_with_best_strategy, BYTES_PER_DERIVED_KEY,
         BYTES_PER_ENUMERATION_INDEX,
     },
-    AccountTreeId, Address, StorageKey, StorageLogQueryType, BOOTLOADER_ADDRESS, U256,
+    AccountTreeId, Address, StorageKey, StorageLogKind, BOOTLOADER_ADDRESS, U256,
 };
 use zksync_utils::u256_to_h256;
 
@@ -139,7 +139,7 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         self.frames_stack.push_forward(
             Box::new(StorageLogQuery {
                 log_query: query.glue_into(),
-                log_type: StorageLogQueryType::Read,
+                log_type: StorageLogKind::Read,
             }),
             query.timestamp,
         );
@@ -158,9 +158,9 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
 
         let is_initial_write = self.storage.get_ptr().borrow_mut().is_write_initial(&key);
         let log_query_type = if is_initial_write {
-            StorageLogQueryType::InitialWrite
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
 
         self.set_initial_value(&key, current_value, query.timestamp);
@@ -426,12 +426,12 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
             // perform actual rollback
             for query in self.frames_stack.rollback().current_frame().iter().rev() {
                 let read_value = match query.log_type {
-                    StorageLogQueryType::Read => {
+                    StorageLogKind::Read => {
                         // Having Read logs in rollback is not possible
                         tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
-                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                    StorageLogKind::InitialWrite | StorageLogKind::RepeatedWrite => {
                         query.log_query.read_value
                     }
                 };
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/tracers/utils.rs b/core/lib/multivm/src/versions/vm_1_4_1/tracers/utils.rs
index 86becfbbc96b..7b24e482b72d 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/tracers/utils.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/tracers/utils.rs
@@ -99,7 +99,7 @@ pub(crate) fn get_debug_log<H: HistoryMode>(
     let data = U256::from_big_endian(&data);
 
     // For long data, it is better to use hex-encoding for greater readability
-    let data_str = if data > U256::from(u64::max_value()) {
+    let data_str = if data > U256::from(u64::MAX) {
         let mut bytes = [0u8; 32];
         data.to_big_endian(&mut bytes);
         format!("0x{}", hex::encode(bytes))
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_1_4_1/types/internals/transaction_data.rs
index 3ec35ebb2478..1379b853a542 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/types/internals/transaction_data.rs
@@ -91,7 +91,7 @@ impl From<Transaction> for TransactionData {
                     ],
                     data: execute_tx.execute.calldata,
                     signature: common_data.signature,
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: common_data.paymaster_params.paymaster_input,
                     reserved_dynamic: vec![],
                     raw_bytes: execute_tx.raw_bytes.map(|a| a.0),
@@ -121,7 +121,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -151,7 +151,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -231,11 +231,12 @@ impl TransactionData {
         }
 
         let l2_tx: L2Tx = self.clone().try_into().unwrap();
-        let transaction_request: TransactionRequest = l2_tx.into();
+        let mut transaction_request: TransactionRequest = l2_tx.into();
+        transaction_request.chain_id = Some(chain_id.as_u64());
 
         // It is assumed that the `TransactionData` always has all the necessary components to recover the hash.
         transaction_request
-            .get_tx_hash(chain_id)
+            .get_tx_hash()
             .expect("Could not recover L2 transaction hash")
     }
 
@@ -283,12 +284,11 @@ impl TryInto<L2Tx> for TransactionData {
                 paymaster_input: self.paymaster_input,
             },
         };
-        let factory_deps = (!self.factory_deps.is_empty()).then_some(self.factory_deps);
         let execute = Execute {
             contract_address: self.to,
             value: self.value,
             calldata: self.data,
-            factory_deps,
+            factory_deps: self.factory_deps,
         };
 
         Ok(L2Tx {
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/utils/logs.rs b/core/lib/multivm/src/versions/vm_1_4_1/utils/logs.rs
index 079c90a07fad..fab90d9bee56 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/utils/logs.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/utils/logs.rs
@@ -1,6 +1,6 @@
 use zk_evm_1_4_1::aux_structures::{LogQuery, Timestamp};
 use zksync_state::WriteStorage;
-use zksync_types::{l2_to_l1_log::L2ToL1Log, StorageLogQueryType, VmEvent};
+use zksync_types::{l2_to_l1_log::L2ToL1Log, StorageLogKind, VmEvent};
 
 use crate::{
     glue::GlueInto,
@@ -33,5 +33,5 @@ pub(crate) fn collect_events_and_l1_system_logs_after_timestamp<S: WriteStorage,
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
diff --git a/core/lib/multivm/src/versions/vm_1_4_1/vm.rs b/core/lib/multivm/src/versions/vm_1_4_1/vm.rs
index 07ff757f3efa..993cc7950554 100644
--- a/core/lib/multivm/src/versions/vm_1_4_1/vm.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_1/vm.rs
@@ -112,7 +112,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         CurrentExecutionState {
             events,
-            deduplicated_storage_log_queries: deduped_storage_log_queries
+            deduplicated_storage_logs: deduped_storage_log_queries
                 .into_iter()
                 .map(GlueInto::glue_into)
                 .collect(),
@@ -179,7 +179,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
                     .clone()
                     .build_pubdata(false),
             ),
-            initially_written_slots: None,
+            state_diffs: None,
         }
     }
 }
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/implementation/logs.rs b/core/lib/multivm/src/versions/vm_1_4_2/implementation/logs.rs
index 47acdfeb3bad..c307b7aa8099 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/implementation/logs.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/implementation/logs.rs
@@ -46,10 +46,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             storage_logs_count + log_queries.len() + precompile_calls_count;
 
         VmExecutionLogs {
-            storage_logs: storage_logs
-                .into_iter()
-                .map(|log| log.glue_into())
-                .collect(),
+            storage_logs: storage_logs.into_iter().map(GlueInto::glue_into).collect(),
             events,
             user_l2_to_l1_logs: user_logs
                 .into_iter()
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/old_vm/event_sink.rs b/core/lib/multivm/src/versions/vm_1_4_2/old_vm/event_sink.rs
index a85259bbc2ba..ce946ba77c8f 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/old_vm/event_sink.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/old_vm/event_sink.rs
@@ -164,7 +164,8 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         // since if rollbacks of parents were not appended anywhere we just still keep them
         for el in history {
             // we are time ordered here in terms of rollbacks
-            if tmp.get(&el.timestamp.0).is_some() {
+            #[allow(clippy::map_entry)]
+            if tmp.contains_key(&el.timestamp.0) {
                 assert!(el.rollback);
                 tmp.remove(&el.timestamp.0);
             } else {
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/old_vm/utils.rs b/core/lib/multivm/src/versions/vm_1_4_2/old_vm/utils.rs
index a7d592c4853f..4ea0a526f6e8 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/old_vm/utils.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/old_vm/utils.rs
@@ -16,6 +16,7 @@ pub(crate) enum VmExecutionResult {
     Ok(Vec<u8>),
     Revert(Vec<u8>),
     Panic,
+    #[allow(dead_code)]
     MostLikelyDidNotFinish(Address, u16),
 }
 
@@ -31,6 +32,7 @@ pub(crate) const fn aux_heap_page_from_base(base: MemoryPage) -> MemoryPage {
     MemoryPage(base.0 + 3)
 }
 
+#[allow(dead_code)]
 pub(crate) trait FixedLengthIterator<'a, I: 'a, const N: usize>: Iterator<Item = I>
 where
     Self: 'a,
@@ -42,6 +44,7 @@ where
 
 pub(crate) trait IntoFixedLengthByteIterator<const N: usize> {
     type IntoIter: FixedLengthIterator<'static, u8, N>;
+    #[allow(dead_code)]
     fn into_le_iter(self) -> Self::IntoIter;
     fn into_be_iter(self) -> Self::IntoIter;
 }
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/oracles/storage.rs b/core/lib/multivm/src/versions/vm_1_4_2/oracles/storage.rs
index e5cb044c5bdd..9cc9945f84ff 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/oracles/storage.rs
@@ -12,7 +12,7 @@ use zksync_types::{
         compression::compress_with_best_strategy, BYTES_PER_DERIVED_KEY,
         BYTES_PER_ENUMERATION_INDEX,
     },
-    AccountTreeId, Address, StorageKey, StorageLogQueryType, BOOTLOADER_ADDRESS, U256,
+    AccountTreeId, Address, StorageKey, StorageLogKind, BOOTLOADER_ADDRESS, U256,
 };
 use zksync_utils::u256_to_h256;
 
@@ -139,7 +139,7 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         self.frames_stack.push_forward(
             Box::new(StorageLogQuery {
                 log_query: query.glue_into(),
-                log_type: StorageLogQueryType::Read,
+                log_type: StorageLogKind::Read,
             }),
             query.timestamp,
         );
@@ -158,9 +158,9 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
 
         let is_initial_write = self.storage.get_ptr().borrow_mut().is_write_initial(&key);
         let log_query_type = if is_initial_write {
-            StorageLogQueryType::InitialWrite
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
 
         self.set_initial_value(&key, current_value, query.timestamp);
@@ -426,12 +426,12 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
             // perform actual rollback
             for query in self.frames_stack.rollback().current_frame().iter().rev() {
                 let read_value = match query.log_type {
-                    StorageLogQueryType::Read => {
+                    StorageLogKind::Read => {
                         // Having Read logs in rollback is not possible
                         tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
-                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                    StorageLogKind::InitialWrite | StorageLogKind::RepeatedWrite => {
                         query.log_query.read_value
                     }
                 };
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/tracers/utils.rs b/core/lib/multivm/src/versions/vm_1_4_2/tracers/utils.rs
index 35f916d3c456..5832241d262d 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/tracers/utils.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/tracers/utils.rs
@@ -99,7 +99,7 @@ pub(crate) fn get_debug_log<H: HistoryMode>(
     let data = U256::from_big_endian(&data);
 
     // For long data, it is better to use hex-encoding for greater readability
-    let data_str = if data > U256::from(u64::max_value()) {
+    let data_str = if data > U256::from(u64::MAX) {
         let mut bytes = [0u8; 32];
         data.to_big_endian(&mut bytes);
         format!("0x{}", hex::encode(bytes))
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_1_4_2/types/internals/transaction_data.rs
index 6ad20f16b4f2..3498e51ec308 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/types/internals/transaction_data.rs
@@ -91,7 +91,7 @@ impl From<Transaction> for TransactionData {
                     ],
                     data: execute_tx.execute.calldata,
                     signature: common_data.signature,
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: common_data.paymaster_params.paymaster_input,
                     reserved_dynamic: vec![],
                     raw_bytes: execute_tx.raw_bytes.map(|a| a.0),
@@ -121,7 +121,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -151,7 +151,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -231,11 +231,12 @@ impl TransactionData {
         }
 
         let l2_tx: L2Tx = self.clone().try_into().unwrap();
-        let transaction_request: TransactionRequest = l2_tx.into();
+        let mut transaction_request: TransactionRequest = l2_tx.into();
+        transaction_request.chain_id = Some(chain_id.as_u64());
 
         // It is assumed that the `TransactionData` always has all the necessary components to recover the hash.
         transaction_request
-            .get_tx_hash(chain_id)
+            .get_tx_hash()
             .expect("Could not recover L2 transaction hash")
     }
 
@@ -283,12 +284,11 @@ impl TryInto<L2Tx> for TransactionData {
                 paymaster_input: self.paymaster_input,
             },
         };
-        let factory_deps = (!self.factory_deps.is_empty()).then_some(self.factory_deps);
         let execute = Execute {
             contract_address: self.to,
             value: self.value,
             calldata: self.data,
-            factory_deps,
+            factory_deps: self.factory_deps,
         };
 
         Ok(L2Tx {
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/utils/logs.rs b/core/lib/multivm/src/versions/vm_1_4_2/utils/logs.rs
index e5df3f5914ab..ef9f124773be 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/utils/logs.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/utils/logs.rs
@@ -1,6 +1,6 @@
 use zk_evm_1_4_1::aux_structures::{LogQuery, Timestamp};
 use zksync_state::WriteStorage;
-use zksync_types::{l2_to_l1_log::L2ToL1Log, StorageLogQueryType, VmEvent};
+use zksync_types::{l2_to_l1_log::L2ToL1Log, StorageLogKind, VmEvent};
 
 use crate::{
     glue::GlueInto,
@@ -33,5 +33,5 @@ pub(crate) fn collect_events_and_l1_system_logs_after_timestamp<S: WriteStorage,
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
diff --git a/core/lib/multivm/src/versions/vm_1_4_2/vm.rs b/core/lib/multivm/src/versions/vm_1_4_2/vm.rs
index daa29d4059d8..6a02b162733d 100644
--- a/core/lib/multivm/src/versions/vm_1_4_2/vm.rs
+++ b/core/lib/multivm/src/versions/vm_1_4_2/vm.rs
@@ -3,7 +3,7 @@ use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::{
     event::extract_l2tol1logs_from_l1_messenger,
     l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
-    Transaction, H256,
+    Transaction,
 };
 use zksync_utils::bytecode::CompressedBytecodeInfo;
 
@@ -112,7 +112,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         CurrentExecutionState {
             events,
-            deduplicated_storage_log_queries: deduped_storage_log_queries
+            deduplicated_storage_logs: deduped_storage_log_queries
                 .into_iter()
                 .map(GlueInto::glue_into)
                 .collect(),
@@ -179,17 +179,11 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
                     .clone()
                     .build_pubdata(false),
             ),
-            initially_written_slots: Some(
+            state_diffs: Some(
                 self.bootloader_state
                     .get_pubdata_information()
                     .state_diffs
-                    .iter()
-                    .filter_map(|record| {
-                        record
-                            .is_write_initial()
-                            .then_some(H256(record.derived_key))
-                    })
-                    .collect(),
+                    .clone(),
             ),
         }
     }
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/implementation/logs.rs b/core/lib/multivm/src/versions/vm_boojum_integration/implementation/logs.rs
index 73be046d7978..daf077fcca51 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/implementation/logs.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/implementation/logs.rs
@@ -48,10 +48,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             storage_logs_count + log_queries.len() + precompile_calls_count;
 
         VmExecutionLogs {
-            storage_logs: storage_logs
-                .into_iter()
-                .map(|log| log.glue_into())
-                .collect(),
+            storage_logs: storage_logs.into_iter().map(GlueInto::glue_into).collect(),
             events,
             user_l2_to_l1_logs: user_logs
                 .into_iter()
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/old_vm/event_sink.rs b/core/lib/multivm/src/versions/vm_boojum_integration/old_vm/event_sink.rs
index 6638057643d4..2bd932d42b7f 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/old_vm/event_sink.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/old_vm/event_sink.rs
@@ -164,7 +164,8 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         // since if rollbacks of parents were not appended anywhere we just still keep them
         for el in history {
             // we are time ordered here in terms of rollbacks
-            if tmp.get(&el.timestamp.0).is_some() {
+            #[allow(clippy::map_entry)]
+            if tmp.contains_key(&el.timestamp.0) {
                 assert!(el.rollback);
                 tmp.remove(&el.timestamp.0);
             } else {
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/old_vm/utils.rs b/core/lib/multivm/src/versions/vm_boojum_integration/old_vm/utils.rs
index 342cc64ea2ac..130bad49e38a 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/old_vm/utils.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/old_vm/utils.rs
@@ -19,6 +19,7 @@ pub(crate) enum VmExecutionResult {
     Ok(Vec<u8>),
     Revert(Vec<u8>),
     Panic,
+    #[allow(dead_code)]
     MostLikelyDidNotFinish(Address, u16),
 }
 
@@ -34,6 +35,7 @@ pub(crate) const fn aux_heap_page_from_base(base: MemoryPage) -> MemoryPage {
     MemoryPage(base.0 + 3)
 }
 
+#[allow(dead_code)]
 pub(crate) trait FixedLengthIterator<'a, I: 'a, const N: usize>: Iterator<Item = I>
 where
     Self: 'a,
@@ -45,6 +47,7 @@ where
 
 pub(crate) trait IntoFixedLengthByteIterator<const N: usize> {
     type IntoIter: FixedLengthIterator<'static, u8, N>;
+    #[allow(dead_code)]
     fn into_le_iter(self) -> Self::IntoIter;
     fn into_be_iter(self) -> Self::IntoIter;
 }
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/oracles/storage.rs b/core/lib/multivm/src/versions/vm_boojum_integration/oracles/storage.rs
index 1ea8c7822e18..e505c2d9630c 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/oracles/storage.rs
@@ -12,7 +12,7 @@ use zksync_types::{
         compression::compress_with_best_strategy, BYTES_PER_DERIVED_KEY,
         BYTES_PER_ENUMERATION_INDEX,
     },
-    AccountTreeId, Address, StorageKey, StorageLogQueryType, BOOTLOADER_ADDRESS, U256,
+    AccountTreeId, Address, StorageKey, StorageLogKind, BOOTLOADER_ADDRESS, U256,
 };
 use zksync_utils::u256_to_h256;
 
@@ -136,7 +136,7 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         self.frames_stack.push_forward(
             Box::new(StorageLogQuery {
                 log_query: query,
-                log_type: StorageLogQueryType::Read,
+                log_type: StorageLogKind::Read,
             }),
             query.timestamp,
         );
@@ -155,9 +155,9 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
 
         let is_initial_write = self.storage.get_ptr().borrow_mut().is_write_initial(&key);
         let log_query_type = if is_initial_write {
-            StorageLogQueryType::InitialWrite
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
 
         self.set_initial_value(&key, current_value, query.timestamp);
@@ -423,12 +423,12 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
             // perform actual rollback
             for query in self.frames_stack.rollback().current_frame().iter().rev() {
                 let read_value = match query.log_type {
-                    StorageLogQueryType::Read => {
+                    StorageLogKind::Read => {
                         // Having Read logs in rollback is not possible
                         tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
-                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                    StorageLogKind::InitialWrite | StorageLogKind::RepeatedWrite => {
                         query.log_query.read_value
                     }
                 };
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/tracers/utils.rs b/core/lib/multivm/src/versions/vm_boojum_integration/tracers/utils.rs
index 58264d89c8ea..aafdab9ee428 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/tracers/utils.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/tracers/utils.rs
@@ -99,7 +99,7 @@ pub(crate) fn get_debug_log<H: HistoryMode>(
     let data = U256::from_big_endian(&data);
 
     // For long data, it is better to use hex-encoding for greater readability
-    let data_str = if data > U256::from(u64::max_value()) {
+    let data_str = if data > U256::from(u64::MAX) {
         let mut bytes = [0u8; 32];
         data.to_big_endian(&mut bytes);
         format!("0x{}", hex::encode(bytes))
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_boojum_integration/types/internals/transaction_data.rs
index ddaca7d158ad..ad740a279dcd 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/types/internals/transaction_data.rs
@@ -91,7 +91,7 @@ impl From<Transaction> for TransactionData {
                     ],
                     data: execute_tx.execute.calldata,
                     signature: common_data.signature,
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: common_data.paymaster_params.paymaster_input,
                     reserved_dynamic: vec![],
                     raw_bytes: execute_tx.raw_bytes.map(|a| a.0),
@@ -121,7 +121,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -151,7 +151,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -245,11 +245,12 @@ impl TransactionData {
         }
 
         let l2_tx: L2Tx = self.clone().try_into().unwrap();
-        let transaction_request: TransactionRequest = l2_tx.into();
+        let mut transaction_request: TransactionRequest = l2_tx.into();
+        transaction_request.chain_id = Some(chain_id.as_u64());
 
         // It is assumed that the `TransactionData` always has all the necessary components to recover the hash.
         transaction_request
-            .get_tx_hash(chain_id)
+            .get_tx_hash()
             .expect("Could not recover L2 transaction hash")
     }
 
@@ -297,12 +298,11 @@ impl TryInto<L2Tx> for TransactionData {
                 paymaster_input: self.paymaster_input,
             },
         };
-        let factory_deps = (!self.factory_deps.is_empty()).then_some(self.factory_deps);
         let execute = Execute {
             contract_address: self.to,
             value: self.value,
             calldata: self.data,
-            factory_deps,
+            factory_deps: self.factory_deps,
         };
 
         Ok(L2Tx {
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/utils/logs.rs b/core/lib/multivm/src/versions/vm_boojum_integration/utils/logs.rs
index 1507f2d5e22d..bc15f88c5437 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/utils/logs.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/utils/logs.rs
@@ -1,7 +1,7 @@
 use zk_evm_1_3_3::aux_structures::LogQuery;
 use zk_evm_1_4_0::aux_structures::Timestamp;
 use zksync_state::WriteStorage;
-use zksync_types::{l2_to_l1_log::L2ToL1Log, StorageLogQueryType, VmEvent};
+use zksync_types::{l2_to_l1_log::L2ToL1Log, StorageLogKind, VmEvent};
 
 use crate::{
     glue::GlueInto,
@@ -34,5 +34,5 @@ pub(crate) fn collect_events_and_l1_system_logs_after_timestamp<S: WriteStorage,
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
diff --git a/core/lib/multivm/src/versions/vm_boojum_integration/vm.rs b/core/lib/multivm/src/versions/vm_boojum_integration/vm.rs
index db8528f58f3f..c893046c8542 100644
--- a/core/lib/multivm/src/versions/vm_boojum_integration/vm.rs
+++ b/core/lib/multivm/src/versions/vm_boojum_integration/vm.rs
@@ -112,7 +112,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         CurrentExecutionState {
             events,
-            deduplicated_storage_log_queries: deduped_storage_log_queries
+            deduplicated_storage_logs: deduped_storage_log_queries
                 .into_iter()
                 .map(GlueInto::glue_into)
                 .collect(),
@@ -179,7 +179,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
                     .clone()
                     .build_pubdata(false),
             ),
-            initially_written_slots: None,
+            state_diffs: None,
         }
     }
 }
diff --git a/core/lib/multivm/src/versions/vm_latest/constants.rs b/core/lib/multivm/src/versions/vm_latest/constants.rs
index 1f02162f7348..01f697ec91a2 100644
--- a/core/lib/multivm/src/versions/vm_latest/constants.rs
+++ b/core/lib/multivm/src/versions/vm_latest/constants.rs
@@ -3,7 +3,7 @@ use zk_evm_1_5_0::aux_structures::MemoryPage;
 pub use zk_evm_1_5_0::zkevm_opcode_defs::system_params::{
     ERGS_PER_CIRCUIT, INITIAL_STORAGE_WRITE_PUBDATA_BYTES,
 };
-use zksync_system_constants::{MAX_L2_TX_GAS_LIMIT, MAX_NEW_FACTORY_DEPS};
+use zksync_system_constants::MAX_NEW_FACTORY_DEPS;
 
 use super::vm::MultiVMSubversion;
 use crate::vm_latest::old_vm::utils::heap_page_from_base;
@@ -160,7 +160,7 @@ pub const BATCH_COMPUTATIONAL_GAS_LIMIT: u32 =
 pub const BATCH_GAS_LIMIT: u64 = 1 << 50;
 
 /// How many gas is allowed to spend on a single transaction in eth_call method
-pub const ETH_CALL_GAS_LIMIT: u32 = MAX_L2_TX_GAS_LIMIT as u32;
+pub const ETH_CALL_GAS_LIMIT: u64 = BATCH_GAS_LIMIT;
 
 /// ID of the transaction from L1
 pub const L1_TX_TYPE: u8 = 255;
diff --git a/core/lib/multivm/src/versions/vm_latest/implementation/logs.rs b/core/lib/multivm/src/versions/vm_latest/implementation/logs.rs
index 5ec6ef062b8a..b42ce16cd0f2 100644
--- a/core/lib/multivm/src/versions/vm_latest/implementation/logs.rs
+++ b/core/lib/multivm/src/versions/vm_latest/implementation/logs.rs
@@ -46,10 +46,7 @@ impl<S: WriteStorage, H: HistoryMode> Vm<S, H> {
             storage_logs_count + log_queries.len() + precompile_calls_count;
 
         VmExecutionLogs {
-            storage_logs: storage_logs
-                .into_iter()
-                .map(|log| log.glue_into())
-                .collect(),
+            storage_logs: storage_logs.into_iter().map(GlueInto::glue_into).collect(),
             events,
             user_l2_to_l1_logs: user_logs
                 .into_iter()
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/event_sink.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/event_sink.rs
index e0569f3586d4..58fad96dec86 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/event_sink.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/event_sink.rs
@@ -164,7 +164,8 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         // since if rollbacks of parents were not appended anywhere we just still keep them
         for el in history {
             // we are time ordered here in terms of rollbacks
-            if tmp.get(&el.timestamp.0).is_some() {
+            #[allow(clippy::map_entry)]
+            if tmp.contains_key(&el.timestamp.0) {
                 assert!(el.rollback);
                 tmp.remove(&el.timestamp.0);
             } else {
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/history_recorder.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/history_recorder.rs
index 5891b3322bfb..650c0217ca65 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/history_recorder.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/history_recorder.rs
@@ -778,6 +778,12 @@ pub struct TransientStorageWrapper {
     inner: HashMap<StorageKey, U256>,
 }
 
+impl TransientStorageWrapper {
+    pub fn inner(&self) -> &HashMap<StorageKey, U256> {
+        &self.inner
+    }
+}
+
 impl WithHistory for TransientStorageWrapper {
     type HistoryRecord = StorageHistoryRecord;
     type ReturnValue = U256;
@@ -814,22 +820,8 @@ impl<H: HistoryMode> HistoryRecorder<TransientStorageWrapper, H> {
         self.apply_historic_record(StorageHistoryRecord { key, value }, timestamp)
     }
 
-    /// Performs zeroing out the storage, while maintaining history about it,
-    /// making it reversible.
-    ///
-    /// Note that while the history is preserved, the inner parts are fully cleared out.
-    /// TODO(X): potentially optimize this function by allowing rollbacks only at the bounds of transactions.
-    pub(crate) fn zero_out(&mut self, timestamp: Timestamp) {
-        let keys = self
-            .inner
-            .inner
-            .drain()
-            .map(|(key, _)| key)
-            .collect::<Vec<_>>();
-
-        for key in keys {
-            self.write_to_storage(key, U256::zero(), timestamp);
-        }
+    pub(crate) fn drain_inner(&mut self) -> Vec<(StorageKey, U256)> {
+        self.inner.inner.drain().collect()
     }
 }
 
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/decommitter.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/decommitter.rs
index 85b18e203ce2..f5cd38779217 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/decommitter.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/oracles/decommitter.rs
@@ -30,7 +30,7 @@ pub struct DecommitterOracle<const B: bool, S, H: HistoryMode> {
     /// Stores pages of memory where certain code hashes have already been decommitted.
     /// It is expected that they all are present in the DB.
     // `decommitted_code_hashes` history is necessary
-    pub decommitted_code_hashes: HistoryRecorder<HashMap<U256, u32>, HistoryEnabled>,
+    pub decommitted_code_hashes: HistoryRecorder<HashMap<U256, Option<u32>>, HistoryEnabled>,
     /// Stores history of decommitment requests.
     decommitment_requests: HistoryRecorder<Vec<()>, H>,
 }
@@ -89,7 +89,7 @@ impl<S: ReadStorage, const B: bool, H: HistoryMode> DecommitterOracle<B, S, H> {
 
     pub fn get_decommitted_code_hashes_with_history(
         &self,
-    ) -> &HistoryRecorder<HashMap<U256, u32>, HistoryEnabled> {
+    ) -> &HistoryRecorder<HashMap<U256, Option<u32>>, HistoryEnabled> {
         &self.decommitted_code_hashes
     }
 
@@ -108,7 +108,7 @@ impl<S: ReadStorage, const B: bool, H: HistoryMode> DecommitterOracle<B, S, H> {
             .map(|(_, value)| value.len() * std::mem::size_of::<U256>())
             .sum::<usize>();
         let decommitted_code_hashes_size =
-            self.decommitted_code_hashes.inner().len() * std::mem::size_of::<(U256, u32)>();
+            self.decommitted_code_hashes.inner().len() * std::mem::size_of::<(U256, Option<u32>)>();
 
         known_bytecodes_size + decommitted_code_hashes_size
     }
@@ -132,7 +132,7 @@ impl<S: ReadStorage, const B: bool, H: HistoryMode> DecommitterOracle<B, S, H> {
         );
         let decommitted_code_hashes_size =
             self.decommitted_code_hashes.borrow_history(|h| h.len(), 0)
-                * std::mem::size_of::<<HashMap<U256, u32> as WithHistory>::HistoryRecord>();
+                * std::mem::size_of::<<HashMap<U256, Option<u32>> as WithHistory>::HistoryRecord>();
 
         known_bytecodes_stack_size + known_bytecodes_heap_size + decommitted_code_hashes_size
     }
@@ -172,6 +172,7 @@ impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcess
             .inner()
             .get(&stored_hash)
             .copied()
+            .flatten()
         {
             partial_query.is_fresh = false;
             partial_query.memory_page = MemoryPage(memory_page);
@@ -179,6 +180,15 @@ impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcess
             Ok(partial_query)
         } else {
             partial_query.is_fresh = true;
+            if self
+                .decommitted_code_hashes
+                .inner()
+                .get(&stored_hash)
+                .is_none()
+            {
+                self.decommitted_code_hashes
+                    .insert(stored_hash, None, partial_query.timestamp);
+            }
 
             Ok(partial_query)
         }
@@ -216,7 +226,7 @@ impl<S: ReadStorage + Debug, const B: bool, H: HistoryMode> DecommittmentProcess
             rw_flag: true,
         };
         self.decommitted_code_hashes
-            .insert(stored_hash, page_to_use.0, timestamp);
+            .insert(stored_hash, Some(page_to_use.0), timestamp);
 
         // Copy the bytecode (that is stored in 'values' Vec) into the memory page.
         if B {
diff --git a/core/lib/multivm/src/versions/vm_latest/old_vm/utils.rs b/core/lib/multivm/src/versions/vm_latest/old_vm/utils.rs
index dd354e983d9e..f7933b4f603f 100644
--- a/core/lib/multivm/src/versions/vm_latest/old_vm/utils.rs
+++ b/core/lib/multivm/src/versions/vm_latest/old_vm/utils.rs
@@ -18,6 +18,7 @@ pub(crate) enum VmExecutionResult {
     Ok(Vec<u8>),
     Revert(Vec<u8>),
     Panic,
+    #[allow(dead_code)]
     MostLikelyDidNotFinish(Address, u16),
 }
 
@@ -33,6 +34,7 @@ pub(crate) const fn aux_heap_page_from_base(base: MemoryPage) -> MemoryPage {
     MemoryPage(base.0 + 3)
 }
 
+#[allow(dead_code)]
 pub(crate) trait FixedLengthIterator<'a, I: 'a, const N: usize>: Iterator<Item = I>
 where
     Self: 'a,
@@ -44,6 +46,7 @@ where
 
 pub(crate) trait IntoFixedLengthByteIterator<const N: usize> {
     type IntoIter: FixedLengthIterator<'static, u8, N>;
+    #[allow(dead_code)]
     fn into_le_iter(self) -> Self::IntoIter;
     fn into_be_iter(self) -> Self::IntoIter;
 }
diff --git a/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs b/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs
index b2d8b3ccd728..22503ce9881c 100644
--- a/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_latest/oracles/storage.rs
@@ -16,9 +16,9 @@ use zksync_types::{
         compression::compress_with_best_strategy, BYTES_PER_DERIVED_KEY,
         BYTES_PER_ENUMERATION_INDEX,
     },
-    AccountTreeId, Address, StorageKey, StorageLogQueryType, BOOTLOADER_ADDRESS, U256,
+    AccountTreeId, Address, StorageKey, StorageLogKind, BOOTLOADER_ADDRESS, U256,
 };
-use zksync_utils::u256_to_h256;
+use zksync_utils::{h256_to_u256, u256_to_h256};
 
 use crate::{
     glue::GlueInto,
@@ -55,6 +55,35 @@ pub(crate) fn storage_key_of_log(query: &LogQuery) -> StorageKey {
     triplet_to_storage_key(query.shard_id, query.address, query.key)
 }
 
+/// The same struct as `zk_evm_1_5_0::aux_structures::LogQuery`, but without the fields that
+/// are not needed to maintain the frame stack of the transient storage.
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct ReducedTstoreLogQuery {
+    shard_id: u8,
+    address: Address,
+    key: U256,
+    written_value: U256,
+    read_value: U256,
+    rw_flag: bool,
+    timestamp: Timestamp,
+    rollback: bool,
+}
+
+impl From<LogQuery> for ReducedTstoreLogQuery {
+    fn from(query: LogQuery) -> Self {
+        Self {
+            shard_id: query.shard_id,
+            address: query.address,
+            key: query.key,
+            written_value: query.written_value,
+            read_value: query.read_value,
+            rw_flag: query.rw_flag,
+            timestamp: query.timestamp,
+            rollback: query.rollback,
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct StorageOracle<S: WriteStorage, H: HistoryMode> {
     // Access to the persistent storage. Please note that it
@@ -67,7 +96,8 @@ pub struct StorageOracle<S: WriteStorage, H: HistoryMode> {
 
     pub(crate) storage_frames_stack: AppDataFrameManagerWithHistory<Box<StorageLogQuery>, H>,
 
-    pub(crate) transient_storage_frames_stack: AppDataFrameManagerWithHistory<Box<LogQuery>, H>,
+    pub(crate) transient_storage_frames_stack:
+        AppDataFrameManagerWithHistory<Box<ReducedTstoreLogQuery>, H>,
 
     // The changes that have been paid for in the current transaction.
     // It is a mapping from storage key to the number of *bytes* that was paid by the user
@@ -100,6 +130,7 @@ impl<S: WriteStorage> OracleWithHistory for StorageOracle<S, HistoryEnabled> {
     fn rollback_to_timestamp(&mut self, timestamp: Timestamp) {
         self.storage.rollback_to_timestamp(timestamp);
         self.storage_frames_stack.rollback_to_timestamp(timestamp);
+        self.transient_storage.rollback_to_timestamp(timestamp);
         self.transient_storage_frames_stack
             .rollback_to_timestamp(timestamp);
         self.paid_changes.rollback_to_timestamp(timestamp);
@@ -157,7 +188,7 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
     fn record_storage_read(&mut self, query: LogQuery) {
         let storage_log_query = StorageLogQuery {
             log_query: query,
-            log_type: StorageLogQueryType::Read,
+            log_type: StorageLogKind::Read,
         };
 
         self.storage_frames_stack
@@ -175,9 +206,9 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
 
         let is_initial_write = self.storage.get_ptr().borrow_mut().is_write_initial(&key);
         let log_query_type = if is_initial_write {
-            StorageLogQueryType::InitialWrite
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
 
         let mut storage_log_query = StorageLogQuery {
@@ -191,12 +222,12 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
             .push_rollback(Box::new(storage_log_query), query.timestamp);
     }
 
-    fn record_transient_storage_read(&mut self, query: LogQuery) {
+    fn record_transient_storage_read(&mut self, query: ReducedTstoreLogQuery) {
         self.transient_storage_frames_stack
             .push_forward(Box::new(query), query.timestamp);
     }
 
-    fn write_transient_storage_value(&mut self, mut query: LogQuery) {
+    fn write_transient_storage_value(&mut self, mut query: ReducedTstoreLogQuery) {
         let key = triplet_to_storage_key(query.shard_id, query.address, query.key);
 
         self.transient_storage
@@ -377,17 +408,19 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
         query.read_value = read_value;
 
         let pubdata_cost = if query.aux_byte == STORAGE_AUX_BYTE && query.rw_flag {
-            // It is considered that the user has paid for the whole base price for the writes
-            let to_pay_by_user = self.base_price_for_write_query(&query);
-            let prepaid = self.prepaid_for_write(&storage_key);
+            let current_price = self.base_price_for_write_query(&query);
+            let previous_price = self.prepaid_for_write(&storage_key);
 
-            // Note, that the diff may be negative, e.g. in case the new write returns to the previous value.
-            let diff = (to_pay_by_user as i32) - (prepaid as i32);
+            // Note, that the diff may be negative, e.g. in case the new write returns to the original value.
+            // The end result is that users pay as much pubdata in total as would have been required to set
+            // the slots to their final values.
+            // The only case where users may overpay is when a previous transaction ends up with a negative pubdata total.
+            let diff = (current_price as i32) - (previous_price as i32);
 
             self.paid_changes.apply_historic_record(
                 HashMapHistoryEvent {
                     key: storage_key,
-                    value: Some(to_pay_by_user),
+                    value: Some(current_price),
                 },
                 query.timestamp,
             );
@@ -399,9 +432,9 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
 
         if query.aux_byte == TRANSIENT_STORAGE_AUX_BYTE {
             if query.rw_flag {
-                self.write_transient_storage_value(query);
+                self.write_transient_storage_value(query.into());
             } else {
-                self.record_transient_storage_read(query);
+                self.record_transient_storage_read(query.into());
             }
         } else if query.aux_byte == STORAGE_AUX_BYTE {
             if query.rw_flag {
@@ -465,12 +498,12 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
                 .rev()
             {
                 let read_value = match query.log_type {
-                    StorageLogQueryType::Read => {
+                    StorageLogKind::Read => {
                         // Having Read logs in rollback is not possible
                         tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
-                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                    StorageLogKind::InitialWrite | StorageLogKind::RepeatedWrite => {
                         query.log_query.read_value
                     }
                 };
@@ -537,7 +570,26 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
     }
 
     fn start_new_tx(&mut self, timestamp: Timestamp) {
-        self.transient_storage.zero_out(timestamp);
+        // Here we perform zeroing out the storage, while maintaining history about it,
+        // making it reversible.
+        //
+        // Note that while the history is preserved, the inner parts are fully cleared out.
+        // TODO(X): potentially optimize this function by allowing rollbacks only at the bounds of transactions.
+
+        let current_active_keys = self.transient_storage.drain_inner();
+        for (key, current_value) in current_active_keys {
+            self.write_transient_storage_value(ReducedTstoreLogQuery {
+                // We currently only support rollup shard id
+                shard_id: 0,
+                address: *key.address(),
+                key: h256_to_u256(*key.key()),
+                written_value: U256::zero(),
+                read_value: current_value,
+                rw_flag: true,
+                timestamp,
+                rollback: false,
+            })
+        }
     }
 }
 
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/block_tip.rs b/core/lib/multivm/src/versions/vm_latest/tests/block_tip.rs
index bf1acb981f3e..78136602dae2 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/block_tip.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/block_tip.rs
@@ -167,7 +167,7 @@ fn execute_test(test_data: L1MessengerTestData) -> TestStatistics {
                 contract_address: CONTRACT_FORCE_DEPLOYER_ADDRESS,
                 calldata: data,
                 value: U256::zero(),
-                factory_deps: None,
+                factory_deps: vec![],
             },
             None,
         );
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/call_tracer.rs b/core/lib/multivm/src/versions/vm_latest/tests/call_tracer.rs
index c97b38b6afc4..a4d0eb2d17e2 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/call_tracer.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/call_tracer.rs
@@ -37,7 +37,7 @@ fn test_max_depth() {
             contract_address: address,
             calldata: vec![],
             value: Default::default(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
@@ -72,7 +72,7 @@ fn test_basic_behavior() {
             contract_address: address,
             calldata: hex::decode(increment_by_6_calldata).unwrap(),
             value: Default::default(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/circuits.rs b/core/lib/multivm/src/versions/vm_latest/tests/circuits.rs
index c582bd28c882..02ec2dc58aaa 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/circuits.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/circuits.rs
@@ -25,7 +25,7 @@ fn test_circuits() {
             contract_address: Address::random(),
             calldata: Vec::new(),
             value: U256::from(1u8),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/code_oracle.rs b/core/lib/multivm/src/versions/vm_latest/tests/code_oracle.rs
index feb60f93a23d..8c8c6e2d0970 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/code_oracle.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/code_oracle.rs
@@ -72,7 +72,7 @@ fn test_code_oracle() {
                 ])
                 .unwrap(),
             value: U256::zero(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
@@ -93,7 +93,7 @@ fn test_code_oracle() {
                 ])
                 .unwrap(),
             value: U256::zero(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
@@ -155,7 +155,7 @@ fn test_code_oracle_big_bytecode() {
                 ])
                 .unwrap(),
             value: U256::zero(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/gas_limit.rs b/core/lib/multivm/src/versions/vm_latest/tests/gas_limit.rs
index 533d9ec660eb..34e1e2d25f31 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/gas_limit.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/gas_limit.rs
@@ -1,3 +1,4 @@
+use zksync_test_account::Account;
 use zksync_types::{fee::Fee, Execute};
 
 use crate::{
@@ -20,15 +21,10 @@ fn test_tx_gas_limit_offset() {
 
     let gas_limit = 9999.into();
     let tx = vm.rich_accounts[0].get_l2_tx_for_execute(
-        Execute {
-            contract_address: Default::default(),
-            calldata: vec![],
-            value: Default::default(),
-            factory_deps: None,
-        },
+        Execute::default(),
         Some(Fee {
             gas_limit,
-            ..Default::default()
+            ..Account::default_fee()
         }),
     );
 
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs b/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs
index 38a4d7cbb43c..1798c700ea2d 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/get_used_contracts.rs
@@ -1,6 +1,14 @@
-use std::collections::{HashMap, HashSet};
+use std::{
+    collections::{HashMap, HashSet},
+    str::FromStr,
+};
 
 use itertools::Itertools;
+use zk_evm_1_5_0::{
+    abstractions::DecommittmentProcessor,
+    aux_structures::{DecommittmentQuery, MemoryPage, Timestamp},
+    zkevm_opcode_defs::{VersionedHashHeader, VersionedHashNormalizedPreimage},
+};
 use zksync_state::WriteStorage;
 use zksync_system_constants::CONTRACT_DEPLOYER_ADDRESS;
 use zksync_test_account::Account;
@@ -70,7 +78,7 @@ fn test_get_used_contracts() {
             contract_address: CONTRACT_DEPLOYER_ADDRESS,
             calldata: big_calldata,
             value: Default::default(),
-            factory_deps: Some(vec![vec![1; 32]]),
+            factory_deps: vec![vec![1; 32]],
         },
         1,
     );
@@ -81,7 +89,7 @@ fn test_get_used_contracts() {
 
     assert!(res2.result.is_failed());
 
-    for factory_dep in tx2.execute.factory_deps.unwrap() {
+    for factory_dep in tx2.execute.factory_deps {
         let hash = hash_bytecode(&factory_dep);
         let hash_to_u256 = h256_to_u256(hash);
         assert!(known_bytecodes_without_aa_code(&vm.vm)
@@ -91,6 +99,47 @@ fn test_get_used_contracts() {
     }
 }
 
+#[test]
+fn test_contract_is_used_right_after_prepare_to_decommit() {
+    let mut vm = VmTesterBuilder::new(HistoryDisabled)
+        .with_empty_in_memory_storage()
+        .with_execution_mode(TxExecutionMode::VerifyExecute)
+        .build();
+
+    assert!(vm.vm.get_used_contracts().is_empty());
+
+    let bytecode_hash =
+        U256::from_str("0x100067ff3124f394104ab03481f7923f0bc4029a2aa9d41cc1d848c81257185")
+            .unwrap();
+    vm.vm
+        .state
+        .decommittment_processor
+        .populate(vec![(bytecode_hash, vec![])], Timestamp(0));
+
+    let header = hex::decode("0100067f").unwrap();
+    let normalized_preimage =
+        hex::decode("f3124f394104ab03481f7923f0bc4029a2aa9d41cc1d848c81257185").unwrap();
+    vm.vm
+        .state
+        .decommittment_processor
+        .prepare_to_decommit(
+            0,
+            DecommittmentQuery {
+                header: VersionedHashHeader(header.try_into().unwrap()),
+                normalized_preimage: VersionedHashNormalizedPreimage(
+                    normalized_preimage.try_into().unwrap(),
+                ),
+                timestamp: Timestamp(0),
+                memory_page: MemoryPage(0),
+                decommitted_length: 0,
+                is_fresh: false,
+            },
+        )
+        .unwrap();
+
+    assert_eq!(vm.vm.get_used_contracts(), vec![bytecode_hash]);
+}
+
 fn known_bytecodes_without_aa_code<S: WriteStorage, H: HistoryMode>(
     vm: &Vm<S, H>,
 ) -> HashMap<U256, Vec<U256>> {
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs b/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs
index 2144ad9812df..359190fc4787 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/l1_tx_execution.rs
@@ -98,7 +98,7 @@ fn test_l1_tx_execution() {
     let res = StorageWritesDeduplicator::apply_on_empty_state(&storage_logs);
 
     // Tx panicked
-    assert_eq!(res.initial_storage_writes - basic_initial_writes, 0);
+    assert_eq!(res.initial_storage_writes, basic_initial_writes);
 
     let tx = account.get_test_contract_transaction(
         deploy_tx.address,
@@ -172,7 +172,7 @@ fn test_l1_tx_execution_high_gas_limit() {
         Execute {
             contract_address: L1_MESSENGER_ADDRESS,
             value: 0.into(),
-            factory_deps: None,
+            factory_deps: vec![],
             calldata,
         },
         0,
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/l2_blocks.rs b/core/lib/multivm/src/versions/vm_latest/tests/l2_blocks.rs
index 59b161019f7c..e62786bb55ef 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/l2_blocks.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/l2_blocks.rs
@@ -37,12 +37,7 @@ fn get_l1_noop() -> Transaction {
             gas_per_pubdata_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
             ..Default::default()
         }),
-        execute: Execute {
-            contract_address: H160::zero(),
-            calldata: vec![],
-            value: U256::zero(),
-            factory_deps: None,
-        },
+        execute: Execute::default(),
         received_timestamp_ms: 0,
         raw_bytes: None,
     }
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs b/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs
index 309e26120af3..076ecb523618 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/nonce_holder.rs
@@ -67,7 +67,7 @@ fn test_nonce_holder() {
                     contract_address: account.address,
                     calldata: vec![12],
                     value: Default::default(),
-                    factory_deps: None,
+                    factory_deps: vec![],
                 },
                 None,
                 Nonce(nonce),
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/precompiles.rs b/core/lib/multivm/src/versions/vm_latest/tests/precompiles.rs
index 652f9c0c03f6..2ab40faf22ca 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/precompiles.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/precompiles.rs
@@ -34,7 +34,7 @@ fn test_keccak() {
             contract_address: address,
             calldata: hex::decode(keccak1000_calldata).unwrap(),
             value: Default::default(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
@@ -78,7 +78,7 @@ fn test_sha256() {
             contract_address: address,
             calldata: hex::decode(sha1000_calldata).unwrap(),
             value: Default::default(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
@@ -115,7 +115,7 @@ fn test_ecrecover() {
             contract_address: account.address,
             calldata: Vec::new(),
             value: Default::default(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/prestate_tracer.rs b/core/lib/multivm/src/versions/vm_latest/tests/prestate_tracer.rs
index 63620c7d9ff8..893ca57bc4d1 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/prestate_tracer.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/prestate_tracer.rs
@@ -91,7 +91,7 @@ fn test_prestate_tracer_diff_mode() {
         contract_address: vm.test_contract.unwrap(),
         calldata: Default::default(),
         value: U256::from(100000),
-        factory_deps: None,
+        factory_deps: vec![],
     };
 
     vm.vm
@@ -101,7 +101,7 @@ fn test_prestate_tracer_diff_mode() {
         contract_address: deployed_address2,
         calldata: Default::default(),
         value: U256::from(200000),
-        factory_deps: None,
+        factory_deps: vec![],
     };
 
     vm.vm
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs b/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
index 51b0cd2f4d9b..72d2271f7158 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/refunds.rs
@@ -94,8 +94,8 @@ fn test_predetermined_refunded_gas() {
     );
 
     assert_eq!(
-        current_state_with_predefined_refunds.deduplicated_storage_log_queries,
-        current_state_without_predefined_refunds.deduplicated_storage_log_queries
+        current_state_with_predefined_refunds.deduplicated_storage_logs,
+        current_state_without_predefined_refunds.deduplicated_storage_logs
     );
     assert_eq!(
         current_state_with_predefined_refunds.used_contract_hashes,
@@ -148,16 +148,16 @@ fn test_predetermined_refunded_gas() {
 
     assert_eq!(
         current_state_with_changed_predefined_refunds
-            .deduplicated_storage_log_queries
+            .deduplicated_storage_logs
             .len(),
         current_state_without_predefined_refunds
-            .deduplicated_storage_log_queries
+            .deduplicated_storage_logs
             .len()
     );
 
     assert_ne!(
-        current_state_with_changed_predefined_refunds.deduplicated_storage_log_queries,
-        current_state_without_predefined_refunds.deduplicated_storage_log_queries
+        current_state_with_changed_predefined_refunds.deduplicated_storage_logs,
+        current_state_without_predefined_refunds.deduplicated_storage_logs
     );
     assert_eq!(
         current_state_with_changed_predefined_refunds.used_contract_hashes,
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs b/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs
index e55aa4075072..5178c5dc29cf 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/require_eip712.rs
@@ -1,5 +1,3 @@
-use std::convert::TryInto;
-
 use ethabi::Token;
 use zksync_eth_signer::{EthereumSigner, TransactionParameters};
 use zksync_system_constants::L2_BASE_TOKEN_ADDRESS;
@@ -68,7 +66,7 @@ async fn test_require_eip712() {
             contract_address: account_abstraction.address,
             calldata: encoded_input,
             value: Default::default(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
@@ -104,7 +102,7 @@ async fn test_require_eip712() {
     l2_tx.set_input(aa_tx, hash);
     // Pretend that operator is malicious and sets the initiator to the AA account.
     l2_tx.common_data.initiator_address = account_abstraction.address;
-    let transaction: Transaction = l2_tx.try_into().unwrap();
+    let transaction: Transaction = l2_tx.into();
 
     vm.vm.push_transaction(transaction);
     let result = vm.vm.execute(VmExecutionMode::OneTx);
@@ -133,11 +131,12 @@ async fn test_require_eip712() {
         },
         account_abstraction.address,
         U256::from(28374938),
-        None,
+        vec![],
         Default::default(),
     );
 
-    let transaction_request: TransactionRequest = tx_712.into();
+    let mut transaction_request: TransactionRequest = tx_712.into();
+    transaction_request.chain_id = Some(chain_id.into());
 
     let domain = Eip712Domain::new(L2ChainId::from(chain_id));
     let signature = private_account
@@ -145,7 +144,7 @@ async fn test_require_eip712() {
         .sign_typed_data(&domain, &transaction_request)
         .await
         .unwrap();
-    let encoded_tx = transaction_request.get_signed_bytes(&signature, L2ChainId::from(chain_id));
+    let encoded_tx = transaction_request.get_signed_bytes(&signature).unwrap();
 
     let (aa_txn_request, aa_hash) =
         TransactionRequest::from_bytes(&encoded_tx, L2ChainId::from(chain_id)).unwrap();
@@ -153,7 +152,7 @@ async fn test_require_eip712() {
     let mut l2_tx = L2Tx::from_request(aa_txn_request, 100000).unwrap();
     l2_tx.set_input(encoded_tx, aa_hash);
 
-    let transaction: Transaction = l2_tx.try_into().unwrap();
+    let transaction: Transaction = l2_tx.into();
     vm.vm.push_transaction(transaction);
     vm.vm.execute(VmExecutionMode::OneTx);
 
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/rollbacks.rs b/core/lib/multivm/src/versions/vm_latest/tests/rollbacks.rs
index 436981dd1582..e0c3ec4157dc 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/rollbacks.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/rollbacks.rs
@@ -103,7 +103,7 @@ fn test_vm_loadnext_rollbacks() {
             }
             .to_bytes(),
             value: Default::default(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
@@ -121,7 +121,7 @@ fn test_vm_loadnext_rollbacks() {
             }
             .to_bytes(),
             value: Default::default(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/sekp256r1.rs b/core/lib/multivm/src/versions/vm_latest/tests/sekp256r1.rs
index 189174568882..07b25eb0a8b0 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/sekp256r1.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/sekp256r1.rs
@@ -51,7 +51,7 @@ fn test_sekp256r1() {
             contract_address: P256VERIFY_PRECOMPILE_ADDRESS,
             calldata: [digest, encoded_r, encoded_s, x, y].concat(),
             value: U256::zero(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/storage.rs b/core/lib/multivm/src/versions/vm_latest/tests/storage.rs
index 42b59ba79bc9..b7c14c54f6df 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/storage.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/storage.rs
@@ -1,13 +1,22 @@
 use ethabi::Token;
 use zksync_contracts::{load_contract, read_bytecode};
-use zksync_types::{Address, Execute, U256};
+use zksync_test_account::Account;
+use zksync_types::{fee::Fee, Address, Execute, U256};
 
 use crate::{
-    interface::{TxExecutionMode, VmExecutionMode, VmInterface},
+    interface::{TxExecutionMode, VmExecutionMode, VmInterface, VmInterfaceHistoryEnabled},
     vm_latest::{tests::tester::VmTesterBuilder, HistoryEnabled},
 };
 
-fn test_storage(first_tx_calldata: Vec<u8>, second_tx_calldata: Vec<u8>) -> u32 {
+#[derive(Debug, Default)]
+
+struct TestTxInfo {
+    calldata: Vec<u8>,
+    fee_overrides: Option<Fee>,
+    should_fail: bool,
+}
+
+fn test_storage(txs: Vec<TestTxInfo>) -> u32 {
     let bytecode = read_bytecode(
         "etc/contracts-test-data/artifacts-zk/contracts/storage/storage.sol/StorageTester.json",
     );
@@ -20,44 +29,58 @@ fn test_storage(first_tx_calldata: Vec<u8>, second_tx_calldata: Vec<u8>) -> u32
         .with_empty_in_memory_storage()
         .with_execution_mode(TxExecutionMode::VerifyExecute)
         .with_deployer()
-        .with_random_rich_accounts(1)
+        .with_random_rich_accounts(txs.len() as u32)
         .with_custom_contracts(vec![(bytecode, test_contract_address, false)])
         .build();
 
-    let account = &mut vm.rich_accounts[0];
-
-    let tx1 = account.get_l2_tx_for_execute(
-        Execute {
-            contract_address: test_contract_address,
-            calldata: first_tx_calldata,
-            value: 0.into(),
-            factory_deps: None,
-        },
-        None,
-    );
-
-    let tx2 = account.get_l2_tx_for_execute(
-        Execute {
-            contract_address: test_contract_address,
-            calldata: second_tx_calldata,
-            value: 0.into(),
-            factory_deps: None,
-        },
-        None,
-    );
-
-    vm.vm.push_transaction(tx1);
-    let result = vm.vm.execute(VmExecutionMode::OneTx);
-    assert!(!result.result.is_failed(), "First tx failed");
-
-    vm.vm.push_transaction(tx2);
-    let result = vm.vm.execute(VmExecutionMode::OneTx);
-    assert!(!result.result.is_failed(), "Second tx failed");
-    result.statistics.pubdata_published
+    let mut last_result = None;
+
+    for (id, tx) in txs.into_iter().enumerate() {
+        let TestTxInfo {
+            calldata,
+            fee_overrides,
+            should_fail,
+        } = tx;
+
+        let account = &mut vm.rich_accounts[id];
+
+        vm.vm.make_snapshot();
+
+        let tx = account.get_l2_tx_for_execute(
+            Execute {
+                contract_address: test_contract_address,
+                calldata,
+                value: 0.into(),
+                factory_deps: vec![],
+            },
+            fee_overrides,
+        );
+
+        vm.vm.push_transaction(tx);
+        let result = vm.vm.execute(VmExecutionMode::OneTx);
+        if should_fail {
+            assert!(result.result.is_failed(), "Transaction should fail");
+            vm.vm.rollback_to_the_latest_snapshot();
+        } else {
+            assert!(!result.result.is_failed(), "Transaction should not fail");
+            vm.vm.pop_snapshot_no_rollback();
+        }
+
+        last_result = Some(result);
+    }
+
+    last_result.unwrap().statistics.pubdata_published
 }
 
 fn test_storage_one_tx(second_tx_calldata: Vec<u8>) -> u32 {
-    test_storage(vec![], second_tx_calldata)
+    test_storage(vec![
+        TestTxInfo::default(),
+        TestTxInfo {
+            calldata: second_tx_calldata,
+            fee_overrides: None,
+            should_fail: false,
+        },
+    ])
 }
 
 #[test]
@@ -115,5 +138,49 @@ fn test_transient_storage_behavior() {
         .encode_input(&[Token::Uint(U256::zero())])
         .unwrap();
 
-    test_storage(first_tstore_test, second_tstore_test);
+    test_storage(vec![
+        TestTxInfo {
+            calldata: first_tstore_test,
+            ..TestTxInfo::default()
+        },
+        TestTxInfo {
+            calldata: second_tstore_test,
+            ..TestTxInfo::default()
+        },
+    ]);
+}
+
+#[test]
+fn test_transient_storage_behavior_panic() {
+    let contract = load_contract(
+        "etc/contracts-test-data/artifacts-zk/contracts/storage/storage.sol/StorageTester.json",
+    );
+
+    let basic_tstore_test = contract
+        .function("tStoreAndRevert")
+        .unwrap()
+        .encode_input(&[Token::Uint(U256::one()), Token::Bool(false)])
+        .unwrap();
+
+    let small_fee = Fee {
+        // Something very-very small to make the validation fail
+        gas_limit: 10_000.into(),
+        ..Account::default_fee()
+    };
+
+    test_storage(vec![
+        TestTxInfo {
+            calldata: basic_tstore_test.clone(),
+            ..TestTxInfo::default()
+        },
+        TestTxInfo {
+            fee_overrides: Some(small_fee),
+            should_fail: true,
+            ..TestTxInfo::default()
+        },
+        TestTxInfo {
+            calldata: basic_tstore_test,
+            ..TestTxInfo::default()
+        },
+    ]);
 }
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/tester/inner_state.rs b/core/lib/multivm/src/versions/vm_latest/tests/tester/inner_state.rs
index 102822351366..2a6fead8cf9c 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/tester/inner_state.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/tester/inner_state.rs
@@ -43,7 +43,7 @@ pub(crate) struct DecommitterTestInnerState<H: HistoryMode> {
     /// so we just compare the modified keys. This is reasonable enough.
     pub(crate) modified_storage_keys: ModifiedKeysMap,
     pub(crate) known_bytecodes: HistoryRecorder<HashMap<U256, Vec<U256>>, H>,
-    pub(crate) decommitted_code_hashes: HistoryRecorder<HashMap<U256, u32>, HistoryEnabled>,
+    pub(crate) decommitted_code_hashes: HistoryRecorder<HashMap<U256, Option<u32>>, HistoryEnabled>,
 }
 
 #[derive(Clone, PartialEq, Debug)]
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/tracing_execution_error.rs b/core/lib/multivm/src/versions/vm_latest/tests/tracing_execution_error.rs
index f02de899b03e..58c5ef77dc42 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/tracing_execution_error.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/tracing_execution_error.rs
@@ -30,7 +30,7 @@ fn test_tracing_of_execution_errors() {
             contract_address,
             calldata: get_execute_error_calldata(),
             value: Default::default(),
-            factory_deps: Some(vec![]),
+            factory_deps: vec![],
         },
         None,
     );
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/transfer.rs b/core/lib/multivm/src/versions/vm_latest/tests/transfer.rs
index 6351c216f3ae..f4198d541f73 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/transfer.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/transfer.rs
@@ -76,7 +76,7 @@ fn test_send_or_transfer(test_option: TestOptions) {
             contract_address: test_contract_address,
             calldata,
             value: U256::zero(),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
@@ -176,7 +176,7 @@ fn test_reentrancy_protection_send_or_transfer(test_option: TestOptions) {
                 .encode_input(&[])
                 .unwrap(),
             value: U256::from(1),
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
@@ -193,7 +193,7 @@ fn test_reentrancy_protection_send_or_transfer(test_option: TestOptions) {
             contract_address: test_contract_address,
             calldata,
             value,
-            factory_deps: None,
+            factory_deps: vec![],
         },
         None,
     );
diff --git a/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs b/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs
index 559cf5884535..80e16248fb2d 100644
--- a/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tests/upgrade.rs
@@ -279,7 +279,7 @@ fn get_forced_deploy_tx(deployment: &[ForceDeployment]) -> Transaction {
     let execute = Execute {
         contract_address: CONTRACT_DEPLOYER_ADDRESS,
         calldata,
-        factory_deps: None,
+        factory_deps: vec![],
         value: U256::zero(),
     };
 
@@ -329,7 +329,7 @@ fn get_complex_upgrade_tx(
     let execute = Execute {
         contract_address: COMPLEX_UPGRADER_ADDRESS,
         calldata: complex_upgrader_calldata,
-        factory_deps: None,
+        factory_deps: vec![],
         value: U256::zero(),
     };
 
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/circuits_tracer.rs b/core/lib/multivm/src/versions/vm_latest/tracers/circuits_tracer.rs
index 7c3012d03f11..4d5dc0b13273 100644
--- a/core/lib/multivm/src/versions/vm_latest/tracers/circuits_tracer.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/circuits_tracer.rs
@@ -177,20 +177,21 @@ impl<S: WriteStorage, H: HistoryMode> CircuitsTracer<S, H> {
             .decommitted_code_hashes
             .history();
         for (_, history_event) in &history[last_decommitment_history_entry_checked..] {
-            // We assume that only insertions may happen during a single VM inspection.
-            assert!(history_event.value.is_none());
-            let bytecode_len = state
-                .decommittment_processor
-                .known_bytecodes
-                .inner()
-                .get(&history_event.key)
-                .expect("Bytecode must be known at this point")
-                .len();
+            // We update cycles once per bytecode when it is actually decommitted.
+            if history_event.value.is_some() {
+                let bytecode_len = state
+                    .decommittment_processor
+                    .known_bytecodes
+                    .inner()
+                    .get(&history_event.key)
+                    .expect("Bytecode must be known at this point")
+                    .len();
 
-            // Each cycle of `CodeDecommitter` processes 2 words.
-            // If the number of words in bytecode is odd, then number of cycles must be rounded up.
-            let decommitter_cycles_used = (bytecode_len + 1) / 2;
-            self.statistics.code_decommitter_cycles += decommitter_cycles_used as u32;
+                // Each cycle of `CodeDecommitter` processes 2 words.
+                // If the number of words in bytecode is odd, then number of cycles must be rounded up.
+                let decommitter_cycles_used = (bytecode_len + 1) / 2;
+                self.statistics.code_decommitter_cycles += decommitter_cycles_used as u32;
+            }
         }
         self.last_decommitment_history_entry_checked = Some(history.len());
     }
diff --git a/core/lib/multivm/src/versions/vm_latest/tracers/utils.rs b/core/lib/multivm/src/versions/vm_latest/tracers/utils.rs
index 2aa827b84637..bad09617b8f0 100644
--- a/core/lib/multivm/src/versions/vm_latest/tracers/utils.rs
+++ b/core/lib/multivm/src/versions/vm_latest/tracers/utils.rs
@@ -102,7 +102,7 @@ pub(crate) fn get_debug_log<H: HistoryMode>(
     let data = U256::from_big_endian(&data);
 
     // For long data, it is better to use hex-encoding for greater readability
-    let data_str = if data > U256::from(u64::max_value()) {
+    let data_str = if data > U256::from(u64::MAX) {
         let mut bytes = [0u8; 32];
         data.to_big_endian(&mut bytes);
         format!("0x{}", hex::encode(bytes))
diff --git a/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs
index aa4df7793d1d..502be0dc22cc 100644
--- a/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_latest/types/internals/transaction_data.rs
@@ -91,7 +91,7 @@ impl From<Transaction> for TransactionData {
                     ],
                     data: execute_tx.execute.calldata,
                     signature: common_data.signature,
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: common_data.paymaster_params.paymaster_input,
                     reserved_dynamic: vec![],
                     raw_bytes: execute_tx.raw_bytes.map(|a| a.0),
@@ -121,7 +121,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -151,7 +151,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -225,11 +225,12 @@ impl TransactionData {
         }
 
         let l2_tx: L2Tx = self.clone().try_into().unwrap();
-        let transaction_request: TransactionRequest = l2_tx.into();
+        let mut transaction_request: TransactionRequest = l2_tx.into();
+        transaction_request.chain_id = Some(chain_id.as_u64());
 
         // It is assumed that the `TransactionData` always has all the necessary components to recover the hash.
         transaction_request
-            .get_tx_hash(chain_id)
+            .get_tx_hash()
             .expect("Could not recover L2 transaction hash")
     }
 
@@ -277,12 +278,11 @@ impl TryInto<L2Tx> for TransactionData {
                 paymaster_input: self.paymaster_input,
             },
         };
-        let factory_deps = (!self.factory_deps.is_empty()).then_some(self.factory_deps);
         let execute = Execute {
             contract_address: self.to,
             value: self.value,
             calldata: self.data,
-            factory_deps,
+            factory_deps: self.factory_deps,
         };
 
         Ok(L2Tx {
diff --git a/core/lib/multivm/src/versions/vm_latest/utils/logs.rs b/core/lib/multivm/src/versions/vm_latest/utils/logs.rs
index 4deea36f09fb..82e096cd3e7f 100644
--- a/core/lib/multivm/src/versions/vm_latest/utils/logs.rs
+++ b/core/lib/multivm/src/versions/vm_latest/utils/logs.rs
@@ -1,6 +1,6 @@
 use zk_evm_1_5_0::aux_structures::{LogQuery, Timestamp};
 use zksync_state::WriteStorage;
-use zksync_types::{l2_to_l1_log::L2ToL1Log, StorageLogQueryType, VmEvent};
+use zksync_types::{l2_to_l1_log::L2ToL1Log, StorageLogKind, VmEvent};
 
 use crate::{
     glue::GlueInto,
@@ -33,5 +33,5 @@ pub(crate) fn collect_events_and_l1_system_logs_after_timestamp<S: WriteStorage,
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
diff --git a/core/lib/multivm/src/versions/vm_latest/vm.rs b/core/lib/multivm/src/versions/vm_latest/vm.rs
index 83805bdd18fc..a6cd884c7380 100644
--- a/core/lib/multivm/src/versions/vm_latest/vm.rs
+++ b/core/lib/multivm/src/versions/vm_latest/vm.rs
@@ -3,7 +3,7 @@ use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::{
     event::extract_l2tol1logs_from_l1_messenger,
     l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
-    Transaction, VmVersion, H256,
+    Transaction, VmVersion,
 };
 use zksync_utils::bytecode::CompressedBytecodeInfo;
 
@@ -142,7 +142,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         CurrentExecutionState {
             events,
-            deduplicated_storage_log_queries: deduped_storage_log_queries
+            deduplicated_storage_logs: deduped_storage_log_queries
                 .into_iter()
                 .map(GlueInto::glue_into)
                 .collect(),
@@ -209,17 +209,11 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
                     .clone()
                     .build_pubdata(false),
             ),
-            initially_written_slots: Some(
+            state_diffs: Some(
                 self.bootloader_state
                     .get_pubdata_information()
                     .state_diffs
-                    .iter()
-                    .filter_map(|record| {
-                        record
-                            .is_write_initial()
-                            .then_some(H256(record.derived_key))
-                    })
-                    .collect(),
+                    .clone(),
             ),
         }
     }
diff --git a/core/lib/multivm/src/versions/vm_m5/event_sink.rs b/core/lib/multivm/src/versions/vm_m5/event_sink.rs
index 0bb1ee498f61..782aa1d662f7 100644
--- a/core/lib/multivm/src/versions/vm_m5/event_sink.rs
+++ b/core/lib/multivm/src/versions/vm_m5/event_sink.rs
@@ -75,7 +75,8 @@ impl InMemoryEventSink {
         // since if rollbacks of parents were not appended anywhere we just still keep them
         for el in history.into_iter() {
             // we are time ordered here in terms of rollbacks
-            if tmp.get(&el.timestamp.0).is_some() {
+            #[allow(clippy::map_entry)]
+            if tmp.contains_key(&el.timestamp.0) {
                 assert!(el.rollback);
                 tmp.remove(&el.timestamp.0);
             } else {
diff --git a/core/lib/multivm/src/versions/vm_m5/oracles/storage.rs b/core/lib/multivm/src/versions/vm_m5/oracles/storage.rs
index 02cf5e9cdbc0..7ccfdf2f30c7 100644
--- a/core/lib/multivm/src/versions/vm_m5/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_m5/oracles/storage.rs
@@ -7,7 +7,7 @@ use zk_evm_1_3_1::{
     zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES,
 };
 use zksync_types::{
-    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogQueryType,
+    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogKind,
     BOOTLOADER_ADDRESS, U256,
 };
 use zksync_utils::u256_to_h256;
@@ -94,7 +94,7 @@ impl<S: Storage> StorageOracle<S> {
         self.frames_stack.push_forward(
             StorageLogQuery {
                 log_query: query,
-                log_type: StorageLogQueryType::Read,
+                log_type: StorageLogKind::Read,
             },
             query.timestamp,
         );
@@ -109,9 +109,9 @@ impl<S: Storage> StorageOracle<S> {
                 .write_to_storage(key, query.written_value, query.timestamp);
 
         let log_query_type = if self.storage.get_ptr().borrow_mut().is_write_initial(&key) {
-            StorageLogQueryType::InitialWrite
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
 
         query.read_value = current_value;
@@ -250,12 +250,12 @@ impl<S: Storage> VmStorageOracle for StorageOracle<S> {
             // perform actual rollback
             for query in rollbacks.iter().rev() {
                 let read_value = match query.log_type {
-                    StorageLogQueryType::Read => {
+                    StorageLogKind::Read => {
                         // Having Read logs in rollback is not possible
                         tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
-                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                    StorageLogKind::InitialWrite | StorageLogKind::RepeatedWrite => {
                         query.log_query.read_value
                     }
                 };
diff --git a/core/lib/multivm/src/versions/vm_m5/oracles/tracer.rs b/core/lib/multivm/src/versions/vm_m5/oracles/tracer.rs
index 7094fb6f068a..45f8ed88f834 100644
--- a/core/lib/multivm/src/versions/vm_m5/oracles/tracer.rs
+++ b/core/lib/multivm/src/versions/vm_m5/oracles/tracer.rs
@@ -799,7 +799,7 @@ fn get_debug_log(state: &VmLocalStateData<'_>, memory: &SimpleMemory) -> String
     let data = U256::from_big_endian(&data);
 
     // For long data, it is better to use hex-encoding for greater readability
-    let data_str = if data > U256::from(u64::max_value()) {
+    let data_str = if data > U256::from(u64::MAX) {
         let mut bytes = [0u8; 32];
         data.to_big_endian(&mut bytes);
         format!("0x{}", hex::encode(bytes))
diff --git a/core/lib/multivm/src/versions/vm_m5/test_utils.rs b/core/lib/multivm/src/versions/vm_m5/test_utils.rs
index e91b365d5344..785eb49835f1 100644
--- a/core/lib/multivm/src/versions/vm_m5/test_utils.rs
+++ b/core/lib/multivm/src/versions/vm_m5/test_utils.rs
@@ -153,7 +153,7 @@ pub fn get_create_execute(code: &[u8], calldata: &[u8]) -> Execute {
     Execute {
         contract_address: CONTRACT_DEPLOYER_ADDRESS,
         calldata,
-        factory_deps: Some(vec![code.to_vec()]),
+        factory_deps: vec![code.to_vec()],
         value: U256::zero(),
     }
 }
diff --git a/core/lib/multivm/src/versions/vm_m5/transaction_data.rs b/core/lib/multivm/src/versions/vm_m5/transaction_data.rs
index 0a093462c1fd..7ef739fd5bf5 100644
--- a/core/lib/multivm/src/versions/vm_m5/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_m5/transaction_data.rs
@@ -89,7 +89,7 @@ impl From<Transaction> for TransactionData {
                     ],
                     data: execute_tx.execute.calldata,
                     signature: common_data.signature.clone(),
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: common_data.paymaster_params.paymaster_input.clone(),
                     reserved_dynamic: vec![],
                 }
@@ -118,7 +118,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                 }
diff --git a/core/lib/multivm/src/versions/vm_m5/utils.rs b/core/lib/multivm/src/versions/vm_m5/utils.rs
index a4fc53c7ea4e..8c5bca674c69 100644
--- a/core/lib/multivm/src/versions/vm_m5/utils.rs
+++ b/core/lib/multivm/src/versions/vm_m5/utils.rs
@@ -7,7 +7,7 @@ use zk_evm_1_3_1::{
 };
 use zksync_contracts::{read_zbin_bytecode, BaseSystemContracts};
 use zksync_system_constants::ZKPORTER_IS_AVAILABLE;
-use zksync_types::{Address, StorageLogQueryType, H160, MAX_L2_TX_GAS_LIMIT, U256};
+use zksync_types::{Address, StorageLogKind, H160, MAX_L2_TX_GAS_LIMIT, U256};
 use zksync_utils::h256_to_u256;
 
 use crate::{
@@ -264,5 +264,5 @@ pub fn read_bootloader_test_code(test: &str) -> Vec<u8> {
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
diff --git a/core/lib/multivm/src/versions/vm_m5/vm.rs b/core/lib/multivm/src/versions/vm_m5/vm.rs
index e65978a9dc72..67bfec9b9703 100644
--- a/core/lib/multivm/src/versions/vm_m5/vm.rs
+++ b/core/lib/multivm/src/versions/vm_m5/vm.rs
@@ -175,7 +175,7 @@ impl<S: Storage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         CurrentExecutionState {
             events,
-            deduplicated_storage_log_queries: deduplicated_logs
+            deduplicated_storage_logs: deduplicated_logs
                 .into_iter()
                 .map(GlueInto::glue_into)
                 .collect(),
diff --git a/core/lib/multivm/src/versions/vm_m6/event_sink.rs b/core/lib/multivm/src/versions/vm_m6/event_sink.rs
index 2fb5d934e969..56fe8dcb11e2 100644
--- a/core/lib/multivm/src/versions/vm_m6/event_sink.rs
+++ b/core/lib/multivm/src/versions/vm_m6/event_sink.rs
@@ -67,7 +67,8 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         // since if rollbacks of parents were not appended anywhere we just still keep them
         for el in history {
             // we are time ordered here in terms of rollbacks
-            if tmp.get(&el.timestamp.0).is_some() {
+            #[allow(clippy::map_entry)]
+            if tmp.contains_key(&el.timestamp.0) {
                 assert!(el.rollback);
                 tmp.remove(&el.timestamp.0);
             } else {
diff --git a/core/lib/multivm/src/versions/vm_m6/oracles/storage.rs b/core/lib/multivm/src/versions/vm_m6/oracles/storage.rs
index a354ef627e3a..5393b9e48169 100644
--- a/core/lib/multivm/src/versions/vm_m6/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_m6/oracles/storage.rs
@@ -6,7 +6,7 @@ use zk_evm_1_3_1::{
     zkevm_opcode_defs::system_params::INITIAL_STORAGE_WRITE_PUBDATA_BYTES,
 };
 use zksync_types::{
-    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogQueryType,
+    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogKind,
     BOOTLOADER_ADDRESS, U256,
 };
 use zksync_utils::u256_to_h256;
@@ -84,7 +84,7 @@ impl<S: Storage, H: HistoryMode> StorageOracle<S, H> {
         self.frames_stack.push_forward(
             StorageLogQuery {
                 log_query: query,
-                log_type: StorageLogQueryType::Read,
+                log_type: StorageLogKind::Read,
             },
             query.timestamp,
         );
@@ -99,9 +99,9 @@ impl<S: Storage, H: HistoryMode> StorageOracle<S, H> {
                 .write_to_storage(key, query.written_value, query.timestamp);
 
         let log_query_type = if self.storage.get_ptr().borrow_mut().is_write_initial(&key) {
-            StorageLogQueryType::InitialWrite
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
 
         query.read_value = current_value;
@@ -254,12 +254,12 @@ impl<S: Storage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
             // perform actual rollback
             for query in self.frames_stack.rollback().current_frame().iter().rev() {
                 let read_value = match query.log_type {
-                    StorageLogQueryType::Read => {
+                    StorageLogKind::Read => {
                         // Having Read logs in rollback is not possible
                         tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
-                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                    StorageLogKind::InitialWrite | StorageLogKind::RepeatedWrite => {
                         query.log_query.read_value
                     }
                 };
diff --git a/core/lib/multivm/src/versions/vm_m6/oracles/tracer/utils.rs b/core/lib/multivm/src/versions/vm_m6/oracles/tracer/utils.rs
index 2df22aa2d3f8..4d963d08952d 100644
--- a/core/lib/multivm/src/versions/vm_m6/oracles/tracer/utils.rs
+++ b/core/lib/multivm/src/versions/vm_m6/oracles/tracer/utils.rs
@@ -88,7 +88,7 @@ pub(crate) fn get_debug_log<H: HistoryMode>(
     let data = U256::from_big_endian(&data);
 
     // For long data, it is better to use hex-encoding for greater readability
-    let data_str = if data > U256::from(u64::max_value()) {
+    let data_str = if data > U256::from(u64::MAX) {
         let mut bytes = [0u8; 32];
         data.to_big_endian(&mut bytes);
         format!("0x{}", hex::encode(bytes))
diff --git a/core/lib/multivm/src/versions/vm_m6/test_utils.rs b/core/lib/multivm/src/versions/vm_m6/test_utils.rs
index bd724dca5cac..ecad7d911b40 100644
--- a/core/lib/multivm/src/versions/vm_m6/test_utils.rs
+++ b/core/lib/multivm/src/versions/vm_m6/test_utils.rs
@@ -153,7 +153,7 @@ pub fn get_create_execute(code: &[u8], calldata: &[u8]) -> Execute {
     Execute {
         contract_address: CONTRACT_DEPLOYER_ADDRESS,
         calldata,
-        factory_deps: Some(vec![code.to_vec()]),
+        factory_deps: vec![code.to_vec()],
         value: U256::zero(),
     }
 }
diff --git a/core/lib/multivm/src/versions/vm_m6/transaction_data.rs b/core/lib/multivm/src/versions/vm_m6/transaction_data.rs
index 0abac18e5ed8..99ce4671c29b 100644
--- a/core/lib/multivm/src/versions/vm_m6/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_m6/transaction_data.rs
@@ -90,7 +90,7 @@ impl From<Transaction> for TransactionData {
                     ],
                     data: execute_tx.execute.calldata,
                     signature: common_data.signature.clone(),
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: common_data.paymaster_params.paymaster_input.clone(),
                     reserved_dynamic: vec![],
                 }
@@ -119,7 +119,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                 }
@@ -148,7 +148,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                 }
diff --git a/core/lib/multivm/src/versions/vm_m6/utils.rs b/core/lib/multivm/src/versions/vm_m6/utils.rs
index 9321b95d00f9..d9709022fe3c 100644
--- a/core/lib/multivm/src/versions/vm_m6/utils.rs
+++ b/core/lib/multivm/src/versions/vm_m6/utils.rs
@@ -7,7 +7,7 @@ use zk_evm_1_3_1::{
 };
 use zksync_contracts::{read_zbin_bytecode, BaseSystemContracts};
 use zksync_system_constants::ZKPORTER_IS_AVAILABLE;
-use zksync_types::{Address, StorageLogQueryType, H160, MAX_L2_TX_GAS_LIMIT, U256};
+use zksync_types::{Address, StorageLogKind, H160, MAX_L2_TX_GAS_LIMIT, U256};
 use zksync_utils::h256_to_u256;
 
 use crate::{
@@ -294,5 +294,5 @@ pub(crate) fn calculate_computational_gas_used<
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
diff --git a/core/lib/multivm/src/versions/vm_m6/vm.rs b/core/lib/multivm/src/versions/vm_m6/vm.rs
index 9f29fa995b69..fe2deb4181a3 100644
--- a/core/lib/multivm/src/versions/vm_m6/vm.rs
+++ b/core/lib/multivm/src/versions/vm_m6/vm.rs
@@ -191,7 +191,7 @@ impl<S: Storage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         CurrentExecutionState {
             events,
-            deduplicated_storage_log_queries: deduplicated_logs
+            deduplicated_storage_logs: deduplicated_logs
                 .into_iter()
                 .map(GlueInto::glue_into)
                 .collect(),
@@ -224,7 +224,7 @@ impl<S: Storage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         self.last_tx_compressed_bytecodes = vec![];
         let bytecodes = if with_compression {
-            let deps = tx.execute.factory_deps.as_deref().unwrap_or_default();
+            let deps = &tx.execute.factory_deps;
             let mut deps_hashes = HashSet::with_capacity(deps.len());
             let mut bytecode_hashes = vec![];
             let filtered_deps = deps.iter().filter_map(|bytecode| {
@@ -241,7 +241,8 @@ impl<S: Storage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
             });
             let compressed_bytecodes: Vec<_> = filtered_deps.collect();
 
-            self.last_tx_compressed_bytecodes = compressed_bytecodes.clone();
+            self.last_tx_compressed_bytecodes
+                .clone_from(&compressed_bytecodes);
             crate::vm_m6::vm_with_bootloader::push_transaction_to_bootloader_memory(
                 &mut self.vm,
                 &tx,
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/event_sink.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/event_sink.rs
index 74dca71d10f6..2af642d358da 100644
--- a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/event_sink.rs
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/event_sink.rs
@@ -74,7 +74,8 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         // since if rollbacks of parents were not appended anywhere we just still keep them
         for el in history {
             // we are time ordered here in terms of rollbacks
-            if tmp.get(&el.timestamp.0).is_some() {
+            #[allow(clippy::map_entry)]
+            if tmp.contains_key(&el.timestamp.0) {
                 assert!(el.rollback);
                 tmp.remove(&el.timestamp.0);
             } else {
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/utils.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/utils.rs
index c2478edf7a89..6d7ab7e7a2d9 100644
--- a/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/utils.rs
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/old_vm/utils.rs
@@ -19,6 +19,7 @@ pub(crate) enum VmExecutionResult {
     Ok(Vec<u8>),
     Revert(Vec<u8>),
     Panic,
+    #[allow(dead_code)]
     MostLikelyDidNotFinish(Address, u16),
 }
 
@@ -34,6 +35,7 @@ pub(crate) const fn aux_heap_page_from_base(base: MemoryPage) -> MemoryPage {
     MemoryPage(base.0 + 3)
 }
 
+#[allow(dead_code)]
 pub(crate) trait FixedLengthIterator<'a, I: 'a, const N: usize>: Iterator<Item = I>
 where
     Self: 'a,
@@ -45,6 +47,7 @@ where
 
 pub(crate) trait IntoFixedLengthByteIterator<const N: usize> {
     type IntoIter: FixedLengthIterator<'static, u8, N>;
+    #[allow(dead_code)]
     fn into_le_iter(self) -> Self::IntoIter;
     fn into_be_iter(self) -> Self::IntoIter;
 }
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/oracles/storage.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/oracles/storage.rs
index 59ed4f9450e5..7b2cd8c61588 100644
--- a/core/lib/multivm/src/versions/vm_refunds_enhancement/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/oracles/storage.rs
@@ -7,7 +7,7 @@ use zk_evm_1_3_3::{
 };
 use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::{
-    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogQueryType,
+    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogKind,
     BOOTLOADER_ADDRESS, U256,
 };
 use zksync_utils::u256_to_h256;
@@ -108,7 +108,7 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         self.frames_stack.push_forward(
             Box::new(StorageLogQuery {
                 log_query: query.glue_into(),
-                log_type: StorageLogQueryType::Read,
+                log_type: StorageLogKind::Read,
             }),
             query.timestamp,
         );
@@ -124,9 +124,9 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
 
         let is_initial_write = self.storage.get_ptr().borrow_mut().is_write_initial(&key);
         let log_query_type = if is_initial_write {
-            StorageLogQueryType::InitialWrite
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
 
         query.read_value = current_value;
@@ -378,12 +378,12 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
             // perform actual rollback
             for query in self.frames_stack.rollback().current_frame().iter().rev() {
                 let read_value = match query.log_type {
-                    StorageLogQueryType::Read => {
+                    StorageLogKind::Read => {
                         // Having Read logs in rollback is not possible
                         tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
-                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                    StorageLogKind::InitialWrite | StorageLogKind::RepeatedWrite => {
                         query.log_query.read_value
                     }
                 };
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/utils.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/utils.rs
index ccacea0cd7e4..1d3e9a272764 100644
--- a/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/utils.rs
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/tracers/utils.rs
@@ -96,7 +96,7 @@ pub(crate) fn get_debug_log<H: HistoryMode>(
     let data = U256::from_big_endian(&data);
 
     // For long data, it is better to use hex-encoding for greater readability
-    let data_str = if data > U256::from(u64::max_value()) {
+    let data_str = if data > U256::from(u64::MAX) {
         let mut bytes = [0u8; 32];
         data.to_big_endian(&mut bytes);
         format!("0x{}", hex::encode(bytes))
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/transaction_data.rs
index a356eb74e668..205090ba633e 100644
--- a/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/types/internals/transaction_data.rs
@@ -91,7 +91,7 @@ impl From<Transaction> for TransactionData {
                     ],
                     data: execute_tx.execute.calldata,
                     signature: common_data.signature,
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: common_data.paymaster_params.paymaster_input,
                     reserved_dynamic: vec![],
                     raw_bytes: execute_tx.raw_bytes.map(|a| a.0),
@@ -121,7 +121,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -151,7 +151,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -245,11 +245,12 @@ impl TransactionData {
         }
 
         let l2_tx: L2Tx = self.clone().try_into().unwrap();
-        let transaction_request: TransactionRequest = l2_tx.into();
+        let mut transaction_request: TransactionRequest = l2_tx.into();
+        transaction_request.chain_id = Some(chain_id.as_u64());
 
         // It is assumed that the `TransactionData` always has all the necessary components to recover the hash.
         transaction_request
-            .get_tx_hash(chain_id)
+            .get_tx_hash()
             .expect("Could not recover L2 transaction hash")
     }
 
@@ -297,12 +298,11 @@ impl TryInto<L2Tx> for TransactionData {
                 paymaster_input: self.paymaster_input,
             },
         };
-        let factory_deps = (!self.factory_deps.is_empty()).then_some(self.factory_deps);
         let execute = Execute {
             contract_address: self.to,
             value: self.value,
             calldata: self.data,
-            factory_deps,
+            factory_deps: self.factory_deps,
         };
 
         Ok(L2Tx {
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/logs.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/logs.rs
index ba1ed871f527..fc8b5bef62b3 100644
--- a/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/logs.rs
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/utils/logs.rs
@@ -1,9 +1,9 @@
 use zk_evm_1_3_3::aux_structures::LogQuery;
-use zksync_types::StorageLogQueryType;
+use zksync_types::StorageLogKind;
 
 /// Log query, which handle initial and repeated writes to the storage
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/vm.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/vm.rs
index f3d233d751a0..0bac1d7d47de 100644
--- a/core/lib/multivm/src/versions/vm_refunds_enhancement/vm.rs
+++ b/core/lib/multivm/src/versions/vm_refunds_enhancement/vm.rs
@@ -108,7 +108,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         CurrentExecutionState {
             events,
-            deduplicated_storage_log_queries: deduped_storage_log_queries
+            deduplicated_storage_logs: deduped_storage_log_queries
                 .into_iter()
                 .map(GlueInto::glue_into)
                 .collect(),
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/event_sink.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/event_sink.rs
index 00a03ca0adb8..eadfe70d0a7e 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/event_sink.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/event_sink.rs
@@ -74,7 +74,8 @@ impl<H: HistoryMode> InMemoryEventSink<H> {
         // since if rollbacks of parents were not appended anywhere we just still keep them
         for el in history {
             // we are time ordered here in terms of rollbacks
-            if tmp.get(&el.timestamp.0).is_some() {
+            #[allow(clippy::map_entry)]
+            if tmp.contains_key(&el.timestamp.0) {
                 assert!(el.rollback);
                 tmp.remove(&el.timestamp.0);
             } else {
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/oracles/storage.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/oracles/storage.rs
index 423abfd1c4a2..682814b8d512 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/oracles/storage.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/oracles/storage.rs
@@ -7,7 +7,7 @@ use zk_evm_1_3_3::{
 };
 use zksync_state::{StoragePtr, WriteStorage};
 use zksync_types::{
-    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogQueryType,
+    utils::storage_key_for_eth_balance, AccountTreeId, Address, StorageKey, StorageLogKind,
     BOOTLOADER_ADDRESS, U256,
 };
 use zksync_utils::u256_to_h256;
@@ -87,7 +87,7 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
         self.frames_stack.push_forward(
             Box::new(StorageLogQuery {
                 log_query: query.glue_into(),
-                log_type: StorageLogQueryType::Read,
+                log_type: StorageLogKind::Read,
             }),
             query.timestamp,
         );
@@ -103,9 +103,9 @@ impl<S: WriteStorage, H: HistoryMode> StorageOracle<S, H> {
 
         let is_initial_write = self.storage.get_ptr().borrow_mut().is_write_initial(&key);
         let log_query_type = if is_initial_write {
-            StorageLogQueryType::InitialWrite
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
 
         query.read_value = current_value;
@@ -287,12 +287,12 @@ impl<S: WriteStorage, H: HistoryMode> VmStorageOracle for StorageOracle<S, H> {
             // perform actual rollback
             for query in self.frames_stack.rollback().current_frame().iter().rev() {
                 let read_value = match query.log_type {
-                    StorageLogQueryType::Read => {
+                    StorageLogKind::Read => {
                         // Having Read logs in rollback is not possible
                         tracing::warn!("Read log in rollback queue {:?}", query);
                         continue;
                     }
-                    StorageLogQueryType::InitialWrite | StorageLogQueryType::RepeatedWrite => {
+                    StorageLogKind::InitialWrite | StorageLogKind::RepeatedWrite => {
                         query.log_query.read_value
                     }
                 };
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/utils.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/utils.rs
index 5be62e384378..834b9988f693 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/utils.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/old_vm/utils.rs
@@ -19,6 +19,7 @@ pub(crate) enum VmExecutionResult {
     Ok(Vec<u8>),
     Revert(Vec<u8>),
     Panic,
+    #[allow(dead_code)]
     MostLikelyDidNotFinish(Address, u16),
 }
 
@@ -34,6 +35,7 @@ pub(crate) const fn aux_heap_page_from_base(base: MemoryPage) -> MemoryPage {
     MemoryPage(base.0 + 3)
 }
 
+#[allow(dead_code)]
 pub(crate) trait FixedLengthIterator<'a, I: 'a, const N: usize>: Iterator<Item = I>
 where
     Self: 'a,
@@ -45,6 +47,7 @@ where
 
 pub(crate) trait IntoFixedLengthByteIterator<const N: usize> {
     type IntoIter: FixedLengthIterator<'static, u8, N>;
+    #[allow(dead_code)]
     fn into_le_iter(self) -> Self::IntoIter;
     fn into_be_iter(self) -> Self::IntoIter;
 }
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/tracers/traits.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/tracers/traits.rs
index 6d8fdab4e661..ed6ad67b5dcd 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/tracers/traits.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/tracers/traits.rs
@@ -49,6 +49,7 @@ pub trait VmTracer<S: WriteStorage, H: HistoryMode>:
 }
 
 pub trait ToTracerPointer<S, H> {
+    #[allow(dead_code)]
     fn into_tracer_pointer(self) -> TracerPointer<S, H>;
 }
 
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/tracers/utils.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/tracers/utils.rs
index 1f3d27d9d20e..ef8219ec2b4d 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/tracers/utils.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/tracers/utils.rs
@@ -96,7 +96,7 @@ pub(crate) fn get_debug_log<H: HistoryMode>(
     let data = U256::from_big_endian(&data);
 
     // For long data, it is better to use hex-encoding for greater readability
-    let data_str = if data > U256::from(u64::max_value()) {
+    let data_str = if data > U256::from(u64::MAX) {
         let mut bytes = [0u8; 32];
         data.to_big_endian(&mut bytes);
         format!("0x{}", hex::encode(bytes))
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/types/internals/transaction_data.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/types/internals/transaction_data.rs
index 67f4050c5a0c..b42950399f61 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/types/internals/transaction_data.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/types/internals/transaction_data.rs
@@ -91,7 +91,7 @@ impl From<Transaction> for TransactionData {
                     ],
                     data: execute_tx.execute.calldata,
                     signature: common_data.signature,
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: common_data.paymaster_params.paymaster_input,
                     reserved_dynamic: vec![],
                     raw_bytes: execute_tx.raw_bytes.map(|a| a.0),
@@ -121,7 +121,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -151,7 +151,7 @@ impl From<Transaction> for TransactionData {
                     data: execute_tx.execute.calldata,
                     // The signature isn't checked for L1 transactions so we don't care
                     signature: vec![],
-                    factory_deps: execute_tx.execute.factory_deps.unwrap_or_default(),
+                    factory_deps: execute_tx.execute.factory_deps,
                     paymaster_input: vec![],
                     reserved_dynamic: vec![],
                     raw_bytes: None,
@@ -245,11 +245,12 @@ impl TransactionData {
         }
 
         let l2_tx: L2Tx = self.clone().try_into().unwrap();
-        let transaction_request: TransactionRequest = l2_tx.into();
+        let mut transaction_request: TransactionRequest = l2_tx.into();
+        transaction_request.chain_id = Some(chain_id.as_u64());
 
         // It is assumed that the `TransactionData` always has all the necessary components to recover the hash.
         transaction_request
-            .get_tx_hash(chain_id)
+            .get_tx_hash()
             .expect("Could not recover L2 transaction hash")
     }
 
@@ -297,12 +298,11 @@ impl TryInto<L2Tx> for TransactionData {
                 paymaster_input: self.paymaster_input,
             },
         };
-        let factory_deps = (!self.factory_deps.is_empty()).then_some(self.factory_deps);
         let execute = Execute {
             contract_address: self.to,
             value: self.value,
             calldata: self.data,
-            factory_deps,
+            factory_deps: self.factory_deps,
         };
 
         Ok(L2Tx {
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/utils/logs.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/utils/logs.rs
index ba1ed871f527..fc8b5bef62b3 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/utils/logs.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/utils/logs.rs
@@ -1,9 +1,9 @@
 use zk_evm_1_3_3::aux_structures::LogQuery;
-use zksync_types::StorageLogQueryType;
+use zksync_types::StorageLogKind;
 
 /// Log query, which handle initial and repeated writes to the storage
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub(crate) struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/vm.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/vm.rs
index 28883b91f110..ec9b12e82ed4 100644
--- a/core/lib/multivm/src/versions/vm_virtual_blocks/vm.rs
+++ b/core/lib/multivm/src/versions/vm_virtual_blocks/vm.rs
@@ -108,7 +108,7 @@ impl<S: WriteStorage, H: HistoryMode> VmInterface<S, H> for Vm<S, H> {
 
         CurrentExecutionState {
             events,
-            deduplicated_storage_log_queries: deduped_storage_log_queries
+            deduplicated_storage_logs: deduped_storage_log_queries
                 .into_iter()
                 .map(GlueInto::glue_into)
                 .collect(),
diff --git a/core/lib/node_framework_derive/Cargo.toml b/core/lib/node_framework_derive/Cargo.toml
new file mode 100644
index 000000000000..3b3198545298
--- /dev/null
+++ b/core/lib/node_framework_derive/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "zksync_node_framework_derive"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = { workspace = true, features = ["full"] }
+quote.workspace = true
+proc-macro2.workspace = true
diff --git a/core/lib/node_framework_derive/src/helpers.rs b/core/lib/node_framework_derive/src/helpers.rs
new file mode 100644
index 000000000000..005e959b2bee
--- /dev/null
+++ b/core/lib/node_framework_derive/src/helpers.rs
@@ -0,0 +1,44 @@
+use std::fmt;
+
+use syn::{GenericArgument, PathArguments, Type};
+
+use crate::labels::CtxLabel;
+
+/// Representation of a single structure field.
+pub(crate) struct Field {
+    /// Name of the field.
+    pub(crate) ident: syn::Ident,
+    /// Type of the field.
+    pub(crate) ty: syn::Type,
+    /// Parsed label.
+    pub(crate) label: CtxLabel,
+}
+
+impl fmt::Debug for Field {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Field")
+            .field("ident", &self.ident)
+            .field("label", &self.label)
+            .finish()
+    }
+}
+
+// Helper function to check if a field is of type Option<T> and extract T
+pub(crate) fn extract_option_inner_type(ty: &Type) -> Option<&Type> {
+    if let Type::Path(type_path) = ty {
+        // Check if the path is `Option`
+        if type_path.path.segments.len() == 1 {
+            let segment = &type_path.path.segments[0];
+            if segment.ident == "Option" {
+                if let PathArguments::AngleBracketed(angle_bracketed_args) = &segment.arguments {
+                    if angle_bracketed_args.args.len() == 1 {
+                        if let GenericArgument::Type(inner_type) = &angle_bracketed_args.args[0] {
+                            return Some(inner_type);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    None
+}
diff --git a/core/lib/node_framework_derive/src/labels.rs b/core/lib/node_framework_derive/src/labels.rs
new file mode 100644
index 000000000000..2bac5a7f7552
--- /dev/null
+++ b/core/lib/node_framework_derive/src/labels.rs
@@ -0,0 +1,98 @@
+use std::fmt;
+
+use syn::{spanned::Spanned as _, Attribute, Result};
+
+/// Context label, e.g. `ctx(crate = "crate")`.
+#[derive(Default)]
+pub(crate) struct CtxLabel {
+    /// Special attribute that marks the derive as internal.
+    /// Alters the path to the trait to be implemented.
+    pub(crate) krate: Option<syn::Path>, // `crate` is a reserved keyword and cannot be a raw identifier.
+    pub(crate) span: Option<proc_macro2::Span>,
+    pub(crate) task: bool,
+    pub(crate) default: bool,
+}
+
+impl fmt::Debug for CtxLabel {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // For some weird reason, doc tests fail with the derived impl, stating that
+        // `syn::Path` does not implement `Debug`.
+        f.debug_struct("CtxLabel")
+            .field("krate", &self.krate.as_ref().and_then(|p| p.get_ident()))
+            .field("span", &self.span)
+            .field("task", &self.task)
+            .field("default", &self.default)
+            .finish()
+    }
+}
+
+impl CtxLabel {
+    const ATTR_NAME: &'static str = "context";
+    const CRATE_LABEL: &'static str = "crate";
+    const TASK_LABEL: &'static str = "task";
+    const DEFAULT_LABEL: &'static str = "default";
+    const LABELS: &'static [&'static str] =
+        &[Self::CRATE_LABEL, Self::TASK_LABEL, Self::DEFAULT_LABEL];
+
+    pub(crate) fn parse(attrs: &[Attribute]) -> Result<Option<Self>> {
+        let mut self_ = Self::default();
+
+        let mut found = false;
+        for attr in attrs {
+            if attr.path().is_ident(Self::ATTR_NAME) {
+                found = true;
+                self_.span = Some(attr.span());
+                match attr.meta {
+                    syn::Meta::Path(_) => {
+                        // No values to parse.
+                        break;
+                    }
+                    syn::Meta::NameValue(_) => {
+                        return Err(syn::Error::new_spanned(
+                            attr,
+                            "Unexpected value, expected a list of labels",
+                        ));
+                    }
+                    syn::Meta::List(_) => {
+                        // Do nothing, parsing happens below.
+                    }
+                }
+                attr.parse_nested_meta(|meta| {
+                    let mut added = false;
+                    for &label in Self::LABELS {
+                        if meta.path.is_ident(label) {
+                            match label {
+                                Self::CRATE_LABEL => {
+                                    let value = meta.value()?;
+                                    let path: syn::Path = value.parse()?;
+                                    self_.krate = Some(path);
+                                }
+                                Self::TASK_LABEL => {
+                                    self_.task = true;
+                                }
+                                Self::DEFAULT_LABEL => {
+                                    self_.default = true;
+                                }
+                                _ => unreachable!(),
+                            }
+                            added = true;
+                            break;
+                        }
+                    }
+
+                    if !added {
+                        let err_msg =
+                            format!("Unexpected token, supported labels: `{:?}`", Self::LABELS);
+                        let err = syn::Error::new_spanned(attr, err_msg);
+                        return Err(err);
+                    }
+                    Ok(())
+                })?;
+            }
+        }
+        if !found {
+            return Ok(None);
+        }
+        Ok(Some(self_))
+    }
+}
diff --git a/core/lib/node_framework_derive/src/lib.rs b/core/lib/node_framework_derive/src/lib.rs
new file mode 100644
index 000000000000..867e0c75fa54
--- /dev/null
+++ b/core/lib/node_framework_derive/src/lib.rs
@@ -0,0 +1,39 @@
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+use syn::{parse_macro_input, DeriveInput};
+
+use crate::macro_impl::{MacroImpl, MacroKind};
+
+pub(crate) mod helpers;
+mod labels;
+mod macro_impl;
+
+/// Derive macro for the `FromContext` trait.
+/// Allows to automatically fetch all the resources and tasks from the context.
+///
+/// See the trait documentation for more details.
+#[proc_macro_derive(FromContext, attributes(context))]
+pub fn from_context_derive(input: TokenStream) -> TokenStream {
+    // Parse the input tokens into a syntax tree
+    let input = parse_macro_input!(input as DeriveInput);
+    MacroImpl::parse(MacroKind::FromContext, input)
+        .and_then(|from_context| from_context.render())
+        .unwrap_or_else(syn::Error::into_compile_error)
+        .into()
+}
+
+/// Derive macro for the `IntoContext` trait.
+/// Allows to automatically insert all the resources in tasks created by the wiring layer
+/// into the context.
+///
+/// See the trait documentation for more details.
+#[proc_macro_derive(IntoContext, attributes(context))]
+pub fn into_context_derive(input: TokenStream) -> TokenStream {
+    // Parse the input tokens into a syntax tree
+    let input = parse_macro_input!(input as DeriveInput);
+    MacroImpl::parse(MacroKind::IntoContext, input)
+        .and_then(|from_context| from_context.render())
+        .unwrap_or_else(syn::Error::into_compile_error)
+        .into()
+}
diff --git a/core/lib/node_framework_derive/src/macro_impl.rs b/core/lib/node_framework_derive/src/macro_impl.rs
new file mode 100644
index 000000000000..30532184fd2c
--- /dev/null
+++ b/core/lib/node_framework_derive/src/macro_impl.rs
@@ -0,0 +1,190 @@
+use std::fmt;
+
+use quote::quote;
+use syn::{DeriveInput, Result};
+
+use crate::{helpers::Field, labels::CtxLabel};
+
+#[derive(Debug)]
+pub enum MacroKind {
+    FromContext,
+    IntoContext,
+}
+
+impl fmt::Display for MacroKind {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::FromContext => write!(f, "FromContext"),
+            Self::IntoContext => write!(f, "IntoContext"),
+        }
+    }
+}
+
+/// Parser and renderer for `FromContext` derive macro.
+#[derive(Debug)]
+pub struct MacroImpl {
+    macro_kind: MacroKind,
+    ctx: CtxLabel,
+    ident: syn::Ident,
+    fields: Vec<Field>,
+}
+
+impl MacroImpl {
+    pub(crate) fn parse(macro_kind: MacroKind, input: DeriveInput) -> Result<Self> {
+        let ctx = CtxLabel::parse(&input.attrs)?.unwrap_or_default();
+        let ident = input.ident;
+        if !input.generics.params.is_empty() {
+            return Err(syn::Error::new(
+                ident.span(),
+                format!("Generics are not supported for `{macro_kind}`"),
+            ));
+        }
+        let fields = match input.data {
+            syn::Data::Struct(data) => match data.fields {
+                syn::Fields::Named(fields) => fields
+                    .named
+                    .into_iter()
+                    .map(|field| {
+                        let ident = field.ident.unwrap();
+                        let ty = field.ty;
+                        let label = CtxLabel::parse(&field.attrs)?.unwrap_or_default();
+                        Ok(Field { ident, ty, label })
+                    })
+                    .collect::<Result<Vec<_>>>()?,
+                _ => {
+                    return Err(syn::Error::new(
+                        ident.span(),
+                        format!("Only named fields are supported for `{macro_kind}`"),
+                    ))
+                }
+            },
+            _ => {
+                return Err(syn::Error::new(
+                    ident.span(),
+                    format!("Only structures are supported for `{macro_kind}`"),
+                ))
+            }
+        };
+
+        Ok(Self {
+            macro_kind,
+            ctx,
+            ident,
+            fields,
+        })
+    }
+
+    pub fn render(self) -> Result<proc_macro2::TokenStream> {
+        match self.macro_kind {
+            MacroKind::FromContext => self.render_from_context(),
+            MacroKind::IntoContext => self.render_into_context(),
+        }
+    }
+
+    fn crate_path(&self) -> proc_macro2::TokenStream {
+        if let Some(krate) = &self.ctx.krate {
+            quote! { #krate }
+        } else {
+            quote! { zksync_node_framework }
+        }
+    }
+
+    fn render_from_context(self) -> Result<proc_macro2::TokenStream> {
+        let crate_path = self.crate_path();
+        let ident = self.ident;
+        let mut fields = Vec::new();
+        for field in self.fields {
+            let ty = field.ty;
+            let ident = field.ident;
+            let default = field.label.default;
+
+            if field.label.krate.is_some() {
+                return Err(syn::Error::new_spanned(
+                    ident,
+                    "`crate` attribute is not allowed for fields",
+                ));
+            }
+
+            if field.label.task {
+                return Err(syn::Error::new_spanned(
+                    ident,
+                    "`task` attribute is not allowed in `FromContext` macro",
+                ));
+            }
+
+            let field = if default {
+                quote! {
+                    #ident: ctx.get_resource_or_default::<#ty>()
+                }
+            } else {
+                quote! {
+                    #ident: <#ty as #crate_path::service::FromContext>::from_context(ctx)?
+                }
+            };
+
+            fields.push(field)
+        }
+
+        Ok(quote! {
+            impl #crate_path::FromContext for #ident {
+                fn from_context(ctx: &mut #crate_path::service::ServiceContext<'_>) -> std::result::Result<Self, #crate_path::WiringError> {
+                    Ok(Self {
+                        #(#fields),*
+                    })
+                }
+            }
+        })
+    }
+
+    fn render_into_context(self) -> Result<proc_macro2::TokenStream> {
+        let crate_path = self.crate_path();
+        let ident = self.ident;
+        let mut actions = Vec::new();
+        for field in self.fields {
+            let ty = field.ty;
+            let ident = field.ident;
+            if field.label.default {
+                return Err(syn::Error::new_spanned(
+                    ident,
+                    "`default` attribute is not allowed in `IntoContext` macro",
+                ));
+            }
+
+            if field.label.krate.is_some() {
+                return Err(syn::Error::new_spanned(
+                    ident,
+                    "`crate` attribute is not allowed for fields",
+                ));
+            }
+
+            let action = if field.label.task {
+                // Check whether the task is an `Option`.
+                if let Some(_inner_ty) = crate::helpers::extract_option_inner_type(&ty) {
+                    quote! {
+                        if let Some(task) = self.#ident {
+                            ctx.add_task(task);
+                        }
+                    }
+                } else {
+                    quote! {
+                        ctx.add_task(self.#ident);
+                    }
+                }
+            } else {
+                quote! {
+                    <#ty as #crate_path::service::IntoContext>::into_context(self.#ident, ctx)?;
+                }
+            };
+            actions.push(action);
+        }
+
+        Ok(quote! {
+            impl #crate_path::IntoContext for #ident {
+                fn into_context(self, ctx: &mut #crate_path::service::ServiceContext<'_>) -> std::result::Result<(), #crate_path::WiringError> {
+                    #(#actions)*
+                    Ok(())
+                }
+            }
+        })
+    }
+}
diff --git a/core/lib/object_store/Cargo.toml b/core/lib/object_store/Cargo.toml
index e8d5322765ec..e400642bd2cd 100644
--- a/core/lib/object_store/Cargo.toml
+++ b/core/lib/object_store/Cargo.toml
@@ -22,9 +22,12 @@ google-cloud-auth.workspace = true
 http.workspace = true
 serde_json.workspace = true
 flate2.workspace = true
+rand.workspace = true
 tokio = { workspace = true, features = ["full"] }
 tracing.workspace = true
 prost.workspace = true
+reqwest.workspace = true
 
 [dev-dependencies]
+assert_matches.workspace = true
 tempfile.workspace = true
diff --git a/core/lib/object_store/README.md b/core/lib/object_store/README.md
index f7d004e3d2c7..5ffa13e4a72b 100644
--- a/core/lib/object_store/README.md
+++ b/core/lib/object_store/README.md
@@ -3,11 +3,13 @@
 This crate provides the object storage abstraction that allows to get, put and remove binary blobs. The following
 implementations are available:
 
-- File-based storage saving blobs as separate files in the local filesystem
-- GCS-based storage
+- File-based store saving blobs as separate files in the local filesystem
+- GCS-based store
+- Mock in-memory store
 
-These implementations are not exposed externally. Instead, a store trait object can be constructed based on the
-[configuration], which can be provided explicitly or constructed from the environment.
+Normally, these implementations are not used directly. Instead, a store trait object can be constructed based on the
+[configuration], which can be provided explicitly or constructed from the environment. This trait object is what should
+be used for dependency injection.
 
 Besides the lower-level storage abstraction, the crate provides high-level typesafe methods to store (de)serializable
 objects. Prefer using these methods whenever possible.
diff --git a/core/lib/object_store/src/factory.rs b/core/lib/object_store/src/factory.rs
new file mode 100644
index 000000000000..af00a8193d7f
--- /dev/null
+++ b/core/lib/object_store/src/factory.rs
@@ -0,0 +1,127 @@
+use std::sync::Arc;
+
+use anyhow::Context as _;
+use tokio::sync::OnceCell;
+use zksync_config::configs::object_store::{ObjectStoreConfig, ObjectStoreMode};
+
+use crate::{
+    file::FileBackedObjectStore,
+    gcs::{GoogleCloudStore, GoogleCloudStoreAuthMode},
+    mirror::MirroringObjectStore,
+    raw::{ObjectStore, ObjectStoreError},
+    retries::StoreWithRetries,
+};
+
+/// Factory of [`ObjectStore`]s that caches the store instance once it's created. Used mainly for legacy reasons.
+///
+/// Please do not use this factory in dependency injection; rely on `Arc<dyn ObjectStore>` instead. This allows to
+/// inject mock store implementations, decorate an object store with middleware etc.
+#[derive(Debug)]
+pub struct ObjectStoreFactory {
+    config: ObjectStoreConfig,
+    store: OnceCell<Arc<dyn ObjectStore>>,
+}
+
+impl ObjectStoreFactory {
+    /// Creates an object store factory based on the provided `config`.
+    pub fn new(config: ObjectStoreConfig) -> Self {
+        Self {
+            config,
+            store: OnceCell::new(),
+        }
+    }
+
+    /// Creates an [`ObjectStore`] or returns a cached store if one was created previously.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if store initialization fails (e.g., because of incorrect configuration).
+    pub async fn create_store(&self) -> anyhow::Result<Arc<dyn ObjectStore>> {
+        self.store
+            .get_or_try_init(|| async {
+                Self::create_from_config(&self.config)
+                    .await
+                    .with_context(|| {
+                        format!(
+                            "failed creating object store factory with configuration {:?}",
+                            self.config
+                        )
+                    })
+            })
+            .await
+            .cloned()
+    }
+
+    /// Creates an [`ObjectStore`] based on the provided `config`.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if store initialization fails (e.g., because of incorrect configuration).
+    async fn create_from_config(
+        config: &ObjectStoreConfig,
+    ) -> Result<Arc<dyn ObjectStore>, ObjectStoreError> {
+        tracing::trace!("Initializing object store with configuration {config:?}");
+        match &config.mode {
+            ObjectStoreMode::GCS { bucket_base_url } => {
+                let store = StoreWithRetries::try_new(config.max_retries, || {
+                    GoogleCloudStore::new(
+                        GoogleCloudStoreAuthMode::Authenticated,
+                        bucket_base_url.clone(),
+                    )
+                })
+                .await?;
+                Self::wrap_mirroring(store, config.local_mirror_path.as_ref()).await
+            }
+            ObjectStoreMode::GCSWithCredentialFile {
+                bucket_base_url,
+                gcs_credential_file_path,
+            } => {
+                let store = StoreWithRetries::try_new(config.max_retries, || {
+                    GoogleCloudStore::new(
+                        GoogleCloudStoreAuthMode::AuthenticatedWithCredentialFile(
+                            gcs_credential_file_path.clone(),
+                        ),
+                        bucket_base_url.clone(),
+                    )
+                })
+                .await?;
+                Self::wrap_mirroring(store, config.local_mirror_path.as_ref()).await
+            }
+            ObjectStoreMode::GCSAnonymousReadOnly { bucket_base_url } => {
+                let store = StoreWithRetries::try_new(config.max_retries, || {
+                    GoogleCloudStore::new(
+                        GoogleCloudStoreAuthMode::Anonymous,
+                        bucket_base_url.clone(),
+                    )
+                })
+                .await?;
+                Self::wrap_mirroring(store, config.local_mirror_path.as_ref()).await
+            }
+
+            ObjectStoreMode::FileBacked {
+                file_backed_base_path,
+            } => {
+                let store = StoreWithRetries::try_new(config.max_retries, || {
+                    FileBackedObjectStore::new(file_backed_base_path.clone())
+                })
+                .await?;
+
+                if let Some(mirror_path) = &config.local_mirror_path {
+                    tracing::warn!("Mirroring doesn't make sense with file-backed object store; ignoring mirror path `{mirror_path}`");
+                }
+                Ok(Arc::new(store))
+            }
+        }
+    }
+
+    async fn wrap_mirroring(
+        store: impl ObjectStore,
+        mirror_path: Option<&String>,
+    ) -> Result<Arc<dyn ObjectStore>, ObjectStoreError> {
+        Ok(if let Some(mirror_path) = mirror_path {
+            Arc::new(MirroringObjectStore::new(store, mirror_path.clone()).await?)
+        } else {
+            Arc::new(store)
+        })
+    }
+}
diff --git a/core/lib/object_store/src/file.rs b/core/lib/object_store/src/file.rs
index 72b7d2dd35fc..94689c78028f 100644
--- a/core/lib/object_store/src/file.rs
+++ b/core/lib/object_store/src/file.rs
@@ -9,18 +9,27 @@ impl From<io::Error> for ObjectStoreError {
     fn from(err: io::Error) -> Self {
         match err.kind() {
             io::ErrorKind::NotFound => ObjectStoreError::KeyNotFound(err.into()),
-            _ => ObjectStoreError::Other(err.into()),
+            kind => ObjectStoreError::Other {
+                is_transient: matches!(kind, io::ErrorKind::Interrupted | io::ErrorKind::TimedOut),
+                source: err.into(),
+            },
         }
     }
 }
 
+/// [`ObjectStore`] implementation storing objects as files in a local filesystem. Mostly useful for local testing.
 #[derive(Debug)]
-pub(crate) struct FileBackedObjectStore {
+pub struct FileBackedObjectStore {
     base_dir: String,
 }
 
 impl FileBackedObjectStore {
-    pub async fn new(base_dir: String) -> Self {
+    /// Creates a new file-backed store with its root at the specified path.
+    ///
+    /// # Errors
+    ///
+    /// Propagates I/O errors.
+    pub async fn new(base_dir: String) -> Result<Self, ObjectStoreError> {
         for bucket in &[
             Bucket::ProverJobs,
             Bucket::WitnessInput,
@@ -33,15 +42,12 @@ impl FileBackedObjectStore {
             Bucket::SchedulerWitnessJobsFri,
             Bucket::ProofsFri,
             Bucket::StorageSnapshot,
+            Bucket::TeeVerifierInput,
         ] {
             let bucket_path = format!("{base_dir}/{bucket}");
-            fs::create_dir_all(&bucket_path)
-                .await
-                .unwrap_or_else(|err| {
-                    panic!("failed creating bucket `{bucket_path}`: {err}");
-                });
+            fs::create_dir_all(&bucket_path).await?;
         }
-        FileBackedObjectStore { base_dir }
+        Ok(FileBackedObjectStore { base_dir })
     }
 
     fn filename(&self, bucket: Bucket, key: &str) -> String {
@@ -86,12 +92,12 @@ mod test {
     async fn test_get() {
         let dir = TempDir::new().unwrap();
         let path = dir.into_path().into_os_string().into_string().unwrap();
-        let object_store = FileBackedObjectStore::new(path).await;
+        let object_store = FileBackedObjectStore::new(path).await.unwrap();
         let expected = vec![9, 0, 8, 9, 0, 7];
-        let result = object_store
+        object_store
             .put_raw(Bucket::ProverJobs, "test-key.bin", expected.clone())
-            .await;
-        assert!(result.is_ok(), "result must be OK");
+            .await
+            .unwrap();
         let bytes = object_store
             .get_raw(Bucket::ProverJobs, "test-key.bin")
             .await
@@ -103,26 +109,26 @@ mod test {
     async fn test_put() {
         let dir = TempDir::new().unwrap();
         let path = dir.into_path().into_os_string().into_string().unwrap();
-        let object_store = FileBackedObjectStore::new(path).await;
+        let object_store = FileBackedObjectStore::new(path).await.unwrap();
         let bytes = vec![9, 0, 8, 9, 0, 7];
-        let result = object_store
+        object_store
             .put_raw(Bucket::ProverJobs, "test-key.bin", bytes)
-            .await;
-        assert!(result.is_ok(), "result must be OK");
+            .await
+            .unwrap();
     }
 
     #[tokio::test]
     async fn test_remove() {
         let dir = TempDir::new().unwrap();
         let path = dir.into_path().into_os_string().into_string().unwrap();
-        let object_store = FileBackedObjectStore::new(path).await;
-        let result = object_store
+        let object_store = FileBackedObjectStore::new(path).await.unwrap();
+        object_store
             .put_raw(Bucket::ProverJobs, "test-key.bin", vec![0, 1])
-            .await;
-        assert!(result.is_ok(), "result must be OK");
-        let result = object_store
+            .await
+            .unwrap();
+        object_store
             .remove_raw(Bucket::ProverJobs, "test-key.bin")
-            .await;
-        assert!(result.is_ok(), "result must be OK");
+            .await
+            .unwrap();
     }
 }
diff --git a/core/lib/object_store/src/gcs.rs b/core/lib/object_store/src/gcs.rs
index d2650a48ea50..451866236243 100644
--- a/core/lib/object_store/src/gcs.rs
+++ b/core/lib/object_store/src/gcs.rs
@@ -1,9 +1,9 @@
 //! GCS-based [`ObjectStore`] implementation.
 
-use std::{fmt, future::Future, time::Duration};
+use std::{error::Error as StdError, fmt, io};
 
 use async_trait::async_trait;
-use google_cloud_auth::{credentials::CredentialsFile, error::Error};
+use google_cloud_auth::{credentials::CredentialsFile, error::Error as AuthError};
 use google_cloud_storage::{
     client::{Client, ClientConfig},
     http::{
@@ -18,122 +18,111 @@ use google_cloud_storage::{
 };
 use http::StatusCode;
 
-use crate::{
-    metrics::GCS_METRICS,
-    raw::{Bucket, ObjectStore, ObjectStoreError},
-};
+use crate::raw::{Bucket, ObjectStore, ObjectStoreError};
 
-async fn retry<T, E, Fut, F>(max_retries: u16, mut f: F) -> Result<T, E>
-where
-    E: fmt::Display,
-    Fut: Future<Output = Result<T, E>>,
-    F: FnMut() -> Fut,
-{
-    let mut retries = 1;
-    let mut backoff = 1;
-    loop {
-        match f().await {
-            Ok(result) => return Ok(result),
-            Err(err) => {
-                tracing::warn!(%err, "Failed GCS request {retries}/{max_retries}, retrying.");
-                if retries > max_retries {
-                    return Err(err);
-                }
-                retries += 1;
-                tokio::time::sleep(Duration::from_secs(backoff)).await;
-                backoff *= 2;
-            }
-        }
-    }
-}
-
-pub struct GoogleCloudStorage {
+/// [`ObjectStore`] implementation based on GCS.
+pub struct GoogleCloudStore {
     bucket_prefix: String,
-    max_retries: u16,
     client: Client,
 }
 
-impl fmt::Debug for GoogleCloudStorage {
+impl fmt::Debug for GoogleCloudStore {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         formatter
-            .debug_struct("GoogleCloudStorage")
+            .debug_struct("GoogleCloudStore")
             .field("bucket_prefix", &self.bucket_prefix)
-            .field("max_retries", &self.max_retries)
+            // Skip `client` as its representation may contain sensitive info
             .finish_non_exhaustive()
     }
 }
 
+/// Authentication mode for [`GoogleCloudStore`].
 #[derive(Debug, Clone)]
-pub enum GoogleCloudStorageAuthMode {
+#[non_exhaustive]
+pub enum GoogleCloudStoreAuthMode {
+    /// Authentication via a credentials file at the specified path.
     AuthenticatedWithCredentialFile(String),
+    /// Ambient authentication (works if the binary runs on Google Cloud).
     Authenticated,
+    /// Anonymous access (only works for public GCS buckets for read operations).
     Anonymous,
 }
 
-impl GoogleCloudStorage {
+impl GoogleCloudStore {
+    /// Creates a new cloud store.
+    ///
+    /// # Errors
+    ///
+    /// Propagates GCS initialization errors.
     pub async fn new(
-        auth_mode: GoogleCloudStorageAuthMode,
+        auth_mode: GoogleCloudStoreAuthMode,
         bucket_prefix: String,
-        max_retries: u16,
-    ) -> Self {
-        let client_config = retry(max_retries, || Self::get_client_config(auth_mode.clone()))
-            .await
-            .expect("failed fetching GCS client config after retries");
-
-        Self {
+    ) -> Result<Self, ObjectStoreError> {
+        let client_config = Self::get_client_config(auth_mode.clone()).await?;
+        Ok(Self {
             client: Client::new(client_config),
             bucket_prefix,
-            max_retries,
-        }
+        })
     }
 
     async fn get_client_config(
-        auth_mode: GoogleCloudStorageAuthMode,
-    ) -> Result<ClientConfig, Error> {
+        auth_mode: GoogleCloudStoreAuthMode,
+    ) -> Result<ClientConfig, AuthError> {
         match auth_mode {
-            GoogleCloudStorageAuthMode::AuthenticatedWithCredentialFile(path) => {
-                let cred_file = CredentialsFile::new_from_file(path)
-                    .await
-                    .expect("failed loading GCS credential file");
+            GoogleCloudStoreAuthMode::AuthenticatedWithCredentialFile(path) => {
+                let cred_file = CredentialsFile::new_from_file(path).await?;
                 ClientConfig::default().with_credentials(cred_file).await
             }
-            GoogleCloudStorageAuthMode::Authenticated => ClientConfig::default().with_auth().await,
-            GoogleCloudStorageAuthMode::Anonymous => Ok(ClientConfig::default().anonymous()),
+            GoogleCloudStoreAuthMode::Authenticated => ClientConfig::default().with_auth().await,
+            GoogleCloudStoreAuthMode::Anonymous => Ok(ClientConfig::default().anonymous()),
         }
     }
 
     fn filename(bucket: &str, filename: &str) -> String {
         format!("{bucket}/{filename}")
     }
+}
 
-    // For some bizarre reason, `async fn` doesn't work here, failing with the following error:
-    //
-    // > hidden type for `impl std::future::Future<Output = Result<(), ObjectStoreError>>`
-    // > captures lifetime that does not appear in bounds
-    fn remove_inner(
-        &self,
-        bucket: &'static str,
-        key: &str,
-    ) -> impl Future<Output = Result<(), ObjectStoreError>> + '_ {
-        let filename = Self::filename(bucket, key);
-        tracing::trace!(
-            "Removing data from GCS for key {filename} from bucket {}",
-            self.bucket_prefix
+impl From<AuthError> for ObjectStoreError {
+    fn from(err: AuthError) -> Self {
+        let is_transient = matches!(
+            &err,
+            AuthError::HttpError(err) if is_transient_http_error(err)
         );
+        Self::Initialization {
+            source: err.into(),
+            is_transient,
+        }
+    }
+}
 
-        let request = DeleteObjectRequest {
-            bucket: self.bucket_prefix.clone(),
-            object: filename,
-            ..DeleteObjectRequest::default()
-        };
-        async move {
-            retry(self.max_retries, || self.client.delete_object(&request))
-                .await
-                .map_err(ObjectStoreError::from)
+fn is_transient_http_error(err: &reqwest::Error) -> bool {
+    err.is_timeout()
+        || err.is_connect()
+        // Not all request errors are logically transient, but a significant part of them are (e.g.,
+        // `hyper` protocol-level errors), and it's safer to consider an error transient.
+        || err.is_request()
+        || has_transient_io_source(err)
+        || err.status() == Some(StatusCode::BAD_GATEWAY)
+        || err.status() == Some(StatusCode::SERVICE_UNAVAILABLE)
+}
+
+fn get_source<'a, T: StdError + 'static>(mut err: &'a (dyn StdError + 'static)) -> Option<&'a T> {
+    loop {
+        if let Some(err) = err.downcast_ref::<T>() {
+            return Some(err);
         }
+        err = err.source()?;
     }
 }
 
+fn has_transient_io_source(err: &(dyn StdError + 'static)) -> bool {
+    // We treat any I/O errors as transient. This isn't always true, but frequently occurring I/O errors
+    // (e.g., "connection reset by peer") *are* transient, and treating an error as transient is a safer option,
+    // even if it can lead to unnecessary retries.
+    get_source::<io::Error>(err).is_some()
+}
+
 impl From<HttpError> for ObjectStoreError {
     fn from(err: HttpError) -> Self {
         let is_not_found = match &err {
@@ -141,21 +130,34 @@ impl From<HttpError> for ObjectStoreError {
                 .status()
                 .map_or(false, |status| matches!(status, StatusCode::NOT_FOUND)),
             HttpError::Response(response) => response.code == StatusCode::NOT_FOUND.as_u16(),
-            HttpError::TokenSource(_) => false,
+            _ => false,
         };
 
         if is_not_found {
             ObjectStoreError::KeyNotFound(err.into())
         } else {
-            ObjectStoreError::Other(err.into())
+            let is_transient = match &err {
+                HttpError::HttpClient(err) => is_transient_http_error(err),
+                HttpError::TokenSource(err) => {
+                    // Token sources are mostly based on the `reqwest` HTTP client, so transient error detection
+                    // can reuse the same logic.
+                    let err = err.as_ref();
+                    has_transient_io_source(err)
+                        || get_source::<reqwest::Error>(err).is_some_and(is_transient_http_error)
+                }
+                _ => false,
+            };
+            ObjectStoreError::Other {
+                is_transient,
+                source: err.into(),
+            }
         }
     }
 }
 
 #[async_trait]
-impl ObjectStore for GoogleCloudStorage {
+impl ObjectStore for GoogleCloudStore {
     async fn get_raw(&self, bucket: Bucket, key: &str) -> Result<Vec<u8>, ObjectStoreError> {
-        let fetch_latency = GCS_METRICS.start_fetch(bucket);
         let filename = Self::filename(bucket.as_str(), key);
         tracing::trace!(
             "Fetching data from GCS for key {filename} from bucket {}",
@@ -167,17 +169,10 @@ impl ObjectStore for GoogleCloudStorage {
             object: filename,
             ..GetObjectRequest::default()
         };
-        let range = Range::default();
-        let blob = retry(self.max_retries, || {
-            self.client.download_object(&request, &range)
-        })
-        .await;
-
-        let elapsed = fetch_latency.observe();
-        tracing::trace!(
-            "Fetched data from GCS for key {key} from bucket {bucket} and it took: {elapsed:?}"
-        );
-        blob.map_err(ObjectStoreError::from)
+        self.client
+            .download_object(&request, &Range::default())
+            .await
+            .map_err(Into::into)
     }
 
     async fn put_raw(
@@ -186,7 +181,6 @@ impl ObjectStore for GoogleCloudStorage {
         key: &str,
         value: Vec<u8>,
     ) -> Result<(), ObjectStoreError> {
-        let store_latency = GCS_METRICS.start_store(bucket);
         let filename = Self::filename(bucket.as_str(), key);
         tracing::trace!(
             "Storing data to GCS for key {filename} from bucket {}",
@@ -198,21 +192,26 @@ impl ObjectStore for GoogleCloudStorage {
             bucket: self.bucket_prefix.clone(),
             ..Default::default()
         };
-        let object = retry(self.max_retries, || {
-            self.client
-                .upload_object(&request, value.clone(), &upload_type)
-        })
-        .await;
+        self.client
+            .upload_object(&request, value.clone(), &upload_type)
+            .await?;
+        Ok(())
+    }
 
-        let elapsed = store_latency.observe();
+    async fn remove_raw(&self, bucket: Bucket, key: &str) -> Result<(), ObjectStoreError> {
+        let filename = Self::filename(bucket.as_str(), key);
         tracing::trace!(
-            "Stored data to GCS for key {key} from bucket {bucket} and it took: {elapsed:?}"
+            "Removing data from GCS for key {filename} from bucket {}",
+            self.bucket_prefix
         );
-        object.map(drop).map_err(ObjectStoreError::from)
-    }
 
-    async fn remove_raw(&self, bucket: Bucket, key: &str) -> Result<(), ObjectStoreError> {
-        self.remove_inner(bucket.as_str(), key).await
+        let request = DeleteObjectRequest {
+            bucket: self.bucket_prefix.clone(),
+            object: filename,
+            ..DeleteObjectRequest::default()
+        };
+        self.client.delete_object(&request).await?;
+        Ok(())
     }
 
     fn storage_prefix_raw(&self, bucket: Bucket) -> String {
@@ -223,43 +222,3 @@ impl ObjectStore for GoogleCloudStorage {
         )
     }
 }
-
-#[cfg(test)]
-mod test {
-    use std::sync::atomic::{AtomicU16, Ordering};
-
-    use super::*;
-
-    #[tokio::test]
-    async fn test_retry_success_immediate() {
-        let result = retry(2, || async { Ok::<_, &'static str>(42) }).await;
-        assert_eq!(result, Ok(42));
-    }
-
-    #[tokio::test]
-    async fn test_retry_failure_exhausted() {
-        let result = retry(2, || async { Err::<i32, _>("oops") }).await;
-        assert_eq!(result, Err("oops"));
-    }
-
-    async fn retry_success_after_n_retries(n: u16) -> Result<u32, String> {
-        let retries = AtomicU16::new(0);
-        let result = retry(n, || async {
-            let retries = retries.fetch_add(1, Ordering::Relaxed);
-            if retries + 1 == n {
-                Ok(42)
-            } else {
-                Err("oops")
-            }
-        })
-        .await;
-
-        result.map_err(|_| "Retry failed".to_string())
-    }
-
-    #[tokio::test]
-    async fn test_retry_success_after_retry() {
-        let result = retry(2, || retry_success_after_n_retries(2)).await;
-        assert_eq!(result, Ok(42));
-    }
-}
diff --git a/core/lib/object_store/src/lib.rs b/core/lib/object_store/src/lib.rs
index 0eddf3a61d53..bd1e2e7c11ed 100644
--- a/core/lib/object_store/src/lib.rs
+++ b/core/lib/object_store/src/lib.rs
@@ -1,13 +1,13 @@
 //! This crate provides the [object storage abstraction](ObjectStore) that allows to get,
 //! put and remove binary blobs. The following implementations are available:
 //!
-//! - File-based storage saving blobs as separate files in the local filesystem
-//! - GCS-based storage
+//! - [File-backed store](FileBackedObjectStore) saving blobs as separate files in the local filesystem
+//! - [GCS-based store](GoogleCloudStore)
+//! - [Mock in-memory store](MockObjectStore)
 //!
-//! These implementations are not exposed externally. Instead, a store trait object
+//! Normally, these implementations are not used directly. Instead, a store trait object (`Arc<dyn ObjectStore>`)
 //! can be constructed using an [`ObjectStoreFactory`] based on the configuration.
-//! The configuration can be provided explicitly (see [`ObjectStoreFactory::new()`])
-//! or obtained from the environment (see [`ObjectStoreFactory::from_env()`]).
+//! This trait object is what should be used for dependency injection.
 //!
 //! Besides the lower-level storage abstraction, the crate provides high-level
 //! typesafe `<dyn ObjectStore>::get()` and `<dyn ObjectStore>::put()` methods
@@ -23,12 +23,15 @@
     clippy::doc_markdown
 )]
 
+mod factory;
 mod file;
 mod gcs;
 mod metrics;
+mod mirror;
 mod mock;
 mod objects;
 mod raw;
+mod retries;
 
 // Re-export `bincode` crate so that client binaries can conveniently use it.
 pub use bincode;
@@ -39,6 +42,10 @@ pub mod _reexports {
 }
 
 pub use self::{
+    factory::ObjectStoreFactory,
+    file::FileBackedObjectStore,
+    gcs::{GoogleCloudStore, GoogleCloudStoreAuthMode},
+    mock::MockObjectStore,
     objects::StoredObject,
-    raw::{Bucket, ObjectStore, ObjectStoreError, ObjectStoreFactory},
+    raw::{Bucket, ObjectStore, ObjectStoreError},
 };
diff --git a/core/lib/object_store/src/metrics.rs b/core/lib/object_store/src/metrics.rs
index f372b5bac1cc..ed37d4790d55 100644
--- a/core/lib/object_store/src/metrics.rs
+++ b/core/lib/object_store/src/metrics.rs
@@ -8,16 +8,16 @@ use crate::Bucket;
 
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "server_object_store")]
-pub(crate) struct GcsMetrics {
-    /// Latency to fetch an object from GCS.
+pub(crate) struct ObjectStoreMetrics {
+    /// Latency to fetch an object from the store (accounting for retries).
     #[metrics(buckets = Buckets::LATENCIES, labels = ["bucket"])]
     fetching_time: LabeledFamily<&'static str, Histogram<Duration>>,
-    /// Latency to store an object in GCS.
+    /// Latency to store an object in the store (accounting for retries).
     #[metrics(buckets = Buckets::LATENCIES, labels = ["bucket"])]
     storing_time: LabeledFamily<&'static str, Histogram<Duration>>,
 }
 
-impl GcsMetrics {
+impl ObjectStoreMetrics {
     pub fn start_fetch(&self, bucket: Bucket) -> LatencyObserver<'_> {
         self.fetching_time[&bucket.as_str()].start()
     }
@@ -28,4 +28,4 @@ impl GcsMetrics {
 }
 
 #[vise::register]
-pub(crate) static GCS_METRICS: vise::Global<GcsMetrics> = vise::Global::new();
+pub(crate) static OBJECT_STORE_METRICS: vise::Global<ObjectStoreMetrics> = vise::Global::new();
diff --git a/core/lib/object_store/src/mirror.rs b/core/lib/object_store/src/mirror.rs
new file mode 100644
index 000000000000..948770e7b39c
--- /dev/null
+++ b/core/lib/object_store/src/mirror.rs
@@ -0,0 +1,150 @@
+//! Mirroring object store.
+
+use async_trait::async_trait;
+
+use crate::{file::FileBackedObjectStore, raw::ObjectStore, Bucket, ObjectStoreError};
+
+#[derive(Debug)]
+pub(crate) struct MirroringObjectStore<S> {
+    inner: S,
+    mirror_store: FileBackedObjectStore,
+}
+
+impl<S: ObjectStore> MirroringObjectStore<S> {
+    pub async fn new(inner: S, mirror_path: String) -> Result<Self, ObjectStoreError> {
+        tracing::info!("Initializing mirroring for store {inner:?} at `{mirror_path}`");
+        let mirror_store = FileBackedObjectStore::new(mirror_path).await?;
+        Ok(Self {
+            inner,
+            mirror_store,
+        })
+    }
+}
+
+#[async_trait]
+impl<S: ObjectStore> ObjectStore for MirroringObjectStore<S> {
+    #[tracing::instrument(skip(self))]
+    async fn get_raw(&self, bucket: Bucket, key: &str) -> Result<Vec<u8>, ObjectStoreError> {
+        match self.mirror_store.get_raw(bucket, key).await {
+            Ok(object) => {
+                tracing::trace!("obtained object from mirror");
+                return Ok(object);
+            }
+            Err(err) => {
+                if !matches!(err, ObjectStoreError::KeyNotFound(_)) {
+                    tracing::warn!(
+                        "unexpected error calling local mirror store: {:#}",
+                        anyhow::Error::from(err)
+                    );
+                }
+                let object = self.inner.get_raw(bucket, key).await?;
+                tracing::trace!("obtained object from underlying store");
+                if let Err(err) = self.mirror_store.put_raw(bucket, key, object.clone()).await {
+                    tracing::warn!("failed mirroring object: {:#}", anyhow::Error::from(err));
+                } else {
+                    tracing::trace!("mirrored object");
+                }
+                Ok(object)
+            }
+        }
+    }
+
+    #[tracing::instrument(skip(self, value), fields(value.len = value.len()))]
+    async fn put_raw(
+        &self,
+        bucket: Bucket,
+        key: &str,
+        value: Vec<u8>,
+    ) -> Result<(), ObjectStoreError> {
+        self.inner.put_raw(bucket, key, value.clone()).await?;
+        // Only put the value into the mirror once it has been put in the underlying store
+        if let Err(err) = self.mirror_store.put_raw(bucket, key, value).await {
+            tracing::warn!("failed mirroring object: {:#}", anyhow::Error::from(err));
+        } else {
+            tracing::trace!("mirrored object");
+        }
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self))]
+    async fn remove_raw(&self, bucket: Bucket, key: &str) -> Result<(), ObjectStoreError> {
+        self.inner.remove_raw(bucket, key).await?;
+        // Only remove the value from the mirror once it has been removed in the underlying store
+        if let Err(err) = self.mirror_store.remove_raw(bucket, key).await {
+            tracing::warn!(
+                "failed removing object from mirror: {:#}",
+                anyhow::Error::from(err)
+            );
+        } else {
+            tracing::trace!("removed object from mirror");
+        }
+        Ok(())
+    }
+
+    fn storage_prefix_raw(&self, bucket: Bucket) -> String {
+        self.inner.storage_prefix_raw(bucket)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use assert_matches::assert_matches;
+    use tempfile::TempDir;
+
+    use super::*;
+    use crate::MockObjectStore;
+
+    #[tokio::test]
+    async fn mirroring_basics() {
+        let dir = TempDir::new().unwrap();
+        let path = dir.into_path().into_os_string().into_string().unwrap();
+
+        let mock_store = MockObjectStore::default();
+        mock_store
+            .put_raw(Bucket::StorageSnapshot, "test", vec![1, 2, 3])
+            .await
+            .unwrap();
+        let mirroring_store = MirroringObjectStore::new(mock_store, path).await.unwrap();
+
+        let object = mirroring_store
+            .get_raw(Bucket::StorageSnapshot, "test")
+            .await
+            .unwrap();
+        assert_eq!(object, [1, 2, 3]);
+        // Check that the object got mirrored.
+        let object_in_mirror = mirroring_store
+            .mirror_store
+            .get_raw(Bucket::StorageSnapshot, "test")
+            .await
+            .unwrap();
+        assert_eq!(object_in_mirror, [1, 2, 3]);
+        let object = mirroring_store
+            .get_raw(Bucket::StorageSnapshot, "test")
+            .await
+            .unwrap();
+        assert_eq!(object, [1, 2, 3]);
+
+        let err = mirroring_store
+            .get_raw(Bucket::StorageSnapshot, "missing")
+            .await
+            .unwrap_err();
+        assert_matches!(err, ObjectStoreError::KeyNotFound(_));
+
+        mirroring_store
+            .put_raw(Bucket::StorageSnapshot, "other", vec![3, 2, 1])
+            .await
+            .unwrap();
+        // Check that the object got mirrored.
+        let object_in_mirror = mirroring_store
+            .mirror_store
+            .get_raw(Bucket::StorageSnapshot, "other")
+            .await
+            .unwrap();
+        assert_eq!(object_in_mirror, [3, 2, 1]);
+        let object = mirroring_store
+            .get_raw(Bucket::StorageSnapshot, "other")
+            .await
+            .unwrap();
+        assert_eq!(object, [3, 2, 1]);
+    }
+}
diff --git a/core/lib/object_store/src/mock.rs b/core/lib/object_store/src/mock.rs
index f7ee7119c7a3..68b8881c86b2 100644
--- a/core/lib/object_store/src/mock.rs
+++ b/core/lib/object_store/src/mock.rs
@@ -1,6 +1,6 @@
 //! Mock implementation of [`ObjectStore`].
 
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::Arc};
 
 use async_trait::async_trait;
 use tokio::sync::Mutex;
@@ -9,13 +9,21 @@ use crate::raw::{Bucket, ObjectStore, ObjectStoreError};
 
 type BucketMap = HashMap<String, Vec<u8>>;
 
+/// Mock [`ObjectStore`] implementation.
 #[derive(Debug, Default)]
-pub(crate) struct MockStore {
+pub struct MockObjectStore {
     inner: Mutex<HashMap<Bucket, BucketMap>>,
 }
 
+impl MockObjectStore {
+    /// Convenience method creating a new mock object store and wrapping it in a trait object.
+    pub fn arc() -> Arc<dyn ObjectStore> {
+        Arc::<Self>::default()
+    }
+}
+
 #[async_trait]
-impl ObjectStore for MockStore {
+impl ObjectStore for MockObjectStore {
     async fn get_raw(&self, bucket: Bucket, key: &str) -> Result<Vec<u8>, ObjectStoreError> {
         let lock = self.inner.lock().await;
         let maybe_bytes = lock.get(&bucket).and_then(|bucket_map| bucket_map.get(key));
diff --git a/core/lib/object_store/src/objects.rs b/core/lib/object_store/src/objects.rs
index 90b19fc52d30..897c93e0b6f8 100644
--- a/core/lib/object_store/src/objects.rs
+++ b/core/lib/object_store/src/objects.rs
@@ -87,11 +87,15 @@ impl StoredObject for SnapshotFactoryDependencies {
     }
 }
 
-impl StoredObject for SnapshotStorageLogsChunk {
+impl<K> StoredObject for SnapshotStorageLogsChunk<K>
+where
+    Self: ProtoFmt,
+{
     const BUCKET: Bucket = Bucket::StorageSnapshot;
     type Key<'a> = SnapshotStorageLogsStorageKey;
 
     fn encode_key(key: Self::Key<'_>) -> String {
+        // FIXME: should keys be separated by version?
         format!(
             "snapshot_l1_batch_{}_storage_logs_part_{:0>4}.proto.gzip",
             key.l1_batch_number, key.chunk_id
@@ -130,6 +134,20 @@ impl dyn ObjectStore + '_ {
         V::deserialize(bytes).map_err(ObjectStoreError::Serialization)
     }
 
+    /// Fetches the value for the given encoded key if it exists.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if an object with the `encoded_key` does not exist, cannot be accessed,
+    /// or cannot be deserialized.
+    pub async fn get_by_encoded_key<V: StoredObject>(
+        &self,
+        encoded_key: String,
+    ) -> Result<V, ObjectStoreError> {
+        let bytes = self.get_raw(V::BUCKET, &encoded_key).await?;
+        V::deserialize(bytes).map_err(ObjectStoreError::Serialization)
+    }
+
     /// Stores the value associating it with the key. If the key already exists,
     /// the value is replaced.
     ///
@@ -167,23 +185,23 @@ mod tests {
     use zksync_types::{
         snapshots::{SnapshotFactoryDependency, SnapshotStorageLog},
         web3::Bytes,
-        AccountTreeId, StorageKey, H160, H256,
+        H256,
     };
 
     use super::*;
-    use crate::ObjectStoreFactory;
+    use crate::MockObjectStore;
 
     #[test]
     fn test_storage_logs_filesnames_generate_corretly() {
-        let filename1 = SnapshotStorageLogsChunk::encode_key(SnapshotStorageLogsStorageKey {
+        let filename1 = <SnapshotStorageLogsChunk>::encode_key(SnapshotStorageLogsStorageKey {
             l1_batch_number: L1BatchNumber(42),
             chunk_id: 97,
         });
-        let filename2 = SnapshotStorageLogsChunk::encode_key(SnapshotStorageLogsStorageKey {
+        let filename2 = <SnapshotStorageLogsChunk>::encode_key(SnapshotStorageLogsStorageKey {
             l1_batch_number: L1BatchNumber(3),
             chunk_id: 531,
         });
-        let filename3 = SnapshotStorageLogsChunk::encode_key(SnapshotStorageLogsStorageKey {
+        let filename3 = <SnapshotStorageLogsChunk>::encode_key(SnapshotStorageLogsStorageKey {
             l1_batch_number: L1BatchNumber(567),
             chunk_id: 5,
         });
@@ -203,7 +221,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_storage_logs_can_be_serialized_and_deserialized() {
-        let store = ObjectStoreFactory::mock().create_store().await;
+        let store = MockObjectStore::arc();
         let key = SnapshotStorageLogsStorageKey {
             l1_batch_number: L1BatchNumber(567),
             chunk_id: 5,
@@ -211,13 +229,13 @@ mod tests {
         let storage_logs = SnapshotStorageLogsChunk {
             storage_logs: vec![
                 SnapshotStorageLog {
-                    key: StorageKey::new(AccountTreeId::new(H160::random()), H256::random()),
+                    key: H256::random(),
                     value: H256::random(),
                     l1_batch_number_of_initial_write: L1BatchNumber(123),
                     enumeration_index: 234,
                 },
                 SnapshotStorageLog {
-                    key: StorageKey::new(AccountTreeId::new(H160::random()), H256::random()),
+                    key: H256::random(),
                     value: H256::random(),
                     l1_batch_number_of_initial_write: L1BatchNumber(345),
                     enumeration_index: 456,
@@ -231,7 +249,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_factory_deps_can_be_serialized_and_deserialized() {
-        let store = ObjectStoreFactory::mock().create_store().await;
+        let store = MockObjectStore::arc();
         let key = L1BatchNumber(123);
         let factory_deps = SnapshotFactoryDependencies {
             factory_deps: vec![
diff --git a/core/lib/object_store/src/raw.rs b/core/lib/object_store/src/raw.rs
index 1776612577bd..da1cd99728d9 100644
--- a/core/lib/object_store/src/raw.rs
+++ b/core/lib/object_store/src/raw.rs
@@ -1,13 +1,6 @@
-use std::{error, fmt, sync::Arc};
+use std::{error, fmt};
 
 use async_trait::async_trait;
-use zksync_config::configs::object_store::{ObjectStoreConfig, ObjectStoreMode};
-
-use crate::{
-    file::FileBackedObjectStore,
-    gcs::{GoogleCloudStorage, GoogleCloudStorageAuthMode},
-    mock::MockStore,
-};
 
 /// Bucket for [`ObjectStore`] in which objects can be placed.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -23,7 +16,10 @@ pub enum Bucket {
     NodeAggregationWitnessJobsFri,
     SchedulerWitnessJobsFri,
     ProofsFri,
+    ProofsTee,
     StorageSnapshot,
+    DataAvailability,
+    TeeVerifierInput,
 }
 
 impl Bucket {
@@ -39,7 +35,10 @@ impl Bucket {
             Self::NodeAggregationWitnessJobsFri => "node_aggregation_witness_jobs_fri",
             Self::SchedulerWitnessJobsFri => "scheduler_witness_jobs_fri",
             Self::ProofsFri => "proofs_fri",
+            Self::ProofsTee => "proofs_tee",
             Self::StorageSnapshot => "storage_logs_snapshots",
+            Self::DataAvailability => "data_availability",
+            Self::TeeVerifierInput => "tee_verifier_inputs",
         }
     }
 }
@@ -55,21 +54,58 @@ pub type BoxedError = Box<dyn error::Error + Send + Sync>;
 
 /// Errors during [`ObjectStore`] operations.
 #[derive(Debug)]
+#[non_exhaustive]
 pub enum ObjectStoreError {
+    /// Object store initialization failed.
+    Initialization {
+        source: BoxedError,
+        is_transient: bool,
+    },
     /// An object with the specified key is not found.
     KeyNotFound(BoxedError),
     /// Object (de)serialization failed.
     Serialization(BoxedError),
     /// Other error has occurred when accessing the store (e.g., a network error).
-    Other(BoxedError),
+    Other {
+        source: BoxedError,
+        is_transient: bool,
+    },
+}
+
+impl ObjectStoreError {
+    /// Gives a best-effort estimate whether this error is transient.
+    pub fn is_transient(&self) -> bool {
+        match self {
+            Self::Initialization { is_transient, .. } | Self::Other { is_transient, .. } => {
+                *is_transient
+            }
+            Self::KeyNotFound(_) | Self::Serialization(_) => false,
+        }
+    }
 }
 
 impl fmt::Display for ObjectStoreError {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
+            Self::Initialization {
+                source,
+                is_transient,
+            } => {
+                let kind = if *is_transient { "transient" } else { "fatal" };
+                write!(
+                    formatter,
+                    "{kind} error initializing object store: {source}"
+                )
+            }
             Self::KeyNotFound(err) => write!(formatter, "key not found: {err}"),
             Self::Serialization(err) => write!(formatter, "serialization error: {err}"),
-            Self::Other(err) => write!(formatter, "other error: {err}"),
+            Self::Other {
+                source,
+                is_transient,
+            } => {
+                let kind = if *is_transient { "transient" } else { "fatal" };
+                write!(formatter, "{kind} error accessing object store: {source}")
+            }
         }
     }
 }
@@ -77,9 +113,10 @@ impl fmt::Display for ObjectStoreError {
 impl error::Error for ObjectStoreError {
     fn source(&self) -> Option<&(dyn error::Error + 'static)> {
         match self {
-            Self::KeyNotFound(err) | Self::Serialization(err) | Self::Other(err) => {
-                Some(err.as_ref())
+            Self::Initialization { source, .. } | Self::Other { source, .. } => {
+                Some(source.as_ref())
             }
+            Self::KeyNotFound(err) | Self::Serialization(err) => Some(err.as_ref()),
         }
     }
 }
@@ -122,119 +159,3 @@ pub trait ObjectStore: 'static + fmt::Debug + Send + Sync {
 
     fn storage_prefix_raw(&self, bucket: Bucket) -> String;
 }
-
-#[async_trait]
-impl<T: ObjectStore + ?Sized> ObjectStore for Arc<T> {
-    async fn get_raw(&self, bucket: Bucket, key: &str) -> Result<Vec<u8>, ObjectStoreError> {
-        (**self).get_raw(bucket, key).await
-    }
-
-    async fn put_raw(
-        &self,
-        bucket: Bucket,
-        key: &str,
-        value: Vec<u8>,
-    ) -> Result<(), ObjectStoreError> {
-        (**self).put_raw(bucket, key, value).await
-    }
-
-    async fn remove_raw(&self, bucket: Bucket, key: &str) -> Result<(), ObjectStoreError> {
-        (**self).remove_raw(bucket, key).await
-    }
-
-    fn storage_prefix_raw(&self, bucket: Bucket) -> String {
-        (**self).storage_prefix_raw(bucket)
-    }
-}
-
-#[derive(Debug)]
-enum ObjectStoreOrigin {
-    Config(ObjectStoreConfig),
-    Mock(Arc<MockStore>),
-}
-
-/// Factory of [`ObjectStore`]s.
-#[derive(Debug)]
-pub struct ObjectStoreFactory {
-    origin: ObjectStoreOrigin,
-}
-
-impl ObjectStoreFactory {
-    /// Creates an object store factory based on the provided `config`.
-    ///
-    /// # Panics
-    ///
-    /// If the GCS-backed implementation is configured, this constructor will panic if called
-    /// outside the Tokio runtime.
-    pub fn new(config: ObjectStoreConfig) -> Self {
-        Self {
-            origin: ObjectStoreOrigin::Config(config),
-        }
-    }
-
-    /// Creates an object store factory with a mock in-memory store.
-    /// All calls to [`Self::create_store()`] will return the same store; thus, the testing code
-    /// can use [`ObjectStore`] methods for assertions.
-    pub fn mock() -> Self {
-        Self {
-            origin: ObjectStoreOrigin::Mock(Arc::new(MockStore::default())),
-        }
-    }
-
-    /// Creates an [`ObjectStore`].
-    pub async fn create_store(&self) -> Arc<dyn ObjectStore> {
-        match &self.origin {
-            ObjectStoreOrigin::Config(config) => Self::create_from_config(config).await,
-            ObjectStoreOrigin::Mock(store) => Arc::new(Arc::clone(store)),
-        }
-    }
-
-    async fn create_from_config(config: &ObjectStoreConfig) -> Arc<dyn ObjectStore> {
-        match &config.mode {
-            ObjectStoreMode::GCS { bucket_base_url } => {
-                tracing::trace!(
-                    "Initialized GoogleCloudStorage Object store without credential file"
-                );
-                let store = GoogleCloudStorage::new(
-                    GoogleCloudStorageAuthMode::Authenticated,
-                    bucket_base_url.clone(),
-                    config.max_retries,
-                )
-                .await;
-                Arc::new(store)
-            }
-            ObjectStoreMode::GCSWithCredentialFile {
-                bucket_base_url,
-                gcs_credential_file_path,
-            } => {
-                tracing::trace!("Initialized GoogleCloudStorage Object store with credential file");
-                let store = GoogleCloudStorage::new(
-                    GoogleCloudStorageAuthMode::AuthenticatedWithCredentialFile(
-                        gcs_credential_file_path.clone(),
-                    ),
-                    bucket_base_url.clone(),
-                    config.max_retries,
-                )
-                .await;
-                Arc::new(store)
-            }
-            ObjectStoreMode::FileBacked {
-                file_backed_base_path,
-            } => {
-                tracing::trace!("Initialized FileBacked Object store");
-                let store = FileBackedObjectStore::new(file_backed_base_path.clone()).await;
-                Arc::new(store)
-            }
-            ObjectStoreMode::GCSAnonymousReadOnly { bucket_base_url } => {
-                tracing::trace!("Initialized GoogleCloudStoragePublicReadOnly store");
-                let store = GoogleCloudStorage::new(
-                    GoogleCloudStorageAuthMode::Anonymous,
-                    bucket_base_url.clone(),
-                    config.max_retries,
-                )
-                .await;
-                Arc::new(store)
-            }
-        }
-    }
-}
diff --git a/core/lib/object_store/src/retries.rs b/core/lib/object_store/src/retries.rs
new file mode 100644
index 000000000000..fafde47a9e2d
--- /dev/null
+++ b/core/lib/object_store/src/retries.rs
@@ -0,0 +1,184 @@
+use std::{any, fmt, future::Future, time::Duration};
+
+use async_trait::async_trait;
+use rand::Rng;
+
+use crate::{
+    metrics::OBJECT_STORE_METRICS,
+    raw::{Bucket, ObjectStore, ObjectStoreError},
+};
+
+/// Information about request added to logs.
+#[derive(Debug, Clone, Copy)]
+#[allow(dead_code)] // fields are used via `Debug` impl in logs
+enum Request<'a> {
+    New,
+    Get(Bucket, &'a str),
+    Put(Bucket, &'a str),
+    Remove(Bucket, &'a str),
+}
+
+impl Request<'_> {
+    #[tracing::instrument(skip(f))] // output request and store as a part of structured logs
+    async fn retry<T, Fut, F>(
+        self,
+        store: &impl fmt::Debug,
+        max_retries: u16,
+        mut f: F,
+    ) -> Result<T, ObjectStoreError>
+    where
+        Fut: Future<Output = Result<T, ObjectStoreError>>,
+        F: FnMut() -> Fut,
+    {
+        let mut retries = 1;
+        let mut backoff_secs = 1;
+        loop {
+            match f().await {
+                Ok(result) => return Ok(result),
+                Err(err) if err.is_transient() => {
+                    if retries > max_retries {
+                        tracing::warn!(%err, "Exhausted {max_retries} retries performing request; returning last error");
+                        return Err(err);
+                    }
+                    tracing::info!(%err, "Failed request, retries: {retries}/{max_retries}");
+                    retries += 1;
+                    // Randomize sleep duration to prevent stampeding the server if multiple requests are initiated at the same time.
+                    let sleep_duration = Duration::from_secs(backoff_secs)
+                        .mul_f32(rand::thread_rng().gen_range(0.8..1.2));
+                    tokio::time::sleep(sleep_duration).await;
+                    backoff_secs *= 2;
+                }
+                Err(err) => {
+                    tracing::warn!(%err, "Failed request with a fatal error");
+                    return Err(err);
+                }
+            }
+        }
+    }
+}
+
+/// [`ObjectStore`] wrapper that retries all operations according to a reasonable policy.
+#[derive(Debug)]
+pub(crate) struct StoreWithRetries<S> {
+    inner: S,
+    max_retries: u16,
+}
+
+impl<S: ObjectStore> StoreWithRetries<S> {
+    /// Creates a store based on the provided async initialization closure.
+    pub async fn try_new<Fut>(
+        max_retries: u16,
+        init_fn: impl FnMut() -> Fut,
+    ) -> Result<Self, ObjectStoreError>
+    where
+        Fut: Future<Output = Result<S, ObjectStoreError>>,
+    {
+        Ok(Self {
+            inner: Request::New
+                .retry(&any::type_name::<S>(), max_retries, init_fn)
+                .await?,
+            max_retries,
+        })
+    }
+}
+
+// Object store metrics are placed here because `ObjectStoreFactory` (which in practice produces "production" object stores)
+// wraps stores in `StoreWithRetries`. If this is changed, metrics will need to be refactored correspondingly.
+#[async_trait]
+impl<S: ObjectStore> ObjectStore for StoreWithRetries<S> {
+    async fn get_raw(&self, bucket: Bucket, key: &str) -> Result<Vec<u8>, ObjectStoreError> {
+        let latency = OBJECT_STORE_METRICS.start_fetch(bucket);
+        let result = Request::Get(bucket, key)
+            .retry(&self.inner, self.max_retries, || {
+                self.inner.get_raw(bucket, key)
+            })
+            .await;
+        latency.observe();
+        result
+    }
+
+    async fn put_raw(
+        &self,
+        bucket: Bucket,
+        key: &str,
+        value: Vec<u8>,
+    ) -> Result<(), ObjectStoreError> {
+        let latency = OBJECT_STORE_METRICS.start_store(bucket);
+        let result = Request::Put(bucket, key)
+            .retry(&self.inner, self.max_retries, || {
+                self.inner.put_raw(bucket, key, value.clone())
+            })
+            .await;
+        latency.observe();
+        result
+    }
+
+    async fn remove_raw(&self, bucket: Bucket, key: &str) -> Result<(), ObjectStoreError> {
+        Request::Remove(bucket, key)
+            .retry(&self.inner, self.max_retries, || {
+                self.inner.remove_raw(bucket, key)
+            })
+            .await
+    }
+
+    fn storage_prefix_raw(&self, bucket: Bucket) -> String {
+        self.inner.storage_prefix_raw(bucket)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::sync::atomic::{AtomicU16, Ordering};
+
+    use assert_matches::assert_matches;
+
+    use super::*;
+
+    fn transient_error() -> ObjectStoreError {
+        ObjectStoreError::Other {
+            is_transient: true,
+            source: "oops".into(),
+        }
+    }
+
+    #[tokio::test]
+    async fn test_retry_success_immediate() {
+        let result = Request::New
+            .retry(&"store", 2, || async { Ok(42) })
+            .await
+            .unwrap();
+        assert_eq!(result, 42);
+    }
+
+    #[tokio::test]
+    async fn test_retry_failure_exhausted() {
+        let err = Request::New
+            .retry(&"store", 2, || async { Err::<i32, _>(transient_error()) })
+            .await
+            .unwrap_err();
+        assert_matches!(err, ObjectStoreError::Other { .. });
+    }
+
+    async fn retry_success_after_n_retries(n: u16) -> Result<u32, ObjectStoreError> {
+        let retries = AtomicU16::new(0);
+        Request::New
+            .retry(&"store", n, || async {
+                let retries = retries.fetch_add(1, Ordering::Relaxed);
+                if retries + 1 == n {
+                    Ok(42)
+                } else {
+                    Err(transient_error())
+                }
+            })
+            .await
+    }
+
+    #[tokio::test]
+    async fn test_retry_success_after_retry() {
+        let result = Request::New
+            .retry(&"store", 2, || retry_success_after_n_retries(2))
+            .await
+            .unwrap();
+        assert_eq!(result, 42);
+    }
+}
diff --git a/core/lib/prometheus_exporter/src/lib.rs b/core/lib/prometheus_exporter/src/lib.rs
deleted file mode 100644
index 4eda0bebe0e6..000000000000
--- a/core/lib/prometheus_exporter/src/lib.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-use std::{net::Ipv4Addr, time::Duration};
-
-use anyhow::Context as _;
-use metrics_exporter_prometheus::{Matcher, PrometheusBuilder};
-use tokio::sync::watch;
-use vise::MetricsCollection;
-use vise_exporter::MetricsExporter;
-
-fn configure_legacy_exporter(builder: PrometheusBuilder) -> PrometheusBuilder {
-    // in seconds
-    let default_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.25, 1.0, 5.0, 30.0, 120.0];
-    let slow_latency_buckets = [
-        0.33, 1.0, 2.0, 5.0, 10.0, 30.0, 60.0, 180.0, 600.0, 1800.0, 3600.0,
-    ];
-    let prover_buckets = [
-        1.0, 10.0, 20.0, 40.0, 60.0, 120.0, 240.0, 360.0, 600.0, 1800.0, 3600.0,
-    ];
-
-    builder
-        .set_buckets(&default_latency_buckets)
-        .unwrap()
-        .set_buckets_for_metric(Matcher::Prefix("server.prover".to_owned()), &prover_buckets)
-        .unwrap()
-        .set_buckets_for_metric(
-            Matcher::Prefix("server.witness_generator".to_owned()),
-            &slow_latency_buckets,
-        )
-        .unwrap()
-}
-
-#[derive(Debug)]
-enum PrometheusTransport {
-    Pull {
-        port: u16,
-    },
-    Push {
-        gateway_uri: String,
-        interval: Duration,
-    },
-}
-
-/// Configuration of a Prometheus exporter.
-#[derive(Debug)]
-pub struct PrometheusExporterConfig {
-    transport: PrometheusTransport,
-    use_new_facade: bool,
-}
-
-impl PrometheusExporterConfig {
-    /// Creates an exporter that will run an HTTP server on the specified `port`.
-    pub const fn pull(port: u16) -> Self {
-        Self {
-            transport: PrometheusTransport::Pull { port },
-            use_new_facade: true,
-        }
-    }
-
-    /// Creates an exporter that will push metrics to the specified Prometheus gateway endpoint.
-    pub const fn push(gateway_uri: String, interval: Duration) -> Self {
-        Self {
-            transport: PrometheusTransport::Push {
-                gateway_uri,
-                interval,
-            },
-            use_new_facade: true,
-        }
-    }
-
-    /// Disables the new metrics façade (`vise`), which is on by default.
-    #[must_use]
-    pub fn without_new_facade(self) -> Self {
-        Self {
-            use_new_facade: false,
-            transport: self.transport,
-        }
-    }
-
-    /// Runs the exporter. This future should be spawned in a separate Tokio task.
-    pub async fn run(self, stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
-        if self.use_new_facade {
-            self.run_with_new_facade(stop_receiver)
-                .await
-                .context("run_with_new_facade()")
-        } else {
-            self.run_without_new_facade()
-                .await
-                .context("run_without_new_facade()")
-        }
-    }
-
-    async fn run_with_new_facade(
-        self,
-        mut stop_receiver: watch::Receiver<bool>,
-    ) -> anyhow::Result<()> {
-        let registry = MetricsCollection::lazy().collect();
-        let metrics_exporter = MetricsExporter::new(registry.into())
-            .with_legacy_exporter(configure_legacy_exporter)
-            .with_graceful_shutdown(async move {
-                stop_receiver.changed().await.ok();
-            });
-
-        match self.transport {
-            PrometheusTransport::Pull { port } => {
-                let prom_bind_address = (Ipv4Addr::UNSPECIFIED, port).into();
-                metrics_exporter
-                    .start(prom_bind_address)
-                    .await
-                    .expect("Failed starting metrics server");
-            }
-            PrometheusTransport::Push {
-                gateway_uri,
-                interval,
-            } => {
-                let endpoint = gateway_uri
-                    .parse()
-                    .context("Failed parsing Prometheus push gateway endpoint")?;
-                metrics_exporter.push_to_gateway(endpoint, interval).await;
-            }
-        }
-        Ok(())
-    }
-
-    async fn run_without_new_facade(self) -> anyhow::Result<()> {
-        let builder = match self.transport {
-            PrometheusTransport::Pull { port } => {
-                let prom_bind_address = (Ipv4Addr::UNSPECIFIED, port);
-                PrometheusBuilder::new().with_http_listener(prom_bind_address)
-            }
-            PrometheusTransport::Push {
-                gateway_uri,
-                interval,
-            } => PrometheusBuilder::new()
-                .with_push_gateway(gateway_uri, interval, None, None)
-                .context("PrometheusBuilder::with_push_gateway()")?,
-        };
-        let builder = configure_legacy_exporter(builder);
-        let (recorder, exporter) = builder.build().context("PrometheusBuilder::build()")?;
-        metrics::set_boxed_recorder(Box::new(recorder))
-            .context("failed to set metrics recorder")?;
-        exporter.await.context("Prometheus exporter failed")
-    }
-}
diff --git a/core/lib/protobuf_config/Cargo.toml b/core/lib/protobuf_config/Cargo.toml
index bfc988659763..ee52d8d5472f 100644
--- a/core/lib/protobuf_config/Cargo.toml
+++ b/core/lib/protobuf_config/Cargo.toml
@@ -22,7 +22,8 @@ zksync_types.workspace = true
 anyhow.workspace = true
 prost.workspace = true
 rand.workspace = true
-hex = "0.4.3"
+hex.workspace = true
+secrecy.workspace = true
 
 [build-dependencies]
 zksync_protobuf_build.workspace = true
diff --git a/core/lib/protobuf_config/build.rs b/core/lib/protobuf_config/build.rs
index 9a23d015239f..5705ed44c1d5 100644
--- a/core/lib/protobuf_config/build.rs
+++ b/core/lib/protobuf_config/build.rs
@@ -3,7 +3,7 @@ fn main() {
     zksync_protobuf_build::Config {
         input_root: "src/proto".into(),
         proto_root: "zksync".into(),
-        dependencies: vec![],
+        dependencies: vec!["::zksync_protobuf::proto".parse().unwrap()],
         protobuf_crate: "::zksync_protobuf".parse().unwrap(),
         is_public: true,
     }
diff --git a/core/lib/protobuf_config/src/api.rs b/core/lib/protobuf_config/src/api.rs
index fe0cfb3e0d6e..4eac849773f3 100644
--- a/core/lib/protobuf_config/src/api.rs
+++ b/core/lib/protobuf_config/src/api.rs
@@ -69,7 +69,11 @@ impl ProtoRepr for proto::Web3JsonRpc {
             })
             .collect::<anyhow::Result<_>>()
             .context("max_response_body_size_overrides")?;
-
+        let api_namespaces = if self.api_namespaces.is_empty() {
+            None
+        } else {
+            Some(self.api_namespaces.clone())
+        };
         Ok(Self::Type {
             http_port: required(&self.http_port)
                 .and_then(|p| Ok((*p).try_into()?))
@@ -154,6 +158,8 @@ impl ProtoRepr for proto::Web3JsonRpc {
                 .map(|(i, k)| parse_h160(k).context(i))
                 .collect::<Result<Vec<_>, _>>()
                 .context("account_pks")?,
+            extended_api_tracing: self.extended_api_tracing.unwrap_or_default(),
+            api_namespaces,
         })
     }
 
@@ -222,6 +228,8 @@ impl ProtoRepr for proto::Web3JsonRpc {
                 .iter()
                 .map(|k| format!("{:?}", k))
                 .collect(),
+            extended_api_tracing: Some(this.extended_api_tracing),
+            api_namespaces: this.api_namespaces.clone().unwrap_or_default(),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/base_token_adjuster.rs b/core/lib/protobuf_config/src/base_token_adjuster.rs
new file mode 100644
index 000000000000..d8dea17daec0
--- /dev/null
+++ b/core/lib/protobuf_config/src/base_token_adjuster.rs
@@ -0,0 +1,22 @@
+use zksync_config::configs::{self};
+use zksync_protobuf::ProtoRepr;
+
+use crate::proto::base_token_adjuster as proto;
+
+impl ProtoRepr for proto::BaseTokenAdjuster {
+    type Type = configs::base_token_adjuster::BaseTokenAdjusterConfig;
+
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(configs::base_token_adjuster::BaseTokenAdjusterConfig {
+            price_polling_interval_ms: self
+                .price_polling_interval_ms
+                .expect("price_polling_interval_ms"),
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            price_polling_interval_ms: Some(this.price_polling_interval_ms),
+        }
+    }
+}
diff --git a/core/lib/protobuf_config/src/chain.rs b/core/lib/protobuf_config/src/chain.rs
index 7b1d9f532fd7..fafecc0131cd 100644
--- a/core/lib/protobuf_config/src/chain.rs
+++ b/core/lib/protobuf_config/src/chain.rs
@@ -78,6 +78,10 @@ impl ProtoRepr for proto::StateKeeper {
             max_circuits_per_batch: required(&self.max_circuits_per_batch)
                 .and_then(|x| Ok((*x).try_into()?))
                 .context("max_circuits_per_batch")?,
+            protective_reads_persistence_enabled: *required(
+                &self.protective_reads_persistence_enabled,
+            )
+            .context("protective_reads_persistence_enabled")?,
 
             // We need these values only for instantiating configs from environmental variables, so it's not
             // needed during the initialization from files
@@ -115,6 +119,7 @@ impl ProtoRepr for proto::StateKeeper {
             validation_computational_gas_limit: Some(this.validation_computational_gas_limit),
             save_call_traces: Some(this.save_call_traces),
             max_circuits_per_batch: Some(this.max_circuits_per_batch.try_into().unwrap()),
+            protective_reads_persistence_enabled: Some(this.protective_reads_persistence_enabled),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/commitment_generator.rs b/core/lib/protobuf_config/src/commitment_generator.rs
new file mode 100644
index 000000000000..23af3ccce76e
--- /dev/null
+++ b/core/lib/protobuf_config/src/commitment_generator.rs
@@ -0,0 +1,24 @@
+use std::num::NonZeroU32;
+
+use anyhow::Context as _;
+use zksync_config::configs::CommitmentGeneratorConfig;
+use zksync_protobuf::{repr::ProtoRepr, required};
+
+use crate::proto::commitment_generator as proto;
+
+impl ProtoRepr for proto::CommitmentGenerator {
+    type Type = CommitmentGeneratorConfig;
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            max_parallelism: NonZeroU32::new(
+                *required(&self.max_parallelism).context("max_parallelism")?,
+            )
+            .context("cannot be 0")?,
+        })
+    }
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            max_parallelism: Some(this.max_parallelism.into()),
+        }
+    }
+}
diff --git a/core/lib/protobuf_config/src/consensus.rs b/core/lib/protobuf_config/src/consensus.rs
index 555cd1e64e0b..3d2c862d7639 100644
--- a/core/lib/protobuf_config/src/consensus.rs
+++ b/core/lib/protobuf_config/src/consensus.rs
@@ -1,10 +1,72 @@
 use anyhow::Context as _;
+use zksync_basic_types::L2ChainId;
 use zksync_config::configs::consensus::{
-    ConsensusConfig, ConsensusSecrets, Host, NodePublicKey, NodeSecretKey, ValidatorSecretKey,
+    ConsensusConfig, GenesisSpec, Host, NodePublicKey, ProtocolVersion, RpcConfig,
+    ValidatorPublicKey, WeightedValidator,
 };
-use zksync_protobuf::{repr::ProtoRepr, required};
+use zksync_protobuf::{read_optional, repr::ProtoRepr, required, ProtoFmt};
 
-use crate::proto::consensus as proto;
+use crate::{proto::consensus as proto, read_optional_repr};
+
+impl ProtoRepr for proto::WeightedValidator {
+    type Type = WeightedValidator;
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            key: ValidatorPublicKey(required(&self.key).context("key")?.clone()),
+            weight: *required(&self.weight).context("weight")?,
+        })
+    }
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            key: Some(this.key.0.clone()),
+            weight: Some(this.weight),
+        }
+    }
+}
+
+impl ProtoRepr for proto::GenesisSpec {
+    type Type = GenesisSpec;
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            chain_id: required(&self.chain_id)
+                .and_then(|x| L2ChainId::try_from(*x).map_err(|a| anyhow::anyhow!(a)))
+                .context("chain_id")?,
+            protocol_version: ProtocolVersion(
+                *required(&self.protocol_version).context("protocol_version")?,
+            ),
+            validators: self
+                .validators
+                .iter()
+                .enumerate()
+                .map(|(i, x)| x.read().context(i))
+                .collect::<Result<_, _>>()
+                .context("validators")?,
+            leader: ValidatorPublicKey(required(&self.leader).context("leader")?.clone()),
+        })
+    }
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            chain_id: Some(this.chain_id.as_u64()),
+            protocol_version: Some(this.protocol_version.0),
+            validators: this.validators.iter().map(ProtoRepr::build).collect(),
+            leader: Some(this.leader.0.clone()),
+        }
+    }
+}
+
+impl ProtoRepr for proto::RpcConfig {
+    type Type = RpcConfig;
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            get_block_rate: read_optional(&self.get_block_rate).context("get_block_rate")?,
+        })
+    }
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            get_block_rate: this.get_block_rate.as_ref().map(ProtoFmt::build),
+        }
+    }
+}
 
 impl ProtoRepr for proto::Config {
     type Type = ConsensusConfig;
@@ -36,6 +98,8 @@ impl ProtoRepr for proto::Config {
                 .enumerate()
                 .map(|(i, e)| read_addr(e).context(i))
                 .collect::<Result<_, _>>()?,
+            genesis_spec: read_optional_repr(&self.genesis_spec).context("genesis_spec")?,
+            rpc: read_optional_repr(&self.rpc_config).context("rpc_config")?,
         })
     }
 
@@ -60,26 +124,8 @@ impl ProtoRepr for proto::Config {
                     addr: Some(x.1 .0.clone()),
                 })
                 .collect(),
-        }
-    }
-}
-
-impl ProtoRepr for proto::Secrets {
-    type Type = ConsensusSecrets;
-    fn read(&self) -> anyhow::Result<Self::Type> {
-        Ok(Self::Type {
-            validator_key: self
-                .validator_key
-                .as_ref()
-                .map(|x| ValidatorSecretKey(x.clone())),
-            node_key: self.node_key.as_ref().map(|x| NodeSecretKey(x.clone())),
-        })
-    }
-
-    fn build(this: &Self::Type) -> Self {
-        Self {
-            validator_key: this.validator_key.as_ref().map(|x| x.0.clone()),
-            node_key: this.node_key.as_ref().map(|x| x.0.clone()),
+            genesis_spec: this.genesis_spec.as_ref().map(ProtoRepr::build),
+            rpc_config: this.rpc.as_ref().map(ProtoRepr::build),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/contracts.rs b/core/lib/protobuf_config/src/contracts.rs
index 05277a49f17d..ac1864b7a0bd 100644
--- a/core/lib/protobuf_config/src/contracts.rs
+++ b/core/lib/protobuf_config/src/contracts.rs
@@ -63,7 +63,7 @@ impl ProtoRepr for proto::Contracts {
                 .as_ref()
                 .map(|x| parse_h160(x))
                 .transpose()
-                .context("l1_erc20_bridge_impl_addr")?,
+                .context("l2_erc20_bridge_addr")?,
             l1_shared_bridge_proxy_addr: shared
                 .l1_address
                 .as_ref()
@@ -75,7 +75,7 @@ impl ProtoRepr for proto::Contracts {
                 .as_ref()
                 .map(|x| parse_h160(x))
                 .transpose()
-                .context("l2_shared_bridge_proxy_addr")?,
+                .context("l2_shared_bridge_addr")?,
             l1_weth_bridge_proxy_addr: weth_bridge
                 .as_ref()
                 .and_then(|bridge| bridge.l1_address.as_ref().map(|x| parse_h160(x)))
diff --git a/core/lib/protobuf_config/src/da_dispatcher.rs b/core/lib/protobuf_config/src/da_dispatcher.rs
new file mode 100644
index 000000000000..1cafa37a1e19
--- /dev/null
+++ b/core/lib/protobuf_config/src/da_dispatcher.rs
@@ -0,0 +1,24 @@
+use zksync_config::configs::{self};
+use zksync_protobuf::ProtoRepr;
+
+use crate::proto::da_dispatcher as proto;
+
+impl ProtoRepr for proto::DataAvailabilityDispatcher {
+    type Type = configs::da_dispatcher::DADispatcherConfig;
+
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(configs::da_dispatcher::DADispatcherConfig {
+            polling_interval_ms: self.polling_interval_ms,
+            max_rows_to_dispatch: self.max_rows_to_dispatch,
+            max_retries: self.max_retries.map(|x| x as u16),
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            polling_interval_ms: this.polling_interval_ms,
+            max_rows_to_dispatch: this.max_rows_to_dispatch,
+            max_retries: this.max_retries.map(Into::into),
+        }
+    }
+}
diff --git a/core/lib/protobuf_config/src/database.rs b/core/lib/protobuf_config/src/database.rs
index 1a99202efeab..c0826f613a34 100644
--- a/core/lib/protobuf_config/src/database.rs
+++ b/core/lib/protobuf_config/src/database.rs
@@ -1,5 +1,4 @@
 use anyhow::Context as _;
-use zksync_basic_types::url::SensitiveUrl;
 use zksync_config::configs;
 use zksync_protobuf::{
     repr::{read_required_repr, ProtoRepr},
@@ -103,32 +102,7 @@ impl ProtoRepr for proto::Postgres {
             .map(|x| (x.server_url.clone(), x.prover_url.clone()))
             .unwrap_or_default();
 
-        let master_url = self
-            .server_url
-            .as_deref()
-            .map(str::parse::<SensitiveUrl>)
-            .transpose()
-            .context("master_url")?;
-        let mut replica_url = self
-            .server_replica_url
-            .as_deref()
-            .map(str::parse::<SensitiveUrl>)
-            .transpose()
-            .context("replica_url")?;
-        if replica_url.is_none() {
-            replica_url = master_url.clone();
-        }
-        let prover_url = self
-            .prover_url
-            .as_deref()
-            .map(str::parse::<SensitiveUrl>)
-            .transpose()
-            .context("prover_url")?;
-
         Ok(Self::Type {
-            master_url,
-            replica_url,
-            prover_url,
             max_connections: self.max_connections,
             max_connections_master: self.max_connections_master,
             acquire_timeout_sec: self.acquire_timeout_sec,
@@ -142,18 +116,6 @@ impl ProtoRepr for proto::Postgres {
 
     fn build(this: &Self::Type) -> Self {
         Self {
-            server_url: this
-                .master_url
-                .as_ref()
-                .map(|url| url.expose_str().to_owned()),
-            server_replica_url: this
-                .replica_url
-                .as_ref()
-                .map(|url| url.expose_str().to_owned()),
-            prover_url: this
-                .prover_url
-                .as_ref()
-                .map(|url| url.expose_str().to_owned()),
             max_connections: this.max_connections,
             max_connections_master: this.max_connections_master,
             acquire_timeout_sec: this.acquire_timeout_sec,
diff --git a/core/lib/protobuf_config/src/en.rs b/core/lib/protobuf_config/src/en.rs
new file mode 100644
index 000000000000..b6323de6ea61
--- /dev/null
+++ b/core/lib/protobuf_config/src/en.rs
@@ -0,0 +1,50 @@
+use std::{num::NonZeroUsize, str::FromStr};
+
+use anyhow::Context;
+use zksync_basic_types::{url::SensitiveUrl, L1ChainId, L2ChainId};
+use zksync_config::configs::en_config::ENConfig;
+use zksync_protobuf::{required, ProtoRepr};
+
+use crate::proto::en as proto;
+
+impl ProtoRepr for proto::ExternalNode {
+    type Type = ENConfig;
+
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            main_node_url: SensitiveUrl::from_str(
+                required(&self.main_node_url).context("main_node_url")?,
+            )?,
+            l1_chain_id: required(&self.l1_chain_id)
+                .map(|x| L1ChainId(*x))
+                .context("l1_chain_id")?,
+            l2_chain_id: required(&self.l2_chain_id)
+                .and_then(|x| L2ChainId::try_from(*x).map_err(|a| anyhow::anyhow!(a)))
+                .context("l2_chain_id")?,
+            l1_batch_commit_data_generator_mode: required(
+                &self.l1_batch_commit_data_generator_mode,
+            )
+            .and_then(|x| Ok(crate::proto::genesis::L1BatchCommitDataGeneratorMode::try_from(*x)?))
+            .context("l1_batch_commit_data_generator_mode")?
+            .parse(),
+            main_node_rate_limit_rps: self
+                .main_node_rate_limit_rps
+                .and_then(|a| NonZeroUsize::new(a as usize)),
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            main_node_url: Some(this.main_node_url.expose_str().to_string()),
+            l1_chain_id: Some(this.l1_chain_id.0),
+            l2_chain_id: Some(this.l2_chain_id.as_u64()),
+            l1_batch_commit_data_generator_mode: Some(
+                crate::proto::genesis::L1BatchCommitDataGeneratorMode::new(
+                    &this.l1_batch_commit_data_generator_mode,
+                )
+                .into(),
+            ),
+            main_node_rate_limit_rps: this.main_node_rate_limit_rps.map(|a| a.get() as u64),
+        }
+    }
+}
diff --git a/core/lib/protobuf_config/src/eth.rs b/core/lib/protobuf_config/src/eth.rs
index 0e3aacf1696a..90807f7dafa3 100644
--- a/core/lib/protobuf_config/src/eth.rs
+++ b/core/lib/protobuf_config/src/eth.rs
@@ -24,30 +24,13 @@ impl proto::ProofSendingMode {
     }
 }
 
-impl proto::ProofLoadingMode {
-    fn new(x: &configs::eth_sender::ProofLoadingMode) -> Self {
-        use configs::eth_sender::ProofLoadingMode as From;
-        match x {
-            From::OldProofFromDb => Self::OldProofFromDb,
-            From::FriProofFromGcs => Self::FriProofFromGcs,
-        }
-    }
-
-    fn parse(&self) -> configs::eth_sender::ProofLoadingMode {
-        use configs::eth_sender::ProofLoadingMode as To;
-        match self {
-            Self::OldProofFromDb => To::OldProofFromDb,
-            Self::FriProofFromGcs => To::FriProofFromGcs,
-        }
-    }
-}
-
 impl proto::PubdataSendingMode {
     fn new(x: &configs::eth_sender::PubdataSendingMode) -> Self {
         use configs::eth_sender::PubdataSendingMode as From;
         match x {
             From::Calldata => Self::Calldata,
             From::Blobs => Self::Blobs,
+            From::Custom => Self::Custom,
         }
     }
 
@@ -56,6 +39,7 @@ impl proto::PubdataSendingMode {
         match self {
             Self::Calldata => To::Calldata,
             Self::Blobs => To::Blobs,
+            Self::Custom => To::Custom,
         }
     }
 }
@@ -68,10 +52,6 @@ impl ProtoRepr for proto::Eth {
             sender: read_optional_repr(&self.sender).context("sender")?,
             gas_adjuster: read_optional_repr(&self.gas_adjuster).context("gas_adjuster")?,
             watcher: read_optional_repr(&self.watcher).context("watcher")?,
-            web3_url: required(&self.web3_url)
-                .context("web3_url")?
-                .parse()
-                .context("web3_url")?,
         })
     }
 
@@ -80,7 +60,6 @@ impl ProtoRepr for proto::Eth {
             sender: this.sender.as_ref().map(ProtoRepr::build),
             gas_adjuster: this.gas_adjuster.as_ref().map(ProtoRepr::build),
             watcher: this.watcher.as_ref().map(ProtoRepr::build),
-            web3_url: Some(this.web3_url.expose_str().to_owned()),
         }
     }
 }
@@ -132,10 +111,6 @@ impl ProtoRepr for proto::Sender {
                 .and_then(|x| Ok(proto::PubdataSendingMode::try_from(*x)?))
                 .context("pubdata_sending_mode")?
                 .parse(),
-            proof_loading_mode: required(&self.proof_loading_mode)
-                .and_then(|x| Ok(proto::ProofLoadingMode::try_from(*x)?))
-                .context("proof_loading_mode")?
-                .parse(),
         })
     }
 
@@ -166,7 +141,6 @@ impl ProtoRepr for proto::Sender {
             pubdata_sending_mode: Some(
                 proto::PubdataSendingMode::new(&this.pubdata_sending_mode).into(),
             ),
-            proof_loading_mode: Some(proto::ProofLoadingMode::new(&this.proof_loading_mode).into()),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/experimental.rs b/core/lib/protobuf_config/src/experimental.rs
index c4fe17aadf43..8d92f3ef87a8 100644
--- a/core/lib/protobuf_config/src/experimental.rs
+++ b/core/lib/protobuf_config/src/experimental.rs
@@ -21,6 +21,13 @@ impl ProtoRepr for proto::Db {
                 .map(|count| NonZeroU32::new(count).context("cannot be 0"))
                 .transpose()
                 .context("state_keeper_db_max_open_files")?,
+            protective_reads_persistence_enabled: self
+                .reads_persistence_enabled
+                .unwrap_or_default(),
+            processing_delay_ms: self.processing_delay_ms.unwrap_or_default(),
+            include_indices_and_filters_in_block_cache: self
+                .include_indices_and_filters_in_block_cache
+                .unwrap_or_default(),
         })
     }
 
@@ -34,6 +41,11 @@ impl ProtoRepr for proto::Db {
             state_keeper_db_max_open_files: this
                 .state_keeper_db_max_open_files
                 .map(NonZeroU32::get),
+            reads_persistence_enabled: Some(this.protective_reads_persistence_enabled),
+            processing_delay_ms: Some(this.processing_delay_ms),
+            include_indices_and_filters_in_block_cache: Some(
+                this.include_indices_and_filters_in_block_cache,
+            ),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/general.rs b/core/lib/protobuf_config/src/general.rs
index ccd55a71c2ec..8993adeccb2c 100644
--- a/core/lib/protobuf_config/src/general.rs
+++ b/core/lib/protobuf_config/src/general.rs
@@ -37,6 +37,19 @@ impl ProtoRepr for proto::GeneralConfig {
             snapshot_creator: read_optional_repr(&self.snapshot_creator)
                 .context("snapshot_creator")?,
             observability: read_optional_repr(&self.observability).context("observability")?,
+            da_dispatcher_config: read_optional_repr(&self.da_dispatcher)
+                .context("da_dispatcher")?,
+            protective_reads_writer_config: read_optional_repr(&self.protective_reads_writer)
+                .context("protective_reads_writer")?,
+            core_object_store: read_optional_repr(&self.core_object_store)
+                .context("core_object_store")?,
+            base_token_adjuster: read_optional_repr(&self.base_token_adjuster)
+                .context("base_token_adjuster")?,
+            commitment_generator: read_optional_repr(&self.commitment_generator)
+                .context("commitment_generator")?,
+            pruning: read_optional_repr(&self.pruning).context("pruning")?,
+            snapshot_recovery: read_optional_repr(&self.snapshot_recovery)
+                .context("snapshot_recovery")?,
         })
     }
 
@@ -68,6 +81,16 @@ impl ProtoRepr for proto::GeneralConfig {
             eth: this.eth.as_ref().map(ProtoRepr::build),
             snapshot_creator: this.snapshot_creator.as_ref().map(ProtoRepr::build),
             observability: this.observability.as_ref().map(ProtoRepr::build),
+            da_dispatcher: this.da_dispatcher_config.as_ref().map(ProtoRepr::build),
+            protective_reads_writer: this
+                .protective_reads_writer_config
+                .as_ref()
+                .map(ProtoRepr::build),
+            commitment_generator: this.commitment_generator.as_ref().map(ProtoRepr::build),
+            snapshot_recovery: this.snapshot_recovery.as_ref().map(ProtoRepr::build),
+            pruning: this.pruning.as_ref().map(ProtoRepr::build),
+            core_object_store: this.core_object_store.as_ref().map(ProtoRepr::build),
+            base_token_adjuster: this.base_token_adjuster.as_ref().map(ProtoRepr::build),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/genesis.rs b/core/lib/protobuf_config/src/genesis.rs
index 63e2f88626f8..52045ed9dbed 100644
--- a/core/lib/protobuf_config/src/genesis.rs
+++ b/core/lib/protobuf_config/src/genesis.rs
@@ -1,37 +1,50 @@
+use std::str::FromStr;
+
 use anyhow::Context as _;
-use zksync_basic_types::{L1ChainId, L2ChainId};
+use zksync_basic_types::{
+    commitment::L1BatchCommitmentMode, protocol_version::ProtocolSemanticVersion, L1ChainId,
+    L2ChainId,
+};
 use zksync_config::configs;
 use zksync_protobuf::{repr::ProtoRepr, required};
 
 use crate::{parse_h160, parse_h256, proto::genesis as proto};
 
 impl proto::L1BatchCommitDataGeneratorMode {
-    fn new(n: &configs::chain::L1BatchCommitDataGeneratorMode) -> Self {
-        use configs::chain::L1BatchCommitDataGeneratorMode as From;
+    pub(crate) fn new(n: &L1BatchCommitmentMode) -> Self {
         match n {
-            From::Rollup => Self::Rollup,
-            From::Validium => Self::Validium,
+            L1BatchCommitmentMode::Rollup => Self::Rollup,
+            L1BatchCommitmentMode::Validium => Self::Validium,
         }
     }
 
-    fn parse(&self) -> configs::chain::L1BatchCommitDataGeneratorMode {
-        use configs::chain::L1BatchCommitDataGeneratorMode as To;
+    pub(crate) fn parse(&self) -> L1BatchCommitmentMode {
         match self {
-            Self::Rollup => To::Rollup,
-            Self::Validium => To::Validium,
+            Self::Rollup => L1BatchCommitmentMode::Rollup,
+            Self::Validium => L1BatchCommitmentMode::Validium,
         }
     }
 }
+
 impl ProtoRepr for proto::Genesis {
     type Type = configs::GenesisConfig;
     fn read(&self) -> anyhow::Result<Self::Type> {
         let prover = required(&self.prover).context("prover")?;
+        let protocol_version = if let Some(protocol_version) =
+            &self.genesis_protocol_semantic_version
+        {
+            ProtocolSemanticVersion::from_str(protocol_version).context("protocol_version")?
+        } else {
+            let minor_version = *required(&self.genesis_protocol_version).context("Either genesis_protocol_version or genesis_protocol_semantic_version should be presented")?;
+            ProtocolSemanticVersion::new(
+                (minor_version as u16)
+                    .try_into()
+                    .context("Wrong protocol version")?,
+                0.into(),
+            )
+        };
         Ok(Self::Type {
-            protocol_version: Some(
-                required(&self.genesis_protocol_version)
-                    .map(|x| *x as u16)
-                    .context("protocol_version")?,
-            ),
+            protocol_version: Some(protocol_version),
             genesis_root_hash: Some(
                 required(&self.genesis_root)
                     .and_then(|x| parse_h256(x))
@@ -95,7 +108,8 @@ impl ProtoRepr for proto::Genesis {
             genesis_root: this.genesis_root_hash.map(|x| format!("{:?}", x)),
             genesis_rollup_leaf_index: this.rollup_last_leaf_index,
             genesis_batch_commitment: this.genesis_commitment.map(|x| format!("{:?}", x)),
-            genesis_protocol_version: this.protocol_version.map(|x| x as u32),
+            genesis_protocol_version: this.protocol_version.map(|x| x.minor as u64),
+            genesis_protocol_semantic_version: this.protocol_version.map(|x| x.to_string()),
             default_aa_hash: this.default_aa_hash.map(|x| format!("{:?}", x)),
             bootloader_hash: this.bootloader_hash.map(|x| format!("{:?}", x)),
             fee_account: Some(format!("{:?}", this.fee_account)),
diff --git a/core/lib/protobuf_config/src/lib.rs b/core/lib/protobuf_config/src/lib.rs
index f3d1614c98f8..d525c03cdb59 100644
--- a/core/lib/protobuf_config/src/lib.rs
+++ b/core/lib/protobuf_config/src/lib.rs
@@ -5,12 +5,16 @@
 //! * protobuf json format
 
 mod api;
+mod base_token_adjuster;
 mod chain;
 mod circuit_breaker;
+mod commitment_generator;
 mod consensus;
 mod contract_verifier;
 mod contracts;
+mod da_dispatcher;
 mod database;
+mod en;
 mod eth;
 mod experimental;
 mod general;
@@ -21,16 +25,21 @@ mod observability;
 mod proof_data_handler;
 pub mod proto;
 mod prover;
+mod pruning;
+mod secrets;
 mod snapshots_creator;
-pub mod testonly;
+
+mod snapshot_recovery;
 #[cfg(test)]
 mod tests;
 mod utils;
+mod vm_runner;
 mod wallets;
 
-use std::str::FromStr;
+use std::{path::PathBuf, str::FromStr};
 
-use zksync_protobuf::ProtoRepr;
+use anyhow::Context;
+use zksync_protobuf::{serde::serialize_proto, ProtoRepr};
 use zksync_types::{H160, H256};
 
 fn parse_h256(bytes: &str) -> anyhow::Result<H256> {
@@ -44,3 +53,20 @@ fn parse_h160(bytes: &str) -> anyhow::Result<H160> {
 pub fn read_optional_repr<P: ProtoRepr>(field: &Option<P>) -> anyhow::Result<Option<P::Type>> {
     field.as_ref().map(|x| x.read()).transpose()
 }
+
+pub fn decode_yaml_repr<T: ProtoRepr>(
+    path: &PathBuf,
+    deny_unknown_fields: bool,
+) -> anyhow::Result<T::Type> {
+    let yaml = std::fs::read_to_string(path).with_context(|| path.display().to_string())?;
+    let d = serde_yaml::Deserializer::from_str(&yaml);
+    let this: T = zksync_protobuf::serde::deserialize_proto_with_options(d, deny_unknown_fields)?;
+    this.read()
+}
+
+pub fn encode_yaml_repr<T: ProtoRepr>(value: &T::Type) -> anyhow::Result<Vec<u8>> {
+    let mut buffer = vec![];
+    let mut s = serde_yaml::Serializer::new(&mut buffer);
+    serialize_proto(&T::build(value), &mut s)?;
+    Ok(buffer)
+}
diff --git a/core/lib/protobuf_config/src/object_store.rs b/core/lib/protobuf_config/src/object_store.rs
index a668cea991ae..eb8349321ab4 100644
--- a/core/lib/protobuf_config/src/object_store.rs
+++ b/core/lib/protobuf_config/src/object_store.rs
@@ -44,6 +44,7 @@ impl ProtoRepr for proto::ObjectStore {
             max_retries: required(&self.max_retries)
                 .and_then(|x| Ok((*x).try_into()?))
                 .context("max_retries")?,
+            local_mirror_path: self.local_mirror_path.clone(),
         })
     }
 
@@ -80,6 +81,7 @@ impl ProtoRepr for proto::ObjectStore {
         Self {
             mode: Some(mode),
             max_retries: Some(this.max_retries.into()),
+            local_mirror_path: this.local_mirror_path.clone(),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/observability.rs b/core/lib/protobuf_config/src/observability.rs
index 12d6a75459b5..e86894f29583 100644
--- a/core/lib/protobuf_config/src/observability.rs
+++ b/core/lib/protobuf_config/src/observability.rs
@@ -35,7 +35,6 @@ impl ProtoRepr for proto::Observability {
                 .as_ref()
                 .map(|cfg| cfg.read().context("opentelemetry"))
                 .transpose()?,
-            sporadic_crypto_errors_substrs: self.sporadic_crypto_errors_substrs.clone(),
             log_directives: self.log_directives.clone(),
         })
     }
@@ -55,7 +54,6 @@ impl ProtoRepr for proto::Observability {
             sentry,
             log_format: Some(this.log_format.clone()),
             opentelemetry: this.opentelemetry.as_ref().map(ProtoRepr::build),
-            sporadic_crypto_errors_substrs: this.sporadic_crypto_errors_substrs.clone(),
             log_directives: this.log_directives.clone(),
         }
     }
diff --git a/core/lib/protobuf_config/src/proof_data_handler.rs b/core/lib/protobuf_config/src/proof_data_handler.rs
index d231e5b46b7b..4b7bd2fd7c32 100644
--- a/core/lib/protobuf_config/src/proof_data_handler.rs
+++ b/core/lib/protobuf_config/src/proof_data_handler.rs
@@ -14,6 +14,9 @@ impl ProtoRepr for proto::ProofDataHandler {
             proof_generation_timeout_in_secs: required(&self.proof_generation_timeout_in_secs)
                 .and_then(|x| Ok((*x).try_into()?))
                 .context("proof_generation_timeout_in_secs")?,
+            tee_support: required(&self.tee_support)
+                .copied()
+                .context("tee_support")?,
         })
     }
 
@@ -21,6 +24,7 @@ impl ProtoRepr for proto::ProofDataHandler {
         Self {
             http_port: Some(this.http_port.into()),
             proof_generation_timeout_in_secs: Some(this.proof_generation_timeout_in_secs.into()),
+            tee_support: Some(this.tee_support),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/proto/config/api.proto b/core/lib/protobuf_config/src/proto/config/api.proto
index 09503056a3f1..4fea0691f79d 100644
--- a/core/lib/protobuf_config/src/proto/config/api.proto
+++ b/core/lib/protobuf_config/src/proto/config/api.proto
@@ -40,7 +40,8 @@ message Web3JsonRpc {
   optional uint64 mempool_cache_size = 29; // optional
   repeated string whitelisted_tokens_for_aa = 30; // optional
   repeated MaxResponseSizeOverride max_response_body_size_overrides = 31;
-
+  repeated string api_namespaces = 32; // Optional, if empty all namespaces are available
+  optional bool extended_api_tracing = 33; // optional, default false
   reserved 15; reserved "l1_to_l2_transactions_compatibility_mode";
 }
 
diff --git a/core/lib/protobuf_config/src/proto/config/base_token_adjuster.proto b/core/lib/protobuf_config/src/proto/config/base_token_adjuster.proto
new file mode 100644
index 000000000000..67e97dd14cda
--- /dev/null
+++ b/core/lib/protobuf_config/src/proto/config/base_token_adjuster.proto
@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package zksync.config.base_token_adjuster;
+
+message BaseTokenAdjuster {
+  optional uint64 price_polling_interval_ms = 1;
+}
diff --git a/core/lib/protobuf_config/src/proto/config/chain.proto b/core/lib/protobuf_config/src/proto/config/chain.proto
index c04f41ca4751..258d6d1d6d4c 100644
--- a/core/lib/protobuf_config/src/proto/config/chain.proto
+++ b/core/lib/protobuf_config/src/proto/config/chain.proto
@@ -8,7 +8,6 @@ enum FeeModelVersion {
   V2 = 1;
 }
 
-
 message StateKeeper {
   optional uint64 transaction_slots = 1; // required
   optional uint64 block_commit_deadline_ms = 2; // required; ms
@@ -33,6 +32,7 @@ message StateKeeper {
   optional bool save_call_traces = 22; // required
   optional uint64 max_circuits_per_batch = 27; // required
   optional uint64 miniblock_max_payload_size = 28; // required
+  optional bool protective_reads_persistence_enabled = 29; // optional
   reserved 23; reserved "virtual_blocks_interval";
   reserved 24; reserved "virtual_blocks_per_miniblock";
   reserved 26; reserved "enum_index_migration_chunk_size";
diff --git a/core/lib/protobuf_config/src/proto/config/commitment_generator.proto b/core/lib/protobuf_config/src/proto/config/commitment_generator.proto
new file mode 100644
index 000000000000..62b9566e1866
--- /dev/null
+++ b/core/lib/protobuf_config/src/proto/config/commitment_generator.proto
@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package zksync.config.commitment_generator;
+
+message CommitmentGenerator {
+  optional uint32 max_parallelism = 1;
+}
diff --git a/core/lib/protobuf_config/src/proto/config/da_dispatcher.proto b/core/lib/protobuf_config/src/proto/config/da_dispatcher.proto
new file mode 100644
index 000000000000..d1d913498a4e
--- /dev/null
+++ b/core/lib/protobuf_config/src/proto/config/da_dispatcher.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package zksync.config.da_dispatcher;
+
+import "zksync/config/object_store.proto";
+
+message DataAvailabilityDispatcher {
+  optional uint32 polling_interval_ms = 1;
+  optional uint32 max_rows_to_dispatch = 2;
+  optional uint32 max_retries = 3;
+}
diff --git a/core/lib/protobuf_config/src/proto/config/database.proto b/core/lib/protobuf_config/src/proto/config/database.proto
index 1154bfc1846a..e1b4e137668e 100644
--- a/core/lib/protobuf_config/src/proto/config/database.proto
+++ b/core/lib/protobuf_config/src/proto/config/database.proto
@@ -26,9 +26,6 @@ message DB {
 }
 
 message Postgres {
-  optional string server_url = 1; // optional
-  optional string server_replica_url = 2; // optional
-  optional string prover_url = 3; // optional
   optional uint32 max_connections = 4; // optional
   optional uint64 statement_timeout_sec = 5; // optional; s
   optional uint64 acquire_timeout_sec = 6; // optional; s
@@ -36,6 +33,8 @@ message Postgres {
   optional uint64 slow_query_threshold_ms = 8; // optional; ms
   optional uint32 max_connections_master = 9; // optional
   optional TestDatabase test = 10;
+  reserved 1, 2, 3; reserved "server_url", "server_replica_url", "prover_url";
+
 }
 
 message TestDatabase {
diff --git a/core/lib/protobuf_config/src/proto/config/en.proto b/core/lib/protobuf_config/src/proto/config/en.proto
new file mode 100644
index 000000000000..b0ec165b2f61
--- /dev/null
+++ b/core/lib/protobuf_config/src/proto/config/en.proto
@@ -0,0 +1,12 @@
+syntax = "proto3";
+import "zksync/config/genesis.proto";
+
+package zksync.config.en;
+
+message ExternalNode {
+  optional string main_node_url = 1; // required
+  optional uint64 l2_chain_id = 2; // required
+  optional uint64 l1_chain_id = 3; // required
+  optional uint64 main_node_rate_limit_rps = 6; // optional
+  optional config.genesis.L1BatchCommitDataGeneratorMode l1_batch_commit_data_generator_mode = 7; // optional, default to rollup
+}
diff --git a/core/lib/protobuf_config/src/proto/config/eth_sender.proto b/core/lib/protobuf_config/src/proto/config/eth_sender.proto
index d4db30682030..839c7f65b973 100644
--- a/core/lib/protobuf_config/src/proto/config/eth_sender.proto
+++ b/core/lib/protobuf_config/src/proto/config/eth_sender.proto
@@ -6,7 +6,7 @@ message ETH {
   optional Sender sender = 1; // required
   optional GasAdjuster gas_adjuster = 2; // required
   optional ETHWatch watcher = 3; // required
-  optional string web3_url = 4;
+  reserved 4; reserved "web3_url";
 }
 
 enum ProofSendingMode {
@@ -23,6 +23,7 @@ enum ProofLoadingMode {
 enum PubdataSendingMode {
   CALLDATA = 0;
   BLOBS = 1;
+  CUSTOM = 2;
 }
 
 message Sender {
@@ -43,7 +44,7 @@ message Sender {
   optional uint64 l1_batch_min_age_before_execute_seconds = 15; // optional; s
   optional uint64 max_acceptable_priority_fee_in_gwei = 16; // required; gwei
   optional PubdataSendingMode pubdata_sending_mode = 18; // required
-  optional ProofLoadingMode proof_loading_mode = 19;
+  reserved 19; reserved "proof_loading_mode";
 }
 
 message GasAdjuster {
diff --git a/core/lib/protobuf_config/src/proto/config/experimental.proto b/core/lib/protobuf_config/src/proto/config/experimental.proto
index 4f456b9aca39..1336c4719d26 100644
--- a/core/lib/protobuf_config/src/proto/config/experimental.proto
+++ b/core/lib/protobuf_config/src/proto/config/experimental.proto
@@ -8,4 +8,13 @@ package zksync.config.experimental;
 message DB {
   optional uint64 state_keeper_db_block_cache_capacity_mb = 1; // MB; required
   optional uint32 state_keeper_db_max_open_files = 2; // optional
+  optional bool reads_persistence_enabled = 3;
+  optional uint64 processing_delay_ms = 4;
+  optional bool include_indices_and_filters_in_block_cache = 5;
+}
+
+// Experimental part of the Snapshot recovery configuration.
+message SnapshotRecovery {
+  optional uint64 tree_recovery_parallel_persistence_buffer = 1;
+  optional bool drop_storage_key_preimages = 2; // optional; false by default
 }
diff --git a/core/lib/protobuf_config/src/proto/config/general.proto b/core/lib/protobuf_config/src/proto/config/general.proto
index fdc60c57cfdd..457890158e54 100644
--- a/core/lib/protobuf_config/src/proto/config/general.proto
+++ b/core/lib/protobuf_config/src/proto/config/general.proto
@@ -13,6 +13,13 @@ import "zksync/config/house_keeper.proto";
 import "zksync/config/observability.proto";
 import "zksync/config/snapshots_creator.proto";
 import "zksync/config/utils.proto";
+import "zksync/config/da_dispatcher.proto";
+import "zksync/config/vm_runner.proto";
+import "zksync/config/commitment_generator.proto";
+import "zksync/config/snapshot_recovery.proto";
+import "zksync/config/pruning.proto";
+import "zksync/config/object_store.proto";
+import "zksync/config/base_token_adjuster.proto";
 
 message GeneralConfig {
   optional config.database.Postgres postgres = 1;
@@ -35,4 +42,11 @@ message GeneralConfig {
   optional config.prover.ProverGateway prover_gateway = 30;
   optional config.snapshot_creator.SnapshotsCreator snapshot_creator = 31;
   optional config.observability.Observability observability = 32;
+  optional config.vm_runner.ProtectiveReadsWriter protective_reads_writer = 33;
+  optional config.object_store.ObjectStore core_object_store = 34;
+  optional config.snapshot_recovery.SnapshotRecovery snapshot_recovery = 35;
+  optional config.pruning.Pruning pruning = 36;
+  optional config.commitment_generator.CommitmentGenerator commitment_generator = 37;
+  optional config.da_dispatcher.DataAvailabilityDispatcher da_dispatcher = 38;
+  optional config.base_token_adjuster.BaseTokenAdjuster base_token_adjuster = 39;
 }
diff --git a/core/lib/protobuf_config/src/proto/config/genesis.proto b/core/lib/protobuf_config/src/proto/config/genesis.proto
index f5f05f249342..be3c420b6ab1 100644
--- a/core/lib/protobuf_config/src/proto/config/genesis.proto
+++ b/core/lib/protobuf_config/src/proto/config/genesis.proto
@@ -17,16 +17,17 @@ message Prover {
 
 
 message Genesis {
-  optional string genesis_root = 1; // optional; h256
-  optional uint64 genesis_rollup_leaf_index = 2; // optional;
-  optional string genesis_batch_commitment = 3; // optional; h256
-  optional uint32 genesis_protocol_version = 4; // optional;
-  optional string default_aa_hash = 5; // optional; h256
-  optional string bootloader_hash = 6; // optional; h256
-  optional uint64 l1_chain_id = 7; // optional;
-  optional uint64 l2_chain_id = 8; // optional;
+  optional string genesis_root = 1; // required; h256
+  optional uint64 genesis_rollup_leaf_index = 2; // required;
+  optional string genesis_batch_commitment = 3; // required; h256
+  optional uint64 genesis_protocol_version = 4; // optional;
+  optional string default_aa_hash = 5; // required; h256
+  optional string bootloader_hash = 6; // required; h256
+  optional uint64 l1_chain_id = 7; // required;
+  optional uint64 l2_chain_id = 8; // required;
   optional string fee_account = 9; // h160
   optional Prover prover = 10;
   optional L1BatchCommitDataGeneratorMode l1_batch_commit_data_generator_mode = 29; // optional, default to rollup
+  optional string genesis_protocol_semantic_version = 12; // optional;
   reserved 11; reserved "shared_bridge";
 }
diff --git a/core/lib/protobuf_config/src/proto/config/object_store.proto b/core/lib/protobuf_config/src/proto/config/object_store.proto
index 1c5a7b5ecdf6..a023f7fa8be5 100644
--- a/core/lib/protobuf_config/src/proto/config/object_store.proto
+++ b/core/lib/protobuf_config/src/proto/config/object_store.proto
@@ -27,4 +27,5 @@ message ObjectStore {
     FileBacked file_backed = 4;
   }
   optional uint32 max_retries = 5; // required
+  optional string local_mirror_path = 6; // optional; fs path
 }
diff --git a/core/lib/protobuf_config/src/proto/config/observability.proto b/core/lib/protobuf_config/src/proto/config/observability.proto
index 968c8126656c..773ea51a2f34 100644
--- a/core/lib/protobuf_config/src/proto/config/observability.proto
+++ b/core/lib/protobuf_config/src/proto/config/observability.proto
@@ -14,8 +14,9 @@ message Observability {
   optional Sentry sentry = 1;
   optional string log_format = 3; // required
   optional Opentelemetry opentelemetry = 4; // optional
-  repeated string sporadic_crypto_errors_substrs = 5;
   optional string log_directives = 6;
+
+  reserved 5; reserved "sporadic_crypto_errors_substrs";
 }
 
 message Opentelemetry {
diff --git a/core/lib/protobuf_config/src/proto/config/prover.proto b/core/lib/protobuf_config/src/proto/config/prover.proto
index 87c30ef0001d..1eaf8637522a 100644
--- a/core/lib/protobuf_config/src/proto/config/prover.proto
+++ b/core/lib/protobuf_config/src/proto/config/prover.proto
@@ -5,97 +5,99 @@ import "zksync/config/object_store.proto";
 package zksync.config.prover;
 
 message ProofCompressor {
-    optional uint32 compression_mode = 1; // required; u8
-    optional uint32 prometheus_listener_port = 2; // required; u16
-    optional string prometheus_pushgateway_url = 3; // required
-    optional uint64 prometheus_push_interval_ms = 4; // optional; ms
-    optional uint32 generation_timeout_in_secs = 5; // required; s
-    optional uint32 max_attempts = 6; // required
-    optional string universal_setup_path = 7; // required; fs path
-    optional string universal_setup_download_url = 8; // required
-    optional bool verify_wrapper_proof = 9; // required
+  optional uint32 compression_mode = 1; // required; u8
+  optional uint32 prometheus_listener_port = 2; // required; u16
+  optional string prometheus_pushgateway_url = 3; // required
+  optional uint64 prometheus_push_interval_ms = 4; // optional; ms
+  optional uint32 generation_timeout_in_secs = 5; // required; s
+  optional uint32 max_attempts = 6; // required
+  optional string universal_setup_path = 7; // required; fs path
+  optional string universal_setup_download_url = 8; // required
+  optional bool verify_wrapper_proof = 9; // required
 }
 
 enum SetupLoadMode {
-    FROM_DISK = 0;
-    FROM_MEMORY = 1;
+  FROM_DISK = 0;
+  FROM_MEMORY = 1;
 }
 
 message Prover {
-    optional string setup_data_path = 1; // required; fs path?
-    optional uint32 prometheus_port = 2; // required; u16
-    optional uint32 max_attempts = 3; // required
-    optional uint32 generation_timeout_in_secs = 4; // required; s
-    optional SetupLoadMode setup_load_mode = 7; // required
-    optional uint32 specialized_group_id = 8; // required; u8
-    optional uint64 queue_capacity = 10; // required
-    optional uint32 witness_vector_receiver_port = 11; // required; u16
-    optional string zone_read_url = 12; // required
-    optional uint32 availability_check_interval_in_secs = 21; // optional; s
-    optional bool shall_save_to_public_bucket = 13; // required
-    optional config.object_store.ObjectStore object_store = 20;
-    reserved 5, 6, 9; reserved "base_layer_circuit_ids_to_be_verified", "recursive_layer_circuit_ids_to_be_verified", "witness_vector_generator_thread_count";
+  optional string setup_data_path = 1; // required; fs path?
+  optional uint32 prometheus_port = 2; // required; u16
+  optional uint32 max_attempts = 3; // required
+  optional uint32 generation_timeout_in_secs = 4; // required; s
+  optional SetupLoadMode setup_load_mode = 7; // required
+  optional uint32 specialized_group_id = 8; // required; u8
+  optional uint64 queue_capacity = 10; // required
+  optional uint32 witness_vector_receiver_port = 11; // required; u16
+  optional string zone_read_url = 12; // required
+  optional uint32 availability_check_interval_in_secs = 21; // optional; s
+  optional bool shall_save_to_public_bucket = 13; // required
+  optional config.object_store.ObjectStore public_object_store = 22;
+  optional config.object_store.ObjectStore prover_object_store = 23;
+  reserved 5, 6, 9; reserved "base_layer_circuit_ids_to_be_verified", "recursive_layer_circuit_ids_to_be_verified", "witness_vector_generator_thread_count";
 }
 
 
 message CircuitIdRoundTuple {
-    optional uint32 circuit_id = 1; // required; u8
-    optional uint32 aggregation_round = 2; // required; u8
+  optional uint32 circuit_id = 1; // required; u8
+  optional uint32 aggregation_round = 2; // required; u8
 }
 
 message ProverGroup {
-    repeated CircuitIdRoundTuple group_0 = 1;
-    repeated CircuitIdRoundTuple group_1 = 2;
-    repeated CircuitIdRoundTuple group_2 = 3;
-    repeated CircuitIdRoundTuple group_3 = 4;
-    repeated CircuitIdRoundTuple group_4 = 5;
-    repeated CircuitIdRoundTuple group_5 = 6;
-    repeated CircuitIdRoundTuple group_6 = 7;
-    repeated CircuitIdRoundTuple group_7 = 8;
-    repeated CircuitIdRoundTuple group_8 = 9;
-    repeated CircuitIdRoundTuple group_9 = 10;
-    repeated CircuitIdRoundTuple group_10 = 11;
-    repeated CircuitIdRoundTuple group_11 = 12;
-    repeated CircuitIdRoundTuple group_12 = 13;
-    repeated CircuitIdRoundTuple group_13 = 14;
-    repeated CircuitIdRoundTuple group_14 = 15;
+  repeated CircuitIdRoundTuple group_0 = 1;
+  repeated CircuitIdRoundTuple group_1 = 2;
+  repeated CircuitIdRoundTuple group_2 = 3;
+  repeated CircuitIdRoundTuple group_3 = 4;
+  repeated CircuitIdRoundTuple group_4 = 5;
+  repeated CircuitIdRoundTuple group_5 = 6;
+  repeated CircuitIdRoundTuple group_6 = 7;
+  repeated CircuitIdRoundTuple group_7 = 8;
+  repeated CircuitIdRoundTuple group_8 = 9;
+  repeated CircuitIdRoundTuple group_9 = 10;
+  repeated CircuitIdRoundTuple group_10 = 11;
+  repeated CircuitIdRoundTuple group_11 = 12;
+  repeated CircuitIdRoundTuple group_12 = 13;
+  repeated CircuitIdRoundTuple group_13 = 14;
+  repeated CircuitIdRoundTuple group_14 = 15;
 }
 
 message ProverGateway {
-    optional string api_url = 1; // required
-    optional uint32 api_poll_duration_secs = 2; // required; s
-    optional uint32 prometheus_listener_port = 3; // required; u16
-    optional string prometheus_pushgateway_url = 4; // required
-    optional uint64 prometheus_push_interval_ms = 5; // optional; ms
+  optional string api_url = 1; // required
+  optional uint32 api_poll_duration_secs = 2; // required; s
+  optional uint32 prometheus_listener_port = 3; // required; u16
+  optional string prometheus_pushgateway_url = 4; // required
+  optional uint64 prometheus_push_interval_ms = 5; // optional; ms
 }
 
 
 message WitnessGenerator {
-    optional uint32 generation_timeout_in_secs = 1; // required;
-    optional uint32 max_attempts = 2; // required;
-    optional uint32 last_l1_batch_to_process = 5; // optional
-    optional bool shall_save_to_public_bucket = 7; // required
-    optional uint32 basic_generation_timeout_in_secs = 8; // optional;
-    optional uint32 leaf_generation_timeout_in_secs = 9; // optional;
-    optional uint32 node_generation_timeout_in_secs = 10; // optional;
-    optional uint32 scheduler_generation_timeout_in_secs = 11; // optional;
-    optional uint32 recursion_tip_timeout_in_secs = 12; // optional;
-    reserved 3, 4, 6;
-    reserved "dump_arguments_for_blocks", "force_process_block", "blocks_proving_percentage";
+  optional uint32 generation_timeout_in_secs = 1; // required;
+  optional uint32 max_attempts = 2; // required;
+  optional uint32 last_l1_batch_to_process = 5; // optional
+  optional bool shall_save_to_public_bucket = 7; // required
+  optional uint32 basic_generation_timeout_in_secs = 8; // optional;
+  optional uint32 leaf_generation_timeout_in_secs = 9; // optional;
+  optional uint32 node_generation_timeout_in_secs = 10; // optional;
+  optional uint32 scheduler_generation_timeout_in_secs = 11; // optional;
+  optional uint32 recursion_tip_timeout_in_secs = 12; // optional;
+  reserved 3, 4, 6;
+  reserved "dump_arguments_for_blocks", "force_process_block", "blocks_proving_percentage";
 }
 
 message WitnessVectorGenerator {
-    optional uint32 max_prover_reservation_duration_in_secs = 1; // required; s
-    optional uint32 prover_instance_wait_timeout_in_secs = 2; // required; s
-    optional uint32 prover_instance_poll_time_in_milli_secs = 3; // required; ms
-    optional uint32 prometheus_listener_port = 4; // required; u16
-    optional string prometheus_pushgateway_url = 5; // required
-    optional uint64 prometheus_push_interval_ms = 6; // optional; ms
-    optional uint32 specialized_group_id = 7; // required; u8
+  optional uint32 max_prover_reservation_duration_in_secs = 1; // required; s
+  optional uint32 prover_instance_wait_timeout_in_secs = 2; // required; s
+  optional uint32 prover_instance_poll_time_in_milli_secs = 3; // required; ms
+  optional uint32 prometheus_listener_port = 4; // required; u16
+  optional string prometheus_pushgateway_url = 5; // required
+  optional uint64 prometheus_push_interval_ms = 6; // optional; ms
+  optional uint32 specialized_group_id = 7; // required; u8
 }
 
 
 message ProofDataHandler {
-    optional uint32 http_port = 1; // required; u16
-    optional uint32 proof_generation_timeout_in_secs = 2; // required; s
+  optional uint32 http_port = 1; // required; u16
+  optional uint32 proof_generation_timeout_in_secs = 2; // required; s
+  optional bool tee_support = 3; // required
 }
diff --git a/core/lib/protobuf_config/src/proto/config/pruning.proto b/core/lib/protobuf_config/src/proto/config/pruning.proto
new file mode 100644
index 000000000000..351f353bf060
--- /dev/null
+++ b/core/lib/protobuf_config/src/proto/config/pruning.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package zksync.config.pruning;
+
+message Pruning {
+  optional bool enabled = 1;
+  optional uint32 chunk_size = 2;
+  optional uint64 removal_delay_sec = 3;
+  optional uint64 data_retention_sec = 4;
+}
diff --git a/core/lib/protobuf_config/src/proto/config/secrets.proto b/core/lib/protobuf_config/src/proto/config/secrets.proto
new file mode 100644
index 000000000000..fb328883f99d
--- /dev/null
+++ b/core/lib/protobuf_config/src/proto/config/secrets.proto
@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+package zksync.config.secrets;
+
+
+message DatabaseSecrets {
+  optional string server_url = 1; // optional
+  optional string server_replica_url = 2; // optional
+  optional string prover_url = 3; // optional
+}
+
+message L1Secrets {
+  optional string l1_rpc_url = 1; // required
+}
+
+message ConsensusSecrets {
+  optional string validator_key = 1; // required for validator nodes; ValidatorSecretKey
+  optional string node_key = 2; // required for any node; NodeSecretKey
+}
+
+message Secrets {
+  optional DatabaseSecrets database = 1;  // optional secrets for database
+  optional L1Secrets l1 = 2; // optional secrets for l1 communication
+  optional ConsensusSecrets consensus = 3; // optional secrets for consensus
+}
+
diff --git a/core/lib/protobuf_config/src/proto/config/snapshot_recovery.proto b/core/lib/protobuf_config/src/proto/config/snapshot_recovery.proto
new file mode 100644
index 000000000000..9eceda12ad86
--- /dev/null
+++ b/core/lib/protobuf_config/src/proto/config/snapshot_recovery.proto
@@ -0,0 +1,22 @@
+syntax = "proto3";
+import "zksync/config/object_store.proto";
+import "zksync/config/experimental.proto";
+
+package zksync.config.snapshot_recovery;
+
+message Tree {
+  optional uint64 chunk_size = 1;
+}
+
+message Postgres {
+  optional uint64 max_concurrency = 1;
+}
+
+message SnapshotRecovery {
+  optional bool enabled = 1;
+  optional Postgres postgres = 2;
+  optional Tree tree = 3;
+  optional uint32 l1_batch = 4;
+  optional config.object_store.ObjectStore object_store = 5;
+  optional experimental.SnapshotRecovery experimental = 6;
+}
diff --git a/core/lib/protobuf_config/src/proto/config/snapshots_creator.proto b/core/lib/protobuf_config/src/proto/config/snapshots_creator.proto
index 7aaa39a57f62..3846d86d6291 100644
--- a/core/lib/protobuf_config/src/proto/config/snapshots_creator.proto
+++ b/core/lib/protobuf_config/src/proto/config/snapshots_creator.proto
@@ -7,4 +7,6 @@ message SnapshotsCreator {
   optional uint64 storage_logs_chunk_size = 1; // optional
   optional uint32 concurrent_queries_count = 2; // optional
   optional config.object_store.ObjectStore object_store = 3;
+  optional uint32 version = 4; // optional; defaults to 0
+  optional uint32 l1_batch_number = 5; // optional
 }
diff --git a/core/lib/protobuf_config/src/proto/config/vm_runner.proto b/core/lib/protobuf_config/src/proto/config/vm_runner.proto
new file mode 100644
index 000000000000..c0c82d4d415f
--- /dev/null
+++ b/core/lib/protobuf_config/src/proto/config/vm_runner.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package zksync.config.vm_runner;
+
+message ProtectiveReadsWriter {
+  optional string db_path = 1; // required; fs path
+  optional uint64 window_size = 2; // required
+  optional uint64 first_processed_batch = 3; // required
+}
diff --git a/core/lib/protobuf_config/src/proto/core/consensus.proto b/core/lib/protobuf_config/src/proto/core/consensus.proto
index 6bc1ba023eea..5b59e5151cf7 100644
--- a/core/lib/protobuf_config/src/proto/core/consensus.proto
+++ b/core/lib/protobuf_config/src/proto/core/consensus.proto
@@ -29,12 +29,33 @@ syntax = "proto3";
 
 package zksync.core.consensus;
 
+import "zksync/std.proto";
+
 // (public key, ip address) of a gossip network node.
 message NodeAddr {
   optional string key = 1; // required; NodePublicKey
   optional string addr = 2; // required; IpAddr
 }
 
+// Weighted member of a validator committee. 
+message WeightedValidator {
+  optional string key = 1; // required; ValidatorPublicKey
+  optional uint64 weight = 2; // required
+}
+
+// Consensus genesis specification.
+message GenesisSpec {
+  optional uint64 chain_id = 1; // required; L2ChainId, should be the same as `l2_chain_id` in the `zksync.config.genesis.Genesis`.
+  optional uint32 protocol_version = 2; // required; validator::ProtocolVersion
+  repeated WeightedValidator validators = 3; // must be non-empty; validator committee.
+  optional string leader = 4; // required; ValidatorPublicKey
+}
+
+// Per peer connection RPC rate limits.
+message RpcConfig {
+  optional std.RateLimit get_block_rate = 1; // optional; defaults to 10 blocks/s.
+}
+
 message Config {
   reserved 3;
   reserved "validators";
@@ -60,9 +81,14 @@ message Config {
   // Outbound gossip network connections that the node should actively try to
   // establish and maintain.
   repeated NodeAddr gossip_static_outbound = 7;
-}
 
-message Secrets {
-  optional string validator_key = 1; // required for validator nodes; ValidatorSecretKey
-  optional string node_key = 2; // required for any node; NodeSecretKey
+  // MAIN NODE ONLY: consensus genesis specification.
+  // Used to (re)initialize genesis if needed.
+  // External nodes fetch the genesis from the main node.
+  optional GenesisSpec genesis_spec = 8;
+
+  // RPC rate limits configuration.
+  // If missing, defaults are used.
+  optional RpcConfig rpc_config = 9; // optional
 }
+
diff --git a/core/lib/protobuf_config/src/prover.rs b/core/lib/protobuf_config/src/prover.rs
index b956749a596a..9a41e433433c 100644
--- a/core/lib/protobuf_config/src/prover.rs
+++ b/core/lib/protobuf_config/src/prover.rs
@@ -289,7 +289,12 @@ impl proto::SetupLoadMode {
 impl ProtoRepr for proto::Prover {
     type Type = configs::FriProverConfig;
     fn read(&self) -> anyhow::Result<Self::Type> {
-        let object_store = if let Some(object_store) = &self.object_store {
+        let public_object_store = if let Some(object_store) = &self.public_object_store {
+            Some(object_store.read()?)
+        } else {
+            None
+        };
+        let prover_object_store = if let Some(object_store) = &self.prover_object_store {
             Some(object_store.read()?)
         } else {
             None
@@ -325,7 +330,8 @@ impl ProtoRepr for proto::Prover {
             availability_check_interval_in_secs: self.availability_check_interval_in_secs,
             shall_save_to_public_bucket: *required(&self.shall_save_to_public_bucket)
                 .context("shall_save_to_public_bucket")?,
-            object_store,
+            public_object_store,
+            prover_object_store,
         })
     }
 
@@ -342,7 +348,8 @@ impl ProtoRepr for proto::Prover {
             zone_read_url: Some(this.zone_read_url.clone()),
             availability_check_interval_in_secs: this.availability_check_interval_in_secs,
             shall_save_to_public_bucket: Some(this.shall_save_to_public_bucket),
-            object_store: this.object_store.as_ref().map(ProtoRepr::build),
+            prover_object_store: this.prover_object_store.as_ref().map(ProtoRepr::build),
+            public_object_store: this.public_object_store.as_ref().map(ProtoRepr::build),
         }
     }
 }
diff --git a/core/lib/protobuf_config/src/pruning.rs b/core/lib/protobuf_config/src/pruning.rs
new file mode 100644
index 000000000000..ed0ebb10b92f
--- /dev/null
+++ b/core/lib/protobuf_config/src/pruning.rs
@@ -0,0 +1,28 @@
+use std::num::NonZeroU64;
+
+use zksync_config::configs::PruningConfig;
+use zksync_protobuf::ProtoRepr;
+
+use crate::proto::pruning as proto;
+
+impl ProtoRepr for proto::Pruning {
+    type Type = PruningConfig;
+
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            enabled: self.enabled.unwrap_or_default(),
+            chunk_size: self.chunk_size,
+            removal_delay_sec: self.removal_delay_sec.and_then(NonZeroU64::new),
+            data_retention_sec: self.data_retention_sec,
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            enabled: Some(this.enabled),
+            chunk_size: this.chunk_size,
+            removal_delay_sec: this.removal_delay_sec.map(|a| a.get()),
+            data_retention_sec: this.data_retention_sec,
+        }
+    }
+}
diff --git a/core/lib/protobuf_config/src/secrets.rs b/core/lib/protobuf_config/src/secrets.rs
new file mode 100644
index 000000000000..91a05b31f196
--- /dev/null
+++ b/core/lib/protobuf_config/src/secrets.rs
@@ -0,0 +1,117 @@
+use std::str::FromStr;
+
+use anyhow::Context;
+use secrecy::ExposeSecret;
+use zksync_basic_types::url::SensitiveUrl;
+use zksync_config::configs::{
+    consensus::{ConsensusSecrets, NodeSecretKey, ValidatorSecretKey},
+    secrets::Secrets,
+    DatabaseSecrets, L1Secrets,
+};
+use zksync_protobuf::{required, ProtoRepr};
+
+use crate::{proto::secrets as proto, read_optional_repr};
+
+impl ProtoRepr for proto::Secrets {
+    type Type = Secrets;
+
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            consensus: read_optional_repr(&self.consensus).context("consensus")?,
+            database: read_optional_repr(&self.database).context("database")?,
+            l1: read_optional_repr(&self.l1).context("l1")?,
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            database: this.database.as_ref().map(ProtoRepr::build),
+            l1: this.l1.as_ref().map(ProtoRepr::build),
+            consensus: this.consensus.as_ref().map(ProtoRepr::build),
+        }
+    }
+}
+
+impl ProtoRepr for proto::DatabaseSecrets {
+    type Type = DatabaseSecrets;
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        let server_url = self
+            .server_url
+            .as_deref()
+            .map(str::parse::<SensitiveUrl>)
+            .transpose()
+            .context("master_url")?;
+        let mut server_replica_url = self
+            .server_replica_url
+            .as_deref()
+            .map(str::parse::<SensitiveUrl>)
+            .transpose()
+            .context("replica_url")?;
+        if server_replica_url.is_none() {
+            server_replica_url.clone_from(&server_url)
+        }
+        let prover_url = self
+            .prover_url
+            .as_deref()
+            .map(str::parse::<SensitiveUrl>)
+            .transpose()
+            .context("prover_url")?;
+        Ok(Self::Type {
+            server_url,
+            prover_url,
+            server_replica_url,
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            server_url: this.server_url.as_ref().map(|a| a.expose_str().to_string()),
+            server_replica_url: this
+                .server_replica_url
+                .as_ref()
+                .map(|a| a.expose_str().to_string()),
+            prover_url: this.prover_url.as_ref().map(|a| a.expose_str().to_string()),
+        }
+    }
+}
+
+impl ProtoRepr for proto::L1Secrets {
+    type Type = L1Secrets;
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            l1_rpc_url: SensitiveUrl::from_str(required(&self.l1_rpc_url).context("l1_rpc_url")?)?,
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            l1_rpc_url: Some(this.l1_rpc_url.expose_str().to_string()),
+        }
+    }
+}
+
+impl ProtoRepr for proto::ConsensusSecrets {
+    type Type = ConsensusSecrets;
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            validator_key: self
+                .validator_key
+                .as_ref()
+                .map(|x| ValidatorSecretKey(x.clone().into())),
+            node_key: self
+                .node_key
+                .as_ref()
+                .map(|x| NodeSecretKey(x.clone().into())),
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            validator_key: this
+                .validator_key
+                .as_ref()
+                .map(|x| x.0.expose_secret().clone()),
+            node_key: this.node_key.as_ref().map(|x| x.0.expose_secret().clone()),
+        }
+    }
+}
diff --git a/core/lib/protobuf_config/src/snapshot_recovery.rs b/core/lib/protobuf_config/src/snapshot_recovery.rs
new file mode 100644
index 000000000000..0c195abffe7a
--- /dev/null
+++ b/core/lib/protobuf_config/src/snapshot_recovery.rs
@@ -0,0 +1,102 @@
+use std::num::NonZeroUsize;
+
+use anyhow::Context;
+use zksync_basic_types::L1BatchNumber;
+use zksync_config::configs::{
+    snapshot_recovery::{PostgresRecoveryConfig, TreeRecoveryConfig},
+    SnapshotRecoveryConfig,
+};
+use zksync_protobuf::ProtoRepr;
+
+use crate::{proto::snapshot_recovery as proto, read_optional_repr};
+
+impl ProtoRepr for proto::Postgres {
+    type Type = PostgresRecoveryConfig;
+
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            max_concurrency: self
+                .max_concurrency
+                .and_then(|a| NonZeroUsize::new(a as usize)),
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            max_concurrency: this.max_concurrency.map(|a| a.get() as u64),
+        }
+    }
+}
+
+impl ProtoRepr for proto::SnapshotRecovery {
+    type Type = SnapshotRecoveryConfig;
+
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        let tree = self
+            .tree
+            .as_ref()
+            .map(|tree| {
+                let chunk_size = tree.chunk_size;
+                let parallel_persistence_buffer = self
+                    .experimental
+                    .as_ref()
+                    .and_then(|a| {
+                        a.tree_recovery_parallel_persistence_buffer
+                            .map(|a| NonZeroUsize::new(a as usize))
+                    })
+                    .flatten();
+                TreeRecoveryConfig {
+                    chunk_size,
+                    parallel_persistence_buffer,
+                }
+            })
+            .unwrap_or_default();
+
+        Ok(Self::Type {
+            enabled: self.enabled.unwrap_or_default(),
+            tree,
+            postgres: read_optional_repr(&self.postgres)
+                .context("postgres")?
+                .unwrap_or_default(),
+            l1_batch: self.l1_batch.map(L1BatchNumber),
+            object_store: read_optional_repr(&self.object_store).context("object store")?,
+            drop_storage_key_preimages: self
+                .experimental
+                .as_ref()
+                .and_then(|experimental| experimental.drop_storage_key_preimages)
+                .unwrap_or_default(),
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        let (tree, experimental) = if this.tree == TreeRecoveryConfig::default() {
+            (None, None)
+        } else {
+            (
+                Some(proto::Tree {
+                    chunk_size: this.tree.chunk_size,
+                }),
+                Some(crate::proto::experimental::SnapshotRecovery {
+                    tree_recovery_parallel_persistence_buffer: this
+                        .tree
+                        .parallel_persistence_buffer
+                        .map(|a| a.get() as u64),
+                    drop_storage_key_preimages: Some(this.drop_storage_key_preimages),
+                }),
+            )
+        };
+        let postgres = if this.postgres == PostgresRecoveryConfig::default() {
+            None
+        } else {
+            Some(this.postgres.clone())
+        };
+        Self {
+            enabled: Some(this.enabled),
+            postgres: postgres.as_ref().map(ProtoRepr::build),
+            tree,
+            experimental,
+            l1_batch: this.l1_batch.map(|a| a.0),
+            object_store: this.object_store.as_ref().map(ProtoRepr::build),
+        }
+    }
+}
diff --git a/core/lib/protobuf_config/src/snapshots_creator.rs b/core/lib/protobuf_config/src/snapshots_creator.rs
index b13d11915b10..d21fb2c321fd 100644
--- a/core/lib/protobuf_config/src/snapshots_creator.rs
+++ b/core/lib/protobuf_config/src/snapshots_creator.rs
@@ -1,4 +1,5 @@
 use anyhow::Context as _;
+use zksync_basic_types::L1BatchNumber;
 use zksync_config::configs;
 use zksync_protobuf::{repr::ProtoRepr, required};
 
@@ -13,6 +14,12 @@ impl ProtoRepr for proto::SnapshotsCreator {
             None
         };
         Ok(Self::Type {
+            version: self
+                .version
+                .unwrap_or_default()
+                .try_into()
+                .context("version")?,
+            l1_batch_number: self.l1_batch_number.map(L1BatchNumber),
             storage_logs_chunk_size: *required(&self.storage_logs_chunk_size)
                 .context("storage_logs_chunk_size")?,
             concurrent_queries_count: *required(&self.concurrent_queries_count)
@@ -23,6 +30,8 @@ impl ProtoRepr for proto::SnapshotsCreator {
 
     fn build(this: &Self::Type) -> Self {
         Self {
+            version: Some(this.version.into()),
+            l1_batch_number: this.l1_batch_number.map(|num| num.0),
             storage_logs_chunk_size: Some(this.storage_logs_chunk_size),
             concurrent_queries_count: Some(this.concurrent_queries_count),
             object_store: this.object_store.as_ref().map(ProtoRepr::build),
diff --git a/core/lib/protobuf_config/src/testonly.rs b/core/lib/protobuf_config/src/testonly.rs
deleted file mode 100644
index 8b137891791f..000000000000
--- a/core/lib/protobuf_config/src/testonly.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/core/lib/protobuf_config/src/tests.rs b/core/lib/protobuf_config/src/tests.rs
index 0db119e718bd..3cb18c5bbf6d 100644
--- a/core/lib/protobuf_config/src/tests.rs
+++ b/core/lib/protobuf_config/src/tests.rs
@@ -1,12 +1,8 @@
 use std::{path::PathBuf, str::FromStr};
 
-use anyhow::Context;
-use zksync_protobuf::{
-    testonly::{test_encode_all_formats, ReprConv},
-    ProtoRepr,
-};
+use zksync_protobuf::testonly::{test_encode_all_formats, ReprConv};
 
-use crate::proto;
+use crate::{decode_yaml_repr, proto};
 
 /// Tests config <-> proto (boilerplate) conversions.
 #[test]
@@ -20,8 +16,12 @@ fn test_encoding() {
     test_encode_all_formats::<ReprConv<proto::chain::StateKeeper>>(rng);
     test_encode_all_formats::<ReprConv<proto::chain::OperationsManager>>(rng);
     test_encode_all_formats::<ReprConv<proto::chain::Mempool>>(rng);
+    test_encode_all_formats::<ReprConv<proto::consensus::RpcConfig>>(rng);
+    test_encode_all_formats::<ReprConv<proto::consensus::WeightedValidator>>(rng);
+    test_encode_all_formats::<ReprConv<proto::consensus::GenesisSpec>>(rng);
     test_encode_all_formats::<ReprConv<proto::consensus::Config>>(rng);
-    test_encode_all_formats::<ReprConv<proto::consensus::Secrets>>(rng);
+    test_encode_all_formats::<ReprConv<proto::secrets::ConsensusSecrets>>(rng);
+    test_encode_all_formats::<ReprConv<proto::secrets::Secrets>>(rng);
     test_encode_all_formats::<ReprConv<proto::contract_verifier::ContractVerifier>>(rng);
     test_encode_all_formats::<ReprConv<proto::contracts::Contracts>>(rng);
     test_encode_all_formats::<ReprConv<proto::database::MerkleTree>>(rng);
@@ -39,16 +39,9 @@ fn test_encoding() {
     test_encode_all_formats::<ReprConv<proto::prover::ProofDataHandler>>(rng);
     test_encode_all_formats::<ReprConv<proto::snapshot_creator::SnapshotsCreator>>(rng);
     test_encode_all_formats::<ReprConv<proto::observability::Observability>>(rng);
-}
-
-pub fn decode_yaml_repr<T: ProtoRepr>(
-    path: &PathBuf,
-    deny_unknown_fields: bool,
-) -> anyhow::Result<T::Type> {
-    let yaml = std::fs::read_to_string(path).with_context(|| path.display().to_string())?;
-    let d = serde_yaml::Deserializer::from_str(&yaml);
-    let this: T = zksync_protobuf::serde::deserialize_proto_with_options(d, deny_unknown_fields)?;
-    this.read()
+    test_encode_all_formats::<ReprConv<proto::wallets::Wallets>>(rng);
+    test_encode_all_formats::<ReprConv<proto::genesis::Genesis>>(rng);
+    test_encode_all_formats::<ReprConv<proto::en::ExternalNode>>(rng);
 }
 
 #[test]
@@ -61,4 +54,7 @@ fn verify_file_parsing() {
     decode_yaml_repr::<proto::genesis::Genesis>(&base_path.join("genesis.yaml"), true).unwrap();
     decode_yaml_repr::<proto::contracts::Contracts>(&base_path.join("contracts.yaml"), true)
         .unwrap();
+    decode_yaml_repr::<proto::secrets::Secrets>(&base_path.join("secrets.yaml"), true).unwrap();
+    decode_yaml_repr::<proto::en::ExternalNode>(&base_path.join("external_node.yaml"), true)
+        .unwrap();
 }
diff --git a/core/lib/protobuf_config/src/vm_runner.rs b/core/lib/protobuf_config/src/vm_runner.rs
new file mode 100644
index 000000000000..78bfee750521
--- /dev/null
+++ b/core/lib/protobuf_config/src/vm_runner.rs
@@ -0,0 +1,28 @@
+use anyhow::Context;
+use zksync_basic_types::L1BatchNumber;
+use zksync_config::configs::{self};
+use zksync_protobuf::{required, ProtoRepr};
+
+use crate::proto::vm_runner as proto;
+
+impl ProtoRepr for proto::ProtectiveReadsWriter {
+    type Type = configs::ProtectiveReadsWriterConfig;
+
+    fn read(&self) -> anyhow::Result<Self::Type> {
+        Ok(Self::Type {
+            db_path: required(&self.db_path).context("db_path")?.clone(),
+            window_size: *required(&self.window_size).context("window_size")? as u32,
+            first_processed_batch: L1BatchNumber(
+                *required(&self.first_processed_batch).context("first_batch")? as u32,
+            ),
+        })
+    }
+
+    fn build(this: &Self::Type) -> Self {
+        Self {
+            db_path: Some(this.db_path.clone()),
+            window_size: Some(this.window_size as u64),
+            first_processed_batch: Some(this.first_processed_batch.0 as u64),
+        }
+    }
+}
diff --git a/core/lib/protobuf_config/src/wallets.rs b/core/lib/protobuf_config/src/wallets.rs
index 1c3b7413de60..31fa63fd2702 100644
--- a/core/lib/protobuf_config/src/wallets.rs
+++ b/core/lib/protobuf_config/src/wallets.rs
@@ -66,12 +66,20 @@ impl ProtoRepr for proto::Wallets {
                 .as_ref()
                 .map(|blob| proto::PrivateKeyWallet {
                     address: Some(format!("{:?}", blob.address())),
-                    private_key: Some(format!("{:?}", blob.private_key())),
+                    private_key: Some(hex::encode(
+                        blob.private_key().expose_secret().secret_bytes(),
+                    )),
                 });
             (
                 Some(proto::PrivateKeyWallet {
                     address: Some(format!("{:?}", eth_sender.operator.address())),
-                    private_key: Some(format!("{:?}", eth_sender.operator.private_key())),
+                    private_key: Some(hex::encode(
+                        eth_sender
+                            .operator
+                            .private_key()
+                            .expose_secret()
+                            .secret_bytes(),
+                    )),
                 }),
                 blob,
             )
diff --git a/core/lib/prover_interface/Cargo.toml b/core/lib/prover_interface/Cargo.toml
index 216eec8b9857..5c5a9a1bdf14 100644
--- a/core/lib/prover_interface/Cargo.toml
+++ b/core/lib/prover_interface/Cargo.toml
@@ -10,8 +10,9 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-zksync_types.workspace = true
+zksync_multivm.workspace = true
 zksync_object_store.workspace = true
+zksync_types.workspace = true
 
 # We can use the newest api to send proofs to L1.
 circuit_sequencer_api_1_5_0.workspace = true
@@ -24,3 +25,4 @@ chrono = { workspace = true, features = ["serde"] }
 [dev-dependencies]
 tokio = { workspace = true, features = ["full"] }
 bincode.workspace = true
+serde_json.workspace = true
diff --git a/core/lib/prover_interface/src/api.rs b/core/lib/prover_interface/src/api.rs
index ff4720c333b0..4683fdf21740 100644
--- a/core/lib/prover_interface/src/api.rs
+++ b/core/lib/prover_interface/src/api.rs
@@ -4,30 +4,58 @@
 use serde::{Deserialize, Serialize};
 use zksync_types::{
     basic_fri_types::Eip4844Blobs,
-    protocol_version::{L1VerifierConfig, ProtocolVersionId},
+    protocol_version::{L1VerifierConfig, ProtocolSemanticVersion},
     L1BatchNumber,
 };
 
-use crate::{inputs::PrepareBasicCircuitsJob, outputs::L1BatchProofForL1};
+use crate::{
+    inputs::{PrepareBasicCircuitsJob, TeeVerifierInput},
+    outputs::{L1BatchProofForL1, L1BatchTeeProofForL1},
+};
+
+// Structs for holding data returned in HTTP responses
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ProofGenerationData {
     pub l1_batch_number: L1BatchNumber,
     pub data: PrepareBasicCircuitsJob,
-    pub protocol_version_id: ProtocolVersionId,
+    pub protocol_version: ProtocolSemanticVersion,
     pub l1_verifier_config: L1VerifierConfig,
     pub eip_4844_blobs: Eip4844Blobs,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ProofGenerationDataRequest {}
-
 #[derive(Debug, Serialize, Deserialize)]
 pub enum ProofGenerationDataResponse {
     Success(Option<Box<ProofGenerationData>>),
     Error(String),
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+pub struct TeeProofGenerationDataResponse(pub Option<Box<TeeVerifierInput>>);
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum SubmitProofResponse {
+    Success,
+    Error(String),
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum SubmitTeeProofResponse {
+    Success,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum RegisterTeeAttestationResponse {
+    Success,
+}
+
+// Structs to hold data necessary for making HTTP requests
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ProofGenerationDataRequest {}
+
+pub type TeeProofGenerationDataRequest = ProofGenerationDataRequest;
+
 #[derive(Debug, Serialize, Deserialize)]
 pub enum SubmitProofRequest {
     Proof(Box<L1BatchProofForL1>),
@@ -35,8 +63,11 @@ pub enum SubmitProofRequest {
     SkippedProofGeneration,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-pub enum SubmitProofResponse {
-    Success,
-    Error(String),
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct SubmitTeeProofRequest(pub Box<L1BatchTeeProofForL1>);
+
+#[derive(Debug, PartialEq, Serialize, Deserialize)]
+pub struct RegisterTeeAttestationRequest {
+    pub attestation: Vec<u8>,
+    pub pubkey: Vec<u8>,
 }
diff --git a/core/lib/prover_interface/src/inputs.rs b/core/lib/prover_interface/src/inputs.rs
index 44fe60edddd8..d9a5b4c2d17f 100644
--- a/core/lib/prover_interface/src/inputs.rs
+++ b/core/lib/prover_interface/src/inputs.rs
@@ -2,8 +2,9 @@ use std::{convert::TryInto, fmt::Debug};
 
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, Bytes};
+use zksync_multivm::interface::{L1BatchEnv, SystemEnv};
 use zksync_object_store::{serialize_using_bincode, Bucket, StoredObject};
-use zksync_types::{L1BatchNumber, H256, U256};
+use zksync_types::{block::L2BlockExecutionData, L1BatchNumber, H256, U256};
 
 const HASH_LEN: usize = H256::len_bytes();
 
@@ -58,7 +59,7 @@ impl StorageLogMetadata {
 /// 256 items with the current Merkle tree). The following items may have less hashes in their
 /// Merkle paths; if this is the case, the starting hashes are skipped and are the same
 /// as in the first path.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct PrepareBasicCircuitsJob {
     // Merkle paths and some auxiliary information for each read / write operation in a block.
     merkle_paths: Vec<StorageLogMetadata>,
@@ -144,6 +145,61 @@ pub struct BasicCircuitWitnessGeneratorInput {
     pub merkle_paths_input: PrepareBasicCircuitsJob,
 }
 
+/// Version 1 of the data used as input for the TEE verifier.
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+pub struct V1TeeVerifierInput {
+    pub prepare_basic_circuits_job: PrepareBasicCircuitsJob,
+    pub l2_blocks_execution_data: Vec<L2BlockExecutionData>,
+    pub l1_batch_env: L1BatchEnv,
+    pub system_env: SystemEnv,
+    pub used_contracts: Vec<(H256, Vec<u8>)>,
+}
+
+impl V1TeeVerifierInput {
+    pub fn new(
+        prepare_basic_circuits_job: PrepareBasicCircuitsJob,
+        l2_blocks_execution_data: Vec<L2BlockExecutionData>,
+        l1_batch_env: L1BatchEnv,
+        system_env: SystemEnv,
+        used_contracts: Vec<(H256, Vec<u8>)>,
+    ) -> Self {
+        V1TeeVerifierInput {
+            prepare_basic_circuits_job,
+            l2_blocks_execution_data,
+            l1_batch_env,
+            system_env,
+            used_contracts,
+        }
+    }
+}
+
+/// Data used as input for the TEE verifier.
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[non_exhaustive]
+#[allow(clippy::large_enum_variant)]
+pub enum TeeVerifierInput {
+    /// `V0` suppresses warning about irrefutable `let...else` pattern
+    V0,
+    V1(V1TeeVerifierInput),
+}
+
+impl TeeVerifierInput {
+    pub fn new(input: V1TeeVerifierInput) -> Self {
+        TeeVerifierInput::V1(input)
+    }
+}
+
+impl StoredObject for TeeVerifierInput {
+    const BUCKET: Bucket = Bucket::TeeVerifierInput;
+    type Key<'a> = L1BatchNumber;
+
+    fn encode_key(key: Self::Key<'_>) -> String {
+        format!("tee_verifier_input_for_l1_batch_{key}.bin")
+    }
+
+    serialize_using_bincode!();
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/core/lib/prover_interface/src/outputs.rs b/core/lib/prover_interface/src/outputs.rs
index 7875d0b67481..9672bfb2142b 100644
--- a/core/lib/prover_interface/src/outputs.rs
+++ b/core/lib/prover_interface/src/outputs.rs
@@ -3,14 +3,28 @@ use core::fmt;
 use circuit_sequencer_api_1_5_0::proof::FinalProof;
 use serde::{Deserialize, Serialize};
 use zksync_object_store::{serialize_using_bincode, Bucket, StoredObject};
-use zksync_types::L1BatchNumber;
+use zksync_types::{protocol_version::ProtocolSemanticVersion, tee_types::TeeType, L1BatchNumber};
 
-/// The only type of proof utilized by the core subsystem: a "final" proof that can be sent
-/// to the L1 contract.
+/// A "final" ZK proof that can be sent to the L1 contract.
 #[derive(Clone, Serialize, Deserialize)]
 pub struct L1BatchProofForL1 {
     pub aggregation_result_coords: [[u8; 32]; 4],
     pub scheduler_proof: FinalProof,
+    pub protocol_version: ProtocolSemanticVersion,
+}
+
+/// A "final" TEE proof that can be sent to the L1 contract.
+#[derive(Clone, PartialEq, Serialize, Deserialize)]
+pub struct L1BatchTeeProofForL1 {
+    // signature generated within the TEE enclave, using the privkey corresponding to the pubkey
+    pub signature: Vec<u8>,
+    // pubkey used for signature verification; each key pair is attested by the TEE attestation
+    // stored in the db
+    pub pubkey: Vec<u8>,
+    // data that was signed
+    pub proof: Vec<u8>,
+    // type of TEE used for attestation
+    pub tee_type: TeeType,
 }
 
 impl fmt::Debug for L1BatchProofForL1 {
@@ -22,12 +36,33 @@ impl fmt::Debug for L1BatchProofForL1 {
     }
 }
 
+impl fmt::Debug for L1BatchTeeProofForL1 {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter
+            .debug_struct("L1BatchTeeProofForL1")
+            .finish_non_exhaustive()
+    }
+}
+
 impl StoredObject for L1BatchProofForL1 {
     const BUCKET: Bucket = Bucket::ProofsFri;
+    type Key<'a> = (L1BatchNumber, ProtocolSemanticVersion);
+
+    fn encode_key(key: Self::Key<'_>) -> String {
+        let (l1_batch_number, protocol_version) = key;
+        let semver_suffix = protocol_version.to_string().replace('.', "_");
+        format!("l1_batch_proof_{l1_batch_number}_{semver_suffix}.bin")
+    }
+
+    serialize_using_bincode!();
+}
+
+impl StoredObject for L1BatchTeeProofForL1 {
+    const BUCKET: Bucket = Bucket::ProofsTee;
     type Key<'a> = L1BatchNumber;
 
     fn encode_key(key: Self::Key<'_>) -> String {
-        format!("l1_batch_proof_{key}.bin")
+        format!("l1_batch_tee_proof_{key}.bin")
     }
 
     serialize_using_bincode!();
diff --git a/core/lib/prover_interface/tests/job_serialization.rs b/core/lib/prover_interface/tests/job_serialization.rs
index e813c2a02db2..dd102c322dd0 100644
--- a/core/lib/prover_interface/tests/job_serialization.rs
+++ b/core/lib/prover_interface/tests/job_serialization.rs
@@ -1,12 +1,16 @@
 //! Integration tests for object store serialization of job objects.
 
+use circuit_sequencer_api_1_5_0::proof::FinalProof;
 use tokio::fs;
-use zksync_object_store::{Bucket, ObjectStoreFactory};
+use zksync_object_store::{Bucket, MockObjectStore};
 use zksync_prover_interface::{
+    api::{SubmitProofRequest, SubmitTeeProofRequest},
     inputs::{PrepareBasicCircuitsJob, StorageLogMetadata},
-    outputs::L1BatchProofForL1,
+    outputs::{L1BatchProofForL1, L1BatchTeeProofForL1},
+};
+use zksync_types::{
+    protocol_version::ProtocolSemanticVersion, tee_types::TeeType, L1BatchNumber, ProtocolVersionId,
 };
-use zksync_types::L1BatchNumber;
 
 /// Tests compatibility of the `PrepareBasicCircuitsJob` serialization to the previously used
 /// one.
@@ -17,7 +21,7 @@ async fn prepare_basic_circuits_job_serialization() {
     let snapshot = fs::read("./tests/snapshots/prepare-basic-circuits-job-full.bin")
         .await
         .unwrap();
-    let store = ObjectStoreFactory::mock().create_store().await;
+    let store = MockObjectStore::arc();
     store
         .put_raw(
             Bucket::WitnessInput,
@@ -66,11 +70,114 @@ async fn prepare_basic_circuits_job_compatibility() {
     assert_job_integrity(job_tuple.1, job_tuple.0);
 }
 
-/// Simple test to check if we can succesfully parse the proof.
+/// Simple test to check if we can successfully parse the proof.
 #[tokio::test]
 async fn test_final_proof_deserialization() {
-    let proof = fs::read("./tests/l1_batch_proof_1.bin").await.unwrap();
+    let proof = fs::read("./tests/l1_batch_proof_1_0_24_0.bin")
+        .await
+        .unwrap();
 
     let results: L1BatchProofForL1 = bincode::deserialize(&proof).unwrap();
     assert_eq!(results.aggregation_result_coords[0][0], 0);
 }
+
+#[test]
+fn test_proof_request_serialization() {
+    let proof = SubmitProofRequest::Proof(Box::new(L1BatchProofForL1 {
+        aggregation_result_coords: [[0; 32]; 4],
+        scheduler_proof: FinalProof::empty(),
+        protocol_version: ProtocolSemanticVersion {
+            minor: ProtocolVersionId::Version25,
+            patch: 10.into(),
+        },
+    }));
+    let encoded_obj = serde_json::to_string(&proof).unwrap();
+    let encoded_json = r#"{
+        "Proof": {
+            "aggregation_result_coords": [
+                [
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+                ],
+                [
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+                ],
+                [
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+                ],
+                [
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+                ]
+            ],
+            "scheduler_proof": {
+                "n": 0,
+                "inputs": [],
+                "state_polys_commitments": [],
+                "witness_polys_commitments": [],
+                "copy_permutation_grand_product_commitment": {
+                    "x": [ 0, 0, 0, 0 ],
+                    "y": [ 1, 0, 0, 0 ],
+                    "infinity": true
+                },
+                "lookup_s_poly_commitment": null,
+                "lookup_grand_product_commitment": null,
+                "quotient_poly_parts_commitments": [],
+                "state_polys_openings_at_z": [],
+                "state_polys_openings_at_dilations": [],
+                "witness_polys_openings_at_z": [],
+                "witness_polys_openings_at_dilations": [],
+                "gate_setup_openings_at_z": [],
+                "gate_selectors_openings_at_z": [],
+                "copy_permutation_polys_openings_at_z": [],
+                "copy_permutation_grand_product_opening_at_z_omega": [ 0, 0, 0, 0 ],
+                "lookup_s_poly_opening_at_z_omega": null,
+                "lookup_grand_product_opening_at_z_omega": null,
+                "lookup_t_poly_opening_at_z": null,
+                "lookup_t_poly_opening_at_z_omega": null,
+                "lookup_selector_poly_opening_at_z": null,
+                "lookup_table_type_poly_opening_at_z": null,
+                "quotient_poly_opening_at_z": [ 0, 0, 0, 0 ],
+                "linearization_poly_opening_at_z": [ 0, 0, 0, 0 ],
+                "opening_proof_at_z": {
+                    "x": [ 0, 0, 0, 0 ],
+                    "y": [ 1, 0, 0, 0 ],
+                    "infinity": true
+                },
+                "opening_proof_at_z_omega": {
+                    "x": [ 0, 0, 0, 0 ],
+                    "y": [ 1, 0, 0, 0 ],
+                    "infinity": true
+                }
+            },
+            "protocol_version": "0.25.10"
+        }
+    }"#;
+    let decoded_obj: SubmitProofRequest = serde_json::from_str(&encoded_obj).unwrap();
+    let decoded_json: SubmitProofRequest = serde_json::from_str(encoded_json).unwrap();
+    match (decoded_obj, decoded_json) {
+        (SubmitProofRequest::Proof(decoded_obj), SubmitProofRequest::Proof(decoded_json)) => {
+            assert_eq!(
+                decoded_obj.aggregation_result_coords,
+                decoded_json.aggregation_result_coords
+            );
+        }
+        _ => panic!("Either decoded_obj or decoded_json is not SubmitProofRequest::Proof"),
+    }
+}
+
+#[test]
+fn test_tee_proof_request_serialization() {
+    let tee_proof_str = r#"{
+        "signature": [ 0, 1, 2, 3, 4 ],
+        "pubkey": [ 5, 6, 7, 8, 9 ],
+        "proof": [ 10, 11, 12, 13, 14 ],
+        "tee_type": "Sgx"
+    }"#;
+    let tee_proof_result = serde_json::from_str::<SubmitTeeProofRequest>(tee_proof_str).unwrap();
+    let tee_proof_expected = SubmitTeeProofRequest(Box::new(L1BatchTeeProofForL1 {
+        signature: vec![0, 1, 2, 3, 4],
+        pubkey: vec![5, 6, 7, 8, 9],
+        proof: vec![10, 11, 12, 13, 14],
+        tee_type: TeeType::Sgx,
+    }));
+    assert_eq!(tee_proof_result, tee_proof_expected);
+}
diff --git a/core/lib/prover_interface/tests/l1_batch_proof_1.bin b/core/lib/prover_interface/tests/l1_batch_proof_1_0_24_0.bin
similarity index 97%
rename from core/lib/prover_interface/tests/l1_batch_proof_1.bin
rename to core/lib/prover_interface/tests/l1_batch_proof_1_0_24_0.bin
index e9e1d69d3240..5fd81784c0bb 100644
Binary files a/core/lib/prover_interface/tests/l1_batch_proof_1.bin and b/core/lib/prover_interface/tests/l1_batch_proof_1_0_24_0.bin differ
diff --git a/core/lib/queued_job_processor/src/lib.rs b/core/lib/queued_job_processor/src/lib.rs
index 569a2b7f59da..a5a4fa39fcae 100644
--- a/core/lib/queued_job_processor/src/lib.rs
+++ b/core/lib/queued_job_processor/src/lib.rs
@@ -5,7 +5,7 @@ use std::{
 
 use anyhow::Context as _;
 pub use async_trait::async_trait;
-use tokio::{sync::watch, task::JoinHandle, time::sleep};
+use tokio::{sync::watch, task::JoinHandle};
 use vise::{Buckets, Counter, Histogram, LabeledFamily, Metrics};
 use zksync_utils::panic_extractor::try_extract_panic_message;
 
@@ -57,7 +57,7 @@ pub trait JobProcessor: Sync + Send {
     /// To process a batch, pass `Some(batch_size)`.
     async fn run(
         self,
-        stop_receiver: watch::Receiver<bool>,
+        mut stop_receiver: watch::Receiver<bool>,
         mut iterations_left: Option<usize>,
     ) -> anyhow::Result<()>
     where
@@ -86,7 +86,7 @@ pub trait JobProcessor: Sync + Send {
                 );
                 let task = self.process_job(&job_id, job, started_at).await;
 
-                self.wait_for_task(job_id, started_at, task)
+                self.wait_for_task(job_id, started_at, task, &mut stop_receiver)
                     .await
                     .context("wait_for_task")?;
             } else if iterations_left.is_some() {
@@ -94,7 +94,10 @@ pub trait JobProcessor: Sync + Send {
                 return Ok(());
             } else {
                 tracing::trace!("Backing off for {} ms", backoff);
-                sleep(Duration::from_millis(backoff)).await;
+                // Error here corresponds to a timeout w/o `stop_receiver` changed; we're OK with this.
+                tokio::time::timeout(Duration::from_millis(backoff), stop_receiver.changed())
+                    .await
+                    .ok();
                 backoff = (backoff * Self::BACKOFF_MULTIPLIER).min(Self::MAX_BACKOFF_MS);
             }
         }
@@ -108,6 +111,7 @@ pub trait JobProcessor: Sync + Send {
         job_id: Self::JobId,
         started_at: Instant,
         task: JoinHandle<anyhow::Result<Self::JobArtifacts>>,
+        stop_receiver: &mut watch::Receiver<bool>,
     ) -> anyhow::Result<()> {
         let attempts = self.get_job_attempts(&job_id).await?;
         let max_attempts = self.max_attempts();
@@ -130,7 +134,17 @@ pub trait JobProcessor: Sync + Send {
             if task.is_finished() {
                 break task.await;
             }
-            sleep(Duration::from_millis(Self::POLLING_INTERVAL_MS)).await;
+            if tokio::time::timeout(
+                Duration::from_millis(Self::POLLING_INTERVAL_MS),
+                stop_receiver.changed(),
+            )
+            .await
+            .is_ok()
+            {
+                // Stop signal received, return early.
+                // Exit will be processed/reported by the main loop.
+                return Ok(());
+            }
         };
         let error_message = match result {
             Ok(Ok(data)) => {
diff --git a/core/lib/snapshots_applier/README.md b/core/lib/snapshots_applier/README.md
new file mode 100644
index 000000000000..60f17344f5b1
--- /dev/null
+++ b/core/lib/snapshots_applier/README.md
@@ -0,0 +1,29 @@
+# `zksync_snapshots_applier`
+
+Library responsible for recovering Postgres from a protocol-level snapshot.
+
+## Recovery workflow
+
+_(See [node docs](../../../docs/guides/external-node/07_snapshots_recovery.md) for a high-level snapshot recovery
+overview and [snapshot creator docs](../../bin/snapshots_creator/README.md) for the snapshot format details)_
+
+1. Recovery is started by querying the main node and determining the snapshot parameters. By default, recovery is
+   performed from the latest snapshot, but it is possible to provide a manual override (L1 batch number of the
+   snapshot).
+2. Factory dependencies (= contract bytecodes) are downloaded from the object store and are atomically saved to Postgres
+   together with the snapshot metadata (L1 batch number / L2 block numbers and timestamps, L1 batch state root hash, L2
+   block hash etc.).
+3. Storage log chunks are downloaded from the object store; each chunk is atomically saved to Postgres (`storage_logs`
+   and `initial_writes` tables). This step has a configurable degree of concurrency to control speed – I/O load
+   trade-off.
+4. After all storage logs are restored, token information is fetched from the main node and saved in the corresponding
+   table. Tokens are double-checked against storage logs.
+
+Recovery is resilient to stops / failures; if the recovery process is interrupted, it will restart from the same
+snapshot and will skip saving data that is already present in Postgres.
+
+Recovery logic for node components (such as metadata calculator and state keeper) is intentionally isolated from
+Postgres recovery. A component requiring recovery must organize it on its own. This is motivated by the fact that at
+least some components requiring recovery may initialize after an arbitrary delay after Postgres recovery (or not run at
+all) and/or may be instantiated multiple times for a single node. As an example, both of these requirements hold for
+metadata calculator / Merkle tree.
diff --git a/core/lib/snapshots_applier/src/lib.rs b/core/lib/snapshots_applier/src/lib.rs
index fcfd0909c3e7..0ee4b2a901f6 100644
--- a/core/lib/snapshots_applier/src/lib.rs
+++ b/core/lib/snapshots_applier/src/lib.rs
@@ -1,6 +1,8 @@
 //! Logic for applying application-level snapshots to Postgres storage.
 
-use std::{collections::HashMap, fmt, num::NonZeroUsize, sync::Arc, time::Duration};
+use std::{
+    cmp::Ordering, collections::HashMap, fmt, mem, num::NonZeroUsize, sync::Arc, time::Duration,
+};
 
 use anyhow::Context as _;
 use async_trait::async_trait;
@@ -16,11 +18,11 @@ use zksync_types::{
         SnapshotStorageLogsChunk, SnapshotStorageLogsStorageKey, SnapshotVersion,
     },
     tokens::TokenInfo,
-    L1BatchNumber, L2BlockNumber, H256,
+    L1BatchNumber, L2BlockNumber, StorageKey, H256,
 };
 use zksync_utils::bytecode::hash_bytecode;
 use zksync_web3_decl::{
-    client::BoxedL2Client,
+    client::{DynClient, L2},
     error::{ClientRpcContext, EnrichedClientError, EnrichedClientResult},
     jsonrpsee::core::client,
     namespaces::{EnNamespaceClient, SnapshotsNamespaceClient, ZksNamespaceClient},
@@ -78,13 +80,10 @@ enum SnapshotsApplierError {
 
 impl SnapshotsApplierError {
     fn object_store(err: ObjectStoreError, context: String) -> Self {
-        match err {
-            ObjectStoreError::KeyNotFound(_) | ObjectStoreError::Serialization(_) => {
-                Self::Fatal(anyhow::Error::from(err).context(context))
-            }
-            ObjectStoreError::Other(_) => {
-                Self::Retryable(anyhow::Error::from(err).context(context))
-            }
+        if err.is_transient() {
+            Self::Retryable(anyhow::Error::from(err).context(context))
+        } else {
+            Self::Fatal(anyhow::Error::from(err).context(context))
         }
     }
 }
@@ -126,7 +125,14 @@ pub trait SnapshotsApplierMainNodeClient: fmt::Debug + Send + Sync {
         number: L2BlockNumber,
     ) -> EnrichedClientResult<Option<api::BlockDetails>>;
 
-    async fn fetch_newest_snapshot(&self) -> EnrichedClientResult<Option<SnapshotHeader>>;
+    async fn fetch_newest_snapshot_l1_batch_number(
+        &self,
+    ) -> EnrichedClientResult<Option<L1BatchNumber>>;
+
+    async fn fetch_snapshot(
+        &self,
+        l1_batch_number: L1BatchNumber,
+    ) -> EnrichedClientResult<Option<SnapshotHeader>>;
 
     async fn fetch_tokens(
         &self,
@@ -135,7 +141,7 @@ pub trait SnapshotsApplierMainNodeClient: fmt::Debug + Send + Sync {
 }
 
 #[async_trait]
-impl SnapshotsApplierMainNodeClient for BoxedL2Client {
+impl SnapshotsApplierMainNodeClient for Box<DynClient<L2>> {
     async fn fetch_l1_batch_details(
         &self,
         number: L1BatchNumber,
@@ -156,17 +162,23 @@ impl SnapshotsApplierMainNodeClient for BoxedL2Client {
             .await
     }
 
-    async fn fetch_newest_snapshot(&self) -> EnrichedClientResult<Option<SnapshotHeader>> {
+    async fn fetch_newest_snapshot_l1_batch_number(
+        &self,
+    ) -> EnrichedClientResult<Option<L1BatchNumber>> {
         let snapshots = self
             .get_all_snapshots()
             .rpc_context("get_all_snapshots")
             .await?;
-        let Some(newest_snapshot) = snapshots.snapshots_l1_batch_numbers.first() else {
-            return Ok(None);
-        };
-        self.get_snapshot_by_l1_batch_number(*newest_snapshot)
+        Ok(snapshots.snapshots_l1_batch_numbers.first().copied())
+    }
+
+    async fn fetch_snapshot(
+        &self,
+        l1_batch_number: L1BatchNumber,
+    ) -> EnrichedClientResult<Option<SnapshotHeader>> {
+        self.get_snapshot_by_l1_batch_number(l1_batch_number)
             .rpc_context("get_snapshot_by_l1_batch_number")
-            .with_arg("number", newest_snapshot)
+            .with_arg("number", &l1_batch_number)
             .await
     }
 
@@ -181,8 +193,19 @@ impl SnapshotsApplierMainNodeClient for BoxedL2Client {
     }
 }
 
+/// Reported status of the snapshot recovery progress.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum RecoveryCompletionStatus {
+    /// There is no infomration about snapshot recovery in the database.
+    NoRecoveryDetected,
+    /// Snapshot recovery is not finished yet.
+    InProgress,
+    /// Snapshot recovery is completed.
+    Completed,
+}
+
 /// Snapshot applier configuration options.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct SnapshotsApplierConfig {
     /// Number of retries for transient errors before giving up on recovery (i.e., returning an error
     /// from [`Self::run()`]).
@@ -226,6 +249,8 @@ pub struct SnapshotApplierTaskStats {
 
 #[derive(Debug)]
 pub struct SnapshotsApplierTask {
+    snapshot_l1_batch: Option<L1BatchNumber>,
+    drop_storage_key_preimages: bool,
     config: SnapshotsApplierConfig,
     health_updater: HealthUpdater,
     connection_pool: ConnectionPool<Core>,
@@ -241,6 +266,8 @@ impl SnapshotsApplierTask {
         blob_store: Arc<dyn ObjectStore>,
     ) -> Self {
         Self {
+            snapshot_l1_batch: None,
+            drop_storage_key_preimages: false,
             config,
             health_updater: ReactiveHealthCheck::new("snapshot_recovery").1,
             connection_pool,
@@ -249,6 +276,56 @@ impl SnapshotsApplierTask {
         }
     }
 
+    /// Checks whether the snapshot recovery is already completed.
+    ///
+    /// Returns `None` if no snapshot recovery information is detected in the DB.
+    /// Returns `Some(true)` if the recovery is completed.
+    /// Returns `Some(false)` if the recovery is not completed.
+    pub async fn is_recovery_completed(
+        conn: &mut Connection<'_, Core>,
+        client: &dyn SnapshotsApplierMainNodeClient,
+    ) -> anyhow::Result<RecoveryCompletionStatus> {
+        let Some(applied_snapshot_status) = conn
+            .snapshot_recovery_dal()
+            .get_applied_snapshot_status()
+            .await?
+        else {
+            return Ok(RecoveryCompletionStatus::NoRecoveryDetected);
+        };
+        // If there are unprocessed storage logs chunks, the recovery is not complete.
+        if applied_snapshot_status.storage_logs_chunks_left_to_process() != 0 {
+            return Ok(RecoveryCompletionStatus::InProgress);
+        }
+        // Currently, migrating tokens is the last step of the recovery.
+        // The number of tokens is not a part of the snapshot header, so we have to re-query the main node.
+        let added_tokens = conn
+            .tokens_web3_dal()
+            .get_all_tokens(Some(applied_snapshot_status.l2_block_number))
+            .await?
+            .len();
+        let tokens_on_main_node = client
+            .fetch_tokens(applied_snapshot_status.l2_block_number)
+            .await?
+            .len();
+
+        match added_tokens.cmp(&tokens_on_main_node) {
+            Ordering::Less => Ok(RecoveryCompletionStatus::InProgress),
+            Ordering::Equal => Ok(RecoveryCompletionStatus::Completed),
+            Ordering::Greater => anyhow::bail!("DB contains more tokens than the main node"),
+        }
+    }
+
+    /// Specifies the L1 batch to recover from. This setting is ignored if recovery is complete or resumed.
+    pub fn set_snapshot_l1_batch(&mut self, number: L1BatchNumber) {
+        self.snapshot_l1_batch = Some(number);
+    }
+
+    /// Enables dropping storage key preimages when recovering storage logs from a snapshot with version 0.
+    /// This is a temporary flag that will eventually be removed together with version 0 snapshot support.
+    pub fn drop_storage_key_preimages(&mut self) {
+        self.drop_storage_key_preimages = true;
+    }
+
     /// Returns the health check for snapshot recovery.
     pub fn health_check(&self) -> ReactiveHealthCheck {
         self.health_updater.subscribe()
@@ -268,14 +345,7 @@ impl SnapshotsApplierTask {
         let mut backoff = self.config.initial_retry_backoff;
         let mut last_error = None;
         for retry_id in 0..self.config.retry_count {
-            let result = SnapshotsApplier::load_snapshot(
-                &self.connection_pool,
-                self.main_node_client.as_ref(),
-                &self.blob_store,
-                &self.health_updater,
-                self.config.max_concurrency.get(),
-            )
-            .await;
+            let result = SnapshotsApplier::load_snapshot(&self).await;
 
             match result {
                 Ok((strategy, final_status)) => {
@@ -316,9 +386,9 @@ impl SnapshotsApplierTask {
 #[derive(Debug, Clone, Copy)]
 enum SnapshotRecoveryStrategy {
     /// Snapshot recovery should proceed from scratch with the specified params.
-    New,
+    New(SnapshotVersion),
     /// Snapshot recovery should continue with the specified params.
-    Resumed,
+    Resumed(SnapshotVersion),
     /// Snapshot recovery has already been completed.
     Completed,
 }
@@ -327,6 +397,7 @@ impl SnapshotRecoveryStrategy {
     async fn new(
         storage: &mut Connection<'_, Core>,
         main_node_client: &dyn SnapshotsApplierMainNodeClient,
+        snapshot_l1_batch: Option<L1BatchNumber>,
     ) -> Result<(Self, SnapshotRecoveryStatus), SnapshotsApplierError> {
         let latency =
             METRICS.initial_stage_duration[&InitialStage::FetchMetadataFromMainNode].start();
@@ -341,9 +412,20 @@ impl SnapshotRecoveryStrategy {
                 return Ok((Self::Completed, applied_snapshot_status));
             }
 
+            let l1_batch_number = applied_snapshot_status.l1_batch_number;
+            let snapshot_header = main_node_client
+                .fetch_snapshot(l1_batch_number)
+                .await?
+                .with_context(|| {
+                    format!("snapshot for L1 batch #{l1_batch_number} is no longer present on main node")
+                })?;
+            // Old snapshots can theoretically be removed by the node, but in this case the snapshot data may be removed as well,
+            // so returning an error looks appropriate here.
+            let snapshot_version = Self::check_snapshot_version(snapshot_header.version)?;
+
             let latency = latency.observe();
             tracing::info!("Re-initialized snapshots applier after reset/failure in {latency:?}");
-            Ok((Self::Resumed, applied_snapshot_status))
+            Ok((Self::Resumed(snapshot_version), applied_snapshot_status))
         } else {
             let is_genesis_needed = storage.blocks_dal().is_genesis_needed().await?;
             if !is_genesis_needed {
@@ -353,7 +435,8 @@ impl SnapshotRecoveryStrategy {
                 return Err(SnapshotsApplierError::Fatal(err));
             }
 
-            let recovery_status = Self::create_fresh_recovery_status(main_node_client).await?;
+            let (recovery_status, snapshot_version) =
+                Self::create_fresh_recovery_status(main_node_client, snapshot_l1_batch).await?;
 
             let storage_logs_count = storage
                 .storage_logs_dal()
@@ -370,18 +453,26 @@ impl SnapshotRecoveryStrategy {
 
             let latency = latency.observe();
             tracing::info!("Initialized fresh snapshots applier in {latency:?}");
-            Ok((Self::New, recovery_status))
+            Ok((Self::New(snapshot_version), recovery_status))
         }
     }
 
     async fn create_fresh_recovery_status(
         main_node_client: &dyn SnapshotsApplierMainNodeClient,
-    ) -> Result<SnapshotRecoveryStatus, SnapshotsApplierError> {
-        let snapshot_response = main_node_client.fetch_newest_snapshot().await?;
+        snapshot_l1_batch: Option<L1BatchNumber>,
+    ) -> Result<(SnapshotRecoveryStatus, SnapshotVersion), SnapshotsApplierError> {
+        let l1_batch_number = match snapshot_l1_batch {
+            Some(num) => num,
+            None => main_node_client
+                .fetch_newest_snapshot_l1_batch_number()
+                .await?
+                .context("no snapshots on main node; snapshot recovery is impossible")?,
+        };
+        let snapshot_response = main_node_client.fetch_snapshot(l1_batch_number).await?;
 
-        let snapshot = snapshot_response
-            .context("no snapshots on main node; snapshot recovery is impossible")?;
-        let l1_batch_number = snapshot.l1_batch_number;
+        let snapshot = snapshot_response.with_context(|| {
+            format!("snapshot for L1 batch #{l1_batch_number} is not present on main node")
+        })?;
         let l2_block_number = snapshot.l2_block_number;
         tracing::info!(
             "Found snapshot with data up to L1 batch #{l1_batch_number}, L2 block #{l2_block_number}, \
@@ -389,7 +480,7 @@ impl SnapshotRecoveryStrategy {
             version = snapshot.version,
             chunk_count = snapshot.storage_logs_chunks.len()
         );
-        Self::check_snapshot_version(snapshot.version)?;
+        let snapshot_version = Self::check_snapshot_version(snapshot.version)?;
 
         let l1_batch = main_node_client
             .fetch_l1_batch_details(l1_batch_number)
@@ -417,7 +508,7 @@ impl SnapshotRecoveryStrategy {
             return Err(err.into());
         }
 
-        Ok(SnapshotRecoveryStatus {
+        let status = SnapshotRecoveryStatus {
             l1_batch_number,
             l1_batch_timestamp: l1_batch.base.timestamp,
             l1_batch_root_hash,
@@ -426,22 +517,105 @@ impl SnapshotRecoveryStrategy {
             l2_block_hash,
             protocol_version,
             storage_logs_chunks_processed: vec![false; snapshot.storage_logs_chunks.len()],
-        })
+        };
+        Ok((status, snapshot_version))
     }
 
-    fn check_snapshot_version(raw_version: u16) -> anyhow::Result<()> {
+    fn check_snapshot_version(raw_version: u16) -> anyhow::Result<SnapshotVersion> {
         let version = SnapshotVersion::try_from(raw_version).with_context(|| {
             format!(
                 "Unrecognized snapshot version: {raw_version}; make sure you're running the latest version of the node"
             )
         })?;
         anyhow::ensure!(
-            matches!(version, SnapshotVersion::Version0),
-            "Cannot recover from a snapshot with version {version:?}; the only supported version is {:?}",
-            SnapshotVersion::Version0
+            matches!(version, SnapshotVersion::Version0 | SnapshotVersion::Version1),
+            "Cannot recover from a snapshot with version {version:?}; the only supported versions are {:?}",
+            [SnapshotVersion::Version0, SnapshotVersion::Version1]
         );
+        Ok(version)
+    }
+}
+
+/// Versioned storage logs chunk.
+#[derive(Debug)]
+enum StorageLogs {
+    V0(Vec<SnapshotStorageLog<StorageKey>>),
+    V1(Vec<SnapshotStorageLog>),
+}
+
+impl StorageLogs {
+    async fn load(
+        blob_store: &dyn ObjectStore,
+        key: SnapshotStorageLogsStorageKey,
+        version: SnapshotVersion,
+    ) -> Result<Self, ObjectStoreError> {
+        match version {
+            SnapshotVersion::Version0 => {
+                let logs: SnapshotStorageLogsChunk<StorageKey> = blob_store.get(key).await?;
+                Ok(Self::V0(logs.storage_logs))
+            }
+            SnapshotVersion::Version1 => {
+                let logs: SnapshotStorageLogsChunk = blob_store.get(key).await?;
+                Ok(Self::V1(logs.storage_logs))
+            }
+        }
+    }
+
+    fn len(&self) -> usize {
+        match self {
+            Self::V0(logs) => logs.len(),
+            Self::V1(logs) => logs.len(),
+        }
+    }
+
+    /// Performs basic sanity check for a storage logs chunk.
+    fn validate(&self, snapshot_status: &SnapshotRecoveryStatus) -> anyhow::Result<()> {
+        match self {
+            Self::V0(logs) => Self::validate_inner(logs, snapshot_status),
+            Self::V1(logs) => Self::validate_inner(logs, snapshot_status),
+        }
+    }
+
+    fn validate_inner<K: fmt::Debug>(
+        storage_logs: &[SnapshotStorageLog<K>],
+        snapshot_status: &SnapshotRecoveryStatus,
+    ) -> anyhow::Result<()> {
+        for log in storage_logs {
+            anyhow::ensure!(
+                log.enumeration_index > 0,
+                "invalid storage log with zero enumeration_index: {log:?}"
+            );
+            anyhow::ensure!(
+                log.l1_batch_number_of_initial_write <= snapshot_status.l1_batch_number,
+                "invalid storage log with `l1_batch_number_of_initial_write` from the future: {log:?}"
+            );
+        }
         Ok(())
     }
+
+    fn drop_key_preimages(&mut self) {
+        match self {
+            Self::V0(logs) => {
+                *self = Self::V1(
+                    mem::take(logs)
+                        .into_iter()
+                        .map(SnapshotStorageLog::drop_key_preimage)
+                        .collect(),
+                );
+            }
+            Self::V1(_) => { /* do nothing */ }
+        }
+    }
+
+    fn without_preimages(self) -> Vec<SnapshotStorageLog> {
+        match self {
+            Self::V0(logs) => logs
+                .into_iter()
+                .map(SnapshotStorageLog::drop_key_preimage)
+                .collect(),
+            Self::V1(logs) => logs,
+        }
+    }
 }
 
 /// Applying application-level storage snapshots to the Postgres storage.
@@ -452,7 +626,9 @@ struct SnapshotsApplier<'a> {
     blob_store: &'a dyn ObjectStore,
     applied_snapshot_status: SnapshotRecoveryStatus,
     health_updater: &'a HealthUpdater,
+    snapshot_version: SnapshotVersion,
     max_concurrency: usize,
+    drop_storage_key_preimages: bool,
     factory_deps_recovered: bool,
     tokens_recovered: bool,
 }
@@ -460,12 +636,12 @@ struct SnapshotsApplier<'a> {
 impl<'a> SnapshotsApplier<'a> {
     /// Returns final snapshot recovery status.
     async fn load_snapshot(
-        connection_pool: &'a ConnectionPool<Core>,
-        main_node_client: &'a dyn SnapshotsApplierMainNodeClient,
-        blob_store: &'a dyn ObjectStore,
-        health_updater: &'a HealthUpdater,
-        max_concurrency: usize,
+        task: &'a SnapshotsApplierTask,
     ) -> Result<(SnapshotRecoveryStrategy, SnapshotRecoveryStatus), SnapshotsApplierError> {
+        let health_updater = &task.health_updater;
+        let connection_pool = &task.connection_pool;
+        let main_node_client = task.main_node_client.as_ref();
+
         // While the recovery is in progress, the node is healthy (no error has occurred),
         // but is affected (its usual APIs don't work).
         health_updater.update(HealthStatus::Affected.into());
@@ -475,22 +651,28 @@ impl<'a> SnapshotsApplier<'a> {
             .await?;
         let mut storage_transaction = storage.start_transaction().await?;
 
-        let (strategy, applied_snapshot_status) =
-            SnapshotRecoveryStrategy::new(&mut storage_transaction, main_node_client).await?;
+        let (strategy, applied_snapshot_status) = SnapshotRecoveryStrategy::new(
+            &mut storage_transaction,
+            main_node_client,
+            task.snapshot_l1_batch,
+        )
+        .await?;
         tracing::info!("Chosen snapshot recovery strategy: {strategy:?} with status: {applied_snapshot_status:?}");
-        let created_from_scratch = match strategy {
+        let (created_from_scratch, snapshot_version) = match strategy {
             SnapshotRecoveryStrategy::Completed => return Ok((strategy, applied_snapshot_status)),
-            SnapshotRecoveryStrategy::New => true,
-            SnapshotRecoveryStrategy::Resumed => false,
+            SnapshotRecoveryStrategy::New(version) => (true, version),
+            SnapshotRecoveryStrategy::Resumed(version) => (false, version),
         };
 
         let mut this = Self {
             connection_pool,
             main_node_client,
-            blob_store,
+            blob_store: task.blob_store.as_ref(),
             applied_snapshot_status,
             health_updater,
-            max_concurrency,
+            snapshot_version,
+            max_concurrency: task.config.max_concurrency.get(),
+            drop_storage_key_preimages: task.drop_storage_key_preimages,
             factory_deps_recovered: !created_from_scratch,
             tokens_recovered: false,
         };
@@ -588,18 +770,22 @@ impl<'a> SnapshotsApplier<'a> {
             factory_deps.factory_deps.len()
         );
 
-        let all_deps_hashmap: HashMap<H256, Vec<u8>> = factory_deps
-            .factory_deps
-            .into_iter()
-            .map(|dep| (hash_bytecode(&dep.bytecode.0), dep.bytecode.0))
-            .collect();
-        storage
-            .factory_deps_dal()
-            .insert_factory_deps(
-                self.applied_snapshot_status.l2_block_number,
-                &all_deps_hashmap,
-            )
-            .await?;
+        // we cannot insert all factory deps because of field size limit triggered by UNNEST
+        // in underlying query, see `https://www.postgresql.org/docs/current/limits.html`
+        // there were around 100 thousand contracts on mainnet, where this issue first manifested
+        for chunk in factory_deps.factory_deps.chunks(1000) {
+            let chunk_deps_hashmap: HashMap<H256, Vec<u8>> = chunk
+                .iter()
+                .map(|dep| (hash_bytecode(&dep.bytecode.0), dep.bytecode.0.clone()))
+                .collect();
+            storage
+                .factory_deps_dal()
+                .insert_factory_deps(
+                    self.applied_snapshot_status.l2_block_number,
+                    &chunk_deps_hashmap,
+                )
+                .await?;
+        }
 
         let latency = latency.observe();
         tracing::info!("Applied factory dependencies in {latency:?}");
@@ -621,16 +807,30 @@ impl<'a> SnapshotsApplier<'a> {
 
     async fn insert_storage_logs_chunk(
         &self,
-        storage_logs: &[SnapshotStorageLog],
+        storage_logs: &StorageLogs,
         storage: &mut Connection<'_, Core>,
     ) -> Result<(), SnapshotsApplierError> {
-        storage
-            .storage_logs_dal()
-            .insert_storage_logs_from_snapshot(
-                self.applied_snapshot_status.l2_block_number,
-                storage_logs,
-            )
-            .await?;
+        match storage_logs {
+            StorageLogs::V0(logs) => {
+                #[allow(deprecated)]
+                storage
+                    .storage_logs_dal()
+                    .insert_storage_logs_with_preimages_from_snapshot(
+                        self.applied_snapshot_status.l2_block_number,
+                        logs,
+                    )
+                    .await?;
+            }
+            StorageLogs::V1(logs) => {
+                storage
+                    .storage_logs_dal()
+                    .insert_storage_logs_from_snapshot(
+                        self.applied_snapshot_status.l2_block_number,
+                        logs,
+                    )
+                    .await?;
+            }
+        }
         Ok(())
     }
 
@@ -651,14 +851,19 @@ impl<'a> SnapshotsApplier<'a> {
             chunk_id,
             l1_batch_number: self.applied_snapshot_status.l1_batch_number,
         };
-        let storage_snapshot_chunk: SnapshotStorageLogsChunk =
-            self.blob_store.get(storage_key).await.map_err(|err| {
-                let context =
-                    format!("cannot fetch storage logs {storage_key:?} from object store");
-                SnapshotsApplierError::object_store(err, context)
-            })?;
-        let storage_logs = &storage_snapshot_chunk.storage_logs;
-        self.validate_storage_logs_chunk(storage_logs)?;
+        let mut storage_logs =
+            StorageLogs::load(self.blob_store, storage_key, self.snapshot_version)
+                .await
+                .map_err(|err| {
+                    let context =
+                        format!("cannot fetch storage logs {storage_key:?} from object store");
+                    SnapshotsApplierError::object_store(err, context)
+                })?;
+
+        storage_logs.validate(&self.applied_snapshot_status)?;
+        if self.drop_storage_key_preimages {
+            storage_logs.drop_key_preimages();
+        }
         let latency = latency.observe();
         tracing::info!(
             "Loaded {} storage logs from GCS for chunk {chunk_id} in {latency:?}",
@@ -675,9 +880,11 @@ impl<'a> SnapshotsApplier<'a> {
         let mut storage_transaction = storage.start_transaction().await?;
 
         tracing::info!("Loading {} storage logs into Postgres", storage_logs.len());
-        self.insert_storage_logs_chunk(storage_logs, &mut storage_transaction)
+
+        self.insert_storage_logs_chunk(&storage_logs, &mut storage_transaction)
             .await?;
-        self.insert_initial_writes_chunk(storage_logs, &mut storage_transaction)
+        let storage_logs = storage_logs.without_preimages();
+        self.insert_initial_writes_chunk(&storage_logs, &mut storage_transaction)
             .await?;
 
         storage_transaction
@@ -693,24 +900,6 @@ impl<'a> SnapshotsApplier<'a> {
         Ok(())
     }
 
-    /// Performs basic sanity check for a storage logs chunk.
-    fn validate_storage_logs_chunk(
-        &self,
-        storage_logs: &[SnapshotStorageLog],
-    ) -> anyhow::Result<()> {
-        for log in storage_logs {
-            anyhow::ensure!(
-                log.enumeration_index > 0,
-                "invalid storage log with zero enumeration_index: {log:?}"
-            );
-            anyhow::ensure!(
-                log.l1_batch_number_of_initial_write <= self.applied_snapshot_status.l1_batch_number,
-                "invalid storage log with `l1_batch_number_of_initial_write` from the future: {log:?}"
-            );
-        }
-        Ok(())
-    }
-
     async fn recover_storage_logs(&self) -> Result<(), SnapshotsApplierError> {
         let effective_concurrency =
             (self.connection_pool.max_size() as usize).min(self.max_concurrency);
diff --git a/core/lib/snapshots_applier/src/tests/mod.rs b/core/lib/snapshots_applier/src/tests/mod.rs
index 33ba37b55771..51578b5090d8 100644
--- a/core/lib/snapshots_applier/src/tests/mod.rs
+++ b/core/lib/snapshots_applier/src/tests/mod.rs
@@ -9,7 +9,7 @@ use assert_matches::assert_matches;
 use test_casing::test_casing;
 use tokio::sync::Barrier;
 use zksync_health_check::CheckHealth;
-use zksync_object_store::ObjectStoreFactory;
+use zksync_object_store::MockObjectStore;
 use zksync_types::{
     api::{BlockDetails, L1BatchDetails},
     block::L1BatchHeader,
@@ -21,9 +21,20 @@ use self::utils::{
     random_storage_logs, MockMainNodeClient, ObjectStoreWithErrors,
 };
 use super::*;
+use crate::tests::utils::HangingObjectStore;
 
 mod utils;
 
+async fn is_recovery_completed(
+    pool: &ConnectionPool<Core>,
+    client: &MockMainNodeClient,
+) -> RecoveryCompletionStatus {
+    let mut connection = pool.connection().await.unwrap();
+    SnapshotsApplierTask::is_recovery_completed(&mut connection, client)
+        .await
+        .unwrap()
+}
+
 #[test_casing(3, [(None, false), (Some(2), false), (None, true)])]
 #[tokio::test]
 async fn snapshots_creator_can_successfully_recover_db(
@@ -35,13 +46,12 @@ async fn snapshots_creator_can_successfully_recover_db(
     } else {
         ConnectionPool::<Core>::test_pool().await
     };
+
     let expected_status = mock_recovery_status();
     let storage_logs = random_storage_logs(expected_status.l1_batch_number, 200);
     let (object_store, client) = prepare_clients(&expected_status, &storage_logs).await;
-    let storage_logs_by_hashed_key: HashMap<_, _> = storage_logs
-        .into_iter()
-        .map(|log| (log.key.hashed_key(), log))
-        .collect();
+    let storage_logs_by_hashed_key: HashMap<_, _> =
+        storage_logs.into_iter().map(|log| (log.key, log)).collect();
 
     let object_store_with_errors;
     let object_store = if with_object_store_errors {
@@ -50,7 +60,10 @@ async fn snapshots_creator_can_successfully_recover_db(
             if error_counter.fetch_add(1, Ordering::SeqCst) >= 3 {
                 Ok(()) // "recover" after 3 retries
             } else {
-                Err(ObjectStoreError::Other("transient error".into()))
+                Err(ObjectStoreError::Other {
+                    is_transient: true,
+                    source: "transient error".into(),
+                })
             }
         });
         Arc::new(object_store_with_errors)
@@ -58,6 +71,12 @@ async fn snapshots_creator_can_successfully_recover_db(
         object_store
     };
 
+    assert_eq!(
+        is_recovery_completed(&pool, &client).await,
+        RecoveryCompletionStatus::NoRecoveryDetected,
+        "No snapshot information in the DB"
+    );
+
     let task = SnapshotsApplierTask::new(
         SnapshotsApplierConfig::for_tests(),
         pool.clone(),
@@ -72,6 +91,12 @@ async fn snapshots_creator_can_successfully_recover_db(
         HealthStatus::Ready
     );
 
+    assert_eq!(
+        is_recovery_completed(&pool, &client).await,
+        RecoveryCompletionStatus::Completed,
+        "Recovery has been completed"
+    );
+
     let mut storage = pool.connection().await.unwrap();
     let mut recovery_dal = storage.snapshot_recovery_dal();
 
@@ -99,8 +124,9 @@ async fn snapshots_creator_can_successfully_recover_db(
     assert_eq!(all_storage_logs.len(), storage_logs_by_hashed_key.len());
     for db_log in all_storage_logs {
         let expected_log = &storage_logs_by_hashed_key[&db_log.hashed_key];
-        assert_eq!(db_log.address, *expected_log.key.address());
-        assert_eq!(db_log.key, *expected_log.key.key());
+        assert_eq!(db_log.hashed_key, expected_log.key);
+        assert!(db_log.key.is_none());
+        assert!(db_log.address.is_none());
         assert_eq!(db_log.value, expected_log.value);
         assert_eq!(db_log.l2_block_number, expected_status.l2_block_number);
     }
@@ -139,6 +165,196 @@ async fn snapshots_creator_can_successfully_recover_db(
     assert!(!stats.done_work);
 }
 
+#[test_casing(2, [false, true])]
+#[tokio::test]
+async fn applier_recovers_v0_snapshot(drop_storage_key_preimages: bool) {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let expected_status = mock_recovery_status();
+    let storage_logs = random_storage_logs::<StorageKey>(expected_status.l1_batch_number, 200);
+    let (object_store, client) = prepare_clients(&expected_status, &storage_logs).await;
+
+    let mut task = SnapshotsApplierTask::new(
+        SnapshotsApplierConfig::for_tests(),
+        pool.clone(),
+        Box::new(client),
+        object_store,
+    );
+    if drop_storage_key_preimages {
+        task.drop_storage_key_preimages();
+    }
+    let stats = task.run().await.unwrap();
+    assert!(stats.done_work);
+
+    let mut storage = pool.connection().await.unwrap();
+    let all_storage_logs = storage
+        .storage_logs_dal()
+        .dump_all_storage_logs_for_tests()
+        .await;
+    assert_eq!(all_storage_logs.len(), storage_logs.len());
+
+    let storage_logs_by_hashed_key: HashMap<_, _> = storage_logs
+        .into_iter()
+        .map(|log| (log.key.hashed_key(), log))
+        .collect();
+    for db_log in all_storage_logs {
+        let expected_log = &storage_logs_by_hashed_key[&db_log.hashed_key];
+        assert_eq!(db_log.hashed_key, expected_log.key.hashed_key());
+        assert_eq!(db_log.value, expected_log.value);
+        assert_eq!(db_log.l2_block_number, expected_status.l2_block_number);
+
+        if drop_storage_key_preimages {
+            assert!(db_log.key.is_none());
+            assert!(db_log.address.is_none());
+        } else {
+            assert_eq!(db_log.key, Some(*expected_log.key.key()));
+            assert_eq!(db_log.address, Some(*expected_log.key.address()));
+        }
+    }
+}
+
+#[tokio::test]
+async fn applier_recovers_explicitly_specified_snapshot() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let expected_status = mock_recovery_status();
+    let storage_logs = random_storage_logs::<H256>(expected_status.l1_batch_number, 200);
+    let (object_store, client) = prepare_clients(&expected_status, &storage_logs).await;
+
+    let mut task = SnapshotsApplierTask::new(
+        SnapshotsApplierConfig::for_tests(),
+        pool.clone(),
+        Box::new(client),
+        object_store,
+    );
+    task.set_snapshot_l1_batch(expected_status.l1_batch_number);
+    let stats = task.run().await.unwrap();
+    assert!(stats.done_work);
+
+    let mut storage = pool.connection().await.unwrap();
+    let all_storage_logs = storage
+        .storage_logs_dal()
+        .dump_all_storage_logs_for_tests()
+        .await;
+    assert_eq!(all_storage_logs.len(), storage_logs.len());
+}
+
+#[tokio::test]
+async fn applier_error_for_missing_explicitly_specified_snapshot() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let expected_status = mock_recovery_status();
+    let storage_logs = random_storage_logs::<H256>(expected_status.l1_batch_number, 200);
+    let (object_store, client) = prepare_clients(&expected_status, &storage_logs).await;
+
+    let mut task = SnapshotsApplierTask::new(
+        SnapshotsApplierConfig::for_tests(),
+        pool,
+        Box::new(client),
+        object_store,
+    );
+    task.set_snapshot_l1_batch(expected_status.l1_batch_number + 1);
+
+    let err = task.run().await.unwrap_err();
+    assert!(
+        format!("{err:#}").contains("not present on main node"),
+        "{err:#}"
+    );
+}
+
+#[tokio::test]
+async fn snapshot_applier_recovers_after_stopping() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut expected_status = mock_recovery_status();
+    expected_status.storage_logs_chunks_processed = vec![true; 10];
+    let storage_logs = random_storage_logs::<H256>(expected_status.l1_batch_number, 200);
+    let (object_store, client) = prepare_clients(&expected_status, &storage_logs).await;
+    let (stopping_object_store, mut stop_receiver) =
+        HangingObjectStore::new(object_store.clone(), 1);
+
+    let mut config = SnapshotsApplierConfig::for_tests();
+    config.max_concurrency = NonZeroUsize::new(1).unwrap();
+    let task = SnapshotsApplierTask::new(
+        config.clone(),
+        pool.clone(),
+        Box::new(client.clone()),
+        Arc::new(stopping_object_store),
+    );
+    let task_handle = tokio::spawn(task.run());
+
+    // Wait until the first storage logs chunk is requested (the object store hangs up at this point)
+    stop_receiver.wait_for(|&count| count > 1).await.unwrap();
+    assert!(!task_handle.is_finished());
+    task_handle.abort();
+
+    assert_eq!(
+        is_recovery_completed(&pool, &client).await,
+        RecoveryCompletionStatus::InProgress,
+        "Recovery has been aborted"
+    );
+
+    // Check that factory deps have been persisted, but no storage logs.
+    let mut storage = pool.connection().await.unwrap();
+    let all_factory_deps = storage
+        .factory_deps_dal()
+        .dump_all_factory_deps_for_tests()
+        .await;
+    assert!(!all_factory_deps.is_empty());
+    let all_storage_logs = storage
+        .storage_logs_dal()
+        .dump_all_storage_logs_for_tests()
+        .await;
+    assert!(all_storage_logs.is_empty(), "{all_storage_logs:?}");
+
+    // Recover 3 storage log chunks and stop again
+    let (stopping_object_store, mut stop_receiver) =
+        HangingObjectStore::new(object_store.clone(), 3);
+
+    let task = SnapshotsApplierTask::new(
+        config.clone(),
+        pool.clone(),
+        Box::new(client.clone()),
+        Arc::new(stopping_object_store),
+    );
+    let task_handle = tokio::spawn(task.run());
+
+    stop_receiver.wait_for(|&count| count > 3).await.unwrap();
+    assert!(!task_handle.is_finished());
+    task_handle.abort();
+
+    assert_eq!(
+        is_recovery_completed(&pool, &client).await,
+        RecoveryCompletionStatus::InProgress,
+        "Not all logs have been recovered"
+    );
+
+    let all_storage_logs = storage
+        .storage_logs_dal()
+        .dump_all_storage_logs_for_tests()
+        .await;
+    assert!(all_storage_logs.len() < storage_logs.len());
+
+    // Recover remaining 7 (10 - 3) storage log chunks.
+    let (stopping_object_store, _) = HangingObjectStore::new(object_store.clone(), 7);
+    let mut task = SnapshotsApplierTask::new(
+        config,
+        pool.clone(),
+        Box::new(client.clone()),
+        Arc::new(stopping_object_store),
+    );
+    task.set_snapshot_l1_batch(expected_status.l1_batch_number); // check that this works fine
+    task.run().await.unwrap();
+
+    assert_eq!(
+        is_recovery_completed(&pool, &client).await,
+        RecoveryCompletionStatus::Completed,
+        "Recovery has been completed"
+    );
+
+    let all_storage_logs = storage
+        .storage_logs_dal()
+        .dump_all_storage_logs_for_tests()
+        .await;
+    assert_eq!(all_storage_logs.len(), storage_logs.len());
+}
+
 #[tokio::test]
 async fn health_status_immediately_after_task_start() {
     #[derive(Debug, Clone)]
@@ -162,7 +378,17 @@ async fn health_status_immediately_after_task_start() {
             future::pending().await
         }
 
-        async fn fetch_newest_snapshot(&self) -> EnrichedClientResult<Option<SnapshotHeader>> {
+        async fn fetch_newest_snapshot_l1_batch_number(
+            &self,
+        ) -> EnrichedClientResult<Option<L1BatchNumber>> {
+            self.0.wait().await;
+            future::pending().await
+        }
+
+        async fn fetch_snapshot(
+            &self,
+            _l1_batch_number: L1BatchNumber,
+        ) -> EnrichedClientResult<Option<SnapshotHeader>> {
             self.0.wait().await;
             future::pending().await
         }
@@ -176,8 +402,7 @@ async fn health_status_immediately_after_task_start() {
         }
     }
 
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    let object_store = MockObjectStore::arc();
     let client = HangingMainNodeClient(Arc::new(Barrier::new(2)));
     let task = SnapshotsApplierTask::new(
         SnapshotsApplierConfig::for_tests(),
@@ -231,8 +456,7 @@ async fn applier_errors_after_genesis() {
         .unwrap();
     drop(storage);
 
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    let object_store = MockObjectStore::arc();
     let client = MockMainNodeClient::default();
 
     let task = SnapshotsApplierTask::new(
@@ -247,8 +471,7 @@ async fn applier_errors_after_genesis() {
 #[tokio::test]
 async fn applier_errors_without_snapshots() {
     let pool = ConnectionPool::<Core>::test_pool().await;
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    let object_store = MockObjectStore::arc();
     let client = MockMainNodeClient::default();
 
     let task = SnapshotsApplierTask::new(
@@ -263,14 +486,10 @@ async fn applier_errors_without_snapshots() {
 #[tokio::test]
 async fn applier_errors_with_unrecognized_snapshot_version() {
     let pool = ConnectionPool::test_pool().await;
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    let object_store = MockObjectStore::arc();
     let expected_status = mock_recovery_status();
     let client = MockMainNodeClient {
-        fetch_newest_snapshot_response: Some(SnapshotHeader {
-            version: u16::MAX,
-            ..mock_snapshot_header(&expected_status)
-        }),
+        fetch_newest_snapshot_response: Some(mock_snapshot_header(u16::MAX, &expected_status)),
         ..MockMainNodeClient::default()
     };
 
@@ -287,7 +506,7 @@ async fn applier_errors_with_unrecognized_snapshot_version() {
 async fn applier_returns_error_on_fatal_object_store_error() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let expected_status = mock_recovery_status();
-    let storage_logs = random_storage_logs(expected_status.l1_batch_number, 100);
+    let storage_logs = random_storage_logs::<H256>(expected_status.l1_batch_number, 100);
     let (object_store, client) = prepare_clients(&expected_status, &storage_logs).await;
     let object_store = ObjectStoreWithErrors::new(object_store, |_| {
         Err(ObjectStoreError::KeyNotFound("not found".into()))
@@ -312,10 +531,13 @@ async fn applier_returns_error_on_fatal_object_store_error() {
 async fn applier_returns_error_after_too_many_object_store_retries() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let expected_status = mock_recovery_status();
-    let storage_logs = random_storage_logs(expected_status.l1_batch_number, 100);
+    let storage_logs = random_storage_logs::<H256>(expected_status.l1_batch_number, 100);
     let (object_store, client) = prepare_clients(&expected_status, &storage_logs).await;
     let object_store = ObjectStoreWithErrors::new(object_store, |_| {
-        Err(ObjectStoreError::Other("service not available".into()))
+        Err(ObjectStoreError::Other {
+            is_transient: true,
+            source: "service not available".into(),
+        })
     });
 
     let task = SnapshotsApplierTask::new(
@@ -328,7 +550,7 @@ async fn applier_returns_error_after_too_many_object_store_retries() {
     assert!(err.chain().any(|cause| {
         matches!(
             cause.downcast_ref::<ObjectStoreError>(),
-            Some(ObjectStoreError::Other(_))
+            Some(ObjectStoreError::Other { .. })
         )
     }));
 }
@@ -344,15 +566,35 @@ async fn recovering_tokens() {
             continue;
         }
         storage_logs.push(SnapshotStorageLog {
-            key: get_code_key(&token.l2_address),
+            key: get_code_key(&token.l2_address).hashed_key(),
             value: H256::random(),
             l1_batch_number_of_initial_write: expected_status.l1_batch_number,
             enumeration_index: storage_logs.len() as u64 + 1,
         });
     }
     let (object_store, mut client) = prepare_clients(&expected_status, &storage_logs).await;
-    client.tokens_response = tokens.clone();
 
+    client.tokens_response.clone_from(&tokens);
+
+    // Make sure that the task will fail when we will start migrating tokens.
+    client.set_token_response_error(EnrichedClientError::custom("Error", "not_important"));
+
+    let task = SnapshotsApplierTask::new(
+        SnapshotsApplierConfig::for_tests(),
+        pool.clone(),
+        Box::new(client.clone()),
+        object_store.clone(),
+    );
+    let task_result = task.run().await;
+    assert!(task_result.is_err());
+
+    assert_eq!(
+        is_recovery_completed(&pool, &client).await,
+        RecoveryCompletionStatus::InProgress,
+        "Tokens are not migrated"
+    );
+
+    // Now perform the recovery again, tokens should be migrated.
     let task = SnapshotsApplierTask::new(
         SnapshotsApplierConfig::for_tests(),
         pool.clone(),
@@ -361,6 +603,12 @@ async fn recovering_tokens() {
     );
     task.run().await.unwrap();
 
+    assert_eq!(
+        is_recovery_completed(&pool, &client).await,
+        RecoveryCompletionStatus::Completed,
+        "Recovery is completed"
+    );
+
     // Check that tokens are successfully restored.
     let mut storage = pool.connection().await.unwrap();
     let recovered_tokens = storage
diff --git a/core/lib/snapshots_applier/src/tests/utils.rs b/core/lib/snapshots_applier/src/tests/utils.rs
index 4629d8c0a2fb..c546fb60c09b 100644
--- a/core/lib/snapshots_applier/src/tests/utils.rs
+++ b/core/lib/snapshots_applier/src/tests/utils.rs
@@ -1,9 +1,14 @@
 //! Test utils.
 
-use std::{collections::HashMap, fmt, sync::Arc};
+use std::{
+    collections::HashMap,
+    fmt, future,
+    sync::{Arc, RwLock},
+};
 
 use async_trait::async_trait;
-use zksync_object_store::{Bucket, ObjectStore, ObjectStoreError, ObjectStoreFactory};
+use tokio::sync::watch;
+use zksync_object_store::{Bucket, MockObjectStore, ObjectStore, ObjectStoreError, StoredObject};
 use zksync_types::{
     api,
     block::L2BlockHeader,
@@ -15,18 +20,53 @@ use zksync_types::{
     tokens::{TokenInfo, TokenMetadata},
     web3::Bytes,
     AccountTreeId, Address, L1BatchNumber, L2BlockNumber, ProtocolVersionId, StorageKey,
-    StorageValue, H160, H256,
+    StorageValue, H256,
 };
-use zksync_web3_decl::error::EnrichedClientResult;
+use zksync_web3_decl::error::{EnrichedClientError, EnrichedClientResult};
 
 use crate::SnapshotsApplierMainNodeClient;
 
+pub(super) trait SnapshotLogKey: Clone {
+    const VERSION: SnapshotVersion;
+
+    fn random() -> Self;
+}
+
+impl SnapshotLogKey for H256 {
+    const VERSION: SnapshotVersion = SnapshotVersion::Version1;
+
+    fn random() -> Self {
+        Self::random()
+    }
+}
+
+impl SnapshotLogKey for StorageKey {
+    const VERSION: SnapshotVersion = SnapshotVersion::Version0;
+
+    fn random() -> Self {
+        Self::new(AccountTreeId::new(Address::random()), H256::random())
+    }
+}
+
 #[derive(Debug, Clone, Default)]
 pub(super) struct MockMainNodeClient {
     pub fetch_l1_batch_responses: HashMap<L1BatchNumber, api::L1BatchDetails>,
     pub fetch_l2_block_responses: HashMap<L2BlockNumber, api::BlockDetails>,
     pub fetch_newest_snapshot_response: Option<SnapshotHeader>,
     pub tokens_response: Vec<TokenInfo>,
+    pub tokens_response_error: Arc<RwLock<Option<EnrichedClientError>>>,
+}
+
+impl MockMainNodeClient {
+    /// Sets the error to be returned by the `fetch_tokens` method.
+    /// Error will be returned just once. Next time the request will succeed.
+    pub(super) fn set_token_response_error(&self, error: EnrichedClientError) {
+        *self.tokens_response_error.write().unwrap() = Some(error);
+    }
+
+    fn take_token_response_error(&self) -> Option<EnrichedClientError> {
+        self.tokens_response_error.write().unwrap().take()
+    }
 }
 
 #[async_trait]
@@ -45,14 +85,33 @@ impl SnapshotsApplierMainNodeClient for MockMainNodeClient {
         Ok(self.fetch_l2_block_responses.get(&number).cloned())
     }
 
-    async fn fetch_newest_snapshot(&self) -> EnrichedClientResult<Option<SnapshotHeader>> {
-        Ok(self.fetch_newest_snapshot_response.clone())
+    async fn fetch_newest_snapshot_l1_batch_number(
+        &self,
+    ) -> EnrichedClientResult<Option<L1BatchNumber>> {
+        Ok(self
+            .fetch_newest_snapshot_response
+            .as_ref()
+            .map(|response| response.l1_batch_number))
+    }
+
+    async fn fetch_snapshot(
+        &self,
+        l1_batch_number: L1BatchNumber,
+    ) -> EnrichedClientResult<Option<SnapshotHeader>> {
+        Ok(self
+            .fetch_newest_snapshot_response
+            .clone()
+            .filter(|response| response.l1_batch_number == l1_batch_number))
     }
 
     async fn fetch_tokens(
         &self,
         _at_l2_block: L2BlockNumber,
     ) -> EnrichedClientResult<Vec<TokenInfo>> {
+        if let Some(error) = self.take_token_response_error() {
+            return Err(error);
+        }
+
         Ok(self.tokens_response.clone())
     }
 }
@@ -140,6 +199,7 @@ fn block_details_base(hash: H256) -> api::BlockDetailsBase {
         executed_at: None,
         l1_gas_price: 0,
         l2_fair_gas_price: 0,
+        fair_pubdata_price: None,
         base_system_contracts_hashes: Default::default(),
     }
 }
@@ -165,16 +225,13 @@ fn l1_batch_details(number: L1BatchNumber, root_hash: H256) -> api::L1BatchDetai
     }
 }
 
-pub(super) fn random_storage_logs(
+pub(super) fn random_storage_logs<K: SnapshotLogKey>(
     l1_batch_number: L1BatchNumber,
     count: u64,
-) -> Vec<SnapshotStorageLog> {
+) -> Vec<SnapshotStorageLog<K>> {
     (0..count)
         .map(|i| SnapshotStorageLog {
-            key: StorageKey::new(
-                AccountTreeId::from_fixed_bytes(H160::random().to_fixed_bytes()),
-                H256::random(),
-            ),
+            key: K::random(),
             value: StorageValue::random(),
             l1_batch_number_of_initial_write: l1_batch_number,
             enumeration_index: i + 1,
@@ -218,31 +275,33 @@ pub(super) fn mock_tokens() -> Vec<TokenInfo> {
     ]
 }
 
-pub(super) fn mock_snapshot_header(status: &SnapshotRecoveryStatus) -> SnapshotHeader {
+pub(super) fn mock_snapshot_header(
+    version: u16,
+    status: &SnapshotRecoveryStatus,
+) -> SnapshotHeader {
     SnapshotHeader {
-        version: SnapshotVersion::Version0.into(),
+        version,
         l1_batch_number: status.l1_batch_number,
         l2_block_number: status.l2_block_number,
-        storage_logs_chunks: vec![
-            SnapshotStorageLogsChunkMetadata {
-                chunk_id: 0,
-                filepath: "file0".to_string(),
-            },
-            SnapshotStorageLogsChunkMetadata {
-                chunk_id: 1,
-                filepath: "file1".to_string(),
-            },
-        ],
+        storage_logs_chunks: (0..status.storage_logs_chunks_processed.len() as u64)
+            .map(|chunk_id| SnapshotStorageLogsChunkMetadata {
+                chunk_id,
+                filepath: format!("file{chunk_id}"),
+            })
+            .collect(),
         factory_deps_filepath: "some_filepath".to_string(),
     }
 }
 
-pub(super) async fn prepare_clients(
+pub(super) async fn prepare_clients<K>(
     status: &SnapshotRecoveryStatus,
-    logs: &[SnapshotStorageLog],
-) -> (Arc<dyn ObjectStore>, MockMainNodeClient) {
-    let object_store_factory = ObjectStoreFactory::mock();
-    let object_store = object_store_factory.create_store().await;
+    logs: &[SnapshotStorageLog<K>],
+) -> (Arc<dyn ObjectStore>, MockMainNodeClient)
+where
+    K: SnapshotLogKey,
+    for<'a> SnapshotStorageLogsChunk<K>: StoredObject<Key<'a> = SnapshotStorageLogsStorageKey>,
+{
+    let object_store = MockObjectStore::arc();
     let mut client = MockMainNodeClient::default();
     let factory_dep_bytes: Vec<u8> = (0..32).collect();
     let factory_deps = SnapshotFactoryDependencies {
@@ -274,7 +333,7 @@ pub(super) async fn prepare_clients(
             .unwrap();
     }
 
-    client.fetch_newest_snapshot_response = Some(mock_snapshot_header(status));
+    client.fetch_newest_snapshot_response = Some(mock_snapshot_header(K::VERSION.into(), status));
     client.fetch_l1_batch_responses.insert(
         status.l1_batch_number,
         l1_batch_details(status.l1_batch_number, status.l1_batch_root_hash),
@@ -289,3 +348,64 @@ pub(super) async fn prepare_clients(
     );
     (object_store, client)
 }
+
+/// Object store wrapper that hangs up after processing the specified number of requests.
+/// Used to emulate the snapshot applier being restarted since, if it's configured to have concurrency 1,
+/// the applier will request an object from the store strictly after fully processing all previously requested objects.
+#[derive(Debug)]
+pub(super) struct HangingObjectStore {
+    inner: Arc<dyn ObjectStore>,
+    stop_after_count: usize,
+    count_sender: watch::Sender<usize>,
+}
+
+impl HangingObjectStore {
+    pub fn new(
+        inner: Arc<dyn ObjectStore>,
+        stop_after_count: usize,
+    ) -> (Self, watch::Receiver<usize>) {
+        let (count_sender, count_receiver) = watch::channel(0);
+        let this = Self {
+            inner,
+            stop_after_count,
+            count_sender,
+        };
+        (this, count_receiver)
+    }
+}
+
+#[async_trait]
+impl ObjectStore for HangingObjectStore {
+    async fn get_raw(&self, bucket: Bucket, key: &str) -> Result<Vec<u8>, ObjectStoreError> {
+        let mut should_proceed = true;
+        self.count_sender.send_modify(|count| {
+            *count += 1;
+            if *count > self.stop_after_count {
+                should_proceed = false;
+            }
+        });
+
+        if should_proceed {
+            self.inner.get_raw(bucket, key).await
+        } else {
+            future::pending().await // Hang up the snapshot applier task
+        }
+    }
+
+    async fn put_raw(
+        &self,
+        _bucket: Bucket,
+        _key: &str,
+        _value: Vec<u8>,
+    ) -> Result<(), ObjectStoreError> {
+        unreachable!("Should not be used in snapshot applier")
+    }
+
+    async fn remove_raw(&self, _bucket: Bucket, _key: &str) -> Result<(), ObjectStoreError> {
+        unreachable!("Should not be used in snapshot applier")
+    }
+
+    fn storage_prefix_raw(&self, bucket: Bucket) -> String {
+        self.inner.storage_prefix_raw(bucket)
+    }
+}
diff --git a/core/lib/state/Cargo.toml b/core/lib/state/Cargo.toml
index fd1742788eff..b7d5a4cfe0f2 100644
--- a/core/lib/state/Cargo.toml
+++ b/core/lib/state/Cargo.toml
@@ -25,6 +25,7 @@ tracing.workspace = true
 itertools.workspace = true
 chrono.workspace = true
 once_cell.workspace = true
+backon.workspace = true
 
 [dev-dependencies]
 assert_matches.workspace = true
diff --git a/core/lib/state/src/catchup.rs b/core/lib/state/src/catchup.rs
index 4adf7547a301..139e10ea19fd 100644
--- a/core/lib/state/src/catchup.rs
+++ b/core/lib/state/src/catchup.rs
@@ -1,7 +1,6 @@
-use std::{sync::Arc, time::Instant};
+use std::{error, fmt, time::Instant};
 
 use anyhow::Context;
-use once_cell::sync::OnceCell;
 use tokio::sync::watch;
 use zksync_dal::{ConnectionPool, Core};
 use zksync_shared_metrics::{SnapshotRecoveryStage, APP_METRICS};
@@ -10,6 +9,85 @@ use zksync_types::L1BatchNumber;
 
 use crate::{RocksdbStorage, RocksdbStorageOptions, StateKeeperColumnFamily};
 
+/// Initial RocksDB cache state returned by [`RocksdbCell::ensure_initialized()`].
+#[derive(Debug, Clone)]
+#[non_exhaustive]
+pub struct InitialRocksdbState {
+    /// Last processed L1 batch number in the RocksDB cache + 1 (i.e., the batch that the cache is ready to process).
+    /// `None` if the cache is empty (i.e., needs recovery).
+    pub l1_batch_number: Option<L1BatchNumber>,
+}
+
+/// Error returned from [`RocksdbCell`] methods if the corresponding [`AsyncCatchupTask`] has failed
+/// or was canceled.
+#[derive(Debug)]
+pub struct AsyncCatchupFailed(());
+
+impl fmt::Display for AsyncCatchupFailed {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str("Async RocksDB cache catchup failed or was canceled")
+    }
+}
+
+impl error::Error for AsyncCatchupFailed {}
+
+/// `OnceCell` equivalent that can be `.await`ed. Correspondingly, it has the following invariants:
+///
+/// - The cell is only set once
+/// - The cell is always set to `Some(_)`.
+///
+/// `OnceCell` (either from `once_cell` or `tokio`) is not used because it lacks a way to wait for the cell
+/// to be initialized. `once_cell::sync::OnceCell` has a blocking `wait()` method, but since it's blocking,
+/// it risks spawning non-cancellable threads if misused.
+type AsyncOnceCell<T> = watch::Receiver<Option<T>>;
+
+/// A lazily initialized handle to RocksDB cache returned from [`AsyncCatchupTask::new()`].
+#[derive(Debug)]
+pub struct RocksdbCell {
+    initial_state: AsyncOnceCell<InitialRocksdbState>,
+    db: AsyncOnceCell<RocksDB<StateKeeperColumnFamily>>,
+}
+
+impl RocksdbCell {
+    /// Waits until RocksDB is initialized and returns it.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if the async catch-up task failed or was canceled before initialization.
+    #[allow(clippy::missing_panics_doc)] // false positive
+    pub async fn wait(&self) -> Result<RocksDB<StateKeeperColumnFamily>, AsyncCatchupFailed> {
+        self.db
+            .clone()
+            .wait_for(Option::is_some)
+            .await
+            // `unwrap` below is safe by construction
+            .map(|db| db.clone().unwrap())
+            .map_err(|_| AsyncCatchupFailed(()))
+    }
+
+    /// Gets a RocksDB instance if it has been initialized.
+    pub fn get(&self) -> Option<RocksDB<StateKeeperColumnFamily>> {
+        self.db.borrow().clone()
+    }
+
+    /// Ensures that the RocksDB has started catching up, and returns the **initial** RocksDB state
+    /// at the start of the catch-up.
+    ///
+    /// # Errors
+    ///
+    /// Returns an error if the async catch-up task failed or was canceled.
+    #[allow(clippy::missing_panics_doc)] // false positive
+    pub async fn ensure_initialized(&self) -> Result<InitialRocksdbState, AsyncCatchupFailed> {
+        self.initial_state
+            .clone()
+            .wait_for(Option::is_some)
+            .await
+            // `unwrap` below is safe by construction
+            .map(|state| state.clone().unwrap())
+            .map_err(|_| AsyncCatchupFailed(()))
+    }
+}
+
 /// A runnable task that blocks until the provided RocksDB cache instance is caught up with
 /// Postgres.
 ///
@@ -19,27 +97,41 @@ pub struct AsyncCatchupTask {
     pool: ConnectionPool<Core>,
     state_keeper_db_path: String,
     state_keeper_db_options: RocksdbStorageOptions,
-    rocksdb_cell: Arc<OnceCell<RocksDB<StateKeeperColumnFamily>>>,
+    initial_state_sender: watch::Sender<Option<InitialRocksdbState>>,
+    db_sender: watch::Sender<Option<RocksDB<StateKeeperColumnFamily>>>,
     to_l1_batch_number: Option<L1BatchNumber>,
 }
 
 impl AsyncCatchupTask {
     /// Create a new catch-up task with the provided Postgres and RocksDB instances. Optionally
     /// accepts the last L1 batch number to catch up to (defaults to latest if not specified).
-    pub fn new(
-        pool: ConnectionPool<Core>,
-        state_keeper_db_path: String,
-        state_keeper_db_options: RocksdbStorageOptions,
-        rocksdb_cell: Arc<OnceCell<RocksDB<StateKeeperColumnFamily>>>,
-        to_l1_batch_number: Option<L1BatchNumber>,
-    ) -> Self {
-        Self {
+    pub fn new(pool: ConnectionPool<Core>, state_keeper_db_path: String) -> (Self, RocksdbCell) {
+        let (initial_state_sender, initial_state) = watch::channel(None);
+        let (db_sender, db) = watch::channel(None);
+        let this = Self {
             pool,
             state_keeper_db_path,
-            state_keeper_db_options,
-            rocksdb_cell,
-            to_l1_batch_number,
-        }
+            state_keeper_db_options: RocksdbStorageOptions::default(),
+            initial_state_sender,
+            db_sender,
+            to_l1_batch_number: None,
+        };
+        (this, RocksdbCell { initial_state, db })
+    }
+
+    /// Sets RocksDB options.
+    #[must_use]
+    pub fn with_db_options(mut self, options: RocksdbStorageOptions) -> Self {
+        self.state_keeper_db_options = options;
+        self
+    }
+
+    /// Sets the L1 batch number to catch up. By default, the task will catch up to the latest L1 batch
+    /// (at the start of catch-up).
+    #[must_use]
+    pub fn with_target_l1_batch_number(mut self, number: L1BatchNumber) -> Self {
+        self.to_l1_batch_number = Some(number);
+        self
     }
 
     /// Block until RocksDB cache instance is caught up with Postgres.
@@ -47,9 +139,10 @@ impl AsyncCatchupTask {
     /// # Errors
     ///
     /// Propagates RocksDB and Postgres errors.
+    #[tracing::instrument(name = "catch_up", skip_all, fields(target_l1_batch = ?self.to_l1_batch_number))]
     pub async fn run(self, stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
         let started_at = Instant::now();
-        tracing::debug!("Catching up RocksDB asynchronously");
+        tracing::info!("Catching up RocksDB asynchronously");
 
         let mut rocksdb_builder = RocksdbStorage::builder_with_options(
             self.state_keeper_db_path.as_ref(),
@@ -58,6 +151,12 @@ impl AsyncCatchupTask {
         .await
         .context("Failed creating RocksDB storage builder")?;
 
+        let initial_state = InitialRocksdbState {
+            l1_batch_number: rocksdb_builder.l1_batch_number().await,
+        };
+        tracing::info!("Initialized RocksDB catchup from state: {initial_state:?}");
+        self.initial_state_sender.send_replace(Some(initial_state));
+
         let mut connection = self.pool.connection_tagged("state_keeper").await?;
         let was_recovered_from_snapshot = rocksdb_builder
             .ensure_ready(&mut connection, &stop_receiver)
@@ -76,12 +175,101 @@ impl AsyncCatchupTask {
             .context("Failed to catch up RocksDB to Postgres")?;
         drop(connection);
         if let Some(rocksdb) = rocksdb {
-            self.rocksdb_cell
-                .set(rocksdb.into_rocksdb())
-                .map_err(|_| anyhow::anyhow!("Async RocksDB cache was initialized twice"))?;
+            self.db_sender.send_replace(Some(rocksdb.into_rocksdb()));
         } else {
             tracing::info!("Synchronizing RocksDB interrupted");
         }
         Ok(())
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use tempfile::TempDir;
+    use test_casing::test_casing;
+    use zksync_types::L2BlockNumber;
+
+    use super::*;
+    use crate::{
+        test_utils::{create_l1_batch, create_l2_block, gen_storage_logs, prepare_postgres},
+        RocksdbStorageBuilder,
+    };
+
+    #[tokio::test]
+    async fn catching_up_basics() {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = pool.connection().await.unwrap();
+        prepare_postgres(&mut conn).await;
+        let storage_logs = gen_storage_logs(20..40);
+        create_l2_block(&mut conn, L2BlockNumber(1), storage_logs.clone()).await;
+        create_l1_batch(&mut conn, L1BatchNumber(1), &storage_logs).await;
+        drop(conn);
+
+        let temp_dir = TempDir::new().unwrap();
+        let (task, rocksdb_cell) =
+            AsyncCatchupTask::new(pool.clone(), temp_dir.path().to_str().unwrap().to_owned());
+        let (_stop_sender, stop_receiver) = watch::channel(false);
+        let task_handle = tokio::spawn(task.run(stop_receiver));
+
+        let initial_state = rocksdb_cell.ensure_initialized().await.unwrap();
+        assert_eq!(initial_state.l1_batch_number, None);
+
+        let db = rocksdb_cell.wait().await.unwrap();
+        assert_eq!(
+            RocksdbStorageBuilder::from_rocksdb(db)
+                .l1_batch_number()
+                .await,
+            Some(L1BatchNumber(2))
+        );
+        task_handle.await.unwrap().unwrap();
+        drop(rocksdb_cell); // should be enough to release RocksDB lock
+
+        let (task, rocksdb_cell) =
+            AsyncCatchupTask::new(pool, temp_dir.path().to_str().unwrap().to_owned());
+        let (_stop_sender, stop_receiver) = watch::channel(false);
+        let task_handle = tokio::spawn(task.run(stop_receiver));
+
+        let initial_state = rocksdb_cell.ensure_initialized().await.unwrap();
+        assert_eq!(initial_state.l1_batch_number, Some(L1BatchNumber(2)));
+
+        task_handle.await.unwrap().unwrap();
+        rocksdb_cell.get().unwrap(); // RocksDB must be caught up at this point
+    }
+
+    #[derive(Debug)]
+    enum CancellationScenario {
+        DropTask,
+        CancelTask,
+    }
+
+    impl CancellationScenario {
+        const ALL: [Self; 2] = [Self::DropTask, Self::CancelTask];
+    }
+
+    #[test_casing(2, CancellationScenario::ALL)]
+    #[tokio::test]
+    async fn catching_up_cancellation(scenario: CancellationScenario) {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut conn = pool.connection().await.unwrap();
+        prepare_postgres(&mut conn).await;
+        let storage_logs = gen_storage_logs(20..40);
+        create_l2_block(&mut conn, L2BlockNumber(1), storage_logs.clone()).await;
+        create_l1_batch(&mut conn, L1BatchNumber(1), &storage_logs).await;
+        drop(conn);
+
+        let temp_dir = TempDir::new().unwrap();
+        let (task, rocksdb_cell) =
+            AsyncCatchupTask::new(pool.clone(), temp_dir.path().to_str().unwrap().to_owned());
+        let (stop_sender, stop_receiver) = watch::channel(false);
+        match scenario {
+            CancellationScenario::DropTask => drop(task),
+            CancellationScenario::CancelTask => {
+                stop_sender.send_replace(true);
+                task.run(stop_receiver).await.unwrap();
+            }
+        }
+
+        assert!(rocksdb_cell.get().is_none());
+        rocksdb_cell.wait().await.unwrap_err();
+    }
+}
diff --git a/core/lib/state/src/in_memory.rs b/core/lib/state/src/in_memory.rs
index 6dfc98434eb9..594eae128169 100644
--- a/core/lib/state/src/in_memory.rs
+++ b/core/lib/state/src/in_memory.rs
@@ -2,8 +2,8 @@ use std::collections::{hash_map::Entry, BTreeMap, HashMap};
 
 use zksync_types::{
     block::DeployedContract, get_code_key, get_known_code_key, get_system_context_init_logs,
-    system_contracts::get_system_smart_contracts, L2ChainId, StorageKey, StorageLog,
-    StorageLogKind, StorageValue, H256, U256,
+    system_contracts::get_system_smart_contracts, L2ChainId, StorageKey, StorageLog, StorageValue,
+    H256, U256,
 };
 use zksync_utils::u256_to_h256;
 
@@ -63,7 +63,7 @@ impl InMemoryStorage {
                 ]
             })
             .chain(system_context_init_log)
-            .filter_map(|log| (log.kind == StorageLogKind::Write).then_some((log.key, log.value)))
+            .filter_map(|log| (log.is_write()).then_some((log.key, log.value)))
             .collect();
         let state: HashMap<_, _> = state_without_indices
             .into_iter()
@@ -84,6 +84,18 @@ impl InMemoryStorage {
         }
     }
 
+    /// Sets the storage `value` at the specified `key`.
+    pub fn set_value_hashed_enum(&mut self, key: H256, enum_index_set: u64, value: StorageValue) {
+        match self.state.entry(key) {
+            Entry::Occupied(mut entry) => {
+                entry.get_mut().0 = value;
+            }
+            Entry::Vacant(entry) => {
+                entry.insert((value, enum_index_set));
+            }
+        }
+    }
+
     /// Sets the storage `value` at the specified `key`.
     pub fn set_value(&mut self, key: StorageKey, value: StorageValue) {
         match self.state.entry(key.hashed_key()) {
diff --git a/core/lib/state/src/lib.rs b/core/lib/state/src/lib.rs
index cd16f65f41b8..b01d4fd35375 100644
--- a/core/lib/state/src/lib.rs
+++ b/core/lib/state/src/lib.rs
@@ -1,4 +1,4 @@
-//! Execution of transaction in zkSync Era
+//! Execution of transaction in ZKsync Era
 
 // Linter settings.
 #![warn(missing_debug_implementations, missing_docs, bare_trait_objects)]
@@ -30,7 +30,7 @@ mod test_utils;
 
 pub use self::{
     cache::sequential_cache::SequentialCache,
-    catchup::AsyncCatchupTask,
+    catchup::{AsyncCatchupTask, RocksdbCell},
     in_memory::InMemoryStorage,
     // Note, that `test_infra` of the bootloader tests relies on this value to be exposed
     in_memory::IN_MEMORY_STORAGE_DEFAULT_NETWORK_ID,
diff --git a/core/lib/state/src/postgres/mod.rs b/core/lib/state/src/postgres/mod.rs
index 17163af0d56f..9d7f6c3f71fa 100644
--- a/core/lib/state/src/postgres/mod.rs
+++ b/core/lib/state/src/postgres/mod.rs
@@ -1,9 +1,11 @@
 use std::{
     mem,
     sync::{Arc, RwLock},
+    time::Duration,
 };
 
 use anyhow::Context as _;
+use backon::{BlockingRetryable, ConstantBuilder};
 use tokio::{
     runtime::Handle,
     sync::{
@@ -42,12 +44,12 @@ impl CacheValue<H256> for TimestampedFactoryDep {
 }
 
 /// Type alias for initial writes caches.
-type InitialWritesCache = LruCache<StorageKey, L1BatchNumber>;
+type InitialWritesCache = LruCache<H256, L1BatchNumber>;
 
-impl CacheValue<StorageKey> for L1BatchNumber {
+impl CacheValue<H256> for L1BatchNumber {
     #[allow(clippy::cast_possible_truncation)] // doesn't happen in practice
     fn cache_weight(&self) -> u32 {
-        const WEIGHT: usize = mem::size_of::<L1BatchNumber>() + mem::size_of::<StorageKey>();
+        const WEIGHT: usize = mem::size_of::<L1BatchNumber>() + mem::size_of::<H256>();
         // ^ Since values are small, we want to account for key sizes as well
 
         WEIGHT as u32
@@ -122,7 +124,7 @@ impl ValuesCache {
 
     /// Gets the cached value for `key` provided that the cache currently holds values
     /// for `l2_block_number`.
-    fn get(&self, l2_block_number: L2BlockNumber, key: &StorageKey) -> Option<StorageValue> {
+    fn get(&self, l2_block_number: L2BlockNumber, hashed_key: H256) -> Option<StorageValue> {
         let lock = self.0.read().expect("values cache is poisoned");
         if lock.valid_for < l2_block_number {
             // The request is from the future; we cannot say which values in the cache remain valid,
@@ -130,7 +132,7 @@ impl ValuesCache {
             return None;
         }
 
-        let timestamped_value = lock.values.get(&key.hashed_key())?;
+        let timestamped_value = lock.values.get(&hashed_key)?;
         if timestamped_value.loaded_at <= l2_block_number {
             Some(timestamped_value.value)
         } else {
@@ -139,11 +141,11 @@ impl ValuesCache {
     }
 
     /// Caches `value` for `key`, but only if the cache currently holds values for `l2_block_number`.
-    fn insert(&self, l2_block_number: L2BlockNumber, key: StorageKey, value: StorageValue) {
+    fn insert(&self, l2_block_number: L2BlockNumber, hashed_key: H256, value: StorageValue) {
         let lock = self.0.read().expect("values cache is poisoned");
         if lock.valid_for == l2_block_number {
             lock.values.insert(
-                key.hashed_key(),
+                hashed_key,
                 TimestampedStorageValue {
                     value,
                     loaded_at: l2_block_number,
@@ -481,19 +483,36 @@ impl<'a> PostgresStorage<'a> {
 }
 
 impl ReadStorage for PostgresStorage<'_> {
-    fn read_value(&mut self, &key: &StorageKey) -> StorageValue {
+    fn read_value(&mut self, key: &StorageKey) -> StorageValue {
+        let hashed_key = key.hashed_key();
         let latency = STORAGE_METRICS.storage[&Method::ReadValue].start();
         let values_cache = self.values_cache();
-        let cached_value = values_cache.and_then(|cache| cache.get(self.l2_block_number, &key));
+        let cached_value =
+            values_cache.and_then(|cache| cache.get(self.l2_block_number, hashed_key));
 
         let value = cached_value.unwrap_or_else(|| {
+            const RETRY_INTERVAL: Duration = Duration::from_millis(500);
+            const MAX_TRIES: usize = 20;
+
             let mut dal = self.connection.storage_web3_dal();
-            let value = self
-                .rt_handle
-                .block_on(dal.get_historical_value_unchecked(&key, self.l2_block_number))
-                .expect("Failed executing `read_value`");
+            let value = (|| {
+                self.rt_handle
+                    .block_on(dal.get_historical_value_unchecked(hashed_key, self.l2_block_number))
+            })
+            .retry(
+                &ConstantBuilder::default()
+                    .with_delay(RETRY_INTERVAL)
+                    .with_max_times(MAX_TRIES),
+            )
+            .when(|e| {
+                e.inner()
+                    .as_database_error()
+                    .is_some_and(|e| e.message() == "canceling statement due to statement timeout")
+            })
+            .call()
+            .expect("Failed executing `read_value`");
             if let Some(cache) = self.values_cache() {
-                cache.insert(self.l2_block_number, key, value);
+                cache.insert(self.l2_block_number, hashed_key, value);
             }
             value
         });
@@ -503,13 +522,15 @@ impl ReadStorage for PostgresStorage<'_> {
     }
 
     fn is_write_initial(&mut self, key: &StorageKey) -> bool {
+        let hashed_key = key.hashed_key();
         let latency = STORAGE_METRICS.storage[&Method::IsWriteInitial].start();
         let caches = self.caches.as_ref();
-        let cached_value = caches.and_then(|caches| caches.initial_writes.get(key));
+        let cached_value = caches.and_then(|caches| caches.initial_writes.get(&hashed_key));
 
         if cached_value.is_none() {
             // Write is absent in positive cache, check whether it's present in the negative cache.
-            let cached_value = caches.and_then(|caches| caches.negative_initial_writes.get(key));
+            let cached_value =
+                caches.and_then(|caches| caches.negative_initial_writes.get(&hashed_key));
             if let Some(min_l1_batch_for_initial_write) = cached_value {
                 // We know that this slot was certainly not touched before `min_l1_batch_for_initial_write`.
                 // Try to use this knowledge to decide if the change is certainly initial.
@@ -526,17 +547,17 @@ impl ReadStorage for PostgresStorage<'_> {
             let mut dal = self.connection.storage_web3_dal();
             let value = self
                 .rt_handle
-                .block_on(dal.get_l1_batch_number_for_initial_write(key))
+                .block_on(dal.get_l1_batch_number_for_initial_write(hashed_key))
                 .expect("Failed executing `is_write_initial`");
 
             if let Some(caches) = &self.caches {
                 if let Some(l1_batch_number) = value {
-                    caches.negative_initial_writes.remove(key);
-                    caches.initial_writes.insert(*key, l1_batch_number);
+                    caches.negative_initial_writes.remove(&hashed_key);
+                    caches.initial_writes.insert(hashed_key, l1_batch_number);
                 } else {
                     caches
                         .negative_initial_writes
-                        .insert(*key, self.pending_l1_batch_number);
+                        .insert(hashed_key, self.pending_l1_batch_number);
                     // The pending L1 batch might have been sealed since its number was requested from Postgres
                     // in `Self::new()`, so this is a somewhat conservative estimate.
                 }
@@ -589,13 +610,11 @@ impl ReadStorage for PostgresStorage<'_> {
     }
 
     fn get_enumeration_index(&mut self, key: &StorageKey) -> Option<u64> {
+        let hashed_key = key.hashed_key();
         let mut dal = self.connection.storage_logs_dedup_dal();
-        let value = self
-            .rt_handle
-            .block_on(dal.get_enumeration_index_in_l1_batch(
-                key.hashed_key(),
-                self.l1_batch_number_for_l2_block,
-            ));
+        let value = self.rt_handle.block_on(
+            dal.get_enumeration_index_in_l1_batch(hashed_key, self.l1_batch_number_for_l2_block),
+        );
         value.expect("failed getting enumeration index for key")
     }
 }
diff --git a/core/lib/state/src/postgres/tests.rs b/core/lib/state/src/postgres/tests.rs
index 4ab8ebb12a7b..f88055fa0479 100644
--- a/core/lib/state/src/postgres/tests.rs
+++ b/core/lib/state/src/postgres/tests.rs
@@ -318,11 +318,15 @@ fn test_initial_writes_cache(pool: &ConnectionPool<Core>, rt_handle: Handle) {
     assert!(storage.is_write_initial(&logs[0].key));
     assert!(storage.is_write_initial(&non_existing_key));
     assert_eq!(
-        caches.negative_initial_writes.get(&logs[0].key),
+        caches
+            .negative_initial_writes
+            .get(&logs[0].key.hashed_key()),
         Some(L1BatchNumber(0))
     );
     assert_eq!(
-        caches.negative_initial_writes.get(&non_existing_key),
+        caches
+            .negative_initial_writes
+            .get(&non_existing_key.hashed_key()),
         Some(L1BatchNumber(0))
     );
     assert!(storage.is_write_initial(&logs[0].key));
@@ -353,12 +357,19 @@ fn test_initial_writes_cache(pool: &ConnectionPool<Core>, rt_handle: Handle) {
 
     // Check that the cache entries have been updated
     assert_eq!(
-        caches.initial_writes.get(&logs[0].key),
+        caches.initial_writes.get(&logs[0].key.hashed_key()),
         Some(L1BatchNumber(1))
     );
-    assert_eq!(caches.negative_initial_writes.get(&logs[0].key), None);
     assert_eq!(
-        caches.negative_initial_writes.get(&non_existing_key),
+        caches
+            .negative_initial_writes
+            .get(&logs[0].key.hashed_key()),
+        None
+    );
+    assert_eq!(
+        caches
+            .negative_initial_writes
+            .get(&non_existing_key.hashed_key()),
         Some(L1BatchNumber(2))
     );
     assert!(storage.is_write_initial(&logs[0].key));
@@ -376,11 +387,13 @@ fn test_initial_writes_cache(pool: &ConnectionPool<Core>, rt_handle: Handle) {
 
     // Check that the cache entries are still as expected.
     assert_eq!(
-        caches.initial_writes.get(&logs[0].key),
+        caches.initial_writes.get(&logs[0].key.hashed_key()),
         Some(L1BatchNumber(1))
     );
     assert_eq!(
-        caches.negative_initial_writes.get(&non_existing_key),
+        caches
+            .negative_initial_writes
+            .get(&non_existing_key.hashed_key()),
         Some(L1BatchNumber(2))
     );
 
@@ -415,7 +428,10 @@ struct ValueCacheAssertions<'a> {
 impl ValueCacheAssertions<'_> {
     fn assert_entries(&self, expected_entries: &[(StorageKey, Option<StorageValue>)]) {
         for (key, expected_value) in expected_entries {
-            assert_eq!(self.cache.get(self.l2_block_number, key), *expected_value);
+            assert_eq!(
+                self.cache.get(self.l2_block_number, key.hashed_key()),
+                *expected_value
+            );
         }
     }
 }
diff --git a/core/lib/state/src/rocksdb/mod.rs b/core/lib/state/src/rocksdb/mod.rs
index bda416cb433b..aab33c7dfe83 100644
--- a/core/lib/state/src/rocksdb/mod.rs
+++ b/core/lib/state/src/rocksdb/mod.rs
@@ -400,7 +400,7 @@ impl RocksdbStorage {
 
     async fn apply_storage_logs(
         &mut self,
-        storage_logs: HashMap<StorageKey, H256>,
+        storage_logs: HashMap<H256, H256>,
         storage: &mut Connection<'_, Core>,
     ) -> anyhow::Result<()> {
         let db = self.db.clone();
@@ -409,12 +409,13 @@ impl RocksdbStorage {
                 .await
                 .context("panicked processing storage logs")?;
 
-        let (logs_with_known_indices, logs_with_unknown_indices): (Vec<_>, Vec<_>) = processed_logs
-            .into_iter()
-            .partition_map(|(key, StateValue { value, enum_index })| match enum_index {
-                Some(index) => Either::Left((key.hashed_key(), (value, index))),
-                None => Either::Right((key.hashed_key(), value)),
-            });
+        let (logs_with_known_indices, logs_with_unknown_indices): (Vec<_>, Vec<_>) =
+            processed_logs.into_iter().partition_map(
+                |(hashed_key, StateValue { value, enum_index })| match enum_index {
+                    Some(index) => Either::Left((hashed_key, (value, index))),
+                    None => Either::Right((hashed_key, value)),
+                },
+            );
         let keys_with_unknown_indices: Vec<_> = logs_with_unknown_indices
             .iter()
             .map(|&(key, _)| key)
@@ -440,8 +441,8 @@ impl RocksdbStorage {
         Ok(())
     }
 
-    fn read_value_inner(&self, key: &StorageKey) -> Option<StorageValue> {
-        Self::read_state_value(&self.db, key.hashed_key()).map(|state_value| state_value.value)
+    fn read_value_inner(&self, hashed_key: H256) -> Option<StorageValue> {
+        Self::read_state_value(&self.db, hashed_key).map(|state_value| state_value.value)
     }
 
     fn read_state_value(
@@ -457,15 +458,20 @@ impl RocksdbStorage {
     /// Returns storage logs to apply.
     fn process_transaction_logs(
         db: &RocksDB<StateKeeperColumnFamily>,
-        updates: HashMap<StorageKey, H256>,
-    ) -> Vec<(StorageKey, StateValue)> {
-        let it = updates.into_iter().filter_map(move |(key, new_value)| {
-            if let Some(state_value) = Self::read_state_value(db, key.hashed_key()) {
-                Some((key, StateValue::new(new_value, state_value.enum_index)))
-            } else {
-                (!new_value.is_zero()).then_some((key, StateValue::new(new_value, None)))
-            }
-        });
+        updates: HashMap<H256, H256>,
+    ) -> Vec<(H256, StateValue)> {
+        let it = updates
+            .into_iter()
+            .filter_map(move |(hashed_key, new_value)| {
+                if let Some(state_value) = Self::read_state_value(db, hashed_key) {
+                    Some((
+                        hashed_key,
+                        StateValue::new(new_value, state_value.enum_index),
+                    ))
+                } else {
+                    (!new_value.is_zero()).then_some((hashed_key, StateValue::new(new_value, None)))
+                }
+            });
         it.collect()
     }
 
@@ -617,11 +623,12 @@ impl RocksdbStorage {
 
 impl ReadStorage for RocksdbStorage {
     fn read_value(&mut self, key: &StorageKey) -> StorageValue {
-        self.read_value_inner(key).unwrap_or_else(H256::zero)
+        self.read_value_inner(key.hashed_key())
+            .unwrap_or_else(H256::zero)
     }
 
     fn is_write_initial(&mut self, key: &StorageKey) -> bool {
-        self.read_value_inner(key).is_none()
+        self.read_value_inner(key.hashed_key()).is_none()
     }
 
     fn load_factory_dep(&mut self, hash: H256) -> Option<Vec<u8>> {
diff --git a/core/lib/state/src/rocksdb/tests.rs b/core/lib/state/src/rocksdb/tests.rs
index a006fcba4750..e73590015079 100644
--- a/core/lib/state/src/rocksdb/tests.rs
+++ b/core/lib/state/src/rocksdb/tests.rs
@@ -40,6 +40,12 @@ impl Default for RocksdbStorageEventListener {
     }
 }
 
+fn hash_storage_log_keys(logs: &HashMap<StorageKey, H256>) -> HashMap<H256, H256> {
+    logs.iter()
+        .map(|(key, value)| (key.hashed_key(), *value))
+        .collect()
+}
+
 #[tokio::test]
 async fn rocksdb_storage_basics() {
     let dir = TempDir::new().expect("cannot create temporary dir for state keeper");
@@ -50,10 +56,11 @@ async fn rocksdb_storage_basics() {
         .into_iter()
         .map(|log| (log.key, log.value))
         .collect();
-    let changed_keys = RocksdbStorage::process_transaction_logs(&storage.db, storage_logs.clone());
+    let changed_keys =
+        RocksdbStorage::process_transaction_logs(&storage.db, hash_storage_log_keys(&storage_logs));
     storage.pending_patch.state = changed_keys
         .into_iter()
-        .map(|(key, state_value)| (key.hashed_key(), (state_value.value, 1))) // enum index doesn't matter in the test
+        .map(|(key, state_value)| (key, (state_value.value, 1))) // enum index doesn't matter in the test
         .collect();
     storage.save(Some(L1BatchNumber(0))).await.unwrap();
     {
@@ -64,13 +71,14 @@ async fn rocksdb_storage_basics() {
     }
 
     // Overwrite some of the logs.
-    for log in storage_logs.values_mut().step_by(2) {
-        *log = StorageValue::zero();
+    for log_value in storage_logs.values_mut().step_by(2) {
+        *log_value = StorageValue::zero();
     }
-    let changed_keys = RocksdbStorage::process_transaction_logs(&storage.db, storage_logs.clone());
+    let changed_keys =
+        RocksdbStorage::process_transaction_logs(&storage.db, hash_storage_log_keys(&storage_logs));
     storage.pending_patch.state = changed_keys
         .into_iter()
-        .map(|(key, state_value)| (key.hashed_key(), (state_value.value, 1))) // enum index doesn't matter in the test
+        .map(|(key, state_value)| (key, (state_value.value, 1))) // enum index doesn't matter in the test
         .collect();
     storage.save(Some(L1BatchNumber(1))).await.unwrap();
 
diff --git a/core/lib/state/src/shadow_storage.rs b/core/lib/state/src/shadow_storage.rs
index 0a2bd0fa43ee..5e32f9b25e71 100644
--- a/core/lib/state/src/shadow_storage.rs
+++ b/core/lib/state/src/shadow_storage.rs
@@ -3,6 +3,7 @@ use zksync_types::{L1BatchNumber, StorageKey, StorageValue, H256};
 
 use crate::ReadStorage;
 
+#[allow(clippy::struct_field_names)]
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "shadow_storage")]
 struct ShadowStorageMetrics {
@@ -49,9 +50,9 @@ impl<'a> ShadowStorage<'a> {
 }
 
 impl ReadStorage for ShadowStorage<'_> {
-    fn read_value(&mut self, &key: &StorageKey) -> StorageValue {
-        let source_value = self.source_storage.read_value(&key);
-        let expected_value = self.to_check_storage.read_value(&key);
+    fn read_value(&mut self, key: &StorageKey) -> StorageValue {
+        let source_value = self.source_storage.as_mut().read_value(key);
+        let expected_value = self.to_check_storage.as_mut().read_value(key);
         if source_value != expected_value {
             self.metrics.read_value_mismatch.inc();
             tracing::error!(
@@ -64,8 +65,8 @@ impl ReadStorage for ShadowStorage<'_> {
     }
 
     fn is_write_initial(&mut self, key: &StorageKey) -> bool {
-        let source_value = self.source_storage.is_write_initial(key);
-        let expected_value = self.to_check_storage.is_write_initial(key);
+        let source_value = self.source_storage.as_mut().is_write_initial(key);
+        let expected_value = self.to_check_storage.as_mut().is_write_initial(key);
         if source_value != expected_value {
             self.metrics.is_write_initial_mismatch.inc();
             tracing::error!(
@@ -92,18 +93,16 @@ impl ReadStorage for ShadowStorage<'_> {
     }
 
     fn get_enumeration_index(&mut self, key: &StorageKey) -> Option<u64> {
-        let source_value = self.source_storage.get_enumeration_index(key);
-        let expected_value = self.to_check_storage.get_enumeration_index(key);
+        let source_value = self.source_storage.as_mut().get_enumeration_index(key);
+        let expected_value = self.to_check_storage.as_mut().get_enumeration_index(key);
         if source_value != expected_value {
             tracing::error!(
-                "get_enumeration_index({:?}) -- l1_batch_number={:?} -- expected source={:?} to be equal to \
-                to_check={:?}", key, self.l1_batch_number, source_value, expected_value
+                "get_enumeration_index({key:?}) -- l1_batch_number={:?} -- \
+                 expected source={source_value:?} to be equal to to_check={expected_value:?}",
+                self.l1_batch_number
             );
-
             self.metrics.get_enumeration_index_mismatch.inc();
         }
         source_value
     }
 }
-
-// TODO: Add unit tests when we swap metrics crate; blocked by: https://linear.app/matterlabs/issue/QIT-3/rework-metrics-approach
diff --git a/core/lib/state/src/storage_factory.rs b/core/lib/state/src/storage_factory.rs
index 625867b82c45..307fa465a7c9 100644
--- a/core/lib/state/src/storage_factory.rs
+++ b/core/lib/state/src/storage_factory.rs
@@ -30,7 +30,7 @@ pub trait ReadStorageFactory: Debug + Send + Sync + 'static {
 #[derive(Debug, Clone)]
 pub struct BatchDiff {
     /// Storage slots touched by this batch along with new values there.
-    pub state_diff: HashMap<StorageKey, H256>,
+    pub state_diff: HashMap<H256, H256>,
     /// Initial write indices introduced by this batch.
     pub enum_index_diff: HashMap<H256, u64>,
     /// Factory dependencies introduced by this batch.
@@ -140,11 +140,12 @@ impl<'a> PgOrRocksdbStorage<'a> {
 
 impl ReadStorage for RocksdbWithMemory {
     fn read_value(&mut self, key: &StorageKey) -> StorageValue {
+        let hashed_key = key.hashed_key();
         match self
             .batch_diffs
             .iter()
             .rev()
-            .find_map(|b| b.state_diff.get(key))
+            .find_map(|b| b.state_diff.get(&hashed_key))
         {
             None => self.rocksdb.read_value(key),
             Some(value) => *value,
@@ -186,7 +187,7 @@ impl ReadStorage for RocksdbWithMemory {
 }
 
 impl ReadStorage for PgOrRocksdbStorage<'_> {
-    fn read_value(&mut self, key: &StorageKey) -> zksync_types::StorageValue {
+    fn read_value(&mut self, key: &StorageKey) -> StorageValue {
         match self {
             Self::Postgres(postgres) => postgres.read_value(key),
             Self::Rocksdb(rocksdb) => rocksdb.read_value(key),
diff --git a/core/lib/state/src/storage_view.rs b/core/lib/state/src/storage_view.rs
index 7756f6007eec..03962fdea13c 100644
--- a/core/lib/state/src/storage_view.rs
+++ b/core/lib/state/src/storage_view.rs
@@ -52,13 +52,6 @@ pub struct StorageView<S> {
     metrics: StorageViewMetrics,
 }
 
-impl<S> StorageView<S> {
-    /// Returns the modified storage keys
-    pub fn modified_storage_keys(&self) -> &HashMap<StorageKey, StorageValue> {
-        &self.modified_storage_keys
-    }
-}
-
 impl<S> ReadStorage for Box<S>
 where
     S: ReadStorage + ?Sized,
diff --git a/core/lib/state/src/test_utils.rs b/core/lib/state/src/test_utils.rs
index 8a0b56588f30..1d1731bf0015 100644
--- a/core/lib/state/src/test_utils.rs
+++ b/core/lib/state/src/test_utils.rs
@@ -94,7 +94,7 @@ pub(crate) async fn create_l2_block(
         .await
         .unwrap();
     conn.storage_logs_dal()
-        .insert_storage_logs(l2_block_number, &[(H256::zero(), block_logs)])
+        .insert_storage_logs(l2_block_number, &block_logs)
         .await
         .unwrap();
 }
@@ -118,6 +118,7 @@ pub(crate) async fn create_l1_batch(
 
     let mut written_keys: Vec<_> = logs_for_initial_writes.iter().map(|log| log.key).collect();
     written_keys.sort_unstable();
+    let written_keys: Vec<_> = written_keys.iter().map(StorageKey::hashed_key).collect();
     conn.storage_logs_dedup_dal()
         .insert_initial_writes(l1_batch_number, &written_keys)
         .await
@@ -149,14 +150,12 @@ pub(crate) async fn prepare_postgres_for_snapshot_recovery(
 
     let snapshot_storage_logs = gen_storage_logs(100..200);
     conn.storage_logs_dal()
-        .insert_storage_logs(
-            snapshot_recovery.l2_block_number,
-            &[(H256::zero(), snapshot_storage_logs.clone())],
-        )
+        .insert_storage_logs(snapshot_recovery.l2_block_number, &snapshot_storage_logs)
         .await
         .unwrap();
     let mut written_keys: Vec<_> = snapshot_storage_logs.iter().map(|log| log.key).collect();
     written_keys.sort_unstable();
+    let written_keys: Vec<_> = written_keys.iter().map(StorageKey::hashed_key).collect();
     conn.storage_logs_dedup_dal()
         .insert_initial_writes(snapshot_recovery.l1_batch_number, &written_keys)
         .await
diff --git a/core/lib/tee_verifier/Cargo.toml b/core/lib/tee_verifier/Cargo.toml
new file mode 100644
index 000000000000..ed222565a1a3
--- /dev/null
+++ b/core/lib/tee_verifier/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "zksync_tee_verifier"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow.workspace = true
+zksync_multivm.workspace = true
+serde.workspace = true
+tracing.workspace = true
+zksync_vm_utils.workspace = true
+zksync_config.workspace = true
+zksync_crypto.workspace = true
+zksync_dal.workspace = true
+zksync_db_connection.workspace = true
+zksync_merkle_tree.workspace = true
+zksync_object_store.workspace = true
+zksync_prover_interface.workspace = true
+zksync_queued_job_processor.workspace = true
+zksync_state.workspace = true
+zksync_types.workspace = true
+zksync_utils.workspace = true
+
+[dev-dependencies]
+zksync_contracts.workspace = true
+zksync_basic_types.workspace = true
diff --git a/core/lib/tee_verifier/src/lib.rs b/core/lib/tee_verifier/src/lib.rs
new file mode 100644
index 000000000000..3d47834aa25a
--- /dev/null
+++ b/core/lib/tee_verifier/src/lib.rs
@@ -0,0 +1,297 @@
+//! Tee verifier
+//!
+//! Verifies that a L1Batch has the expected root hash after
+//! executing the VM and verifying all the accessed memory slots by their
+//! merkle path.
+
+use std::{cell::RefCell, rc::Rc};
+
+use anyhow::Context;
+use zksync_crypto::hasher::blake2::Blake2Hasher;
+use zksync_merkle_tree::{
+    BlockOutputWithProofs, TreeInstruction, TreeLogEntry, TreeLogEntryWithProof, ValueHash,
+};
+use zksync_multivm::{
+    interface::{FinishedL1Batch, L2BlockEnv, VmInterface},
+    vm_latest::HistoryEnabled,
+    VmInstance,
+};
+use zksync_prover_interface::inputs::{
+    PrepareBasicCircuitsJob, StorageLogMetadata, V1TeeVerifierInput,
+};
+use zksync_state::{InMemoryStorage, StorageView, WriteStorage};
+use zksync_types::{block::L2BlockExecutionData, L1BatchNumber, StorageLog, H256};
+use zksync_utils::bytecode::hash_bytecode;
+use zksync_vm_utils::execute_tx;
+
+/// A structure to hold the result of verification.
+pub struct VerificationResult {
+    /// The root hash of the batch that was verified.
+    pub value_hash: ValueHash,
+    /// The batch number that was verified.
+    pub batch_number: L1BatchNumber,
+}
+
+/// A trait for the computations that can be verified in TEE.
+pub trait Verify {
+    fn verify(self) -> anyhow::Result<VerificationResult>;
+}
+
+impl Verify for V1TeeVerifierInput {
+    /// Verify that the L1Batch produces the expected root hash
+    /// by executing the VM and verifying the merkle paths of all
+    /// touch storage slots.
+    ///
+    /// # Errors
+    ///
+    /// Returns a verbose error of the failure, because any error is
+    /// not actionable.
+    fn verify(self) -> anyhow::Result<VerificationResult> {
+        let old_root_hash = self.l1_batch_env.previous_batch_hash.unwrap();
+        let l2_chain_id = self.system_env.chain_id;
+        let enumeration_index = self.prepare_basic_circuits_job.next_enumeration_index();
+
+        let mut raw_storage = InMemoryStorage::with_custom_system_contracts_and_chain_id(
+            l2_chain_id,
+            hash_bytecode,
+            Vec::with_capacity(0),
+        );
+
+        for (hash, bytes) in self.used_contracts.into_iter() {
+            tracing::trace!("raw_storage.store_factory_dep({hash}, bytes)");
+            raw_storage.store_factory_dep(hash, bytes)
+        }
+
+        let block_output_with_proofs =
+            get_bowp_and_set_initial_values(self.prepare_basic_circuits_job, &mut raw_storage);
+
+        let storage_view = Rc::new(RefCell::new(StorageView::new(&raw_storage)));
+
+        let batch_number = self.l1_batch_env.number;
+        let vm = VmInstance::new(self.l1_batch_env, self.system_env, storage_view);
+
+        let vm_out = execute_vm(self.l2_blocks_execution_data, vm)?;
+
+        let instructions: Vec<TreeInstruction> =
+            generate_tree_instructions(enumeration_index, &block_output_with_proofs, vm_out)?;
+
+        block_output_with_proofs
+            .verify_proofs(&Blake2Hasher, old_root_hash, &instructions)
+            .context("Failed to verify_proofs {l1_batch_number} correctly!")?;
+
+        Ok(VerificationResult {
+            value_hash: block_output_with_proofs.root_hash().unwrap(),
+            batch_number,
+        })
+    }
+}
+
+/// Sets the initial storage values and returns `BlockOutputWithProofs`
+fn get_bowp_and_set_initial_values(
+    prepare_basic_circuits_job: PrepareBasicCircuitsJob,
+    raw_storage: &mut InMemoryStorage,
+) -> BlockOutputWithProofs {
+    let logs = prepare_basic_circuits_job
+        .into_merkle_paths()
+        .map(
+            |StorageLogMetadata {
+                 root_hash,
+                 merkle_paths,
+                 is_write,
+                 first_write,
+                 leaf_enumeration_index,
+                 value_read,
+                 leaf_hashed_key: leaf_storage_key,
+                 ..
+             }| {
+                let root_hash = root_hash.into();
+                let merkle_path = merkle_paths.into_iter().map(|x| x.into()).collect();
+                let base: TreeLogEntry = match (is_write, first_write, leaf_enumeration_index) {
+                    (false, _, 0) => TreeLogEntry::ReadMissingKey,
+                    (false, _, _) => {
+                        // This is a special U256 here, which needs `to_little_endian`
+                        let mut hashed_key = [0_u8; 32];
+                        leaf_storage_key.to_little_endian(&mut hashed_key);
+                        raw_storage.set_value_hashed_enum(
+                            hashed_key.into(),
+                            leaf_enumeration_index,
+                            value_read.into(),
+                        );
+                        TreeLogEntry::Read {
+                            leaf_index: leaf_enumeration_index,
+                            value: value_read.into(),
+                        }
+                    }
+                    (true, true, _) => TreeLogEntry::Inserted,
+                    (true, false, _) => {
+                        // This is a special U256 here, which needs `to_little_endian`
+                        let mut hashed_key = [0_u8; 32];
+                        leaf_storage_key.to_little_endian(&mut hashed_key);
+                        raw_storage.set_value_hashed_enum(
+                            hashed_key.into(),
+                            leaf_enumeration_index,
+                            value_read.into(),
+                        );
+                        TreeLogEntry::Updated {
+                            leaf_index: leaf_enumeration_index,
+                            previous_value: value_read.into(),
+                        }
+                    }
+                };
+                TreeLogEntryWithProof {
+                    base,
+                    merkle_path,
+                    root_hash,
+                }
+            },
+        )
+        .collect();
+
+    BlockOutputWithProofs {
+        logs,
+        leaf_count: 0,
+    }
+}
+
+/// Executes the VM and returns `FinishedL1Batch` on success.
+fn execute_vm<S: WriteStorage>(
+    l2_blocks_execution_data: Vec<L2BlockExecutionData>,
+    mut vm: VmInstance<S, HistoryEnabled>,
+) -> anyhow::Result<FinishedL1Batch> {
+    let next_l2_blocks_data = l2_blocks_execution_data.iter().skip(1);
+
+    let l2_blocks_data = l2_blocks_execution_data.iter().zip(next_l2_blocks_data);
+
+    for (l2_block_data, next_l2_block_data) in l2_blocks_data {
+        tracing::trace!(
+            "Started execution of l2_block: {:?}, executing {:?} transactions",
+            l2_block_data.number,
+            l2_block_data.txs.len(),
+        );
+        for tx in &l2_block_data.txs {
+            tracing::trace!("Started execution of tx: {tx:?}");
+            execute_tx(tx, &mut vm)
+                .context("failed to execute transaction in TeeVerifierInputProducer")?;
+            tracing::trace!("Finished execution of tx: {tx:?}");
+        }
+        vm.start_new_l2_block(L2BlockEnv::from_l2_block_data(next_l2_block_data));
+
+        tracing::trace!("Finished execution of l2_block: {:?}", l2_block_data.number);
+    }
+
+    Ok(vm.finish_batch())
+}
+
+/// Map `LogQuery` and `TreeLogEntry` to a `TreeInstruction`
+fn map_log_tree(
+    storage_log: &StorageLog,
+    tree_log_entry: &TreeLogEntry,
+    idx: &mut u64,
+) -> anyhow::Result<TreeInstruction> {
+    let key = storage_log.key.hashed_key_u256();
+    Ok(match (storage_log.is_write(), *tree_log_entry) {
+        (true, TreeLogEntry::Updated { leaf_index, .. }) => {
+            TreeInstruction::write(key, leaf_index, H256(storage_log.value.into()))
+        }
+        (true, TreeLogEntry::Inserted) => {
+            let leaf_index = *idx;
+            *idx += 1;
+            TreeInstruction::write(key, leaf_index, H256(storage_log.value.into()))
+        }
+        (false, TreeLogEntry::Read { value, .. }) => {
+            if storage_log.value != value {
+                tracing::error!(
+                    "Failed to map LogQuery to TreeInstruction: {:#?} != {:#?}",
+                    storage_log.value,
+                    value
+                );
+                anyhow::bail!(
+                    "Failed to map LogQuery to TreeInstruction: {:#?} != {:#?}",
+                    storage_log.value,
+                    value
+                );
+            }
+            TreeInstruction::Read(key)
+        }
+        (false, TreeLogEntry::ReadMissingKey { .. }) => TreeInstruction::Read(key),
+        _ => {
+            tracing::error!("Failed to map LogQuery to TreeInstruction");
+            anyhow::bail!("Failed to map LogQuery to TreeInstruction");
+        }
+    })
+}
+
+/// Generates the `TreeInstruction`s from the VM executions.
+fn generate_tree_instructions(
+    mut idx: u64,
+    bowp: &BlockOutputWithProofs,
+    vm_out: FinishedL1Batch,
+) -> anyhow::Result<Vec<TreeInstruction>> {
+    vm_out
+        .final_execution_state
+        .deduplicated_storage_logs
+        .into_iter()
+        .zip(bowp.logs.iter())
+        .map(|(log_query, tree_log_entry)| map_log_tree(&log_query, &tree_log_entry.base, &mut idx))
+        .collect::<Result<Vec<_>, _>>()
+}
+
+#[cfg(test)]
+mod tests {
+    use zksync_basic_types::U256;
+    use zksync_contracts::{BaseSystemContracts, SystemContractCode};
+    use zksync_multivm::interface::{L1BatchEnv, SystemEnv, TxExecutionMode};
+    use zksync_object_store::StoredObject;
+    use zksync_prover_interface::inputs::TeeVerifierInput;
+
+    use super::*;
+
+    #[test]
+    fn test_v1_serialization() {
+        let tvi = V1TeeVerifierInput::new(
+            PrepareBasicCircuitsJob::new(0),
+            vec![],
+            L1BatchEnv {
+                previous_batch_hash: Some(H256([1; 32])),
+                number: Default::default(),
+                timestamp: 0,
+                fee_input: Default::default(),
+                fee_account: Default::default(),
+                enforced_base_fee: None,
+                first_l2_block: L2BlockEnv {
+                    number: 0,
+                    timestamp: 0,
+                    prev_block_hash: H256([1; 32]),
+                    max_virtual_blocks_to_create: 0,
+                },
+            },
+            SystemEnv {
+                zk_porter_available: false,
+                version: Default::default(),
+                base_system_smart_contracts: BaseSystemContracts {
+                    bootloader: SystemContractCode {
+                        code: vec![U256([1; 4])],
+                        hash: H256([1; 32]),
+                    },
+                    default_aa: SystemContractCode {
+                        code: vec![U256([1; 4])],
+                        hash: H256([1; 32]),
+                    },
+                },
+                bootloader_gas_limit: 0,
+                execution_mode: TxExecutionMode::VerifyExecute,
+                default_validation_computational_gas_limit: 0,
+                chain_id: Default::default(),
+            },
+            vec![(H256([1; 32]), vec![0, 1, 2, 3, 4])],
+        );
+        let tvi = TeeVerifierInput::new(tvi);
+        let serialized = <TeeVerifierInput as StoredObject>::serialize(&tvi)
+            .expect("Failed to serialize TeeVerifierInput.");
+        let deserialized: TeeVerifierInput =
+            <TeeVerifierInput as StoredObject>::deserialize(serialized)
+                .expect("Failed to deserialize TeeVerifierInput.");
+
+        assert_eq!(tvi, deserialized);
+    }
+}
diff --git a/core/lib/types/Cargo.toml b/core/lib/types/Cargo.toml
index a562cccacbc1..673a0f35a26a 100644
--- a/core/lib/types/Cargo.toml
+++ b/core/lib/types/Cargo.toml
@@ -27,12 +27,14 @@ once_cell.workspace = true
 rlp.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+bigdecimal.workspace = true
 strum = { workspace = true, features = ["derive"] }
 thiserror.workspace = true
 num_enum.workspace = true
 hex.workspace = true
 prost.workspace = true
 itertools.workspace = true
+tracing.workspace = true
 
 # Crypto stuff
 secp256k1.workspace = true
diff --git a/core/lib/types/src/abi.rs b/core/lib/types/src/abi.rs
new file mode 100644
index 000000000000..84f8aba64869
--- /dev/null
+++ b/core/lib/types/src/abi.rs
@@ -0,0 +1,367 @@
+use anyhow::Context as _;
+use zksync_utils::{bytecode::hash_bytecode, h256_to_u256};
+
+use crate::{
+    ethabi,
+    ethabi::{ParamType, Token},
+    transaction_request::TransactionRequest,
+    web3, Address, H256, U256,
+};
+
+/// `L2CanonicalTransaction` from `l1-contracts/contracts/zksync/interfaces/IMailbox.sol`.
+/// Represents L1->L2 transactions: priority transactions and protocol upgrade transactions.
+#[derive(Default, Debug)]
+pub struct L2CanonicalTransaction {
+    pub tx_type: U256,
+    pub from: U256,
+    pub to: U256,
+    pub gas_limit: U256,
+    pub gas_per_pubdata_byte_limit: U256,
+    pub max_fee_per_gas: U256,
+    pub max_priority_fee_per_gas: U256,
+    pub paymaster: U256,
+    pub nonce: U256,
+    pub value: U256,
+    pub reserved: [U256; 4],
+    pub data: Vec<u8>,
+    pub signature: Vec<u8>,
+    pub factory_deps: Vec<U256>,
+    pub paymaster_input: Vec<u8>,
+    pub reserved_dynamic: Vec<u8>,
+}
+
+impl L2CanonicalTransaction {
+    /// RLP schema of the L1->L2 transaction.
+    pub fn schema() -> ParamType {
+        ParamType::Tuple(vec![
+            ParamType::Uint(256),                                  // `txType`
+            ParamType::Uint(256),                                  // sender
+            ParamType::Uint(256),                                  // to
+            ParamType::Uint(256),                                  // gasLimit
+            ParamType::Uint(256),                                  // `gasPerPubdataLimit`
+            ParamType::Uint(256),                                  // maxFeePerGas
+            ParamType::Uint(256),                                  // maxPriorityFeePerGas
+            ParamType::Uint(256),                                  // paymaster
+            ParamType::Uint(256),                                  // nonce (serial ID)
+            ParamType::Uint(256),                                  // value
+            ParamType::FixedArray(ParamType::Uint(256).into(), 4), // reserved
+            ParamType::Bytes,                                      // calldata
+            ParamType::Bytes,                                      // signature
+            ParamType::Array(Box::new(ParamType::Uint(256))),      // factory deps
+            ParamType::Bytes,                                      // paymaster input
+            ParamType::Bytes,                                      // `reservedDynamic`
+        ])
+    }
+
+    /// Decodes L1->L2 transaction from a RLP token.
+    /// Returns an error if token doesn't match the `schema()`.
+    pub fn decode(token: Token) -> anyhow::Result<Self> {
+        let tokens = token.into_tuple().context("not a tuple")?;
+        anyhow::ensure!(tokens.len() == 16);
+        let mut t = tokens.into_iter();
+        let mut next = || t.next().unwrap();
+        Ok(Self {
+            tx_type: next().into_uint().context("tx_type")?,
+            from: next().into_uint().context("from")?,
+            to: next().into_uint().context("to")?,
+            gas_limit: next().into_uint().context("gas_limit")?,
+            gas_per_pubdata_byte_limit: next().into_uint().context("gas_per_pubdata_byte_limit")?,
+            max_fee_per_gas: next().into_uint().context("max_fee_per_gas")?,
+            max_priority_fee_per_gas: next().into_uint().context("max_priority_fee_per_gas")?,
+            paymaster: next().into_uint().context("paymaster")?,
+            nonce: next().into_uint().context("nonce")?,
+            value: next().into_uint().context("value")?,
+            reserved: next()
+                .into_fixed_array()
+                .context("reserved")?
+                .into_iter()
+                .enumerate()
+                .map(|(i, t)| t.into_uint().context(i))
+                .collect::<Result<Vec<_>, _>>()
+                .context("reserved")?
+                .try_into()
+                .ok()
+                .context("reserved")?,
+            data: next().into_bytes().context("data")?,
+            signature: next().into_bytes().context("signature")?,
+            factory_deps: next()
+                .into_array()
+                .context("factory_deps")?
+                .into_iter()
+                .enumerate()
+                .map(|(i, t)| t.into_uint().context(i))
+                .collect::<Result<_, _>>()
+                .context("factory_deps")?,
+            paymaster_input: next().into_bytes().context("paymaster_input")?,
+            reserved_dynamic: next().into_bytes().context("reserved_dynamic")?,
+        })
+    }
+
+    /// Encodes L1->L2 transaction to a RLP token.
+    pub fn encode(&self) -> Token {
+        Token::Tuple(vec![
+            Token::Uint(self.tx_type),
+            Token::Uint(self.from),
+            Token::Uint(self.to),
+            Token::Uint(self.gas_limit),
+            Token::Uint(self.gas_per_pubdata_byte_limit),
+            Token::Uint(self.max_fee_per_gas),
+            Token::Uint(self.max_priority_fee_per_gas),
+            Token::Uint(self.paymaster),
+            Token::Uint(self.nonce),
+            Token::Uint(self.value),
+            Token::FixedArray(self.reserved.iter().map(|x| Token::Uint(*x)).collect()),
+            Token::Bytes(self.data.clone()),
+            Token::Bytes(self.signature.clone()),
+            Token::Array(self.factory_deps.iter().map(|x| Token::Uint(*x)).collect()),
+            Token::Bytes(self.paymaster_input.clone()),
+            Token::Bytes(self.reserved_dynamic.clone()),
+        ])
+    }
+
+    /// Canonical hash of the L1->L2 transaction.
+    pub fn hash(&self) -> H256 {
+        H256::from_slice(&web3::keccak256(&ethabi::encode(&[self.encode()])))
+    }
+}
+
+/// `NewPriorityRequest` from `l1-contracts/contracts/zksync/interfaces/IMailbox.sol`.
+#[derive(Debug)]
+pub struct NewPriorityRequest {
+    pub tx_id: U256,
+    pub tx_hash: [u8; 32],
+    pub expiration_timestamp: u64,
+    pub transaction: Box<L2CanonicalTransaction>,
+    pub factory_deps: Vec<Vec<u8>>,
+}
+
+impl NewPriorityRequest {
+    /// Encodes `NewPriorityRequest` to a sequence of RLP tokens.
+    pub fn encode(&self) -> Vec<Token> {
+        vec![
+            Token::Uint(self.tx_id),
+            Token::FixedBytes(self.tx_hash.into()),
+            Token::Uint(self.expiration_timestamp.into()),
+            self.transaction.encode(),
+            Token::Array(
+                self.factory_deps
+                    .iter()
+                    .map(|b| Token::Bytes(b.clone()))
+                    .collect(),
+            ),
+        ]
+    }
+
+    /// Decodes `NewPriorityRequest` from RLP encoding.
+    /// Returns an error if token doesn't match the `schema()`.
+    pub fn decode(data: &[u8]) -> Result<Self, ethabi::Error> {
+        let tokens = ethabi::decode(
+            &[
+                ParamType::Uint(256),                      // tx ID
+                ParamType::FixedBytes(32),                 // tx hash
+                ParamType::Uint(64),                       // expiration block
+                L2CanonicalTransaction::schema(),          // transaction data
+                ParamType::Array(ParamType::Bytes.into()), // factory deps
+            ],
+            data,
+        )?;
+        let mut t = tokens.into_iter();
+        // All the unwraps are save because `ethabi::decode()` has validated
+        // the input.
+        let mut next = || t.next().unwrap();
+        Ok(Self {
+            tx_id: next().into_uint().unwrap(),
+            tx_hash: next().into_fixed_bytes().unwrap().try_into().unwrap(),
+            expiration_timestamp: next().into_uint().unwrap().try_into().unwrap(),
+            transaction: L2CanonicalTransaction::decode(next()).unwrap().into(),
+            factory_deps: next()
+                .into_array()
+                .unwrap()
+                .into_iter()
+                .map(|t| t.into_bytes().unwrap())
+                .collect(),
+        })
+    }
+}
+
+/// `VerifierParams` from `l1-contracts/contracts/state-transition/chain-interfaces/IVerifier.sol`.
+#[derive(Default, PartialEq)]
+pub struct VerifierParams {
+    pub recursion_node_level_vk_hash: [u8; 32],
+    pub recursion_leaf_level_vk_hash: [u8; 32],
+    pub recursion_circuits_set_vks_hash: [u8; 32],
+}
+
+/// `ProposedUpgrade` from, `l1-contracts/contracts/upgrades/BazeZkSyncUpgrade.sol`.
+pub struct ProposedUpgrade {
+    pub l2_protocol_upgrade_tx: Box<L2CanonicalTransaction>,
+    pub factory_deps: Vec<Vec<u8>>,
+    pub bootloader_hash: [u8; 32],
+    pub default_account_hash: [u8; 32],
+    pub verifier: Address,
+    pub verifier_params: VerifierParams,
+    pub l1_contracts_upgrade_calldata: Vec<u8>,
+    pub post_upgrade_calldata: Vec<u8>,
+    pub upgrade_timestamp: U256,
+    pub new_protocol_version: U256,
+}
+
+impl VerifierParams {
+    /// RLP schema of `VerifierParams`.
+    pub fn schema() -> ParamType {
+        ParamType::Tuple(vec![
+            ParamType::FixedBytes(32),
+            ParamType::FixedBytes(32),
+            ParamType::FixedBytes(32),
+        ])
+    }
+
+    /// Encodes `VerifierParams` to a RLP token.
+    pub fn encode(&self) -> Token {
+        Token::Tuple(vec![
+            Token::FixedBytes(self.recursion_node_level_vk_hash.into()),
+            Token::FixedBytes(self.recursion_leaf_level_vk_hash.into()),
+            Token::FixedBytes(self.recursion_circuits_set_vks_hash.into()),
+        ])
+    }
+
+    /// Decodes `VerifierParams` from a RLP token.
+    /// Returns an error if token doesn't match the `schema()`.
+    pub fn decode(token: Token) -> anyhow::Result<Self> {
+        let tokens = token.into_tuple().context("not a tuple")?;
+        anyhow::ensure!(tokens.len() == 3);
+        let mut t = tokens.into_iter();
+        let mut next = || t.next().unwrap();
+        Ok(Self {
+            recursion_node_level_vk_hash: next()
+                .into_fixed_bytes()
+                .and_then(|x| x.try_into().ok())
+                .context("recursion_node_level_vk_hash")?,
+            recursion_leaf_level_vk_hash: next()
+                .into_fixed_bytes()
+                .and_then(|x| x.try_into().ok())
+                .context("recursion_leaf_level_vk_hash")?,
+            recursion_circuits_set_vks_hash: next()
+                .into_fixed_bytes()
+                .and_then(|x| x.try_into().ok())
+                .context("recursion_circuits_set_vks_hash")?,
+        })
+    }
+}
+
+impl ProposedUpgrade {
+    /// RLP schema of the `ProposedUpgrade`.
+    pub fn schema() -> ParamType {
+        ParamType::Tuple(vec![
+            L2CanonicalTransaction::schema(),          // transaction data
+            ParamType::Array(ParamType::Bytes.into()), // factory deps
+            ParamType::FixedBytes(32),                 // bootloader code hash
+            ParamType::FixedBytes(32),                 // default account code hash
+            ParamType::Address,                        // verifier address
+            VerifierParams::schema(),                  // verifier params
+            ParamType::Bytes,                          // l1 custom data
+            ParamType::Bytes,                          // l1 post-upgrade custom data
+            ParamType::Uint(256),                      // timestamp
+            ParamType::Uint(256),                      // version id
+        ])
+    }
+
+    /// Encodes `ProposedUpgrade` to a RLP token.
+    pub fn encode(&self) -> Token {
+        Token::Tuple(vec![
+            self.l2_protocol_upgrade_tx.encode(),
+            Token::Array(
+                self.factory_deps
+                    .iter()
+                    .map(|b| Token::Bytes(b.clone()))
+                    .collect(),
+            ),
+            Token::FixedBytes(self.bootloader_hash.into()),
+            Token::FixedBytes(self.default_account_hash.into()),
+            Token::Address(self.verifier),
+            self.verifier_params.encode(),
+            Token::Bytes(self.l1_contracts_upgrade_calldata.clone()),
+            Token::Bytes(self.post_upgrade_calldata.clone()),
+            Token::Uint(self.upgrade_timestamp),
+            Token::Uint(self.new_protocol_version),
+        ])
+    }
+
+    /// Decodes `ProposedUpgrade` from a RLP token.
+    /// Returns an error if token doesn't match the `schema()`.
+    pub fn decode(token: Token) -> anyhow::Result<Self> {
+        let tokens = token.into_tuple().context("not a tuple")?;
+        anyhow::ensure!(tokens.len() == 10);
+        let mut t = tokens.into_iter();
+        let mut next = || t.next().unwrap();
+        Ok(Self {
+            l2_protocol_upgrade_tx: L2CanonicalTransaction::decode(next())
+                .context("l2_protocol_upgrade_tx")?
+                .into(),
+            factory_deps: next()
+                .into_array()
+                .context("factory_deps")?
+                .into_iter()
+                .enumerate()
+                .map(|(i, b)| b.into_bytes().context(i))
+                .collect::<Result<_, _>>()
+                .context("factory_deps")?,
+            bootloader_hash: next()
+                .into_fixed_bytes()
+                .and_then(|b| b.try_into().ok())
+                .context("bootloader_hash")?,
+            default_account_hash: next()
+                .into_fixed_bytes()
+                .and_then(|b| b.try_into().ok())
+                .context("default_account_hash")?,
+            verifier: next().into_address().context("verifier")?,
+            verifier_params: VerifierParams::decode(next()).context("verifier_params")?,
+            l1_contracts_upgrade_calldata: next()
+                .into_bytes()
+                .context("l1_contracts_upgrade_calldata")?,
+            post_upgrade_calldata: next().into_bytes().context("post_upgrade_calldata")?,
+            upgrade_timestamp: next().into_uint().context("upgrade_timestamp")?,
+            new_protocol_version: next().into_uint().context("new_protocol_version")?,
+        })
+    }
+}
+
+/// Minimal representation of arbitrary zksync transaction.
+/// Suitable for verifying hashes/re-encoding.
+#[derive(Debug)]
+pub enum Transaction {
+    /// L1->L2 transaction (both protocol upgrade and Priority transaction).
+    L1 {
+        /// Hashed data.
+        tx: Box<L2CanonicalTransaction>,
+        /// `tx` contains a commitment to `factory_deps`.
+        factory_deps: Vec<Vec<u8>>,
+        /// Auxiliary data, not hashed.
+        eth_block: u64,
+    },
+    /// RLP encoding of a L2 transaction.
+    L2(Vec<u8>),
+}
+
+impl Transaction {
+    /// Canonical hash of the transaction.
+    /// Returns an error if data is inconsistent.
+    /// Note that currently not all of the transaction
+    /// content is included in the hash.
+    pub fn hash(&self) -> anyhow::Result<H256> {
+        Ok(match self {
+            Self::L1 {
+                tx, factory_deps, ..
+            } => {
+                // verify data integrity
+                let factory_deps_hashes: Vec<_> = factory_deps
+                    .iter()
+                    .map(|b| h256_to_u256(hash_bytecode(b)))
+                    .collect();
+                anyhow::ensure!(tx.factory_deps == factory_deps_hashes);
+                tx.hash()
+            }
+            Self::L2(raw) => TransactionRequest::from_bytes_unverified(raw)?.1,
+        })
+    }
+}
diff --git a/core/lib/types/src/api/mod.rs b/core/lib/types/src/api/mod.rs
index 6bebb2388801..abf8288a8327 100644
--- a/core/lib/types/src/api/mod.rs
+++ b/core/lib/types/src/api/mod.rs
@@ -1,5 +1,6 @@
 use chrono::{DateTime, Utc};
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use serde_json::Value;
 use strum::Display;
 use zksync_basic_types::{
     web3::{AccessList, Bytes, Index},
@@ -27,6 +28,8 @@ pub enum BlockNumber {
     Finalized,
     /// Latest sealed block
     Latest,
+    /// Last block that was committed on L1
+    L1Committed,
     /// Earliest block (genesis)
     Earliest,
     /// Latest block (may be the block that is currently open).
@@ -51,6 +54,7 @@ impl Serialize for BlockNumber {
             BlockNumber::Committed => serializer.serialize_str("committed"),
             BlockNumber::Finalized => serializer.serialize_str("finalized"),
             BlockNumber::Latest => serializer.serialize_str("latest"),
+            BlockNumber::L1Committed => serializer.serialize_str("l1_committed"),
             BlockNumber::Earliest => serializer.serialize_str("earliest"),
             BlockNumber::Pending => serializer.serialize_str("pending"),
         }
@@ -73,6 +77,7 @@ impl<'de> Deserialize<'de> for BlockNumber {
                     "committed" => BlockNumber::Committed,
                     "finalized" => BlockNumber::Finalized,
                     "latest" => BlockNumber::Latest,
+                    "l1_committed" => BlockNumber::L1Committed,
                     "earliest" => BlockNumber::Earliest,
                     "pending" => BlockNumber::Pending,
                     num => {
@@ -89,7 +94,7 @@ impl<'de> Deserialize<'de> for BlockNumber {
     }
 }
 
-/// Block unified identifier in terms of zkSync
+/// Block unified identifier in terms of ZKsync
 ///
 /// This is an utility structure that cannot be (de)serialized, it has to be created manually.
 /// The reason is because Web3 API provides multiple methods for referring block either by hash or number,
@@ -640,18 +645,81 @@ impl From<Call> for DebugCall {
     }
 }
 
+// TODO (PLA-965): remove deprecated fields from the struct. It is currently in a "migration" phase
+// to keep compatibility between old and new versions.
 #[derive(Default, Serialize, Deserialize, Clone, Debug)]
 pub struct ProtocolVersion {
-    /// Protocol version ID
-    pub version_id: u16,
+    /// Minor version of the protocol
+    #[deprecated]
+    pub version_id: Option<u16>,
+    /// Minor version of the protocol
+    #[serde(rename = "minorVersion")]
+    pub minor_version: Option<u16>,
     /// Timestamp at which upgrade should be performed
     pub timestamp: u64,
     /// Verifier configuration
-    pub verification_keys_hashes: L1VerifierConfig,
+    #[deprecated]
+    pub verification_keys_hashes: Option<L1VerifierConfig>,
     /// Hashes of base system contracts (bootloader and default account)
-    pub base_system_contracts: BaseSystemContractsHashes,
+    #[deprecated]
+    pub base_system_contracts: Option<BaseSystemContractsHashes>,
+    /// Bootloader code hash
+    #[serde(rename = "bootloaderCodeHash")]
+    pub bootloader_code_hash: Option<H256>,
+    /// Default account code hash
+    #[serde(rename = "defaultAccountCodeHash")]
+    pub default_account_code_hash: Option<H256>,
     /// L2 Upgrade transaction hash
+    #[deprecated]
     pub l2_system_upgrade_tx_hash: Option<H256>,
+    /// L2 Upgrade transaction hash
+    #[serde(rename = "l2SystemUpgradeTxHash")]
+    pub l2_system_upgrade_tx_hash_new: Option<H256>,
+}
+
+#[allow(deprecated)]
+impl ProtocolVersion {
+    pub fn new(
+        minor_version: u16,
+        timestamp: u64,
+        bootloader_code_hash: H256,
+        default_account_code_hash: H256,
+        l2_system_upgrade_tx_hash: Option<H256>,
+    ) -> Self {
+        Self {
+            version_id: Some(minor_version),
+            minor_version: Some(minor_version),
+            timestamp,
+            verification_keys_hashes: Some(Default::default()),
+            base_system_contracts: Some(BaseSystemContractsHashes {
+                bootloader: bootloader_code_hash,
+                default_aa: default_account_code_hash,
+            }),
+            bootloader_code_hash: Some(bootloader_code_hash),
+            default_account_code_hash: Some(default_account_code_hash),
+            l2_system_upgrade_tx_hash,
+            l2_system_upgrade_tx_hash_new: l2_system_upgrade_tx_hash,
+        }
+    }
+
+    pub fn bootloader_code_hash(&self) -> Option<H256> {
+        self.bootloader_code_hash
+            .or_else(|| self.base_system_contracts.map(|hashes| hashes.bootloader))
+    }
+
+    pub fn default_account_code_hash(&self) -> Option<H256> {
+        self.default_account_code_hash
+            .or_else(|| self.base_system_contracts.map(|hashes| hashes.default_aa))
+    }
+
+    pub fn minor_version(&self) -> Option<u16> {
+        self.minor_version.or(self.version_id)
+    }
+
+    pub fn l2_system_upgrade_tx_hash(&self) -> Option<H256> {
+        self.l2_system_upgrade_tx_hash_new
+            .or(self.l2_system_upgrade_tx_hash)
+    }
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -698,6 +766,8 @@ pub struct BlockDetailsBase {
     pub executed_at: Option<DateTime<Utc>>,
     pub l1_gas_price: u64,
     pub l2_fair_gas_price: u64,
+    // Cost of publishing one byte (in wei).
+    pub fair_pubdata_price: Option<u64>,
     pub base_system_contracts_hashes: BaseSystemContractsHashes,
 }
 
@@ -751,3 +821,46 @@ pub struct ApiStorageLog {
     pub key: U256,
     pub written_value: U256,
 }
+
+/// Raw transaction execution data.
+/// Data is taken from `TransactionExecutionMetrics`.
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct TransactionExecutionInfo {
+    pub execution_info: Value,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // TODO (PLA-965): remove test after removing deprecating fields.
+    #[allow(deprecated)]
+    #[test]
+    fn check_protocol_version_type_compatibility() {
+        let new_version = ProtocolVersion {
+            version_id: Some(24),
+            minor_version: Some(24),
+            timestamp: 0,
+            verification_keys_hashes: Some(Default::default()),
+            base_system_contracts: Some(Default::default()),
+            bootloader_code_hash: Some(Default::default()),
+            default_account_code_hash: Some(Default::default()),
+            l2_system_upgrade_tx_hash: Default::default(),
+            l2_system_upgrade_tx_hash_new: Default::default(),
+        };
+
+        #[derive(Deserialize)]
+        #[allow(dead_code)]
+        struct OldProtocolVersion {
+            pub version_id: u16,
+            pub timestamp: u64,
+            pub verification_keys_hashes: L1VerifierConfig,
+            pub base_system_contracts: BaseSystemContractsHashes,
+            pub l2_system_upgrade_tx_hash: Option<H256>,
+        }
+
+        serde_json::from_str::<OldProtocolVersion>(&serde_json::to_string(&new_version).unwrap())
+            .unwrap();
+    }
+}
diff --git a/core/lib/types/src/base_token_ratio.rs b/core/lib/types/src/base_token_ratio.rs
new file mode 100644
index 000000000000..0782e67ab4b0
--- /dev/null
+++ b/core/lib/types/src/base_token_ratio.rs
@@ -0,0 +1,22 @@
+use std::num::NonZeroU64;
+
+use chrono::{DateTime, Utc};
+
+/// Represents the base token to ETH conversion ratio at a given point in time.
+#[derive(Debug, Clone)]
+pub struct BaseTokenRatio {
+    pub id: u32,
+    pub ratio_timestamp: DateTime<Utc>,
+    pub numerator: NonZeroU64,
+    pub denominator: NonZeroU64,
+    pub used_in_l1: bool,
+}
+
+/// Struct to represent API response containing denominator, numerator, and timestamp.
+#[derive(Debug)]
+pub struct BaseTokenAPIRatio {
+    pub numerator: NonZeroU64,
+    pub denominator: NonZeroU64,
+    /// Either the timestamp of the quote or the timestamp of the request.
+    pub ratio_timestamp: DateTime<Utc>,
+}
diff --git a/core/lib/types/src/block.rs b/core/lib/types/src/block.rs
index e1e98671bd8e..bc13bed457bf 100644
--- a/core/lib/types/src/block.rs
+++ b/core/lib/types/src/block.rs
@@ -30,6 +30,14 @@ impl DeployedContract {
     }
 }
 
+/// Holder for l1 batches data, used in eth sender metrics
+pub struct L1BatchStatistics {
+    pub number: L1BatchNumber,
+    pub timestamp: u64,
+    pub l2_tx_count: u32,
+    pub l1_tx_count: u32,
+}
+
 /// Holder for the block metadata that is not available from transactions themselves.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct L1BatchHeader {
@@ -93,7 +101,7 @@ pub struct StorageOracleInfo {
 }
 
 /// Data needed to execute an L2 block in the VM.
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct L2BlockExecutionData {
     pub number: L2BlockNumber,
     pub timestamp: u64,
@@ -200,7 +208,7 @@ pub struct L2BlockHasher {
 }
 
 impl L2BlockHasher {
-    /// At the beginning of the zkSync, the hashes of the blocks could be calculated as the hash of their number.
+    /// At the beginning of the ZKsync, the hashes of the blocks could be calculated as the hash of their number.
     /// This method returns the hash of such L2 blocks.
     pub fn legacy_hash(l2_block_number: L2BlockNumber) -> H256 {
         H256(keccak256(&l2_block_number.0.to_be_bytes()))
@@ -249,6 +257,22 @@ impl L2BlockHasher {
             Self::legacy_hash(self.number)
         }
     }
+
+    pub fn hash(
+        number: L2BlockNumber,
+        timestamp: u64,
+        prev_l2_block_hash: H256,
+        txs_rolling_hash: H256,
+        protocol_version: ProtocolVersionId,
+    ) -> H256 {
+        Self {
+            number,
+            timestamp,
+            prev_l2_block_hash,
+            txs_rolling_hash,
+        }
+        .finalize(protocol_version)
+    }
 }
 
 /// Returns block.number/timestamp based on the block's information
diff --git a/core/lib/types/src/commitment/mod.rs b/core/lib/types/src/commitment/mod.rs
index 31baa78ee1fe..61c2d7b5ea27 100644
--- a/core/lib/types/src/commitment/mod.rs
+++ b/core/lib/types/src/commitment/mod.rs
@@ -1,7 +1,7 @@
 //! Data structures that have more metadata than their primary versions declared in this crate.
 //! For example, L1 batch defined here has the `root_hash` field which is absent in `L1BatchHeader`.
 //!
-//! Existence of this module is caused by the execution model of zkSync: when executing transactions,
+//! Existence of this module is caused by the execution model of ZKsync: when executing transactions,
 //! we aim to avoid expensive operations like the state root hash recalculation. State root hash is not
 //! required for the rollup to execute L1 batches, it's needed for the proof generation and the Ethereum
 //! transactions, thus the calculations are done separately and asynchronously.
@@ -9,6 +9,7 @@
 use std::{collections::HashMap, convert::TryFrom};
 
 use serde::{Deserialize, Serialize};
+pub use zksync_basic_types::commitment::L1BatchCommitmentMode;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_mini_merkle_tree::MiniMerkleTree;
 use zksync_system_constants::{
@@ -259,7 +260,7 @@ impl SerializeCommitment for StateDiffRecord {
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 #[cfg_attr(test, derive(Serialize, Deserialize))]
-struct L1BatchAuxiliaryCommonOutput {
+pub struct L1BatchAuxiliaryCommonOutput {
     l2_l1_logs_merkle_root: H256,
     protocol_version: ProtocolVersionId,
 }
@@ -267,7 +268,7 @@ struct L1BatchAuxiliaryCommonOutput {
 /// Block Output produced by Virtual Machine
 #[derive(Debug, Clone, Eq, PartialEq)]
 #[cfg_attr(test, derive(Serialize, Deserialize))]
-enum L1BatchAuxiliaryOutput {
+pub enum L1BatchAuxiliaryOutput {
     PreBoojum {
         common: L1BatchAuxiliaryCommonOutput,
         l2_l1_logs_linear_hash: H256,
@@ -466,7 +467,7 @@ pub struct L1BatchMetaParameters {
     pub zkporter_is_available: bool,
     pub bootloader_code_hash: H256,
     pub default_aa_code_hash: H256,
-    pub protocol_version: ProtocolVersionId,
+    pub protocol_version: Option<ProtocolVersionId>,
 }
 
 impl L1BatchMetaParameters {
@@ -477,7 +478,10 @@ impl L1BatchMetaParameters {
         result.extend(self.bootloader_code_hash.as_bytes());
         result.extend(self.default_aa_code_hash.as_bytes());
 
-        if self.protocol_version.is_post_1_5_0() {
+        if self
+            .protocol_version
+            .map_or(false, |ver| ver.is_post_1_5_0())
+        {
             // EVM simulator hash for now is the same as the default AA hash.
             result.extend(self.default_aa_code_hash.as_bytes());
         }
@@ -528,8 +532,8 @@ impl L1BatchPassThroughData {
 #[derive(Debug, Clone)]
 pub struct L1BatchCommitment {
     pass_through_data: L1BatchPassThroughData,
-    auxiliary_output: L1BatchAuxiliaryOutput,
-    meta_parameters: L1BatchMetaParameters,
+    pub auxiliary_output: L1BatchAuxiliaryOutput,
+    pub meta_parameters: L1BatchMetaParameters,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -542,13 +546,12 @@ pub struct L1BatchCommitmentHash {
 }
 
 impl L1BatchCommitment {
-    #[allow(clippy::too_many_arguments)]
     pub fn new(input: CommitmentInput) -> Self {
         let meta_parameters = L1BatchMetaParameters {
             zkporter_is_available: ZKPORTER_IS_AVAILABLE,
             bootloader_code_hash: input.common().bootloader_code_hash,
             default_aa_code_hash: input.common().default_aa_code_hash,
-            protocol_version: input.common().protocol_version,
+            protocol_version: Some(input.common().protocol_version),
         };
 
         Self {
diff --git a/core/lib/types/src/commitment/tests/post_boojum_1_4_1_test.json b/core/lib/types/src/commitment/tests/post_boojum_1_4_1_test.json
index ab260f4011de..c5eccbce038a 100644
--- a/core/lib/types/src/commitment/tests/post_boojum_1_4_1_test.json
+++ b/core/lib/types/src/commitment/tests/post_boojum_1_4_1_test.json
@@ -81,38 +81,9 @@
           "address": "0x000000000000000000000000000000000000800a",
           "key": "0x1",
           "derived_key": [
-            113,
-            233,
-            23,
-            33,
-            249,
-            145,
-            133,
-            118,
-            215,
-            96,
-            240,
-            47,
-            3,
-            202,
-            196,
-            124,
-            111,
-            64,
-            3,
-            49,
-            96,
-            49,
-            132,
-            142,
-            60,
-            29,
-            153,
-            230,
-            232,
-            58,
-            71,
-            67
+            113, 233, 23, 33, 249, 145, 133, 118, 215, 96, 240, 47, 3, 202, 196,
+            124, 111, 64, 3, 49, 96, 49, 132, 142, 60, 29, 153, 230, 232, 58,
+            71, 67
           ],
           "enumeration_index": 49,
           "initial_value": "0x18776f28c303800",
@@ -122,38 +93,9 @@
           "address": "0x000000000000000000000000000000000000800a",
           "key": "0x294a00337abeee2b3cd948ffeed92231e2a3acc2eb11210400e0aa9557f23e26",
           "derived_key": [
-            45,
-            90,
-            105,
-            98,
-            204,
-            206,
-            229,
-            212,
-            173,
-            180,
-            138,
-            54,
-            187,
-            191,
-            68,
-            58,
-            83,
-            23,
-            33,
-            72,
-            67,
-            129,
-            18,
-            89,
-            55,
-            243,
-            0,
-            26,
-            197,
-            255,
-            135,
-            91
+            45, 90, 105, 98, 204, 206, 229, 212, 173, 180, 138, 54, 187, 191,
+            68, 58, 83, 23, 33, 72, 67, 129, 18, 89, 55, 243, 0, 26, 197, 255,
+            135, 91
           ],
           "enumeration_index": 50,
           "initial_value": "0xf5559e28fd66c0",
@@ -163,38 +105,9 @@
           "address": "0x000000000000000000000000000000000000800a",
           "key": "0xeaa2b2fbf0b42c559059e5e9510edc15755f1c1883f0e41d5ba5f9aea4ac201a",
           "derived_key": [
-            141,
-            97,
-            126,
-            192,
-            90,
-            203,
-            191,
-            95,
-            226,
-            69,
-            41,
-            166,
-            75,
-            35,
-            133,
-            169,
-            106,
-            173,
-            67,
-            240,
-            155,
-            225,
-            173,
-            169,
-            44,
-            112,
-            64,
-            49,
-            220,
-            193,
-            72,
-            27
+            141, 97, 126, 192, 90, 203, 191, 95, 226, 69, 41, 166, 75, 35, 133,
+            169, 106, 173, 67, 240, 155, 225, 173, 169, 44, 112, 64, 49, 220,
+            193, 72, 27
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -204,38 +117,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0x7",
           "derived_key": [
-            18,
-            59,
-            175,
-            197,
-            134,
-            247,
-            119,
-            100,
-            72,
-            140,
-            210,
-            76,
-            106,
-            119,
-            84,
-            110,
-            90,
-            15,
-            232,
-            189,
-            251,
-            79,
-            162,
-            3,
-            207,
-            175,
-            252,
-            54,
-            204,
-            228,
-            221,
-            91
+            18, 59, 175, 197, 134, 247, 119, 100, 72, 140, 210, 76, 106, 119,
+            84, 110, 90, 15, 232, 189, 251, 79, 162, 3, 207, 175, 252, 54, 204,
+            228, 221, 91
           ],
           "enumeration_index": 53,
           "initial_value": "0x100000000000000000000000065c22e3e",
@@ -245,38 +129,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0x9",
           "derived_key": [
-            142,
-            125,
-            208,
-            106,
-            197,
-            183,
-            59,
-            71,
-            59,
-            230,
-            188,
-            90,
-            81,
-            3,
-            15,
-            76,
-            116,
-            55,
-            101,
-            124,
-            183,
-            178,
-            155,
-            243,
-            118,
-            197,
-            100,
-            184,
-            209,
-            103,
-            90,
-            94
+            142, 125, 208, 106, 197, 183, 59, 71, 59, 230, 188, 90, 81, 3, 15,
+            76, 116, 55, 101, 124, 183, 178, 155, 243, 118, 197, 100, 184, 209,
+            103, 90, 94
           ],
           "enumeration_index": 54,
           "initial_value": "0x200000000000000000000000065c22e3f",
@@ -286,38 +141,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0xd",
           "derived_key": [
-            235,
-            221,
-            239,
-            221,
-            164,
-            142,
-            178,
-            170,
-            127,
-            102,
-            236,
-            247,
-            148,
-            10,
-            40,
-            14,
-            158,
-            243,
-            251,
-            46,
-            149,
-            219,
-            9,
-            149,
-            83,
-            132,
-            64,
-            166,
-            42,
-            247,
-            152,
-            97
+            235, 221, 239, 221, 164, 142, 178, 170, 127, 102, 236, 247, 148, 10,
+            40, 14, 158, 243, 251, 46, 149, 219, 9, 149, 83, 132, 64, 166, 42,
+            247, 152, 97
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -327,38 +153,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0xe",
           "derived_key": [
-            70,
-            64,
-            215,
-            56,
-            69,
-            54,
-            78,
-            198,
-            145,
-            246,
-            222,
-            251,
-            96,
-            106,
-            58,
-            114,
-            253,
-            165,
-            215,
-            173,
-            51,
-            209,
-            125,
-            4,
-            153,
-            90,
-            142,
-            37,
-            44,
-            74,
-            6,
-            216
+            70, 64, 215, 56, 69, 54, 78, 198, 145, 246, 222, 251, 96, 106, 58,
+            114, 253, 165, 215, 173, 51, 209, 125, 4, 153, 90, 142, 37, 44, 74,
+            6, 216
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -368,38 +165,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0x10c",
           "derived_key": [
-            121,
-            9,
-            53,
-            136,
-            208,
-            232,
-            71,
-            239,
-            167,
-            58,
-            16,
-            206,
-            32,
-            228,
-            121,
-            159,
-            177,
-            228,
-            102,
-            66,
-            214,
-            86,
-            23,
-            199,
-            229,
-            33,
-            63,
-            160,
-            73,
-            137,
-            217,
-            45
+            121, 9, 53, 136, 208, 232, 71, 239, 167, 58, 16, 206, 32, 228, 121,
+            159, 177, 228, 102, 66, 214, 86, 23, 199, 229, 33, 63, 160, 73, 137,
+            217, 45
           ],
           "enumeration_index": 57,
           "initial_value": "0x200000000000000000000000065c22e3f",
@@ -409,38 +177,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0xad67d757c34507f157cacfa2e3153e9f260a2244f30428821be7be64587ac55f",
           "derived_key": [
-            12,
-            194,
-            74,
-            180,
-            47,
-            190,
-            197,
-            49,
-            125,
-            155,
-            26,
-            44,
-            164,
-            124,
-            169,
-            185,
-            59,
-            158,
-            195,
-            109,
-            121,
-            142,
-            253,
-            124,
-            218,
-            167,
-            57,
-            36,
-            22,
-            48,
-            203,
-            70
+            12, 194, 74, 180, 47, 190, 197, 49, 125, 155, 26, 44, 164, 124, 169,
+            185, 59, 158, 195, 109, 121, 142, 253, 124, 218, 167, 57, 36, 22,
+            48, 203, 70
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -451,7 +190,10 @@
         "events_queue_commitment": "0x6193a5098eb140796387bdf40700a3855eeb010474b5478f30bf917172c67883",
         "bootloader_initial_content_commitment": "0xf031b4491c37f20516c4ebf428f4765156409f67089e64772f4106fd2d9f3351"
       },
-      "blob_commitments": ["0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"]
+      "blob_commitments": [
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000"
+      ]
     }
   },
   "pass_through_data": {
@@ -480,347 +222,40 @@
       },
       "system_logs_linear_hash": "0x3fc3c24217a2f1e09715eb3fa07327bec6818799a847175174ae027525519eb6",
       "state_diffs_compressed": [
-        1,
-        0,
-        1,
-        72,
-        4,
-        0,
-        4,
-        141,
-        97,
-        126,
-        192,
-        90,
-        203,
-        191,
-        95,
-        226,
-        69,
-        41,
-        166,
-        75,
-        35,
-        133,
-        169,
-        106,
-        173,
-        67,
-        240,
-        155,
-        225,
-        173,
-        169,
-        44,
-        112,
-        64,
-        49,
-        220,
-        193,
-        72,
-        27,
-        65,
-        111,
-        5,
-        225,
-        147,
-        53,
-        50,
-        134,
-        160,
-        235,
-        221,
-        239,
-        221,
-        164,
-        142,
-        178,
-        170,
-        127,
-        102,
-        236,
-        247,
-        148,
-        10,
-        40,
-        14,
-        158,
-        243,
-        251,
-        46,
-        149,
-        219,
-        9,
-        149,
-        83,
-        132,
-        64,
-        166,
-        42,
-        247,
-        152,
-        97,
-        0,
-        235,
-        190,
-        96,
-        156,
-        211,
-        204,
-        209,
-        31,
-        39,
-        62,
-        185,
-        67,
-        116,
-        214,
-        211,
-        162,
-        247,
-        133,
-        108,
-        95,
-        16,
-        57,
-        220,
-        72,
-        119,
-        198,
-        163,
-        52,
-        24,
-        138,
-        199,
-        193,
-        70,
-        64,
-        215,
-        56,
-        69,
-        54,
-        78,
-        198,
-        145,
-        246,
-        222,
-        251,
-        96,
-        106,
-        58,
-        114,
-        253,
-        165,
-        215,
-        173,
-        51,
-        209,
-        125,
-        4,
-        153,
-        90,
-        142,
-        37,
-        44,
-        74,
-        6,
-        216,
-        0,
-        112,
-        142,
-        127,
-        207,
-        104,
-        235,
-        171,
-        108,
-        135,
-        50,
-        38,
-        134,
-        202,
-        196,
-        188,
-        219,
-        95,
-        43,
-        212,
-        199,
-        31,
-        51,
-        123,
-        24,
-        209,
-        71,
-        253,
-        154,
-        108,
-        68,
-        173,
-        19,
-        12,
-        194,
-        74,
-        180,
-        47,
-        190,
-        197,
-        49,
-        125,
-        155,
-        26,
-        44,
-        164,
-        124,
-        169,
-        185,
-        59,
-        158,
-        195,
-        109,
-        121,
-        142,
-        253,
-        124,
-        218,
-        167,
-        57,
-        36,
-        22,
-        48,
-        203,
-        70,
-        0,
-        85,
-        97,
-        141,
-        181,
-        255,
-        36,
-        174,
-        228,
-        210,
-        54,
-        146,
-        27,
-        111,
-        66,
-        114,
-        16,
-        17,
-        97,
-        19,
-        113,
-        21,
-        163,
-        180,
-        196,
-        166,
-        95,
-        134,
-        119,
-        177,
-        36,
-        192,
-        28,
-        0,
-        0,
-        0,
-        49,
-        65,
-        111,
-        6,
-        45,
-        144,
-        62,
-        129,
-        207,
-        96,
-        0,
-        0,
-        0,
-        50,
-        49,
-        75,
-        253,
-        9,
-        79,
-        72,
-        192,
-        0,
-        0,
-        0,
-        53,
-        137,
-        1,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        66,
-        0,
-        0,
-        0,
-        54,
-        137,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        66,
-        0,
-        0,
-        0,
-        57,
-        137,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        66
+        1, 0, 1, 72, 4, 0, 4, 141, 97, 126, 192, 90, 203, 191, 95, 226, 69, 41,
+        166, 75, 35, 133, 169, 106, 173, 67, 240, 155, 225, 173, 169, 44, 112,
+        64, 49, 220, 193, 72, 27, 65, 111, 5, 225, 147, 53, 50, 134, 160, 235,
+        221, 239, 221, 164, 142, 178, 170, 127, 102, 236, 247, 148, 10, 40, 14,
+        158, 243, 251, 46, 149, 219, 9, 149, 83, 132, 64, 166, 42, 247, 152, 97,
+        0, 235, 190, 96, 156, 211, 204, 209, 31, 39, 62, 185, 67, 116, 214, 211,
+        162, 247, 133, 108, 95, 16, 57, 220, 72, 119, 198, 163, 52, 24, 138,
+        199, 193, 70, 64, 215, 56, 69, 54, 78, 198, 145, 246, 222, 251, 96, 106,
+        58, 114, 253, 165, 215, 173, 51, 209, 125, 4, 153, 90, 142, 37, 44, 74,
+        6, 216, 0, 112, 142, 127, 207, 104, 235, 171, 108, 135, 50, 38, 134,
+        202, 196, 188, 219, 95, 43, 212, 199, 31, 51, 123, 24, 209, 71, 253,
+        154, 108, 68, 173, 19, 12, 194, 74, 180, 47, 190, 197, 49, 125, 155, 26,
+        44, 164, 124, 169, 185, 59, 158, 195, 109, 121, 142, 253, 124, 218, 167,
+        57, 36, 22, 48, 203, 70, 0, 85, 97, 141, 181, 255, 36, 174, 228, 210,
+        54, 146, 27, 111, 66, 114, 16, 17, 97, 19, 113, 21, 163, 180, 196, 166,
+        95, 134, 119, 177, 36, 192, 28, 0, 0, 0, 49, 65, 111, 6, 45, 144, 62,
+        129, 207, 96, 0, 0, 0, 50, 49, 75, 253, 9, 79, 72, 192, 0, 0, 0, 53,
+        137, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66, 0, 0, 0, 54,
+        137, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66, 0, 0, 0, 57,
+        137, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66
       ],
       "state_diffs_hash": "0xb18f72a4a5b4b8ce1b7e41095fb1332a211a140376bcc2607910875d236708e0",
       "aux_commitments": {
         "events_queue_commitment": "0x6193a5098eb140796387bdf40700a3855eeb010474b5478f30bf917172c67883",
         "bootloader_initial_content_commitment": "0xf031b4491c37f20516c4ebf428f4765156409f67089e64772f4106fd2d9f3351"
       },
-      "blob_linear_hashes": ["0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
-      "blob_commitments": ["0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"]
+      "blob_linear_hashes": [
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000"
+      ],
+      "blob_commitments": [
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000"
+      ]
     }
   },
   "hashes": {
diff --git a/core/lib/types/src/commitment/tests/post_boojum_1_4_2_test.json b/core/lib/types/src/commitment/tests/post_boojum_1_4_2_test.json
index 726874949ad8..4983bbeca143 100644
--- a/core/lib/types/src/commitment/tests/post_boojum_1_4_2_test.json
+++ b/core/lib/types/src/commitment/tests/post_boojum_1_4_2_test.json
@@ -97,38 +97,9 @@
           "address": "0x000000000000000000000000000000000000800a",
           "key": "0x1",
           "derived_key": [
-            113,
-            233,
-            23,
-            33,
-            249,
-            145,
-            133,
-            118,
-            215,
-            96,
-            240,
-            47,
-            3,
-            202,
-            196,
-            124,
-            111,
-            64,
-            3,
-            49,
-            96,
-            49,
-            132,
-            142,
-            60,
-            29,
-            153,
-            230,
-            232,
-            58,
-            71,
-            67
+            113, 233, 23, 33, 249, 145, 133, 118, 215, 96, 240, 47, 3, 202, 196,
+            124, 111, 64, 3, 49, 96, 49, 132, 142, 60, 29, 153, 230, 232, 58,
+            71, 67
           ],
           "enumeration_index": 49,
           "initial_value": "0x18776f28c303800",
@@ -138,38 +109,9 @@
           "address": "0x000000000000000000000000000000000000800a",
           "key": "0x294a00337abeee2b3cd948ffeed92231e2a3acc2eb11210400e0aa9557f23e26",
           "derived_key": [
-            45,
-            90,
-            105,
-            98,
-            204,
-            206,
-            229,
-            212,
-            173,
-            180,
-            138,
-            54,
-            187,
-            191,
-            68,
-            58,
-            83,
-            23,
-            33,
-            72,
-            67,
-            129,
-            18,
-            89,
-            55,
-            243,
-            0,
-            26,
-            197,
-            255,
-            135,
-            91
+            45, 90, 105, 98, 204, 206, 229, 212, 173, 180, 138, 54, 187, 191,
+            68, 58, 83, 23, 33, 72, 67, 129, 18, 89, 55, 243, 0, 26, 197, 255,
+            135, 91
           ],
           "enumeration_index": 50,
           "initial_value": "0xf5559e28fd66c0",
@@ -179,38 +121,9 @@
           "address": "0x000000000000000000000000000000000000800a",
           "key": "0xeaa2b2fbf0b42c559059e5e9510edc15755f1c1883f0e41d5ba5f9aea4ac201a",
           "derived_key": [
-            141,
-            97,
-            126,
-            192,
-            90,
-            203,
-            191,
-            95,
-            226,
-            69,
-            41,
-            166,
-            75,
-            35,
-            133,
-            169,
-            106,
-            173,
-            67,
-            240,
-            155,
-            225,
-            173,
-            169,
-            44,
-            112,
-            64,
-            49,
-            220,
-            193,
-            72,
-            27
+            141, 97, 126, 192, 90, 203, 191, 95, 226, 69, 41, 166, 75, 35, 133,
+            169, 106, 173, 67, 240, 155, 225, 173, 169, 44, 112, 64, 49, 220,
+            193, 72, 27
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -220,38 +133,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0x7",
           "derived_key": [
-            18,
-            59,
-            175,
-            197,
-            134,
-            247,
-            119,
-            100,
-            72,
-            140,
-            210,
-            76,
-            106,
-            119,
-            84,
-            110,
-            90,
-            15,
-            232,
-            189,
-            251,
-            79,
-            162,
-            3,
-            207,
-            175,
-            252,
-            54,
-            204,
-            228,
-            221,
-            91
+            18, 59, 175, 197, 134, 247, 119, 100, 72, 140, 210, 76, 106, 119,
+            84, 110, 90, 15, 232, 189, 251, 79, 162, 3, 207, 175, 252, 54, 204,
+            228, 221, 91
           ],
           "enumeration_index": 53,
           "initial_value": "0x100000000000000000000000065c22e3e",
@@ -261,38 +145,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0x9",
           "derived_key": [
-            142,
-            125,
-            208,
-            106,
-            197,
-            183,
-            59,
-            71,
-            59,
-            230,
-            188,
-            90,
-            81,
-            3,
-            15,
-            76,
-            116,
-            55,
-            101,
-            124,
-            183,
-            178,
-            155,
-            243,
-            118,
-            197,
-            100,
-            184,
-            209,
-            103,
-            90,
-            94
+            142, 125, 208, 106, 197, 183, 59, 71, 59, 230, 188, 90, 81, 3, 15,
+            76, 116, 55, 101, 124, 183, 178, 155, 243, 118, 197, 100, 184, 209,
+            103, 90, 94
           ],
           "enumeration_index": 54,
           "initial_value": "0x200000000000000000000000065c22e3f",
@@ -302,38 +157,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0xd",
           "derived_key": [
-            235,
-            221,
-            239,
-            221,
-            164,
-            142,
-            178,
-            170,
-            127,
-            102,
-            236,
-            247,
-            148,
-            10,
-            40,
-            14,
-            158,
-            243,
-            251,
-            46,
-            149,
-            219,
-            9,
-            149,
-            83,
-            132,
-            64,
-            166,
-            42,
-            247,
-            152,
-            97
+            235, 221, 239, 221, 164, 142, 178, 170, 127, 102, 236, 247, 148, 10,
+            40, 14, 158, 243, 251, 46, 149, 219, 9, 149, 83, 132, 64, 166, 42,
+            247, 152, 97
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -343,38 +169,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0xe",
           "derived_key": [
-            70,
-            64,
-            215,
-            56,
-            69,
-            54,
-            78,
-            198,
-            145,
-            246,
-            222,
-            251,
-            96,
-            106,
-            58,
-            114,
-            253,
-            165,
-            215,
-            173,
-            51,
-            209,
-            125,
-            4,
-            153,
-            90,
-            142,
-            37,
-            44,
-            74,
-            6,
-            216
+            70, 64, 215, 56, 69, 54, 78, 198, 145, 246, 222, 251, 96, 106, 58,
+            114, 253, 165, 215, 173, 51, 209, 125, 4, 153, 90, 142, 37, 44, 74,
+            6, 216
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -384,38 +181,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0x10c",
           "derived_key": [
-            121,
-            9,
-            53,
-            136,
-            208,
-            232,
-            71,
-            239,
-            167,
-            58,
-            16,
-            206,
-            32,
-            228,
-            121,
-            159,
-            177,
-            228,
-            102,
-            66,
-            214,
-            86,
-            23,
-            199,
-            229,
-            33,
-            63,
-            160,
-            73,
-            137,
-            217,
-            45
+            121, 9, 53, 136, 208, 232, 71, 239, 167, 58, 16, 206, 32, 228, 121,
+            159, 177, 228, 102, 66, 214, 86, 23, 199, 229, 33, 63, 160, 73, 137,
+            217, 45
           ],
           "enumeration_index": 57,
           "initial_value": "0x200000000000000000000000065c22e3f",
@@ -425,38 +193,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0xad67d757c34507f157cacfa2e3153e9f260a2244f30428821be7be64587ac55f",
           "derived_key": [
-            12,
-            194,
-            74,
-            180,
-            47,
-            190,
-            197,
-            49,
-            125,
-            155,
-            26,
-            44,
-            164,
-            124,
-            169,
-            185,
-            59,
-            158,
-            195,
-            109,
-            121,
-            142,
-            253,
-            124,
-            218,
-            167,
-            57,
-            36,
-            22,
-            48,
-            203,
-            70
+            12, 194, 74, 180, 47, 190, 197, 49, 125, 155, 26, 44, 164, 124, 169,
+            185, 59, 158, 195, 109, 121, 142, 253, 124, 218, 167, 57, 36, 22,
+            48, 203, 70
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -467,7 +206,10 @@
         "events_queue_commitment": "0x6193a5098eb140796387bdf40700a3855eeb010474b5478f30bf917172c67883",
         "bootloader_initial_content_commitment": "0xf031b4491c37f20516c4ebf428f4765156409f67089e64772f4106fd2d9f3351"
       },
-      "blob_commitments": ["0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002"]
+      "blob_commitments": [
+        "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "0x0000000000000000000000000000000000000000000000000000000000000002"
+      ]
     }
   },
   "pass_through_data": {
@@ -496,347 +238,40 @@
       },
       "system_logs_linear_hash": "0xc559d154f69af74a0017e2380afa3a861822cf47bc5b99e3a76f7fc4de6cca09",
       "state_diffs_compressed": [
-        1,
-        0,
-        1,
-        72,
-        4,
-        0,
-        4,
-        141,
-        97,
-        126,
-        192,
-        90,
-        203,
-        191,
-        95,
-        226,
-        69,
-        41,
-        166,
-        75,
-        35,
-        133,
-        169,
-        106,
-        173,
-        67,
-        240,
-        155,
-        225,
-        173,
-        169,
-        44,
-        112,
-        64,
-        49,
-        220,
-        193,
-        72,
-        27,
-        65,
-        111,
-        5,
-        225,
-        147,
-        53,
-        50,
-        134,
-        160,
-        235,
-        221,
-        239,
-        221,
-        164,
-        142,
-        178,
-        170,
-        127,
-        102,
-        236,
-        247,
-        148,
-        10,
-        40,
-        14,
-        158,
-        243,
-        251,
-        46,
-        149,
-        219,
-        9,
-        149,
-        83,
-        132,
-        64,
-        166,
-        42,
-        247,
-        152,
-        97,
-        0,
-        235,
-        190,
-        96,
-        156,
-        211,
-        204,
-        209,
-        31,
-        39,
-        62,
-        185,
-        67,
-        116,
-        214,
-        211,
-        162,
-        247,
-        133,
-        108,
-        95,
-        16,
-        57,
-        220,
-        72,
-        119,
-        198,
-        163,
-        52,
-        24,
-        138,
-        199,
-        193,
-        70,
-        64,
-        215,
-        56,
-        69,
-        54,
-        78,
-        198,
-        145,
-        246,
-        222,
-        251,
-        96,
-        106,
-        58,
-        114,
-        253,
-        165,
-        215,
-        173,
-        51,
-        209,
-        125,
-        4,
-        153,
-        90,
-        142,
-        37,
-        44,
-        74,
-        6,
-        216,
-        0,
-        112,
-        142,
-        127,
-        207,
-        104,
-        235,
-        171,
-        108,
-        135,
-        50,
-        38,
-        134,
-        202,
-        196,
-        188,
-        219,
-        95,
-        43,
-        212,
-        199,
-        31,
-        51,
-        123,
-        24,
-        209,
-        71,
-        253,
-        154,
-        108,
-        68,
-        173,
-        19,
-        12,
-        194,
-        74,
-        180,
-        47,
-        190,
-        197,
-        49,
-        125,
-        155,
-        26,
-        44,
-        164,
-        124,
-        169,
-        185,
-        59,
-        158,
-        195,
-        109,
-        121,
-        142,
-        253,
-        124,
-        218,
-        167,
-        57,
-        36,
-        22,
-        48,
-        203,
-        70,
-        0,
-        85,
-        97,
-        141,
-        181,
-        255,
-        36,
-        174,
-        228,
-        210,
-        54,
-        146,
-        27,
-        111,
-        66,
-        114,
-        16,
-        17,
-        97,
-        19,
-        113,
-        21,
-        163,
-        180,
-        196,
-        166,
-        95,
-        134,
-        119,
-        177,
-        36,
-        192,
-        28,
-        0,
-        0,
-        0,
-        49,
-        65,
-        111,
-        6,
-        45,
-        144,
-        62,
-        129,
-        207,
-        96,
-        0,
-        0,
-        0,
-        50,
-        49,
-        75,
-        253,
-        9,
-        79,
-        72,
-        192,
-        0,
-        0,
-        0,
-        53,
-        137,
-        1,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        66,
-        0,
-        0,
-        0,
-        54,
-        137,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        66,
-        0,
-        0,
-        0,
-        57,
-        137,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        66
+        1, 0, 1, 72, 4, 0, 4, 141, 97, 126, 192, 90, 203, 191, 95, 226, 69, 41,
+        166, 75, 35, 133, 169, 106, 173, 67, 240, 155, 225, 173, 169, 44, 112,
+        64, 49, 220, 193, 72, 27, 65, 111, 5, 225, 147, 53, 50, 134, 160, 235,
+        221, 239, 221, 164, 142, 178, 170, 127, 102, 236, 247, 148, 10, 40, 14,
+        158, 243, 251, 46, 149, 219, 9, 149, 83, 132, 64, 166, 42, 247, 152, 97,
+        0, 235, 190, 96, 156, 211, 204, 209, 31, 39, 62, 185, 67, 116, 214, 211,
+        162, 247, 133, 108, 95, 16, 57, 220, 72, 119, 198, 163, 52, 24, 138,
+        199, 193, 70, 64, 215, 56, 69, 54, 78, 198, 145, 246, 222, 251, 96, 106,
+        58, 114, 253, 165, 215, 173, 51, 209, 125, 4, 153, 90, 142, 37, 44, 74,
+        6, 216, 0, 112, 142, 127, 207, 104, 235, 171, 108, 135, 50, 38, 134,
+        202, 196, 188, 219, 95, 43, 212, 199, 31, 51, 123, 24, 209, 71, 253,
+        154, 108, 68, 173, 19, 12, 194, 74, 180, 47, 190, 197, 49, 125, 155, 26,
+        44, 164, 124, 169, 185, 59, 158, 195, 109, 121, 142, 253, 124, 218, 167,
+        57, 36, 22, 48, 203, 70, 0, 85, 97, 141, 181, 255, 36, 174, 228, 210,
+        54, 146, 27, 111, 66, 114, 16, 17, 97, 19, 113, 21, 163, 180, 196, 166,
+        95, 134, 119, 177, 36, 192, 28, 0, 0, 0, 49, 65, 111, 6, 45, 144, 62,
+        129, 207, 96, 0, 0, 0, 50, 49, 75, 253, 9, 79, 72, 192, 0, 0, 0, 53,
+        137, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66, 0, 0, 0, 54,
+        137, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66, 0, 0, 0, 57,
+        137, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66
       ],
       "state_diffs_hash": "0xb18f72a4a5b4b8ce1b7e41095fb1332a211a140376bcc2607910875d236708e0",
       "aux_commitments": {
         "events_queue_commitment": "0x6193a5098eb140796387bdf40700a3855eeb010474b5478f30bf917172c67883",
         "bootloader_initial_content_commitment": "0xf031b4491c37f20516c4ebf428f4765156409f67089e64772f4106fd2d9f3351"
       },
-      "blob_linear_hashes": ["0x0000000000000000000000000000000000000000000000000000000000000003", "0x0000000000000000000000000000000000000000000000000000000000000004"],
-      "blob_commitments": ["0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002"]
+      "blob_linear_hashes": [
+        "0x0000000000000000000000000000000000000000000000000000000000000003",
+        "0x0000000000000000000000000000000000000000000000000000000000000004"
+      ],
+      "blob_commitments": [
+        "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "0x0000000000000000000000000000000000000000000000000000000000000002"
+      ]
     }
   },
   "hashes": {
diff --git a/core/lib/types/src/commitment/tests/post_boojum_1_5_0_test.json b/core/lib/types/src/commitment/tests/post_boojum_1_5_0_test.json
index 506110c6bcce..59a24b7c90ce 100644
--- a/core/lib/types/src/commitment/tests/post_boojum_1_5_0_test.json
+++ b/core/lib/types/src/commitment/tests/post_boojum_1_5_0_test.json
@@ -129,38 +129,9 @@
           "address": "0x000000000000000000000000000000000000800a",
           "key": "0x1",
           "derived_key": [
-            113,
-            233,
-            23,
-            33,
-            249,
-            145,
-            133,
-            118,
-            215,
-            96,
-            240,
-            47,
-            3,
-            202,
-            196,
-            124,
-            111,
-            64,
-            3,
-            49,
-            96,
-            49,
-            132,
-            142,
-            60,
-            29,
-            153,
-            230,
-            232,
-            58,
-            71,
-            67
+            113, 233, 23, 33, 249, 145, 133, 118, 215, 96, 240, 47, 3, 202, 196,
+            124, 111, 64, 3, 49, 96, 49, 132, 142, 60, 29, 153, 230, 232, 58,
+            71, 67
           ],
           "enumeration_index": 49,
           "initial_value": "0x18776f28c303800",
@@ -170,38 +141,9 @@
           "address": "0x000000000000000000000000000000000000800a",
           "key": "0x294a00337abeee2b3cd948ffeed92231e2a3acc2eb11210400e0aa9557f23e26",
           "derived_key": [
-            45,
-            90,
-            105,
-            98,
-            204,
-            206,
-            229,
-            212,
-            173,
-            180,
-            138,
-            54,
-            187,
-            191,
-            68,
-            58,
-            83,
-            23,
-            33,
-            72,
-            67,
-            129,
-            18,
-            89,
-            55,
-            243,
-            0,
-            26,
-            197,
-            255,
-            135,
-            91
+            45, 90, 105, 98, 204, 206, 229, 212, 173, 180, 138, 54, 187, 191,
+            68, 58, 83, 23, 33, 72, 67, 129, 18, 89, 55, 243, 0, 26, 197, 255,
+            135, 91
           ],
           "enumeration_index": 50,
           "initial_value": "0xf5559e28fd66c0",
@@ -211,38 +153,9 @@
           "address": "0x000000000000000000000000000000000000800a",
           "key": "0xeaa2b2fbf0b42c559059e5e9510edc15755f1c1883f0e41d5ba5f9aea4ac201a",
           "derived_key": [
-            141,
-            97,
-            126,
-            192,
-            90,
-            203,
-            191,
-            95,
-            226,
-            69,
-            41,
-            166,
-            75,
-            35,
-            133,
-            169,
-            106,
-            173,
-            67,
-            240,
-            155,
-            225,
-            173,
-            169,
-            44,
-            112,
-            64,
-            49,
-            220,
-            193,
-            72,
-            27
+            141, 97, 126, 192, 90, 203, 191, 95, 226, 69, 41, 166, 75, 35, 133,
+            169, 106, 173, 67, 240, 155, 225, 173, 169, 44, 112, 64, 49, 220,
+            193, 72, 27
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -252,38 +165,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0x7",
           "derived_key": [
-            18,
-            59,
-            175,
-            197,
-            134,
-            247,
-            119,
-            100,
-            72,
-            140,
-            210,
-            76,
-            106,
-            119,
-            84,
-            110,
-            90,
-            15,
-            232,
-            189,
-            251,
-            79,
-            162,
-            3,
-            207,
-            175,
-            252,
-            54,
-            204,
-            228,
-            221,
-            91
+            18, 59, 175, 197, 134, 247, 119, 100, 72, 140, 210, 76, 106, 119,
+            84, 110, 90, 15, 232, 189, 251, 79, 162, 3, 207, 175, 252, 54, 204,
+            228, 221, 91
           ],
           "enumeration_index": 53,
           "initial_value": "0x100000000000000000000000065c22e3e",
@@ -293,38 +177,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0x9",
           "derived_key": [
-            142,
-            125,
-            208,
-            106,
-            197,
-            183,
-            59,
-            71,
-            59,
-            230,
-            188,
-            90,
-            81,
-            3,
-            15,
-            76,
-            116,
-            55,
-            101,
-            124,
-            183,
-            178,
-            155,
-            243,
-            118,
-            197,
-            100,
-            184,
-            209,
-            103,
-            90,
-            94
+            142, 125, 208, 106, 197, 183, 59, 71, 59, 230, 188, 90, 81, 3, 15,
+            76, 116, 55, 101, 124, 183, 178, 155, 243, 118, 197, 100, 184, 209,
+            103, 90, 94
           ],
           "enumeration_index": 54,
           "initial_value": "0x200000000000000000000000065c22e3f",
@@ -334,38 +189,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0xd",
           "derived_key": [
-            235,
-            221,
-            239,
-            221,
-            164,
-            142,
-            178,
-            170,
-            127,
-            102,
-            236,
-            247,
-            148,
-            10,
-            40,
-            14,
-            158,
-            243,
-            251,
-            46,
-            149,
-            219,
-            9,
-            149,
-            83,
-            132,
-            64,
-            166,
-            42,
-            247,
-            152,
-            97
+            235, 221, 239, 221, 164, 142, 178, 170, 127, 102, 236, 247, 148, 10,
+            40, 14, 158, 243, 251, 46, 149, 219, 9, 149, 83, 132, 64, 166, 42,
+            247, 152, 97
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -375,38 +201,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0xe",
           "derived_key": [
-            70,
-            64,
-            215,
-            56,
-            69,
-            54,
-            78,
-            198,
-            145,
-            246,
-            222,
-            251,
-            96,
-            106,
-            58,
-            114,
-            253,
-            165,
-            215,
-            173,
-            51,
-            209,
-            125,
-            4,
-            153,
-            90,
-            142,
-            37,
-            44,
-            74,
-            6,
-            216
+            70, 64, 215, 56, 69, 54, 78, 198, 145, 246, 222, 251, 96, 106, 58,
+            114, 253, 165, 215, 173, 51, 209, 125, 4, 153, 90, 142, 37, 44, 74,
+            6, 216
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -416,38 +213,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0x10c",
           "derived_key": [
-            121,
-            9,
-            53,
-            136,
-            208,
-            232,
-            71,
-            239,
-            167,
-            58,
-            16,
-            206,
-            32,
-            228,
-            121,
-            159,
-            177,
-            228,
-            102,
-            66,
-            214,
-            86,
-            23,
-            199,
-            229,
-            33,
-            63,
-            160,
-            73,
-            137,
-            217,
-            45
+            121, 9, 53, 136, 208, 232, 71, 239, 167, 58, 16, 206, 32, 228, 121,
+            159, 177, 228, 102, 66, 214, 86, 23, 199, 229, 33, 63, 160, 73, 137,
+            217, 45
           ],
           "enumeration_index": 57,
           "initial_value": "0x200000000000000000000000065c22e3f",
@@ -457,38 +225,9 @@
           "address": "0x000000000000000000000000000000000000800b",
           "key": "0xad67d757c34507f157cacfa2e3153e9f260a2244f30428821be7be64587ac55f",
           "derived_key": [
-            12,
-            194,
-            74,
-            180,
-            47,
-            190,
-            197,
-            49,
-            125,
-            155,
-            26,
-            44,
-            164,
-            124,
-            169,
-            185,
-            59,
-            158,
-            195,
-            109,
-            121,
-            142,
-            253,
-            124,
-            218,
-            167,
-            57,
-            36,
-            22,
-            48,
-            203,
-            70
+            12, 194, 74, 180, 47, 190, 197, 49, 125, 155, 26, 44, 164, 124, 169,
+            185, 59, 158, 195, 109, 121, 142, 253, 124, 218, 167, 57, 36, 22,
+            48, 203, 70
           ],
           "enumeration_index": 0,
           "initial_value": "0x0",
@@ -499,7 +238,24 @@
         "events_queue_commitment": "0x6193a5098eb140796387bdf40700a3855eeb010474b5478f30bf917172c67883",
         "bootloader_initial_content_commitment": "0xf031b4491c37f20516c4ebf428f4765156409f67089e64772f4106fd2d9f3351"
       },
-      "blob_commitments": ["0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002", "0x0000000000000000000000000000000000000000000000000000000000000003", "0x0000000000000000000000000000000000000000000000000000000000000004", "0x0000000000000000000000000000000000000000000000000000000000000005", "0x0000000000000000000000000000000000000000000000000000000000000006", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"]
+      "blob_commitments": [
+        "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "0x0000000000000000000000000000000000000000000000000000000000000002",
+        "0x0000000000000000000000000000000000000000000000000000000000000003",
+        "0x0000000000000000000000000000000000000000000000000000000000000004",
+        "0x0000000000000000000000000000000000000000000000000000000000000005",
+        "0x0000000000000000000000000000000000000000000000000000000000000006",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000"
+      ]
     }
   },
   "pass_through_data": {
@@ -528,347 +284,68 @@
       },
       "system_logs_linear_hash": "0x602dacc0a26e3347f0679924c4ae151ff5200e7dd80902fe0fc11c806c4d3ffb",
       "state_diffs_compressed": [
-        1,
-        0,
-        1,
-        72,
-        4,
-        0,
-        4,
-        141,
-        97,
-        126,
-        192,
-        90,
-        203,
-        191,
-        95,
-        226,
-        69,
-        41,
-        166,
-        75,
-        35,
-        133,
-        169,
-        106,
-        173,
-        67,
-        240,
-        155,
-        225,
-        173,
-        169,
-        44,
-        112,
-        64,
-        49,
-        220,
-        193,
-        72,
-        27,
-        65,
-        111,
-        5,
-        225,
-        147,
-        53,
-        50,
-        134,
-        160,
-        235,
-        221,
-        239,
-        221,
-        164,
-        142,
-        178,
-        170,
-        127,
-        102,
-        236,
-        247,
-        148,
-        10,
-        40,
-        14,
-        158,
-        243,
-        251,
-        46,
-        149,
-        219,
-        9,
-        149,
-        83,
-        132,
-        64,
-        166,
-        42,
-        247,
-        152,
-        97,
-        0,
-        235,
-        190,
-        96,
-        156,
-        211,
-        204,
-        209,
-        31,
-        39,
-        62,
-        185,
-        67,
-        116,
-        214,
-        211,
-        162,
-        247,
-        133,
-        108,
-        95,
-        16,
-        57,
-        220,
-        72,
-        119,
-        198,
-        163,
-        52,
-        24,
-        138,
-        199,
-        193,
-        70,
-        64,
-        215,
-        56,
-        69,
-        54,
-        78,
-        198,
-        145,
-        246,
-        222,
-        251,
-        96,
-        106,
-        58,
-        114,
-        253,
-        165,
-        215,
-        173,
-        51,
-        209,
-        125,
-        4,
-        153,
-        90,
-        142,
-        37,
-        44,
-        74,
-        6,
-        216,
-        0,
-        112,
-        142,
-        127,
-        207,
-        104,
-        235,
-        171,
-        108,
-        135,
-        50,
-        38,
-        134,
-        202,
-        196,
-        188,
-        219,
-        95,
-        43,
-        212,
-        199,
-        31,
-        51,
-        123,
-        24,
-        209,
-        71,
-        253,
-        154,
-        108,
-        68,
-        173,
-        19,
-        12,
-        194,
-        74,
-        180,
-        47,
-        190,
-        197,
-        49,
-        125,
-        155,
-        26,
-        44,
-        164,
-        124,
-        169,
-        185,
-        59,
-        158,
-        195,
-        109,
-        121,
-        142,
-        253,
-        124,
-        218,
-        167,
-        57,
-        36,
-        22,
-        48,
-        203,
-        70,
-        0,
-        85,
-        97,
-        141,
-        181,
-        255,
-        36,
-        174,
-        228,
-        210,
-        54,
-        146,
-        27,
-        111,
-        66,
-        114,
-        16,
-        17,
-        97,
-        19,
-        113,
-        21,
-        163,
-        180,
-        196,
-        166,
-        95,
-        134,
-        119,
-        177,
-        36,
-        192,
-        28,
-        0,
-        0,
-        0,
-        49,
-        65,
-        111,
-        6,
-        45,
-        144,
-        62,
-        129,
-        207,
-        96,
-        0,
-        0,
-        0,
-        50,
-        49,
-        75,
-        253,
-        9,
-        79,
-        72,
-        192,
-        0,
-        0,
-        0,
-        53,
-        137,
-        1,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        66,
-        0,
-        0,
-        0,
-        54,
-        137,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        66,
-        0,
-        0,
-        0,
-        57,
-        137,
-        2,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        66
+        1, 0, 1, 72, 4, 0, 4, 141, 97, 126, 192, 90, 203, 191, 95, 226, 69, 41,
+        166, 75, 35, 133, 169, 106, 173, 67, 240, 155, 225, 173, 169, 44, 112,
+        64, 49, 220, 193, 72, 27, 65, 111, 5, 225, 147, 53, 50, 134, 160, 235,
+        221, 239, 221, 164, 142, 178, 170, 127, 102, 236, 247, 148, 10, 40, 14,
+        158, 243, 251, 46, 149, 219, 9, 149, 83, 132, 64, 166, 42, 247, 152, 97,
+        0, 235, 190, 96, 156, 211, 204, 209, 31, 39, 62, 185, 67, 116, 214, 211,
+        162, 247, 133, 108, 95, 16, 57, 220, 72, 119, 198, 163, 52, 24, 138,
+        199, 193, 70, 64, 215, 56, 69, 54, 78, 198, 145, 246, 222, 251, 96, 106,
+        58, 114, 253, 165, 215, 173, 51, 209, 125, 4, 153, 90, 142, 37, 44, 74,
+        6, 216, 0, 112, 142, 127, 207, 104, 235, 171, 108, 135, 50, 38, 134,
+        202, 196, 188, 219, 95, 43, 212, 199, 31, 51, 123, 24, 209, 71, 253,
+        154, 108, 68, 173, 19, 12, 194, 74, 180, 47, 190, 197, 49, 125, 155, 26,
+        44, 164, 124, 169, 185, 59, 158, 195, 109, 121, 142, 253, 124, 218, 167,
+        57, 36, 22, 48, 203, 70, 0, 85, 97, 141, 181, 255, 36, 174, 228, 210,
+        54, 146, 27, 111, 66, 114, 16, 17, 97, 19, 113, 21, 163, 180, 196, 166,
+        95, 134, 119, 177, 36, 192, 28, 0, 0, 0, 49, 65, 111, 6, 45, 144, 62,
+        129, 207, 96, 0, 0, 0, 50, 49, 75, 253, 9, 79, 72, 192, 0, 0, 0, 53,
+        137, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66, 0, 0, 0, 54,
+        137, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66, 0, 0, 0, 57,
+        137, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 66
       ],
       "state_diffs_hash": "0xb18f72a4a5b4b8ce1b7e41095fb1332a211a140376bcc2607910875d236708e0",
       "aux_commitments": {
         "events_queue_commitment": "0x6193a5098eb140796387bdf40700a3855eeb010474b5478f30bf917172c67883",
         "bootloader_initial_content_commitment": "0xf031b4491c37f20516c4ebf428f4765156409f67089e64772f4106fd2d9f3351"
       },
-      "blob_linear_hashes": ["0x0000000000000000000000000000000000000000000000000000000000000003", "0x0000000000000000000000000000000000000000000000000000000000000004", "0x0000000000000000000000000000000000000000000000000000000000000005", "0x0000000000000000000000000000000000000000000000000000000000000006", "0x0000000000000000000000000000000000000000000000000000000000000007", "0x0000000000000000000000000000000000000000000000000000000000000008","0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"],
-      "blob_commitments": ["0x0000000000000000000000000000000000000000000000000000000000000001", "0x0000000000000000000000000000000000000000000000000000000000000002", "0x0000000000000000000000000000000000000000000000000000000000000003", "0x0000000000000000000000000000000000000000000000000000000000000004", "0x0000000000000000000000000000000000000000000000000000000000000005", "0x0000000000000000000000000000000000000000000000000000000000000006", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000"]
+      "blob_linear_hashes": [
+        "0x0000000000000000000000000000000000000000000000000000000000000003",
+        "0x0000000000000000000000000000000000000000000000000000000000000004",
+        "0x0000000000000000000000000000000000000000000000000000000000000005",
+        "0x0000000000000000000000000000000000000000000000000000000000000006",
+        "0x0000000000000000000000000000000000000000000000000000000000000007",
+        "0x0000000000000000000000000000000000000000000000000000000000000008",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000"
+      ],
+      "blob_commitments": [
+        "0x0000000000000000000000000000000000000000000000000000000000000001",
+        "0x0000000000000000000000000000000000000000000000000000000000000002",
+        "0x0000000000000000000000000000000000000000000000000000000000000003",
+        "0x0000000000000000000000000000000000000000000000000000000000000004",
+        "0x0000000000000000000000000000000000000000000000000000000000000005",
+        "0x0000000000000000000000000000000000000000000000000000000000000006",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "0x0000000000000000000000000000000000000000000000000000000000000000"
+      ]
     }
   },
   "hashes": {
diff --git a/core/lib/types/src/contract_verification_api.rs b/core/lib/types/src/contract_verification_api.rs
index 033bb9dc9f36..588de3cb675e 100644
--- a/core/lib/types/src/contract_verification_api.rs
+++ b/core/lib/types/src/contract_verification_api.rs
@@ -140,7 +140,7 @@ pub struct VerificationIncomingRequest {
     pub optimizer_mode: Option<String>,
     #[serde(default)]
     pub constructor_arguments: Bytes,
-    #[serde(default)]
+    #[serde(default, alias = "enableEraVMExtensions")]
     pub is_system: bool,
     #[serde(default)]
     pub force_evmla: bool,
diff --git a/core/lib/types/src/fee.rs b/core/lib/types/src/fee.rs
index 5f32beb2fd4c..524015cdd095 100644
--- a/core/lib/types/src/fee.rs
+++ b/core/lib/types/src/fee.rs
@@ -57,9 +57,9 @@ impl Default for TransactionExecutionMetrics {
 pub struct Fee {
     /// The limit of gas that are to be spent on the actual transaction.
     pub gas_limit: U256,
-    /// zkSync version of EIP1559 maxFeePerGas.
+    /// ZKsync version of EIP1559 maxFeePerGas.
     pub max_fee_per_gas: U256,
-    /// zkSync version of EIP1559 maxPriorityFeePerGas.
+    /// ZKsync version of EIP1559 maxPriorityFeePerGas.
     pub max_priority_fee_per_gas: U256,
     /// The maximal gas per pubdata byte the user agrees to.
     pub gas_per_pubdata_limit: U256,
diff --git a/core/lib/types/src/fee_model.rs b/core/lib/types/src/fee_model.rs
index 74629f33576e..38d785113e5f 100644
--- a/core/lib/types/src/fee_model.rs
+++ b/core/lib/types/src/fee_model.rs
@@ -1,3 +1,6 @@
+use std::num::NonZeroU64;
+
+use bigdecimal::{BigDecimal, ToPrimitive};
 use serde::{Deserialize, Serialize};
 use zksync_config::configs::chain::{FeeModelVersion, StateKeeperConfig};
 use zksync_system_constants::L1_GAS_PER_PUBDATA_BYTE;
@@ -9,7 +12,7 @@ use crate::ProtocolVersionId;
 /// versions of Era prior to 1.4.1 integration.
 /// - `PubdataIndependent`: L1 gas price and pubdata price are not necessarily dependent on one another. This options is more suitable for the
 /// versions of Era after the 1.4.1 integration. It is expected that if a VM supports `PubdataIndependent` version, then it should also support `L1Pegged` version, but converting it into `PubdataIndependentBatchFeeModelInput` in-place.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub enum BatchFeeInput {
     L1Pegged(L1PeggedBatchFeeModelInput),
     PubdataIndependent(PubdataIndependentBatchFeeModelInput),
@@ -137,7 +140,7 @@ impl BatchFeeInput {
 }
 
 /// Pubdata is only published via calldata and so its price is pegged to the L1 gas price.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub struct L1PeggedBatchFeeModelInput {
     /// Fair L2 gas price to provide
     pub fair_l2_gas_price: u64,
@@ -157,10 +160,10 @@ pub struct PubdataIndependentBatchFeeModelInput {
 }
 
 /// The enum which represents the version of the fee model. It is used to determine which fee model should be used for the batch.
-/// - `V1`, the first model that was used in zkSync Era. In this fee model, the pubdata price must be pegged to the L1 gas price.
+/// - `V1`, the first model that was used in ZKsync Era. In this fee model, the pubdata price must be pegged to the L1 gas price.
 /// Also, the fair L2 gas price is expected to only include the proving/computation price for the operator and not the costs that come from
 /// processing the batch on L1.
-/// - `V2`, the second model that was used in zkSync Era. There the pubdata price might be independent from the L1 gas price. Also,
+/// - `V2`, the second model that was used in ZKsync Era. There the pubdata price might be independent from the L1 gas price. Also,
 /// The fair L2 gas price is expected to both the proving/computation price for the operator and the costs that come from
 /// processing the batch on L1.
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
@@ -236,9 +239,86 @@ pub struct FeeParamsV1 {
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct FeeParamsV2 {
-    pub config: FeeModelConfigV2,
-    pub l1_gas_price: u64,
-    pub l1_pubdata_price: u64,
+    config: FeeModelConfigV2,
+    l1_gas_price: u64,
+    l1_pubdata_price: u64,
+    conversion_ratio: BaseTokenConversionRatio,
+}
+
+impl FeeParamsV2 {
+    pub fn new(
+        config: FeeModelConfigV2,
+        l1_gas_price: u64,
+        l1_pubdata_price: u64,
+        conversion_ratio: BaseTokenConversionRatio,
+    ) -> Self {
+        Self {
+            config,
+            l1_gas_price,
+            l1_pubdata_price,
+            conversion_ratio,
+        }
+    }
+
+    /// Returns the fee model config with the minimal L2 gas price denominated in the chain's base token (WEI or equivalent).
+    pub fn config(&self) -> FeeModelConfigV2 {
+        FeeModelConfigV2 {
+            minimal_l2_gas_price: self.convert_to_base_token(self.config.minimal_l2_gas_price),
+            ..self.config
+        }
+    }
+
+    /// Returns the l1 gas price denominated in the chain's base token (WEI or equivalent).
+    pub fn l1_gas_price(&self) -> u64 {
+        self.convert_to_base_token(self.l1_gas_price)
+    }
+
+    /// Returns the l1 pubdata price denominated in the chain's base token (WEI or equivalent).
+    pub fn l1_pubdata_price(&self) -> u64 {
+        self.convert_to_base_token(self.l1_pubdata_price)
+    }
+
+    /// Converts the fee param to the base token.
+    fn convert_to_base_token(&self, price_in_wei: u64) -> u64 {
+        let conversion_ratio = BigDecimal::from(self.conversion_ratio.numerator.get())
+            / BigDecimal::from(self.conversion_ratio.denominator.get());
+        let converted_price_bd = BigDecimal::from(price_in_wei) * conversion_ratio;
+
+        // Match on the converted price to ensure it can be represented as a u64
+        match converted_price_bd.to_u64() {
+            Some(converted_price) => converted_price,
+            None => {
+                if converted_price_bd > BigDecimal::from(u64::MAX) {
+                    tracing::warn!(
+                        "Conversion to base token price failed: converted price is too large: {}. Using u64::MAX instead.",
+                        converted_price_bd
+                    );
+                } else {
+                    panic!(
+                        "Conversion to base token price failed: converted price is not a valid u64: {}",
+                        converted_price_bd
+                    );
+                }
+                u64::MAX
+            }
+        }
+    }
+}
+
+/// The struct that represents the BaseToken<->ETH conversion ratio.
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub struct BaseTokenConversionRatio {
+    pub numerator: NonZeroU64,
+    pub denominator: NonZeroU64,
+}
+
+impl Default for BaseTokenConversionRatio {
+    fn default() -> Self {
+        Self {
+            numerator: NonZeroU64::new(1).unwrap(),
+            denominator: NonZeroU64::new(1).unwrap(),
+        }
+    }
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
diff --git a/core/lib/types/src/l1/mod.rs b/core/lib/types/src/l1/mod.rs
index e94be684f9d7..05f08987a2d3 100644
--- a/core/lib/types/src/l1/mod.rs
+++ b/core/lib/types/src/l1/mod.rs
@@ -1,17 +1,16 @@
-//! Definition of zkSync network priority operations: operations initiated from the L1.
+//! Definition of ZKsync network priority operations: operations initiated from the L1.
 
 use std::convert::TryFrom;
 
 use serde::{Deserialize, Serialize};
-use zksync_basic_types::{
-    ethabi::{decode, ParamType, Token},
-    web3::Log,
-    Address, L1BlockNumber, PriorityOpId, H160, H256, U256,
+use zksync_basic_types::{web3::Log, Address, L1BlockNumber, PriorityOpId, H256, U256};
+use zksync_utils::{
+    address_to_u256, bytecode::hash_bytecode, h256_to_u256, u256_to_account_address,
 };
-use zksync_utils::u256_to_account_address;
 
 use super::Transaction;
 use crate::{
+    abi, ethabi,
     helpers::unix_timestamp_ms,
     l1::error::L1TxParseError,
     l2::TransactionType,
@@ -73,15 +72,39 @@ pub fn is_l1_tx_type(tx_type: u8) -> bool {
     tx_type == PRIORITY_OPERATION_L2_TX_TYPE || tx_type == PROTOCOL_UPGRADE_TX_TYPE
 }
 
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+// TODO(PLA-962): remove once all nodes start treating the deprecated fields as optional.
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
+struct L1TxCommonDataSerde {
+    pub sender: Address,
+    pub serial_id: PriorityOpId,
+    pub layer_2_tip_fee: U256,
+    pub full_fee: U256,
+    pub max_fee_per_gas: U256,
+    pub gas_limit: U256,
+    pub gas_per_pubdata_limit: U256,
+    pub op_processing_type: OpProcessingType,
+    pub priority_queue_type: PriorityQueueType,
+    pub canonical_tx_hash: H256,
+    pub to_mint: U256,
+    pub refund_recipient: Address,
+
+    /// DEPRECATED.
+    #[serde(default)]
+    pub deadline_block: u64,
+    #[serde(default)]
+    pub eth_hash: H256,
+    #[serde(default)]
+    pub eth_block: u64,
+}
+
+#[derive(Default, Debug, Clone, PartialEq)]
 pub struct L1TxCommonData {
     /// Sender of the transaction.
     pub sender: Address,
     /// Unique ID of the priority operation.
     pub serial_id: PriorityOpId,
-    /// Ethereum deadline block until which operation must be processed.
-    pub deadline_block: u64,
+
     /// Additional payment to the operator as an incentive to perform the operation. The contract uses a value of 192 bits.
     pub layer_2_tip_fee: U256,
     /// The total cost the sender paid for the transaction.
@@ -96,16 +119,63 @@ pub struct L1TxCommonData {
     pub op_processing_type: OpProcessingType,
     /// Priority operations queue type.
     pub priority_queue_type: PriorityQueueType,
-    /// Hash of the corresponding Ethereum transaction. Size should be 32 bytes.
-    pub eth_hash: H256,
-    /// Block in which Ethereum transaction was included.
-    pub eth_block: u64,
-    /// Tx hash of the transaction in the zkSync network. Calculated as the encoded transaction data hash.
+    /// Tx hash of the transaction in the ZKsync network. Calculated as the encoded transaction data hash.
     pub canonical_tx_hash: H256,
     /// The amount of ETH that should be minted with this transaction
     pub to_mint: U256,
     /// The recipient of the refund of the transaction
     pub refund_recipient: Address,
+
+    // DEPRECATED.
+    pub eth_block: u64,
+}
+
+impl serde::Serialize for L1TxCommonData {
+    fn serialize<S: serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
+        L1TxCommonDataSerde {
+            sender: self.sender,
+            serial_id: self.serial_id,
+            layer_2_tip_fee: self.layer_2_tip_fee,
+            full_fee: self.full_fee,
+            max_fee_per_gas: self.max_fee_per_gas,
+            gas_limit: self.gas_limit,
+            gas_per_pubdata_limit: self.gas_per_pubdata_limit,
+            op_processing_type: self.op_processing_type,
+            priority_queue_type: self.priority_queue_type,
+            canonical_tx_hash: self.canonical_tx_hash,
+            to_mint: self.to_mint,
+            refund_recipient: self.refund_recipient,
+
+            // DEPRECATED.
+            deadline_block: 0,
+            eth_hash: H256::default(),
+            eth_block: self.eth_block,
+        }
+        .serialize(s)
+    }
+}
+
+impl<'de> serde::Deserialize<'de> for L1TxCommonData {
+    fn deserialize<D: serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
+        let x = L1TxCommonDataSerde::deserialize(d)?;
+        Ok(Self {
+            sender: x.sender,
+            serial_id: x.serial_id,
+            layer_2_tip_fee: x.layer_2_tip_fee,
+            full_fee: x.full_fee,
+            max_fee_per_gas: x.max_fee_per_gas,
+            gas_limit: x.gas_limit,
+            gas_per_pubdata_limit: x.gas_per_pubdata_limit,
+            op_processing_type: x.op_processing_type,
+            priority_queue_type: x.priority_queue_type,
+            canonical_tx_hash: x.canonical_tx_hash,
+            to_mint: x.to_mint,
+            refund_recipient: x.refund_recipient,
+
+            // DEPRECATED.
+            eth_block: x.eth_block,
+        })
+    }
 }
 
 impl L1TxCommonData {
@@ -194,161 +264,114 @@ impl L1Tx {
     }
 }
 
-impl TryFrom<Log> for L1Tx {
-    type Error = L1TxParseError;
-
-    fn try_from(event: Log) -> Result<Self, Self::Error> {
-        // TODO: refactor according to tx type
-        let transaction_param_type = ParamType::Tuple(vec![
-            ParamType::Uint(8),                                       // `txType`
-            ParamType::Address,                                       // sender
-            ParamType::Address,                                       // to
-            ParamType::Uint(256),                                     // gasLimit
-            ParamType::Uint(256),                                     // `gasPerPubdataLimit`
-            ParamType::Uint(256),                                     // maxFeePerGas
-            ParamType::Uint(256),                                     // maxPriorityFeePerGas
-            ParamType::Address,                                       // paymaster
-            ParamType::Uint(256),                                     // nonce (serial ID)
-            ParamType::Uint(256),                                     // value
-            ParamType::FixedArray(Box::new(ParamType::Uint(256)), 4), // reserved
-            ParamType::Bytes,                                         // calldata
-            ParamType::Bytes,                                         // signature
-            ParamType::Array(Box::new(ParamType::Uint(256))),         // factory deps
-            ParamType::Bytes,                                         // paymaster input
-            ParamType::Bytes,                                         // `reservedDynamic`
-        ]);
-
-        let mut dec_ev = decode(
-            &[
-                ParamType::Uint(256),                         // tx ID
-                ParamType::FixedBytes(32),                    // tx hash
-                ParamType::Uint(64),                          // expiration block
-                transaction_param_type,                       // transaction data
-                ParamType::Array(Box::new(ParamType::Bytes)), // factory deps
-            ],
-            &event.data.0,
-        )?;
-
-        let eth_hash = event
-            .transaction_hash
-            .expect("Event transaction hash is missing");
-        let eth_block = event
-            .block_number
-            .expect("Event block number is missing")
-            .as_u64();
-
-        let serial_id = PriorityOpId(
-            dec_ev
-                .remove(0)
-                .into_uint()
-                .as_ref()
-                .map(U256::as_u64)
-                .unwrap(),
-        );
-
-        let canonical_tx_hash = H256::from_slice(&dec_ev.remove(0).into_fixed_bytes().unwrap());
-
-        let deadline_block = dec_ev.remove(0).into_uint().unwrap().as_u64();
-
-        // Decoding transaction bytes
-        let mut transaction = match dec_ev.remove(0) {
-            Token::Tuple(tx) => tx,
-            _ => unreachable!(),
-        };
-
-        assert_eq!(transaction.len(), 16);
-
-        let tx_type = transaction.remove(0).into_uint().unwrap();
-        assert_eq!(tx_type.clone(), U256::from(PRIORITY_OPERATION_L2_TX_TYPE));
-
-        let sender = transaction.remove(0).into_address().unwrap();
-        let contract_address = transaction.remove(0).into_address().unwrap();
-
-        let gas_limit = transaction.remove(0).into_uint().unwrap();
-
-        let gas_per_pubdata_limit = transaction.remove(0).into_uint().unwrap();
-
-        let max_fee_per_gas = transaction.remove(0).into_uint().unwrap();
-
-        let max_priority_fee_per_gas = transaction.remove(0).into_uint().unwrap();
-        assert_eq!(max_priority_fee_per_gas, U256::zero());
-
-        let paymaster = transaction.remove(0).into_address().unwrap();
-        assert_eq!(paymaster, H160::zero());
-
-        let serial_id_from_tx = transaction.remove(0).into_uint().unwrap();
-        assert_eq!(serial_id_from_tx, serial_id.0.into()); // serial id from decoded from transaction bytes should be equal to one from event
-
-        let msg_value = transaction.remove(0).into_uint().unwrap();
-
-        let reserved = transaction
-            .remove(0)
-            .into_fixed_array()
-            .unwrap()
-            .into_iter()
-            .map(|token| token.into_uint().unwrap())
-            .collect::<Vec<_>>();
-        assert_eq!(reserved.len(), 4);
-
-        let to_mint = reserved[0];
-        let refund_recipient = u256_to_account_address(&reserved[1]);
-
-        // All other reserved fields should be zero
-        for item in reserved.iter().skip(2) {
-            assert_eq!(item, &U256::zero());
+impl From<L1Tx> for abi::NewPriorityRequest {
+    fn from(t: L1Tx) -> Self {
+        let factory_deps = t.execute.factory_deps;
+        Self {
+            tx_id: t.common_data.serial_id.0.into(),
+            tx_hash: t.common_data.canonical_tx_hash.to_fixed_bytes(),
+            expiration_timestamp: 0,
+            transaction: abi::L2CanonicalTransaction {
+                tx_type: PRIORITY_OPERATION_L2_TX_TYPE.into(),
+                from: address_to_u256(&t.common_data.sender),
+                to: address_to_u256(&t.execute.contract_address),
+                gas_limit: t.common_data.gas_limit,
+                gas_per_pubdata_byte_limit: t.common_data.gas_per_pubdata_limit,
+                max_fee_per_gas: t.common_data.max_fee_per_gas,
+                max_priority_fee_per_gas: 0.into(),
+                paymaster: 0.into(),
+                nonce: t.common_data.serial_id.0.into(),
+                value: t.execute.value,
+                reserved: [
+                    t.common_data.to_mint,
+                    address_to_u256(&t.common_data.refund_recipient),
+                    0.into(),
+                    0.into(),
+                ],
+                data: t.execute.calldata,
+                signature: vec![],
+                factory_deps: factory_deps
+                    .iter()
+                    .map(|b| h256_to_u256(hash_bytecode(b)))
+                    .collect(),
+                paymaster_input: vec![],
+                reserved_dynamic: vec![],
+            }
+            .into(),
+            factory_deps,
         }
+    }
+}
 
-        let calldata = transaction.remove(0).into_bytes().unwrap();
-
-        let signature = transaction.remove(0).into_bytes().unwrap();
-        assert_eq!(signature.len(), 0);
-
-        // TODO (SMA-1621): check that `reservedDynamic` are constructed correctly.
-        let _factory_deps_hashes = transaction.remove(0).into_array().unwrap();
-        let _paymaster_input = transaction.remove(0).into_bytes().unwrap();
-        let _reserved_dynamic = transaction.remove(0).into_bytes().unwrap();
-
-        // Decoding metadata
-
-        // Finally, decode the factory dependencies
-        let factory_deps = match dec_ev.remove(0) {
-            Token::Array(factory_deps) => factory_deps,
-            _ => unreachable!(),
-        };
-
-        let factory_deps = factory_deps
-            .into_iter()
-            .map(|token| token.into_bytes().unwrap())
-            .collect::<Vec<_>>();
+impl TryFrom<abi::NewPriorityRequest> for L1Tx {
+    type Error = anyhow::Error;
+
+    /// Note that this method doesn't set `eth_block` and `received_timestamp_ms`
+    /// because `req` doesn't contain those. They can be set after this conversion.
+    fn try_from(req: abi::NewPriorityRequest) -> anyhow::Result<Self> {
+        anyhow::ensure!(req.transaction.tx_type == PRIORITY_OPERATION_L2_TX_TYPE.into());
+        anyhow::ensure!(req.transaction.nonce == req.tx_id); // serial id from decoded from transaction bytes should be equal to one from event
+        anyhow::ensure!(req.transaction.max_priority_fee_per_gas == U256::zero());
+        anyhow::ensure!(req.transaction.paymaster == U256::zero());
+        anyhow::ensure!(req.transaction.hash() == H256::from_slice(&req.tx_hash));
+        let factory_deps_hashes: Vec<_> = req
+            .factory_deps
+            .iter()
+            .map(|b| h256_to_u256(hash_bytecode(b)))
+            .collect();
+        anyhow::ensure!(req.transaction.factory_deps == factory_deps_hashes);
+        for item in &req.transaction.reserved[2..] {
+            anyhow::ensure!(item == &U256::zero());
+        }
+        anyhow::ensure!(req.transaction.signature.is_empty());
+        anyhow::ensure!(req.transaction.paymaster_input.is_empty());
+        anyhow::ensure!(req.transaction.reserved_dynamic.is_empty());
 
         let common_data = L1TxCommonData {
-            serial_id,
-            canonical_tx_hash,
-            sender,
-            deadline_block,
+            serial_id: PriorityOpId(req.transaction.nonce.try_into().unwrap()),
+            canonical_tx_hash: H256::from_slice(&req.tx_hash),
+            sender: u256_to_account_address(&req.transaction.from),
             layer_2_tip_fee: U256::zero(),
-            to_mint,
-            refund_recipient,
+            to_mint: req.transaction.reserved[0],
+            refund_recipient: u256_to_account_address(&req.transaction.reserved[1]),
             full_fee: U256::zero(),
-            gas_limit,
-            max_fee_per_gas,
-            gas_per_pubdata_limit,
+            gas_limit: req.transaction.gas_limit,
+            max_fee_per_gas: req.transaction.max_fee_per_gas,
+            gas_per_pubdata_limit: req.transaction.gas_per_pubdata_byte_limit,
             op_processing_type: OpProcessingType::Common,
             priority_queue_type: PriorityQueueType::Deque,
-            eth_hash,
-            eth_block,
+            // DEPRECATED.
+            eth_block: 0,
         };
 
         let execute = Execute {
-            contract_address,
-            calldata: calldata.to_vec(),
-            factory_deps: Some(factory_deps),
-            value: msg_value,
+            contract_address: u256_to_account_address(&req.transaction.to),
+            calldata: req.transaction.data,
+            factory_deps: req.factory_deps,
+            value: req.transaction.value,
         };
         Ok(Self {
             common_data,
             execute,
-            received_timestamp_ms: unix_timestamp_ms(),
+            received_timestamp_ms: 0,
         })
     }
 }
+
+impl TryFrom<Log> for L1Tx {
+    type Error = L1TxParseError;
+
+    fn try_from(event: Log) -> Result<Self, Self::Error> {
+        let mut tx: L1Tx = abi::NewPriorityRequest::decode(&event.data.0)?
+            .try_into()
+            .map_err(|err| L1TxParseError::from(ethabi::Error::Other(format!("{err:#}").into())))?;
+        // TODO (PLA-962): start setting it to 0 for all new transactions.
+        tx.common_data.eth_block = event
+            .block_number
+            .expect("Event block number is missing")
+            .try_into()
+            .unwrap();
+        tx.received_timestamp_ms = unix_timestamp_ms();
+        Ok(tx)
+    }
+}
diff --git a/core/lib/types/src/l2/mod.rs b/core/lib/types/src/l2/mod.rs
index bf232f0eb15e..5a5276407529 100644
--- a/core/lib/types/src/l2/mod.rs
+++ b/core/lib/types/src/l2/mod.rs
@@ -2,7 +2,7 @@ use std::convert::TryFrom;
 
 use anyhow::Context as _;
 use num_enum::TryFromPrimitive;
-use rlp::{Rlp, RlpStream};
+use rlp::Rlp;
 use serde::{Deserialize, Serialize};
 use zksync_crypto_primitives::K256PrivateKey;
 
@@ -15,8 +15,8 @@ use crate::{
     transaction_request::PaymasterParams,
     tx::Execute,
     web3::Bytes,
-    Address, EIP712TypedStructure, Eip712Domain, ExecuteTransactionCommon, InputData, L2ChainId,
-    Nonce, PackedEthSignature, StructBuilder, Transaction, EIP_1559_TX_TYPE, EIP_2930_TX_TYPE,
+    Address, EIP712TypedStructure, ExecuteTransactionCommon, InputData, L2ChainId, Nonce,
+    PackedEthSignature, StructBuilder, Transaction, EIP_1559_TX_TYPE, EIP_2930_TX_TYPE,
     EIP_712_TX_TYPE, H256, LEGACY_TX_TYPE, PRIORITY_OPERATION_L2_TX_TYPE, PROTOCOL_UPGRADE_TX_TYPE,
     U256, U64,
 };
@@ -31,7 +31,7 @@ pub enum TransactionType {
     LegacyTransaction = 0,
     EIP2930Transaction = 1,
     EIP1559Transaction = 2,
-    // EIP 712 transaction with additional fields specified for zkSync
+    // EIP 712 transaction with additional fields specified for ZKsync
     EIP712Transaction = EIP_712_TX_TYPE as u32,
     PriorityOpTransaction = PRIORITY_OPERATION_L2_TX_TYPE as u32,
     ProtocolUpgradeTransaction = PROTOCOL_UPGRADE_TX_TYPE as u32,
@@ -159,7 +159,7 @@ impl L2Tx {
         fee: Fee,
         initiator_address: Address,
         value: U256,
-        factory_deps: Option<Vec<Vec<u8>>>,
+        factory_deps: Vec<Vec<u8>>,
         paymaster_params: PaymasterParams,
     ) -> Self {
         Self {
@@ -192,11 +192,11 @@ impl L2Tx {
         value: U256,
         chain_id: L2ChainId,
         private_key: &K256PrivateKey,
-        factory_deps: Option<Vec<Vec<u8>>>,
+        factory_deps: Vec<Vec<u8>>,
         paymaster_params: PaymasterParams,
     ) -> Result<Self, SignError> {
         let initiator_address = private_key.address();
-        let mut res = Self::new(
+        let tx = Self::new(
             contract_address,
             calldata,
             nonce,
@@ -206,10 +206,19 @@ impl L2Tx {
             factory_deps,
             paymaster_params,
         );
-
-        let data = res.get_signed_bytes(chain_id);
-        res.set_signature(PackedEthSignature::sign_raw(private_key, &data).context("sign_raw")?);
-        Ok(res)
+        // We do a whole dance to reconstruct missing data: RLP encoding, hash and signature.
+        let mut req: TransactionRequest = tx.into();
+        req.chain_id = Some(chain_id.as_u64());
+        let data = req
+            .get_default_signed_message()
+            .context("get_default_signed_message()")?;
+        let sig = PackedEthSignature::sign_raw(private_key, &data).context("sign_raw")?;
+        let raw = req.get_signed_bytes(&sig).context("get_signed_bytes")?;
+        let (req, hash) =
+            TransactionRequest::from_bytes_unverified(&raw).context("from_bytes_unverified()")?;
+        let mut tx = L2Tx::from_request_unverified(req).context("from_request_unverified()")?;
+        tx.set_input(raw, hash);
+        Ok(tx)
     }
 
     /// Returns the hash of the transaction.
@@ -236,24 +245,11 @@ impl L2Tx {
         self.common_data.set_input(data, hash)
     }
 
-    pub fn get_rlp_bytes(&self, chain_id: L2ChainId) -> Bytes {
-        let mut rlp_stream = RlpStream::new();
-        let tx: TransactionRequest = self.clone().into();
-        tx.rlp(&mut rlp_stream, chain_id.as_u64(), None);
-        Bytes(rlp_stream.as_raw().to_vec())
-    }
-
     pub fn get_signed_bytes(&self, chain_id: L2ChainId) -> H256 {
-        let tx: TransactionRequest = self.clone().into();
-        if tx.is_eip712_tx() {
-            PackedEthSignature::typed_data_to_signed_bytes(&Eip712Domain::new(chain_id), &tx)
-        } else {
-            let mut data = self.get_rlp_bytes(chain_id).0;
-            if let Some(tx_type) = tx.transaction_type {
-                data.insert(0, tx_type.as_u32() as u8);
-            }
-            PackedEthSignature::message_to_signed_bytes(&data)
-        }
+        let mut req: TransactionRequest = self.clone().into();
+        req.chain_id = Some(chain_id.as_u64());
+        // It is ok to unwrap, because the `chain_id` is set.
+        req.get_default_signed_message().unwrap()
     }
 
     pub fn set_signature(&mut self, signature: PackedEthSignature) {
@@ -271,7 +267,7 @@ impl L2Tx {
     pub fn abi_encoding_len(&self) -> usize {
         let data_len = self.execute.calldata.len();
         let signature_len = self.common_data.signature.len();
-        let factory_deps_len = self.execute.factory_deps_length();
+        let factory_deps_len = self.execute.factory_deps.len();
         let paymaster_input_len = self.common_data.paymaster_params.paymaster_input.len();
 
         encoding_len(
@@ -294,9 +290,8 @@ impl L2Tx {
     pub fn factory_deps_len(&self) -> u32 {
         self.execute
             .factory_deps
-            .as_ref()
-            .map(|deps| deps.iter().fold(0u32, |len, item| len + item.len() as u32))
-            .unwrap_or_default()
+            .iter()
+            .fold(0u32, |len, item| len + item.len() as u32)
     }
 }
 
@@ -491,7 +486,7 @@ mod tests {
                 contract_address: Default::default(),
                 calldata: vec![],
                 value: U256::zero(),
-                factory_deps: None,
+                factory_deps: vec![],
             },
             common_data: L2TxCommonData {
                 nonce: Nonce(0),
diff --git a/core/lib/types/src/lib.rs b/core/lib/types/src/lib.rs
index 25f4173831b7..105d43aa6c6c 100644
--- a/core/lib/types/src/lib.rs
+++ b/core/lib/types/src/lib.rs
@@ -1,12 +1,13 @@
-//! zkSync types: essential type definitions for zkSync network.
+//! ZKsync types: essential type definitions for ZKsync network.
 //!
-//! `zksync_types` is a crate containing essential zkSync network types, such as transactions, operations and
+//! `zksync_types` is a crate containing essential ZKsync network types, such as transactions, operations and
 //! blockchain primitives.
 
 #![allow(clippy::upper_case_acronyms, clippy::derive_partial_eq_without_eq)]
 
 use std::{fmt, fmt::Debug};
 
+use anyhow::Context as _;
 pub use event::{VmEvent, VmEventGroupKey};
 use fee::encoding_len;
 pub use l1::L1TxCommonData;
@@ -17,12 +18,19 @@ pub use storage::*;
 pub use tx::Execute;
 pub use zksync_basic_types::{protocol_version::ProtocolVersionId, vm_version::VmVersion, *};
 pub use zksync_crypto_primitives::*;
-
-use crate::{l2::TransactionType, protocol_upgrade::ProtocolUpgradeTxCommonData};
+use zksync_utils::{
+    address_to_u256, bytecode::hash_bytecode, h256_to_u256, u256_to_account_address,
+};
+
+use crate::{
+    l2::{L2Tx, TransactionType},
+    protocol_upgrade::ProtocolUpgradeTxCommonData,
+};
 pub use crate::{Nonce, H256, U256, U64};
 
 pub type SerialId = u64;
 
+pub mod abi;
 pub mod aggregated_operations;
 pub mod blob;
 pub mod block;
@@ -49,13 +57,14 @@ pub mod vm_trace;
 pub mod zk_evm_types;
 
 pub mod api;
+pub mod base_token_ratio;
 pub mod eth_sender;
 pub mod helpers;
 pub mod proto;
 pub mod transaction_request;
 pub mod utils;
 
-/// Denotes the first byte of the special zkSync's EIP-712-signed transaction.
+/// Denotes the first byte of the special ZKsync's EIP-712-signed transaction.
 pub const EIP_712_TX_TYPE: u8 = 0x71;
 
 /// Denotes the first byte of the `EIP-1559` transaction.
@@ -184,12 +193,7 @@ impl Transaction {
     // Returns how many slots it takes to encode the transaction
     pub fn encoding_len(&self) -> usize {
         let data_len = self.execute.calldata.len();
-        let factory_deps_len = self
-            .execute
-            .factory_deps
-            .as_ref()
-            .map(|deps| deps.len())
-            .unwrap_or_default();
+        let factory_deps_len = self.execute.factory_deps.len();
         let (signature_len, paymaster_input_len) = match &self.common_data {
             ExecuteTransactionCommon::L1(_) => (0, 0),
             ExecuteTransactionCommon::L2(l2_common_data) => (
@@ -237,3 +241,163 @@ impl fmt::Display for ExecuteTransactionCommon {
         }
     }
 }
+
+impl TryFrom<Transaction> for abi::Transaction {
+    type Error = anyhow::Error;
+
+    fn try_from(tx: Transaction) -> anyhow::Result<Self> {
+        use ExecuteTransactionCommon as E;
+        let factory_deps = tx.execute.factory_deps;
+        Ok(match tx.common_data {
+            E::L2(data) => Self::L2(
+                data.input
+                    .context("input is required for L2 transactions")?
+                    .data,
+            ),
+            E::L1(data) => Self::L1 {
+                tx: abi::L2CanonicalTransaction {
+                    tx_type: PRIORITY_OPERATION_L2_TX_TYPE.into(),
+                    from: address_to_u256(&data.sender),
+                    to: address_to_u256(&tx.execute.contract_address),
+                    gas_limit: data.gas_limit,
+                    gas_per_pubdata_byte_limit: data.gas_per_pubdata_limit,
+                    max_fee_per_gas: data.max_fee_per_gas,
+                    max_priority_fee_per_gas: 0.into(),
+                    paymaster: 0.into(),
+                    nonce: data.serial_id.0.into(),
+                    value: tx.execute.value,
+                    reserved: [
+                        data.to_mint,
+                        address_to_u256(&data.refund_recipient),
+                        0.into(),
+                        0.into(),
+                    ],
+                    data: tx.execute.calldata,
+                    signature: vec![],
+                    factory_deps: factory_deps
+                        .iter()
+                        .map(|b| h256_to_u256(hash_bytecode(b)))
+                        .collect(),
+                    paymaster_input: vec![],
+                    reserved_dynamic: vec![],
+                }
+                .into(),
+                factory_deps,
+                eth_block: data.eth_block,
+            },
+            E::ProtocolUpgrade(data) => Self::L1 {
+                tx: abi::L2CanonicalTransaction {
+                    tx_type: PROTOCOL_UPGRADE_TX_TYPE.into(),
+                    from: address_to_u256(&data.sender),
+                    to: address_to_u256(&tx.execute.contract_address),
+                    gas_limit: data.gas_limit,
+                    gas_per_pubdata_byte_limit: data.gas_per_pubdata_limit,
+                    max_fee_per_gas: data.max_fee_per_gas,
+                    max_priority_fee_per_gas: 0.into(),
+                    paymaster: 0.into(),
+                    nonce: (data.upgrade_id as u16).into(),
+                    value: tx.execute.value,
+                    reserved: [
+                        data.to_mint,
+                        address_to_u256(&data.refund_recipient),
+                        0.into(),
+                        0.into(),
+                    ],
+                    data: tx.execute.calldata,
+                    signature: vec![],
+                    factory_deps: factory_deps
+                        .iter()
+                        .map(|b| h256_to_u256(hash_bytecode(b)))
+                        .collect(),
+                    paymaster_input: vec![],
+                    reserved_dynamic: vec![],
+                }
+                .into(),
+                factory_deps,
+                eth_block: data.eth_block,
+            },
+        })
+    }
+}
+
+impl TryFrom<abi::Transaction> for Transaction {
+    type Error = anyhow::Error;
+    fn try_from(tx: abi::Transaction) -> anyhow::Result<Self> {
+        Ok(match tx {
+            abi::Transaction::L1 {
+                tx,
+                factory_deps,
+                eth_block,
+            } => {
+                let factory_deps_hashes: Vec<_> = factory_deps
+                    .iter()
+                    .map(|b| h256_to_u256(hash_bytecode(b)))
+                    .collect();
+                anyhow::ensure!(tx.factory_deps == factory_deps_hashes);
+                for item in &tx.reserved[2..] {
+                    anyhow::ensure!(item == &U256::zero());
+                }
+                assert_eq!(tx.max_priority_fee_per_gas, U256::zero());
+                assert_eq!(tx.paymaster, U256::zero());
+                assert!(tx.signature.is_empty());
+                assert!(tx.paymaster_input.is_empty());
+                assert!(tx.reserved_dynamic.is_empty());
+                let hash = tx.hash();
+                Transaction {
+                    common_data: match tx.tx_type {
+                        t if t == PRIORITY_OPERATION_L2_TX_TYPE.into() => {
+                            ExecuteTransactionCommon::L1(L1TxCommonData {
+                                serial_id: PriorityOpId(
+                                    tx.nonce
+                                        .try_into()
+                                        .map_err(|err| anyhow::format_err!("{err}"))?,
+                                ),
+                                canonical_tx_hash: hash,
+                                sender: u256_to_account_address(&tx.from),
+                                layer_2_tip_fee: U256::zero(),
+                                to_mint: tx.reserved[0],
+                                refund_recipient: u256_to_account_address(&tx.reserved[1]),
+                                full_fee: U256::zero(),
+                                gas_limit: tx.gas_limit,
+                                max_fee_per_gas: tx.max_fee_per_gas,
+                                gas_per_pubdata_limit: tx.gas_per_pubdata_byte_limit,
+                                op_processing_type: l1::OpProcessingType::Common,
+                                priority_queue_type: l1::PriorityQueueType::Deque,
+                                eth_block,
+                            })
+                        }
+                        t if t == PROTOCOL_UPGRADE_TX_TYPE.into() => {
+                            ExecuteTransactionCommon::ProtocolUpgrade(ProtocolUpgradeTxCommonData {
+                                upgrade_id: tx.nonce.try_into().unwrap(),
+                                canonical_tx_hash: hash,
+                                sender: u256_to_account_address(&tx.from),
+                                to_mint: tx.reserved[0],
+                                refund_recipient: u256_to_account_address(&tx.reserved[1]),
+                                gas_limit: tx.gas_limit,
+                                max_fee_per_gas: tx.max_fee_per_gas,
+                                gas_per_pubdata_limit: tx.gas_per_pubdata_byte_limit,
+                                eth_block,
+                            })
+                        }
+                        unknown_type => anyhow::bail!("unknown tx type {unknown_type}"),
+                    },
+                    execute: Execute {
+                        contract_address: u256_to_account_address(&tx.to),
+                        calldata: tx.data,
+                        factory_deps,
+                        value: tx.value,
+                    },
+                    raw_bytes: None,
+                    received_timestamp_ms: helpers::unix_timestamp_ms(),
+                }
+            }
+            abi::Transaction::L2(raw) => {
+                let (req, hash) =
+                    transaction_request::TransactionRequest::from_bytes_unverified(&raw)?;
+                let mut tx = L2Tx::from_request_unverified(req)?;
+                tx.set_input(raw, hash);
+                tx.into()
+            }
+        })
+    }
+}
diff --git a/core/lib/types/src/proto/mod.proto b/core/lib/types/src/proto/mod.proto
index 163215bb1237..1e2ae0ede515 100644
--- a/core/lib/types/src/proto/mod.proto
+++ b/core/lib/types/src/proto/mod.proto
@@ -7,8 +7,12 @@ message SnapshotStorageLogsChunk {
 }
 
 message SnapshotStorageLog {
-    optional bytes account_address = 1; // required; H160
-    optional bytes storage_key = 2; // required; H256
+    // `account_address` and `storage_key` fields are obsolete and are not used in the new snapshot format;
+    // `hashed_key` is used instead. The fields are retained for now to support recovery from old snapshots.
+    optional bytes account_address = 1; // optional; H160
+    optional bytes storage_key = 2; // optional; H256
+    optional bytes hashed_key = 6; // optional; H256
+
     optional bytes storage_value = 3; // required; H256
     optional uint32 l1_batch_number_of_initial_write = 4; // required
     optional uint64 enumeration_index = 5; // required
diff --git a/core/lib/types/src/protocol_upgrade.rs b/core/lib/types/src/protocol_upgrade.rs
index 677f22e7fe44..c0d7267ebfae 100644
--- a/core/lib/types/src/protocol_upgrade.rs
+++ b/core/lib/types/src/protocol_upgrade.rs
@@ -1,16 +1,22 @@
 use std::convert::{TryFrom, TryInto};
 
+use anyhow::Context as _;
 use serde::{Deserialize, Serialize};
-use zksync_basic_types::protocol_version::{L1VerifierConfig, ProtocolVersionId, VerifierParams};
-use zksync_contracts::BaseSystemContractsHashes;
-use zksync_utils::u256_to_account_address;
+use zksync_basic_types::{
+    ethabi,
+    protocol_version::{
+        L1VerifierConfig, ProtocolSemanticVersion, ProtocolVersionId, VerifierParams,
+    },
+};
+use zksync_contracts::{
+    BaseSystemContractsHashes, ADMIN_EXECUTE_UPGRADE_FUNCTION,
+    ADMIN_UPGRADE_CHAIN_FROM_VERSION_FUNCTION,
+};
+use zksync_utils::h256_to_u256;
 
 use crate::{
-    ethabi::{decode, encode, ParamType, Token},
-    helpers::unix_timestamp_ms,
-    web3::{keccak256, Log},
-    Address, Execute, ExecuteTransactionCommon, Transaction, TransactionType, H256,
-    PROTOCOL_UPGRADE_TX_TYPE, U256,
+    abi, ethabi::ParamType, web3::Log, Address, Execute, ExecuteTransactionCommon, Transaction,
+    TransactionType, H256, U256,
 };
 
 /// Represents a call to be made during governance operation.
@@ -57,7 +63,7 @@ pub struct GovernanceOperation {
 #[derive(Debug, Clone, Default)]
 pub struct ProtocolUpgrade {
     /// New protocol version ID.
-    pub id: ProtocolVersionId,
+    pub version: ProtocolSemanticVersion,
     /// New bootloader code hash.
     pub bootloader_code_hash: Option<H256>,
     /// New default account code hash.
@@ -72,311 +78,130 @@ pub struct ProtocolUpgrade {
     pub tx: Option<ProtocolUpgradeTx>,
 }
 
-fn get_transaction_param_type() -> ParamType {
-    ParamType::Tuple(vec![
-        ParamType::Uint(256),                                     // `txType`
-        ParamType::Uint(256),                                     // sender
-        ParamType::Uint(256),                                     // to
-        ParamType::Uint(256),                                     // gasLimit
-        ParamType::Uint(256),                                     // `gasPerPubdataLimit`
-        ParamType::Uint(256),                                     // maxFeePerGas
-        ParamType::Uint(256),                                     // maxPriorityFeePerGas
-        ParamType::Uint(256),                                     // paymaster
-        ParamType::Uint(256),                                     // nonce (serial ID)
-        ParamType::Uint(256),                                     // value
-        ParamType::FixedArray(Box::new(ParamType::Uint(256)), 4), // reserved
-        ParamType::Bytes,                                         // calldata
-        ParamType::Bytes,                                         // signature
-        ParamType::Array(Box::new(ParamType::Uint(256))),         // factory deps
-        ParamType::Bytes,                                         // paymaster input
-        ParamType::Bytes,                                         // `reservedDynamic`
-    ])
+impl From<VerifierParams> for abi::VerifierParams {
+    fn from(x: VerifierParams) -> Self {
+        Self {
+            recursion_node_level_vk_hash: x.recursion_node_level_vk_hash.into(),
+            recursion_leaf_level_vk_hash: x.recursion_node_level_vk_hash.into(),
+            recursion_circuits_set_vks_hash: x.recursion_circuits_set_vks_hash.into(),
+        }
+    }
 }
 
-impl TryFrom<Log> for ProtocolUpgrade {
-    type Error = crate::ethabi::Error;
-
-    fn try_from(event: Log) -> Result<Self, Self::Error> {
-        let facet_cut_param_type = ParamType::Tuple(vec![
-            ParamType::Address,
-            ParamType::Uint(8),
-            ParamType::Bool,
-            ParamType::Array(Box::new(ParamType::FixedBytes(4))),
-        ]);
-        let diamond_cut_data_param_type = ParamType::Tuple(vec![
-            ParamType::Array(Box::new(facet_cut_param_type)),
-            ParamType::Address,
-            ParamType::Bytes,
-        ]);
-        let mut decoded = decode(
-            &[diamond_cut_data_param_type, ParamType::FixedBytes(32)],
-            &event.data.0,
-        )?;
-
-        let init_calldata = match decoded.remove(0) {
-            Token::Tuple(tokens) => tokens[2].clone().into_bytes().unwrap(),
-            _ => unreachable!(),
-        };
-
-        let transaction_param_type: ParamType = get_transaction_param_type();
-        let verifier_params_type = ParamType::Tuple(vec![
-            ParamType::FixedBytes(32),
-            ParamType::FixedBytes(32),
-            ParamType::FixedBytes(32),
-        ]);
-
-        let mut decoded = decode(
-            &[ParamType::Tuple(vec![
-                transaction_param_type,                       // transaction data
-                ParamType::Array(Box::new(ParamType::Bytes)), // factory deps
-                ParamType::FixedBytes(32),                    // bootloader code hash
-                ParamType::FixedBytes(32),                    // default account code hash
-                ParamType::Address,                           // verifier address
-                verifier_params_type,                         // verifier params
-                ParamType::Bytes,                             // l1 custom data
-                ParamType::Bytes,                             // l1 post-upgrade custom data
-                ParamType::Uint(256),                         // timestamp
-                ParamType::Uint(256),                         // version id
-            ])],
-            init_calldata
-                .get(4..)
-                .ok_or(crate::ethabi::Error::InvalidData)?,
-        )?;
-
-        let Token::Tuple(mut decoded) = decoded.remove(0) else {
-            unreachable!();
-        };
-
-        let Token::Tuple(transaction) = decoded.remove(0) else {
-            unreachable!()
-        };
-
-        let factory_deps = decoded.remove(0).into_array().unwrap();
-
-        let eth_hash = event
-            .transaction_hash
-            .expect("Event transaction hash is missing");
-        let eth_block = event
-            .block_number
-            .expect("Event block number is missing")
-            .as_u64();
-
-        let tx = ProtocolUpgradeTx::decode_tx(transaction, eth_hash, eth_block, factory_deps);
-        let bootloader_code_hash = H256::from_slice(&decoded.remove(0).into_fixed_bytes().unwrap());
-        let default_account_code_hash =
-            H256::from_slice(&decoded.remove(0).into_fixed_bytes().unwrap());
-        let verifier_address = decoded.remove(0).into_address().unwrap();
-        let Token::Tuple(mut verifier_params) = decoded.remove(0) else {
-            unreachable!()
-        };
-        let recursion_node_level_vk_hash =
-            H256::from_slice(&verifier_params.remove(0).into_fixed_bytes().unwrap());
-        let recursion_leaf_level_vk_hash =
-            H256::from_slice(&verifier_params.remove(0).into_fixed_bytes().unwrap());
-        let recursion_circuits_set_vks_hash =
-            H256::from_slice(&verifier_params.remove(0).into_fixed_bytes().unwrap());
-
-        let _l1_custom_data = decoded.remove(0);
-        let _l1_post_upgrade_custom_data = decoded.remove(0);
-        let timestamp = decoded.remove(0).into_uint().unwrap();
-        let version_id = decoded.remove(0).into_uint().unwrap();
-        if version_id > u16::MAX.into() {
-            panic!("Version ID is too big, max expected is {}", u16::MAX);
+impl From<abi::VerifierParams> for VerifierParams {
+    fn from(x: abi::VerifierParams) -> Self {
+        Self {
+            recursion_node_level_vk_hash: x.recursion_node_level_vk_hash.into(),
+            recursion_leaf_level_vk_hash: x.recursion_node_level_vk_hash.into(),
+            recursion_circuits_set_vks_hash: x.recursion_circuits_set_vks_hash.into(),
         }
+    }
+}
 
+impl ProtocolUpgrade {
+    /// `l1-contracts/contracts/state-transition/libraries/diamond.sol:DiamondCutData.initCalldata`
+    fn try_from_init_calldata(init_calldata: &[u8], eth_block: u64) -> anyhow::Result<Self> {
+        let upgrade = ethabi::decode(
+            &[abi::ProposedUpgrade::schema()],
+            init_calldata.get(4..).context("need >= 4 bytes")?,
+        )
+        .context("ethabi::decode()")?;
+        let upgrade = abi::ProposedUpgrade::decode(upgrade.into_iter().next().unwrap()).unwrap();
+        let bootloader_hash = H256::from_slice(&upgrade.bootloader_hash);
+        let default_account_hash = H256::from_slice(&upgrade.default_account_hash);
         Ok(Self {
-            id: ProtocolVersionId::try_from(version_id.as_u32() as u16)
-                .expect("Version is not supported"),
-            bootloader_code_hash: (bootloader_code_hash != H256::zero())
-                .then_some(bootloader_code_hash),
-            default_account_code_hash: (default_account_code_hash != H256::zero())
-                .then_some(default_account_code_hash),
-            verifier_params: (recursion_node_level_vk_hash != H256::zero()
-                || recursion_leaf_level_vk_hash != H256::zero()
-                || recursion_circuits_set_vks_hash != H256::zero())
-            .then_some(VerifierParams {
-                recursion_node_level_vk_hash,
-                recursion_leaf_level_vk_hash,
-                recursion_circuits_set_vks_hash,
-            }),
-            verifier_address: (verifier_address != Address::zero()).then_some(verifier_address),
-            timestamp: timestamp.as_u64(),
-            tx,
+            version: ProtocolSemanticVersion::try_from_packed(upgrade.new_protocol_version)
+                .map_err(|err| anyhow::format_err!("Version is not supported: {err}"))?,
+            bootloader_code_hash: (bootloader_hash != H256::zero()).then_some(bootloader_hash),
+            default_account_code_hash: (default_account_hash != H256::zero())
+                .then_some(default_account_hash),
+            verifier_params: (upgrade.verifier_params != abi::VerifierParams::default())
+                .then_some(upgrade.verifier_params.into()),
+            verifier_address: (upgrade.verifier != Address::zero()).then_some(upgrade.verifier),
+            timestamp: upgrade.upgrade_timestamp.try_into().unwrap(),
+            tx: (upgrade.l2_protocol_upgrade_tx.tx_type != U256::zero())
+                .then(|| {
+                    Transaction::try_from(abi::Transaction::L1 {
+                        tx: upgrade.l2_protocol_upgrade_tx,
+                        factory_deps: upgrade.factory_deps,
+                        eth_block,
+                    })
+                    .context("Transaction::try_from()")?
+                    .try_into()
+                    .map_err(|err| anyhow::format_err!("try_into::<ProtocolUpgradeTx>(): {err}"))
+                })
+                .transpose()?,
         })
     }
 }
 
 pub fn decode_set_chain_id_event(
     event: Log,
-) -> Result<(ProtocolVersionId, ProtocolUpgradeTx), crate::ethabi::Error> {
-    let transaction_param_type: ParamType = get_transaction_param_type();
-
-    let Token::Tuple(transaction) = decode(&[transaction_param_type], &event.data.0)?.remove(0)
-    else {
-        unreachable!()
-    };
-
-    let version_id = event.topics[2].to_low_u64_be();
-
-    let eth_hash = event
-        .transaction_hash
-        .expect("Event transaction hash is missing");
-    let eth_block = event
-        .block_number
-        .expect("Event block number is missing")
-        .as_u64();
-
-    let factory_deps: Vec<Token> = Vec::new();
-
-    let upgrade_tx = ProtocolUpgradeTx::decode_tx(transaction, eth_hash, eth_block, factory_deps)
-        .expect("Upgrade tx is missing");
-    let version_id =
-        ProtocolVersionId::try_from(version_id as u16).expect("Version is not supported");
-
-    Ok((version_id, upgrade_tx))
-}
-
-impl ProtocolUpgradeTx {
-    pub fn decode_tx(
-        mut transaction: Vec<Token>,
-        eth_hash: H256,
-        eth_block: u64,
-        factory_deps: Vec<Token>,
-    ) -> Option<ProtocolUpgradeTx> {
-        let canonical_tx_hash = H256(keccak256(&encode(&[Token::Tuple(transaction.clone())])));
-        assert_eq!(transaction.len(), 16);
-
-        let tx_type = transaction.remove(0).into_uint().unwrap();
-        if tx_type == U256::zero() {
-            // There is no upgrade tx.
-            return None;
-        }
-
-        assert_eq!(
-            tx_type,
-            PROTOCOL_UPGRADE_TX_TYPE.into(),
-            "Unexpected tx type {} when decoding upgrade",
-            tx_type
-        );
-
-        // There is an upgrade tx. Decoding it.
-        let sender = transaction.remove(0).into_uint().unwrap();
-        let sender = u256_to_account_address(&sender);
-
-        let contract_address = transaction.remove(0).into_uint().unwrap();
-        let contract_address = u256_to_account_address(&contract_address);
-
-        let gas_limit = transaction.remove(0).into_uint().unwrap();
-
-        let gas_per_pubdata_limit = transaction.remove(0).into_uint().unwrap();
-
-        let max_fee_per_gas = transaction.remove(0).into_uint().unwrap();
-
-        let max_priority_fee_per_gas = transaction.remove(0).into_uint().unwrap();
-        assert_eq!(max_priority_fee_per_gas, U256::zero());
-
-        let paymaster = transaction.remove(0).into_uint().unwrap();
-        let paymaster = u256_to_account_address(&paymaster);
-        assert_eq!(paymaster, Address::zero());
-
-        let upgrade_id = transaction.remove(0).into_uint().unwrap();
-
-        let msg_value = transaction.remove(0).into_uint().unwrap();
-
-        let reserved = transaction
-            .remove(0)
-            .into_fixed_array()
-            .unwrap()
-            .into_iter()
-            .map(|token| token.into_uint().unwrap())
-            .collect::<Vec<_>>();
-        assert_eq!(reserved.len(), 4);
-
-        let to_mint = reserved[0];
-        let refund_recipient = u256_to_account_address(&reserved[1]);
-
-        // All other reserved fields should be zero
-        for item in reserved.iter().skip(2) {
-            assert_eq!(item, &U256::zero());
-        }
-
-        let calldata = transaction.remove(0).into_bytes().unwrap();
-
-        let signature = transaction.remove(0).into_bytes().unwrap();
-        assert_eq!(signature.len(), 0);
-
-        let _factory_deps_hashes = transaction.remove(0).into_array().unwrap();
-
-        let paymaster_input = transaction.remove(0).into_bytes().unwrap();
-        assert_eq!(paymaster_input.len(), 0);
-
-        // TODO (SMA-1621): check that `reservedDynamic` are constructed correctly.
-        let reserved_dynamic = transaction.remove(0).into_bytes().unwrap();
-        assert_eq!(reserved_dynamic.len(), 0);
-
-        let common_data = ProtocolUpgradeTxCommonData {
-            canonical_tx_hash,
-            sender,
-            upgrade_id: (upgrade_id.as_u32() as u16).try_into().unwrap(),
-            to_mint,
-            refund_recipient,
-            gas_limit,
-            max_fee_per_gas,
-            gas_per_pubdata_limit,
-            eth_hash,
-            eth_block,
-        };
-
-        let factory_deps = factory_deps
-            .into_iter()
-            .map(|t| t.into_bytes().unwrap())
-            .collect();
-
-        let execute = Execute {
-            contract_address,
-            calldata: calldata.to_vec(),
-            factory_deps: Some(factory_deps),
-            value: msg_value,
-        };
-
-        Some(ProtocolUpgradeTx {
-            common_data,
-            execute,
-            received_timestamp_ms: unix_timestamp_ms(),
+) -> Result<(ProtocolVersionId, ProtocolUpgradeTx), ethabi::Error> {
+    let tx = ethabi::decode(&[abi::L2CanonicalTransaction::schema()], &event.data.0)?;
+    let tx = abi::L2CanonicalTransaction::decode(tx.into_iter().next().unwrap()).unwrap();
+
+    let full_version_id = h256_to_u256(event.topics[2]);
+    let protocol_version = ProtocolVersionId::try_from_packed_semver(full_version_id)
+        .unwrap_or_else(|_| panic!("Version is not supported, packed version: {full_version_id}"));
+    Ok((
+        protocol_version,
+        Transaction::try_from(abi::Transaction::L1 {
+            tx: tx.into(),
+            eth_block: event
+                .block_number
+                .expect("Event block number is missing")
+                .as_u64(),
+            factory_deps: vec![],
         })
-    }
+        .unwrap()
+        .try_into()
+        .unwrap(),
+    ))
 }
 
 impl TryFrom<Call> for ProtocolUpgrade {
-    type Error = crate::ethabi::Error;
+    type Error = anyhow::Error;
 
     fn try_from(call: Call) -> Result<Self, Self::Error> {
-        // Reuses `ProtocolUpgrade::try_from`.
-        // `ProtocolUpgrade::try_from` only uses 3 log fields: `data`, `block_number`, `transaction_hash`.
-        // Others can be filled with dummy values.
-        // We build data as `call.data` without first 4 bytes which are for selector
-        // and append it with `bytes32(0)` for compatibility with old event data.
-        let data = call
-            .data
-            .into_iter()
-            .skip(4)
-            .chain(encode(&[Token::FixedBytes(H256::zero().0.to_vec())]))
-            .collect::<Vec<u8>>()
-            .into();
-        let log = Log {
-            address: Default::default(),
-            topics: Default::default(),
-            data,
-            block_hash: Default::default(),
-            block_number: Some(call.eth_block.into()),
-            transaction_hash: Some(call.eth_hash),
-            transaction_index: Default::default(),
-            log_index: Default::default(),
-            transaction_log_index: Default::default(),
-            log_type: Default::default(),
-            removed: Default::default(),
-        };
-        ProtocolUpgrade::try_from(log)
+        anyhow::ensure!(call.data.len() >= 4);
+        let (signature, data) = call.data.split_at(4);
+
+        let diamond_cut_tokens =
+            if signature.to_vec() == ADMIN_EXECUTE_UPGRADE_FUNCTION.short_signature().to_vec() {
+                // Unwraps are safe, because we validate the input against the function signature.
+                ADMIN_EXECUTE_UPGRADE_FUNCTION
+                    .decode_input(data)?
+                    .pop()
+                    .unwrap()
+                    .into_tuple()
+                    .unwrap()
+            } else if signature.to_vec()
+                == ADMIN_UPGRADE_CHAIN_FROM_VERSION_FUNCTION
+                    .short_signature()
+                    .to_vec()
+            {
+                let mut data = ADMIN_UPGRADE_CHAIN_FROM_VERSION_FUNCTION.decode_input(data)?;
+
+                assert_eq!(
+                    data.len(),
+                    2,
+                    "The second method is expected to accept exactly 2 arguments"
+                );
+
+                // The second item must be a tuple of diamond cut data
+                // Unwraps are safe, because we validate the input against the function signature.
+                data.pop().unwrap().into_tuple().unwrap()
+            } else {
+                anyhow::bail!("unknown function");
+            };
+
+        ProtocolUpgrade::try_from_init_calldata(
+            // Unwrap is safe because we have validated the input against the function signature.
+            &diamond_cut_tokens[2].clone().into_bytes().unwrap(),
+            call.eth_block,
+        )
+        .context("ProtocolUpgrade::try_from_init_calldata()")
     }
 }
 
@@ -396,7 +221,8 @@ impl TryFrom<Log> for GovernanceOperation {
             ParamType::FixedBytes(32),
         ]);
         // Decode data.
-        let mut decoded = decode(&[ParamType::Uint(256), operation_param_type], &event.data.0)?;
+        let mut decoded =
+            ethabi::decode(&[ParamType::Uint(256), operation_param_type], &event.data.0)?;
         // Extract `GovernanceOperation` data.
         let mut decoded_governance_operation = decoded.remove(1).into_tuple().unwrap();
 
@@ -451,7 +277,7 @@ impl TryFrom<Log> for GovernanceOperation {
 #[derive(Debug, Clone, Default)]
 pub struct ProtocolVersion {
     /// Protocol version ID
-    pub id: ProtocolVersionId,
+    pub version: ProtocolSemanticVersion,
     /// Timestamp at which upgrade should be performed
     pub timestamp: u64,
     /// Verifier configuration
@@ -470,7 +296,7 @@ impl ProtocolVersion {
         new_scheduler_vk_hash: Option<H256>,
     ) -> ProtocolVersion {
         ProtocolVersion {
-            id: upgrade.id,
+            version: upgrade.version,
             timestamp: upgrade.timestamp,
             l1_verifier_config: L1VerifierConfig {
                 params: upgrade
@@ -492,8 +318,27 @@ impl ProtocolVersion {
     }
 }
 
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)]
+// TODO(PLA-962): remove once all nodes start treating the deprecated fields as optional.
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
+struct ProtocolUpgradeTxCommonDataSerde {
+    pub sender: Address,
+    pub upgrade_id: ProtocolVersionId,
+    pub max_fee_per_gas: U256,
+    pub gas_limit: U256,
+    pub gas_per_pubdata_limit: U256,
+    pub canonical_tx_hash: H256,
+    pub to_mint: U256,
+    pub refund_recipient: Address,
+
+    /// DEPRECATED.
+    #[serde(default)]
+    pub eth_hash: H256,
+    #[serde(default)]
+    pub eth_block: u64,
+}
+
+#[derive(Default, Debug, Clone, PartialEq)]
 pub struct ProtocolUpgradeTxCommonData {
     /// Sender of the transaction.
     pub sender: Address,
@@ -505,11 +350,9 @@ pub struct ProtocolUpgradeTxCommonData {
     pub gas_limit: U256,
     /// The maximum number of gas per 1 byte of pubdata.
     pub gas_per_pubdata_limit: U256,
-    /// Hash of the corresponding Ethereum transaction. Size should be 32 bytes.
-    pub eth_hash: H256,
     /// Block in which Ethereum transaction was included.
     pub eth_block: u64,
-    /// Tx hash of the transaction in the zkSync network. Calculated as the encoded transaction data hash.
+    /// Tx hash of the transaction in the ZKsync network. Calculated as the encoded transaction data hash.
     pub canonical_tx_hash: H256,
     /// The amount of ETH that should be minted with this transaction
     pub to_mint: U256,
@@ -527,6 +370,45 @@ impl ProtocolUpgradeTxCommonData {
     }
 }
 
+impl serde::Serialize for ProtocolUpgradeTxCommonData {
+    fn serialize<S: serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
+        ProtocolUpgradeTxCommonDataSerde {
+            sender: self.sender,
+            upgrade_id: self.upgrade_id,
+            max_fee_per_gas: self.max_fee_per_gas,
+            gas_limit: self.gas_limit,
+            gas_per_pubdata_limit: self.gas_per_pubdata_limit,
+            canonical_tx_hash: self.canonical_tx_hash,
+            to_mint: self.to_mint,
+            refund_recipient: self.refund_recipient,
+
+            // DEPRECATED.
+            eth_hash: H256::default(),
+            eth_block: self.eth_block,
+        }
+        .serialize(s)
+    }
+}
+
+impl<'de> serde::Deserialize<'de> for ProtocolUpgradeTxCommonData {
+    fn deserialize<D: serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
+        let x = ProtocolUpgradeTxCommonDataSerde::deserialize(d)?;
+        Ok(Self {
+            sender: x.sender,
+            upgrade_id: x.upgrade_id,
+            max_fee_per_gas: x.max_fee_per_gas,
+            gas_limit: x.gas_limit,
+            gas_per_pubdata_limit: x.gas_per_pubdata_limit,
+            canonical_tx_hash: x.canonical_tx_hash,
+            to_mint: x.to_mint,
+            refund_recipient: x.refund_recipient,
+
+            // DEPRECATED.
+            eth_block: x.eth_block,
+        })
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct ProtocolUpgradeTx {
     pub execute: Execute,
@@ -574,6 +456,8 @@ impl TryFrom<Transaction> for ProtocolUpgradeTx {
 
 #[cfg(test)]
 mod tests {
+    use ethabi::Token;
+
     use super::*;
 
     #[test]
@@ -588,7 +472,7 @@ mod tests {
             Token::FixedBytes(H256::random().0.to_vec()),
             Token::FixedBytes(H256::random().0.to_vec()),
         ]);
-        let event_data = encode(&[Token::Uint(U256::zero()), operation_token]);
+        let event_data = ethabi::encode(&[Token::Uint(U256::zero()), operation_token]);
 
         let correct_log = Log {
             address: Default::default(),
diff --git a/core/lib/types/src/pubdata_da.rs b/core/lib/types/src/pubdata_da.rs
index 8f7d3a96f55e..6705fdc29530 100644
--- a/core/lib/types/src/pubdata_da.rs
+++ b/core/lib/types/src/pubdata_da.rs
@@ -1,5 +1,7 @@
+use chrono::{DateTime, Utc};
 use num_enum::TryFromPrimitive;
 use serde::{Deserialize, Serialize};
+use zksync_basic_types::L1BatchNumber;
 use zksync_config::configs::eth_sender::PubdataSendingMode;
 
 /// Enum holding the current values used for DA Layers.
@@ -7,8 +9,12 @@ use zksync_config::configs::eth_sender::PubdataSendingMode;
 #[derive(Debug, Clone, Copy, Deserialize, PartialEq, Serialize)]
 #[derive(TryFromPrimitive)]
 pub enum PubdataDA {
+    /// Pubdata is sent to the L1 as a tx calldata.
     Calldata = 0,
+    /// Pubdata is sent to L1 as EIP-4844 blobs.
     Blobs,
+    /// Pubdata is sent to the external storage (GCS/DA layers) or not sent at all.
+    Custom,
 }
 
 impl From<PubdataSendingMode> for PubdataDA {
@@ -16,6 +22,16 @@ impl From<PubdataSendingMode> for PubdataDA {
         match value {
             PubdataSendingMode::Calldata => PubdataDA::Calldata,
             PubdataSendingMode::Blobs => PubdataDA::Blobs,
+            PubdataSendingMode::Custom => PubdataDA::Custom,
         }
     }
 }
+
+/// Represents a blob in the data availability layer.
+#[derive(Debug, Clone)]
+pub struct DataAvailabilityBlob {
+    pub l1_batch_number: L1BatchNumber,
+    pub blob_id: String,
+    pub inclusion_data: Option<Vec<u8>>,
+    pub sent_at: DateTime<Utc>,
+}
diff --git a/core/lib/types/src/snapshots.rs b/core/lib/types/src/snapshots.rs
index 6e4f734a33c1..a29e5a91bf1e 100644
--- a/core/lib/types/src/snapshots.rs
+++ b/core/lib/types/src/snapshots.rs
@@ -25,6 +25,9 @@ pub struct AllSnapshots {
 pub enum SnapshotVersion {
     /// Initial snapshot version. Keys in storage logs are stored as `(address, key)` pairs.
     Version0 = 0,
+    /// Snapshot version made compatible with L1 recovery. Differs from `Version0` by including
+    /// hashed keys in storage logs instead of `(address, key)` pairs.
+    Version1 = 1,
 }
 
 /// Storage snapshot metadata. Used in DAL to fetch certain snapshot data.
@@ -79,18 +82,33 @@ pub struct SnapshotStorageLogsStorageKey {
 }
 
 #[derive(Debug, Clone, PartialEq)]
-pub struct SnapshotStorageLogsChunk {
-    pub storage_logs: Vec<SnapshotStorageLog>,
+pub struct SnapshotStorageLogsChunk<K = H256> {
+    pub storage_logs: Vec<SnapshotStorageLog<K>>,
 }
 
+/// Storage log record in a storage snapshot.
+///
+/// Version 0 and version 1 snapshots differ in the key type; version 0 uses full [`StorageKey`]s (i.e., storage key preimages),
+/// and version 1 uses [`H256`] hashed keys. See [`SnapshotVersion`] for details.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct SnapshotStorageLog {
-    pub key: StorageKey,
+pub struct SnapshotStorageLog<K = H256> {
+    pub key: K,
     pub value: StorageValue,
     pub l1_batch_number_of_initial_write: L1BatchNumber,
     pub enumeration_index: u64,
 }
 
+impl SnapshotStorageLog<StorageKey> {
+    pub fn drop_key_preimage(self) -> SnapshotStorageLog {
+        SnapshotStorageLog {
+            key: self.key.hashed_key(),
+            value: self.value,
+            l1_batch_number_of_initial_write: self.l1_batch_number_of_initial_write,
+            enumeration_index: self.enumeration_index,
+        }
+    }
+}
+
 #[derive(Debug, PartialEq)]
 pub struct SnapshotFactoryDependencies {
     pub factory_deps: Vec<SnapshotFactoryDependency>,
@@ -144,17 +162,58 @@ impl ProtoFmt for SnapshotStorageLog {
     type Proto = crate::proto::SnapshotStorageLog;
 
     fn read(r: &Self::Proto) -> anyhow::Result<Self> {
+        let hashed_key = if let Some(hashed_key) = &r.hashed_key {
+            <[u8; 32]>::try_from(hashed_key.as_slice())
+                .context("hashed_key")?
+                .into()
+        } else {
+            let address = required(&r.account_address)
+                .and_then(|bytes| Ok(<[u8; 20]>::try_from(bytes.as_slice())?.into()))
+                .context("account_address")?;
+            let key = required(&r.storage_key)
+                .and_then(|bytes| Ok(<[u8; 32]>::try_from(bytes.as_slice())?.into()))
+                .context("storage_key")?;
+            StorageKey::new(AccountTreeId::new(address), key).hashed_key()
+        };
+
         Ok(Self {
-            key: StorageKey::new(
-                AccountTreeId::new(
-                    required(&r.account_address)
-                        .and_then(|bytes| Ok(<[u8; 20]>::try_from(bytes.as_slice())?.into()))
-                        .context("account_address")?,
-                ),
-                required(&r.storage_key)
-                    .and_then(|bytes| Ok(<[u8; 32]>::try_from(bytes.as_slice())?.into()))
-                    .context("storage_key")?,
+            key: hashed_key,
+            value: required(&r.storage_value)
+                .and_then(|bytes| Ok(<[u8; 32]>::try_from(bytes.as_slice())?.into()))
+                .context("storage_value")?,
+            l1_batch_number_of_initial_write: L1BatchNumber(
+                *required(&r.l1_batch_number_of_initial_write)
+                    .context("l1_batch_number_of_initial_write")?,
             ),
+            enumeration_index: *required(&r.enumeration_index).context("enumeration_index")?,
+        })
+    }
+
+    fn build(&self) -> Self::Proto {
+        Self::Proto {
+            account_address: None,
+            storage_key: None,
+            hashed_key: Some(self.key.as_bytes().to_vec()),
+            storage_value: Some(self.value.as_bytes().to_vec()),
+            l1_batch_number_of_initial_write: Some(self.l1_batch_number_of_initial_write.0),
+            enumeration_index: Some(self.enumeration_index),
+        }
+    }
+}
+
+impl ProtoFmt for SnapshotStorageLog<StorageKey> {
+    type Proto = crate::proto::SnapshotStorageLog;
+
+    fn read(r: &Self::Proto) -> anyhow::Result<Self> {
+        let address = required(&r.account_address)
+            .and_then(|bytes| Ok(<[u8; 20]>::try_from(bytes.as_slice())?.into()))
+            .context("account_address")?;
+        let key = required(&r.storage_key)
+            .and_then(|bytes| Ok(<[u8; 32]>::try_from(bytes.as_slice())?.into()))
+            .context("storage_key")?;
+
+        Ok(Self {
+            key: StorageKey::new(AccountTreeId::new(address), key),
             value: required(&r.storage_value)
                 .and_then(|bytes| Ok(<[u8; 32]>::try_from(bytes.as_slice())?.into()))
                 .context("storage_value")?,
@@ -168,23 +227,27 @@ impl ProtoFmt for SnapshotStorageLog {
 
     fn build(&self) -> Self::Proto {
         Self::Proto {
-            account_address: Some(self.key.address().as_bytes().into()),
-            storage_key: Some(self.key.key().as_bytes().into()),
-            storage_value: Some(self.value.as_bytes().into()),
+            account_address: Some(self.key.address().as_bytes().to_vec()),
+            storage_key: Some(self.key.key().as_bytes().to_vec()),
+            hashed_key: None,
+            storage_value: Some(self.value.as_bytes().to_vec()),
             l1_batch_number_of_initial_write: Some(self.l1_batch_number_of_initial_write.0),
             enumeration_index: Some(self.enumeration_index),
         }
     }
 }
 
-impl ProtoFmt for SnapshotStorageLogsChunk {
+impl<K> ProtoFmt for SnapshotStorageLogsChunk<K>
+where
+    SnapshotStorageLog<K>: ProtoFmt<Proto = crate::proto::SnapshotStorageLog>,
+{
     type Proto = crate::proto::SnapshotStorageLogsChunk;
 
     fn read(r: &Self::Proto) -> anyhow::Result<Self> {
         let mut storage_logs = Vec::with_capacity(r.storage_logs.len());
         for (i, storage_log) in r.storage_logs.iter().enumerate() {
             storage_logs.push(
-                SnapshotStorageLog::read(storage_log)
+                SnapshotStorageLog::<K>::read(storage_log)
                     .with_context(|| format!("storage_log[{i}]"))?,
             )
         }
@@ -196,7 +259,7 @@ impl ProtoFmt for SnapshotStorageLogsChunk {
             storage_logs: self
                 .storage_logs
                 .iter()
-                .map(SnapshotStorageLog::build)
+                .map(SnapshotStorageLog::<K>::build)
                 .collect(),
         }
     }
diff --git a/core/lib/types/src/storage/log.rs b/core/lib/types/src/storage/log.rs
index 6128f588668e..a05e25abccb5 100644
--- a/core/lib/types/src/storage/log.rs
+++ b/core/lib/types/src/storage/log.rs
@@ -2,19 +2,19 @@ use std::mem;
 
 use serde::{Deserialize, Serialize};
 use zksync_basic_types::AccountTreeId;
-use zksync_utils::u256_to_h256;
+use zksync_utils::{h256_to_u256, u256_to_h256};
 
 use crate::{
     api::ApiStorageLog,
-    zk_evm_types::{LogQuery, Timestamp},
+    zk_evm_types::{self, LogQuery, Timestamp},
     StorageKey, StorageValue, U256,
 };
 
-// TODO (SMA-1269): Refactor `StorageLog/StorageLogQuery and StorageLogKind/StorageLongQueryType`.
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
 pub enum StorageLogKind {
     Read,
-    Write,
+    InitialWrite,
+    RepeatedWrite,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
@@ -24,20 +24,23 @@ pub struct StorageLog {
     pub value: StorageValue,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct StorageLogWithPreviousValue {
+    pub log: StorageLog,
+    pub previous_value: StorageValue,
+}
+
 impl StorageLog {
-    pub fn from_log_query(log: &StorageLogQuery) -> Self {
-        let key = StorageKey::new(
-            AccountTreeId::new(log.log_query.address),
-            u256_to_h256(log.log_query.key),
-        );
-        if log.log_query.rw_flag {
-            if log.log_query.rollback {
-                Self::new_write_log(key, u256_to_h256(log.log_query.read_value))
+    pub fn from_log_query(log: &LogQuery) -> Self {
+        let key = StorageKey::new(AccountTreeId::new(log.address), u256_to_h256(log.key));
+        if log.rw_flag {
+            if log.rollback {
+                Self::new_write_log(key, u256_to_h256(log.read_value))
             } else {
-                Self::new_write_log(key, u256_to_h256(log.log_query.written_value))
+                Self::new_write_log(key, u256_to_h256(log.written_value))
             }
         } else {
-            Self::new_read_log(key, u256_to_h256(log.log_query.read_value))
+            Self::new_read_log(key, u256_to_h256(log.read_value))
         }
     }
 
@@ -51,12 +54,16 @@ impl StorageLog {
 
     pub fn new_write_log(key: StorageKey, value: StorageValue) -> Self {
         Self {
-            kind: StorageLogKind::Write,
+            kind: StorageLogKind::RepeatedWrite,
             key,
             value,
         }
     }
 
+    pub fn is_write(&self) -> bool {
+        !matches!(self.kind, StorageLogKind::Read)
+    }
+
     /// Converts this log to a log query that could be used in tests.
     pub fn to_test_log_query(&self) -> LogQuery {
         let mut read_value = U256::zero();
@@ -74,33 +81,54 @@ impl StorageLog {
             key: U256::from_big_endian(self.key.key().as_bytes()),
             read_value,
             written_value,
-            rw_flag: matches!(self.kind, StorageLogKind::Write),
+            rw_flag: self.is_write(),
             rollback: false,
             is_service: false,
         }
     }
 }
 
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
-pub enum StorageLogQueryType {
-    Read,
-    InitialWrite,
-    RepeatedWrite,
+impl From<zk_evm_types::LogQuery> for StorageLog {
+    fn from(log_query: zk_evm_types::LogQuery) -> Self {
+        Self::from_log_query(&log_query)
+    }
+}
+
+impl From<StorageLog> for ApiStorageLog {
+    fn from(storage_log: StorageLog) -> Self {
+        Self {
+            address: *storage_log.key.address(),
+            key: h256_to_u256(*storage_log.key.key()),
+            written_value: h256_to_u256(storage_log.value),
+        }
+    }
+}
+
+impl From<&StorageLogWithPreviousValue> for ApiStorageLog {
+    fn from(log: &StorageLogWithPreviousValue) -> Self {
+        log.log.into()
+    }
 }
 
 /// Log query, which handle initial and repeated writes to the storage
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct StorageLogQuery {
     pub log_query: LogQuery,
-    pub log_type: StorageLogQueryType,
+    pub log_type: StorageLogKind,
 }
 
 impl From<&StorageLogQuery> for ApiStorageLog {
     fn from(log_query: &StorageLogQuery) -> Self {
+        log_query.log_query.into()
+    }
+}
+
+impl From<LogQuery> for ApiStorageLog {
+    fn from(log_query: LogQuery) -> Self {
         ApiStorageLog {
-            address: log_query.log_query.address,
-            key: log_query.log_query.key,
-            written_value: log_query.log_query.written_value,
+            address: log_query.address,
+            key: log_query.key,
+            written_value: log_query.written_value,
         }
     }
 }
diff --git a/core/lib/types/src/storage/writes/mod.rs b/core/lib/types/src/storage/writes/mod.rs
index 83e8120268c6..ef19eeffed02 100644
--- a/core/lib/types/src/storage/writes/mod.rs
+++ b/core/lib/types/src/storage/writes/mod.rs
@@ -1,6 +1,6 @@
-use std::convert::TryInto;
+use std::{convert::TryInto, fmt};
 
-use serde::{Deserialize, Serialize};
+use serde::{de, ser::SerializeTuple, Deserialize, Deserializer, Serialize, Serializer};
 use zksync_basic_types::{Address, U256};
 
 pub(crate) use self::compression::{compress_with_best_strategy, COMPRESSION_VERSION_NUMBER};
@@ -188,6 +188,77 @@ fn prepend_header(compressed_state_diffs: Vec<u8>) -> Vec<u8> {
     res.to_vec()
 }
 
+/// Struct for storing tree writes in DB.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct TreeWrite {
+    /// `address` part of storage key.
+    pub address: Address,
+    /// `key` part of storage key.
+    pub key: H256,
+    /// Value written.
+    pub value: H256,
+    /// Leaf index of the slot.
+    pub leaf_index: u64,
+}
+
+impl Serialize for TreeWrite {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut tup = serializer.serialize_tuple(4)?;
+        tup.serialize_element(&self.address.0)?;
+        tup.serialize_element(&self.key.0)?;
+        tup.serialize_element(&self.value.0)?;
+        tup.serialize_element(&self.leaf_index)?;
+        tup.end()
+    }
+}
+
+impl<'de> Deserialize<'de> for TreeWrite {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct TreeWriteVisitor;
+
+        impl<'de> de::Visitor<'de> for TreeWriteVisitor {
+            type Value = TreeWrite;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter.write_str("a tuple of 4 elements")
+            }
+
+            fn visit_seq<V>(self, mut seq: V) -> Result<TreeWrite, V::Error>
+            where
+                V: de::SeqAccess<'de>,
+            {
+                let address: [u8; 20] = seq
+                    .next_element()?
+                    .ok_or_else(|| de::Error::invalid_length(0, &self))?;
+                let key: [u8; 32] = seq
+                    .next_element()?
+                    .ok_or_else(|| de::Error::invalid_length(1, &self))?;
+                let value: [u8; 32] = seq
+                    .next_element()?
+                    .ok_or_else(|| de::Error::invalid_length(2, &self))?;
+                let leaf_index = seq
+                    .next_element()?
+                    .ok_or_else(|| de::Error::invalid_length(3, &self))?;
+
+                Ok(TreeWrite {
+                    address: Address::from_slice(&address),
+                    key: H256::from_slice(&key),
+                    value: H256::from_slice(&value),
+                    leaf_index,
+                })
+            }
+        }
+
+        deserializer.deserialize_tuple(4, TreeWriteVisitor)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::{
@@ -515,4 +586,26 @@ mod tests {
             panic!("invalid operation id");
         }
     }
+
+    #[test]
+    fn check_tree_write_serde() {
+        let tree_write = TreeWrite {
+            address: Address::repeat_byte(0x11),
+            key: H256::repeat_byte(0x22),
+            value: H256::repeat_byte(0x33),
+            leaf_index: 1,
+        };
+
+        let serialized = bincode::serialize(&tree_write).unwrap();
+        let expected: Vec<_> = vec![0x11u8; 20]
+            .into_iter()
+            .chain(vec![0x22u8; 32])
+            .chain(vec![0x33u8; 32])
+            .chain(1u64.to_le_bytes())
+            .collect();
+        assert_eq!(serialized, expected);
+
+        let deserialized: TreeWrite = bincode::deserialize(&serialized).unwrap();
+        assert_eq!(tree_write, deserialized);
+    }
 }
diff --git a/core/lib/types/src/storage_writes_deduplicator.rs b/core/lib/types/src/storage_writes_deduplicator.rs
index 19bf51b6eb03..f9f3cc323b9f 100644
--- a/core/lib/types/src/storage_writes_deduplicator.rs
+++ b/core/lib/types/src/storage_writes_deduplicator.rs
@@ -1,19 +1,18 @@
 use std::collections::HashMap;
 
-use zksync_utils::u256_to_h256;
+use zksync_basic_types::H256;
+use zksync_utils::h256_to_u256;
 
 use crate::{
     tx::tx_execution_info::DeduplicatedWritesMetrics,
-    writes::compression::compress_with_best_strategy, AccountTreeId, StorageKey, StorageLogQuery,
-    StorageLogQueryType, U256,
+    writes::compression::compress_with_best_strategy, StorageKey, StorageLogKind,
+    StorageLogWithPreviousValue,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Default)]
 pub struct ModifiedSlot {
     /// Value of the slot after modification.
-    pub value: U256,
-    /// Index (in L1 batch) of the transaction that lastly modified the slot.
-    pub tx_index: u16,
+    pub value: H256,
     /// Size of pubdata update in bytes
     pub size: usize,
 }
@@ -35,7 +34,7 @@ struct UpdateItem {
 /// Struct that allows to deduplicate storage writes in-flight.
 #[derive(Debug, Clone, PartialEq, Default)]
 pub struct StorageWritesDeduplicator {
-    initial_values: HashMap<StorageKey, U256>,
+    initial_values: HashMap<StorageKey, H256>,
     // stores the mapping of storage-slot key to its values and the tx number in block
     modified_key_values: HashMap<StorageKey, ModifiedSlot>,
     metrics: DeduplicatedWritesMetrics,
@@ -55,13 +54,13 @@ impl StorageWritesDeduplicator {
     }
 
     /// Applies storage logs to the state.
-    pub fn apply<'a, I: IntoIterator<Item = &'a StorageLogQuery>>(&mut self, logs: I) {
+    pub fn apply<'a, I: IntoIterator<Item = &'a StorageLogWithPreviousValue>>(&mut self, logs: I) {
         self.process_storage_logs(logs);
     }
 
     /// Returns metrics as if provided storage logs are applied to the state.
     /// It's implemented in the following way: apply logs -> save current metrics -> rollback logs.
-    pub fn apply_and_rollback<'a, I: IntoIterator<Item = &'a StorageLogQuery>>(
+    pub fn apply_and_rollback<'a, I: IntoIterator<Item = &'a StorageLogWithPreviousValue>>(
         &mut self,
         logs: I,
     ) -> DeduplicatedWritesMetrics {
@@ -72,7 +71,7 @@ impl StorageWritesDeduplicator {
     }
 
     /// Applies logs to the empty state and returns metrics.
-    pub fn apply_on_empty_state<'a, I: IntoIterator<Item = &'a StorageLogQuery>>(
+    pub fn apply_on_empty_state<'a, I: IntoIterator<Item = &'a StorageLogWithPreviousValue>>(
         logs: I,
     ) -> DeduplicatedWritesMetrics {
         let mut deduplicator = Self::new();
@@ -83,29 +82,18 @@ impl StorageWritesDeduplicator {
     /// Processes storage logs and returns updates for `modified_keys` and `metrics` fields.
     /// Metrics can be used later to rollback the state.
     /// We don't care about `initial_values` changes as we only inserted values there and they are always valid.
-    fn process_storage_logs<'a, I: IntoIterator<Item = &'a StorageLogQuery>>(
+    fn process_storage_logs<'a, I: IntoIterator<Item = &'a StorageLogWithPreviousValue>>(
         &mut self,
         logs: I,
     ) -> Vec<UpdateItem> {
         let mut updates = Vec::new();
-        for log in logs.into_iter().filter(|log| log.log_query.rw_flag) {
-            let key = StorageKey::new(
-                AccountTreeId::new(log.log_query.address),
-                u256_to_h256(log.log_query.key),
-            );
-            let initial_value = *self
-                .initial_values
-                .entry(key)
-                .or_insert(log.log_query.read_value);
-            let was_key_modified = self.modified_key_values.get(&key).is_some();
-            let modified_value = if log.log_query.rollback {
-                (initial_value != log.log_query.read_value).then_some(log.log_query.read_value)
-            } else {
-                (initial_value != log.log_query.written_value)
-                    .then_some(log.log_query.written_value)
-            };
+        for log in logs.into_iter().filter(|log| log.log.is_write()) {
+            let key = log.log.key;
+            let initial_value = *self.initial_values.entry(key).or_insert(log.previous_value);
+            let was_key_modified = self.modified_key_values.contains_key(&key);
+            let modified_value = (initial_value != log.log.value).then_some(log.log.value);
 
-            let is_write_initial = log.log_type == StorageLogQueryType::InitialWrite;
+            let is_write_initial = log.log.kind == StorageLogKind::InitialWrite;
             let field_to_change = if is_write_initial {
                 &mut self.metrics.initial_storage_writes
             } else {
@@ -113,7 +101,6 @@ impl StorageWritesDeduplicator {
             };
 
             let total_size = &mut self.metrics.total_updated_values_size;
-
             match (was_key_modified, modified_value) {
                 (true, None) => {
                     let value = self.modified_key_values.remove(&key).unwrap_or_else(|| {
@@ -128,14 +115,17 @@ impl StorageWritesDeduplicator {
                     });
                 }
                 (true, Some(new_value)) => {
-                    let value_size = compress_with_best_strategy(initial_value, new_value).len();
+                    let value_size = compress_with_best_strategy(
+                        h256_to_u256(initial_value),
+                        h256_to_u256(new_value),
+                    )
+                    .len();
                     let old_value = self
                         .modified_key_values
                         .insert(
                             key,
                             ModifiedSlot {
                                 value: new_value,
-                                tx_index: log.log_query.tx_number_in_block,
                                 size: value_size,
                             },
                         )
@@ -153,12 +143,15 @@ impl StorageWritesDeduplicator {
                     *total_size += value_size;
                 }
                 (false, Some(new_value)) => {
-                    let value_size = compress_with_best_strategy(initial_value, new_value).len();
+                    let value_size = compress_with_best_strategy(
+                        h256_to_u256(initial_value),
+                        h256_to_u256(new_value),
+                    )
+                    .len();
                     self.modified_key_values.insert(
                         key,
                         ModifiedSlot {
                             value: new_value,
-                            tx_index: log.log_query.tx_number_in_block,
                             size: value_size,
                         },
                     );
@@ -219,58 +212,59 @@ impl StorageWritesDeduplicator {
 
 #[cfg(test)]
 mod tests {
+    use zksync_basic_types::{AccountTreeId, U256};
+    use zksync_utils::u256_to_h256;
+
     use super::*;
-    use crate::{
-        zk_evm_types::{LogQuery, Timestamp},
-        H160,
-    };
+    use crate::{StorageLog, H160};
 
-    fn storage_log_query(
+    fn storage_log(
         key: U256,
         read_value: U256,
         written_value: U256,
         rollback: bool,
         is_initial: bool,
-    ) -> StorageLogQuery {
-        let log_type = if is_initial {
-            StorageLogQueryType::InitialWrite
+    ) -> StorageLogWithPreviousValue {
+        let kind = if is_initial {
+            StorageLogKind::InitialWrite
         } else {
-            StorageLogQueryType::RepeatedWrite
+            StorageLogKind::RepeatedWrite
         };
-        StorageLogQuery {
-            log_query: LogQuery {
-                timestamp: Timestamp(0),
-                tx_number_in_block: 0,
-                aux_byte: 0,
-                shard_id: 0,
-                address: Default::default(),
-                key,
-                read_value,
-                written_value,
-                rw_flag: true,
-                rollback,
-                is_service: false,
+        StorageLogWithPreviousValue {
+            log: StorageLog {
+                key: StorageKey::new(AccountTreeId::default(), u256_to_h256(key)),
+                value: u256_to_h256(if rollback { read_value } else { written_value }),
+                kind,
             },
-            log_type,
+            previous_value: u256_to_h256(if rollback { written_value } else { read_value }),
         }
     }
 
-    fn storage_log_query_with_address(
+    fn storage_log_with_address(
         address: H160,
         key: U256,
         written_value: U256,
-    ) -> StorageLogQuery {
-        let mut log = storage_log_query(key, 1234u32.into(), written_value, false, false);
-        log.log_query.address = address;
-        log
+    ) -> StorageLogWithPreviousValue {
+        StorageLogWithPreviousValue {
+            log: StorageLog {
+                key: StorageKey::new(AccountTreeId::new(address), u256_to_h256(key)),
+                value: u256_to_h256(written_value),
+                kind: StorageLogKind::RepeatedWrite,
+            },
+            previous_value: H256::from_low_u64_be(1234),
+        }
     }
 
     #[test]
     fn storage_writes_deduplicator() {
         // Each test scenario is a tuple (input, expected output, description).
-        let scenarios: Vec<(Vec<StorageLogQuery>, DeduplicatedWritesMetrics, String)> = vec![
+        let scenarios: Vec<(
+            Vec<StorageLogWithPreviousValue>,
+            DeduplicatedWritesMetrics,
+            String,
+        )> = vec![
             (
-                vec![storage_log_query(
+                vec![storage_log(
                     0u32.into(),
                     0u32.into(),
                     1u32.into(),
@@ -286,8 +280,8 @@ mod tests {
             ),
             (
                 vec![
-                    storage_log_query(0u32.into(), 0u32.into(), 1u32.into(), false, true),
-                    storage_log_query(1u32.into(), 0u32.into(), 1u32.into(), false, false),
+                    storage_log(0u32.into(), 0u32.into(), 1u32.into(), false, true),
+                    storage_log(1u32.into(), 0u32.into(), 1u32.into(), false, false),
                 ],
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 1,
@@ -298,8 +292,8 @@ mod tests {
             ),
             (
                 vec![
-                    storage_log_query(0u32.into(), 0u32.into(), 1u32.into(), false, true),
-                    storage_log_query(0u32.into(), 0u32.into(), 1u32.into(), true, true),
+                    storage_log(0u32.into(), 0u32.into(), 1u32.into(), false, true),
+                    storage_log(0u32.into(), 0u32.into(), 1u32.into(), true, true),
                 ],
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 0,
@@ -309,7 +303,7 @@ mod tests {
                 "single rollback".into(),
             ),
             (
-                vec![storage_log_query(
+                vec![storage_log(
                     0u32.into(),
                     10u32.into(),
                     10u32.into(),
@@ -325,9 +319,9 @@ mod tests {
             ),
             (
                 vec![
-                    storage_log_query(0u32.into(), 0u32.into(), 1u32.into(), false, true),
-                    storage_log_query(0u32.into(), 1u32.into(), 2u32.into(), false, true),
-                    storage_log_query(0u32.into(), 2u32.into(), 0u32.into(), false, true),
+                    storage_log(0u32.into(), 0u32.into(), 1u32.into(), false, true),
+                    storage_log(0u32.into(), 1u32.into(), 2u32.into(), false, true),
+                    storage_log(0u32.into(), 2u32.into(), 0u32.into(), false, true),
                 ],
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 0,
@@ -338,13 +332,13 @@ mod tests {
             ),
             (
                 vec![
-                    storage_log_query(0u32.into(), 5u32.into(), 10u32.into(), false, true),
-                    storage_log_query(1u32.into(), 1u32.into(), 2u32.into(), false, true),
-                    storage_log_query(0u32.into(), 10u32.into(), 11u32.into(), false, true),
-                    storage_log_query(0u32.into(), 10u32.into(), 11u32.into(), true, true),
-                    storage_log_query(2u32.into(), 0u32.into(), 10u32.into(), false, false),
-                    storage_log_query(2u32.into(), 10u32.into(), 0u32.into(), false, false),
-                    storage_log_query(2u32.into(), 0u32.into(), 10u32.into(), false, false),
+                    storage_log(0u32.into(), 5u32.into(), 10u32.into(), false, true),
+                    storage_log(1u32.into(), 1u32.into(), 2u32.into(), false, true),
+                    storage_log(0u32.into(), 10u32.into(), 11u32.into(), false, true),
+                    storage_log(0u32.into(), 10u32.into(), 11u32.into(), true, true),
+                    storage_log(2u32.into(), 0u32.into(), 10u32.into(), false, false),
+                    storage_log(2u32.into(), 10u32.into(), 0u32.into(), false, false),
+                    storage_log(2u32.into(), 0u32.into(), 10u32.into(), false, false),
                 ],
                 DeduplicatedWritesMetrics {
                     initial_storage_writes: 2,
@@ -394,60 +388,54 @@ mod tests {
             (
                 new_storage_key(1, 5),
                 ModifiedSlot {
-                    value: 8u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(8),
                     size: 2,
                 },
             ),
             (
                 new_storage_key(1, 4),
                 ModifiedSlot {
-                    value: 6u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(6),
                     size: 2,
                 },
             ),
             (
                 new_storage_key(2, 5),
                 ModifiedSlot {
-                    value: 9u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(9),
                     size: 2,
                 },
             ),
             (
                 new_storage_key(2, 4),
                 ModifiedSlot {
-                    value: 11u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(11),
                     size: 2,
                 },
             ),
             (
                 new_storage_key(3, 5),
                 ModifiedSlot {
-                    value: 2u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(2),
                     size: 2,
                 },
             ),
             (
                 new_storage_key(3, 4),
                 ModifiedSlot {
-                    value: 7u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(7),
                     size: 2,
                 },
             ),
         ]);
         let mut deduplicator = StorageWritesDeduplicator::new();
         let logs = [
-            storage_log_query_with_address(H160::from_low_u64_be(1), 5u32.into(), 8u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(1), 4u32.into(), 6u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(2), 4u32.into(), 11u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(2), 5u32.into(), 9u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(3), 4u32.into(), 7u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(3), 5u32.into(), 2u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(1), 5u32.into(), 8u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(1), 4u32.into(), 6u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(2), 4u32.into(), 11u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(2), 5u32.into(), 9u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(3), 4u32.into(), 7u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(3), 5u32.into(), 2u32.into()),
         ];
         deduplicator.apply(&logs);
         assert_eq!(expected, deduplicator.modified_key_values);
@@ -459,36 +447,33 @@ mod tests {
             (
                 new_storage_key(1, 5),
                 ModifiedSlot {
-                    value: 6u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(6),
                     size: 2,
                 },
             ),
             (
                 new_storage_key(2, 4),
                 ModifiedSlot {
-                    value: 11u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(11),
                     size: 2,
                 },
             ),
             (
                 new_storage_key(3, 6),
                 ModifiedSlot {
-                    value: 7u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(7),
                     size: 2,
                 },
             ),
         ]);
         let mut deduplicator = StorageWritesDeduplicator::new();
         let logs = [
-            storage_log_query_with_address(H160::from_low_u64_be(1), 5u32.into(), 8u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(1), 5u32.into(), 6u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(2), 4u32.into(), 9u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(2), 4u32.into(), 11u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(3), 6u32.into(), 2u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(3), 6u32.into(), 7u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(1), 5u32.into(), 8u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(1), 5u32.into(), 6u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(2), 4u32.into(), 9u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(2), 4u32.into(), 11u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(3), 6u32.into(), 2u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(3), 6u32.into(), 7u32.into()),
         ];
         deduplicator.apply(&logs);
         assert_eq!(expected, deduplicator.modified_key_values);
@@ -500,33 +485,30 @@ mod tests {
             (
                 new_storage_key(1, 2),
                 ModifiedSlot {
-                    value: 3u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(3),
                     size: 2,
                 },
             ),
             (
                 new_storage_key(1, 2),
                 ModifiedSlot {
-                    value: 4u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(4),
                     size: 2,
                 },
             ),
             (
                 new_storage_key(1, 2),
                 ModifiedSlot {
-                    value: 5u32.into(),
-                    tx_index: 0,
+                    value: H256::from_low_u64_be(5),
                     size: 2,
                 },
             ),
         ]);
         let mut deduplicator = StorageWritesDeduplicator::new();
         let logs = [
-            storage_log_query_with_address(H160::from_low_u64_be(1), 2u32.into(), 3u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(1), 2u32.into(), 4u32.into()),
-            storage_log_query_with_address(H160::from_low_u64_be(1), 2u32.into(), 5u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(1), 2u32.into(), 3u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(1), 2u32.into(), 4u32.into()),
+            storage_log_with_address(H160::from_low_u64_be(1), 2u32.into(), 5u32.into()),
         ];
         deduplicator.apply(&logs);
         assert_eq!(expected, deduplicator.modified_key_values);
@@ -537,28 +519,27 @@ mod tests {
         let expected = HashMap::from([(
             new_storage_key(0, 1),
             ModifiedSlot {
-                value: 2u32.into(),
-                tx_index: 0,
+                value: H256::from_low_u64_be(2),
                 size: 2,
             },
         )]);
         let mut deduplicator = StorageWritesDeduplicator::new();
         let logs = [
-            storage_log_query(
+            storage_log(
                 U256::from(1u32),
                 U256::from(1u32),
                 U256::from(2u32),
                 false,
                 false,
             ),
-            storage_log_query(
+            storage_log(
                 U256::from(1u32),
                 U256::from(2u32),
                 U256::from(1u32),
                 false,
                 false,
             ),
-            storage_log_query(
+            storage_log(
                 U256::from(1u32),
                 U256::from(2u32),
                 U256::from(1u32),
diff --git a/core/lib/types/src/system_contracts.rs b/core/lib/types/src/system_contracts.rs
index c802246da1d2..a28c45b8feae 100644
--- a/core/lib/types/src/system_contracts.rs
+++ b/core/lib/types/src/system_contracts.rs
@@ -180,7 +180,7 @@ static SYSTEM_CONTRACTS: Lazy<Vec<DeployedContract>> = Lazy::new(|| {
         .collect::<Vec<_>>()
 });
 
-/// Gets default set of system contracts, based on ZKSYNC_HOME environment variable.
+/// Gets default set of system contracts, based on Cargo workspace location.
 pub fn get_system_smart_contracts() -> Vec<DeployedContract> {
     SYSTEM_CONTRACTS.clone()
 }
diff --git a/core/lib/types/src/tokens.rs b/core/lib/types/src/tokens.rs
index 26aec479498d..ddabaffa2319 100644
--- a/core/lib/types/src/tokens.rs
+++ b/core/lib/types/src/tokens.rs
@@ -9,7 +9,7 @@ pub struct TokenInfo {
     pub metadata: TokenMetadata,
 }
 
-/// Relevant information about tokens supported by zkSync protocol.
+/// Relevant information about tokens supported by ZKsync protocol.
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 pub struct TokenMetadata {
     /// Token name (e.g. "Ethereum" or "USD Coin")
diff --git a/core/lib/types/src/transaction_request.rs b/core/lib/types/src/transaction_request.rs
index 72551d762d18..a59b21409cd1 100644
--- a/core/lib/types/src/transaction_request.rs
+++ b/core/lib/types/src/transaction_request.rs
@@ -66,11 +66,32 @@ pub struct CallRequest {
     pub eip712_meta: Option<Eip712Meta>,
 }
 
+/// While some default parameters are usually provided for the `eth_call` methods,
+/// sometimes users may want to override those.
+pub struct CallOverrides {
+    pub enforced_base_fee: Option<u64>,
+}
+
 impl CallRequest {
     /// Function to return a builder for a Call Request
     pub fn builder() -> CallRequestBuilder {
         CallRequestBuilder::default()
     }
+
+    pub fn get_call_overrides(&self) -> Result<CallOverrides, SerializationTransactionError> {
+        let provided_gas_price = self.max_fee_per_gas.or(self.gas_price);
+        let enforced_base_fee = if let Some(provided_gas_price) = provided_gas_price {
+            Some(
+                provided_gas_price
+                    .try_into()
+                    .map_err(|_| SerializationTransactionError::MaxFeePerGasNotU64)?,
+            )
+        } else {
+            None
+        };
+
+        Ok(CallOverrides { enforced_base_fee })
+    }
 }
 
 /// Call Request Builder
@@ -183,10 +204,16 @@ pub enum SerializationTransactionError {
     AccessListsNotSupported,
     #[error("nonce has max value")]
     TooBigNonce,
-    /// Sanity check error to avoid extremely big numbers specified
+
+    /// Sanity checks to avoid extremely big numbers specified
     /// to gas and pubdata price.
-    #[error("{0}")]
-    TooHighGas(String),
+    #[error("max fee per gas higher than 2^64-1")]
+    MaxFeePerGasNotU64,
+    #[error("max fee per pubdata byte higher than 2^64-1")]
+    MaxFeePerPubdataByteNotU64,
+    #[error("max priority fee per gas higher than 2^64-1")]
+    MaxPriorityFeePerGasNotU64,
+
     /// OversizedData is returned if the raw tx size is greater
     /// than some meaningful limit a user might use. This is not a consensus error
     /// making the transaction invalid, rather a DOS protection.
@@ -196,13 +223,11 @@ pub enum SerializationTransactionError {
     GasPerPubDataLimitZero,
 }
 
+#[derive(Clone, Debug, PartialEq, Default)]
 /// Description of a Transaction, pending or in the chain.
-#[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Default)]
-#[serde(rename_all = "camelCase")]
 pub struct TransactionRequest {
     /// Nonce
     pub nonce: U256,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub from: Option<Address>,
     /// Recipient (None when contract creation)
     pub to: Option<Address>,
@@ -213,32 +238,23 @@ pub struct TransactionRequest {
     /// Gas amount
     pub gas: U256,
     /// EIP-1559 part of gas price that goes to miners
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub max_priority_fee_per_gas: Option<U256>,
     /// Input data
     pub input: Bytes,
     /// ECDSA recovery id
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub v: Option<U64>,
     /// ECDSA signature r, 32 bytes
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub r: Option<U256>,
     /// ECDSA signature s, 32 bytes
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub s: Option<U256>,
     /// Raw transaction data
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub raw: Option<Bytes>,
     /// Transaction type, Some(1) for AccessList transaction, None for Legacy
-    #[serde(rename = "type", default, skip_serializing_if = "Option::is_none")]
     pub transaction_type: Option<U64>,
     /// Access list
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub access_list: Option<AccessList>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub eip712_meta: Option<Eip712Meta>,
     /// Chain ID
-    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub chain_id: Option<u64>,
 }
 
@@ -272,7 +288,7 @@ impl PaymasterParams {
 pub struct Eip712Meta {
     pub gas_per_pubdata: U256,
     #[serde(default)]
-    pub factory_deps: Option<Vec<Vec<u8>>>,
+    pub factory_deps: Vec<Vec<u8>>,
     pub custom_signature: Option<Vec<u8>>,
     pub paymaster_params: Option<PaymasterParams>,
 }
@@ -280,13 +296,9 @@ pub struct Eip712Meta {
 impl Eip712Meta {
     pub fn rlp_append(&self, rlp: &mut RlpStream) {
         rlp.append(&self.gas_per_pubdata);
-        if let Some(factory_deps) = &self.factory_deps {
-            rlp.begin_list(factory_deps.len());
-            for dep in factory_deps.iter() {
-                rlp.append(&dep.as_slice());
-            }
-        } else {
-            rlp.begin_list(0);
+        rlp.begin_list(self.factory_deps.len());
+        for dep in &self.factory_deps {
+            rlp.append(&dep.as_slice());
         }
 
         rlp_opt(rlp, &self.custom_signature);
@@ -356,30 +368,34 @@ impl EIP712TypedStructure for TransactionRequest {
 
 impl TransactionRequest {
     pub fn get_custom_signature(&self) -> Option<Vec<u8>> {
-        self.eip712_meta
-            .as_ref()
-            .and_then(|meta| meta.custom_signature.as_ref())
-            .cloned()
+        self.eip712_meta.as_ref()?.custom_signature.clone()
     }
 
     pub fn get_paymaster(&self) -> Option<Address> {
-        self.eip712_meta
-            .clone()
-            .and_then(|meta| meta.paymaster_params)
-            .map(|params| params.paymaster)
+        Some(
+            self.eip712_meta
+                .as_ref()?
+                .paymaster_params
+                .as_ref()?
+                .paymaster,
+        )
     }
 
     pub fn get_paymaster_input(&self) -> Option<Vec<u8>> {
-        self.eip712_meta
-            .clone()
-            .and_then(|meta| meta.paymaster_params)
-            .map(|params| params.paymaster_input)
+        Some(
+            self.eip712_meta
+                .as_ref()?
+                .paymaster_params
+                .as_ref()?
+                .paymaster_input
+                .clone(),
+        )
     }
 
     pub fn get_factory_deps(&self) -> Vec<Vec<u8>> {
         self.eip712_meta
-            .clone()
-            .and_then(|meta| meta.factory_deps)
+            .as_ref()
+            .map(|meta| meta.factory_deps.clone())
             .unwrap_or_default()
     }
 
@@ -430,28 +446,48 @@ impl TransactionRequest {
         Ok(packed_eth_signature.serialize_packed().to_vec())
     }
 
-    pub fn get_signed_bytes(&self, signature: &PackedEthSignature, chain_id: L2ChainId) -> Vec<u8> {
+    pub fn get_signed_bytes(
+        &self,
+        signature: &PackedEthSignature,
+    ) -> Result<Vec<u8>, SerializationTransactionError> {
         let mut rlp = RlpStream::new();
-        self.rlp(&mut rlp, chain_id.as_u64(), Some(signature));
+        self.rlp(&mut rlp, Some(signature))?;
         let mut data = rlp.out().to_vec();
         if let Some(tx_type) = self.transaction_type {
             data.insert(0, tx_type.as_u64() as u8);
         }
-        data
+        Ok(data)
     }
 
     pub fn is_legacy_tx(&self) -> bool {
         self.transaction_type.is_none() || self.transaction_type == Some(LEGACY_TX_TYPE.into())
     }
 
-    pub fn rlp(&self, rlp: &mut RlpStream, chain_id: u64, signature: Option<&PackedEthSignature>) {
+    /// Encodes `TransactionRequest` to RLP.
+    /// It may fail if `chain_id` is `None` while required.
+    pub fn get_rlp(&self) -> Result<Vec<u8>, SerializationTransactionError> {
+        let mut rlp_stream = RlpStream::new();
+        self.rlp(&mut rlp_stream, None)?;
+        Ok(rlp_stream.as_raw().into())
+    }
+
+    /// Encodes `TransactionRequest` to RLP.
+    /// It may fail if `chain_id` is `None` while required.
+    pub fn rlp(
+        &self,
+        rlp: &mut RlpStream,
+        signature: Option<&PackedEthSignature>,
+    ) -> Result<(), SerializationTransactionError> {
         rlp.begin_unbounded_list();
 
         match self.transaction_type {
             // EIP-2930 (0x01)
             Some(x) if x == EIP_2930_TX_TYPE.into() => {
-                // `rlp_opt(rlp, &self.chain_id);`
-                rlp.append(&chain_id);
+                rlp.append(
+                    &self
+                        .chain_id
+                        .ok_or(SerializationTransactionError::WrongChainId(None))?,
+                );
                 rlp.append(&self.nonce);
                 rlp.append(&self.gas_price);
                 rlp.append(&self.gas);
@@ -462,8 +498,11 @@ impl TransactionRequest {
             }
             // EIP-1559 (0x02)
             Some(x) if x == EIP_1559_TX_TYPE.into() => {
-                // `rlp_opt(rlp, &self.chain_id);`
-                rlp.append(&chain_id);
+                rlp.append(
+                    &self
+                        .chain_id
+                        .ok_or(SerializationTransactionError::WrongChainId(None))?,
+                );
                 rlp.append(&self.nonce);
                 rlp_opt(rlp, &self.max_priority_fee_per_gas);
                 rlp.append(&self.gas_price);
@@ -503,22 +542,31 @@ impl TransactionRequest {
             Some(_) => unreachable!("Unknown tx type"),
         }
 
-        if let Some(signature) = signature {
-            if self.is_legacy_tx() && chain_id != 0 {
-                rlp.append(&signature.v_with_chain_id(chain_id));
-            } else {
-                rlp.append(&signature.v());
+        match (signature, self.chain_id, self.is_legacy_tx()) {
+            (Some(sig), Some(chain_id), true) => {
+                rlp.append(&sig.v_with_chain_id(chain_id));
+                rlp.append(&U256::from_big_endian(sig.r()));
+                rlp.append(&U256::from_big_endian(sig.s()));
+            }
+            (None, Some(chain_id), true) => {
+                rlp.append(&chain_id);
+                rlp.append(&0u8);
+                rlp.append(&0u8);
             }
-            rlp.append(&U256::from_big_endian(signature.r()));
-            rlp.append(&U256::from_big_endian(signature.s()));
-        } else if self.is_legacy_tx() && chain_id != 0 {
-            rlp.append(&chain_id);
-            rlp.append(&0u8);
-            rlp.append(&0u8);
+            (Some(sig), _, _) => {
+                rlp.append(&sig.v());
+                rlp.append(&U256::from_big_endian(sig.r()));
+                rlp.append(&U256::from_big_endian(sig.s()));
+            }
+            (None, _, _) => {}
         }
 
         if self.is_eip712_tx() {
-            rlp.append(&chain_id);
+            rlp.append(
+                &self
+                    .chain_id
+                    .ok_or(SerializationTransactionError::WrongChainId(None))?,
+            );
             rlp_opt(rlp, &self.from);
             if let Some(meta) = &self.eip712_meta {
                 meta.rlp_append(rlp);
@@ -526,6 +574,7 @@ impl TransactionRequest {
         }
 
         rlp.finalize_unbounded_list();
+        Ok(())
     }
 
     fn decode_standard_fields(rlp: &Rlp, offset: usize) -> Result<Self, DecoderError> {
@@ -557,27 +606,22 @@ impl TransactionRequest {
         Some(EIP_712_TX_TYPE.into()) == self.transaction_type
     }
 
-    pub fn from_bytes(
+    pub fn from_bytes_unverified(
         bytes: &[u8],
-        chain_id: L2ChainId,
     ) -> Result<(Self, H256), SerializationTransactionError> {
         let rlp;
         let mut tx = match bytes.first() {
             Some(x) if *x >= 0x80 => {
                 rlp = Rlp::new(bytes);
                 if rlp.item_count()? != 9 {
-                    return Err(SerializationTransactionError::DecodeRlpError(
-                        DecoderError::RlpIncorrectListLen,
-                    ));
+                    return Err(DecoderError::RlpIncorrectListLen.into());
                 }
                 let v = rlp.val_at(6)?;
-                let (_, tx_chain_id) = PackedEthSignature::unpack_v(v)
-                    .map_err(|_| SerializationTransactionError::MalformedSignature)?;
-                if tx_chain_id.is_some() && tx_chain_id != Some(chain_id.as_u64()) {
-                    return Err(SerializationTransactionError::WrongChainId(tx_chain_id));
-                }
                 Self {
-                    chain_id: tx_chain_id,
+                    // For legacy transactions `chain_id` is optional.
+                    chain_id: PackedEthSignature::unpack_v(v)
+                        .map_err(|_| SerializationTransactionError::MalformedSignature)?
+                        .1,
                     v: Some(rlp.val_at(6)?),
                     r: Some(rlp.val_at(7)?),
                     s: Some(rlp.val_at(8)?),
@@ -587,22 +631,15 @@ impl TransactionRequest {
             Some(&EIP_1559_TX_TYPE) => {
                 rlp = Rlp::new(&bytes[1..]);
                 if rlp.item_count()? != 12 {
-                    return Err(SerializationTransactionError::DecodeRlpError(
-                        DecoderError::RlpIncorrectListLen,
-                    ));
+                    return Err(DecoderError::RlpIncorrectListLen.into());
                 }
                 if let Ok(access_list_rlp) = rlp.at(8) {
                     if access_list_rlp.item_count()? > 0 {
                         return Err(SerializationTransactionError::AccessListsNotSupported);
                     }
                 }
-
-                let tx_chain_id = rlp.val_at(0).ok();
-                if tx_chain_id != Some(chain_id.as_u64()) {
-                    return Err(SerializationTransactionError::WrongChainId(tx_chain_id));
-                }
                 Self {
-                    chain_id: tx_chain_id,
+                    chain_id: Some(rlp.val_at(0)?),
                     v: Some(rlp.val_at(9)?),
                     r: Some(rlp.val_at(10)?),
                     s: Some(rlp.val_at(11)?),
@@ -614,22 +651,15 @@ impl TransactionRequest {
             Some(&EIP_712_TX_TYPE) => {
                 rlp = Rlp::new(&bytes[1..]);
                 if rlp.item_count()? != 16 {
-                    return Err(SerializationTransactionError::DecodeRlpError(
-                        DecoderError::RlpIncorrectListLen,
-                    ));
-                }
-                let tx_chain_id = rlp.val_at(10).ok();
-                if tx_chain_id.is_some() && tx_chain_id != Some(chain_id.as_u64()) {
-                    return Err(SerializationTransactionError::WrongChainId(tx_chain_id));
+                    return Err(DecoderError::RlpIncorrectListLen.into());
                 }
-
                 Self {
                     v: Some(rlp.val_at(7)?),
                     r: Some(rlp.val_at(8)?),
                     s: Some(rlp.val_at(9)?),
                     eip712_meta: Some(Eip712Meta {
                         gas_per_pubdata: rlp.val_at(12)?,
-                        factory_deps: rlp.list_at(13).ok(),
+                        factory_deps: rlp.list_at(13)?,
                         custom_signature: rlp.val_at(14).ok(),
                         paymaster_params: if let Ok(params) = rlp.list_at(15) {
                             PaymasterParams::from_vector(params)?
@@ -637,7 +667,7 @@ impl TransactionRequest {
                             None
                         },
                     }),
-                    chain_id: tx_chain_id,
+                    chain_id: Some(rlp.val_at(10)?),
                     transaction_type: Some(EIP_712_TX_TYPE.into()),
                     from: Some(rlp.val_at(11)?),
                     ..Self::decode_eip1559_fields(&rlp, 0)?
@@ -648,42 +678,46 @@ impl TransactionRequest {
             }
             _ => return Err(SerializationTransactionError::UnknownTransactionFormat),
         };
-        let factory_deps_ref = tx
-            .eip712_meta
-            .as_ref()
-            .and_then(|m| m.factory_deps.as_ref());
-        if let Some(deps) = factory_deps_ref {
-            validate_factory_deps(deps)?;
+        if let Some(meta) = &tx.eip712_meta {
+            validate_factory_deps(&meta.factory_deps)?;
         }
         tx.raw = Some(Bytes(bytes.to_vec()));
 
-        let default_signed_message = tx.get_default_signed_message(tx.chain_id)?;
+        let default_signed_message = tx.get_default_signed_message()?;
 
-        tx.from = match tx.from {
-            Some(_) => tx.from,
-            None => tx.recover_default_signer(default_signed_message).ok(),
-        };
+        if tx.from.is_none() {
+            tx.from = tx.recover_default_signer(default_signed_message).ok();
+        }
 
-        let hash = tx.get_tx_hash_with_signed_message(&default_signed_message, chain_id)?;
+        // `tx.raw` is set, so unwrap is safe here.
+        let hash = tx
+            .get_tx_hash_with_signed_message(default_signed_message)?
+            .unwrap();
+        Ok((tx, hash))
+    }
 
+    pub fn from_bytes(
+        bytes: &[u8],
+        chain_id: L2ChainId,
+    ) -> Result<(Self, H256), SerializationTransactionError> {
+        let (tx, hash) = Self::from_bytes_unverified(bytes)?;
+        if tx.chain_id.is_some() && tx.chain_id != Some(chain_id.as_u64()) {
+            return Err(SerializationTransactionError::WrongChainId(tx.chain_id));
+        }
         Ok((tx, hash))
     }
 
-    fn get_default_signed_message(
-        &self,
-        chain_id: Option<u64>,
-    ) -> Result<H256, SerializationTransactionError> {
+    pub fn get_default_signed_message(&self) -> Result<H256, SerializationTransactionError> {
         if self.is_eip712_tx() {
-            let tx_chain_id =
-                chain_id.ok_or(SerializationTransactionError::WrongChainId(chain_id))?;
+            let chain_id = self
+                .chain_id
+                .ok_or(SerializationTransactionError::WrongChainId(None))?;
             Ok(PackedEthSignature::typed_data_to_signed_bytes(
-                &Eip712Domain::new(L2ChainId::try_from(tx_chain_id).unwrap()),
+                &Eip712Domain::new(L2ChainId::try_from(chain_id).unwrap()),
                 self,
             ))
         } else {
-            let mut rlp_stream = RlpStream::new();
-            self.rlp(&mut rlp_stream, chain_id.unwrap_or_default(), None);
-            let mut data = rlp_stream.out().to_vec();
+            let mut data = self.get_rlp()?;
             if let Some(tx_type) = self.transaction_type {
                 data.insert(0, tx_type.as_u64() as u8);
             }
@@ -693,27 +727,24 @@ impl TransactionRequest {
 
     fn get_tx_hash_with_signed_message(
         &self,
-        default_signed_message: &H256,
-        chain_id: L2ChainId,
-    ) -> Result<H256, SerializationTransactionError> {
-        let hash = if self.is_eip712_tx() {
-            concat_and_hash(
-                *default_signed_message,
+        signed_message: H256,
+    ) -> Result<Option<H256>, SerializationTransactionError> {
+        if self.is_eip712_tx() {
+            return Ok(Some(concat_and_hash(
+                signed_message,
                 H256(keccak256(&self.get_signature()?)),
-            )
-        } else if let Some(bytes) = &self.raw {
-            H256(keccak256(&bytes.0))
-        } else {
-            let signature = self.get_packed_signature()?;
-            H256(keccak256(&self.get_signed_bytes(&signature, chain_id)))
-        };
-
-        Ok(hash)
+            )));
+        }
+        Ok(self.raw.as_ref().map(|bytes| H256(keccak256(&bytes.0))))
     }
 
-    pub fn get_tx_hash(&self, chain_id: L2ChainId) -> Result<H256, SerializationTransactionError> {
-        let default_signed_message = self.get_default_signed_message(Some(chain_id.as_u64()))?;
-        self.get_tx_hash_with_signed_message(&default_signed_message, chain_id)
+    pub fn get_tx_hash(&self) -> Result<H256, SerializationTransactionError> {
+        let signed_message = self.get_default_signed_message()?;
+        if let Some(hash) = self.get_tx_hash_with_signed_message(signed_message)? {
+            return Ok(hash);
+        }
+        let signature = self.get_packed_signature()?;
+        Ok(H256(keccak256(&self.get_signed_bytes(&signature)?)))
     }
 
     fn recover_default_signer(
@@ -736,16 +767,12 @@ impl TransactionRequest {
 
     fn get_fee_data_checked(&self) -> Result<Fee, SerializationTransactionError> {
         if self.gas_price > u64::MAX.into() {
-            return Err(SerializationTransactionError::TooHighGas(
-                "max fee per gas higher than 2^64-1".to_string(),
-            ));
+            return Err(SerializationTransactionError::MaxFeePerGasNotU64);
         }
 
         let gas_per_pubdata_limit = if let Some(meta) = &self.eip712_meta {
             if meta.gas_per_pubdata > u64::MAX.into() {
-                return Err(SerializationTransactionError::TooHighGas(
-                    "max fee per pubdata byte higher than 2^64-1".to_string(),
-                ));
+                return Err(SerializationTransactionError::MaxFeePerPubdataByteNotU64);
             } else if meta.gas_per_pubdata == U256::zero() {
                 return Err(SerializationTransactionError::GasPerPubDataLimitZero);
             }
@@ -757,9 +784,7 @@ impl TransactionRequest {
 
         let max_priority_fee_per_gas = self.max_priority_fee_per_gas.unwrap_or(self.gas_price);
         if max_priority_fee_per_gas > u64::MAX.into() {
-            return Err(SerializationTransactionError::TooHighGas(
-                "max priority fee per gas higher than 2^64-1".to_string(),
-            ));
+            return Err(SerializationTransactionError::MaxPriorityFeePerGasNotU64);
         }
 
         Ok(Fee {
@@ -780,23 +805,15 @@ impl TransactionRequest {
 }
 
 impl L2Tx {
-    pub fn from_request(
-        value: TransactionRequest,
-        max_tx_size: usize,
+    pub(crate) fn from_request_unverified(
+        mut value: TransactionRequest,
     ) -> Result<Self, SerializationTransactionError> {
         let fee = value.get_fee_data_checked()?;
         let nonce = value.get_nonce_checked()?;
 
         let raw_signature = value.get_signature().unwrap_or_default();
-        // Destruct `eip712_meta` in one go to avoid cloning.
-        let (factory_deps, paymaster_params) = value
-            .eip712_meta
-            .map(|eip712_meta| (eip712_meta.factory_deps, eip712_meta.paymaster_params))
-            .unwrap_or_default();
-
-        if let Some(deps) = factory_deps.as_ref() {
-            validate_factory_deps(deps)?;
-        }
+        let meta = value.eip712_meta.take().unwrap_or_default();
+        validate_factory_deps(&meta.factory_deps)?;
 
         let mut tx = L2Tx::new(
             value
@@ -807,8 +824,8 @@ impl L2Tx {
             fee,
             value.from.unwrap_or_default(),
             value.value,
-            factory_deps,
-            paymaster_params.unwrap_or_default(),
+            meta.factory_deps,
+            meta.paymaster_params.unwrap_or_default(),
         );
 
         tx.common_data.transaction_type = match value.transaction_type.map(|t| t.as_u64() as u8) {
@@ -823,6 +840,14 @@ impl L2Tx {
         if let Some(raw_bytes) = value.raw {
             tx.set_raw_bytes(raw_bytes);
         }
+        Ok(tx)
+    }
+
+    pub fn from_request(
+        value: TransactionRequest,
+        max_tx_size: usize,
+    ) -> Result<Self, SerializationTransactionError> {
+        let tx = Self::from_request_unverified(value)?;
         tx.check_encoded_size(max_tx_size)?;
         Ok(tx)
     }
@@ -845,11 +870,11 @@ impl From<L2Tx> for CallRequest {
     fn from(tx: L2Tx) -> Self {
         let mut meta = Eip712Meta {
             gas_per_pubdata: tx.common_data.fee.gas_per_pubdata_limit,
-            factory_deps: None,
+            factory_deps: vec![],
             custom_signature: Some(tx.common_data.signature.clone()),
             paymaster_params: Some(tx.common_data.paymaster_params.clone()),
         };
-        meta.factory_deps = tx.execute.factory_deps.clone();
+        meta.factory_deps.clone_from(&tx.execute.factory_deps);
         let mut request = CallRequestBuilder::default()
             .from(tx.initiator_account())
             .gas(tx.common_data.fee.gas_limit)
@@ -973,13 +998,13 @@ mod tests {
             ..Default::default()
         };
         let mut rlp = RlpStream::new();
-        tx.rlp(&mut rlp, 270, None);
+        tx.rlp(&mut rlp, None).unwrap();
         let data = rlp.out().to_vec();
         let msg = PackedEthSignature::message_to_signed_bytes(&data);
         let signature = PackedEthSignature::sign_raw(&private_key, &msg).unwrap();
         tx.raw = Some(Bytes(data));
         let mut rlp = RlpStream::new();
-        tx.rlp(&mut rlp, 270, Some(&signature));
+        tx.rlp(&mut rlp, Some(&signature)).unwrap();
         let data = rlp.out().to_vec();
         let (tx2, _) = TransactionRequest::from_bytes(&data, L2ChainId::from(270)).unwrap();
         assert_eq!(tx.gas, tx2.gas);
@@ -1010,7 +1035,7 @@ mod tests {
             transaction_type: Some(U64::from(EIP_712_TX_TYPE)),
             eip712_meta: Some(Eip712Meta {
                 gas_per_pubdata: U256::from(4u32),
-                factory_deps: Some(vec![vec![2; 32]]),
+                factory_deps: vec![vec![2; 32]],
                 custom_signature: Some(vec![1, 2, 3]),
                 paymaster_params: Some(PaymasterParams {
                     paymaster: Default::default(),
@@ -1028,7 +1053,7 @@ mod tests {
         let signature = PackedEthSignature::sign_raw(&private_key, &msg).unwrap();
 
         let mut rlp = RlpStream::new();
-        tx.rlp(&mut rlp, 270, Some(&signature));
+        tx.rlp(&mut rlp, Some(&signature)).unwrap();
         let mut data = rlp.out().to_vec();
         data.insert(0, EIP_712_TX_TYPE);
         tx.raw = Some(Bytes(data.clone()));
@@ -1058,7 +1083,7 @@ mod tests {
             transaction_type: Some(U64::from(EIP_712_TX_TYPE)),
             eip712_meta: Some(Eip712Meta {
                 gas_per_pubdata: U256::from(4u32),
-                factory_deps: Some(vec![vec![2; 32]]),
+                factory_deps: vec![vec![2; 32]],
                 custom_signature: Some(vec![]),
                 paymaster_params: None,
             }),
@@ -1070,7 +1095,7 @@ mod tests {
             PackedEthSignature::sign_typed_data(&private_key, &domain, &transaction_request)
                 .unwrap();
 
-        let encoded_tx = transaction_request.get_signed_bytes(&signature, L2ChainId::from(270));
+        let encoded_tx = transaction_request.get_signed_bytes(&signature).unwrap();
 
         let (decoded_tx, _) =
             TransactionRequest::from_bytes(encoded_tx.as_slice(), L2ChainId::from(270)).unwrap();
@@ -1095,7 +1120,7 @@ mod tests {
             transaction_type: Some(U64::from(EIP_712_TX_TYPE)),
             eip712_meta: Some(Eip712Meta {
                 gas_per_pubdata: U256::from(4u32),
-                factory_deps: Some(vec![vec![2; 32]]),
+                factory_deps: vec![vec![2; 32]],
                 custom_signature: Some(vec![1, 2, 3]),
                 paymaster_params: Some(PaymasterParams {
                     paymaster: Default::default(),
@@ -1110,7 +1135,7 @@ mod tests {
             PackedEthSignature::sign_typed_data(&private_key, &domain, &transaction_request)
                 .unwrap();
 
-        let encoded_tx = transaction_request.get_signed_bytes(&signature, L2ChainId::from(270));
+        let encoded_tx = transaction_request.get_signed_bytes(&signature).unwrap();
 
         let decoded_tx =
             TransactionRequest::from_bytes(encoded_tx.as_slice(), L2ChainId::from(272));
@@ -1141,7 +1166,7 @@ mod tests {
             ..Default::default()
         };
         let mut rlp_stream = RlpStream::new();
-        transaction_request.rlp(&mut rlp_stream, 270, None);
+        transaction_request.rlp(&mut rlp_stream, None).unwrap();
         let mut data = rlp_stream.out().to_vec();
         data.insert(0, EIP_1559_TX_TYPE);
         let msg = PackedEthSignature::message_to_signed_bytes(&data);
@@ -1149,7 +1174,7 @@ mod tests {
         let signature = PackedEthSignature::sign_raw(&private_key, &msg).unwrap();
         transaction_request.raw = Some(Bytes(data));
         let mut rlp = RlpStream::new();
-        transaction_request.rlp(&mut rlp, 270, Some(&signature));
+        transaction_request.rlp(&mut rlp, Some(&signature)).unwrap();
         let mut data = rlp.out().to_vec();
         data.insert(0, EIP_1559_TX_TYPE);
 
@@ -1179,7 +1204,7 @@ mod tests {
             ..Default::default()
         };
         let mut rlp_stream = RlpStream::new();
-        transaction_request.rlp(&mut rlp_stream, 272, None);
+        transaction_request.rlp(&mut rlp_stream, None).unwrap();
         let mut data = rlp_stream.out().to_vec();
         data.insert(0, EIP_1559_TX_TYPE);
         let msg = PackedEthSignature::message_to_signed_bytes(&data);
@@ -1187,7 +1212,7 @@ mod tests {
         let signature = PackedEthSignature::sign_raw(&private_key, &msg).unwrap();
         transaction_request.raw = Some(Bytes(data));
         let mut rlp = RlpStream::new();
-        transaction_request.rlp(&mut rlp, 272, Some(&signature));
+        transaction_request.rlp(&mut rlp, Some(&signature)).unwrap();
         let mut data = rlp.out().to_vec();
         data.insert(0, EIP_1559_TX_TYPE);
 
@@ -1219,7 +1244,7 @@ mod tests {
             ..Default::default()
         };
         let mut rlp_stream = RlpStream::new();
-        transaction_request.rlp(&mut rlp_stream, 270, None);
+        transaction_request.rlp(&mut rlp_stream, None).unwrap();
         let mut data = rlp_stream.out().to_vec();
         data.insert(0, EIP_1559_TX_TYPE);
         let msg = PackedEthSignature::message_to_signed_bytes(&data);
@@ -1227,7 +1252,7 @@ mod tests {
         let signature = PackedEthSignature::sign_raw(&private_key, &msg).unwrap();
         transaction_request.raw = Some(Bytes(data));
         let mut rlp = RlpStream::new();
-        transaction_request.rlp(&mut rlp, 270, Some(&signature));
+        transaction_request.rlp(&mut rlp, Some(&signature)).unwrap();
         let mut data = rlp.out().to_vec();
         data.insert(0, EIP_1559_TX_TYPE);
 
@@ -1256,7 +1281,7 @@ mod tests {
             ..Default::default()
         };
         let mut rlp_stream = RlpStream::new();
-        transaction_request.rlp(&mut rlp_stream, 270, None);
+        transaction_request.rlp(&mut rlp_stream, None).unwrap();
         let mut data = rlp_stream.out().to_vec();
         data.insert(0, EIP_2930_TX_TYPE);
         let msg = PackedEthSignature::message_to_signed_bytes(&data);
@@ -1264,7 +1289,7 @@ mod tests {
         let signature = PackedEthSignature::sign_raw(&private_key, &msg).unwrap();
         transaction_request.raw = Some(Bytes(data));
         let mut rlp = RlpStream::new();
-        transaction_request.rlp(&mut rlp, 270, Some(&signature));
+        transaction_request.rlp(&mut rlp, Some(&signature)).unwrap();
         let mut data = rlp.out().to_vec();
         data.insert(0, EIP_2930_TX_TYPE);
 
@@ -1316,9 +1341,7 @@ mod tests {
             L2Tx::from_request(tx1, usize::MAX);
         assert_eq!(
             execute_tx1.unwrap_err(),
-            SerializationTransactionError::TooHighGas(
-                "max fee per gas higher than 2^64-1".to_string()
-            )
+            SerializationTransactionError::MaxFeePerGasNotU64
         );
 
         let tx2 = TransactionRequest {
@@ -1332,9 +1355,7 @@ mod tests {
             L2Tx::from_request(tx2, usize::MAX);
         assert_eq!(
             execute_tx2.unwrap_err(),
-            SerializationTransactionError::TooHighGas(
-                "max priority fee per gas higher than 2^64-1".to_string()
-            )
+            SerializationTransactionError::MaxPriorityFeePerGasNotU64
         );
 
         let tx3 = TransactionRequest {
@@ -1352,9 +1373,7 @@ mod tests {
             L2Tx::from_request(tx3, usize::MAX);
         assert_eq!(
             execute_tx3.unwrap_err(),
-            SerializationTransactionError::TooHighGas(
-                "max fee per pubdata byte higher than 2^64-1".to_string()
-            )
+            SerializationTransactionError::MaxFeePerPubdataByteNotU64
         );
     }
 
@@ -1379,7 +1398,7 @@ mod tests {
             transaction_type: Some(U64::from(EIP_712_TX_TYPE)),
             eip712_meta: Some(Eip712Meta {
                 gas_per_pubdata: U256::from(4u32),
-                factory_deps: Some(factory_deps),
+                factory_deps,
                 custom_signature: Some(vec![1, 2, 3]),
                 paymaster_params: Some(PaymasterParams {
                     paymaster: Default::default(),
@@ -1397,7 +1416,7 @@ mod tests {
         let signature = PackedEthSignature::sign_raw(&private_key, &msg).unwrap();
 
         let mut rlp = RlpStream::new();
-        tx.rlp(&mut rlp, 270, Some(&signature));
+        tx.rlp(&mut rlp, Some(&signature)).unwrap();
         let mut data = rlp.out().to_vec();
         data.insert(0, EIP_712_TX_TYPE);
         tx.raw = Some(Bytes(data.clone()));
diff --git a/core/lib/types/src/tx/execute.rs b/core/lib/types/src/tx/execute.rs
index e54f469b135d..03762040a6b8 100644
--- a/core/lib/types/src/tx/execute.rs
+++ b/core/lib/types/src/tx/execute.rs
@@ -4,30 +4,61 @@ use zksync_utils::ZeroPrefixHexSerde;
 
 use crate::{ethabi, Address, EIP712TypedStructure, StructBuilder, H256, U256};
 
-/// `Execute` transaction executes a previously deployed smart contract in the L2 rollup.
-#[derive(Clone, Default, Serialize, Deserialize, PartialEq)]
+/// This struct is the `serde` schema for the `Execute` struct.
+/// It allows us to modify `Execute` struct without worrying
+/// about encoding compatibility.
+///
+/// For example, changing type of `factory_deps` from `Option<Vec<Vec<u8>>`
+/// to `Vec<Vec<u8>>` (even with `#[serde(default)]` annotation)
+/// would be incompatible for `serde` json encoding,
+/// because `null` is a valid value for the former but not for the latter.
+#[derive(Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
+struct ExecuteSerde {
+    contract_address: Address,
+    #[serde(with = "ZeroPrefixHexSerde")]
+    calldata: Vec<u8>,
+    value: U256,
+    factory_deps: Option<Vec<Vec<u8>>>,
+}
+
+/// `Execute` transaction executes a previously deployed smart contract in the L2 rollup.
+#[derive(Clone, Default, PartialEq)]
 pub struct Execute {
     pub contract_address: Address,
-
-    #[serde(with = "ZeroPrefixHexSerde")]
     pub calldata: Vec<u8>,
-
     pub value: U256,
-
     /// Factory dependencies: list of contract bytecodes associated with the deploy transaction.
-    /// This field is always `None` for all the transaction that do not cause the contract deployment.
-    /// For the deployment transactions, this field is always `Some`, even if there s no "dependencies" for the
-    /// contract being deployed, since the bytecode of the contract itself is also included into this list.
-    pub factory_deps: Option<Vec<Vec<u8>>>,
+    pub factory_deps: Vec<Vec<u8>>,
+}
+
+impl serde::Serialize for Execute {
+    fn serialize<S: serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
+        ExecuteSerde {
+            contract_address: self.contract_address,
+            calldata: self.calldata.clone(),
+            value: self.value,
+            factory_deps: Some(self.factory_deps.clone()),
+        }
+        .serialize(s)
+    }
+}
+
+impl<'de> serde::Deserialize<'de> for Execute {
+    fn deserialize<D: serde::Deserializer<'de>>(d: D) -> Result<Self, D::Error> {
+        let x = ExecuteSerde::deserialize(d)?;
+        Ok(Self {
+            contract_address: x.contract_address,
+            calldata: x.calldata,
+            value: x.value,
+            factory_deps: x.factory_deps.unwrap_or_default(),
+        })
+    }
 }
 
 impl std::fmt::Debug for Execute {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let factory_deps = match &self.factory_deps {
-            Some(deps) => format!("Some(<{} factory deps>)", deps.len()),
-            None => "None".to_string(),
-        };
+        let factory_deps = format!("<{} factory deps>", self.factory_deps.len());
         f.debug_struct("Execute")
             .field("contract_address", &self.contract_address)
             .field("calldata", &hex::encode(&self.calldata))
@@ -83,12 +114,4 @@ impl Execute {
 
         FUNCTION_SIGNATURE.iter().copied().chain(params).collect()
     }
-
-    /// Number of new factory dependencies in this transaction
-    pub fn factory_deps_length(&self) -> usize {
-        self.factory_deps
-            .as_ref()
-            .map(|deps| deps.len())
-            .unwrap_or_default()
-    }
 }
diff --git a/core/lib/types/src/tx/mod.rs b/core/lib/types/src/tx/mod.rs
index 9bf38aa19555..7078f4ee3fe3 100644
--- a/core/lib/types/src/tx/mod.rs
+++ b/core/lib/types/src/tx/mod.rs
@@ -1,6 +1,6 @@
 //! `transactions` is module that holds the essential information for every transaction.
 //!
-//! Since in zkSync Era every operation can be executed either from the contract or rollup,
+//! Since in ZKsync Era every operation can be executed either from the contract or rollup,
 //! it makes more sense to define the contents of each transaction chain-agnostic, and extent this data
 //! with metadata (such as fees and/or signatures) for L1 and L2 separately.
 
diff --git a/core/lib/utils/Cargo.toml b/core/lib/utils/Cargo.toml
index 564da8cd9ebb..9ab2041bef98 100644
--- a/core/lib/utils/Cargo.toml
+++ b/core/lib/utils/Cargo.toml
@@ -12,7 +12,7 @@ categories.workspace = true
 [dependencies]
 zksync_basic_types.workspace = true
 zk_evm.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 
 bigdecimal.workspace = true
 num = { workspace = true, features = ["serde"] }
@@ -25,8 +25,10 @@ futures.workspace = true
 hex.workspace = true
 reqwest = { workspace = true, features = ["blocking"] }
 itertools.workspace = true
+serde_json.workspace = true
+once_cell.workspace = true
 
 [dev-dependencies]
-serde_json.workspace = true
 rand.workspace = true
 tokio = { workspace = true, features = ["macros", "rt"] }
+bincode.workspace = true
diff --git a/core/lib/utils/src/env.rs b/core/lib/utils/src/env.rs
new file mode 100644
index 000000000000..0eddc6c2cd64
--- /dev/null
+++ b/core/lib/utils/src/env.rs
@@ -0,0 +1,70 @@
+use std::{
+    path::{Path, PathBuf},
+    str,
+};
+
+use anyhow::Context as _;
+use once_cell::sync::OnceCell;
+
+static WORKSPACE: OnceCell<Option<PathBuf>> = OnceCell::new();
+
+fn locate_workspace_inner() -> anyhow::Result<PathBuf> {
+    let output = std::process::Command::new(
+        std::env::var("CARGO")
+            .ok()
+            .unwrap_or_else(|| "cargo".to_string()),
+    )
+    .arg("locate-project")
+    .arg("--workspace")
+    .output()
+    .context("Can't find Cargo workspace location")?;
+
+    let output =
+        serde_json::from_slice::<serde_json::Value>(&output.stdout).with_context(|| {
+            format!(
+                "Error parsing `cargo locate-project` output {}",
+                str::from_utf8(&output.stdout).unwrap_or("(non-utf8 output)")
+            )
+        })?;
+    let root = output.get("root").with_context(|| {
+        format!("root doesn't exist in output from `cargo locate-project` {output:?}")
+    })?;
+
+    let serde_json::Value::String(root) = root else {
+        return Err(anyhow::anyhow!("`root` is not a string: {root:?}"));
+    };
+    let root_path = PathBuf::from(root);
+    Ok(root_path
+        .parent()
+        .with_context(|| format!("`root` path doesn't have a parent: {}", root_path.display()))?
+        .to_path_buf())
+}
+
+/// Find the location of the current workspace, if this code works in workspace
+/// then it will return the correct folder if, it's binary e.g. in docker container
+/// you have to use fallback to another directory
+/// The code has been inspired by `insta`
+/// `https://github.com/mitsuhiko/insta/blob/master/insta/src/env.rs`
+pub fn locate_workspace() -> Option<&'static Path> {
+    // Since `locate_workspace_inner()` should be deterministic, it makes little sense to call
+    // `OnceCell::get_or_try_init()` here; the repeated calls are just as unlikely to succeed as the initial call.
+    // Instead, we store `None` in the `OnceCell` if initialization failed.
+    WORKSPACE
+        .get_or_init(|| {
+            let result = locate_workspace_inner();
+            if result.is_err() {
+                // `get_or_init()` is guaranteed to call the provided closure once per `OnceCell`;
+                // i.e., we won't spam logs here.
+                tracing::info!(
+                    "locate_workspace() failed. You are using an already compiled version"
+                );
+            }
+            result.ok()
+        })
+        .as_deref()
+}
+
+/// Returns [`locate_workspace()`] output with the "." fallback.
+pub fn workspace_dir_or_current_dir() -> &'static Path {
+    locate_workspace().unwrap_or_else(|| Path::new("."))
+}
diff --git a/core/lib/utils/src/lib.rs b/core/lib/utils/src/lib.rs
index df26dbf6ab88..7f9304e3110c 100644
--- a/core/lib/utils/src/lib.rs
+++ b/core/lib/utils/src/lib.rs
@@ -1,7 +1,8 @@
-//! Various helpers used in the zkSync stack.
+//! Various helpers used in the ZKsync stack.
 
 pub mod bytecode;
 mod convert;
+mod env;
 pub mod http_with_retries;
 pub mod misc;
 pub mod panic_extractor;
@@ -9,6 +10,4 @@ mod serde_wrappers;
 pub mod time;
 pub mod wait_for_tasks;
 
-pub use convert::*;
-pub use misc::*;
-pub use serde_wrappers::*;
+pub use self::{convert::*, env::*, misc::*, serde_wrappers::*};
diff --git a/core/lib/utils/src/serde_wrappers.rs b/core/lib/utils/src/serde_wrappers.rs
index 3c7876a5bbb7..cb9687a8a504 100644
--- a/core/lib/utils/src/serde_wrappers.rs
+++ b/core/lib/utils/src/serde_wrappers.rs
@@ -25,28 +25,70 @@ impl<P: Prefix> BytesToHexSerde<P> {
     where
         S: Serializer,
     {
-        // First, serialize to hexadecimal string.
-        let hex_value = format!("{}{}", P::prefix(), hex::encode(value));
+        if serializer.is_human_readable() {
+            // First, serialize to hexadecimal string.
+            let hex_value = format!("{}{}", P::prefix(), hex::encode(value));
 
-        // Then, serialize it using `Serialize` trait implementation for `String`.
-        String::serialize(&hex_value, serializer)
+            // Then, serialize it using `Serialize` trait implementation for `String`.
+            String::serialize(&hex_value, serializer)
+        } else {
+            <[u8]>::serialize(value, serializer)
+        }
     }
 
     pub fn deserialize<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
     where
         D: Deserializer<'de>,
     {
-        let deserialized_string = String::deserialize(deserializer)?;
+        if deserializer.is_human_readable() {
+            let deserialized_string = String::deserialize(deserializer)?;
 
-        if let Some(deserialized_string) = deserialized_string.strip_prefix(P::prefix()) {
-            hex::decode(deserialized_string).map_err(de::Error::custom)
+            if let Some(deserialized_string) = deserialized_string.strip_prefix(P::prefix()) {
+                hex::decode(deserialized_string).map_err(de::Error::custom)
+            } else {
+                Err(de::Error::custom(format!(
+                    "string value missing prefix: {:?}",
+                    P::prefix()
+                )))
+            }
         } else {
-            Err(de::Error::custom(format!(
-                "string value missing prefix: {:?}",
-                P::prefix()
-            )))
+            <Vec<u8>>::deserialize(deserializer)
         }
     }
 }
 
 pub type ZeroPrefixHexSerde = BytesToHexSerde<ZeroxPrefix>;
+
+#[cfg(test)]
+mod tests {
+    use serde::{Deserialize, Serialize};
+
+    use crate::ZeroPrefixHexSerde;
+
+    #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    struct Execute {
+        #[serde(with = "ZeroPrefixHexSerde")]
+        pub calldata: Vec<u8>,
+    }
+
+    #[test]
+    fn test_hex_serde_bincode() {
+        let original = Execute {
+            calldata: vec![0, 1, 2, 3, 4],
+        };
+        let encoded: Vec<u8> = vec![5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4];
+        let decoded: Execute = bincode::deserialize(&encoded).unwrap();
+        assert_eq!(original, decoded);
+    }
+
+    #[test]
+    fn test_hex_serde_json() {
+        let original = Execute {
+            calldata: vec![0, 1, 2, 3, 4],
+        };
+        let encoded = serde_json::to_string(&original).unwrap();
+        assert_eq!(r#"{"calldata":"0x0001020304"}"#, encoded);
+        let decoded: Execute = serde_json::from_str(&encoded).unwrap();
+        assert_eq!(original, decoded);
+    }
+}
diff --git a/core/lib/utils/src/wait_for_tasks.rs b/core/lib/utils/src/wait_for_tasks.rs
index 2fa59280e99e..ab548bdd1dde 100644
--- a/core/lib/utils/src/wait_for_tasks.rs
+++ b/core/lib/utils/src/wait_for_tasks.rs
@@ -47,14 +47,14 @@ impl ManagedTasks {
                     let err =
                         "One of the actors finished its run, while it wasn't expected to do it";
                     tracing::error!("{err}");
-                    vlog::capture_message(err, vlog::AlertLevel::Warning);
+                    zksync_vlog::capture_message(err, zksync_vlog::AlertLevel::Warning);
                 }
             }
             Ok(Err(err)) => {
                 let err =
                     format!("One of the tokio actors unexpectedly finished with error: {err:#}");
                 tracing::error!("{err}");
-                vlog::capture_message(&err, vlog::AlertLevel::Warning);
+                zksync_vlog::capture_message(&err, zksync_vlog::AlertLevel::Warning);
             }
             Err(error) => {
                 let panic_message = try_extract_panic_message(error);
diff --git a/core/lib/vlog/Cargo.toml b/core/lib/vlog/Cargo.toml
index b32b4694137e..eec87a50dfcd 100644
--- a/core/lib/vlog/Cargo.toml
+++ b/core/lib/vlog/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "vlog"
+name = "zksync_vlog"
 version = "0.1.0"
 edition.workspace = true
 authors.workspace = true
@@ -11,7 +11,9 @@ categories.workspace = true
 publish = false
 
 [dependencies]
+anyhow.workspace = true
 chrono.workspace = true
+tokio.workspace = true
 tracing.workspace = true
 tracing-subscriber = { workspace = true, features = [
     "fmt",
@@ -21,6 +23,7 @@ tracing-subscriber = { workspace = true, features = [
 ] }
 tracing-opentelemetry.workspace = true
 sentry.workspace = true
+serde.workspace = true
 serde_json.workspace = true
 opentelemetry = { workspace = true, features = ["rt-tokio", "trace"] }
 opentelemetry-otlp = { workspace = true, features = [
@@ -28,3 +31,5 @@ opentelemetry-otlp = { workspace = true, features = [
     "reqwest-client",
 ] }
 opentelemetry-semantic-conventions.workspace = true
+vise.workspace = true
+vise-exporter.workspace = true
diff --git a/core/lib/vlog/src/lib.rs b/core/lib/vlog/src/lib.rs
index b4a73afb19d6..9b2886ba81d5 100644
--- a/core/lib/vlog/src/lib.rs
+++ b/core/lib/vlog/src/lib.rs
@@ -1,4 +1,4 @@
-//! This module contains the observability subsystem.
+//! This crate contains the observability subsystem.
 //! It is responsible for providing a centralized interface for consistent observability configuration.
 
 use std::{backtrace::Backtrace, borrow::Cow, panic::PanicInfo, str::FromStr};
@@ -17,6 +17,7 @@ use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_semantic_conventions::resource::SERVICE_NAME;
 pub use sentry::{capture_message, Level as AlertLevel};
 use sentry::{types::Dsn, ClientInitGuard};
+use serde::{de::Error, Deserialize, Deserializer};
 use tracing_opentelemetry::OpenTelemetryLayer;
 use tracing_subscriber::{
     filter::Filtered,
@@ -27,6 +28,8 @@ use tracing_subscriber::{
     EnvFilter, Layer,
 };
 
+pub mod prometheus;
+
 type TracingLayer<Inner> =
     Layered<Filtered<OpenTelemetryLayer<Inner, Tracer>, EnvFilter, Inner>, Inner>;
 
@@ -38,6 +41,15 @@ pub enum LogFormat {
     Json,
 }
 
+impl std::fmt::Display for LogFormat {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Plain => f.write_str("plain"),
+            Self::Json => f.write_str("json"),
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct LogFormatError(&'static str);
 
@@ -61,6 +73,13 @@ impl FromStr for LogFormat {
     }
 }
 
+impl<'de> Deserialize<'de> for LogFormat {
+    fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+        let s = String::deserialize(deserializer)?;
+        s.parse::<Self>().map_err(D::Error::custom)
+    }
+}
+
 // Doesn't define WARN and ERROR, because the highest verbosity of spans is INFO.
 #[derive(Copy, Clone, Debug, Default)]
 pub enum OpenTelemetryLevel {
@@ -122,6 +141,7 @@ pub struct OpenTelemetryOptions {
 /// Currently capable of configuring logging output and sentry integration.
 #[derive(Debug, Default)]
 pub struct ObservabilityBuilder {
+    disable_default_logs: bool,
     log_format: LogFormat,
     log_directives: Option<String>,
     sentry_url: Option<Dsn>,
@@ -159,6 +179,14 @@ impl ObservabilityBuilder {
         self
     }
 
+    /// Disables logs enabled by default.
+    /// May be used, for example, in interactive CLI applications, where the user may want to fully control
+    /// the verbosity.
+    pub fn disable_default_logs(mut self) -> Self {
+        self.disable_default_logs = true;
+        self
+    }
+
     /// Enables Sentry integration.
     /// Returns an error if the provided Sentry URL is invalid.
     pub fn with_sentry_url(
@@ -237,15 +265,36 @@ impl ObservabilityBuilder {
         subscriber.with(layer)
     }
 
+    /// Builds a filter for the logs.
+    ///
+    /// Unless `disable_default_logs` was set, uses `zksync=info` as a default which is then merged
+    /// with user-defined directives. Provided directives can extend/override the default value.
+    ///
+    /// The provided default convers all the crates with a name starting with `zksync` (per `tracing`
+    /// [documentation][1]), which is a good enough default for any project.
+    ///
+    /// If `log_directives` are provided via `with_log_directives`, they will be used.
+    /// Otherwise, the value will be parsed from the environment variable `RUST_LOG`.
+    ///
+    /// [1]: https://docs.rs/tracing-subscriber/0.3.18/tracing_subscriber/filter/targets/struct.Targets.html#filtering-with-targets
+    fn build_filter(&self) -> EnvFilter {
+        let mut directives = if self.disable_default_logs {
+            "".to_string()
+        } else {
+            "zksync=info,".to_string()
+        };
+        if let Some(log_directives) = &self.log_directives {
+            directives.push_str(log_directives);
+        } else if let Ok(env_directives) = std::env::var(EnvFilter::DEFAULT_ENV) {
+            directives.push_str(&env_directives);
+        };
+        EnvFilter::new(directives)
+    }
+
     /// Initializes the observability subsystem.
     pub fn build(self) -> ObservabilityGuard {
         // Initialize logs.
-
-        let env_filter = if let Some(log_directives) = self.log_directives {
-            tracing_subscriber::EnvFilter::new(log_directives)
-        } else {
-            tracing_subscriber::EnvFilter::from_default_env()
-        };
+        let env_filter = self.build_filter();
 
         match self.log_format {
             LogFormat::Plain => {
diff --git a/core/lib/vlog/src/prometheus.rs b/core/lib/vlog/src/prometheus.rs
new file mode 100644
index 000000000000..14db8fa418d7
--- /dev/null
+++ b/core/lib/vlog/src/prometheus.rs
@@ -0,0 +1,73 @@
+//! Prometheus-related functionality, such as [`PrometheusExporterConfig`].
+
+use std::{net::Ipv4Addr, time::Duration};
+
+use anyhow::Context as _;
+use tokio::sync::watch;
+use vise::MetricsCollection;
+use vise_exporter::MetricsExporter;
+
+#[derive(Debug)]
+enum PrometheusTransport {
+    Pull {
+        port: u16,
+    },
+    Push {
+        gateway_uri: String,
+        interval: Duration,
+    },
+}
+
+/// Configuration of a Prometheus exporter.
+#[derive(Debug)]
+pub struct PrometheusExporterConfig {
+    transport: PrometheusTransport,
+}
+
+impl PrometheusExporterConfig {
+    /// Creates an exporter that will run an HTTP server on the specified `port`.
+    pub const fn pull(port: u16) -> Self {
+        Self {
+            transport: PrometheusTransport::Pull { port },
+        }
+    }
+
+    /// Creates an exporter that will push metrics to the specified Prometheus gateway endpoint.
+    pub const fn push(gateway_uri: String, interval: Duration) -> Self {
+        Self {
+            transport: PrometheusTransport::Push {
+                gateway_uri,
+                interval,
+            },
+        }
+    }
+
+    /// Runs the exporter. This future should be spawned in a separate Tokio task.
+    pub async fn run(self, mut stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        let registry = MetricsCollection::lazy().collect();
+        let metrics_exporter =
+            MetricsExporter::new(registry.into()).with_graceful_shutdown(async move {
+                stop_receiver.changed().await.ok();
+            });
+
+        match self.transport {
+            PrometheusTransport::Pull { port } => {
+                let prom_bind_address = (Ipv4Addr::UNSPECIFIED, port).into();
+                metrics_exporter
+                    .start(prom_bind_address)
+                    .await
+                    .context("Failed starting metrics server")?;
+            }
+            PrometheusTransport::Push {
+                gateway_uri,
+                interval,
+            } => {
+                let endpoint = gateway_uri
+                    .parse()
+                    .context("Failed parsing Prometheus push gateway endpoint")?;
+                metrics_exporter.push_to_gateway(endpoint, interval).await;
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/core/lib/vm_utils/Cargo.toml b/core/lib/vm_utils/Cargo.toml
index 2ae020f44052..632813d55e6a 100644
--- a/core/lib/vm_utils/Cargo.toml
+++ b/core/lib/vm_utils/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "vm_utils"
+name = "zksync_vm_utils"
 version = "0.1.0"
 edition.workspace = true
 authors.workspace = true
@@ -10,7 +10,7 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-multivm.workspace = true
+zksync_multivm.workspace = true
 zksync_types.workspace = true
 zksync_dal.workspace = true
 zksync_state.workspace = true
diff --git a/core/lib/vm_utils/src/lib.rs b/core/lib/vm_utils/src/lib.rs
index 2dcf186d48d3..d3f294afd9e7 100644
--- a/core/lib/vm_utils/src/lib.rs
+++ b/core/lib/vm_utils/src/lib.rs
@@ -1,13 +1,13 @@
 pub mod storage;
 
 use anyhow::{anyhow, Context};
-use multivm::{
+use tokio::runtime::Handle;
+use zksync_dal::{Connection, Core};
+use zksync_multivm::{
     interface::{VmInterface, VmInterfaceHistoryEnabled},
     vm_latest::HistoryEnabled,
     VmInstance,
 };
-use tokio::runtime::Handle;
-use zksync_dal::{Connection, Core};
 use zksync_state::{PostgresStorage, StoragePtr, StorageView, WriteStorage};
 use zksync_types::{L1BatchNumber, L2ChainId, Transaction};
 
diff --git a/core/lib/vm_utils/src/storage.rs b/core/lib/vm_utils/src/storage.rs
index f9b6dec23da6..6eeaf92b718e 100644
--- a/core/lib/vm_utils/src/storage.rs
+++ b/core/lib/vm_utils/src/storage.rs
@@ -1,13 +1,13 @@
 use std::time::{Duration, Instant};
 
 use anyhow::Context;
-use multivm::{
+use zksync_contracts::BaseSystemContracts;
+use zksync_dal::{Connection, Core, CoreDal, DalError};
+use zksync_multivm::{
     interface::{L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode},
     vm_latest::constants::BATCH_COMPUTATIONAL_GAS_LIMIT,
     zk_evm_latest::ethereum_types::H256,
 };
-use zksync_contracts::BaseSystemContracts;
-use zksync_dal::{Connection, Core, CoreDal, DalError};
 use zksync_types::{
     block::L2BlockHeader, fee_model::BatchFeeInput, snapshots::SnapshotRecoveryStatus, Address,
     L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersionId, ZKPORTER_IS_AVAILABLE,
diff --git a/core/lib/web3_decl/Cargo.toml b/core/lib/web3_decl/Cargo.toml
index fec212c500a2..86cd0a105252 100644
--- a/core/lib/web3_decl/Cargo.toml
+++ b/core/lib/web3_decl/Cargo.toml
@@ -16,6 +16,7 @@ rlp.workspace = true
 thiserror.workspace = true
 jsonrpsee = { workspace = true, features = [
     "macros",
+    "client",
 ] }
 pin-project-lite.workspace = true
 zksync_types.workspace = true
@@ -34,6 +35,6 @@ test-casing.workspace = true
 tokio = { workspace = true, features = ["rt", "test-util"] }
 
 [features]
-default = ["server", "client"]
+default = []
+# Enables server stubs
 server = ["jsonrpsee/server"]
-client = ["jsonrpsee/client"]
diff --git a/core/lib/web3_decl/src/client/boxed.rs b/core/lib/web3_decl/src/client/boxed.rs
index 251994e1f6e2..c49e8aed721c 100644
--- a/core/lib/web3_decl/src/client/boxed.rs
+++ b/core/lib/web3_decl/src/client/boxed.rs
@@ -9,10 +9,10 @@ use jsonrpsee::core::{
 };
 use serde::de::DeserializeOwned;
 
-use super::TaggedClient;
+use super::{ForNetwork, Network, TaggedClient};
 
 #[derive(Debug)]
-struct RawParams(Option<Box<JsonRawValue>>);
+pub struct RawParams(pub(super) Option<Box<JsonRawValue>>);
 
 impl RawParams {
     fn new(params: impl ToRpcParams) -> Result<Self, serde_json::Error> {
@@ -26,54 +26,65 @@ impl ToRpcParams for RawParams {
     }
 }
 
-/// Object-safe version of [`ClientT`] + [`Clone`] + [`TaggedClient`].
-///
-/// The implementation is fairly straightforward: [`RawParams`] is used as a catch-all params type,
-/// and `serde_json::Value` is used as a catch-all response type.
+/// Object-safe version of [`ClientT`] + [`Clone`]. Should generally be used via [`DynClient`] type alias.
+// The implementation is fairly straightforward: [`RawParams`] is used as a catch-all params type,
+// and `serde_json::Value` is used as a catch-all response type.
 #[async_trait]
-trait ObjectSafeClient: 'static + Send + Sync + fmt::Debug {
-    fn clone_boxed(&self) -> Box<dyn ObjectSafeClient>;
+pub trait ObjectSafeClient: 'static + Send + Sync + fmt::Debug + ForNetwork {
+    /// Tags this client as working for a specific component. The component name can be used in logging,
+    /// metrics etc.
+    fn for_component(self: Box<Self>, component_name: &'static str) -> Box<DynClient<Self::Net>>;
 
-    fn for_component_boxed(
-        self: Box<Self>,
-        component_name: &'static str,
-    ) -> Box<dyn ObjectSafeClient>;
+    #[doc(hidden)] // implementation detail
+    fn clone_boxed(&self) -> Box<DynClient<Self::Net>>;
 
-    async fn notification(&self, method: &str, params: RawParams) -> Result<(), Error>;
+    #[doc(hidden)] // implementation detail
+    async fn generic_notification(&self, method: &str, params: RawParams) -> Result<(), Error>;
 
-    async fn request(&self, method: &str, params: RawParams) -> Result<serde_json::Value, Error>;
+    #[doc(hidden)] // implementation detail
+    async fn generic_request(
+        &self,
+        method: &str,
+        params: RawParams,
+    ) -> Result<serde_json::Value, Error>;
 
-    async fn batch_request<'a>(
+    #[doc(hidden)] // implementation detail
+    async fn generic_batch_request<'a>(
         &self,
         batch: BatchRequestBuilder<'a>,
     ) -> Result<BatchResponse<'a, serde_json::Value>, Error>;
 }
 
+/// Dynamically typed RPC client for a certain [`Network`].
+pub type DynClient<Net> = dyn ObjectSafeClient<Net = Net>;
+
 #[async_trait]
 impl<C> ObjectSafeClient for C
 where
     C: 'static + Send + Sync + Clone + fmt::Debug + ClientT + TaggedClient,
 {
-    fn clone_boxed(&self) -> Box<dyn ObjectSafeClient> {
-        Box::new(self.clone())
+    fn clone_boxed(&self) -> Box<DynClient<C::Net>> {
+        Box::new(<C as Clone>::clone(self))
     }
 
-    fn for_component_boxed(
-        self: Box<Self>,
-        component_name: &'static str,
-    ) -> Box<dyn ObjectSafeClient> {
-        Box::new(self.for_component(component_name))
+    fn for_component(mut self: Box<Self>, component_name: &'static str) -> Box<DynClient<C::Net>> {
+        self.set_component(component_name);
+        self
     }
 
-    async fn notification(&self, method: &str, params: RawParams) -> Result<(), Error> {
+    async fn generic_notification(&self, method: &str, params: RawParams) -> Result<(), Error> {
         <C as ClientT>::notification(self, method, params).await
     }
 
-    async fn request(&self, method: &str, params: RawParams) -> Result<serde_json::Value, Error> {
+    async fn generic_request(
+        &self,
+        method: &str,
+        params: RawParams,
+    ) -> Result<serde_json::Value, Error> {
         <C as ClientT>::request(self, method, params).await
     }
 
-    async fn batch_request<'a>(
+    async fn generic_batch_request<'a>(
         &self,
         batch: BatchRequestBuilder<'a>,
     ) -> Result<BatchResponse<'a, serde_json::Value>, Error> {
@@ -81,45 +92,20 @@ where
     }
 }
 
-/// Boxed version of an L2 client.
-///
-/// For now, it has two implementations:
-///
-/// - [`L2Client`](super::L2Client) is the main implementation based on HTTP JSON-RPC
-/// - [`MockL2Client`](super::MockL2Client) is a mock implementation.
-#[derive(Debug)]
-pub struct BoxedL2Client(Box<dyn ObjectSafeClient>);
-
-impl Clone for BoxedL2Client {
+impl<Net: Network> Clone for Box<DynClient<Net>> {
     fn clone(&self) -> Self {
-        Self(self.0.clone_boxed())
-    }
-}
-
-impl BoxedL2Client {
-    /// Boxes the provided client.
-    pub fn new<C>(client: C) -> Self
-    where
-        C: 'static + Send + Sync + Clone + fmt::Debug + ClientT + TaggedClient,
-    {
-        Self(Box::new(client))
-    }
-
-    /// Tags this client with a component label, which will be shown in logs etc.
-    pub fn for_component(self, component_name: &'static str) -> Self {
-        Self(self.0.for_component_boxed(component_name))
+        self.as_ref().clone_boxed()
     }
 }
 
 #[async_trait]
-impl ClientT for BoxedL2Client {
+impl<Net: Network> ClientT for &DynClient<Net> {
     async fn notification<Params>(&self, method: &str, params: Params) -> Result<(), Error>
     where
         Params: ToRpcParams + Send,
     {
-        self.0
-            .as_ref()
-            .notification(method, RawParams::new(params)?)
+        (**self)
+            .generic_notification(method, RawParams::new(params)?)
             .await
     }
 
@@ -128,10 +114,8 @@ impl ClientT for BoxedL2Client {
         R: DeserializeOwned,
         Params: ToRpcParams + Send,
     {
-        let raw_response = self
-            .0
-            .as_ref()
-            .request(method, RawParams::new(params)?)
+        let raw_response = (**self)
+            .generic_request(method, RawParams::new(params)?)
             .await?;
         serde_json::from_value(raw_response).map_err(Error::ParseError)
     }
@@ -143,7 +127,7 @@ impl ClientT for BoxedL2Client {
     where
         R: DeserializeOwned + fmt::Debug + 'a,
     {
-        let raw_responses = self.0.as_ref().batch_request(batch).await?;
+        let raw_responses = (**self).generic_batch_request(batch).await?;
         let mut successful_calls = 0;
         let mut failed_calls = 0;
         let mut responses = Vec::with_capacity(raw_responses.len());
@@ -167,20 +151,72 @@ impl ClientT for BoxedL2Client {
     }
 }
 
+// Delegates to the above `&DynClient<Net>` implementation.
+#[async_trait]
+impl<Net: Network> ClientT for Box<DynClient<Net>> {
+    async fn notification<Params>(&self, method: &str, params: Params) -> Result<(), Error>
+    where
+        Params: ToRpcParams + Send,
+    {
+        ClientT::notification(&self.as_ref(), method, params).await
+    }
+
+    async fn request<R, Params>(&self, method: &str, params: Params) -> Result<R, Error>
+    where
+        R: DeserializeOwned,
+        Params: ToRpcParams + Send,
+    {
+        ClientT::request(&self.as_ref(), method, params).await
+    }
+
+    async fn batch_request<'a, R>(
+        &self,
+        batch: BatchRequestBuilder<'a>,
+    ) -> Result<BatchResponse<'a, R>, Error>
+    where
+        R: DeserializeOwned + fmt::Debug + 'a,
+    {
+        ClientT::batch_request(&self.as_ref(), batch).await
+    }
+}
+
 #[cfg(test)]
 mod tests {
+    use zksync_types::U64;
+
     use super::*;
-    use crate::{client::MockL2Client, namespaces::EthNamespaceClient};
+    use crate::{
+        client::{MockClient, L2},
+        namespaces::EthNamespaceClient,
+    };
 
     #[tokio::test]
     async fn boxing_mock_client() {
-        let client = MockL2Client::new(|method, params| {
-            assert_eq!(method, "eth_blockNumber");
-            assert_eq!(params, serde_json::Value::Null);
-            Ok(serde_json::json!("0x42"))
-        });
-        let client = BoxedL2Client::new(client);
+        let client = MockClient::builder(L2::default())
+            .method("eth_blockNumber", || Ok(U64::from(0x42)))
+            .build();
+        let client = Box::new(client) as Box<DynClient<L2>>;
+
         let block_number = client.get_block_number().await.unwrap();
         assert_eq!(block_number, 0x42.into());
+        let block_number = client.as_ref().get_block_number().await.unwrap();
+        assert_eq!(block_number, 0x42.into());
+    }
+
+    #[tokio::test]
+    async fn client_can_be_cloned() {
+        let client = MockClient::builder(L2::default())
+            .method("eth_blockNumber", || Ok(U64::from(0x42)))
+            .build();
+        let client = Box::new(client) as Box<DynClient<L2>>;
+
+        let cloned_client = client.clone();
+        let block_number = cloned_client.get_block_number().await.unwrap();
+        assert_eq!(block_number, 0x42.into());
+
+        let client_with_label = client.for_component("test");
+        assert_eq!(client_with_label.component(), "test");
+        let block_number = client_with_label.get_block_number().await.unwrap();
+        assert_eq!(block_number, 0x42.into());
     }
 }
diff --git a/core/lib/web3_decl/src/client/metrics.rs b/core/lib/web3_decl/src/client/metrics.rs
index 5bc2a2153b34..0f01bbb49914 100644
--- a/core/lib/web3_decl/src/client/metrics.rs
+++ b/core/lib/web3_decl/src/client/metrics.rs
@@ -5,19 +5,21 @@ use std::time::Duration;
 use jsonrpsee::{core::client, http_client::transport};
 use vise::{
     Buckets, Counter, DurationAsSecs, EncodeLabelSet, EncodeLabelValue, Family, Histogram, Info,
-    Metrics, Unit,
+    LabeledFamily, Metrics, Unit,
 };
 
 use super::{AcquireStats, CallOrigin, SharedRateLimit};
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, EncodeLabelSet)]
 pub(super) struct RequestLabels {
+    pub network: String,
     pub component: &'static str,
     pub method: String,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, EncodeLabelSet)]
 pub(super) struct RpcErrorLabels {
+    pub network: String,
     pub component: &'static str,
     pub method: String,
     pub code: i32,
@@ -25,6 +27,7 @@ pub(super) struct RpcErrorLabels {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, EncodeLabelSet)]
 pub(super) struct HttpErrorLabels {
+    pub network: String,
     pub component: &'static str,
     pub method: String,
     pub status: Option<u16>,
@@ -40,6 +43,7 @@ pub(super) enum CallErrorKind {
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash, EncodeLabelSet)]
 pub(super) struct GenericErrorLabels {
+    network: String,
     component: &'static str,
     method: String,
     kind: CallErrorKind,
@@ -56,7 +60,8 @@ struct L2ClientConfigLabels {
 #[metrics(prefix = "l2_client")]
 pub(super) struct L2ClientMetrics {
     /// Client configuration.
-    info: Info<L2ClientConfigLabels>,
+    #[metrics(labels = ["network"])]
+    info: LabeledFamily<String, Info<L2ClientConfigLabels>>,
     /// Number of requests timed out in the rate-limiting logic.
     pub rate_limit_timeout: Family<RequestLabels, Counter>,
     /// Latency of rate-limiting logic for rate-limited requests.
@@ -71,28 +76,31 @@ pub(super) struct L2ClientMetrics {
 }
 
 impl L2ClientMetrics {
-    pub fn observe_config(&self, rate_limit: &SharedRateLimit) {
+    pub fn observe_config(&self, network: String, rate_limit: &SharedRateLimit) {
         let config_labels = L2ClientConfigLabels {
             rate_limit: rate_limit.rate_limit,
             rate_limit_window: rate_limit.rate_limit_window.into(),
         };
-        if let Err(err) = self.info.set(config_labels) {
-            tracing::warn!(
+        let info = &self.info[&network];
+        if let Err(err) = info.set(config_labels) {
+            tracing::debug!(
                 "Error setting configuration info {:?} for L2 client; already set to {:?}",
                 err.into_inner(),
-                self.info.get()
+                info.get()
             );
         }
     }
 
     pub fn observe_rate_limit_latency(
         &self,
+        network: &str,
         component: &'static str,
         origin: CallOrigin<'_>,
         stats: &AcquireStats,
     ) {
         for method in origin.distinct_method_names() {
             let request_labels = RequestLabels {
+                network: network.to_owned(),
                 component,
                 method: method.to_owned(),
             };
@@ -100,9 +108,15 @@ impl L2ClientMetrics {
         }
     }
 
-    pub fn observe_rate_limit_timeout(&self, component: &'static str, origin: CallOrigin<'_>) {
+    pub fn observe_rate_limit_timeout(
+        &self,
+        network: &str,
+        component: &'static str,
+        origin: CallOrigin<'_>,
+    ) {
         for method in origin.distinct_method_names() {
             let request_labels = RequestLabels {
+                network: network.to_owned(),
                 component,
                 method: method.to_owned(),
             };
@@ -112,25 +126,34 @@ impl L2ClientMetrics {
 
     pub fn observe_error(
         &self,
+        network: &str,
         component: &'static str,
         origin: CallOrigin<'_>,
         err: &client::Error,
     ) {
         for method in origin.distinct_method_names() {
-            self.observe_error_inner(component, method, err);
+            self.observe_error_inner(network.to_owned(), component, method, err);
         }
     }
 
-    fn observe_error_inner(&self, component: &'static str, method: &str, err: &client::Error) {
+    fn observe_error_inner(
+        &self,
+        network: String,
+        component: &'static str,
+        method: &str,
+        err: &client::Error,
+    ) {
         let kind = match err {
             client::Error::Call(err) => {
                 let labels = RpcErrorLabels {
+                    network,
                     component,
                     method: method.to_owned(),
                     code: err.code(),
                 };
                 if self.rpc_errors[&labels].inc() == 0 {
                     tracing::warn!(
+                        network = labels.network,
                         component,
                         method,
                         code = err.code(),
@@ -144,16 +167,18 @@ impl L2ClientMetrics {
                 let status = err
                     .downcast_ref::<transport::Error>()
                     .and_then(|err| match err {
-                        transport::Error::RequestFailure { status_code } => Some(*status_code),
+                        transport::Error::Rejected { status_code } => Some(*status_code),
                         _ => None,
                     });
                 let labels = HttpErrorLabels {
+                    network,
                     component,
                     method: method.to_owned(),
                     status,
                 };
                 if self.http_errors[&labels].inc() == 0 {
                     tracing::warn!(
+                        network = labels.network,
                         component,
                         method,
                         status,
@@ -168,15 +193,17 @@ impl L2ClientMetrics {
         };
 
         let labels = GenericErrorLabels {
+            network,
             component,
             method: method.to_owned(),
             kind,
         };
         if self.generic_errors[&labels].inc() == 0 {
             tracing::warn!(
+                network = labels.network,
                 component,
                 method,
-                "Request `{method}` from component `{component}` failed with generic error: {err}"
+                "Request `{method}` from component `{component}` failed with generic error: {err}",
             );
         }
     }
diff --git a/core/lib/web3_decl/src/client/mock.rs b/core/lib/web3_decl/src/client/mock.rs
index ed7aedc35305..75bd037049d4 100644
--- a/core/lib/web3_decl/src/client/mock.rs
+++ b/core/lib/web3_decl/src/client/mock.rs
@@ -1,31 +1,166 @@
 //! Mock L2 client implementation.
 
-use std::{fmt, future::Future, pin::Pin, sync::Arc};
+use std::{any, collections::HashMap, fmt, future::Future, marker::PhantomData, sync::Arc};
 
 use async_trait::async_trait;
 use futures::future;
-use jsonrpsee::core::{
-    client::{BatchResponse, ClientT, Error, Subscription, SubscriptionClientT},
-    params::BatchRequestBuilder,
-    traits::ToRpcParams,
+use jsonrpsee::{
+    core::{
+        client::{BatchResponse, ClientT, Error},
+        params::BatchRequestBuilder,
+        traits::ToRpcParams,
+    },
+    types::{error::ErrorCode, ErrorObject},
 };
-use serde::de::DeserializeOwned;
+use serde::{de::DeserializeOwned, Serialize};
 
-use super::TaggedClient;
+use super::{boxed::RawParams, ForNetwork, Network, TaggedClient};
 
-type MockHandleResult<'a> =
-    Pin<Box<dyn Future<Output = Result<serde_json::Value, Error>> + Send + 'a>>;
-type RequestHandler = dyn Fn(&str, serde_json::Value) -> MockHandleResult<'_> + Send + Sync;
+/// Object-safe counterpart to [`Handler`]. We need it because async closures aren't available on stable Rust.
+#[async_trait]
+trait HandleGenericRequest: Send + Sync + fmt::Debug {
+    async fn handle_generic_request(
+        &self,
+        req: serde_json::Value,
+    ) -> Result<serde_json::Value, Error>;
+}
+
+/// The only implementation of [`HandleGenericRequest`].
+struct RequestHandler<Req, H, const ASYNC: bool> {
+    inner: H,
+    _fn: PhantomData<fn(Req)>,
+}
+
+impl<Req, H, const ASYNC: bool> fmt::Debug for RequestHandler<Req, H, ASYNC>
+where
+    Req: 'static,
+    H: Handler<Req, ASYNC>,
+    H::Resp: 'static,
+{
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter
+            .debug_struct("RequestHandler")
+            .field("async", &ASYNC)
+            .field("req", &any::type_name::<Req>())
+            .field("resp", &any::type_name::<H::Resp>())
+            .finish()
+    }
+}
+
+#[async_trait]
+impl<Req, H, const ASYNC: bool> HandleGenericRequest for RequestHandler<Req, H, ASYNC>
+where
+    Req: DeserializeOwned + Send + 'static,
+    H: Handler<Req, ASYNC>,
+    H::Resp: Serialize + 'static,
+{
+    async fn handle_generic_request(
+        &self,
+        req: serde_json::Value,
+    ) -> Result<serde_json::Value, Error> {
+        let req: Req = serde_json::from_value(req)?;
+        let resp = self.inner.call(req).await?;
+        Ok(serde_json::to_value(resp)?)
+    }
+}
+
+/// Request handler for [`MockClient`]. Implemented automatically for sync and async closures
+/// taking zero to 3 de-serializable args (you might want to specify their types explicitly)
+/// and returning `Result<Resp, Error>`, where `Resp` is serializable.
+pub trait Handler<Req, const ASYNC: bool>: Send + Sync + 'static {
+    /// Successful response.
+    type Resp: Serialize + 'static;
+    /// Handler future.
+    type Fut: Future<Output = Result<Self::Resp, Error>> + Send + 'static;
+    /// Calls the handler.
+    fn call(&self, req: Req) -> Self::Fut;
+}
+
+macro_rules! impl_handler_for_tuple {
+    ($($field:tt : $typ:ident),*) => {
+        impl<F, $($typ,)* Resp> Handler<($($typ,)*), true> for F
+        where
+            F: Fn($($typ,)*) -> Result<Resp, Error> + Send + Sync + 'static,
+            $($typ: DeserializeOwned + 'static,)*
+            Resp: Serialize + Send + 'static,
+        {
+            type Resp = Resp;
+            type Fut = future::Ready<Result<Resp, Error>>;
+
+            #[allow(unused_variables)] // for `()`
+            fn call(&self, req: ($($typ,)*)) -> Self::Fut {
+                future::ready(self($(req.$field,)*))
+            }
+        }
+
+        impl<F, Fut, $($typ,)* Resp> Handler<($($typ,)*), false> for F
+        where
+            F: Fn($($typ,)*) -> Fut + Send + Sync + 'static,
+            Fut: Future<Output = Result<Resp, Error>> + Send + 'static,
+            $($typ: DeserializeOwned + 'static,)*
+            Resp: Serialize + Send + 'static,
+        {
+            type Resp = Resp;
+            type Fut = Fut;
+
+            #[allow(unused_variables)] // for `()`
+            fn call(&self, req: ($($typ,)*)) -> Self::Fut {
+                self($(req.$field,)*)
+            }
+        }
+    };
+}
+
+impl_handler_for_tuple!();
+impl_handler_for_tuple!(0: A);
+impl_handler_for_tuple!(0: A, 1: B);
+impl_handler_for_tuple!(0: A, 1: B, 2: C);
+
+/// Builder for [`MockClient`].
+#[derive(Debug)]
+pub struct MockClientBuilder<Net> {
+    request_handlers: HashMap<&'static str, Box<dyn HandleGenericRequest>>,
+    network: Net,
+}
+
+impl<Net: Network> MockClientBuilder<Net> {
+    /// Adds a mock method handler to this builder.
+    #[must_use]
+    pub fn method<Req, const ASYNC: bool>(
+        mut self,
+        method: &'static str,
+        request_handler: impl Handler<Req, ASYNC>,
+    ) -> Self
+    where
+        Req: DeserializeOwned + Send + 'static,
+    {
+        let handler = RequestHandler {
+            inner: request_handler,
+            _fn: PhantomData,
+        };
+        self.request_handlers.insert(method, Box::new(handler));
+        self
+    }
+
+    pub fn build(self) -> MockClient<Net> {
+        MockClient {
+            request_handlers: Arc::new(self.request_handlers),
+            component_name: "",
+            network: self.network,
+        }
+    }
+}
 
 /// Mock L2 client implementation. For now, it only mocks requests and batch requests; all other
 /// interactions with the client will panic.
 #[derive(Clone)]
-pub struct MockL2Client {
-    request_handler: Arc<RequestHandler>,
+pub struct MockClient<Net> {
+    request_handlers: Arc<HashMap<&'static str, Box<dyn HandleGenericRequest>>>,
     component_name: &'static str,
+    network: Net,
 }
 
-impl fmt::Debug for MockL2Client {
+impl<Net> fmt::Debug for MockClient<Net> {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         formatter
             .debug_struct("MockL2Client")
@@ -33,41 +168,35 @@ impl fmt::Debug for MockL2Client {
     }
 }
 
-impl MockL2Client {
-    /// Creates an L2 client based on the provided request handler.
-    pub fn new<F>(request_handler: F) -> Self
-    where
-        F: Fn(&str, serde_json::Value) -> Result<serde_json::Value, Error> + Send + Sync + 'static,
-    {
-        Self {
-            request_handler: Arc::new(move |method, params| {
-                Box::pin(future::ready(request_handler(method, params)))
-            }),
-            component_name: "",
+impl<Net: Network> MockClient<Net> {
+    pub fn builder(network: Net) -> MockClientBuilder<Net> {
+        MockClientBuilder {
+            request_handlers: HashMap::new(),
+            network,
         }
     }
+}
 
-    /// Creates an L2 client based on the provided async request handler.
-    pub fn new_async<F>(request_handler: F) -> Self
-    where
-        F: Fn(&str, serde_json::Value) -> MockHandleResult<'_> + Send + Sync + 'static,
-    {
-        Self {
-            request_handler: Arc::new(request_handler),
-            component_name: "",
-        }
+impl<Net: Network> ForNetwork for MockClient<Net> {
+    type Net = Net;
+
+    fn network(&self) -> Self::Net {
+        self.network
+    }
+
+    fn component(&self) -> &'static str {
+        self.component_name
     }
 }
 
-impl TaggedClient for MockL2Client {
-    fn for_component(mut self, component_name: &'static str) -> Self {
+impl<Net: Network> TaggedClient for MockClient<Net> {
+    fn set_component(&mut self, component_name: &'static str) {
         self.component_name = component_name;
-        self
     }
 }
 
 #[async_trait]
-impl ClientT for MockL2Client {
+impl<Net: Network> ClientT for MockClient<Net> {
     async fn notification<Params>(&self, _method: &str, _params: Params) -> Result<(), Error>
     where
         Params: ToRpcParams + Send,
@@ -86,7 +215,14 @@ impl ClientT for MockL2Client {
         } else {
             serde_json::Value::Null
         };
-        let raw_response = (self.request_handler)(method, params).await?;
+        let handler = self.request_handlers.get(method).ok_or_else(|| {
+            Error::Call(ErrorObject::owned(
+                ErrorCode::MethodNotFound.code(),
+                ErrorCode::MethodNotFound.message(),
+                None::<()>,
+            ))
+        })?;
+        let raw_response = handler.handle_generic_request(params).await?;
         Ok(serde_json::from_value(raw_response)?)
     }
 
@@ -99,7 +235,7 @@ impl ClientT for MockL2Client {
     {
         let request_handlers = batch
             .into_iter()
-            .map(|(method, _)| self.request::<serde_json::Value, _>(method, [()]));
+            .map(|(method, value)| self.request(method, RawParams(value)));
         let response_results = future::join_all(request_handlers).await;
         let mut responses = vec![];
         let mut successful_calls = 0;
@@ -124,29 +260,3 @@ impl ClientT for MockL2Client {
         ))
     }
 }
-
-#[async_trait]
-impl SubscriptionClientT for MockL2Client {
-    async fn subscribe<'a, Notif, Params>(
-        &self,
-        _subscribe_method: &'a str,
-        _params: Params,
-        _unsubscribe_method: &'a str,
-    ) -> Result<Subscription<Notif>, Error>
-    where
-        Params: ToRpcParams + Send,
-        Notif: DeserializeOwned,
-    {
-        unimplemented!("never used in the codebase")
-    }
-
-    async fn subscribe_to_method<'a, Notif>(
-        &self,
-        _method: &'a str,
-    ) -> Result<Subscription<Notif>, Error>
-    where
-        Notif: DeserializeOwned,
-    {
-        unimplemented!("never used in the codebase")
-    }
-}
diff --git a/core/lib/web3_decl/src/client/mod.rs b/core/lib/web3_decl/src/client/mod.rs
index 8fe342c20ad9..80a310e2d440 100644
--- a/core/lib/web3_decl/src/client/mod.rs
+++ b/core/lib/web3_decl/src/client/mod.rs
@@ -3,9 +3,9 @@
 //!
 //! # Overview
 //!
-//! - [`L2Client`] is the main client implementation. It's parameterized by the transport (e.g., HTTP or WS),
+//! - [`Client`] is the main client implementation. It's parameterized by the transport (e.g., HTTP or WS),
 //!   with HTTP being the default option.
-//! - [`MockL2Client`] is a mock client useful for testing. Bear in mind that because of the client being generic,
+//! - [`MockClient`] is a mock client useful for testing. Bear in mind that because of the client being generic,
 //!   mock tooling is fairly low-level. Prefer defining a domain-specific wrapper trait for the client functionality and mock it
 //!   where it's possible.
 //! - [`BoxedL2Client`] is a generic client (essentially, a wrapper around a trait object). Use it for dependency injection
@@ -28,17 +28,25 @@ use jsonrpsee::{
         traits::ToRpcParams,
     },
     http_client::{HttpClient, HttpClientBuilder},
+    ws_client,
 };
 use serde::de::DeserializeOwned;
 use tokio::time::Instant;
 use zksync_types::url::SensitiveUrl;
 
 use self::metrics::{L2ClientMetrics, METRICS};
-pub use self::{boxed::BoxedL2Client, mock::MockL2Client};
+pub use self::{
+    boxed::{DynClient, ObjectSafeClient},
+    mock::MockClient,
+    network::{ForNetwork, Network, TaggedClient, L1, L2},
+    shared::Shared,
+};
 
 mod boxed;
 mod metrics;
 mod mock;
+mod network;
+mod shared;
 #[cfg(test)]
 mod tests;
 
@@ -82,17 +90,12 @@ impl fmt::Display for CallOrigin<'_> {
     }
 }
 
-/// Trait encapsulating requirements for the L2 client base.
-pub trait L2ClientBase: SubscriptionClientT + Clone + fmt::Debug + Send + Sync + 'static {}
-
-impl<T: SubscriptionClientT + Clone + fmt::Debug + Send + Sync + 'static> L2ClientBase for T {}
+/// Trait encapsulating requirements for the client base.
+pub trait ClientBase: ClientT + Clone + fmt::Debug + Send + Sync + 'static {}
 
-pub trait TaggedClient {
-    /// Sets the component operating this client. This is used in logging etc.
-    fn for_component(self, component_name: &'static str) -> Self;
-}
+impl<T: ClientT + Clone + fmt::Debug + Send + Sync + 'static> ClientBase for T {}
 
-/// JSON-RPC client for the main node with built-in middleware support.
+/// JSON-RPC client for the main node or Ethereum node with built-in middleware support.
 ///
 /// The client should be used instead of `HttpClient` etc. A single instance of the client should be built
 /// and shared among all tasks run by the node in order to correctly rate-limit requests.
@@ -107,37 +110,54 @@ pub trait TaggedClient {
 //   [a boxed cloneable version of services](https://docs.rs/tower/latest/tower/util/struct.BoxCloneService.html),
 //   but it doesn't fit (it's unconditionally `!Sync`, and `Sync` is required for `HttpClient<_>` to implement RPC traits).
 #[derive(Clone)]
-pub struct L2Client<C = HttpClient> {
+pub struct Client<Net, C = HttpClient> {
     inner: C,
     url: SensitiveUrl,
     rate_limit: SharedRateLimit,
     component_name: &'static str,
     metrics: &'static L2ClientMetrics,
+    network: Net,
 }
 
-impl<C: 'static> fmt::Debug for L2Client<C> {
+/// Client using the WebSocket transport.
+pub type WsClient<Net> = Client<Net, Shared<ws_client::WsClient>>;
+
+impl<Net: fmt::Debug, C: 'static> fmt::Debug for Client<Net, C> {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         formatter
-            .debug_struct("L2Client")
+            .debug_struct("Client")
             // Do not expose the entire client `Debug` representation, which may (and in case of `HttpClient`, does)
             // include potentially sensitive URL and/or HTTP headers
             .field("inner", &any::type_name::<C>())
             .field("url", &self.url)
             .field("rate_limit", &self.rate_limit)
             .field("component_name", &self.component_name)
+            .field("network", &self.network)
             .finish_non_exhaustive()
     }
 }
 
-impl L2Client {
-    /// Creates an HTTP-backed L2 client.
-    pub fn http(url: SensitiveUrl) -> anyhow::Result<L2ClientBuilder> {
+impl<Net: Network> Client<Net> {
+    /// Creates an HTTP-backed client.
+    pub fn http(url: SensitiveUrl) -> anyhow::Result<ClientBuilder<Net>> {
         let client = HttpClientBuilder::default().build(url.expose_str())?;
-        Ok(L2ClientBuilder::new(client, url))
+        Ok(ClientBuilder::new(client, url))
     }
 }
 
-impl<C: L2ClientBase> L2Client<C> {
+impl<Net: Network> WsClient<Net> {
+    /// Creates a WS-backed client.
+    pub async fn ws(
+        url: SensitiveUrl,
+    ) -> anyhow::Result<ClientBuilder<Net, Shared<ws_client::WsClient>>> {
+        let client = ws_client::WsClientBuilder::default()
+            .build(url.expose_str())
+            .await?;
+        Ok(ClientBuilder::new(Shared::new(client), url))
+    }
+}
+
+impl<Net: Network, C: ClientBase> Client<Net, C> {
     async fn limit_rate(&self, origin: CallOrigin<'_>) -> Result<(), Error> {
         const RATE_LIMIT_TIMEOUT: Duration = Duration::from_secs(10);
 
@@ -146,11 +166,17 @@ impl<C: L2ClientBase> L2Client<C> {
             self.rate_limit.acquire(origin.request_count()),
         )
         .await;
+
+        let network_label = self.network.metric_label();
         let stats = match rate_limit_result {
             Err(_) => {
-                self.metrics
-                    .observe_rate_limit_timeout(self.component_name, origin);
+                self.metrics.observe_rate_limit_timeout(
+                    &network_label,
+                    self.component_name,
+                    origin,
+                );
                 tracing::warn!(
+                    network = network_label,
                     component = self.component_name,
                     %origin,
                     "Request to {origin} by component `{}` timed out during rate limiting using policy {} reqs/{:?}",
@@ -164,9 +190,14 @@ impl<C: L2ClientBase> L2Client<C> {
             Ok(stats) => stats,
         };
 
-        self.metrics
-            .observe_rate_limit_latency(self.component_name, origin, &stats);
-        tracing::warn!(
+        self.metrics.observe_rate_limit_latency(
+            &network_label,
+            self.component_name,
+            origin,
+            &stats,
+        );
+        tracing::debug!(
+            network = network_label,
             component = self.component_name,
             %origin,
             "Request to {origin} by component `{}` was rate-limited using policy {} reqs/{:?}: {stats:?}",
@@ -183,21 +214,34 @@ impl<C: L2ClientBase> L2Client<C> {
         call_result: Result<T, Error>,
     ) -> Result<T, Error> {
         if let Err(err) = &call_result {
-            self.metrics.observe_error(self.component_name, origin, err);
+            let network_label = self.network.metric_label();
+            self.metrics
+                .observe_error(&network_label, self.component_name, origin, err);
         }
         call_result
     }
 }
 
-impl<C: L2ClientBase> TaggedClient for L2Client<C> {
-    fn for_component(mut self, component_name: &'static str) -> Self {
+impl<Net: Network, C: ClientBase> ForNetwork for Client<Net, C> {
+    type Net = Net;
+
+    fn network(&self) -> Self::Net {
+        self.network
+    }
+
+    fn component(&self) -> &'static str {
+        self.component_name
+    }
+}
+
+impl<Net: Network, C: ClientBase> TaggedClient for Client<Net, C> {
+    fn set_component(&mut self, component_name: &'static str) {
         self.component_name = component_name;
-        self
     }
 }
 
 #[async_trait]
-impl<C: L2ClientBase> ClientT for L2Client<C> {
+impl<Net: Network, C: ClientBase> ClientT for Client<Net, C> {
     async fn notification<Params>(&self, method: &str, params: Params) -> Result<(), Error>
     where
         Params: ToRpcParams + Send,
@@ -231,7 +275,7 @@ impl<C: L2ClientBase> ClientT for L2Client<C> {
 }
 
 #[async_trait]
-impl<C: L2ClientBase> SubscriptionClientT for L2Client<C> {
+impl<Net: Network, C: ClientBase + SubscriptionClientT> SubscriptionClientT for Client<Net, C> {
     async fn subscribe<'a, Notif, Params>(
         &self,
         subscribe_method: &'a str,
@@ -264,34 +308,43 @@ impl<C: L2ClientBase> SubscriptionClientT for L2Client<C> {
     }
 }
 
-/// Builder for the [`L2Client`].
-pub struct L2ClientBuilder<C = HttpClient> {
+/// Builder for the [`Client`].
+pub struct ClientBuilder<Net, C = HttpClient> {
     client: C,
     url: SensitiveUrl,
     rate_limit: (usize, Duration),
+    network: Net,
 }
 
-impl<C: 'static> fmt::Debug for L2ClientBuilder<C> {
+impl<Net: fmt::Debug, C: 'static> fmt::Debug for ClientBuilder<Net, C> {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         formatter
             .debug_struct("L2ClientBuilder")
             .field("client", &any::type_name::<C>())
             .field("url", &self.url)
             .field("rate_limit", &self.rate_limit)
+            .field("network", &self.network)
             .finish_non_exhaustive()
     }
 }
 
-impl<C: L2ClientBase> L2ClientBuilder<C> {
+impl<Net: Network, C: ClientBase> ClientBuilder<Net, C> {
     /// Wraps the provided client.
     fn new(client: C, url: SensitiveUrl) -> Self {
         Self {
             client,
             url,
             rate_limit: (1, Duration::ZERO),
+            network: Net::default(),
         }
     }
 
+    /// Specifies the network to be used by the client. The network is logged and is used as a metrics label.
+    pub fn for_network(mut self, network: Net) -> Self {
+        self.network = network;
+        self
+    }
+
     /// Sets the rate limit for the client. The rate limit is applied across all client instances,
     /// including cloned ones.
     pub fn with_allowed_requests_per_second(mut self, rps: NonZeroUsize) -> Self {
@@ -309,21 +362,23 @@ impl<C: L2ClientBase> L2ClientBuilder<C> {
     }
 
     /// Builds the client.
-    pub fn build(self) -> L2Client<C> {
+    pub fn build(self) -> Client<Net, C> {
         tracing::info!(
-            "Creating JSON-RPC client with inner client: {:?} and rate limit: {:?}",
+            "Creating JSON-RPC client for network {:?} with inner client: {:?} and rate limit: {:?}",
+            self.network,
             self.client,
             self.rate_limit
         );
         let rate_limit = SharedRateLimit::new(self.rate_limit.0, self.rate_limit.1);
-        METRICS.observe_config(&rate_limit);
+        METRICS.observe_config(self.network.metric_label(), &rate_limit);
 
-        L2Client {
+        Client {
             inner: self.client,
             url: self.url,
             rate_limit,
             component_name: "",
             metrics: &METRICS,
+            network: self.network,
         }
     }
 }
diff --git a/core/lib/web3_decl/src/client/network.rs b/core/lib/web3_decl/src/client/network.rs
new file mode 100644
index 000000000000..2e7dcce9937f
--- /dev/null
+++ b/core/lib/web3_decl/src/client/network.rs
@@ -0,0 +1,97 @@
+//! `Network` and related types.
+
+use std::fmt;
+
+use zksync_types::{L1ChainId, L2ChainId};
+
+/// Marker trait for networks. Two standard network kinds are [`L1`] and [`L2`].
+///
+/// The `Default` value should belong to a "generic" / "unknown" network, rather than to a specific network like the mainnet.
+pub trait Network: 'static + Copy + Default + Sync + Send + fmt::Debug {
+    /// String representation of a network used as a metric label and in log messages.
+    fn metric_label(&self) -> String;
+}
+
+/// L1 (i.e., Ethereum) network.
+#[derive(Debug, Clone, Copy, Default)]
+pub struct L1(Option<L1ChainId>);
+
+impl Network for L1 {
+    fn metric_label(&self) -> String {
+        if let Some(chain_id) = self.0 {
+            format!("ethereum_{chain_id}")
+        } else {
+            "ethereum".to_owned()
+        }
+    }
+}
+
+impl From<L1ChainId> for L1 {
+    fn from(chain_id: L1ChainId) -> Self {
+        Self(Some(chain_id))
+    }
+}
+
+/// L2 network.
+#[derive(Debug, Clone, Copy, Default)]
+pub struct L2(Option<L2ChainId>);
+
+impl Network for L2 {
+    fn metric_label(&self) -> String {
+        if let Some(chain_id) = self.0 {
+            format!("l2_{}", chain_id.as_u64())
+        } else {
+            "l2".to_owned()
+        }
+    }
+}
+
+impl From<L2ChainId> for L2 {
+    fn from(chain_id: L2ChainId) -> Self {
+        Self(Some(chain_id))
+    }
+}
+
+/// Associates a type with a particular type of RPC networks, such as Ethereum or ZKsync Era. RPC traits created using `jsonrpsee::rpc`
+/// can use `ForNetwork` as a client boundary to restrict which implementations can call their methods.
+pub trait ForNetwork {
+    /// Network that the type is associated with.
+    type Net: Network;
+
+    /// Returns a network for this type instance.
+    fn network(&self) -> Self::Net;
+
+    /// Returns the component tag. The component name can be used in logging, metrics etc.
+    /// The component name should be copied to the clones of this client, but should not be passed upstream.
+    fn component(&self) -> &'static str;
+}
+
+impl<T: ?Sized + ForNetwork> ForNetwork for &T {
+    type Net = T::Net;
+
+    fn network(&self) -> Self::Net {
+        (**self).network()
+    }
+
+    fn component(&self) -> &'static str {
+        (**self).component()
+    }
+}
+
+impl<T: ?Sized + ForNetwork> ForNetwork for Box<T> {
+    type Net = T::Net;
+
+    fn network(&self) -> Self::Net {
+        self.as_ref().network()
+    }
+
+    fn component(&self) -> &'static str {
+        self.as_ref().component()
+    }
+}
+
+/// Client that can be tagged with the component using it.
+pub trait TaggedClient: ForNetwork {
+    /// Tags this client as working for a specific component.
+    fn set_component(&mut self, component_name: &'static str);
+}
diff --git a/core/lib/web3_decl/src/client/shared.rs b/core/lib/web3_decl/src/client/shared.rs
new file mode 100644
index 000000000000..abab1de21acc
--- /dev/null
+++ b/core/lib/web3_decl/src/client/shared.rs
@@ -0,0 +1,89 @@
+//! `Shared` RPC client.
+
+use std::{fmt, sync::Arc};
+
+use async_trait::async_trait;
+use jsonrpsee::core::{
+    client::{BatchResponse, ClientT, Error, Subscription, SubscriptionClientT},
+    params::BatchRequestBuilder,
+    traits::ToRpcParams,
+};
+use serde::de::DeserializeOwned;
+
+#[derive(Debug)]
+pub struct Shared<T>(Arc<T>);
+
+impl<T> Clone for Shared<T> {
+    fn clone(&self) -> Self {
+        Self(self.0.clone())
+    }
+}
+
+impl<T: ClientT> Shared<T> {
+    pub fn new(client: T) -> Self {
+        Self(Arc::new(client))
+    }
+}
+
+impl<T: ClientT> From<Arc<T>> for Shared<T> {
+    fn from(client_arc: Arc<T>) -> Self {
+        Self(client_arc)
+    }
+}
+
+#[async_trait]
+impl<T: ClientT + Send + Sync> ClientT for Shared<T> {
+    async fn notification<Params>(&self, method: &str, params: Params) -> Result<(), Error>
+    where
+        Params: ToRpcParams + Send,
+    {
+        self.0.as_ref().notification(method, params).await
+    }
+
+    async fn request<R, Params>(&self, method: &str, params: Params) -> Result<R, Error>
+    where
+        R: DeserializeOwned,
+        Params: ToRpcParams + Send,
+    {
+        self.0.as_ref().request(method, params).await
+    }
+
+    async fn batch_request<'a, R>(
+        &self,
+        batch: BatchRequestBuilder<'a>,
+    ) -> Result<BatchResponse<'a, R>, Error>
+    where
+        R: DeserializeOwned + fmt::Debug + 'a,
+    {
+        self.0.batch_request(batch).await
+    }
+}
+
+#[async_trait]
+impl<T: SubscriptionClientT + Send + Sync> SubscriptionClientT for Shared<T> {
+    async fn subscribe<'a, Notif, Params>(
+        &self,
+        subscribe_method: &'a str,
+        params: Params,
+        unsubscribe_method: &'a str,
+    ) -> Result<Subscription<Notif>, Error>
+    where
+        Params: ToRpcParams + Send,
+        Notif: DeserializeOwned,
+    {
+        self.0
+            .as_ref()
+            .subscribe(subscribe_method, params, unsubscribe_method)
+            .await
+    }
+
+    async fn subscribe_to_method<'a, Notif>(
+        &self,
+        method: &'a str,
+    ) -> Result<Subscription<Notif>, Error>
+    where
+        Notif: DeserializeOwned,
+    {
+        self.0.as_ref().subscribe_to_method(method).await
+    }
+}
diff --git a/core/lib/web3_decl/src/client/tests.rs b/core/lib/web3_decl/src/client/tests.rs
index bad14458a9c8..6ba7ac7d1a33 100644
--- a/core/lib/web3_decl/src/client/tests.rs
+++ b/core/lib/web3_decl/src/client/tests.rs
@@ -7,12 +7,10 @@ use std::{
 
 use assert_matches::assert_matches;
 use futures::future;
-use jsonrpsee::{
-    http_client::transport,
-    types::{error::ErrorCode, ErrorObject},
-};
+use jsonrpsee::{http_client::transport, rpc_params, types::error::ErrorCode};
 use rand::{rngs::StdRng, Rng, SeedableRng};
 use test_casing::test_casing;
+use zksync_types::{L2ChainId, U64};
 
 use super::{
     metrics::{HttpErrorLabels, RequestLabels, RpcErrorLabels},
@@ -193,32 +191,25 @@ async fn rate_limiting_with_rng_and_threads(rate_limit: usize) {
 async fn wrapping_mock_client() {
     tokio::time::pause();
 
-    let client = MockL2Client::new_async(|method, _| {
-        Box::pin(async move {
-            match method {
-                "ok" => Ok(serde_json::from_value(serde_json::json!("ok"))?),
-                "slow" => {
-                    tokio::time::sleep(Duration::from_millis(10)).await;
-                    Ok(serde_json::from_value(serde_json::json!("slow"))?)
-                }
-                "rate_limit" => {
-                    let http_err = transport::Error::RequestFailure { status_code: 429 };
-                    Err(Error::Transport(http_err.into()))
-                }
-                "eth_getBlockNumber" => Ok(serde_json::from_value(serde_json::json!("0x1"))?),
-                _ => {
-                    let unknown_method_err =
-                        ErrorObject::borrowed(ErrorCode::MethodNotFound.code(), "oops", None);
-                    Err(Error::Call(unknown_method_err))
-                }
-            }
+    let client = MockClient::builder(L2::default())
+        .method("ok", || Ok("ok"))
+        .method("slow", || async {
+            tokio::time::sleep(Duration::from_millis(10)).await;
+            Ok("slow")
         })
-    });
+        .method("rate_limit", || {
+            let http_err = transport::Error::Rejected { status_code: 429 };
+            Err::<(), _>(Error::Transport(http_err.into()))
+        })
+        .method("eth_getBlockNumber", || Ok(U64::from(1)))
+        .build();
 
-    let mut client = L2ClientBuilder::new(client, "http://localhost".parse().unwrap())
+    let mut client = ClientBuilder::<L2, _>::new(client, "http://localhost".parse().unwrap())
+        .for_network(L2ChainId::default().into())
         .with_allowed_requests_per_second(NonZeroUsize::new(100).unwrap())
-        .build()
-        .for_component("test");
+        .build();
+    client.set_component("test");
+
     let metrics = &*Box::leak(Box::default());
     client.metrics = metrics;
     assert_eq!(
@@ -229,24 +220,26 @@ async fn wrapping_mock_client() {
 
     // Check that expected results are passed from the wrapped client.
     for _ in 0..10 {
-        let output: String = client.request("ok", [()]).await.unwrap();
+        let output: String = client.request("ok", rpc_params![]).await.unwrap();
         assert_eq!(output, "ok");
     }
 
     let mut batch_request = BatchRequestBuilder::new();
     for _ in 0..5 {
-        batch_request.insert("ok", [()]).unwrap();
+        batch_request.insert("ok", rpc_params![]).unwrap();
     }
-    batch_request.insert("slow", [()]).unwrap();
+    batch_request.insert("slow", rpc_params![]).unwrap();
     client.batch_request::<String>(batch_request).await.unwrap();
 
     // Check that the batch hit the rate limit.
     let labels = RequestLabels {
+        network: "l2_270".to_string(),
         component: "test",
         method: "ok".to_string(),
     };
     assert!(metrics.rate_limit_latency.contains(&labels), "{metrics:?}");
     let labels = RequestLabels {
+        network: "l2_270".to_string(),
         component: "test",
         method: "slow".to_string(),
     };
@@ -254,11 +247,12 @@ async fn wrapping_mock_client() {
 
     // Check error reporting.
     let err = client
-        .request::<String, _>("unknown", [()])
+        .request::<String, _>("unknown", rpc_params![])
         .await
         .unwrap_err();
     assert_matches!(err, Error::Call(_));
     let labels = RpcErrorLabels {
+        network: "l2_270".to_string(),
         component: "test",
         method: "unknown".to_string(),
         code: ErrorCode::MethodNotFound.code(),
@@ -266,11 +260,12 @@ async fn wrapping_mock_client() {
     assert!(metrics.rpc_errors.contains(&labels), "{metrics:?}");
 
     let err = client
-        .request::<String, _>("rate_limit", [()])
+        .request::<String, _>("rate_limit", rpc_params![])
         .await
         .unwrap_err();
     assert_matches!(err, Error::Transport(_));
     let labels = HttpErrorLabels {
+        network: "l2_270".to_string(),
         component: "test",
         method: "rate_limit".to_string(),
         status: Some(429),
diff --git a/core/lib/web3_decl/src/error.rs b/core/lib/web3_decl/src/error.rs
index 1ada1f602324..1ea737a947f5 100644
--- a/core/lib/web3_decl/src/error.rs
+++ b/core/lib/web3_decl/src/error.rs
@@ -1,4 +1,4 @@
-//! Definition of errors that can occur in the zkSync Web3 API.
+//! Definition of errors that can occur in the ZKsync Web3 API.
 
 use std::{
     collections::HashMap,
@@ -11,7 +11,7 @@ use std::{
     task::{Context, Poll},
 };
 
-use jsonrpsee::core::ClientError;
+use jsonrpsee::{core::ClientError, types::error::ErrorCode};
 use pin_project_lite::pin_project;
 use thiserror::Error;
 use zksync_types::{api::SerializationTransactionError, L1BatchNumber, L2BlockNumber};
@@ -39,10 +39,12 @@ pub enum Web3Error {
     LogsLimitExceeded(usize, u32, u32),
     #[error("invalid filter: if blockHash is supplied fromBlock and toBlock must not be")]
     InvalidFilterBlockHash,
-    #[error("Not implemented")]
-    NotImplemented,
-
-    #[error("Tree API is not available")]
+    /// Weaker form of a "method not found" error; the method implementation is technically present,
+    /// but the node configuration prevents the method from functioning.
+    #[error("Method not implemented")]
+    MethodNotImplemented,
+    /// Unavailability caused by node configuration is returned as [`Self::MethodNotImplemented`].
+    #[error("Tree API is temporarily unavailable")]
     TreeApiUnavailable,
     #[error("Internal error")]
     InternalError(#[from] anyhow::Error),
@@ -85,10 +87,15 @@ impl EnrichedClientError {
 
     /// Whether the error should be considered transient.
     pub fn is_transient(&self) -> bool {
-        matches!(
-            self.as_ref(),
-            ClientError::Transport(_) | ClientError::RequestTimeout
-        )
+        match self.as_ref() {
+            ClientError::Transport(_) | ClientError::RequestTimeout => true,
+            ClientError::Call(err) => {
+                // At least some RPC providers use "internal error" in case of the server being overloaded
+                err.code() == ErrorCode::ServerIsBusy.code()
+                    || err.code() == ErrorCode::InternalError.code()
+            }
+            _ => false,
+        }
     }
 }
 
diff --git a/core/lib/web3_decl/src/lib.rs b/core/lib/web3_decl/src/lib.rs
index 30b0d1d912d6..c104668d5977 100644
--- a/core/lib/web3_decl/src/lib.rs
+++ b/core/lib/web3_decl/src/lib.rs
@@ -1,4 +1,4 @@
-//! `zksync_web3_decl` is a collection of common types required for zkSync Web3 API
+//! `zksync_web3_decl` is a collection of common types required for ZKsync Web3 API
 //! and also `jsonrpsee`-based declaration of server and client traits.
 //!
 //! Web3 namespaces are declared in `namespaces` module.
@@ -7,13 +7,10 @@
 
 #![allow(clippy::derive_partial_eq_without_eq)]
 
-#[cfg(all(not(feature = "server"), not(feature = "client")))]
-std::compile_error!(r#"At least on of features ["server", "client"] must be enabled"#);
-
-#[cfg(feature = "client")]
 pub mod client;
 pub mod error;
 pub mod namespaces;
 pub mod types;
 
+// Re-export to simplify crate usage (especially for server implementations).
 pub use jsonrpsee;
diff --git a/core/lib/web3_decl/src/namespaces/debug.rs b/core/lib/web3_decl/src/namespaces/debug.rs
index c54903d7e3c1..b06560b47c32 100644
--- a/core/lib/web3_decl/src/namespaces/debug.rs
+++ b/core/lib/web3_decl/src/namespaces/debug.rs
@@ -1,23 +1,24 @@
-use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+#[cfg_attr(not(feature = "server"), allow(unused_imports))]
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::proc_macros::rpc;
 use zksync_types::{
     api::{BlockId, BlockNumber, DebugCall, ResultDebugCall, TracerConfig},
     debug_flat_call::DebugCallFlat,
     transaction_request::CallRequest,
 };
 
-use crate::types::H256;
+use crate::{
+    client::{ForNetwork, L2},
+    types::H256,
+};
 
 #[cfg_attr(
-    all(feature = "client", feature = "server"),
-    rpc(server, client, namespace = "debug")
-)]
-#[cfg_attr(
-    all(feature = "client", not(feature = "server")),
-    rpc(client, namespace = "debug")
+    feature = "server",
+    rpc(server, client, namespace = "debug", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 #[cfg_attr(
-    all(not(feature = "client"), feature = "server"),
-    rpc(server, namespace = "debug")
+    not(feature = "server"),
+    rpc(client, namespace = "debug", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 pub trait DebugNamespace {
     #[method(name = "traceBlockByNumber")]
@@ -26,18 +27,21 @@ pub trait DebugNamespace {
         block: BlockNumber,
         options: Option<TracerConfig>,
     ) -> RpcResult<Vec<ResultDebugCall>>;
+
     #[method(name = "traceBlockByNumber.callFlatTracer")]
     async fn trace_block_by_number_flat(
         &self,
         block: BlockNumber,
         options: Option<TracerConfig>,
     ) -> RpcResult<Vec<DebugCallFlat>>;
+
     #[method(name = "traceBlockByHash")]
     async fn trace_block_by_hash(
         &self,
         hash: H256,
         options: Option<TracerConfig>,
     ) -> RpcResult<Vec<ResultDebugCall>>;
+
     #[method(name = "traceCall")]
     async fn trace_call(
         &self,
@@ -45,6 +49,7 @@ pub trait DebugNamespace {
         block: Option<BlockId>,
         options: Option<TracerConfig>,
     ) -> RpcResult<DebugCall>;
+
     #[method(name = "traceTransaction")]
     async fn trace_transaction(
         &self,
diff --git a/core/lib/web3_decl/src/namespaces/en.rs b/core/lib/web3_decl/src/namespaces/en.rs
index 29a96f33a3d9..3bd55ecf936f 100644
--- a/core/lib/web3_decl/src/namespaces/en.rs
+++ b/core/lib/web3_decl/src/namespaces/en.rs
@@ -1,18 +1,18 @@
-use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+#[cfg_attr(not(feature = "server"), allow(unused_imports))]
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::proc_macros::rpc;
 use zksync_config::{configs::EcosystemContracts, GenesisConfig};
 use zksync_types::{api::en, tokens::TokenInfo, Address, L2BlockNumber};
 
+use crate::client::{ForNetwork, L2};
+
 #[cfg_attr(
-    all(feature = "client", feature = "server"),
-    rpc(server, client, namespace = "en")
-)]
-#[cfg_attr(
-    all(feature = "client", not(feature = "server")),
-    rpc(client, namespace = "en")
+    feature = "server",
+    rpc(server, client, namespace = "en", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 #[cfg_attr(
-    all(not(feature = "client"), feature = "server"),
-    rpc(server, namespace = "en")
+    not(feature = "server"),
+    rpc(client, namespace = "en", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 pub trait EnNamespace {
     #[method(name = "syncL2Block")]
diff --git a/core/lib/web3_decl/src/namespaces/eth.rs b/core/lib/web3_decl/src/namespaces/eth.rs
index 864a0c25375e..b0e311d339bc 100644
--- a/core/lib/web3_decl/src/namespaces/eth.rs
+++ b/core/lib/web3_decl/src/namespaces/eth.rs
@@ -1,29 +1,27 @@
-use jsonrpsee::{
-    core::{RpcResult, SubscriptionResult},
-    proc_macros::rpc,
-};
+#[cfg_attr(not(feature = "server"), allow(unused_imports))]
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::proc_macros::rpc;
 use zksync_types::{
     api::{BlockId, BlockIdVariant, BlockNumber, Transaction, TransactionVariant},
     transaction_request::CallRequest,
     Address, H256,
 };
 
-use crate::types::{
-    Block, Bytes, FeeHistory, Filter, FilterChanges, Index, Log, PubSubFilter, SyncState,
-    TransactionReceipt, U256, U64,
+use crate::{
+    client::{ForNetwork, L2},
+    types::{
+        Block, Bytes, FeeHistory, Filter, FilterChanges, Index, Log, SyncState, TransactionReceipt,
+        U256, U64,
+    },
 };
 
 #[cfg_attr(
-    all(feature = "client", feature = "server"),
-    rpc(server, client, namespace = "eth")
-)]
-#[cfg_attr(
-    all(feature = "client", not(feature = "server")),
-    rpc(client, namespace = "eth")
+    feature = "server",
+    rpc(server, client, namespace = "eth", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 #[cfg_attr(
-    all(not(feature = "client"), feature = "server"),
-    rpc(server, namespace = "eth")
+    not(feature = "server"),
+    rpc(client, namespace = "eth", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 pub trait EthNamespace {
     #[method(name = "blockNumber")]
@@ -176,9 +174,22 @@ pub trait EthNamespace {
     ) -> RpcResult<FeeHistory>;
 }
 
-#[rpc(server, namespace = "eth")]
-pub trait EthPubSub {
-    #[subscription(name = "subscribe" => "subscription", unsubscribe = "unsubscribe", item = PubSubResult)]
-    async fn subscribe(&self, sub_type: String, filter: Option<PubSubFilter>)
-        -> SubscriptionResult;
+#[cfg(feature = "server")]
+mod pub_sub {
+    use jsonrpsee::{core::SubscriptionResult, proc_macros::rpc};
+
+    use crate::types::PubSubFilter;
+
+    #[rpc(server, namespace = "eth")]
+    pub trait EthPubSub {
+        #[subscription(name = "subscribe" => "subscription", unsubscribe = "unsubscribe", item = PubSubResult)]
+        async fn subscribe(
+            &self,
+            sub_type: String,
+            filter: Option<PubSubFilter>,
+        ) -> SubscriptionResult;
+    }
 }
+
+#[cfg(feature = "server")]
+pub use self::pub_sub::EthPubSubServer;
diff --git a/core/lib/web3_decl/src/namespaces/eth_subscribe.rs b/core/lib/web3_decl/src/namespaces/eth_subscribe.rs
deleted file mode 100644
index 8b137891791f..000000000000
--- a/core/lib/web3_decl/src/namespaces/eth_subscribe.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/core/lib/web3_decl/src/namespaces/mod.rs b/core/lib/web3_decl/src/namespaces/mod.rs
index e3fcc6669a76..f3b5c8a9aaee 100644
--- a/core/lib/web3_decl/src/namespaces/mod.rs
+++ b/core/lib/web3_decl/src/namespaces/mod.rs
@@ -1,21 +1,20 @@
-pub mod debug;
-pub mod en;
-pub mod eth;
-pub mod eth_subscribe;
-pub mod net;
-pub mod snapshots;
-pub mod web3;
-pub mod zks;
-
-#[cfg(feature = "client")]
 pub use self::{
     debug::DebugNamespaceClient, en::EnNamespaceClient, eth::EthNamespaceClient,
-    net::NetNamespaceClient, snapshots::SnapshotsNamespaceServer, web3::Web3NamespaceClient,
-    zks::ZksNamespaceClient,
+    net::NetNamespaceClient, snapshots::SnapshotsNamespaceClient,
+    unstable::UnstableNamespaceClient, web3::Web3NamespaceClient, zks::ZksNamespaceClient,
 };
 #[cfg(feature = "server")]
 pub use self::{
     debug::DebugNamespaceServer, en::EnNamespaceServer, eth::EthNamespaceServer,
-    eth::EthPubSubServer, net::NetNamespaceServer, snapshots::SnapshotsNamespaceClient,
-    web3::Web3NamespaceServer, zks::ZksNamespaceServer,
+    eth::EthPubSubServer, net::NetNamespaceServer, snapshots::SnapshotsNamespaceServer,
+    unstable::UnstableNamespaceServer, web3::Web3NamespaceServer, zks::ZksNamespaceServer,
 };
+
+mod debug;
+mod en;
+mod eth;
+mod net;
+mod snapshots;
+mod unstable;
+mod web3;
+mod zks;
diff --git a/core/lib/web3_decl/src/namespaces/net.rs b/core/lib/web3_decl/src/namespaces/net.rs
index 9213b3536716..21e6548e5341 100644
--- a/core/lib/web3_decl/src/namespaces/net.rs
+++ b/core/lib/web3_decl/src/namespaces/net.rs
@@ -1,17 +1,17 @@
-use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+#[cfg_attr(not(feature = "server"), allow(unused_imports))]
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::proc_macros::rpc;
 use zksync_types::U256;
 
+use crate::client::{ForNetwork, L2};
+
 #[cfg_attr(
-    all(feature = "client", feature = "server"),
-    rpc(server, client, namespace = "net")
-)]
-#[cfg_attr(
-    all(feature = "client", not(feature = "server")),
-    rpc(client, namespace = "net")
+    feature = "server",
+    rpc(server, client, namespace = "net", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 #[cfg_attr(
-    all(not(feature = "client"), feature = "server"),
-    rpc(server, namespace = "net")
+    not(feature = "server"),
+    rpc(client, namespace = "net", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 pub trait NetNamespace {
     #[method(name = "version")]
diff --git a/core/lib/web3_decl/src/namespaces/snapshots.rs b/core/lib/web3_decl/src/namespaces/snapshots.rs
index 02f9aa6b36d2..6b82d5f590d8 100644
--- a/core/lib/web3_decl/src/namespaces/snapshots.rs
+++ b/core/lib/web3_decl/src/namespaces/snapshots.rs
@@ -1,20 +1,20 @@
-use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+#[cfg_attr(not(feature = "server"), allow(unused_imports))]
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::proc_macros::rpc;
 use zksync_types::{
     snapshots::{AllSnapshots, SnapshotHeader},
     L1BatchNumber,
 };
 
+use crate::client::{ForNetwork, L2};
+
 #[cfg_attr(
-    all(feature = "client", feature = "server"),
-    rpc(server, client, namespace = "snapshots")
-)]
-#[cfg_attr(
-    all(feature = "client", not(feature = "server")),
-    rpc(client, namespace = "snapshots")
+    feature = "server",
+    rpc(server, client, namespace = "snapshots", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 #[cfg_attr(
-    all(not(feature = "client"), feature = "server"),
-    rpc(server, namespace = "snapshots")
+    not(feature = "server"),
+    rpc(client, namespace = "snapshots", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 pub trait SnapshotsNamespace {
     #[method(name = "getAllSnapshots")]
diff --git a/core/lib/web3_decl/src/namespaces/unstable.rs b/core/lib/web3_decl/src/namespaces/unstable.rs
new file mode 100644
index 000000000000..4996813a9855
--- /dev/null
+++ b/core/lib/web3_decl/src/namespaces/unstable.rs
@@ -0,0 +1,23 @@
+#[cfg_attr(not(feature = "server"), allow(unused_imports))]
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::proc_macros::rpc;
+use zksync_types::{api::TransactionExecutionInfo, H256};
+
+use crate::client::{ForNetwork, L2};
+
+/// RPCs in this namespace are experimental, and their interface is unstable, and it WILL change.
+#[cfg_attr(
+    feature = "server",
+    rpc(server, client, namespace = "unstable", client_bounds(Self: ForNetwork<Net = L2>))
+)]
+#[cfg_attr(
+    not(feature = "server"),
+    rpc(client, namespace = "unstable", client_bounds(Self: ForNetwork<Net = L2>))
+)]
+pub trait UnstableNamespace {
+    #[method(name = "getTransactionExecutionInfo")]
+    async fn transaction_execution_info(
+        &self,
+        hash: H256,
+    ) -> RpcResult<Option<TransactionExecutionInfo>>;
+}
diff --git a/core/lib/web3_decl/src/namespaces/web3.rs b/core/lib/web3_decl/src/namespaces/web3.rs
index b143477a5f1a..8851f6d0c3be 100644
--- a/core/lib/web3_decl/src/namespaces/web3.rs
+++ b/core/lib/web3_decl/src/namespaces/web3.rs
@@ -1,16 +1,16 @@
-use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+#[cfg_attr(not(feature = "server"), allow(unused_imports))]
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::proc_macros::rpc;
+
+use crate::client::{ForNetwork, L2};
 
 #[cfg_attr(
-    all(feature = "client", feature = "server"),
-    rpc(server, client, namespace = "web3")
-)]
-#[cfg_attr(
-    all(feature = "client", not(feature = "server")),
-    rpc(client, namespace = "web3")
+    feature = "server",
+    rpc(server, client, namespace = "web3", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 #[cfg_attr(
-    all(not(feature = "client"), feature = "server"),
-    rpc(server, namespace = "web3")
+    not(feature = "server"),
+    rpc(client, namespace = "web3", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 pub trait Web3Namespace {
     #[method(name = "clientVersion")]
diff --git a/core/lib/web3_decl/src/namespaces/zks.rs b/core/lib/web3_decl/src/namespaces/zks.rs
index 12f2c7fe5948..b6861a9d2dd7 100644
--- a/core/lib/web3_decl/src/namespaces/zks.rs
+++ b/core/lib/web3_decl/src/namespaces/zks.rs
@@ -1,6 +1,8 @@
 use std::collections::HashMap;
 
-use jsonrpsee::{core::RpcResult, proc_macros::rpc};
+#[cfg_attr(not(feature = "server"), allow(unused_imports))]
+use jsonrpsee::core::RpcResult;
+use jsonrpsee::proc_macros::rpc;
 use zksync_types::{
     api::{
         BlockDetails, BridgeAddresses, L1BatchDetails, L2ToL1LogProof, Proof, ProtocolVersion,
@@ -12,19 +14,18 @@ use zksync_types::{
     Address, L1BatchNumber, L2BlockNumber, H256, U256, U64,
 };
 
-use crate::types::{Bytes, Token};
+use crate::{
+    client::{ForNetwork, L2},
+    types::{Bytes, Token},
+};
 
 #[cfg_attr(
-    all(feature = "client", feature = "server"),
-    rpc(server, client, namespace = "zks")
-)]
-#[cfg_attr(
-    all(feature = "client", not(feature = "server")),
-    rpc(client, namespace = "zks")
+    feature = "server",
+    rpc(server, client, namespace = "zks", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 #[cfg_attr(
-    all(not(feature = "client"), feature = "server"),
-    rpc(server, namespace = "zks")
+    not(feature = "server"),
+    rpc(client, namespace = "zks", client_bounds(Self: ForNetwork<Net = L2>))
 )]
 pub trait ZksNamespace {
     #[method(name = "estimateFee")]
diff --git a/core/lib/web3_decl/src/types.rs b/core/lib/web3_decl/src/types.rs
index ec6bbed46883..41902e408e7a 100644
--- a/core/lib/web3_decl/src/types.rs
+++ b/core/lib/web3_decl/src/types.rs
@@ -3,7 +3,7 @@
 //! Most of the types are re-exported from the `web3` crate, but some of them maybe extended with
 //! new variants (enums) or optional fields (structures).
 //!
-//! These "extensions" are required to provide more zkSync-specific information while remaining Web3-compilant.
+//! These "extensions" are required to provide more ZKsync-specific information while remaining Web3-compilant.
 
 use core::{
     convert::{TryFrom, TryInto},
@@ -21,7 +21,7 @@ pub use zksync_types::{
     Address, Transaction, H160, H256, H64, U256, U64,
 };
 
-/// Token in the zkSync network
+/// Token in the ZKsync network
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Token {
diff --git a/core/lib/zksync_core/Cargo.toml b/core/lib/zksync_core/Cargo.toml
deleted file mode 100644
index 756d32ab74af..000000000000
--- a/core/lib/zksync_core/Cargo.toml
+++ /dev/null
@@ -1,110 +0,0 @@
-[package]
-name = "zksync_core"
-version = "0.1.0"
-edition.workspace = true
-authors.workspace = true
-homepage.workspace = true
-repository.workspace = true
-license.workspace = true
-keywords.workspace = true
-categories.workspace = true
-
-links = "zksync_core_proto"
-
-[dependencies]
-vise.workspace = true
-zksync_state.workspace = true
-vm_utils.workspace = true
-zksync_types.workspace = true
-zksync_dal.workspace = true
-prover_dal.workspace = true
-zksync_db_connection.workspace = true
-zksync_config.workspace = true
-zksync_protobuf_config.workspace = true
-zksync_utils.workspace = true
-zksync_contracts.workspace = true
-zksync_system_constants.workspace = true
-zksync_eth_client.workspace = true
-zksync_eth_signer.workspace = true
-zksync_l1_contract_interface.workspace = true
-zksync_mempool.workspace = true
-zksync_circuit_breaker.workspace = true
-zksync_storage.workspace = true
-zksync_merkle_tree.workspace = true
-zksync_mini_merkle_tree.workspace = true
-prometheus_exporter.workspace = true
-zksync_prover_interface.workspace = true
-zksync_web3_decl = { workspace = true, features = [
-    "server",
-    "client",
-] }
-zksync_object_store.workspace = true
-zksync_health_check.workspace = true
-vlog.workspace = true
-zksync_eth_watch.workspace = true
-zksync_shared_metrics.workspace = true
-zksync_proof_data_handler.workspace = true
-zksync_commitment_generator.workspace = true
-zksync_house_keeper.workspace = true
-zksync_node_genesis.workspace = true
-zksync_eth_sender.workspace = true
-zksync_node_fee_model.workspace = true
-multivm.workspace = true
-
-# Consensus dependenices
-zksync_concurrency.workspace = true
-zksync_consensus_crypto.workspace = true
-zksync_consensus_network.workspace = true
-zksync_consensus_roles.workspace = true
-zksync_consensus_storage.workspace = true
-zksync_consensus_executor.workspace = true
-zksync_consensus_bft.workspace = true
-zksync_consensus_utils.workspace = true
-zksync_protobuf.workspace = true
-
-prost.workspace = true
-serde = { workspace = true, features = ["derive"] }
-serde_json.workspace = true
-serde_yaml.workspace = true
-itertools.workspace = true
-metrics.workspace = true
-ctrlc.workspace = true
-rand.workspace = true
-
-tokio = { workspace = true, features = ["time"] }
-futures = { workspace = true, features = ["compat"] }
-pin-project-lite.workspace = true
-chrono = { workspace = true, features = ["serde"] }
-anyhow.workspace = true
-thiserror.workspace = true
-async-trait.workspace = true
-thread_local.workspace = true
-
-reqwest = { workspace = true, features = ["blocking", "json"] }
-hex.workspace = true
-lru.workspace = true
-governor.workspace = true
-tower-http = { workspace = true, features = ["full"] }
-tower = { workspace = true, features = ["full"] }
-axum = { workspace = true, features = [
-    "http1",
-    "json",
-    "tokio",
-] }
-once_cell.workspace = true
-
-tracing.workspace = true
-
-[dev-dependencies]
-zksync_test_account.workspace = true
-zksync_node_test_utils.workspace = true
-
-assert_matches.workspace = true
-jsonrpsee.workspace = true
-tempfile.workspace = true
-test-casing.workspace = true
-test-log.workspace = true
-backon.workspace = true
-
-[build-dependencies]
-zksync_protobuf_build.workspace = true
diff --git a/core/lib/zksync_core/build.rs b/core/lib/zksync_core/build.rs
deleted file mode 100644
index 78ad3018e333..000000000000
--- a/core/lib/zksync_core/build.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-//! Generates rust code from protobufs.
-fn main() {
-    zksync_protobuf_build::Config {
-        input_root: "src/proto".into(),
-        proto_root: "zksync/core".into(),
-        dependencies: vec!["::zksync_protobuf_config::proto".parse().unwrap()],
-        protobuf_crate: "::zksync_protobuf".parse().unwrap(),
-        is_public: true,
-    }
-    .generate()
-    .unwrap();
-}
diff --git a/core/lib/zksync_core/src/api_server/tx_sender/proxy.rs b/core/lib/zksync_core/src/api_server/tx_sender/proxy.rs
deleted file mode 100644
index 9155cbfac777..000000000000
--- a/core/lib/zksync_core/src/api_server/tx_sender/proxy.rs
+++ /dev/null
@@ -1,264 +0,0 @@
-use std::{
-    collections::{BTreeSet, HashMap},
-    future::Future,
-    sync::Arc,
-    time::Duration,
-};
-
-use tokio::sync::{watch, RwLock};
-use zksync_dal::{transactions_dal::L2TxSubmissionResult, ConnectionPool, Core, CoreDal};
-use zksync_shared_metrics::{TxStage, APP_METRICS};
-use zksync_types::{
-    api::{BlockId, Transaction, TransactionDetails, TransactionId},
-    fee::TransactionExecutionMetrics,
-    l2::L2Tx,
-    Address, Nonce, H256,
-};
-use zksync_web3_decl::{
-    client::BoxedL2Client,
-    error::{ClientRpcContext, EnrichedClientResult, Web3Error},
-    namespaces::{EthNamespaceClient, ZksNamespaceClient},
-};
-
-use super::{tx_sink::TxSink, SubmitTxError};
-
-#[derive(Debug, Clone, Default)]
-pub(crate) struct TxCache {
-    inner: Arc<RwLock<TxCacheInner>>,
-}
-
-#[derive(Debug, Default)]
-struct TxCacheInner {
-    tx_cache: HashMap<H256, L2Tx>,
-    nonces_by_account: HashMap<Address, BTreeSet<Nonce>>,
-}
-
-impl TxCache {
-    async fn push(&self, tx: L2Tx) {
-        let mut inner = self.inner.write().await;
-        inner
-            .nonces_by_account
-            .entry(tx.initiator_account())
-            .or_default()
-            .insert(tx.nonce());
-        inner.tx_cache.insert(tx.hash(), tx);
-    }
-
-    async fn get_tx(&self, tx_hash: H256) -> Option<L2Tx> {
-        self.inner.read().await.tx_cache.get(&tx_hash).cloned()
-    }
-
-    async fn get_nonces_for_account(&self, account_address: Address) -> BTreeSet<Nonce> {
-        let inner = self.inner.read().await;
-        if let Some(nonces) = inner.nonces_by_account.get(&account_address) {
-            nonces.clone()
-        } else {
-            BTreeSet::new()
-        }
-    }
-
-    async fn remove_tx(&self, tx_hash: H256) {
-        self.inner.write().await.tx_cache.remove(&tx_hash);
-        // We intentionally don't change `nonces_by_account`; they should only be changed in response to new L2 blocks
-    }
-
-    async fn run_updates(
-        self,
-        pool: ConnectionPool<Core>,
-        stop_receiver: watch::Receiver<bool>,
-    ) -> anyhow::Result<()> {
-        const UPDATE_INTERVAL: Duration = Duration::from_secs(1);
-
-        loop {
-            if *stop_receiver.borrow() {
-                return Ok(());
-            }
-
-            let addresses: Vec<_> = {
-                // Split into 2 statements for readability.
-                let inner = self.inner.read().await;
-                inner.nonces_by_account.keys().copied().collect()
-            };
-            let mut storage = pool.connection_tagged("api").await?;
-            let nonces_for_accounts = storage
-                .storage_web3_dal()
-                .get_nonces_for_addresses(&addresses)
-                .await?;
-            drop(storage); // Don't hold both `storage` and lock on `inner` at the same time.
-
-            let mut inner = self.inner.write().await;
-            inner.nonces_by_account.retain(|address, account_nonces| {
-                let stored_nonce = nonces_for_accounts
-                    .get(address)
-                    .copied()
-                    .unwrap_or(Nonce(0));
-                // Retain only nonces starting from the stored one.
-                *account_nonces = account_nonces.split_off(&stored_nonce);
-                // If we've removed all nonces, drop the account entry so we don't request stored nonces for it later.
-                !account_nonces.is_empty()
-            });
-            drop(inner);
-
-            tokio::time::sleep(UPDATE_INTERVAL).await;
-        }
-    }
-}
-
-/// Used by external node to proxy transaction to the main node
-/// and store them while they're not synced back yet
-#[derive(Debug)]
-pub struct TxProxy {
-    tx_cache: TxCache,
-    client: BoxedL2Client,
-}
-
-impl TxProxy {
-    pub fn new(client: BoxedL2Client) -> Self {
-        Self {
-            client: client.for_component("tx_proxy"),
-            tx_cache: TxCache::default(),
-        }
-    }
-
-    async fn submit_tx_impl(&self, tx: &L2Tx) -> EnrichedClientResult<H256> {
-        let input_data = tx.common_data.input_data().expect("raw tx is absent");
-        let raw_tx = zksync_types::web3::Bytes(input_data.to_vec());
-        let tx_hash = tx.hash();
-        tracing::info!("Proxying tx {tx_hash:?}");
-        self.client
-            .send_raw_transaction(raw_tx)
-            .rpc_context("send_raw_transaction")
-            .with_arg("tx_hash", &tx_hash)
-            .await
-    }
-
-    async fn save_tx(&self, tx: L2Tx) {
-        self.tx_cache.push(tx).await;
-    }
-
-    async fn find_tx(&self, tx_hash: H256) -> Option<L2Tx> {
-        self.tx_cache.get_tx(tx_hash).await
-    }
-
-    async fn forget_tx(&self, tx_hash: H256) {
-        self.tx_cache.remove_tx(tx_hash).await;
-    }
-
-    async fn next_nonce_by_initiator_account(
-        &self,
-        account_address: Address,
-        current_nonce: u32,
-    ) -> Nonce {
-        let mut pending_nonce = Nonce(current_nonce);
-        let nonces = self.tx_cache.get_nonces_for_account(account_address).await;
-        for nonce in nonces.range(pending_nonce + 1..) {
-            // If nonce is not sequential, then we should not increment nonce.
-            if nonce == &pending_nonce {
-                pending_nonce += 1;
-            } else {
-                break;
-            }
-        }
-
-        pending_nonce
-    }
-
-    async fn request_tx(&self, id: TransactionId) -> EnrichedClientResult<Option<Transaction>> {
-        match id {
-            TransactionId::Block(BlockId::Hash(block), index) => {
-                self.client
-                    .get_transaction_by_block_hash_and_index(block, index)
-                    .rpc_context("get_transaction_by_block_hash_and_index")
-                    .with_arg("block", &block)
-                    .with_arg("index", &index)
-                    .await
-            }
-            TransactionId::Block(BlockId::Number(block), index) => {
-                self.client
-                    .get_transaction_by_block_number_and_index(block, index)
-                    .rpc_context("get_transaction_by_block_number_and_index")
-                    .with_arg("block", &block)
-                    .with_arg("index", &index)
-                    .await
-            }
-            TransactionId::Hash(hash) => {
-                self.client
-                    .get_transaction_by_hash(hash)
-                    .rpc_context("get_transaction_by_hash")
-                    .with_arg("hash", &hash)
-                    .await
-            }
-        }
-    }
-
-    async fn request_tx_details(
-        &self,
-        hash: H256,
-    ) -> EnrichedClientResult<Option<TransactionDetails>> {
-        self.client
-            .get_transaction_details(hash)
-            .rpc_context("get_transaction_details")
-            .with_arg("hash", &hash)
-            .await
-    }
-
-    pub fn run_account_nonce_sweeper(
-        &self,
-        pool: ConnectionPool<Core>,
-        stop_receiver: watch::Receiver<bool>,
-    ) -> impl Future<Output = anyhow::Result<()>> {
-        let tx_cache = self.tx_cache.clone();
-        tx_cache.run_updates(pool, stop_receiver)
-    }
-}
-
-#[async_trait::async_trait]
-impl TxSink for TxProxy {
-    async fn submit_tx(
-        &self,
-        tx: &L2Tx,
-        _execution_metrics: TransactionExecutionMetrics,
-    ) -> Result<L2TxSubmissionResult, SubmitTxError> {
-        // We're running an external node: we have to proxy the transaction to the main node.
-        // But before we do that, save the tx to cache in case someone will request it
-        // Before it reaches the main node.
-        self.save_tx(tx.clone()).await;
-        self.submit_tx_impl(tx).await?;
-        // Now, after we are sure that the tx is on the main node, remove it from cache
-        // since we don't want to store txs that might have been replaced or otherwise removed
-        // from the mempool.
-        self.forget_tx(tx.hash()).await;
-        APP_METRICS.processed_txs[&TxStage::Proxied].inc();
-        Ok(L2TxSubmissionResult::Proxied)
-    }
-
-    async fn lookup_pending_nonce(
-        &self,
-        account_address: Address,
-        last_known_nonce: u32,
-    ) -> Result<Option<Nonce>, Web3Error> {
-        // EN: get pending nonces from the transaction cache
-        // We don't have mempool in EN, it's safe to use the proxy cache as a mempool
-        Ok(Some(
-            self.next_nonce_by_initiator_account(account_address, last_known_nonce)
-                .await
-                .0
-                .into(),
-        ))
-    }
-
-    async fn lookup_tx(&self, id: TransactionId) -> Result<Option<Transaction>, Web3Error> {
-        if let TransactionId::Hash(hash) = id {
-            // If the transaction is not in the db, check the cache
-            if let Some(tx) = self.find_tx(hash).await {
-                return Ok(Some(tx.into()));
-            }
-        }
-        // If the transaction is not in the cache, query main node
-        Ok(self.request_tx(id).await?)
-    }
-
-    async fn lookup_tx_details(&self, hash: H256) -> Result<Option<TransactionDetails>, Web3Error> {
-        Ok(self.request_tx_details(hash).await?)
-    }
-}
diff --git a/core/lib/zksync_core/src/consensus/config.rs b/core/lib/zksync_core/src/consensus/config.rs
deleted file mode 100644
index 998a56a554a0..000000000000
--- a/core/lib/zksync_core/src/consensus/config.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-//! Configuration utilities for the consensus component.
-use std::collections::HashMap;
-
-use anyhow::Context as _;
-use zksync_concurrency::net;
-use zksync_config::configs::consensus::{ConsensusConfig, ConsensusSecrets, Host, NodePublicKey};
-use zksync_consensus_crypto::{Text, TextFmt};
-use zksync_consensus_executor as executor;
-use zksync_consensus_roles::{node, validator};
-use zksync_types::L2ChainId;
-
-use crate::consensus::{fetcher::P2PConfig, MainNodeConfig};
-
-fn read_secret_text<T: TextFmt>(text: Option<&String>) -> anyhow::Result<T> {
-    Text::new(text.context("missing")?)
-        .decode()
-        .map_err(|_| anyhow::format_err!("invalid format"))
-}
-
-fn validator_key(secrets: &ConsensusSecrets) -> anyhow::Result<validator::SecretKey> {
-    read_secret_text(secrets.validator_key.as_ref().map(|x| &x.0))
-}
-
-fn node_key(secrets: &ConsensusSecrets) -> anyhow::Result<node::SecretKey> {
-    read_secret_text(secrets.node_key.as_ref().map(|x| &x.0))
-}
-
-/// Constructs a main node config from raw config.
-pub fn main_node(
-    cfg: &ConsensusConfig,
-    secrets: &ConsensusSecrets,
-    chain_id: L2ChainId,
-) -> anyhow::Result<MainNodeConfig> {
-    Ok(MainNodeConfig {
-        executor: executor(cfg, secrets)?,
-        validator_key: validator_key(secrets).context("validator_key")?,
-        chain_id: validator::ChainId(chain_id.as_u64()),
-    })
-}
-
-pub(super) fn p2p(cfg: &ConsensusConfig, secrets: &ConsensusSecrets) -> anyhow::Result<P2PConfig> {
-    executor(cfg, secrets)
-}
-
-fn executor(cfg: &ConsensusConfig, secrets: &ConsensusSecrets) -> anyhow::Result<executor::Config> {
-    let mut gossip_static_outbound = HashMap::new();
-    {
-        let mut append = |key: &NodePublicKey, addr: &Host| {
-            gossip_static_outbound.insert(
-                Text::new(&key.0).decode().context("key")?,
-                net::Host(addr.0.clone()),
-            );
-            anyhow::Ok(())
-        };
-        for (i, (k, v)) in cfg.gossip_static_outbound.iter().enumerate() {
-            append(k, v).with_context(|| format!("gossip_static_outbound[{i}]"))?;
-        }
-    }
-    Ok(executor::Config {
-        server_addr: cfg.server_addr,
-        public_addr: net::Host(cfg.public_addr.0.clone()),
-        max_payload_size: cfg.max_payload_size,
-        node_key: node_key(secrets).context("node_key")?,
-        gossip_dynamic_inbound_limit: cfg.gossip_dynamic_inbound_limit,
-        gossip_static_inbound: cfg
-            .gossip_static_inbound
-            .iter()
-            .enumerate()
-            .map(|(i, x)| Text::new(&x.0).decode().context(i))
-            .collect::<Result<_, _>>()
-            .context("gossip_static_inbound")?,
-        gossip_static_outbound,
-    })
-}
diff --git a/core/lib/zksync_core/src/consensus/mod.rs b/core/lib/zksync_core/src/consensus/mod.rs
deleted file mode 100644
index 449532fdc5ef..000000000000
--- a/core/lib/zksync_core/src/consensus/mod.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-//! Consensus-related functionality.
-
-#![allow(clippy::redundant_locals)]
-#![allow(clippy::needless_pass_by_ref_mut)]
-
-use zksync_concurrency::{ctx, error::Wrap as _, scope};
-use zksync_consensus_executor as executor;
-use zksync_consensus_roles::validator;
-
-pub use self::{fetcher::*, storage::Store};
-
-pub mod config;
-pub mod era;
-mod fetcher;
-mod storage;
-#[cfg(test)]
-pub(crate) mod testonly;
-#[cfg(test)]
-mod tests;
-
-/// Main node consensus config.
-#[derive(Debug, Clone)]
-pub struct MainNodeConfig {
-    pub executor: executor::Config,
-    pub validator_key: validator::SecretKey,
-    pub chain_id: validator::ChainId,
-}
-
-impl MainNodeConfig {
-    /// Task generating consensus certificates for the L2 blocks generated by `StateKeeper`.
-    /// Broadcasts the blocks with certificates to gossip network peers.
-    pub async fn run(self, ctx: &ctx::Ctx, store: Store) -> anyhow::Result<()> {
-        scope::run!(&ctx, |ctx, s| async {
-            store
-                .try_init_genesis(ctx, self.chain_id, &self.validator_key.public())
-                .await
-                .wrap("block_store.try_init_genesis()")?;
-            let (block_store, runner) = store
-                .clone()
-                .into_block_store(ctx, None)
-                .await
-                .wrap("into_block_store()")?;
-            s.spawn_bg(runner.run(ctx));
-            let executor = executor::Executor {
-                config: self.executor,
-                block_store,
-                validator: Some(executor::Validator {
-                    key: self.validator_key,
-                    replica_store: Box::new(store.clone()),
-                    payload_manager: Box::new(store.clone()),
-                }),
-            };
-            executor.run(ctx).await
-        })
-        .await
-    }
-}
diff --git a/core/lib/zksync_core/src/consensus/storage/mod.rs b/core/lib/zksync_core/src/consensus/storage/mod.rs
deleted file mode 100644
index 0083481deed5..000000000000
--- a/core/lib/zksync_core/src/consensus/storage/mod.rs
+++ /dev/null
@@ -1,566 +0,0 @@
-//! Storage implementation based on DAL.
-
-use std::sync::Arc;
-
-use anyhow::Context as _;
-use zksync_concurrency::{ctx, error::Wrap as _, scope, sync, time};
-use zksync_consensus_bft::PayloadManager;
-use zksync_consensus_roles::validator;
-use zksync_consensus_storage as storage;
-use zksync_dal::{consensus_dal::Payload, ConnectionPool, Core, CoreDal, DalError};
-use zksync_types::L2BlockNumber;
-
-#[cfg(test)]
-mod testonly;
-
-use crate::{
-    state_keeper::io::common::IoCursor,
-    sync_layer::{
-        fetcher::{FetchedBlock, FetchedTransaction},
-        sync_action::ActionQueueSender,
-    },
-};
-
-/// Context-aware `zksync_dal::Connection<Core>` wrapper.
-pub(super) struct Connection<'a>(pub(super) zksync_dal::Connection<'a, Core>);
-
-impl<'a> Connection<'a> {
-    /// Wrapper for `start_transaction()`.
-    pub async fn start_transaction<'b, 'c: 'b>(
-        &'c mut self,
-        ctx: &ctx::Ctx,
-    ) -> ctx::Result<Connection<'b>> {
-        Ok(Connection(
-            ctx.wait(self.0.start_transaction())
-                .await?
-                .context("sqlx")?,
-        ))
-    }
-
-    /// Wrapper for `commit()`.
-    pub async fn commit(self, ctx: &ctx::Ctx) -> ctx::Result<()> {
-        Ok(ctx.wait(self.0.commit()).await?.context("sqlx")?)
-    }
-
-    /// Wrapper for `consensus_dal().block_range()`.
-    pub async fn block_range(
-        &mut self,
-        ctx: &ctx::Ctx,
-    ) -> ctx::Result<std::ops::Range<validator::BlockNumber>> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().block_range())
-            .await?
-            .context("sqlx")?)
-    }
-
-    /// Wrapper for `consensus_dal().block_payload()`.
-    pub async fn payload(
-        &mut self,
-        ctx: &ctx::Ctx,
-        number: validator::BlockNumber,
-    ) -> ctx::Result<Option<Payload>> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().block_payload(number))
-            .await?
-            .map_err(DalError::generalize)?)
-    }
-
-    /// Wrapper for `consensus_dal().first_certificate()`.
-    pub async fn first_certificate(
-        &mut self,
-        ctx: &ctx::Ctx,
-    ) -> ctx::Result<Option<validator::CommitQC>> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().first_certificate())
-            .await?
-            .map_err(DalError::generalize)?)
-    }
-
-    /// Wrapper for `consensus_dal().last_certificate()`.
-    pub async fn last_certificate(
-        &mut self,
-        ctx: &ctx::Ctx,
-    ) -> ctx::Result<Option<validator::CommitQC>> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().last_certificate())
-            .await?
-            .map_err(DalError::generalize)?)
-    }
-
-    /// Wrapper for `consensus_dal().certificate()`.
-    pub async fn certificate(
-        &mut self,
-        ctx: &ctx::Ctx,
-        number: validator::BlockNumber,
-    ) -> ctx::Result<Option<validator::CommitQC>> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().certificate(number))
-            .await?
-            .map_err(DalError::generalize)?)
-    }
-
-    /// Wrapper for `consensus_dal().insert_certificate()`.
-    pub async fn insert_certificate(
-        &mut self,
-        ctx: &ctx::Ctx,
-        cert: &validator::CommitQC,
-    ) -> ctx::Result<()> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().insert_certificate(cert))
-            .await??)
-    }
-
-    /// Wrapper for `consensus_dal().replica_state()`.
-    pub async fn replica_state(&mut self, ctx: &ctx::Ctx) -> ctx::Result<storage::ReplicaState> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().replica_state())
-            .await?
-            .map_err(DalError::generalize)?)
-    }
-
-    /// Wrapper for `consensus_dal().set_replica_state()`.
-    pub async fn set_replica_state(
-        &mut self,
-        ctx: &ctx::Ctx,
-        state: &storage::ReplicaState,
-    ) -> ctx::Result<()> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().set_replica_state(state))
-            .await?
-            .context("sqlx")?)
-    }
-
-    /// Wrapper for `FetcherCursor::new()`.
-    pub async fn new_payload_queue(
-        &mut self,
-        ctx: &ctx::Ctx,
-        actions: ActionQueueSender,
-    ) -> ctx::Result<PayloadQueue> {
-        Ok(PayloadQueue {
-            inner: ctx.wait(IoCursor::for_fetcher(&mut self.0)).await??,
-            actions,
-        })
-    }
-
-    pub async fn genesis(&mut self, ctx: &ctx::Ctx) -> ctx::Result<Option<validator::Genesis>> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().genesis())
-            .await?
-            .map_err(DalError::generalize)?)
-    }
-
-    pub async fn try_update_genesis(
-        &mut self,
-        ctx: &ctx::Ctx,
-        genesis: &validator::Genesis,
-    ) -> ctx::Result<()> {
-        Ok(ctx
-            .wait(self.0.consensus_dal().try_update_genesis(genesis))
-            .await??)
-    }
-}
-
-#[derive(Debug)]
-pub(super) struct PayloadQueue {
-    inner: IoCursor,
-    actions: ActionQueueSender,
-}
-
-impl PayloadQueue {
-    pub(super) fn next(&self) -> validator::BlockNumber {
-        validator::BlockNumber(self.inner.next_l2_block.0.into())
-    }
-
-    /// Converts the block into actions and pushes them to the actions queue.
-    /// Does nothing and returns Ok() if the block has been already processed.
-    /// Returns an error if a block with an earlier block number was expected.
-    pub(super) async fn send(&mut self, block: FetchedBlock) -> anyhow::Result<()> {
-        let want = self.inner.next_l2_block;
-        // Some blocks are missing.
-        if block.number > want {
-            anyhow::bail!("expected {want:?}, got {:?}", block.number);
-        }
-        // Block already processed.
-        if block.number < want {
-            return Ok(());
-        }
-        self.actions.push_actions(self.inner.advance(block)).await;
-        Ok(())
-    }
-}
-
-/// Wrapper of `ConnectionPool` implementing `ReplicaStore` and `PayloadManager`.
-#[derive(Clone, Debug)]
-pub struct Store(pub ConnectionPool<Core>);
-
-impl Store {
-    /// Wrapper for `connection_tagged()`.
-    pub(super) async fn access<'a>(&'a self, ctx: &ctx::Ctx) -> ctx::Result<Connection<'a>> {
-        Ok(Connection(
-            ctx.wait(self.0.connection_tagged("consensus"))
-                .await?
-                .map_err(DalError::generalize)?,
-        ))
-    }
-
-    /// Waits for the `number` L2 block.
-    pub async fn wait_for_payload(
-        &self,
-        ctx: &ctx::Ctx,
-        number: validator::BlockNumber,
-    ) -> ctx::Result<Payload> {
-        const POLL_INTERVAL: time::Duration = time::Duration::milliseconds(50);
-        loop {
-            if let Some(payload) = self
-                .access(ctx)
-                .await
-                .wrap("access()")?
-                .payload(ctx, number)
-                .await
-                .wrap("payload()")?
-            {
-                return Ok(payload);
-            }
-            ctx.sleep(POLL_INTERVAL).await?;
-        }
-    }
-
-    pub(super) async fn genesis(&self, ctx: &ctx::Ctx) -> ctx::Result<validator::Genesis> {
-        Ok(self
-            .access(ctx)
-            .await
-            .wrap("access()")?
-            .genesis(ctx)
-            .await
-            .wrap("genesis()")?
-            .context("genesis is missing")?)
-    }
-
-    /// Fetches and verifies consistency of certificates in storage.
-    async fn certificates_range(&self, ctx: &ctx::Ctx) -> ctx::Result<storage::BlockStoreState> {
-        let mut conn = self.access(ctx).await.wrap("access()")?;
-
-        // Fetch the range of L2 blocks in storage.
-        let block_range = conn.block_range(ctx).await.context("block_range")?;
-
-        // Fetch the range of certificates in storage.
-        let genesis = conn
-            .genesis(ctx)
-            .await
-            .wrap("genesis()")?
-            .context("genesis missing")?;
-        let first_expected_cert = genesis.first_block.max(block_range.start);
-        let last_cert = conn
-            .last_certificate(ctx)
-            .await
-            .wrap("last_certificate()")?;
-        let next_expected_cert = last_cert
-            .as_ref()
-            .map_or(first_expected_cert, |cert| cert.header().number.next());
-
-        // Check that the first certificate in storage has the expected L2 block number.
-        if let Some(got) = conn
-            .first_certificate(ctx)
-            .await
-            .wrap("first_certificate()")?
-        {
-            if got.header().number != first_expected_cert {
-                return Err(anyhow::format_err!(
-                    "inconsistent storage: certificates should start at {first_expected_cert}, while they start at {}",
-                    got.header().number,
-                ).into());
-            }
-        }
-
-        // Check that the node has all the blocks before the next expected certificate, because
-        // the node needs to know the state of the chain up to block `X` to process block `X+1`.
-        if block_range.end < next_expected_cert {
-            return Err(anyhow::format_err!("inconsistent storage: cannot start consensus for L2 block {next_expected_cert}, because earlier blocks are missing").into());
-        }
-        Ok(storage::BlockStoreState {
-            first: first_expected_cert,
-            last: last_cert,
-        })
-    }
-
-    pub(super) async fn block(
-        &self,
-        ctx: &ctx::Ctx,
-        number: validator::BlockNumber,
-    ) -> ctx::Result<Option<validator::FinalBlock>> {
-        let conn = &mut self.access(ctx).await.wrap("access()")?;
-        let Some(justification) = conn.certificate(ctx, number).await.wrap("certificate()")? else {
-            return Ok(None);
-        };
-        let payload = conn
-            .payload(ctx, number)
-            .await
-            .wrap("payload()")?
-            .context("L2 block disappeared from storage")?;
-        Ok(Some(validator::FinalBlock {
-            payload: payload.encode(),
-            justification,
-        }))
-    }
-
-    /// Initializes consensus genesis (with 1 validator) to start at the last L2 block in storage.
-    /// No-op if db already contains a genesis.
-    pub(super) async fn try_init_genesis(
-        &self,
-        ctx: &ctx::Ctx,
-        chain_id: validator::ChainId,
-        validator_key: &validator::PublicKey,
-    ) -> ctx::Result<()> {
-        let mut conn = self.access(ctx).await.wrap("access()")?;
-        let block_range = conn.block_range(ctx).await.wrap("block_range()")?;
-        let mut txn = conn
-            .start_transaction(ctx)
-            .await
-            .wrap("start_transaction()")?;
-        // `Committee::new()` with a single validator should never fail.
-        let committee = validator::Committee::new([validator::WeightedValidator {
-            key: validator_key.clone(),
-            weight: 1,
-        }])
-        .unwrap();
-        let leader_selection = validator::LeaderSelectionMode::Sticky(validator_key.clone());
-        let old = txn.genesis(ctx).await.wrap("genesis()")?;
-        // Check if the current config of the main node is compatible with the stored genesis.
-        if old.as_ref().map_or(false, |old| {
-            old.chain_id == chain_id
-                && old.protocol_version == validator::ProtocolVersion::CURRENT
-                && old.committee == committee
-                && old.leader_selection == leader_selection
-        }) {
-            return Ok(());
-        }
-        // If not, perform a hard fork.
-        tracing::info!("Performing a hard fork of consensus.");
-        let genesis = validator::GenesisRaw {
-            chain_id,
-            fork_number: old
-                .as_ref()
-                .map_or(validator::ForkNumber(0), |old| old.fork_number.next()),
-            first_block: block_range.end,
-
-            protocol_version: validator::ProtocolVersion::CURRENT,
-            committee,
-            leader_selection,
-        }
-        .with_hash();
-        txn.try_update_genesis(ctx, &genesis)
-            .await
-            .wrap("try_update_genesis()")?;
-        txn.commit(ctx).await.wrap("commit()")?;
-        Ok(())
-    }
-
-    pub(super) async fn into_block_store(
-        self,
-        ctx: &ctx::Ctx,
-        payload_queue: Option<PayloadQueue>,
-    ) -> ctx::Result<(Arc<storage::BlockStore>, BlockStoreRunner)> {
-        let persisted = self
-            .certificates_range(ctx)
-            .await
-            .wrap("certificates_range()")?;
-        let persisted = sync::watch::channel(persisted).0;
-        let (certs_send, certs_recv) = ctx::channel::unbounded();
-        let (block_store, runner) = storage::BlockStore::new(
-            ctx,
-            Box::new(BlockStore {
-                inner: self.clone(),
-                certificates: certs_send,
-                payloads: payload_queue.map(sync::Mutex::new),
-                persisted: persisted.subscribe(),
-            }),
-        )
-        .await?;
-        Ok((
-            block_store,
-            BlockStoreRunner {
-                store: self,
-                persisted,
-                certificates: certs_recv,
-                inner: runner,
-            },
-        ))
-    }
-}
-
-/// Wrapper of `ConnectionPool` implementing `PersistentBlockStore`.
-#[derive(Debug)]
-struct BlockStore {
-    inner: Store,
-    payloads: Option<sync::Mutex<PayloadQueue>>,
-    certificates: ctx::channel::UnboundedSender<validator::CommitQC>,
-    persisted: sync::watch::Receiver<storage::BlockStoreState>,
-}
-
-/// Background task of the `BlockStore`.
-pub struct BlockStoreRunner {
-    store: Store,
-    persisted: sync::watch::Sender<storage::BlockStoreState>,
-    certificates: ctx::channel::UnboundedReceiver<validator::CommitQC>,
-    inner: storage::BlockStoreRunner,
-}
-
-impl BlockStoreRunner {
-    pub async fn run(mut self, ctx: &ctx::Ctx) -> anyhow::Result<()> {
-        let res = scope::run!(ctx, |ctx, s| async {
-            s.spawn(async { Ok(self.inner.run(ctx).await?) });
-            loop {
-                let cert = self.certificates.recv(ctx).await?;
-                self.store
-                    .wait_for_payload(ctx, cert.header().number)
-                    .await
-                    .wrap("wait_for_payload()")?;
-                self.store
-                    .access(ctx)
-                    .await
-                    .wrap("access()")?
-                    .insert_certificate(ctx, &cert)
-                    .await
-                    .wrap("insert_certificate()")?;
-                self.persisted.send_modify(|p| p.last = Some(cert));
-            }
-        })
-        .await;
-        match res {
-            Err(ctx::Error::Canceled(_)) | Ok(()) => Ok(()),
-            Err(ctx::Error::Internal(err)) => Err(err),
-        }
-    }
-}
-
-#[async_trait::async_trait]
-impl storage::PersistentBlockStore for BlockStore {
-    async fn genesis(&self, ctx: &ctx::Ctx) -> ctx::Result<validator::Genesis> {
-        self.inner.genesis(ctx).await
-    }
-
-    fn persisted(&self) -> sync::watch::Receiver<storage::BlockStoreState> {
-        self.persisted.clone()
-    }
-
-    async fn block(
-        &self,
-        ctx: &ctx::Ctx,
-        number: validator::BlockNumber,
-    ) -> ctx::Result<validator::FinalBlock> {
-        Ok(self.inner.block(ctx, number).await?.context("not found")?)
-    }
-
-    /// If actions queue is set (and the block has not been stored yet),
-    /// the block will be translated into a sequence of actions.
-    /// The received actions should be fed
-    /// to `ExternalIO`, so that `StateKeeper` will store the corresponding L2 block in the db.
-    ///
-    /// `store_next_block()` call will wait synchronously for the L2 block.
-    /// Once the L2 block is observed in storage, `store_next_block()` will store a cert for this
-    /// L2 block.
-    async fn queue_next_block(
-        &self,
-        ctx: &ctx::Ctx,
-        block: validator::FinalBlock,
-    ) -> ctx::Result<()> {
-        if let Some(payloads) = &self.payloads {
-            let mut payloads = sync::lock(ctx, payloads).await?.into_async();
-            let number = L2BlockNumber(
-                block
-                    .number()
-                    .0
-                    .try_into()
-                    .context("Integer overflow converting block number")?,
-            );
-            let payload = Payload::decode(&block.payload).context("Payload::decode()")?;
-            let block = FetchedBlock {
-                number,
-                l1_batch_number: payload.l1_batch_number,
-                last_in_batch: payload.last_in_batch,
-                protocol_version: payload.protocol_version,
-                timestamp: payload.timestamp,
-                reference_hash: Some(payload.hash),
-                l1_gas_price: payload.l1_gas_price,
-                l2_fair_gas_price: payload.l2_fair_gas_price,
-                fair_pubdata_price: payload.fair_pubdata_price,
-                virtual_blocks: payload.virtual_blocks,
-                operator_address: payload.operator_address,
-                transactions: payload
-                    .transactions
-                    .into_iter()
-                    .map(FetchedTransaction::new)
-                    .collect(),
-            };
-            payloads.send(block).await.context("payload_queue.send()")?;
-        }
-        self.certificates.send(block.justification);
-        Ok(())
-    }
-}
-
-#[async_trait::async_trait]
-impl storage::ReplicaStore for Store {
-    async fn state(&self, ctx: &ctx::Ctx) -> ctx::Result<storage::ReplicaState> {
-        self.access(ctx)
-            .await
-            .wrap("access()")?
-            .replica_state(ctx)
-            .await
-            .wrap("replica_state()")
-    }
-
-    async fn set_state(&self, ctx: &ctx::Ctx, state: &storage::ReplicaState) -> ctx::Result<()> {
-        self.access(ctx)
-            .await
-            .wrap("access()")?
-            .set_replica_state(ctx, state)
-            .await
-            .wrap("set_replica_state()")
-    }
-}
-
-#[async_trait::async_trait]
-impl PayloadManager for Store {
-    /// Currently (for the main node) proposing is implemented as just converting an L2 block from db (without a cert) into a payload.
-    async fn propose(
-        &self,
-        ctx: &ctx::Ctx,
-        block_number: validator::BlockNumber,
-    ) -> ctx::Result<validator::Payload> {
-        const LARGE_PAYLOAD_SIZE: usize = 1 << 20;
-        tracing::info!("proposing block {block_number}");
-        let payload = self.wait_for_payload(ctx, block_number).await?;
-        let encoded_payload = payload.encode();
-        if encoded_payload.0.len() > LARGE_PAYLOAD_SIZE {
-            tracing::warn!(
-                "large payload ({}B) with {} transactions",
-                encoded_payload.0.len(),
-                payload.transactions.len()
-            );
-        }
-        tracing::info!("proposing block {block_number} DONE");
-        Ok(encoded_payload)
-    }
-
-    /// Verify that `payload` is a correct proposal for the block `block_number`.
-    /// Currently, (for the main node) it is implemented as checking whether the received payload
-    /// matches the L2 block in the db.
-    async fn verify(
-        &self,
-        ctx: &ctx::Ctx,
-        block_number: validator::BlockNumber,
-        payload: &validator::Payload,
-    ) -> ctx::Result<()> {
-        tracing::info!("verifying block {block_number}");
-        let got = Payload::decode(payload).context("Payload::decode(got)")?;
-        let want = self.wait_for_payload(ctx, block_number).await?;
-        if got != want {
-            return Err(
-                anyhow::format_err!("unexpected payload: got {got:?} want {want:?}").into(),
-            );
-        }
-        tracing::info!("verifying block {block_number} DONE");
-        Ok(())
-    }
-}
diff --git a/core/lib/zksync_core/src/consensus/storage/testonly.rs b/core/lib/zksync_core/src/consensus/storage/testonly.rs
deleted file mode 100644
index beae80632cc0..000000000000
--- a/core/lib/zksync_core/src/consensus/storage/testonly.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-//! Storage test helpers.
-
-use anyhow::Context as _;
-use zksync_concurrency::{ctx, error::Wrap as _, time};
-use zksync_consensus_roles::validator;
-use zksync_dal::ConnectionPool;
-use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
-use zksync_node_test_utils::{recover, snapshot, Snapshot};
-
-use super::Store;
-
-impl Store {
-    /// Waits for the `number` L2 block to have a certificate.
-    pub async fn wait_for_certificate(
-        &self,
-        ctx: &ctx::Ctx,
-        number: validator::BlockNumber,
-    ) -> ctx::Result<()> {
-        const POLL_INTERVAL: time::Duration = time::Duration::milliseconds(100);
-        while self
-            .access(ctx)
-            .await
-            .wrap("access()")?
-            .certificate(ctx, number)
-            .await
-            .wrap("certificate()")?
-            .is_none()
-        {
-            ctx.sleep(POLL_INTERVAL).await?;
-        }
-        Ok(())
-    }
-
-    /// Takes a storage snapshot at the last sealed L1 batch.
-    pub(crate) async fn snapshot(&self, ctx: &ctx::Ctx) -> ctx::Result<Snapshot> {
-        let mut conn = self.access(ctx).await.wrap("access()")?;
-        Ok(ctx.wait(snapshot(&mut conn.0)).await?)
-    }
-
-    /// Constructs a new db initialized with genesis state.
-    pub(crate) async fn from_genesis() -> Self {
-        let pool = ConnectionPool::test_pool().await;
-        {
-            let mut storage = pool.connection().await.unwrap();
-            insert_genesis_batch(&mut storage, &GenesisParams::mock())
-                .await
-                .unwrap();
-        }
-        Self(pool)
-    }
-
-    /// Recovers storage from a snapshot.
-    pub(crate) async fn from_snapshot(snapshot: Snapshot) -> Self {
-        let pool = ConnectionPool::test_pool().await;
-        {
-            let mut storage = pool.connection().await.unwrap();
-            recover(&mut storage, snapshot).await;
-        }
-        Self(pool)
-    }
-
-    /// Waits for `want_last` block to have certificate then fetches all L2 blocks with certificates.
-    pub async fn wait_for_certificates(
-        &self,
-        ctx: &ctx::Ctx,
-        want_last: validator::BlockNumber,
-    ) -> ctx::Result<Vec<validator::FinalBlock>> {
-        self.wait_for_certificate(ctx, want_last).await?;
-        let mut conn = self.access(ctx).await.wrap("access()")?;
-        let last_cert = conn
-            .last_certificate(ctx)
-            .await
-            .wrap("last_certificate()")?
-            .unwrap();
-        let first_cert = conn
-            .first_certificate(ctx)
-            .await
-            .wrap("first_certificate()")?
-            .unwrap();
-        assert_eq!(want_last, last_cert.header().number);
-        let mut blocks: Vec<validator::FinalBlock> = vec![];
-        for i in first_cert.header().number.0..=last_cert.header().number.0 {
-            let i = validator::BlockNumber(i);
-            let block = self.block(ctx, i).await.context("block()")?.unwrap();
-            blocks.push(block);
-        }
-        Ok(blocks)
-    }
-
-    /// Same as `wait_for_certificates`, but additionally verifies all the blocks against genesis.
-    pub async fn wait_for_certificates_and_verify(
-        &self,
-        ctx: &ctx::Ctx,
-        want_last: validator::BlockNumber,
-    ) -> ctx::Result<Vec<validator::FinalBlock>> {
-        let blocks = self.wait_for_certificates(ctx, want_last).await?;
-        let genesis = self.genesis(ctx).await.wrap("genesis()")?;
-        for block in &blocks {
-            block.verify(&genesis).context(block.number())?;
-        }
-        Ok(blocks)
-    }
-}
diff --git a/core/lib/zksync_core/src/consensus/testonly.rs b/core/lib/zksync_core/src/consensus/testonly.rs
deleted file mode 100644
index f1996cb2bf92..000000000000
--- a/core/lib/zksync_core/src/consensus/testonly.rs
+++ /dev/null
@@ -1,436 +0,0 @@
-//! Utilities for testing the consensus module.
-
-use std::{collections::HashMap, sync::Arc};
-
-use anyhow::Context as _;
-use rand::Rng;
-use zksync_concurrency::{ctx, error::Wrap as _, scope, sync};
-use zksync_config::{configs, GenesisConfig};
-use zksync_consensus_roles::validator;
-use zksync_contracts::BaseSystemContractsHashes;
-use zksync_dal::{CoreDal, DalError};
-use zksync_node_genesis::{mock_genesis_config, GenesisParams};
-use zksync_node_test_utils::{create_l1_batch_metadata, create_l2_transaction};
-use zksync_types::{
-    api, snapshots::SnapshotRecoveryStatus, Address, L1BatchNumber, L2BlockNumber, L2ChainId,
-    ProtocolVersionId, H256,
-};
-use zksync_web3_decl::{
-    client::{BoxedL2Client, L2Client},
-    error::{EnrichedClientError, EnrichedClientResult},
-};
-
-use crate::{
-    api_server::web3::{state::InternalApiConfig, tests::spawn_http_server},
-    consensus::{fetcher::P2PConfig, Fetcher, Store},
-    state_keeper::{
-        io::{IoCursor, L1BatchParams, L2BlockParams},
-        seal_criteria::NoopSealer,
-        tests::MockBatchExecutor,
-        OutputHandler, StateKeeperPersistence, ZkSyncStateKeeper,
-    },
-    sync_layer::{
-        fetcher::FetchedTransaction,
-        sync_action::{ActionQueue, ActionQueueSender, SyncAction},
-        ExternalIO, MainNodeClient, SyncState,
-    },
-};
-
-#[derive(Debug, Default)]
-pub(crate) struct MockMainNodeClient {
-    l2_blocks: Vec<api::en::SyncBlock>,
-    block_number_offset: u32,
-    protocol_versions: HashMap<u16, api::ProtocolVersion>,
-    system_contracts: HashMap<H256, Vec<u8>>,
-}
-
-impl MockMainNodeClient {
-    pub fn for_snapshot_recovery(snapshot: &SnapshotRecoveryStatus) -> Self {
-        // This block may be requested during node initialization
-        let last_l2_block_in_snapshot_batch = api::en::SyncBlock {
-            number: snapshot.l2_block_number,
-            l1_batch_number: snapshot.l1_batch_number,
-            last_in_batch: true,
-            timestamp: snapshot.l2_block_timestamp,
-            l1_gas_price: 2,
-            l2_fair_gas_price: 3,
-            fair_pubdata_price: Some(24),
-            base_system_contracts_hashes: BaseSystemContractsHashes::default(),
-            operator_address: Address::repeat_byte(2),
-            transactions: Some(vec![]),
-            virtual_blocks: Some(0),
-            hash: Some(snapshot.l2_block_hash),
-            protocol_version: ProtocolVersionId::latest(),
-        };
-
-        Self {
-            l2_blocks: vec![last_l2_block_in_snapshot_batch],
-            block_number_offset: snapshot.l2_block_number.0,
-            ..Self::default()
-        }
-    }
-
-    pub fn insert_protocol_version(&mut self, version: api::ProtocolVersion) {
-        self.system_contracts
-            .insert(version.base_system_contracts.bootloader, vec![]);
-        self.system_contracts
-            .insert(version.base_system_contracts.default_aa, vec![]);
-        self.protocol_versions.insert(version.version_id, version);
-    }
-}
-
-#[async_trait::async_trait]
-impl MainNodeClient for MockMainNodeClient {
-    async fn fetch_system_contract_by_hash(
-        &self,
-        hash: H256,
-    ) -> EnrichedClientResult<Option<Vec<u8>>> {
-        Ok(self.system_contracts.get(&hash).cloned())
-    }
-
-    async fn fetch_genesis_contract_bytecode(
-        &self,
-        _address: Address,
-    ) -> EnrichedClientResult<Option<Vec<u8>>> {
-        Err(EnrichedClientError::custom(
-            "not implemented",
-            "fetch_genesis_contract_bytecode",
-        ))
-    }
-
-    async fn fetch_protocol_version(
-        &self,
-        protocol_version: ProtocolVersionId,
-    ) -> EnrichedClientResult<Option<api::ProtocolVersion>> {
-        let protocol_version = protocol_version as u16;
-        Ok(self.protocol_versions.get(&protocol_version).cloned())
-    }
-
-    async fn fetch_l2_block_number(&self) -> EnrichedClientResult<L2BlockNumber> {
-        if let Some(number) = self.l2_blocks.len().checked_sub(1) {
-            Ok(L2BlockNumber(number as u32))
-        } else {
-            Err(EnrichedClientError::custom(
-                "not implemented",
-                "fetch_l2_block_number",
-            ))
-        }
-    }
-
-    async fn fetch_l2_block(
-        &self,
-        number: L2BlockNumber,
-        with_transactions: bool,
-    ) -> EnrichedClientResult<Option<api::en::SyncBlock>> {
-        let Some(block_index) = number.0.checked_sub(self.block_number_offset) else {
-            return Ok(None);
-        };
-        let Some(mut block) = self.l2_blocks.get(block_index as usize).cloned() else {
-            return Ok(None);
-        };
-        if !with_transactions {
-            block.transactions = None;
-        }
-        Ok(Some(block))
-    }
-
-    async fn fetch_consensus_genesis(
-        &self,
-    ) -> EnrichedClientResult<Option<api::en::ConsensusGenesis>> {
-        unimplemented!()
-    }
-
-    async fn fetch_genesis_config(&self) -> EnrichedClientResult<GenesisConfig> {
-        Ok(mock_genesis_config())
-    }
-}
-
-/// Fake StateKeeper for tests.
-pub(super) struct StateKeeper {
-    // Batch of the `last_block`.
-    last_batch: L1BatchNumber,
-    last_block: L2BlockNumber,
-    // timestamp of the last block.
-    last_timestamp: u64,
-    batch_sealed: bool,
-
-    fee_per_gas: u64,
-    gas_per_pubdata: u64,
-
-    actions_sender: ActionQueueSender,
-    addr: sync::watch::Receiver<Option<std::net::SocketAddr>>,
-    store: Store,
-}
-
-/// Fake StateKeeper task to be executed in the background.
-pub(super) struct StateKeeperRunner {
-    actions_queue: ActionQueue,
-    store: Store,
-    addr: sync::watch::Sender<Option<std::net::SocketAddr>>,
-}
-
-impl StateKeeper {
-    /// Constructs and initializes a new `StateKeeper`.
-    /// Caller has to run `StateKeeperRunner.run()` task in the background.
-    pub async fn new(ctx: &ctx::Ctx, store: Store) -> ctx::Result<(Self, StateKeeperRunner)> {
-        let mut conn = store.access(ctx).await.wrap("access()")?;
-        let cursor = ctx
-            .wait(IoCursor::for_fetcher(&mut conn.0))
-            .await?
-            .context("IoCursor::new()")?;
-        let pending_batch = ctx
-            .wait(conn.0.blocks_dal().pending_batch_exists())
-            .await?
-            .context("pending_batch_exists()")?;
-        let (actions_sender, actions_queue) = ActionQueue::new();
-        let addr = sync::watch::channel(None).0;
-        Ok((
-            Self {
-                last_batch: cursor.l1_batch,
-                last_block: cursor.next_l2_block - 1,
-                last_timestamp: cursor.prev_l2_block_timestamp,
-                batch_sealed: !pending_batch,
-                fee_per_gas: 10,
-                gas_per_pubdata: 100,
-                actions_sender,
-                addr: addr.subscribe(),
-                store: store.clone(),
-            },
-            StateKeeperRunner {
-                actions_queue,
-                store: store.clone(),
-                addr,
-            },
-        ))
-    }
-
-    fn open_block(&mut self) -> SyncAction {
-        if self.batch_sealed {
-            self.last_batch += 1;
-            self.last_block += 1;
-            self.last_timestamp += 5;
-            self.batch_sealed = false;
-            SyncAction::OpenBatch {
-                params: L1BatchParams {
-                    protocol_version: ProtocolVersionId::latest(),
-                    validation_computational_gas_limit: u32::MAX,
-                    operator_address: GenesisParams::mock().config().fee_account,
-                    fee_input: Default::default(),
-                    first_l2_block: L2BlockParams {
-                        timestamp: self.last_timestamp,
-                        virtual_blocks: 1,
-                    },
-                },
-                number: self.last_batch,
-                first_l2_block_number: self.last_block,
-            }
-        } else {
-            self.last_block += 1;
-            self.last_timestamp += 2;
-            SyncAction::L2Block {
-                params: L2BlockParams {
-                    timestamp: self.last_timestamp,
-                    virtual_blocks: 0,
-                },
-                number: self.last_block,
-            }
-        }
-    }
-
-    /// Pushes a new L2 block with `transactions` transactions to the `StateKeeper`.
-    pub async fn push_block(&mut self, transactions: usize) {
-        assert!(transactions > 0);
-        let mut actions = vec![self.open_block()];
-        for _ in 0..transactions {
-            let tx = create_l2_transaction(self.fee_per_gas, self.gas_per_pubdata);
-            actions.push(FetchedTransaction::new(tx.into()).into());
-        }
-        actions.push(SyncAction::SealL2Block);
-        self.actions_sender.push_actions(actions).await;
-    }
-
-    /// Pushes `SealBatch` command to the `StateKeeper`.
-    pub async fn seal_batch(&mut self) {
-        // Each batch ends with an empty block (aka fictive block).
-        let mut actions = vec![self.open_block()];
-        actions.push(SyncAction::SealBatch);
-        self.actions_sender.push_actions(actions).await;
-        self.batch_sealed = true;
-    }
-
-    /// Pushes `count` random L2 blocks to the StateKeeper.
-    pub async fn push_random_blocks(&mut self, rng: &mut impl Rng, count: usize) {
-        for _ in 0..count {
-            // 20% chance to seal an L1 batch.
-            // `seal_batch()` also produces a (fictive) block.
-            if rng.gen_range(0..100) < 20 {
-                self.seal_batch().await;
-            } else {
-                self.push_block(rng.gen_range(3..8)).await;
-            }
-        }
-    }
-
-    /// Last block that has been pushed to the `StateKeeper` via `ActionQueue`.
-    /// It might NOT be present in storage yet.
-    pub fn last_block(&self) -> validator::BlockNumber {
-        validator::BlockNumber(self.last_block.0.into())
-    }
-
-    /// Connects to the json RPC endpoint exposed by the state keeper.
-    pub async fn connect(&self, ctx: &ctx::Ctx) -> ctx::Result<BoxedL2Client> {
-        let addr = sync::wait_for(ctx, &mut self.addr.clone(), Option::is_some)
-            .await?
-            .unwrap();
-        let client = L2Client::http(format!("http://{addr}/").parse().context("url")?)
-            .context("json_rpc()")?
-            .build();
-        Ok(BoxedL2Client::new(client))
-    }
-
-    /// Runs the centralized fetcher.
-    pub async fn run_centralized_fetcher(
-        self,
-        ctx: &ctx::Ctx,
-        client: BoxedL2Client,
-    ) -> anyhow::Result<()> {
-        Fetcher {
-            store: self.store,
-            client,
-            sync_state: SyncState::default(),
-        }
-        .run_centralized(ctx, self.actions_sender)
-        .await
-    }
-
-    /// Runs the p2p fetcher.
-    pub async fn run_p2p_fetcher(
-        self,
-        ctx: &ctx::Ctx,
-        client: BoxedL2Client,
-        cfg: P2PConfig,
-    ) -> anyhow::Result<()> {
-        Fetcher {
-            store: self.store,
-            client,
-            sync_state: SyncState::default(),
-        }
-        .run_p2p(ctx, self.actions_sender, cfg)
-        .await
-    }
-}
-
-async fn calculate_mock_metadata(ctx: &ctx::Ctx, store: &Store) -> ctx::Result<()> {
-    let mut conn = store.access(ctx).await.wrap("access()")?;
-    let Some(last) = ctx
-        .wait(conn.0.blocks_dal().get_sealed_l1_batch_number())
-        .await?
-        .map_err(DalError::generalize)?
-    else {
-        return Ok(());
-    };
-    let prev = ctx
-        .wait(conn.0.blocks_dal().get_last_l1_batch_number_with_metadata())
-        .await?
-        .map_err(DalError::generalize)?;
-    let mut first = match prev {
-        Some(prev) => prev + 1,
-        None => ctx
-            .wait(conn.0.blocks_dal().get_earliest_l1_batch_number())
-            .await?
-            .map_err(DalError::generalize)?
-            .context("batches disappeared")?,
-    };
-    while first <= last {
-        let metadata = create_l1_batch_metadata(first.0);
-        ctx.wait(
-            conn.0
-                .blocks_dal()
-                .save_l1_batch_tree_data(first, &metadata.tree_data()),
-        )
-        .await?
-        .context("save_l1_batch_tree_data()")?;
-        first += 1;
-    }
-    Ok(())
-}
-
-impl StateKeeperRunner {
-    /// Executes the StateKeeper task.
-    pub async fn run(self, ctx: &ctx::Ctx) -> anyhow::Result<()> {
-        let res = scope::run!(ctx, |ctx, s| async {
-            let (stop_send, stop_recv) = sync::watch::channel(false);
-            let (persistence, l2_block_sealer) =
-                StateKeeperPersistence::new(self.store.0.clone(), Address::repeat_byte(11), 5);
-
-            let io = ExternalIO::new(
-                self.store.0.clone(),
-                self.actions_queue,
-                Box::<MockMainNodeClient>::default(),
-                L2ChainId::default(),
-            )
-            .await?;
-            s.spawn_bg(async {
-                Ok(l2_block_sealer
-                    .run()
-                    .await
-                    .context("l2_block_sealer.run()")?)
-            });
-            s.spawn_bg::<()>(async {
-                loop {
-                    calculate_mock_metadata(ctx, &self.store).await?;
-                    // Sleep real time.
-                    ctx.wait(tokio::time::sleep(tokio::time::Duration::from_millis(100)))
-                        .await?;
-                }
-            });
-            s.spawn_bg({
-                let stop_recv = stop_recv.clone();
-                async {
-                    ZkSyncStateKeeper::new(
-                        stop_recv,
-                        Box::new(io),
-                        Box::new(MockBatchExecutor),
-                        OutputHandler::new(Box::new(persistence.with_tx_insertion())),
-                        Arc::new(NoopSealer),
-                    )
-                    .run()
-                    .await
-                    .context("ZkSyncStateKeeper::run()")?;
-                    Ok(())
-                }
-            });
-            s.spawn_bg(async {
-                // Spawn HTTP server.
-                let cfg = InternalApiConfig::new(
-                    &configs::api::Web3JsonRpcConfig::for_tests(),
-                    &configs::contracts::ContractsConfig::for_tests(),
-                    &configs::GenesisConfig::for_tests(),
-                );
-                let mut server = spawn_http_server(
-                    cfg,
-                    self.store.0.clone(),
-                    Default::default(),
-                    Arc::default(),
-                    stop_recv,
-                )
-                .await;
-                if let Ok(addr) = ctx.wait(server.wait_until_ready()).await {
-                    self.addr.send_replace(Some(addr));
-                    tracing::info!("API server ready!");
-                }
-                ctx.canceled().await;
-                server.shutdown().await;
-                Ok(())
-            });
-            ctx.canceled().await;
-            stop_send.send_replace(true);
-            Ok(())
-        })
-        .await;
-        match res {
-            Ok(()) | Err(ctx::Error::Canceled(_)) => Ok(()),
-            Err(ctx::Error::Internal(err)) => Err(err),
-        }
-    }
-}
diff --git a/core/lib/zksync_core/src/consensus/tests.rs b/core/lib/zksync_core/src/consensus/tests.rs
deleted file mode 100644
index c250fac35d26..000000000000
--- a/core/lib/zksync_core/src/consensus/tests.rs
+++ /dev/null
@@ -1,455 +0,0 @@
-use anyhow::Context as _;
-use test_casing::test_casing;
-use tracing::Instrument as _;
-use zksync_concurrency::{ctx, scope};
-use zksync_consensus_executor as executor;
-use zksync_consensus_network as network;
-use zksync_consensus_network::testonly::{new_configs, new_fullnode};
-use zksync_consensus_roles::validator::testonly::{Setup, SetupSpec};
-use zksync_node_test_utils::Snapshot;
-use zksync_types::{L1BatchNumber, L2BlockNumber};
-
-use super::*;
-
-const CHAIN_ID: validator::ChainId = validator::ChainId(1337);
-
-async fn new_store(from_snapshot: bool) -> Store {
-    match from_snapshot {
-        true => {
-            Store::from_snapshot(Snapshot::make(L1BatchNumber(23), L2BlockNumber(87), &[])).await
-        }
-        false => Store::from_genesis().await,
-    }
-}
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_validator_block_store() {
-    zksync_concurrency::testonly::abort_on_panic();
-    let ctx = &ctx::test_root(&ctx::RealClock);
-    let rng = &mut ctx.rng();
-    let store = new_store(false).await;
-
-    // Fill storage with unsigned L2 blocks.
-    // Fetch a suffix of blocks that we will generate (fake) certs for.
-    let want = scope::run!(ctx, |ctx, s| async {
-        // Start state keeper.
-        let (mut sk, runner) = testonly::StateKeeper::new(ctx, store.clone()).await?;
-        s.spawn_bg(runner.run(ctx));
-        sk.push_random_blocks(rng, 10).await;
-        store.wait_for_payload(ctx, sk.last_block()).await?;
-        let mut setup = SetupSpec::new(rng, 3);
-        setup.first_block = validator::BlockNumber(4);
-        let mut setup = Setup::from(setup);
-        let mut conn = store.access(ctx).await.wrap("access()")?;
-        conn.try_update_genesis(ctx, &setup.genesis)
-            .await
-            .wrap("try_update_genesis()")?;
-        for i in setup.genesis.first_block.0..sk.last_block().next().0 {
-            let i = validator::BlockNumber(i);
-            let payload = conn
-                .payload(ctx, i)
-                .await
-                .wrap(i)?
-                .with_context(|| format!("payload for {i:?} not found"))?
-                .encode();
-            setup.push_block(payload);
-        }
-        Ok(setup.blocks.clone())
-    })
-    .await
-    .unwrap();
-
-    // Insert blocks one by one and check the storage state.
-    for (i, block) in want.iter().enumerate() {
-        scope::run!(ctx, |ctx, s| async {
-            let (block_store, runner) = store.clone().into_block_store(ctx, None).await.unwrap();
-            s.spawn_bg(runner.run(ctx));
-            block_store.queue_block(ctx, block.clone()).await.unwrap();
-            block_store
-                .wait_until_persisted(ctx, block.number())
-                .await
-                .unwrap();
-            let got = store
-                .wait_for_certificates(ctx, block.number())
-                .await
-                .unwrap();
-            assert_eq!(want[..=i], got);
-            Ok(())
-        })
-        .await
-        .unwrap();
-    }
-}
-
-fn executor_config(cfg: &network::Config) -> executor::Config {
-    executor::Config {
-        server_addr: *cfg.server_addr,
-        public_addr: cfg.public_addr.clone(),
-        max_payload_size: usize::MAX,
-        node_key: cfg.gossip.key.clone(),
-        gossip_dynamic_inbound_limit: cfg.gossip.dynamic_inbound_limit,
-        gossip_static_inbound: cfg.gossip.static_inbound.clone(),
-        gossip_static_outbound: cfg.gossip.static_outbound.clone(),
-    }
-}
-
-// In the current implementation, consensus certificates are created asynchronously
-// for the L2 blocks constructed by the StateKeeper. This means that consensus actor
-// is effectively just back filling the consensus certificates for the L2 blocks in storage.
-#[test_casing(2, [false, true])]
-#[tokio::test(flavor = "multi_thread")]
-async fn test_validator(from_snapshot: bool) {
-    zksync_concurrency::testonly::abort_on_panic();
-    let ctx = &ctx::test_root(&ctx::AffineClock::new(10.));
-    let rng = &mut ctx.rng();
-    let setup = Setup::new(rng, 1);
-    let cfgs = new_configs(rng, &setup, 0);
-
-    scope::run!(ctx, |ctx, s| async {
-        tracing::info!("Start state keeper.");
-        let store = new_store(from_snapshot).await;
-        let (mut sk, runner) = testonly::StateKeeper::new(ctx, store.clone()).await?;
-        s.spawn_bg(runner.run(ctx));
-
-        tracing::info!("Populate storage with a bunch of blocks.");
-        sk.push_random_blocks(rng, 5).await;
-        store
-            .wait_for_payload(ctx, sk.last_block())
-            .await
-            .context("sk.wait_for_payload(<1st phase>)")?;
-
-        tracing::info!("Restart consensus actor a couple times, making it process a bunch of blocks each time.");
-        for iteration in 0..3 {
-            tracing::info!("iteration {iteration}");
-            scope::run!(ctx, |ctx, s| async {
-                tracing::info!("Start consensus actor");
-                // In the first iteration it will initialize genesis.
-                let cfg = MainNodeConfig {
-                    executor: executor_config(&cfgs[0]),
-                    validator_key: setup.keys[0].clone(),
-                    chain_id: CHAIN_ID,
-                };
-                s.spawn_bg(cfg.run(ctx, store.clone()));
-
-                tracing::info!("Generate couple more blocks and wait for consensus to catch up.");
-                sk.push_random_blocks(rng, 3).await;
-                store
-                    .wait_for_certificate(ctx, sk.last_block())
-                    .await
-                    .context("wait_for_certificate(<2nd phase>)")?;
-
-                tracing::info!("Synchronously produce blocks one by one, and wait for consensus.");
-                for _ in 0..2 {
-                    sk.push_random_blocks(rng, 1).await;
-                    store
-                        .wait_for_certificate(ctx, sk.last_block())
-                        .await
-                        .context("wait_for_certificate(<3rd phase>)")?;
-                }
-
-                tracing::info!("Verify all certificates");
-                store
-                    .wait_for_certificates_and_verify(ctx, sk.last_block())
-                    .await
-                    .context("wait_for_certificates_and_verify()")?;
-                Ok(())
-            })
-            .await
-            .context(iteration)?;
-        }
-        Ok(())
-    })
-    .await
-    .unwrap();
-}
-
-// Test running a validator node and 2 full nodes recovered from different snapshots.
-#[tokio::test(flavor = "multi_thread")]
-async fn test_nodes_from_various_snapshots() {
-    zksync_concurrency::testonly::abort_on_panic();
-    let ctx = &ctx::test_root(&ctx::AffineClock::new(10.));
-    let rng = &mut ctx.rng();
-    let setup = Setup::new(rng, 1);
-    let validator_cfg = new_configs(rng, &setup, 0).pop().unwrap();
-
-    scope::run!(ctx, |ctx, s| async {
-        tracing::info!("spawn validator");
-        let validator_store = Store::from_genesis().await;
-        let (mut validator, runner) =
-            testonly::StateKeeper::new(ctx, validator_store.clone()).await?;
-        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("validator")));
-        let cfg = MainNodeConfig {
-            executor: executor_config(&validator_cfg),
-            validator_key: setup.keys[0].clone(),
-            chain_id: CHAIN_ID,
-        };
-        s.spawn_bg(cfg.run(ctx, validator_store.clone()));
-
-        tracing::info!("produce some batches");
-        validator.push_random_blocks(rng, 5).await;
-        validator.seal_batch().await;
-        validator_store
-            .wait_for_certificate(ctx, validator.last_block())
-            .await?;
-
-        tracing::info!("take snapshot and start a node from it");
-        let snapshot = validator_store.snapshot(ctx).await?;
-        let node_store = Store::from_snapshot(snapshot).await;
-        let (node, runner) = testonly::StateKeeper::new(ctx, node_store.clone()).await?;
-        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("node1")));
-        let node_cfg = executor_config(&new_fullnode(rng, &validator_cfg));
-        s.spawn_bg(node.run_p2p_fetcher(ctx, validator.connect(ctx).await?, node_cfg));
-
-        tracing::info!("produce more batches");
-        validator.push_random_blocks(rng, 5).await;
-        validator.seal_batch().await;
-        node_store
-            .wait_for_certificate(ctx, validator.last_block())
-            .await?;
-
-        tracing::info!("take another snapshot and start a node from it");
-        let snapshot = validator_store.snapshot(ctx).await?;
-        let node_store2 = Store::from_snapshot(snapshot).await;
-        let (node, runner) = testonly::StateKeeper::new(ctx, node_store2.clone()).await?;
-        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("node2")));
-        let node_cfg = executor_config(&new_fullnode(rng, &validator_cfg));
-        s.spawn_bg(node.run_p2p_fetcher(ctx, validator.connect(ctx).await?, node_cfg));
-
-        tracing::info!("produce more blocks and compare storages");
-        validator.push_random_blocks(rng, 5).await;
-        let want = validator_store
-            .wait_for_certificates_and_verify(ctx, validator.last_block())
-            .await?;
-        // node stores should be suffixes for validator store.
-        for got in [
-            node_store
-                .wait_for_certificates_and_verify(ctx, validator.last_block())
-                .await?,
-            node_store2
-                .wait_for_certificates_and_verify(ctx, validator.last_block())
-                .await?,
-        ] {
-            assert_eq!(want[want.len() - got.len()..], got[..]);
-        }
-        Ok(())
-    })
-    .await
-    .unwrap();
-}
-
-// Test running a validator node and a couple of full nodes.
-// Validator is producing signed blocks and fetchers are expected to fetch
-// them directly or indirectly.
-#[test_casing(2, [false, true])]
-#[tokio::test(flavor = "multi_thread")]
-async fn test_full_nodes(from_snapshot: bool) {
-    const NODES: usize = 2;
-
-    zksync_concurrency::testonly::abort_on_panic();
-    let ctx = &ctx::test_root(&ctx::AffineClock::new(10.));
-    let rng = &mut ctx.rng();
-    let setup = Setup::new(rng, 1);
-    let validator_cfgs = new_configs(rng, &setup, 0);
-
-    // topology:
-    // validator <-> node <-> node <-> ...
-    let mut node_cfgs = vec![];
-    for _ in 0..NODES {
-        node_cfgs.push(new_fullnode(
-            rng,
-            node_cfgs.last().unwrap_or(&validator_cfgs[0]),
-        ));
-    }
-
-    // Run validator and fetchers in parallel.
-    scope::run!(ctx, |ctx, s| async {
-        let validator_store = new_store(from_snapshot).await;
-        let (mut validator, runner) =
-            testonly::StateKeeper::new(ctx, validator_store.clone()).await?;
-        s.spawn_bg(async {
-            runner
-                .run(ctx)
-                .instrument(tracing::info_span!("validator"))
-                .await
-                .context("validator")
-        });
-        tracing::info!("Generate a couple of blocks, before initializing consensus genesis.");
-        validator.push_random_blocks(rng, 5).await;
-        // API server needs at least 1 L1 batch to start.
-        validator.seal_batch().await;
-        validator_store
-            .wait_for_payload(ctx, validator.last_block())
-            .await
-            .unwrap();
-
-        tracing::info!("Run validator.");
-        let cfg = MainNodeConfig {
-            executor: executor_config(&validator_cfgs[0]),
-            validator_key: setup.keys[0].clone(),
-            chain_id: CHAIN_ID,
-        };
-        s.spawn_bg(cfg.run(ctx, validator_store.clone()));
-
-        tracing::info!("Run nodes.");
-        let mut node_stores = vec![];
-        for (i, cfg) in node_cfgs.iter().enumerate() {
-            let i = ctx::NoCopy(i);
-            let store = new_store(from_snapshot).await;
-            let (node, runner) = testonly::StateKeeper::new(ctx, store.clone()).await?;
-            node_stores.push(store.clone());
-            s.spawn_bg(async {
-                let i = i;
-                runner
-                    .run(ctx)
-                    .instrument(tracing::info_span!("node", i = *i))
-                    .await
-                    .with_context(|| format!("node{}", *i))
-            });
-            s.spawn_bg(node.run_p2p_fetcher(
-                ctx,
-                validator.connect(ctx).await?,
-                executor_config(cfg),
-            ));
-        }
-
-        tracing::info!("Make validator produce blocks and wait for fetchers to get them.");
-        // Note that block from before and after genesis have to be fetched.
-        validator.push_random_blocks(rng, 5).await;
-        let want_last = validator.last_block();
-        let want = validator_store
-            .wait_for_certificates_and_verify(ctx, want_last)
-            .await?;
-        for store in &node_stores {
-            assert_eq!(
-                want,
-                store
-                    .wait_for_certificates_and_verify(ctx, want_last)
-                    .await?
-            );
-        }
-        Ok(())
-    })
-    .await
-    .unwrap();
-}
-
-// Test fetcher back filling missing certs.
-#[test_casing(2, [false, true])]
-#[tokio::test(flavor = "multi_thread")]
-async fn test_p2p_fetcher_backfill_certs(from_snapshot: bool) {
-    zksync_concurrency::testonly::abort_on_panic();
-    let ctx = &ctx::test_root(&ctx::AffineClock::new(10.));
-    let rng = &mut ctx.rng();
-    let setup = Setup::new(rng, 1);
-    let validator_cfg = new_configs(rng, &setup, 0)[0].clone();
-    let node_cfg = executor_config(&new_fullnode(rng, &validator_cfg));
-
-    scope::run!(ctx, |ctx, s| async {
-        tracing::info!("Spawn validator.");
-        let validator_store = new_store(from_snapshot).await;
-        let (mut validator, runner) =
-            testonly::StateKeeper::new(ctx, validator_store.clone()).await?;
-        s.spawn_bg(runner.run(ctx));
-        s.spawn_bg(
-            MainNodeConfig {
-                executor: executor_config(&validator_cfg),
-                validator_key: setup.keys[0].clone(),
-                chain_id: CHAIN_ID,
-            }
-            .run(ctx, validator_store.clone()),
-        );
-        // API server needs at least 1 L1 batch to start.
-        validator.seal_batch().await;
-        let client = validator.connect(ctx).await?;
-
-        let node_store = new_store(from_snapshot).await;
-
-        tracing::info!("Run p2p fetcher.");
-        scope::run!(ctx, |ctx, s| async {
-            let (node, runner) = testonly::StateKeeper::new(ctx, node_store.clone()).await?;
-            s.spawn_bg(runner.run(ctx));
-            s.spawn_bg(node.run_p2p_fetcher(ctx, client.clone(), node_cfg.clone()));
-            validator.push_random_blocks(rng, 3).await;
-            node_store
-                .wait_for_certificate(ctx, validator.last_block())
-                .await?;
-            Ok(())
-        })
-        .await
-        .unwrap();
-
-        tracing::info!("Run centralized fetcher.");
-        scope::run!(ctx, |ctx, s| async {
-            let (node, runner) = testonly::StateKeeper::new(ctx, node_store.clone()).await?;
-            s.spawn_bg(runner.run(ctx));
-            s.spawn_bg(node.run_centralized_fetcher(ctx, client.clone()));
-            validator.push_random_blocks(rng, 3).await;
-            node_store
-                .wait_for_payload(ctx, validator.last_block())
-                .await?;
-            Ok(())
-        })
-        .await
-        .unwrap();
-
-        tracing::info!("Run p2p fetcher again.");
-        scope::run!(ctx, |ctx, s| async {
-            let (node, runner) = testonly::StateKeeper::new(ctx, node_store.clone()).await?;
-            s.spawn_bg(runner.run(ctx));
-            s.spawn_bg(node.run_p2p_fetcher(ctx, client.clone(), node_cfg.clone()));
-            validator.push_random_blocks(rng, 3).await;
-            let want = validator_store
-                .wait_for_certificates_and_verify(ctx, validator.last_block())
-                .await?;
-            let got = node_store
-                .wait_for_certificates_and_verify(ctx, validator.last_block())
-                .await?;
-            assert_eq!(want, got);
-            Ok(())
-        })
-        .await
-        .unwrap();
-        Ok(())
-    })
-    .await
-    .unwrap();
-}
-
-#[test_casing(2, [false, true])]
-#[tokio::test]
-async fn test_centralized_fetcher(from_snapshot: bool) {
-    zksync_concurrency::testonly::abort_on_panic();
-    let ctx = &ctx::test_root(&ctx::RealClock);
-    let rng = &mut ctx.rng();
-
-    scope::run!(ctx, |ctx, s| async {
-        tracing::info!("Spawn a validator.");
-        let validator_store = new_store(from_snapshot).await;
-        let (mut validator, runner) =
-            testonly::StateKeeper::new(ctx, validator_store.clone()).await?;
-        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("validator")));
-
-        tracing::info!("Produce a batch (to make api server start)");
-        // TODO: ensure at least L1 batch in `testonly::StateKeeper::new()` to make it fool proof.
-        validator.seal_batch().await;
-
-        tracing::info!("Spawn a node.");
-        let node_store = new_store(from_snapshot).await;
-        let (node, runner) = testonly::StateKeeper::new(ctx, node_store.clone()).await?;
-        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("fetcher")));
-        s.spawn_bg(node.run_centralized_fetcher(ctx, validator.connect(ctx).await?));
-
-        tracing::info!("Produce some blocks and wait for node to fetch them");
-        validator.push_random_blocks(rng, 10).await;
-        let want = validator_store
-            .wait_for_payload(ctx, validator.last_block())
-            .await?;
-        let got = node_store
-            .wait_for_payload(ctx, validator.last_block())
-            .await?;
-        assert_eq!(want, got);
-        Ok(())
-    })
-    .await
-    .unwrap();
-}
diff --git a/core/lib/zksync_core/src/lib.rs b/core/lib/zksync_core/src/lib.rs
deleted file mode 100644
index b8513c6963fb..000000000000
--- a/core/lib/zksync_core/src/lib.rs
+++ /dev/null
@@ -1,1409 +0,0 @@
-#![allow(clippy::upper_case_acronyms, clippy::derive_partial_eq_without_eq)]
-
-use std::{
-    net::Ipv4Addr,
-    str::FromStr,
-    sync::Arc,
-    time::{Duration, Instant},
-};
-
-use anyhow::Context as _;
-use api_server::tx_sender::master_pool_sink::MasterPoolSink;
-use prometheus_exporter::PrometheusExporterConfig;
-use prover_dal::Prover;
-use temp_config_store::Secrets;
-use tokio::{
-    sync::{oneshot, watch},
-    task::JoinHandle,
-};
-use zksync_circuit_breaker::{
-    l1_txs::FailedL1TransactionChecker, replication_lag::ReplicationLagChecker,
-    CircuitBreakerChecker, CircuitBreakers,
-};
-use zksync_commitment_generator::{
-    input_generation::{InputGenerator, RollupInputGenerator, ValidiumInputGenerator},
-    CommitmentGenerator,
-};
-use zksync_concurrency::{ctx, scope};
-use zksync_config::{
-    configs::{
-        api::{MerkleTreeApiConfig, Web3JsonRpcConfig},
-        chain::{
-            CircuitBreakerConfig, L1BatchCommitDataGeneratorMode, MempoolConfig,
-            OperationsManagerConfig, StateKeeperConfig,
-        },
-        consensus::ConsensusConfig,
-        database::{MerkleTreeConfig, MerkleTreeMode},
-        wallets,
-        wallets::Wallets,
-        ContractsConfig, GeneralConfig,
-    },
-    ApiConfig, DBConfig, EthWatchConfig, GenesisConfig, PostgresConfig,
-};
-use zksync_contracts::governance_contract;
-use zksync_dal::{metrics::PostgresMetrics, ConnectionPool, Core, CoreDal};
-use zksync_db_connection::healthcheck::ConnectionPoolHealthCheck;
-use zksync_eth_client::{
-    clients::{PKSigningClient, QueryClient},
-    BoundEthInterface, EthInterface,
-};
-use zksync_eth_sender::{
-    l1_batch_commit_data_generator::{
-        L1BatchCommitDataGenerator, RollupModeL1BatchCommitDataGenerator,
-        ValidiumModeL1BatchCommitDataGenerator,
-    },
-    Aggregator, EthTxAggregator, EthTxManager,
-};
-use zksync_eth_watch::{EthHttpQueryClient, EthWatch};
-use zksync_health_check::{AppHealthCheck, HealthStatus, ReactiveHealthCheck};
-use zksync_house_keeper::{
-    blocks_state_reporter::L1BatchMetricsReporter, fri_gpu_prover_archiver::FriGpuProverArchiver,
-    fri_proof_compressor_job_retry_manager::FriProofCompressorJobRetryManager,
-    fri_proof_compressor_queue_monitor::FriProofCompressorStatsReporter,
-    fri_prover_job_retry_manager::FriProverJobRetryManager,
-    fri_prover_jobs_archiver::FriProverJobArchiver,
-    fri_prover_queue_monitor::FriProverStatsReporter,
-    fri_witness_generator_jobs_retry_manager::FriWitnessGeneratorJobRetryManager,
-    fri_witness_generator_queue_monitor::FriWitnessGeneratorStatsReporter,
-    periodic_job::PeriodicJob,
-    waiting_to_queued_fri_witness_job_mover::WaitingToQueuedFriWitnessJobMover,
-};
-use zksync_node_fee_model::{
-    l1_gas_price::{
-        GasAdjusterSingleton, PubdataPricing, RollupPubdataPricing, ValidiumPubdataPricing,
-    },
-    ApiFeeInputProvider, BatchFeeModelInputProvider, MainNodeFeeInputProvider,
-};
-use zksync_node_genesis::{ensure_genesis_state, GenesisParams};
-use zksync_object_store::{ObjectStore, ObjectStoreFactory};
-use zksync_shared_metrics::{InitStage, APP_METRICS};
-use zksync_state::{PostgresStorageCaches, RocksdbStorageOptions};
-use zksync_types::{ethabi::Contract, fee_model::FeeModelConfig, Address, L2ChainId};
-
-use crate::{
-    api_server::{
-        contract_verification,
-        execution_sandbox::{VmConcurrencyBarrier, VmConcurrencyLimiter},
-        healthcheck::HealthCheckHandle,
-        tree::TreeApiHttpClient,
-        tx_sender::{ApiContracts, TxSender, TxSenderBuilder, TxSenderConfig},
-        web3::{self, mempool_cache::MempoolCache, state::InternalApiConfig, Namespace},
-    },
-    metadata_calculator::{MetadataCalculator, MetadataCalculatorConfig},
-    state_keeper::{
-        create_state_keeper, AsyncRocksdbCache, MempoolFetcher, MempoolGuard, OutputHandler,
-        SequencerSealer, StateKeeperPersistence,
-    },
-    utils::ensure_l1_batch_commit_data_generation_mode,
-};
-
-pub mod api_server;
-pub mod consensus;
-pub mod consistency_checker;
-pub mod metadata_calculator;
-pub mod proto;
-pub mod reorg_detector;
-pub mod state_keeper;
-pub mod sync_layer;
-pub mod temp_config_store;
-pub mod utils;
-
-/// Inserts the initial information about zkSync tokens into the database.
-pub async fn genesis_init(
-    genesis_config: GenesisConfig,
-    postgres_config: &PostgresConfig,
-) -> anyhow::Result<()> {
-    let db_url = postgres_config.master_url()?;
-    let pool = ConnectionPool::<Core>::singleton(db_url)
-        .build()
-        .await
-        .context("failed to build connection_pool")?;
-    let mut storage = pool.connection().await.context("connection()")?;
-
-    let params = GenesisParams::load_genesis_params(genesis_config)?;
-    ensure_genesis_state(&mut storage, &params).await?;
-
-    Ok(())
-}
-
-pub async fn is_genesis_needed(postgres_config: &PostgresConfig) -> bool {
-    let db_url = postgres_config.master_url().unwrap();
-    let pool = ConnectionPool::<Core>::singleton(db_url)
-        .build()
-        .await
-        .expect("failed to build connection_pool");
-    let mut storage = pool.connection().await.expect("connection()");
-    storage.blocks_dal().is_genesis_needed().await.unwrap()
-}
-
-/// Sets up an interrupt handler and returns a future that resolves once an interrupt signal
-/// is received.
-pub fn setup_sigint_handler() -> oneshot::Receiver<()> {
-    let (sigint_sender, sigint_receiver) = oneshot::channel();
-    let mut sigint_sender = Some(sigint_sender);
-    ctrlc::set_handler(move || {
-        if let Some(sigint_sender) = sigint_sender.take() {
-            sigint_sender.send(()).ok();
-            // ^ The send fails if `sigint_receiver` is dropped. We're OK with this,
-            // since at this point the node should be stopping anyway, or is not interested
-            // in listening to interrupt signals.
-        }
-    })
-    .expect("Error setting Ctrl+C handler");
-
-    sigint_receiver
-}
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Component {
-    /// Public Web3 API running on HTTP server.
-    HttpApi,
-    /// Public Web3 API (including PubSub) running on WebSocket server.
-    WsApi,
-    /// REST API for contract verification.
-    ContractVerificationApi,
-    /// Metadata calculator.
-    Tree,
-    /// Merkle tree API.
-    TreeApi,
-    EthWatcher,
-    /// Eth tx generator.
-    EthTxAggregator,
-    /// Manager for eth tx.
-    EthTxManager,
-    /// State keeper.
-    StateKeeper,
-    /// Component for housekeeping task such as cleaning blobs from GCS, reporting metrics etc.
-    Housekeeper,
-    /// Component for exposing APIs to prover for providing proof generation data and accepting proofs.
-    ProofDataHandler,
-    /// Component generating BFT consensus certificates for L2 blocks.
-    Consensus,
-    /// Component generating commitment for L1 batches.
-    CommitmentGenerator,
-}
-
-#[derive(Debug)]
-pub struct Components(pub Vec<Component>);
-
-impl FromStr for Components {
-    type Err = String;
-
-    fn from_str(s: &str) -> Result<Components, String> {
-        match s {
-            "api" => Ok(Components(vec![
-                Component::HttpApi,
-                Component::WsApi,
-                Component::ContractVerificationApi,
-            ])),
-            "http_api" => Ok(Components(vec![Component::HttpApi])),
-            "ws_api" => Ok(Components(vec![Component::WsApi])),
-            "contract_verification_api" => Ok(Components(vec![Component::ContractVerificationApi])),
-            "tree" => Ok(Components(vec![Component::Tree])),
-            "tree_api" => Ok(Components(vec![Component::TreeApi])),
-            "state_keeper" => Ok(Components(vec![Component::StateKeeper])),
-            "housekeeper" => Ok(Components(vec![Component::Housekeeper])),
-            "eth" => Ok(Components(vec![
-                Component::EthWatcher,
-                Component::EthTxAggregator,
-                Component::EthTxManager,
-            ])),
-            "eth_watcher" => Ok(Components(vec![Component::EthWatcher])),
-            "eth_tx_aggregator" => Ok(Components(vec![Component::EthTxAggregator])),
-            "eth_tx_manager" => Ok(Components(vec![Component::EthTxManager])),
-            "proof_data_handler" => Ok(Components(vec![Component::ProofDataHandler])),
-            "consensus" => Ok(Components(vec![Component::Consensus])),
-            "commitment_generator" => Ok(Components(vec![Component::CommitmentGenerator])),
-            other => Err(format!("{} is not a valid component name", other)),
-        }
-    }
-}
-
-pub async fn initialize_components(
-    configs: &GeneralConfig,
-    wallets: &Wallets,
-    genesis_config: &GenesisConfig,
-    contracts_config: &ContractsConfig,
-    components: &[Component],
-    secrets: &Secrets,
-    consensus_config: Option<ConsensusConfig>,
-) -> anyhow::Result<(
-    Vec<JoinHandle<anyhow::Result<()>>>,
-    watch::Sender<bool>,
-    HealthCheckHandle,
-)> {
-    tracing::info!("Starting the components: {components:?}");
-    let l2_chain_id = genesis_config.l2_chain_id;
-    let db_config = configs.db_config.clone().context("db_config")?;
-    let postgres_config = configs.postgres_config.clone().context("postgres_config")?;
-
-    if let Some(threshold) = postgres_config.slow_query_threshold() {
-        ConnectionPool::<Core>::global_config().set_slow_query_threshold(threshold)?;
-    }
-    if let Some(threshold) = postgres_config.long_connection_threshold() {
-        ConnectionPool::<Core>::global_config().set_long_connection_threshold(threshold)?;
-    }
-
-    let pool_size = postgres_config.max_connections()?;
-    let pool_size_master = postgres_config
-        .max_connections_master()
-        .unwrap_or(pool_size);
-
-    let connection_pool =
-        ConnectionPool::<Core>::builder(postgres_config.master_url()?, pool_size_master)
-            .build()
-            .await
-            .context("failed to build connection_pool")?;
-    // We're most interested in setting acquire / statement timeouts for the API server, which puts the most load
-    // on Postgres.
-    let replica_connection_pool =
-        ConnectionPool::<Core>::builder(postgres_config.replica_url()?, pool_size)
-            .set_acquire_timeout(postgres_config.acquire_timeout())
-            .set_statement_timeout(postgres_config.statement_timeout())
-            .build()
-            .await
-            .context("failed to build replica_connection_pool")?;
-
-    let health_check_config = configs
-        .api_config
-        .clone()
-        .context("api_config")?
-        .healthcheck;
-
-    let app_health = Arc::new(AppHealthCheck::new(
-        health_check_config.slow_time_limit(),
-        health_check_config.hard_time_limit(),
-    ));
-
-    let eth = configs.eth.clone().context("eth")?;
-    let circuit_breaker_config = configs
-        .circuit_breaker_config
-        .clone()
-        .context("circuit_breaker_config")?;
-
-    let circuit_breaker_checker = CircuitBreakerChecker::new(
-        Arc::new(
-            circuit_breakers_for_components(components, &postgres_config, &circuit_breaker_config)
-                .await
-                .context("circuit_breakers_for_components")?,
-        ),
-        circuit_breaker_config.sync_interval(),
-    );
-    circuit_breaker_checker.check().await.unwrap_or_else(|err| {
-        panic!("Circuit breaker triggered: {}", err);
-    });
-
-    let query_client = QueryClient::new(eth.web3_url.clone()).context("Ethereum client")?;
-    let query_client = Box::new(query_client);
-    let gas_adjuster_config = eth.gas_adjuster.context("gas_adjuster")?;
-    let sender = eth.sender.as_ref().context("sender")?;
-    let pubdata_pricing: Arc<dyn PubdataPricing> =
-        match genesis_config.l1_batch_commit_data_generator_mode {
-            L1BatchCommitDataGeneratorMode::Rollup => Arc::new(RollupPubdataPricing {}),
-            L1BatchCommitDataGeneratorMode::Validium => Arc::new(ValidiumPubdataPricing {}),
-        };
-
-    let mut gas_adjuster = GasAdjusterSingleton::new(
-        eth.web3_url.clone(),
-        gas_adjuster_config,
-        sender.pubdata_sending_mode,
-        pubdata_pricing,
-    );
-
-    let (stop_sender, stop_receiver) = watch::channel(false);
-
-    // Prometheus exporter and circuit breaker checker should run for every component configuration.
-    let prom_config = configs
-        .prometheus_config
-        .clone()
-        .context("prometheus_config")?;
-    let prom_config = PrometheusExporterConfig::pull(prom_config.listener_port);
-
-    let (prometheus_health_check, prometheus_health_updater) =
-        ReactiveHealthCheck::new("prometheus_exporter");
-    app_health.insert_component(prometheus_health_check)?;
-    let prometheus_task = prom_config.run(stop_receiver.clone());
-    let prometheus_task = tokio::spawn(async move {
-        prometheus_health_updater.update(HealthStatus::Ready.into());
-        let res = prometheus_task.await;
-        drop(prometheus_health_updater);
-        res
-    });
-
-    let mut task_futures: Vec<JoinHandle<anyhow::Result<()>>> = vec![
-        prometheus_task,
-        tokio::spawn(circuit_breaker_checker.run(stop_receiver.clone())),
-    ];
-
-    if components.contains(&Component::WsApi)
-        || components.contains(&Component::HttpApi)
-        || components.contains(&Component::ContractVerificationApi)
-    {
-        let api_config = configs.api_config.clone().context("api_config")?;
-        let state_keeper_config = configs
-            .state_keeper_config
-            .clone()
-            .context("state_keeper_config")?;
-        let tx_sender_config = TxSenderConfig::new(
-            &state_keeper_config,
-            &api_config.web3_json_rpc,
-            wallets
-                .state_keeper
-                .clone()
-                .context("Fee account")?
-                .fee_account
-                .address(),
-            l2_chain_id,
-        );
-        let internal_api_config =
-            InternalApiConfig::new(&api_config.web3_json_rpc, contracts_config, genesis_config);
-
-        // Lazily initialize storage caches only when they are needed (e.g., skip their initialization
-        // if we only run the explorer APIs). This is required because the cache update task will
-        // terminate immediately if storage caches are dropped, which will lead to the (unexpected)
-        // program termination.
-        let mut storage_caches = None;
-
-        let mempool_cache = MempoolCache::new(api_config.web3_json_rpc.mempool_cache_size());
-        let mempool_cache_update_task = mempool_cache.update_task(
-            connection_pool.clone(),
-            api_config.web3_json_rpc.mempool_cache_update_interval(),
-        );
-        task_futures.push(tokio::spawn(
-            mempool_cache_update_task.run(stop_receiver.clone()),
-        ));
-
-        if components.contains(&Component::HttpApi) {
-            storage_caches = Some(
-                build_storage_caches(
-                    &api_config.web3_json_rpc,
-                    &replica_connection_pool,
-                    &mut task_futures,
-                    stop_receiver.clone(),
-                )
-                .context("build_storage_caches()")?,
-            );
-
-            let started_at = Instant::now();
-            tracing::info!("Initializing HTTP API");
-            let bounded_gas_adjuster = gas_adjuster
-                .get_or_init()
-                .await
-                .context("gas_adjuster.get_or_init()")?;
-            let batch_fee_input_provider = Arc::new(MainNodeFeeInputProvider::new(
-                bounded_gas_adjuster,
-                FeeModelConfig::from_state_keeper_config(&state_keeper_config),
-            ));
-            run_http_api(
-                &mut task_futures,
-                &app_health,
-                &postgres_config,
-                &tx_sender_config,
-                &state_keeper_config,
-                &internal_api_config,
-                &api_config,
-                connection_pool.clone(),
-                replica_connection_pool.clone(),
-                stop_receiver.clone(),
-                batch_fee_input_provider,
-                state_keeper_config.save_call_traces,
-                storage_caches.clone().unwrap(),
-                mempool_cache.clone(),
-            )
-            .await
-            .context("run_http_api")?;
-
-            let elapsed = started_at.elapsed();
-            APP_METRICS.init_latency[&InitStage::HttpApi].set(elapsed);
-            tracing::info!(
-                "Initialized HTTP API on port {:?} in {elapsed:?}",
-                api_config.web3_json_rpc.http_port
-            );
-        }
-
-        if components.contains(&Component::WsApi) {
-            let storage_caches = match storage_caches {
-                Some(storage_caches) => storage_caches,
-                None => build_storage_caches(
-                    &configs.api_config.clone().context("api")?.web3_json_rpc,
-                    &replica_connection_pool,
-                    &mut task_futures,
-                    stop_receiver.clone(),
-                )
-                .context("build_storage_caches()")?,
-            };
-
-            let started_at = Instant::now();
-            tracing::info!("initializing WS API");
-            let bounded_gas_adjuster = gas_adjuster
-                .get_or_init()
-                .await
-                .context("gas_adjuster.get_or_init()")?;
-            let batch_fee_input_provider = Arc::new(MainNodeFeeInputProvider::new(
-                bounded_gas_adjuster,
-                FeeModelConfig::from_state_keeper_config(&state_keeper_config),
-            ));
-            run_ws_api(
-                &mut task_futures,
-                &app_health,
-                &postgres_config,
-                &tx_sender_config,
-                &state_keeper_config,
-                &internal_api_config,
-                &api_config,
-                batch_fee_input_provider,
-                connection_pool.clone(),
-                replica_connection_pool.clone(),
-                stop_receiver.clone(),
-                storage_caches,
-                mempool_cache,
-            )
-            .await
-            .context("run_ws_api")?;
-
-            let elapsed = started_at.elapsed();
-            APP_METRICS.init_latency[&InitStage::WsApi].set(elapsed);
-            tracing::info!(
-                "Initialized WS API on port {} in {elapsed:?}",
-                api_config.web3_json_rpc.ws_port
-            );
-        }
-
-        if components.contains(&Component::ContractVerificationApi) {
-            let started_at = Instant::now();
-            tracing::info!("initializing contract verification REST API");
-            task_futures.push(tokio::spawn(contract_verification::start_server(
-                connection_pool.clone(),
-                replica_connection_pool.clone(),
-                configs
-                    .contract_verifier
-                    .clone()
-                    .context("Contract verifier")?,
-                stop_receiver.clone(),
-            )));
-            let elapsed = started_at.elapsed();
-            APP_METRICS.init_latency[&InitStage::ContractVerificationApi].set(elapsed);
-            tracing::info!("initialized contract verification REST API in {elapsed:?}");
-        }
-    }
-
-    let object_store_config = configs
-        .prover_config
-        .clone()
-        .context("Prover")?
-        .object_store
-        .clone()
-        .context("object_store_config")?;
-    let store_factory = ObjectStoreFactory::new(object_store_config);
-
-    if components.contains(&Component::StateKeeper) {
-        let started_at = Instant::now();
-        tracing::info!("initializing State Keeper");
-        let bounded_gas_adjuster = gas_adjuster
-            .get_or_init()
-            .await
-            .context("gas_adjuster.get_or_init()")?;
-        let state_keeper_config = configs
-            .state_keeper_config
-            .clone()
-            .context("state_keeper_config")?;
-        let batch_fee_input_provider = Arc::new(MainNodeFeeInputProvider::new(
-            bounded_gas_adjuster,
-            FeeModelConfig::from_state_keeper_config(&state_keeper_config),
-        ));
-        add_state_keeper_to_task_futures(
-            &mut task_futures,
-            &postgres_config,
-            contracts_config,
-            state_keeper_config,
-            wallets
-                .state_keeper
-                .clone()
-                .context("State keeper wallets")?,
-            l2_chain_id,
-            &db_config,
-            &configs.mempool_config.clone().context("mempool_config")?,
-            batch_fee_input_provider,
-            stop_receiver.clone(),
-        )
-        .await
-        .context("add_state_keeper_to_task_futures()")?;
-
-        let elapsed = started_at.elapsed();
-        APP_METRICS.init_latency[&InitStage::StateKeeper].set(elapsed);
-        tracing::info!("initialized State Keeper in {elapsed:?}");
-    }
-
-    let diamond_proxy_addr = contracts_config.diamond_proxy_addr;
-    let state_transition_manager_addr = contracts_config
-        .ecosystem_contracts
-        .as_ref()
-        .map(|a| a.state_transition_proxy_addr);
-
-    if components.contains(&Component::Consensus) {
-        let secrets = secrets.consensus.as_ref().context("Secrets are missing")?;
-        let cfg = consensus::config::main_node(
-            consensus_config
-                .as_ref()
-                .context("consensus component's config is missing")?,
-            secrets,
-            l2_chain_id,
-        )?;
-        let started_at = Instant::now();
-        tracing::info!("initializing Consensus");
-        let pool = connection_pool.clone();
-        let mut stop_receiver = stop_receiver.clone();
-        task_futures.push(tokio::spawn(async move {
-            // We instantiate the root context here, since the consensus task is the only user of the
-            // structured concurrency framework.
-            // Note, however, that awaiting for the `stop_receiver` is related to the root context behavior,
-            // not the consensus task itself. There may have been any number of tasks running in the root context,
-            // but we only need to wait for stop signal once, and it will be propagated to all child contexts.
-            let root_ctx = ctx::root();
-            scope::run!(&root_ctx, |ctx, s| async move {
-                s.spawn_bg(consensus::era::run_main_node(ctx, cfg, pool));
-                let _ = stop_receiver.wait_for(|stop| *stop).await?;
-                Ok(())
-            })
-            .await
-        }));
-
-        let elapsed = started_at.elapsed();
-        APP_METRICS.init_latency[&InitStage::Consensus].set(elapsed);
-        tracing::info!("initialized Consensus in {elapsed:?}");
-    }
-
-    if components.contains(&Component::EthWatcher) {
-        let started_at = Instant::now();
-        tracing::info!("initializing ETH-Watcher");
-        let eth_watch_pool = ConnectionPool::<Core>::singleton(postgres_config.master_url()?)
-            .build()
-            .await
-            .context("failed to build eth_watch_pool")?;
-        let governance = (governance_contract(), contracts_config.governance_addr);
-        let eth_watch_config = configs
-            .eth
-            .clone()
-            .context("eth_config")?
-            .watcher
-            .context("watcher")?;
-        task_futures.push(
-            start_eth_watch(
-                eth_watch_config,
-                eth_watch_pool,
-                query_client.clone(),
-                diamond_proxy_addr,
-                state_transition_manager_addr,
-                governance,
-                stop_receiver.clone(),
-            )
-            .await
-            .context("start_eth_watch()")?,
-        );
-        let elapsed = started_at.elapsed();
-        APP_METRICS.init_latency[&InitStage::EthWatcher].set(elapsed);
-        tracing::info!("initialized ETH-Watcher in {elapsed:?}");
-    }
-
-    let input_generator: Box<dyn InputGenerator> = if genesis_config
-        .l1_batch_commit_data_generator_mode
-        == L1BatchCommitDataGeneratorMode::Validium
-    {
-        Box::new(ValidiumInputGenerator)
-    } else {
-        Box::new(RollupInputGenerator)
-    };
-
-    if components.contains(&Component::EthTxAggregator) {
-        let started_at = Instant::now();
-        tracing::info!("initializing ETH-TxAggregator");
-        let eth_sender_pool = ConnectionPool::<Core>::singleton(postgres_config.master_url()?)
-            .build()
-            .await
-            .context("failed to build eth_sender_pool")?;
-
-        let eth_sender_wallets = wallets.eth_sender.clone().context("eth_sender")?;
-        let operator_private_key = eth_sender_wallets.operator.private_key();
-        let diamond_proxy_addr = contracts_config.diamond_proxy_addr;
-        let default_priority_fee_per_gas = eth
-            .gas_adjuster
-            .as_ref()
-            .context("gas_adjuster")?
-            .default_priority_fee_per_gas;
-        let l1_chain_id = genesis_config.l1_chain_id;
-
-        let eth_client = PKSigningClient::new_raw(
-            operator_private_key.clone(),
-            diamond_proxy_addr,
-            default_priority_fee_per_gas,
-            l1_chain_id,
-            query_client.clone(),
-        );
-
-        let l1_batch_commit_data_generator_mode =
-            genesis_config.l1_batch_commit_data_generator_mode;
-        ensure_l1_batch_commit_data_generation_mode(
-            l1_batch_commit_data_generator_mode,
-            contracts_config.diamond_proxy_addr,
-            eth_client.as_ref(),
-        )
-        .await?;
-
-        let l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator> =
-            match l1_batch_commit_data_generator_mode {
-                L1BatchCommitDataGeneratorMode::Rollup => {
-                    Arc::new(RollupModeL1BatchCommitDataGenerator {})
-                }
-                L1BatchCommitDataGeneratorMode::Validium => {
-                    Arc::new(ValidiumModeL1BatchCommitDataGenerator {})
-                }
-            };
-
-        let operator_blobs_address = eth_sender_wallets.blob_operator.map(|x| x.address());
-
-        let sender_config = eth.sender.clone().context("eth_sender")?;
-        let eth_tx_aggregator_actor = EthTxAggregator::new(
-            eth_sender_pool,
-            sender_config.clone(),
-            Aggregator::new(
-                sender_config.clone(),
-                store_factory.create_store().await,
-                operator_blobs_address.is_some(),
-                l1_batch_commit_data_generator.clone(),
-            ),
-            Box::new(eth_client),
-            contracts_config.validator_timelock_addr,
-            contracts_config.l1_multicall3_addr,
-            diamond_proxy_addr,
-            l2_chain_id,
-            operator_blobs_address,
-            l1_batch_commit_data_generator,
-        )
-        .await;
-        task_futures.push(tokio::spawn(
-            eth_tx_aggregator_actor.run(stop_receiver.clone()),
-        ));
-        let elapsed = started_at.elapsed();
-        APP_METRICS.init_latency[&InitStage::EthTxAggregator].set(elapsed);
-        tracing::info!("initialized ETH-TxAggregator in {elapsed:?}");
-    }
-
-    if components.contains(&Component::EthTxManager) {
-        let started_at = Instant::now();
-        tracing::info!("initializing ETH-TxManager");
-        let eth_manager_pool = ConnectionPool::<Core>::singleton(postgres_config.master_url()?)
-            .build()
-            .await
-            .context("failed to build eth_manager_pool")?;
-        let eth_sender = configs.eth.clone().context("eth_sender_config")?;
-        let eth_sender_wallets = wallets.eth_sender.clone().context("eth_sender")?;
-        let operator_private_key = eth_sender_wallets.operator.private_key();
-        let diamond_proxy_addr = contracts_config.diamond_proxy_addr;
-        let default_priority_fee_per_gas = eth
-            .gas_adjuster
-            .as_ref()
-            .context("gas_adjuster")?
-            .default_priority_fee_per_gas;
-        let l1_chain_id = genesis_config.l1_chain_id;
-
-        let eth_client = PKSigningClient::new_raw(
-            operator_private_key.clone(),
-            diamond_proxy_addr,
-            default_priority_fee_per_gas,
-            l1_chain_id,
-            query_client.clone(),
-        );
-
-        let eth_client_blobs = if let Some(blob_operator) = eth_sender_wallets.blob_operator {
-            let operator_blob_private_key = blob_operator.private_key().clone();
-            let client = Box::new(PKSigningClient::new_raw(
-                operator_blob_private_key,
-                diamond_proxy_addr,
-                default_priority_fee_per_gas,
-                l1_chain_id,
-                query_client,
-            ));
-            Some(client as Box<dyn BoundEthInterface>)
-        } else {
-            None
-        };
-
-        let eth_tx_manager_actor = EthTxManager::new(
-            eth_manager_pool,
-            eth_sender.sender.clone().context("eth_sender")?,
-            gas_adjuster
-                .get_or_init()
-                .await
-                .context("gas_adjuster.get_or_init()")?,
-            Box::new(eth_client),
-            eth_client_blobs,
-        );
-        task_futures.extend([tokio::spawn(
-            eth_tx_manager_actor.run(stop_receiver.clone()),
-        )]);
-        let elapsed = started_at.elapsed();
-        APP_METRICS.init_latency[&InitStage::EthTxManager].set(elapsed);
-        tracing::info!("initialized ETH-TxManager in {elapsed:?}");
-    }
-
-    add_trees_to_task_futures(
-        configs,
-        &mut task_futures,
-        &app_health,
-        components,
-        &store_factory,
-        stop_receiver.clone(),
-    )
-    .await
-    .context("add_trees_to_task_futures()")?;
-
-    if components.contains(&Component::Housekeeper) {
-        add_house_keeper_to_task_futures(configs, &mut task_futures, stop_receiver.clone())
-            .await
-            .context("add_house_keeper_to_task_futures()")?;
-    }
-
-    if components.contains(&Component::ProofDataHandler) {
-        task_futures.push(tokio::spawn(zksync_proof_data_handler::run_server(
-            configs
-                .proof_data_handler_config
-                .clone()
-                .context("proof_data_handler_config")?,
-            store_factory.create_store().await,
-            connection_pool.clone(),
-            stop_receiver.clone(),
-        )));
-    }
-
-    if components.contains(&Component::CommitmentGenerator) {
-        let commitment_generator_pool =
-            ConnectionPool::<Core>::singleton(postgres_config.master_url()?)
-                .build()
-                .await
-                .context("failed to build commitment_generator_pool")?;
-        let commitment_generator =
-            CommitmentGenerator::new(commitment_generator_pool, input_generator);
-        app_health.insert_component(commitment_generator.health_check())?;
-        task_futures.push(tokio::spawn(
-            commitment_generator.run(stop_receiver.clone()),
-        ));
-    }
-
-    // Run healthcheck server for all components.
-    let db_health_check = ConnectionPoolHealthCheck::new(replica_connection_pool);
-    app_health.insert_custom_component(Arc::new(db_health_check))?;
-    let health_check_handle =
-        HealthCheckHandle::spawn_server(health_check_config.bind_addr(), app_health);
-
-    if let Some(task) = gas_adjuster.run_if_initialized(stop_receiver.clone()) {
-        task_futures.push(task);
-    }
-
-    Ok((task_futures, stop_sender, health_check_handle))
-}
-
-#[allow(clippy::too_many_arguments)]
-async fn add_state_keeper_to_task_futures(
-    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
-    postgres_config: &PostgresConfig,
-    contracts_config: &ContractsConfig,
-    state_keeper_config: StateKeeperConfig,
-    state_keeper_wallets: wallets::StateKeeper,
-    l2chain_id: L2ChainId,
-    db_config: &DBConfig,
-    mempool_config: &MempoolConfig,
-    batch_fee_input_provider: Arc<dyn BatchFeeModelInputProvider>,
-    stop_receiver: watch::Receiver<bool>,
-) -> anyhow::Result<()> {
-    let state_keeper_pool = ConnectionPool::<Core>::singleton(postgres_config.master_url()?)
-        .build()
-        .await
-        .context("failed to build state_keeper_pool")?;
-    let mempool = {
-        let mut storage = state_keeper_pool
-            .connection()
-            .await
-            .context("Access storage to build mempool")?;
-        let mempool = MempoolGuard::from_storage(&mut storage, mempool_config.capacity).await;
-        mempool.register_metrics();
-        mempool
-    };
-
-    let l2_block_sealer_pool = ConnectionPool::<Core>::singleton(postgres_config.master_url()?)
-        .build()
-        .await
-        .context("failed to build l2_block_sealer_pool")?;
-    let (persistence, l2_block_sealer) = StateKeeperPersistence::new(
-        l2_block_sealer_pool,
-        contracts_config
-            .l2_shared_bridge_addr
-            .context("`l2_shared_bridge_addr` config is missing")?,
-        state_keeper_config.l2_block_seal_queue_capacity,
-    );
-    task_futures.push(tokio::spawn(l2_block_sealer.run()));
-
-    // One (potentially held long-term) connection for `AsyncCatchupTask` and another connection
-    // to access `AsyncRocksdbCache` as a storage.
-    let async_cache_pool = ConnectionPool::<Core>::builder(postgres_config.master_url()?, 2)
-        .build()
-        .await
-        .context("failed to build async_cache_pool")?;
-    let cache_options = RocksdbStorageOptions {
-        block_cache_capacity: db_config
-            .experimental
-            .state_keeper_db_block_cache_capacity(),
-        max_open_files: db_config.experimental.state_keeper_db_max_open_files,
-    };
-    let (async_cache, async_catchup_task) = AsyncRocksdbCache::new(
-        async_cache_pool,
-        db_config.state_keeper_db_path.clone(),
-        cache_options,
-    );
-    let state_keeper = create_state_keeper(
-        state_keeper_config,
-        state_keeper_wallets,
-        async_cache,
-        l2chain_id,
-        mempool_config,
-        state_keeper_pool,
-        mempool.clone(),
-        batch_fee_input_provider.clone(),
-        OutputHandler::new(Box::new(persistence)),
-        stop_receiver.clone(),
-    )
-    .await;
-
-    let mut stop_receiver_clone = stop_receiver.clone();
-    task_futures.push(tokio::task::spawn(async move {
-        let result = async_catchup_task.run(stop_receiver_clone.clone()).await;
-        stop_receiver_clone.changed().await?;
-        result
-    }));
-    task_futures.push(tokio::spawn(state_keeper.run()));
-
-    let mempool_fetcher_pool = ConnectionPool::<Core>::singleton(postgres_config.master_url()?)
-        .build()
-        .await
-        .context("failed to build mempool_fetcher_pool")?;
-    let mempool_fetcher = MempoolFetcher::new(
-        mempool,
-        batch_fee_input_provider,
-        mempool_config,
-        mempool_fetcher_pool,
-    );
-    let mempool_fetcher_handle = tokio::spawn(mempool_fetcher.run(stop_receiver));
-    task_futures.push(mempool_fetcher_handle);
-    Ok(())
-}
-
-pub async fn start_eth_watch(
-    config: EthWatchConfig,
-    pool: ConnectionPool<Core>,
-    eth_gateway: Box<dyn EthInterface>,
-    diamond_proxy_addr: Address,
-    state_transition_manager_addr: Option<Address>,
-    governance: (Contract, Address),
-    stop_receiver: watch::Receiver<bool>,
-) -> anyhow::Result<JoinHandle<anyhow::Result<()>>> {
-    let eth_client = EthHttpQueryClient::new(
-        eth_gateway,
-        diamond_proxy_addr,
-        state_transition_manager_addr,
-        governance.1,
-        config.confirmations_for_eth_event,
-    );
-
-    let eth_watch = EthWatch::new(
-        diamond_proxy_addr,
-        state_transition_manager_addr,
-        &governance.0,
-        Box::new(eth_client),
-        pool,
-        config.poll_interval(),
-    )
-    .await?;
-
-    Ok(tokio::spawn(eth_watch.run(stop_receiver)))
-}
-
-async fn add_trees_to_task_futures(
-    configs: &GeneralConfig,
-    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
-    app_health: &AppHealthCheck,
-    components: &[Component],
-    store_factory: &ObjectStoreFactory,
-    stop_receiver: watch::Receiver<bool>,
-) -> anyhow::Result<()> {
-    if !components.contains(&Component::Tree) {
-        anyhow::ensure!(
-            !components.contains(&Component::TreeApi),
-            "Merkle tree API cannot be started without a tree component"
-        );
-        return Ok(());
-    }
-
-    let db_config = configs.db_config.clone().context("db_config")?;
-    let operation_config = configs
-        .operations_manager_config
-        .clone()
-        .context("operations_manager_config")?;
-    let api_config = configs
-        .api_config
-        .clone()
-        .context("api_config")?
-        .merkle_tree;
-    let postgres_config = configs.postgres_config.clone().context("postgres_config")?;
-    let api_config = components
-        .contains(&Component::TreeApi)
-        .then_some(&api_config);
-
-    let object_store = match db_config.merkle_tree.mode {
-        MerkleTreeMode::Lightweight => None,
-        MerkleTreeMode::Full => Some(store_factory.create_store().await),
-    };
-
-    run_tree(
-        task_futures,
-        app_health,
-        &postgres_config,
-        &db_config.merkle_tree,
-        api_config,
-        &operation_config,
-        object_store,
-        stop_receiver,
-    )
-    .await
-    .context("run_tree()")
-}
-
-#[allow(clippy::too_many_arguments)]
-async fn run_tree(
-    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
-    app_health: &AppHealthCheck,
-    postgres_config: &PostgresConfig,
-    merkle_tree_config: &MerkleTreeConfig,
-    api_config: Option<&MerkleTreeApiConfig>,
-    operation_manager: &OperationsManagerConfig,
-    object_store: Option<Arc<dyn ObjectStore>>,
-    stop_receiver: watch::Receiver<bool>,
-) -> anyhow::Result<()> {
-    let started_at = Instant::now();
-    let mode_str = if matches!(merkle_tree_config.mode, MerkleTreeMode::Full) {
-        "full"
-    } else {
-        "lightweight"
-    };
-    tracing::info!("Initializing Merkle tree in {mode_str} mode");
-
-    let config = MetadataCalculatorConfig::for_main_node(merkle_tree_config, operation_manager);
-    let pool = ConnectionPool::singleton(postgres_config.master_url()?)
-        .build()
-        .await
-        .context("failed to build connection pool for Merkle tree")?;
-    // The number of connections in a recovery pool is based on the mainnet recovery runs. It doesn't need
-    // to be particularly accurate at this point, since the main node isn't expected to recover from a snapshot.
-    let recovery_pool = ConnectionPool::builder(postgres_config.replica_url()?, 10)
-        .build()
-        .await
-        .context("failed to build connection pool for Merkle tree recovery")?;
-    let metadata_calculator = MetadataCalculator::new(config, object_store, pool)
-        .await
-        .context("failed initializing metadata_calculator")?
-        .with_recovery_pool(recovery_pool);
-
-    if let Some(api_config) = api_config {
-        let address = (Ipv4Addr::UNSPECIFIED, api_config.port).into();
-        let tree_reader = metadata_calculator.tree_reader();
-        let stop_receiver = stop_receiver.clone();
-        task_futures.push(tokio::spawn(async move {
-            tree_reader
-                .wait()
-                .await
-                .run_api_server(address, stop_receiver)
-                .await
-        }));
-    }
-
-    let tree_health_check = metadata_calculator.tree_health_check();
-    app_health.insert_custom_component(Arc::new(tree_health_check))?;
-    let tree_task = tokio::spawn(metadata_calculator.run(stop_receiver));
-    task_futures.push(tree_task);
-
-    let elapsed = started_at.elapsed();
-    APP_METRICS.init_latency[&InitStage::Tree].set(elapsed);
-    tracing::info!("Initialized {mode_str} tree in {elapsed:?}");
-    Ok(())
-}
-
-async fn add_house_keeper_to_task_futures(
-    configs: &GeneralConfig,
-    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
-    stop_receiver: watch::Receiver<bool>,
-) -> anyhow::Result<()> {
-    let house_keeper_config = configs
-        .house_keeper_config
-        .clone()
-        .context("house_keeper_config")?;
-    let postgres_config = configs.postgres_config.clone().context("postgres_config")?;
-    let connection_pool = ConnectionPool::<Core>::builder(
-        postgres_config.replica_url()?,
-        postgres_config.max_connections()?,
-    )
-    .build()
-    .await
-    .context("failed to build a connection pool")?;
-
-    let pool_for_metrics = connection_pool.clone();
-    let mut stop_receiver_for_metrics = stop_receiver.clone();
-    task_futures.push(tokio::spawn(async move {
-        tokio::select! {
-            () = PostgresMetrics::run_scraping(pool_for_metrics, Duration::from_secs(60)) => {
-                tracing::warn!("Postgres metrics scraping unexpectedly stopped");
-            }
-            _ = stop_receiver_for_metrics.changed() => {
-                tracing::info!("Stop signal received, Postgres metrics scraping is shutting down");
-            }
-        }
-        Ok(())
-    }));
-
-    let l1_batch_metrics_reporter = L1BatchMetricsReporter::new(
-        house_keeper_config.l1_batch_metrics_reporting_interval_ms,
-        connection_pool.clone(),
-    );
-
-    let prover_connection_pool = ConnectionPool::<Prover>::builder(
-        postgres_config.prover_url()?,
-        postgres_config.max_connections()?,
-    )
-    .build()
-    .await
-    .context("failed to build a prover_connection_pool")?;
-    let task = l1_batch_metrics_reporter.run(stop_receiver.clone());
-    task_futures.push(tokio::spawn(task));
-
-    // All FRI Prover related components are configured below.
-    let fri_prover_config = configs.prover_config.clone().context("fri_prover_config")?;
-    let fri_prover_job_retry_manager = FriProverJobRetryManager::new(
-        fri_prover_config.max_attempts,
-        fri_prover_config.proof_generation_timeout(),
-        house_keeper_config.prover_job_retrying_interval_ms,
-        prover_connection_pool.clone(),
-    );
-    let task = fri_prover_job_retry_manager.run(stop_receiver.clone());
-    task_futures.push(tokio::spawn(task));
-
-    let fri_witness_gen_config = configs
-        .witness_generator
-        .clone()
-        .context("fri_witness_generator_config")?;
-    let fri_witness_gen_job_retry_manager = FriWitnessGeneratorJobRetryManager::new(
-        fri_witness_gen_config.max_attempts,
-        fri_witness_gen_config.witness_generation_timeouts(),
-        house_keeper_config.witness_generator_job_retrying_interval_ms,
-        prover_connection_pool.clone(),
-    );
-    let task = fri_witness_gen_job_retry_manager.run(stop_receiver.clone());
-    task_futures.push(tokio::spawn(task));
-
-    let waiting_to_queued_fri_witness_job_mover = WaitingToQueuedFriWitnessJobMover::new(
-        house_keeper_config.witness_job_moving_interval_ms,
-        prover_connection_pool.clone(),
-    );
-    let task = waiting_to_queued_fri_witness_job_mover.run(stop_receiver.clone());
-    task_futures.push(tokio::spawn(task));
-
-    let fri_witness_generator_stats_reporter = FriWitnessGeneratorStatsReporter::new(
-        prover_connection_pool.clone(),
-        house_keeper_config.witness_generator_stats_reporting_interval_ms,
-    );
-    let task = fri_witness_generator_stats_reporter.run(stop_receiver.clone());
-    task_futures.push(tokio::spawn(task));
-
-    // TODO(PLA-862): remove after fields become required
-    if let Some((archiving_interval, archive_after)) =
-        house_keeper_config.prover_job_archiver_params()
-    {
-        let fri_prover_jobs_archiver = FriProverJobArchiver::new(
-            prover_connection_pool.clone(),
-            archiving_interval,
-            archive_after,
-        );
-        let task = fri_prover_jobs_archiver.run(stop_receiver.clone());
-        task_futures.push(tokio::spawn(task));
-    }
-
-    if let Some((archiving_interval, archive_after)) =
-        house_keeper_config.fri_gpu_prover_archiver_params()
-    {
-        let fri_gpu_prover_jobs_archiver = FriGpuProverArchiver::new(
-            prover_connection_pool.clone(),
-            archiving_interval,
-            archive_after,
-        );
-        let task = fri_gpu_prover_jobs_archiver.run(stop_receiver.clone());
-        task_futures.push(tokio::spawn(task));
-    }
-
-    let fri_prover_group_config = configs
-        .prover_group_config
-        .clone()
-        .context("fri_prover_group_config")?;
-    let fri_prover_stats_reporter = FriProverStatsReporter::new(
-        house_keeper_config.prover_stats_reporting_interval_ms,
-        prover_connection_pool.clone(),
-        connection_pool.clone(),
-        fri_prover_group_config,
-    );
-    let task = fri_prover_stats_reporter.run(stop_receiver.clone());
-    task_futures.push(tokio::spawn(task));
-
-    let proof_compressor_config = configs
-        .proof_compressor_config
-        .clone()
-        .context("fri_proof_compressor_config")?;
-    let fri_proof_compressor_stats_reporter = FriProofCompressorStatsReporter::new(
-        house_keeper_config.proof_compressor_stats_reporting_interval_ms,
-        prover_connection_pool.clone(),
-    );
-    let task = fri_proof_compressor_stats_reporter.run(stop_receiver.clone());
-    task_futures.push(tokio::spawn(task));
-
-    let fri_proof_compressor_retry_manager = FriProofCompressorJobRetryManager::new(
-        proof_compressor_config.max_attempts,
-        proof_compressor_config.generation_timeout(),
-        house_keeper_config.proof_compressor_job_retrying_interval_ms,
-        prover_connection_pool.clone(),
-    );
-    let task = fri_proof_compressor_retry_manager.run(stop_receiver);
-    task_futures.push(tokio::spawn(task));
-    Ok(())
-}
-
-fn build_storage_caches(
-    rpc_config: &Web3JsonRpcConfig,
-    replica_connection_pool: &ConnectionPool<Core>,
-    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
-    stop_receiver: watch::Receiver<bool>,
-) -> anyhow::Result<PostgresStorageCaches> {
-    let factory_deps_capacity = rpc_config.factory_deps_cache_size() as u64;
-    let initial_writes_capacity = rpc_config.initial_writes_cache_size() as u64;
-    let values_capacity = rpc_config.latest_values_cache_size() as u64;
-    let mut storage_caches =
-        PostgresStorageCaches::new(factory_deps_capacity, initial_writes_capacity);
-
-    if values_capacity > 0 {
-        let values_cache_task = storage_caches
-            .configure_storage_values_cache(values_capacity, replica_connection_pool.clone());
-        task_futures.push(tokio::task::spawn(values_cache_task.run(stop_receiver)));
-    }
-    Ok(storage_caches)
-}
-
-async fn build_tx_sender(
-    tx_sender_config: &TxSenderConfig,
-    web3_json_config: &Web3JsonRpcConfig,
-    state_keeper_config: &StateKeeperConfig,
-    replica_pool: ConnectionPool<Core>,
-    master_pool: ConnectionPool<Core>,
-    batch_fee_model_input_provider: Arc<dyn BatchFeeModelInputProvider>,
-    storage_caches: PostgresStorageCaches,
-) -> (TxSender, VmConcurrencyBarrier) {
-    let sequencer_sealer = SequencerSealer::new(state_keeper_config.clone());
-    let master_pool_sink = MasterPoolSink::new(master_pool);
-    let tx_sender_builder = TxSenderBuilder::new(
-        tx_sender_config.clone(),
-        replica_pool.clone(),
-        Arc::new(master_pool_sink),
-    )
-    .with_sealer(Arc::new(sequencer_sealer));
-
-    let max_concurrency = web3_json_config.vm_concurrency_limit();
-    let (vm_concurrency_limiter, vm_barrier) = VmConcurrencyLimiter::new(max_concurrency);
-
-    let batch_fee_input_provider =
-        ApiFeeInputProvider::new(batch_fee_model_input_provider, replica_pool);
-
-    let tx_sender = tx_sender_builder
-        .build(
-            Arc::new(batch_fee_input_provider),
-            Arc::new(vm_concurrency_limiter),
-            ApiContracts::load_from_disk(),
-            storage_caches,
-        )
-        .await;
-    (tx_sender, vm_barrier)
-}
-
-#[allow(clippy::too_many_arguments)]
-async fn run_http_api(
-    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
-    app_health: &AppHealthCheck,
-    postgres_config: &PostgresConfig,
-    tx_sender_config: &TxSenderConfig,
-    state_keeper_config: &StateKeeperConfig,
-    internal_api: &InternalApiConfig,
-    api_config: &ApiConfig,
-    master_connection_pool: ConnectionPool<Core>,
-    replica_connection_pool: ConnectionPool<Core>,
-    stop_receiver: watch::Receiver<bool>,
-    batch_fee_model_input_provider: Arc<dyn BatchFeeModelInputProvider>,
-    with_debug_namespace: bool,
-    storage_caches: PostgresStorageCaches,
-    mempool_cache: MempoolCache,
-) -> anyhow::Result<()> {
-    let (tx_sender, vm_barrier) = build_tx_sender(
-        tx_sender_config,
-        &api_config.web3_json_rpc,
-        state_keeper_config,
-        replica_connection_pool.clone(),
-        master_connection_pool,
-        batch_fee_model_input_provider,
-        storage_caches,
-    )
-    .await;
-
-    let mut namespaces = Namespace::DEFAULT.to_vec();
-    if with_debug_namespace {
-        namespaces.push(Namespace::Debug)
-    }
-    namespaces.push(Namespace::Snapshots);
-
-    let updaters_pool = ConnectionPool::<Core>::builder(postgres_config.replica_url()?, 2)
-        .build()
-        .await
-        .context("failed to build updaters_pool")?;
-
-    let mut api_builder =
-        web3::ApiBuilder::jsonrpsee_backend(internal_api.clone(), replica_connection_pool)
-            .http(api_config.web3_json_rpc.http_port)
-            .with_updaters_pool(updaters_pool)
-            .with_filter_limit(api_config.web3_json_rpc.filters_limit())
-            .with_batch_request_size_limit(api_config.web3_json_rpc.max_batch_request_size())
-            .with_response_body_size_limit(api_config.web3_json_rpc.max_response_body_size())
-            .with_tx_sender(tx_sender)
-            .with_vm_barrier(vm_barrier)
-            .with_mempool_cache(mempool_cache)
-            .enable_api_namespaces(namespaces);
-    if let Some(tree_api_url) = api_config.web3_json_rpc.tree_api_url() {
-        let tree_api = Arc::new(TreeApiHttpClient::new(tree_api_url));
-        api_builder = api_builder.with_tree_api(tree_api.clone());
-        app_health.insert_custom_component(tree_api)?;
-    }
-
-    let server_handles = api_builder
-        .build()
-        .context("failed to build HTTP API server")?
-        .run(stop_receiver)
-        .await?;
-    task_futures.extend(server_handles.tasks);
-    app_health.insert_component(server_handles.health_check)?;
-    Ok(())
-}
-
-#[allow(clippy::too_many_arguments)]
-async fn run_ws_api(
-    task_futures: &mut Vec<JoinHandle<anyhow::Result<()>>>,
-    app_health: &AppHealthCheck,
-    postgres_config: &PostgresConfig,
-    tx_sender_config: &TxSenderConfig,
-    state_keeper_config: &StateKeeperConfig,
-    internal_api: &InternalApiConfig,
-    api_config: &ApiConfig,
-    batch_fee_model_input_provider: Arc<dyn BatchFeeModelInputProvider>,
-    master_connection_pool: ConnectionPool<Core>,
-    replica_connection_pool: ConnectionPool<Core>,
-    stop_receiver: watch::Receiver<bool>,
-    storage_caches: PostgresStorageCaches,
-    mempool_cache: MempoolCache,
-) -> anyhow::Result<()> {
-    let (tx_sender, vm_barrier) = build_tx_sender(
-        tx_sender_config,
-        &api_config.web3_json_rpc,
-        state_keeper_config,
-        replica_connection_pool.clone(),
-        master_connection_pool,
-        batch_fee_model_input_provider,
-        storage_caches,
-    )
-    .await;
-    let updaters_pool = ConnectionPool::<Core>::singleton(postgres_config.replica_url()?)
-        .build()
-        .await
-        .context("failed to build updaters_pool")?;
-
-    let mut namespaces = Namespace::DEFAULT.to_vec();
-    namespaces.push(Namespace::Snapshots);
-
-    let mut api_builder =
-        web3::ApiBuilder::jsonrpsee_backend(internal_api.clone(), replica_connection_pool)
-            .ws(api_config.web3_json_rpc.ws_port)
-            .with_updaters_pool(updaters_pool)
-            .with_filter_limit(api_config.web3_json_rpc.filters_limit())
-            .with_subscriptions_limit(api_config.web3_json_rpc.subscriptions_limit())
-            .with_batch_request_size_limit(api_config.web3_json_rpc.max_batch_request_size())
-            .with_response_body_size_limit(api_config.web3_json_rpc.max_response_body_size())
-            .with_websocket_requests_per_minute_limit(
-                api_config
-                    .web3_json_rpc
-                    .websocket_requests_per_minute_limit(),
-            )
-            .with_polling_interval(api_config.web3_json_rpc.pubsub_interval())
-            .with_tx_sender(tx_sender)
-            .with_vm_barrier(vm_barrier)
-            .with_mempool_cache(mempool_cache)
-            .enable_api_namespaces(namespaces);
-    if let Some(tree_api_url) = api_config.web3_json_rpc.tree_api_url() {
-        let tree_api = Arc::new(TreeApiHttpClient::new(tree_api_url));
-        api_builder = api_builder.with_tree_api(tree_api.clone());
-        app_health.insert_custom_component(tree_api)?;
-    }
-
-    let server_handles = api_builder
-        .build()
-        .context("failed to build WS API server")?
-        .run(stop_receiver)
-        .await?;
-    task_futures.extend(server_handles.tasks);
-    app_health.insert_component(server_handles.health_check)?;
-    Ok(())
-}
-
-async fn circuit_breakers_for_components(
-    components: &[Component],
-    postgres_config: &PostgresConfig,
-    circuit_breaker_config: &CircuitBreakerConfig,
-) -> anyhow::Result<CircuitBreakers> {
-    let circuit_breakers = CircuitBreakers::default();
-
-    if components
-        .iter()
-        .any(|c| matches!(c, Component::EthTxAggregator | Component::EthTxManager))
-    {
-        let pool = ConnectionPool::<Core>::singleton(postgres_config.replica_url()?)
-            .build()
-            .await
-            .context("failed to build a connection pool")?;
-        circuit_breakers
-            .insert(Box::new(FailedL1TransactionChecker { pool }))
-            .await;
-    }
-
-    if components.iter().any(|c| {
-        matches!(
-            c,
-            Component::HttpApi | Component::WsApi | Component::ContractVerificationApi
-        )
-    }) {
-        let pool = ConnectionPool::<Core>::singleton(postgres_config.replica_url()?)
-            .build()
-            .await?;
-        circuit_breakers
-            .insert(Box::new(ReplicationLagChecker {
-                pool,
-                replication_lag_limit: circuit_breaker_config.replication_lag_limit(),
-            }))
-            .await;
-    }
-    Ok(circuit_breakers)
-}
diff --git a/core/lib/zksync_core/src/metadata_calculator/updater.rs b/core/lib/zksync_core/src/metadata_calculator/updater.rs
deleted file mode 100644
index b4f7d90117a2..000000000000
--- a/core/lib/zksync_core/src/metadata_calculator/updater.rs
+++ /dev/null
@@ -1,303 +0,0 @@
-//! Tree updater trait and its implementations.
-
-use std::{ops, sync::Arc, time::Instant};
-
-use anyhow::Context as _;
-use futures::{future, FutureExt};
-use tokio::sync::watch;
-use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
-use zksync_merkle_tree::domain::TreeMetadata;
-use zksync_object_store::ObjectStore;
-use zksync_types::{
-    block::{L1BatchHeader, L1BatchTreeData},
-    L1BatchNumber,
-};
-
-use super::{
-    helpers::{AsyncTree, Delayer, L1BatchWithLogs},
-    metrics::{TreeUpdateStage, METRICS},
-    MetadataCalculator,
-};
-use crate::utils::wait_for_l1_batch;
-
-#[derive(Debug)]
-pub(super) struct TreeUpdater {
-    tree: AsyncTree,
-    max_l1_batches_per_iter: usize,
-    object_store: Option<Arc<dyn ObjectStore>>,
-}
-
-impl TreeUpdater {
-    pub fn new(
-        tree: AsyncTree,
-        max_l1_batches_per_iter: usize,
-        object_store: Option<Arc<dyn ObjectStore>>,
-    ) -> Self {
-        Self {
-            tree,
-            max_l1_batches_per_iter,
-            object_store,
-        }
-    }
-
-    async fn process_l1_batch(
-        &mut self,
-        l1_batch: L1BatchWithLogs,
-    ) -> anyhow::Result<(L1BatchHeader, TreeMetadata, Option<String>)> {
-        let compute_latency = METRICS.start_stage(TreeUpdateStage::Compute);
-        let l1_batch_header = l1_batch.header.clone();
-        let l1_batch_number = l1_batch_header.number;
-        let mut metadata = self.tree.process_l1_batch(l1_batch).await?;
-        compute_latency.observe();
-
-        let witness_input = metadata.witness.take();
-        let object_key = if let Some(object_store) = &self.object_store {
-            let witness_input =
-                witness_input.context("no witness input provided by tree; this is a bug")?;
-            let save_witnesses_latency = METRICS.start_stage(TreeUpdateStage::SaveGcs);
-            let object_key = object_store
-                .put(l1_batch_number, &witness_input)
-                .await
-                .context("cannot save witness input to object store")?;
-            save_witnesses_latency.observe();
-
-            tracing::info!(
-                "Saved witnesses for L1 batch #{l1_batch_number} to object storage at `{object_key}`"
-            );
-            Some(object_key)
-        } else {
-            None
-        };
-
-        Ok((l1_batch_header, metadata, object_key))
-    }
-
-    /// Processes a range of L1 batches with a single flushing of the tree updates to RocksDB at the end.
-    /// This allows to save on RocksDB I/O ops.
-    ///
-    /// Returns the number of the next L1 batch to be processed by the tree.
-    ///
-    /// # Implementation details
-    ///
-    /// We load L1 batch data from Postgres in parallel with updating the tree. (Naturally, we need to load
-    /// the first L1 batch data beforehand.) This allows saving some time if we actually process
-    /// multiple L1 batches at once (e.g., during the initial tree syncing), and if loading data from Postgres
-    /// is slow for whatever reason.
-    async fn process_multiple_batches(
-        &mut self,
-        storage: &mut Connection<'_, Core>,
-        l1_batch_numbers: ops::RangeInclusive<u32>,
-    ) -> anyhow::Result<L1BatchNumber> {
-        let tree_mode = self.tree.mode();
-        let start = Instant::now();
-        tracing::info!("Processing L1 batches #{l1_batch_numbers:?} in {tree_mode:?} mode");
-        let first_l1_batch_number = L1BatchNumber(*l1_batch_numbers.start());
-        let last_l1_batch_number = L1BatchNumber(*l1_batch_numbers.end());
-        let mut l1_batch_data = L1BatchWithLogs::new(storage, first_l1_batch_number, tree_mode)
-            .await
-            .with_context(|| {
-                format!("failed fetching tree input for L1 batch #{first_l1_batch_number}")
-            })?;
-
-        let mut total_logs = 0;
-        let mut updated_headers = vec![];
-        for l1_batch_number in l1_batch_numbers {
-            let l1_batch_number = L1BatchNumber(l1_batch_number);
-            let Some(current_l1_batch_data) = l1_batch_data else {
-                return Ok(l1_batch_number);
-            };
-            total_logs += current_l1_batch_data.storage_logs.len();
-
-            let process_l1_batch_task = self.process_l1_batch(current_l1_batch_data);
-            let load_next_l1_batch_task = async {
-                if l1_batch_number < last_l1_batch_number {
-                    let next_l1_batch_number = l1_batch_number + 1;
-                    L1BatchWithLogs::new(storage, next_l1_batch_number, tree_mode)
-                        .await
-                        .with_context(|| {
-                            format!(
-                                "failed fetching tree input for L1 batch #{next_l1_batch_number}"
-                            )
-                        })
-                } else {
-                    Ok(None) // Don't need to load the next L1 batch after the last one we're processing.
-                }
-            };
-            let ((header, metadata, object_key), next_l1_batch_data) =
-                future::try_join(process_l1_batch_task, load_next_l1_batch_task).await?;
-
-            let save_postgres_latency = METRICS.start_stage(TreeUpdateStage::SavePostgres);
-            let tree_data = L1BatchTreeData {
-                hash: metadata.root_hash,
-                rollup_last_leaf_index: metadata.rollup_last_leaf_index,
-            };
-            storage
-                .blocks_dal()
-                .save_l1_batch_tree_data(l1_batch_number, &tree_data)
-                .await
-                .context("failed saving tree data")?;
-            // ^ Note that `save_l1_batch_tree_data()` will not blindly overwrite changes if L1 batch
-            // metadata already exists; instead, it'll check that the old and new metadata match.
-            // That is, if we run multiple tree instances, we'll get metadata correspondence
-            // right away without having to implement dedicated code.
-
-            if let Some(object_key) = &object_key {
-                storage
-                    .proof_generation_dal()
-                    .insert_proof_generation_details(l1_batch_number, object_key)
-                    .await;
-            }
-            save_postgres_latency.observe();
-            tracing::info!("Updated metadata for L1 batch #{l1_batch_number} in Postgres");
-
-            updated_headers.push(header);
-            l1_batch_data = next_l1_batch_data;
-        }
-
-        let save_rocksdb_latency = METRICS.start_stage(TreeUpdateStage::SaveRocksdb);
-        self.tree.save().await?;
-        save_rocksdb_latency.observe();
-        MetadataCalculator::update_metrics(&updated_headers, total_logs, start);
-
-        Ok(last_l1_batch_number + 1)
-    }
-
-    async fn step(
-        &mut self,
-        mut storage: Connection<'_, Core>,
-        next_l1_batch_to_seal: &mut L1BatchNumber,
-    ) -> anyhow::Result<()> {
-        let Some(last_sealed_l1_batch) = storage
-            .blocks_dal()
-            .get_sealed_l1_batch_number()
-            .await
-            .context("failed loading sealed L1 batch number")?
-        else {
-            tracing::trace!("No L1 batches to seal: Postgres storage is empty");
-            return Ok(());
-        };
-        let last_requested_l1_batch =
-            next_l1_batch_to_seal.0 + self.max_l1_batches_per_iter as u32 - 1;
-        let last_requested_l1_batch = last_requested_l1_batch.min(last_sealed_l1_batch.0);
-        let l1_batch_numbers = next_l1_batch_to_seal.0..=last_requested_l1_batch;
-        if l1_batch_numbers.is_empty() {
-            tracing::trace!(
-                "No L1 batches to seal: batch numbers range to be loaded {l1_batch_numbers:?} is empty"
-            );
-        } else {
-            tracing::info!("Updating Merkle tree with L1 batches #{l1_batch_numbers:?}");
-            *next_l1_batch_to_seal = self
-                .process_multiple_batches(&mut storage, l1_batch_numbers)
-                .await?;
-        }
-        Ok(())
-    }
-
-    /// The processing loop for this updater.
-    pub async fn loop_updating_tree(
-        mut self,
-        delayer: Delayer,
-        pool: &ConnectionPool<Core>,
-        mut stop_receiver: watch::Receiver<bool>,
-    ) -> anyhow::Result<()> {
-        let Some(earliest_l1_batch) =
-            wait_for_l1_batch(pool, delayer.delay_interval(), &mut stop_receiver).await?
-        else {
-            return Ok(()); // Stop signal received
-        };
-        let mut storage = pool.connection_tagged("metadata_calculator").await?;
-
-        // Ensure genesis creation
-        let tree = &mut self.tree;
-        if tree.is_empty() {
-            anyhow::ensure!(
-                earliest_l1_batch == L1BatchNumber(0),
-                "Non-zero earliest L1 batch #{earliest_l1_batch} is not supported without previous tree recovery"
-            );
-            let batch = L1BatchWithLogs::new(&mut storage, earliest_l1_batch, tree.mode())
-                .await
-                .with_context(|| {
-                    format!("failed fetching tree input for L1 batch #{earliest_l1_batch}")
-                })?
-                .context("Missing storage logs for the genesis L1 batch")?;
-            tree.process_l1_batch(batch).await?;
-            tree.save().await?;
-        }
-        let mut next_l1_batch_to_seal = tree.next_l1_batch_number();
-
-        let current_db_batch = storage.blocks_dal().get_sealed_l1_batch_number().await?;
-        let last_l1_batch_with_metadata = storage
-            .blocks_dal()
-            .get_last_l1_batch_number_with_metadata()
-            .await?;
-        drop(storage);
-
-        tracing::info!(
-            "Initialized metadata calculator with {max_batches_per_iter} max L1 batches per iteration. \
-             Next L1 batch for Merkle tree: {next_l1_batch_to_seal}, current Postgres L1 batch: {current_db_batch:?}, \
-             last L1 batch with metadata: {last_l1_batch_with_metadata:?}",
-            max_batches_per_iter = self.max_l1_batches_per_iter
-        );
-
-        // It may be the case that we don't have any L1 batches with metadata in Postgres, e.g. after
-        // recovering from a snapshot. We cannot wait for such a batch to appear (*this* is the component
-        // responsible for their appearance!), but fortunately most of the updater doesn't depend on it.
-        if let Some(last_l1_batch_with_metadata) = last_l1_batch_with_metadata {
-            let backup_lag =
-                (last_l1_batch_with_metadata.0 + 1).saturating_sub(next_l1_batch_to_seal.0);
-            METRICS.backup_lag.set(backup_lag.into());
-
-            if next_l1_batch_to_seal > last_l1_batch_with_metadata + 1 {
-                // Check stop signal before proceeding with a potentially time-consuming operation.
-                if *stop_receiver.borrow_and_update() {
-                    tracing::info!("Stop signal received, metadata_calculator is shutting down");
-                    return Ok(());
-                }
-
-                tracing::warn!(
-                    "Next L1 batch of the tree ({next_l1_batch_to_seal}) is greater than last L1 batch with metadata in Postgres \
-                     ({last_l1_batch_with_metadata}); this may be a result of restoring Postgres from a snapshot. \
-                     Truncating Merkle tree versions so that this mismatch is fixed..."
-                );
-                tree.revert_logs(last_l1_batch_with_metadata);
-                tree.save().await?;
-                next_l1_batch_to_seal = tree.next_l1_batch_number();
-                tracing::info!("Truncated Merkle tree to L1 batch #{next_l1_batch_to_seal}");
-            }
-        }
-
-        loop {
-            if *stop_receiver.borrow_and_update() {
-                tracing::info!("Stop signal received, metadata_calculator is shutting down");
-                break;
-            }
-            let storage = pool.connection_tagged("metadata_calculator").await?;
-
-            let snapshot = *next_l1_batch_to_seal;
-            self.step(storage, &mut next_l1_batch_to_seal).await?;
-            let delay = if snapshot == *next_l1_batch_to_seal {
-                tracing::trace!(
-                    "Metadata calculator (next L1 batch: #{next_l1_batch_to_seal}) \
-                     didn't make any progress; delaying it using {delayer:?}"
-                );
-                delayer.wait(&self.tree).left_future()
-            } else {
-                tracing::trace!(
-                    "Metadata calculator (next L1 batch: #{next_l1_batch_to_seal}) made progress from #{snapshot}"
-                );
-                future::ready(()).right_future()
-            };
-
-            // The delays we're operating with are reasonably small, but selecting between the delay
-            // and the stop receiver still allows to be more responsive during shutdown.
-            tokio::select! {
-                _ = stop_receiver.changed() => {
-                    tracing::info!("Stop signal received, metadata_calculator is shutting down");
-                    break;
-                }
-                () = delay => { /* The delay has passed */ }
-            }
-        }
-        Ok(())
-    }
-}
diff --git a/core/lib/zksync_core/src/proto/mod.proto b/core/lib/zksync_core/src/proto/mod.proto
deleted file mode 100644
index 7876c28c641e..000000000000
--- a/core/lib/zksync_core/src/proto/mod.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package zksync.core;
-
-import "zksync/core/consensus.proto";
-
-message Secrets {
-    optional consensus.Secrets consensus = 1; // optional
-}
diff --git a/core/lib/zksync_core/src/proto/mod.rs b/core/lib/zksync_core/src/proto/mod.rs
deleted file mode 100644
index 9f44835b29cf..000000000000
--- a/core/lib/zksync_core/src/proto/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![allow(warnings)]
-
-include!(concat!(env!("OUT_DIR"), "/src/proto/gen.rs"));
diff --git a/core/lib/zksync_core/src/utils/mod.rs b/core/lib/zksync_core/src/utils/mod.rs
deleted file mode 100644
index f2364dd1eff0..000000000000
--- a/core/lib/zksync_core/src/utils/mod.rs
+++ /dev/null
@@ -1,390 +0,0 @@
-//! Miscellaneous utils used by multiple components.
-
-use std::{
-    future::Future,
-    sync::atomic::{AtomicBool, Ordering},
-    time::Duration,
-};
-
-use anyhow::Context as _;
-use async_trait::async_trait;
-use tokio::sync::watch;
-use zksync_config::configs::chain::L1BatchCommitDataGeneratorMode;
-use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
-use zksync_eth_client::{CallFunctionArgs, ClientError, Error as EthClientError, EthInterface};
-use zksync_types::{Address, L1BatchNumber, ProtocolVersionId};
-
-/// Fallible and async predicate for binary search.
-#[async_trait]
-pub(crate) trait BinarySearchPredicate: Send {
-    type Error;
-
-    async fn eval(&mut self, argument: u32) -> Result<bool, Self::Error>;
-}
-
-#[async_trait]
-impl<F, Fut, E> BinarySearchPredicate for F
-where
-    F: Send + FnMut(u32) -> Fut,
-    Fut: Send + Future<Output = Result<bool, E>>,
-{
-    type Error = E;
-
-    async fn eval(&mut self, argument: u32) -> Result<bool, Self::Error> {
-        self(argument).await
-    }
-}
-
-/// Finds the greatest `u32` value for which `f` returns `true`.
-pub(crate) async fn binary_search_with<P: BinarySearchPredicate>(
-    mut left: u32,
-    mut right: u32,
-    mut predicate: P,
-) -> Result<u32, P::Error> {
-    while left + 1 < right {
-        let middle = (left + right) / 2;
-        if predicate.eval(middle).await? {
-            left = middle;
-        } else {
-            right = middle;
-        }
-    }
-    Ok(left)
-}
-
-/// Repeatedly polls the DB until there is an L1 batch. We may not have such a batch initially
-/// if the DB is recovered from an application-level snapshot.
-///
-/// Returns the number of the *earliest* L1 batch, or `None` if the stop signal is received.
-pub(crate) async fn wait_for_l1_batch(
-    pool: &ConnectionPool<Core>,
-    poll_interval: Duration,
-    stop_receiver: &mut watch::Receiver<bool>,
-) -> anyhow::Result<Option<L1BatchNumber>> {
-    tracing::debug!("Waiting for at least one L1 batch in db in DB");
-    loop {
-        if *stop_receiver.borrow() {
-            return Ok(None);
-        }
-
-        let mut storage = pool.connection().await?;
-        let sealed_l1_batch_number = storage.blocks_dal().get_earliest_l1_batch_number().await?;
-        drop(storage);
-
-        if let Some(number) = sealed_l1_batch_number {
-            return Ok(Some(number));
-        }
-
-        // We don't check the result: if a stop signal is received, we'll return at the start
-        // of the next iteration.
-        tokio::time::timeout(poll_interval, stop_receiver.changed())
-            .await
-            .ok();
-    }
-}
-
-/// Repeatedly polls the DB until there is an L1 batch with metadata. We may not have such a batch initially
-/// if the DB is recovered from an application-level snapshot.
-///
-/// Returns the number of the *earliest* L1 batch with metadata, or `None` if the stop signal is received.
-pub(crate) async fn wait_for_l1_batch_with_metadata(
-    pool: &ConnectionPool<Core>,
-    poll_interval: Duration,
-    stop_receiver: &mut watch::Receiver<bool>,
-) -> anyhow::Result<Option<L1BatchNumber>> {
-    loop {
-        if *stop_receiver.borrow() {
-            return Ok(None);
-        }
-
-        let mut storage = pool.connection().await?;
-        let sealed_l1_batch_number = storage
-            .blocks_dal()
-            .get_earliest_l1_batch_number_with_metadata()
-            .await?;
-        drop(storage);
-
-        if let Some(number) = sealed_l1_batch_number {
-            return Ok(Some(number));
-        }
-        tracing::debug!(
-            "No L1 batches with metadata are present in DB; trying again in {poll_interval:?}"
-        );
-        tokio::time::timeout(poll_interval, stop_receiver.changed())
-            .await
-            .ok();
-    }
-}
-
-/// Returns the projected number of the first locally available L1 batch. The L1 batch is **not**
-/// guaranteed to be present in the storage!
-pub(crate) async fn projected_first_l1_batch(
-    storage: &mut Connection<'_, Core>,
-) -> anyhow::Result<L1BatchNumber> {
-    let snapshot_recovery = storage
-        .snapshot_recovery_dal()
-        .get_applied_snapshot_status()
-        .await?;
-    Ok(snapshot_recovery.map_or(L1BatchNumber(0), |recovery| recovery.l1_batch_number + 1))
-}
-
-/// Obtains a protocol version projected to be applied for the next L2 block. This is either the version used by the last
-/// sealed L2 block, or (if there are no L2 blocks), one referenced in the snapshot recovery record.
-pub(crate) async fn pending_protocol_version(
-    storage: &mut Connection<'_, Core>,
-) -> anyhow::Result<ProtocolVersionId> {
-    static WARNED_ABOUT_NO_VERSION: AtomicBool = AtomicBool::new(false);
-
-    let last_l2_block = storage
-        .blocks_dal()
-        .get_last_sealed_l2_block_header()
-        .await?;
-    if let Some(last_l2_block) = last_l2_block {
-        return Ok(last_l2_block.protocol_version.unwrap_or_else(|| {
-            // Protocol version should be set for the most recent L2 block even in cases it's not filled
-            // for old L2 blocks, hence the warning. We don't want to rely on this assumption, so we treat
-            // the lack of it as in other similar places, replacing with the default value.
-            if !WARNED_ABOUT_NO_VERSION.fetch_or(true, Ordering::Relaxed) {
-                tracing::warn!("Protocol version not set for recent L2 block: {last_l2_block:?}");
-            }
-            ProtocolVersionId::last_potentially_undefined()
-        }));
-    }
-    // No L2 blocks in the storage; use snapshot recovery information.
-    let snapshot_recovery = storage
-        .snapshot_recovery_dal()
-        .get_applied_snapshot_status()
-        .await?
-        .context("storage contains neither L2 blocks, nor snapshot recovery info")?;
-    Ok(snapshot_recovery.protocol_version)
-}
-
-async fn get_pubdata_pricing_mode(
-    diamond_proxy_address: Address,
-    eth_client: &dyn EthInterface,
-) -> Result<L1BatchCommitDataGeneratorMode, EthClientError> {
-    CallFunctionArgs::new("getPubdataPricingMode", ())
-        .for_contract(
-            diamond_proxy_address,
-            &zksync_contracts::hyperchain_contract(),
-        )
-        .call(eth_client)
-        .await
-}
-
-pub async fn ensure_l1_batch_commit_data_generation_mode(
-    selected_l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
-    diamond_proxy_address: Address,
-    eth_client: &dyn EthInterface,
-) -> anyhow::Result<()> {
-    match get_pubdata_pricing_mode(diamond_proxy_address, eth_client).await {
-        // Getters contract support getPubdataPricingMode method
-        Ok(l1_contract_batch_commitment_mode) => {
-            anyhow::ensure!(
-                l1_contract_batch_commitment_mode == selected_l1_batch_commit_data_generator_mode,
-                "The selected L1BatchCommitDataGeneratorMode ({:?}) does not match the commitment mode used on L1 contract ({:?})",
-                selected_l1_batch_commit_data_generator_mode,
-                l1_contract_batch_commitment_mode
-            );
-
-            Ok(())
-        }
-        // Getters contract does not support getPubdataPricingMode method.
-        // This case is accepted for backwards compatibility with older contracts, but emits a
-        // warning in case the wrong contract address was passed by the caller.
-        Err(err @ EthClientError::EthereumGateway(ClientError::Call(_))) => {
-            tracing::warn!("Getters contract does not support getPubdataPricingMode method: {err}");
-            Ok(())
-        }
-        Err(err) => anyhow::bail!(err),
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::{mem, sync::Mutex};
-
-    use jsonrpsee::types::ErrorObject;
-    use zksync_eth_client::{clients::MockEthereum, ClientError};
-    use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
-    use zksync_types::{ethabi, U256};
-
-    use super::*;
-
-    #[tokio::test]
-    async fn test_binary_search() {
-        for divergence_point in [1, 50, 51, 100] {
-            let mut f = |x| async move { Ok::<_, ()>(x < divergence_point) };
-            let result = binary_search_with(0, 100, &mut f).await;
-            assert_eq!(result, Ok(divergence_point - 1));
-        }
-    }
-
-    #[tokio::test]
-    async fn waiting_for_l1_batch_success() {
-        let pool = ConnectionPool::<Core>::test_pool().await;
-        let (_stop_sender, mut stop_receiver) = watch::channel(false);
-
-        let pool_copy = pool.clone();
-        tokio::spawn(async move {
-            tokio::time::sleep(Duration::from_millis(25)).await;
-            let mut storage = pool_copy.connection().await.unwrap();
-            insert_genesis_batch(&mut storage, &GenesisParams::mock())
-                .await
-                .unwrap();
-        });
-
-        let l1_batch = wait_for_l1_batch(&pool, Duration::from_millis(10), &mut stop_receiver)
-            .await
-            .unwrap();
-        assert_eq!(l1_batch, Some(L1BatchNumber(0)));
-    }
-
-    #[tokio::test]
-    async fn waiting_for_l1_batch_cancellation() {
-        let pool = ConnectionPool::<Core>::test_pool().await;
-        let (stop_sender, mut stop_receiver) = watch::channel(false);
-
-        tokio::spawn(async move {
-            tokio::time::sleep(Duration::from_millis(25)).await;
-            stop_sender.send_replace(true);
-        });
-
-        let l1_batch = wait_for_l1_batch(&pool, Duration::from_secs(30), &mut stop_receiver)
-            .await
-            .unwrap();
-        assert_eq!(l1_batch, None);
-    }
-
-    fn mock_ethereum(token: ethabi::Token, err: Option<EthClientError>) -> MockEthereum {
-        let err_mutex = Mutex::new(err);
-        MockEthereum::default().with_fallible_call_handler(move |_, _| {
-            let err = mem::take(&mut *err_mutex.lock().unwrap());
-            if let Some(err) = err {
-                Err(err)
-            } else {
-                Ok(token.clone())
-            }
-        })
-    }
-
-    fn mock_ethereum_with_legacy_contract() -> MockEthereum {
-        let call_err = ErrorObject::owned(3, "execution reverted: F", None::<()>);
-        let err = EthClientError::EthereumGateway(ClientError::Call(call_err));
-        mock_ethereum(ethabi::Token::Uint(U256::zero()), Some(err))
-    }
-
-    fn mock_ethereum_with_transport_error() -> MockEthereum {
-        let err =
-            EthClientError::EthereumGateway(ClientError::Transport(anyhow::anyhow!("unreachable")));
-        mock_ethereum(ethabi::Token::Uint(U256::zero()), Some(err))
-    }
-
-    fn mock_ethereum_with_rollup_contract() -> MockEthereum {
-        mock_ethereum(ethabi::Token::Uint(U256::zero()), None)
-    }
-
-    fn mock_ethereum_with_validium_contract() -> MockEthereum {
-        mock_ethereum(ethabi::Token::Uint(U256::one()), None)
-    }
-
-    #[tokio::test]
-    async fn ensure_l1_batch_commit_data_generation_mode_succeeds_when_both_match() {
-        let addr = Address::repeat_byte(0x01);
-        ensure_l1_batch_commit_data_generation_mode(
-            L1BatchCommitDataGeneratorMode::Rollup,
-            addr,
-            &mock_ethereum_with_rollup_contract(),
-        )
-        .await
-        .unwrap();
-
-        ensure_l1_batch_commit_data_generation_mode(
-            L1BatchCommitDataGeneratorMode::Validium,
-            addr,
-            &mock_ethereum_with_validium_contract(),
-        )
-        .await
-        .unwrap();
-    }
-
-    #[tokio::test]
-    async fn ensure_l1_batch_commit_data_generation_mode_succeeds_on_legacy_contracts() {
-        let addr = Address::repeat_byte(0x01);
-        ensure_l1_batch_commit_data_generation_mode(
-            L1BatchCommitDataGeneratorMode::Rollup,
-            addr,
-            &mock_ethereum_with_legacy_contract(),
-        )
-        .await
-        .unwrap();
-
-        ensure_l1_batch_commit_data_generation_mode(
-            L1BatchCommitDataGeneratorMode::Validium,
-            addr,
-            &mock_ethereum_with_legacy_contract(),
-        )
-        .await
-        .unwrap();
-    }
-
-    #[tokio::test]
-    async fn ensure_l1_batch_commit_data_generation_mode_fails_on_mismatch() {
-        let addr = Address::repeat_byte(0x01);
-        let err = ensure_l1_batch_commit_data_generation_mode(
-            L1BatchCommitDataGeneratorMode::Validium,
-            addr,
-            &mock_ethereum_with_rollup_contract(),
-        )
-        .await
-        .unwrap_err()
-        .to_string();
-        assert!(err.contains("commitment mode"), "{err}");
-
-        let err = ensure_l1_batch_commit_data_generation_mode(
-            L1BatchCommitDataGeneratorMode::Rollup,
-            addr,
-            &mock_ethereum_with_validium_contract(),
-        )
-        .await
-        .unwrap_err()
-        .to_string();
-        assert!(err.contains("commitment mode"), "{err}");
-    }
-
-    #[tokio::test]
-    async fn ensure_l1_batch_commit_data_generation_mode_fails_on_request_failure() {
-        let addr = Address::repeat_byte(0x01);
-        let err = ensure_l1_batch_commit_data_generation_mode(
-            L1BatchCommitDataGeneratorMode::Rollup,
-            addr,
-            &mock_ethereum_with_transport_error(),
-        )
-        .await
-        .unwrap_err();
-
-        assert!(
-            err.chain().any(|cause| cause.is::<ClientError>()),
-            "{err:?}"
-        );
-    }
-
-    #[tokio::test]
-    async fn ensure_l1_batch_commit_data_generation_mode_fails_on_parse_error() {
-        let addr = Address::repeat_byte(0x01);
-
-        let err = ensure_l1_batch_commit_data_generation_mode(
-            L1BatchCommitDataGeneratorMode::Rollup,
-            addr,
-            &mock_ethereum(ethabi::Token::String("what".into()), None),
-        )
-        .await
-        .unwrap_err()
-        .to_string();
-
-        assert!(
-            err.contains("L1BatchCommitDataGeneratorMode::from_tokens"),
-            "{err}",
-        );
-    }
-}
diff --git a/core/lib/zksync_core_leftovers/Cargo.toml b/core/lib/zksync_core_leftovers/Cargo.toml
new file mode 100644
index 000000000000..83e22fc6a5eb
--- /dev/null
+++ b/core/lib/zksync_core_leftovers/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "zksync_core_leftovers"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_dal.workspace = true
+zksync_config.workspace = true
+zksync_protobuf.workspace = true
+zksync_node_genesis.workspace = true
+
+anyhow.workspace = true
+tokio = { workspace = true, features = ["time"] }
+serde_yaml.workspace = true
+ctrlc.workspace = true
diff --git a/core/lib/zksync_core_leftovers/src/lib.rs b/core/lib/zksync_core_leftovers/src/lib.rs
new file mode 100644
index 000000000000..a665c40babd9
--- /dev/null
+++ b/core/lib/zksync_core_leftovers/src/lib.rs
@@ -0,0 +1,141 @@
+#![allow(clippy::upper_case_acronyms, clippy::derive_partial_eq_without_eq)]
+
+use std::str::FromStr;
+
+use anyhow::Context as _;
+use tokio::sync::oneshot;
+use zksync_config::{configs::DatabaseSecrets, GenesisConfig};
+use zksync_dal::{ConnectionPool, Core, CoreDal as _};
+use zksync_node_genesis::{ensure_genesis_state, GenesisParams};
+
+pub mod temp_config_store;
+
+/// Inserts the initial information about ZKsync tokens into the database.
+pub async fn genesis_init(
+    genesis_config: GenesisConfig,
+    database_secrets: &DatabaseSecrets,
+) -> anyhow::Result<()> {
+    let db_url = database_secrets.master_url()?;
+    let pool = ConnectionPool::<Core>::singleton(db_url)
+        .build()
+        .await
+        .context("failed to build connection_pool")?;
+    let mut storage = pool.connection().await.context("connection()")?;
+
+    let params = GenesisParams::load_genesis_params(genesis_config)?;
+    ensure_genesis_state(&mut storage, &params).await?;
+
+    Ok(())
+}
+
+pub async fn is_genesis_needed(database_secrets: &DatabaseSecrets) -> bool {
+    let db_url = database_secrets.master_url().unwrap();
+    let pool = ConnectionPool::<Core>::singleton(db_url)
+        .build()
+        .await
+        .expect("failed to build connection_pool");
+    let mut storage = pool.connection().await.expect("connection()");
+    storage.blocks_dal().is_genesis_needed().await.unwrap()
+}
+
+/// Sets up an interrupt handler and returns a future that resolves once an interrupt signal
+/// is received.
+pub fn setup_sigint_handler() -> oneshot::Receiver<()> {
+    let (sigint_sender, sigint_receiver) = oneshot::channel();
+    let mut sigint_sender = Some(sigint_sender);
+    ctrlc::set_handler(move || {
+        if let Some(sigint_sender) = sigint_sender.take() {
+            sigint_sender.send(()).ok();
+            // ^ The send fails if `sigint_receiver` is dropped. We're OK with this,
+            // since at this point the node should be stopping anyway, or is not interested
+            // in listening to interrupt signals.
+        }
+    })
+    .expect("Error setting Ctrl+C handler");
+
+    sigint_receiver
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Component {
+    /// Public Web3 API running on HTTP server.
+    HttpApi,
+    /// Public Web3 API (including PubSub) running on WebSocket server.
+    WsApi,
+    /// REST API for contract verification.
+    ContractVerificationApi,
+    /// Metadata calculator.
+    Tree,
+    /// Merkle tree API.
+    TreeApi,
+    EthWatcher,
+    /// Eth tx generator.
+    EthTxAggregator,
+    /// Manager for eth tx.
+    EthTxManager,
+    /// State keeper.
+    StateKeeper,
+    /// Produces input for the TEE verifier.
+    /// The blob is later used as input for TEE verifier.
+    TeeVerifierInputProducer,
+    /// Component for housekeeping task such as cleaning blobs from GCS, reporting metrics etc.
+    Housekeeper,
+    /// Component for exposing APIs to prover for providing proof generation data and accepting proofs.
+    ProofDataHandler,
+    /// Component generating BFT consensus certificates for L2 blocks.
+    Consensus,
+    /// Component generating commitment for L1 batches.
+    CommitmentGenerator,
+    /// Component sending a pubdata to the DA layers.
+    DADispatcher,
+    /// VM runner-based component that saves protective reads to Postgres.
+    VmRunnerProtectiveReads,
+    /// A component to fetch and persist ETH<->BaseToken conversion ratios for chains with custom base tokens.
+    BaseTokenRatioPersister,
+}
+
+#[derive(Debug)]
+pub struct Components(pub Vec<Component>);
+
+impl FromStr for Components {
+    type Err = String;
+
+    fn from_str(s: &str) -> Result<Components, String> {
+        match s {
+            "api" => Ok(Components(vec![
+                Component::HttpApi,
+                Component::WsApi,
+                Component::ContractVerificationApi,
+            ])),
+            "http_api" => Ok(Components(vec![Component::HttpApi])),
+            "ws_api" => Ok(Components(vec![Component::WsApi])),
+            "contract_verification_api" => Ok(Components(vec![Component::ContractVerificationApi])),
+            "tree" => Ok(Components(vec![Component::Tree])),
+            "tree_api" => Ok(Components(vec![Component::TreeApi])),
+            "state_keeper" => Ok(Components(vec![Component::StateKeeper])),
+            "housekeeper" => Ok(Components(vec![Component::Housekeeper])),
+            "tee_verifier_input_producer" => {
+                Ok(Components(vec![Component::TeeVerifierInputProducer]))
+            }
+            "eth" => Ok(Components(vec![
+                Component::EthWatcher,
+                Component::EthTxAggregator,
+                Component::EthTxManager,
+            ])),
+            "eth_watcher" => Ok(Components(vec![Component::EthWatcher])),
+            "eth_tx_aggregator" => Ok(Components(vec![Component::EthTxAggregator])),
+            "eth_tx_manager" => Ok(Components(vec![Component::EthTxManager])),
+            "proof_data_handler" => Ok(Components(vec![Component::ProofDataHandler])),
+            "consensus" => Ok(Components(vec![Component::Consensus])),
+            "commitment_generator" => Ok(Components(vec![Component::CommitmentGenerator])),
+            "da_dispatcher" => Ok(Components(vec![Component::DADispatcher])),
+            "vm_runner_protective_reads" => {
+                Ok(Components(vec![Component::VmRunnerProtectiveReads]))
+            }
+            "base_token_ratio_persister" => {
+                Ok(Components(vec![Component::BaseTokenRatioPersister]))
+            }
+            other => Err(format!("{} is not a valid component name", other)),
+        }
+    }
+}
diff --git a/core/lib/zksync_core/src/temp_config_store/mod.rs b/core/lib/zksync_core_leftovers/src/temp_config_store/mod.rs
similarity index 73%
rename from core/lib/zksync_core/src/temp_config_store/mod.rs
rename to core/lib/zksync_core_leftovers/src/temp_config_store/mod.rs
index 958cd4b0c68f..3b4c8a53b84f 100644
--- a/core/lib/zksync_core/src/temp_config_store/mod.rs
+++ b/core/lib/zksync_core_leftovers/src/temp_config_store/mod.rs
@@ -1,4 +1,6 @@
-use anyhow::Context as _;
+use std::path::PathBuf;
+
+use anyhow::Context;
 use zksync_config::{
     configs::{
         api::{HealthCheckConfig, MerkleTreeApiConfig, Web3JsonRpcConfig},
@@ -6,38 +8,35 @@ use zksync_config::{
             CircuitBreakerConfig, MempoolConfig, NetworkConfig, OperationsManagerConfig,
             StateKeeperConfig,
         },
-        consensus::ConsensusSecrets,
         fri_prover_group::FriProverGroupConfig,
         house_keeper::HouseKeeperConfig,
         wallets::{AddressWallet, EthSender, StateKeeper, Wallet, Wallets},
-        FriProofCompressorConfig, FriProverConfig, FriProverGatewayConfig,
-        FriWitnessGeneratorConfig, FriWitnessVectorGeneratorConfig, GeneralConfig,
-        ObservabilityConfig, PrometheusConfig, ProofDataHandlerConfig,
+        CommitmentGeneratorConfig, FriProofCompressorConfig, FriProverConfig,
+        FriProverGatewayConfig, FriWitnessGeneratorConfig, FriWitnessVectorGeneratorConfig,
+        GeneralConfig, ObservabilityConfig, PrometheusConfig, ProofDataHandlerConfig,
+        ProtectiveReadsWriterConfig, PruningConfig, SnapshotRecoveryConfig,
     },
-    ApiConfig, ContractVerifierConfig, DBConfig, EthConfig, EthWatchConfig, GasAdjusterConfig,
-    ObjectStoreConfig, PostgresConfig, SnapshotsCreatorConfig,
+    ApiConfig, BaseTokenAdjusterConfig, ContractVerifierConfig, DADispatcherConfig, DBConfig,
+    EthConfig, EthWatchConfig, GasAdjusterConfig, ObjectStoreConfig, PostgresConfig,
+    SnapshotsCreatorConfig,
 };
-use zksync_protobuf::{repr::ProtoRepr, ProtoFmt};
-use zksync_protobuf_config::read_optional_repr;
-
-use crate::proto;
-
-pub fn decode_yaml<T: ProtoFmt>(yaml: &str) -> anyhow::Result<T> {
-    let d = serde_yaml::Deserializer::from_str(yaml);
-    let this: T = zksync_protobuf::serde::deserialize(d)?;
-    Ok(this)
-}
+use zksync_protobuf::repr::ProtoRepr;
 
 pub fn decode_yaml_repr<T: ProtoRepr>(yaml: &str) -> anyhow::Result<T::Type> {
     let d = serde_yaml::Deserializer::from_str(yaml);
     let this: T = zksync_protobuf::serde::deserialize_proto_with_options(d, false)?;
     this.read()
 }
-//
+
+pub fn read_yaml_repr<T: ProtoRepr>(path_buf: PathBuf) -> anyhow::Result<T::Type> {
+    let yaml = std::fs::read_to_string(path_buf).context("failed reading YAML config")?;
+    decode_yaml_repr::<T>(&yaml)
+}
+
 // TODO (QIT-22): This structure is going to be removed when components will be responsible for their own configs.
 /// A temporary config store allowing to pass deserialized configs from `zksync_server` to `zksync_core`.
 /// All the configs are optional, since for some component combination it is not needed to pass all the configs.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Default)]
 pub struct TempConfigStore {
     pub postgres_config: Option<PostgresConfig>,
     pub health_check_config: Option<HealthCheckConfig>,
@@ -63,29 +62,15 @@ pub struct TempConfigStore {
     pub eth_sender_config: Option<EthConfig>,
     pub eth_watch_config: Option<EthWatchConfig>,
     pub gas_adjuster_config: Option<GasAdjusterConfig>,
-    pub object_store_config: Option<ObjectStoreConfig>,
     pub observability: Option<ObservabilityConfig>,
     pub snapshot_creator: Option<SnapshotsCreatorConfig>,
-}
-
-#[derive(Debug)]
-pub struct Secrets {
-    pub consensus: Option<ConsensusSecrets>,
-}
-
-impl ProtoFmt for Secrets {
-    type Proto = proto::Secrets;
-    fn read(r: &Self::Proto) -> anyhow::Result<Self> {
-        Ok(Self {
-            consensus: read_optional_repr(&r.consensus).context("consensus")?,
-        })
-    }
-
-    fn build(&self) -> Self::Proto {
-        Self::Proto {
-            consensus: self.consensus.as_ref().map(ProtoRepr::build),
-        }
-    }
+    pub da_dispatcher_config: Option<DADispatcherConfig>,
+    pub protective_reads_writer_config: Option<ProtectiveReadsWriterConfig>,
+    pub core_object_store: Option<ObjectStoreConfig>,
+    pub base_token_adjuster_config: Option<BaseTokenAdjusterConfig>,
+    pub commitment_generator: Option<CommitmentGeneratorConfig>,
+    pub pruning: Option<PruningConfig>,
+    pub snapshot_recovery: Option<SnapshotRecoveryConfig>,
 }
 
 impl TempConfigStore {
@@ -111,6 +96,13 @@ impl TempConfigStore {
             eth: self.eth_sender_config.clone(),
             snapshot_creator: self.snapshot_creator.clone(),
             observability: self.observability.clone(),
+            da_dispatcher_config: self.da_dispatcher_config.clone(),
+            protective_reads_writer_config: self.protective_reads_writer_config.clone(),
+            core_object_store: self.core_object_store.clone(),
+            base_token_adjuster: self.base_token_adjuster_config.clone(),
+            commitment_generator: self.commitment_generator.clone(),
+            snapshot_recovery: self.snapshot_recovery.clone(),
+            pruning: self.pruning.clone(),
         }
     }
 
diff --git a/core/node/api_server/Cargo.toml b/core/node/api_server/Cargo.toml
new file mode 100644
index 000000000000..9a026846f003
--- /dev/null
+++ b/core/node/api_server/Cargo.toml
@@ -0,0 +1,60 @@
+[package]
+name = "zksync_node_api_server"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_config.workspace = true
+zksync_contracts.workspace = true
+zksync_types.workspace = true
+zksync_dal.workspace = true
+zksync_node_sync.workspace = true
+zksync_health_check.workspace = true
+zksync_node_fee_model.workspace = true
+zksync_state_keeper.workspace = true
+zksync_shared_metrics.workspace = true
+zksync_state.workspace = true
+zksync_system_constants.workspace = true
+zksync_metadata_calculator.workspace = true
+zksync_web3_decl = { workspace = true, features = ["server"] }
+zksync_utils.workspace = true
+zksync_protobuf.workspace = true
+zksync_mini_merkle_tree.workspace = true
+zksync_multivm.workspace = true
+vise.workspace = true
+
+anyhow.workspace = true
+async-trait.workspace = true
+axum.workspace = true
+chrono.workspace = true
+futures.workspace = true
+tokio = { workspace = true, features = ["rt", "time"] }
+tracing.workspace = true
+thiserror.workspace = true
+once_cell.workspace = true
+rand.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+itertools.workspace = true
+thread_local.workspace = true
+governor.workspace = true
+pin-project-lite.workspace = true
+hex.workspace = true
+http.workspace = true
+tower.workspace = true
+strum = { workspace = true, features = ["derive"] }
+tower-http = { workspace = true, features = ["cors", "metrics"] }
+lru.workspace = true
+
+[dev-dependencies]
+zksync_node_genesis.workspace = true
+zksync_node_test_utils.workspace = true
+
+assert_matches.workspace = true
+test-casing.workspace = true
diff --git a/core/node/api_server/README.md b/core/node/api_server/README.md
new file mode 100644
index 000000000000..27dbb57b2c89
--- /dev/null
+++ b/core/node/api_server/README.md
@@ -0,0 +1,3 @@
+# `zksync_node_api_server`
+
+Implementation of Web3 API used by ZK Stack nodes.
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/apply.rs b/core/node/api_server/src/execution_sandbox/apply.rs
similarity index 97%
rename from core/lib/zksync_core/src/api_server/execution_sandbox/apply.rs
rename to core/node/api_server/src/execution_sandbox/apply.rs
index d3af1a5c9dd4..0d607311a445 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/apply.rs
+++ b/core/node/api_server/src/execution_sandbox/apply.rs
@@ -9,14 +9,14 @@
 use std::time::{Duration, Instant};
 
 use anyhow::Context as _;
-use multivm::{
+use tokio::runtime::Handle;
+use zksync_dal::{Connection, ConnectionPool, Core, CoreDal, DalError};
+use zksync_multivm::{
     interface::{L1BatchEnv, L2BlockEnv, SystemEnv, VmInterface},
     utils::adjust_pubdata_price_for_tx,
     vm_latest::{constants::BATCH_COMPUTATIONAL_GAS_LIMIT, HistoryDisabled},
     VmInstance,
 };
-use tokio::runtime::Handle;
-use zksync_dal::{Connection, ConnectionPool, Core, CoreDal, DalError};
 use zksync_state::{PostgresStorage, ReadStorage, StoragePtr, StorageView, WriteStorage};
 use zksync_system_constants::{
     SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION,
@@ -366,7 +366,7 @@ impl StoredL2BlockInfo {
         );
         let l2_block_info = connection
             .storage_web3_dal()
-            .get_historical_value_unchecked(&l2_block_info_key, l2_block_number)
+            .get_historical_value_unchecked(l2_block_info_key.hashed_key(), l2_block_number)
             .await
             .context("failed reading L2 block info from VM state")?;
         let (l2_block_number_from_state, l2_block_timestamp) =
@@ -378,7 +378,10 @@ impl StoredL2BlockInfo {
         );
         let txs_rolling_hash = connection
             .storage_web3_dal()
-            .get_historical_value_unchecked(&l2_block_txs_rolling_hash_key, l2_block_number)
+            .get_historical_value_unchecked(
+                l2_block_txs_rolling_hash_key.hashed_key(),
+                l2_block_number,
+            )
             .await
             .context("failed reading transaction rolling hash from VM state")?;
 
@@ -403,12 +406,12 @@ impl StoredL2BlockInfo {
 }
 
 #[derive(Debug)]
-struct ResolvedBlockInfo {
+pub(crate) struct ResolvedBlockInfo {
     state_l2_block_number: L2BlockNumber,
     state_l2_block_hash: H256,
     vm_l1_batch_number: L1BatchNumber,
     l1_batch_timestamp: u64,
-    protocol_version: ProtocolVersionId,
+    pub(crate) protocol_version: ProtocolVersionId,
     historical_fee_input: Option<BatchFeeInput>,
 }
 
@@ -429,7 +432,7 @@ impl BlockArgs {
         )
     }
 
-    async fn resolve_block_info(
+    pub(crate) async fn resolve_block_info(
         &self,
         connection: &mut Connection<'_, Core>,
     ) -> anyhow::Result<ResolvedBlockInfo> {
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/error.rs b/core/node/api_server/src/execution_sandbox/error.rs
similarity index 98%
rename from core/lib/zksync_core/src/api_server/execution_sandbox/error.rs
rename to core/node/api_server/src/execution_sandbox/error.rs
index 9d6d635a344c..5d63d50a3c85 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/error.rs
+++ b/core/node/api_server/src/execution_sandbox/error.rs
@@ -1,5 +1,5 @@
-use multivm::interface::{Halt, TxRevertReason};
 use thiserror::Error;
+use zksync_multivm::interface::{Halt, TxRevertReason};
 
 #[derive(Debug, Error)]
 pub(crate) enum SandboxExecutionError {
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/execute.rs b/core/node/api_server/src/execution_sandbox/execute.rs
similarity index 85%
rename from core/lib/zksync_core/src/api_server/execution_sandbox/execute.rs
rename to core/node/api_server/src/execution_sandbox/execute.rs
index afdfbffd6fc8..d15cf7a91439 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/execute.rs
+++ b/core/node/api_server/src/execution_sandbox/execute.rs
@@ -1,22 +1,22 @@
 //! Implementation of "executing" methods, e.g. `eth_call`.
 
 use anyhow::Context as _;
-use multivm::{
+use tracing::{span, Level};
+use zksync_dal::{ConnectionPool, Core};
+use zksync_multivm::{
     interface::{TxExecutionMode, VmExecutionResultAndLogs, VmInterface},
     tracers::StorageInvocations,
-    vm_latest::constants::ETH_CALL_GAS_LIMIT,
     MultiVMTracer,
 };
-use tracing::{span, Level};
-use zksync_dal::{ConnectionPool, Core};
 use zksync_types::{
-    fee::TransactionExecutionMetrics, l2::L2Tx, ExecuteTransactionCommon, Nonce,
-    PackedEthSignature, Transaction, U256,
+    fee::TransactionExecutionMetrics, l2::L2Tx, transaction_request::CallOverrides,
+    ExecuteTransactionCommon, Nonce, PackedEthSignature, Transaction, U256,
 };
 
-#[cfg(test)]
-use super::testonly::MockTransactionExecutor;
-use super::{apply, vm_metrics, ApiTracer, BlockArgs, TxSharedArgs, VmPermit};
+use super::{
+    apply, testonly::MockTransactionExecutor, vm_metrics, ApiTracer, BlockArgs, TxSharedArgs,
+    VmPermit,
+};
 
 #[derive(Debug)]
 pub(crate) struct TxExecutionArgs {
@@ -39,7 +39,7 @@ impl TxExecutionArgs {
     }
 
     fn for_eth_call(
-        enforced_base_fee: u64,
+        enforced_base_fee: Option<u64>,
         vm_execution_cache_misses_limit: Option<usize>,
     ) -> Self {
         let missed_storage_invocation_limit = vm_execution_cache_misses_limit.unwrap_or(usize::MAX);
@@ -47,7 +47,7 @@ impl TxExecutionArgs {
             execution_mode: TxExecutionMode::EthCall,
             enforced_nonce: None,
             added_balance: U256::zero(),
-            enforced_base_fee: Some(enforced_base_fee),
+            enforced_base_fee,
             missed_storage_invocation_limit,
         }
     }
@@ -90,7 +90,7 @@ pub(crate) struct TransactionExecutionOutput {
 #[derive(Debug)]
 pub(crate) enum TransactionExecutor {
     Real,
-    #[cfg(test)]
+    #[doc(hidden)] // Intended for tests only
     Mock(MockTransactionExecutor),
 }
 
@@ -113,16 +113,11 @@ impl TransactionExecutor {
         block_args: BlockArgs,
         custom_tracers: Vec<ApiTracer>,
     ) -> anyhow::Result<TransactionExecutionOutput> {
-        #[cfg(test)]
         if let Self::Mock(mock_executor) = self {
             return mock_executor.execute_tx(&tx, &block_args);
         }
 
-        let total_factory_deps = tx
-            .execute
-            .factory_deps
-            .as_ref()
-            .map_or(0, |deps| deps.len() as u16);
+        let total_factory_deps = tx.execute.factory_deps.len() as u16;
 
         let (published_bytecodes, execution_result) = tokio::task::spawn_blocking(move || {
             let span = span!(Level::DEBUG, "execute_in_sandbox").entered();
@@ -170,23 +165,21 @@ impl TransactionExecutor {
         vm_permit: VmPermit,
         shared_args: TxSharedArgs,
         connection_pool: ConnectionPool<Core>,
+        call_overrides: CallOverrides,
         mut tx: L2Tx,
         block_args: BlockArgs,
         vm_execution_cache_misses_limit: Option<usize>,
         custom_tracers: Vec<ApiTracer>,
     ) -> anyhow::Result<VmExecutionResultAndLogs> {
-        let enforced_base_fee = tx.common_data.fee.max_fee_per_gas.as_u64();
-        let execution_args =
-            TxExecutionArgs::for_eth_call(enforced_base_fee, vm_execution_cache_misses_limit);
+        let execution_args = TxExecutionArgs::for_eth_call(
+            call_overrides.enforced_base_fee,
+            vm_execution_cache_misses_limit,
+        );
 
         if tx.common_data.signature.is_empty() {
             tx.common_data.signature = PackedEthSignature::default().serialize_packed().into();
         }
 
-        // Protection against infinite-loop eth_calls and alike:
-        // limiting the amount of gas the call can use.
-        // We can't use `BLOCK_ERGS_LIMIT` here since the VM itself has some overhead.
-        tx.common_data.fee.gas_limit = ETH_CALL_GAS_LIMIT.into();
         let output = self
             .execute_tx_in_sandbox(
                 vm_permit,
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/mod.rs b/core/node/api_server/src/execution_sandbox/mod.rs
similarity index 99%
rename from core/lib/zksync_core/src/api_server/execution_sandbox/mod.rs
rename to core/node/api_server/src/execution_sandbox/mod.rs
index 42de8e285d91..72c6ba9789f5 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/mod.rs
+++ b/core/node/api_server/src/execution_sandbox/mod.rs
@@ -26,8 +26,7 @@ use super::tx_sender::MultiVMBaseSystemContracts;
 mod apply;
 mod error;
 mod execute;
-#[cfg(test)]
-pub(super) mod testonly;
+pub mod testonly;
 #[cfg(test)]
 mod tests;
 mod tracers;
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/testonly.rs b/core/node/api_server/src/execution_sandbox/testonly.rs
similarity index 86%
rename from core/lib/zksync_core/src/api_server/execution_sandbox/testonly.rs
rename to core/node/api_server/src/execution_sandbox/testonly.rs
index 8662101d5068..673c30b9f17e 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/testonly.rs
+++ b/core/node/api_server/src/execution_sandbox/testonly.rs
@@ -1,6 +1,6 @@
 use std::fmt;
 
-use multivm::interface::{ExecutionResult, VmExecutionResultAndLogs};
+use zksync_multivm::interface::{ExecutionResult, VmExecutionResultAndLogs};
 use zksync_types::{
     fee::TransactionExecutionMetrics, l2::L2Tx, ExecuteTransactionCommon, Transaction,
 };
@@ -13,7 +13,7 @@ use super::{
 
 type TxResponseFn = dyn Fn(&Transaction, &BlockArgs) -> VmExecutionResultAndLogs + Send + Sync;
 
-pub(crate) struct MockTransactionExecutor {
+pub struct MockTransactionExecutor {
     call_responses: Box<TxResponseFn>,
     tx_responses: Box<TxResponseFn>,
 }
@@ -43,20 +43,23 @@ impl Default for MockTransactionExecutor {
 }
 
 impl MockTransactionExecutor {
-    pub fn set_call_responses<F>(&mut self, responses: F)
+    #[cfg(test)]
+    pub(crate) fn set_call_responses<F>(&mut self, responses: F)
     where
         F: Fn(&Transaction, &BlockArgs) -> ExecutionResult + 'static + Send + Sync,
     {
         self.call_responses = self.wrap_responses(responses);
     }
 
-    pub fn set_tx_responses<F>(&mut self, responses: F)
+    #[cfg(test)]
+    pub(crate) fn set_tx_responses<F>(&mut self, responses: F)
     where
         F: Fn(&Transaction, &BlockArgs) -> ExecutionResult + 'static + Send + Sync,
     {
         self.tx_responses = self.wrap_responses(responses);
     }
 
+    #[cfg(test)]
     fn wrap_responses<F>(&mut self, responses: F) -> Box<TxResponseFn>
     where
         F: Fn(&Transaction, &BlockArgs) -> ExecutionResult + 'static + Send + Sync,
@@ -73,14 +76,19 @@ impl MockTransactionExecutor {
         )
     }
 
-    pub fn set_tx_responses_with_logs<F>(&mut self, responses: F)
+    #[cfg(test)]
+    pub(crate) fn set_tx_responses_with_logs<F>(&mut self, responses: F)
     where
         F: Fn(&Transaction, &BlockArgs) -> VmExecutionResultAndLogs + 'static + Send + Sync,
     {
         self.tx_responses = Box::new(responses);
     }
 
-    pub fn validate_tx(&self, tx: L2Tx, block_args: &BlockArgs) -> Result<(), ValidationError> {
+    pub(crate) fn validate_tx(
+        &self,
+        tx: L2Tx,
+        block_args: &BlockArgs,
+    ) -> Result<(), ValidationError> {
         let result = (self.tx_responses)(&tx.into(), block_args);
         match result.result {
             ExecutionResult::Success { .. } => Ok(()),
@@ -90,7 +98,7 @@ impl MockTransactionExecutor {
         }
     }
 
-    pub fn execute_tx(
+    pub(crate) fn execute_tx(
         &self,
         tx: &Transaction,
         block_args: &BlockArgs,
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/tests.rs b/core/node/api_server/src/execution_sandbox/tests.rs
similarity index 96%
rename from core/lib/zksync_core/src/api_server/execution_sandbox/tests.rs
rename to core/node/api_server/src/execution_sandbox/tests.rs
index a3e6bb6ad0cf..e479066cacc2 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/tests.rs
+++ b/core/node/api_server/src/execution_sandbox/tests.rs
@@ -6,7 +6,7 @@ use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
 use zksync_node_test_utils::{create_l2_block, create_l2_transaction, prepare_recovery_snapshot};
 
 use super::*;
-use crate::api_server::{execution_sandbox::apply::apply_vm_in_sandbox, tx_sender::ApiContracts};
+use crate::{execution_sandbox::apply::apply_vm_in_sandbox, tx_sender::ApiContracts};
 
 #[tokio::test]
 async fn creating_block_args() {
@@ -185,11 +185,11 @@ async fn test_instantiating_vm(pool: ConnectionPool<Core>, block_args: BlockArgs
     let (vm_concurrency_limiter, _) = VmConcurrencyLimiter::new(1);
     let vm_permit = vm_concurrency_limiter.acquire().await.unwrap();
     let transaction = create_l2_transaction(10, 100).into();
-
+    let estimate_gas_contracts = ApiContracts::load_from_disk().await.unwrap().estimate_gas;
     tokio::task::spawn_blocking(move || {
         apply_vm_in_sandbox(
             vm_permit,
-            TxSharedArgs::mock(ApiContracts::load_from_disk().estimate_gas),
+            TxSharedArgs::mock(estimate_gas_contracts),
             true,
             &TxExecutionArgs::for_gas_estimate(None, &transaction, 123),
             &pool,
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/tracers.rs b/core/node/api_server/src/execution_sandbox/tracers.rs
similarity index 73%
rename from core/lib/zksync_core/src/api_server/execution_sandbox/tracers.rs
rename to core/node/api_server/src/execution_sandbox/tracers.rs
index 2b969e380dd2..ba258ab7c74a 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/tracers.rs
+++ b/core/node/api_server/src/execution_sandbox/tracers.rs
@@ -1,7 +1,9 @@
 use std::sync::Arc;
 
-use multivm::{tracers::CallTracer, vm_latest::HistoryMode, MultiVMTracer, MultiVmTracerPointer};
 use once_cell::sync::OnceCell;
+use zksync_multivm::{
+    tracers::CallTracer, vm_latest::HistoryMode, MultiVMTracer, MultiVmTracerPointer,
+};
 use zksync_state::WriteStorage;
 use zksync_types::vm_trace::Call;
 
@@ -14,7 +16,7 @@ pub(crate) enum ApiTracer {
 impl ApiTracer {
     pub fn into_boxed<
         S: WriteStorage,
-        H: HistoryMode + multivm::HistoryMode<Vm1_5_0 = H> + 'static,
+        H: HistoryMode + zksync_multivm::HistoryMode<Vm1_5_0 = H> + 'static,
     >(
         self,
     ) -> MultiVmTracerPointer<S, H> {
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/validate.rs b/core/node/api_server/src/execution_sandbox/validate.rs
similarity index 99%
rename from core/lib/zksync_core/src/api_server/execution_sandbox/validate.rs
rename to core/node/api_server/src/execution_sandbox/validate.rs
index 5540fa3ec36a..958fbc8a0742 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/validate.rs
+++ b/core/node/api_server/src/execution_sandbox/validate.rs
@@ -1,7 +1,8 @@
 use std::collections::HashSet;
 
 use anyhow::Context as _;
-use multivm::{
+use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
+use zksync_multivm::{
     interface::{ExecutionResult, VmExecutionMode, VmInterface},
     tracers::{
         validator::{self, ValidationTracer, ValidationTracerParams},
@@ -10,7 +11,6 @@ use multivm::{
     vm_latest::HistoryDisabled,
     MultiVMTracer,
 };
-use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
 use zksync_types::{l2::L2Tx, Address, Transaction, TRUSTED_ADDRESS_SLOTS, TRUSTED_TOKEN_SLOTS};
 
 use super::{
@@ -40,7 +40,6 @@ impl TransactionExecutor {
         block_args: BlockArgs,
         computational_gas_limit: u32,
     ) -> Result<(), ValidationError> {
-        #[cfg(test)]
         if let Self::Mock(mock) = self {
             return mock.validate_tx(tx, &block_args);
         }
diff --git a/core/lib/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs b/core/node/api_server/src/execution_sandbox/vm_metrics.rs
similarity index 96%
rename from core/lib/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs
rename to core/node/api_server/src/execution_sandbox/vm_metrics.rs
index 6c1f92ed68b4..e1e96d8eee5e 100644
--- a/core/lib/zksync_core/src/api_server/execution_sandbox/vm_metrics.rs
+++ b/core/node/api_server/src/execution_sandbox/vm_metrics.rs
@@ -1,9 +1,9 @@
 use std::time::Duration;
 
-use multivm::interface::{VmExecutionResultAndLogs, VmMemoryMetrics};
 use vise::{
     Buckets, EncodeLabelSet, EncodeLabelValue, Family, Gauge, Histogram, LatencyObserver, Metrics,
 };
+use zksync_multivm::interface::{VmExecutionResultAndLogs, VmMemoryMetrics};
 use zksync_shared_metrics::InteractionType;
 use zksync_state::StorageViewMetrics;
 use zksync_types::{
@@ -14,7 +14,7 @@ use zksync_types::{
 };
 use zksync_utils::bytecode::bytecode_len_in_bytes;
 
-use crate::api_server::utils::ReportFilter;
+use crate::utils::ReportFilter;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
 #[metrics(label = "type", rename_all = "snake_case")]
@@ -87,7 +87,7 @@ pub(super) enum SandboxStage {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
 #[metrics(label = "stage", rename_all = "snake_case")]
-pub(in crate::api_server) enum SubmitTxStage {
+pub(crate) enum SubmitTxStage {
     #[metrics(name = "1_validate")]
     Validate,
     #[metrics(name = "2_dry_run")]
@@ -102,7 +102,7 @@ pub(in crate::api_server) enum SubmitTxStage {
 
 #[must_use = "should be `observe()`d"]
 #[derive(Debug)]
-pub(in crate::api_server) struct SubmitTxLatencyObserver<'a> {
+pub(crate) struct SubmitTxLatencyObserver<'a> {
     inner: Option<LatencyObserver<'a>>,
     tx_hash: H256,
     stage: SubmitTxStage,
@@ -145,7 +145,7 @@ impl Drop for SubmitTxLatencyObserver<'_> {
 
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "api_web3")]
-pub(in crate::api_server) struct SandboxMetrics {
+pub(crate) struct SandboxMetrics {
     #[metrics(buckets = Buckets::LATENCIES)]
     pub(super) sandbox: Family<SandboxStage, Histogram<Duration>>,
     #[metrics(buckets = Buckets::linear(0.0..=2_000.0, 200.0))]
@@ -171,8 +171,7 @@ impl SandboxMetrics {
 }
 
 #[vise::register]
-pub(in crate::api_server) static SANDBOX_METRICS: vise::Global<SandboxMetrics> =
-    vise::Global::new();
+pub(crate) static SANDBOX_METRICS: vise::Global<SandboxMetrics> = vise::Global::new();
 
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "api_execution")]
diff --git a/core/lib/zksync_core/src/api_server/healthcheck.rs b/core/node/api_server/src/healthcheck.rs
similarity index 92%
rename from core/lib/zksync_core/src/api_server/healthcheck.rs
rename to core/node/api_server/src/healthcheck.rs
index 4e880b57a198..bb97b87bdfbc 100644
--- a/core/lib/zksync_core/src/api_server/healthcheck.rs
+++ b/core/node/api_server/src/healthcheck.rs
@@ -28,9 +28,10 @@ async fn run_server(
     let app = Router::new()
         .route("/health", get(check_health))
         .with_state(app_health_check);
-
-    axum::Server::bind(bind_address)
-        .serve(app.into_make_service())
+    let listener = tokio::net::TcpListener::bind(bind_address)
+        .await
+        .unwrap_or_else(|err| panic!("Failed binding healthcheck server to {bind_address}: {err}"));
+    axum::serve(listener, app)
         .with_graceful_shutdown(async move {
             if stop_receiver.changed().await.is_err() {
                 tracing::warn!("Stop signal sender for healthcheck server was dropped without sending a signal");
diff --git a/core/lib/zksync_core/src/api_server/mod.rs b/core/node/api_server/src/lib.rs
similarity index 79%
rename from core/lib/zksync_core/src/api_server/mod.rs
rename to core/node/api_server/src/lib.rs
index cc6ec239473b..00a3a5632ceb 100644
--- a/core/lib/zksync_core/src/api_server/mod.rs
+++ b/core/node/api_server/src/lib.rs
@@ -2,9 +2,7 @@
 
 #[macro_use]
 mod utils;
-pub mod contract_verification;
 pub mod execution_sandbox;
 pub mod healthcheck;
-pub mod tree;
 pub mod tx_sender;
 pub mod web3;
diff --git a/core/lib/zksync_core/src/api_server/tx_sender/master_pool_sink.rs b/core/node/api_server/src/tx_sender/master_pool_sink.rs
similarity index 98%
rename from core/lib/zksync_core/src/api_server/tx_sender/master_pool_sink.rs
rename to core/node/api_server/src/tx_sender/master_pool_sink.rs
index 9938870c0b7a..b7478b9c9711 100644
--- a/core/lib/zksync_core/src/api_server/tx_sender/master_pool_sink.rs
+++ b/core/node/api_server/src/tx_sender/master_pool_sink.rs
@@ -6,7 +6,7 @@ use zksync_shared_metrics::{TxStage, APP_METRICS};
 use zksync_types::{fee::TransactionExecutionMetrics, l2::L2Tx, Address, Nonce, H256};
 
 use super::{tx_sink::TxSink, SubmitTxError};
-use crate::api_server::web3::metrics::API_METRICS;
+use crate::web3::metrics::API_METRICS;
 
 /// Wrapper for the master DB pool that allows to submit transactions to the mempool.
 #[derive(Debug)]
diff --git a/core/lib/zksync_core/src/api_server/tx_sender/mod.rs b/core/node/api_server/src/tx_sender/mod.rs
similarity index 92%
rename from core/lib/zksync_core/src/api_server/tx_sender/mod.rs
rename to core/node/api_server/src/tx_sender/mod.rs
index 1a03c91bcaa6..50b0be541bf0 100644
--- a/core/lib/zksync_core/src/api_server/tx_sender/mod.rs
+++ b/core/node/api_server/src/tx_sender/mod.rs
@@ -1,29 +1,34 @@
-//! Helper module to submit transactions into the zkSync Network.
+//! Helper module to submit transactions into the ZKsync Network.
 
 use std::{sync::Arc, time::Instant};
 
 use anyhow::Context as _;
-use multivm::{
-    interface::VmExecutionResultAndLogs,
-    utils::{
-        adjust_pubdata_price_for_tx, derive_base_fee_and_gas_per_pubdata, derive_overhead,
-        get_max_batch_gas_limit,
-    },
-    vm_latest::constants::BATCH_COMPUTATIONAL_GAS_LIMIT,
-};
 use tokio::sync::RwLock;
 use zksync_config::configs::{api::Web3JsonRpcConfig, chain::StateKeeperConfig};
 use zksync_contracts::BaseSystemContracts;
 use zksync_dal::{
     transactions_dal::L2TxSubmissionResult, Connection, ConnectionPool, Core, CoreDal,
 };
-use zksync_node_fee_model::BatchFeeModelInputProvider;
+use zksync_multivm::{
+    interface::VmExecutionResultAndLogs,
+    utils::{
+        adjust_pubdata_price_for_tx, derive_base_fee_and_gas_per_pubdata, derive_overhead,
+        get_eth_call_gas_limit, get_max_batch_gas_limit,
+    },
+    vm_latest::constants::BATCH_COMPUTATIONAL_GAS_LIMIT,
+};
+use zksync_node_fee_model::{ApiFeeInputProvider, BatchFeeModelInputProvider};
 use zksync_state::PostgresStorageCaches;
+use zksync_state_keeper::{
+    seal_criteria::{ConditionalSealer, NoopSealer, SealData},
+    SequencerSealer,
+};
 use zksync_types::{
     fee::{Fee, TransactionExecutionMetrics},
     fee_model::BatchFeeInput,
     get_code_key, get_intrinsic_constants,
     l2::{error::TxCheckError::TxDuplication, L2Tx},
+    transaction_request::CallOverrides,
     utils::storage_key_for_eth_balance,
     AccountTreeId, Address, ExecuteTransactionCommon, L2ChainId, Nonce, PackedEthSignature,
     ProtocolVersionId, Transaction, VmVersion, H160, H256, MAX_L2_TX_GAS_LIMIT,
@@ -32,17 +37,13 @@ use zksync_types::{
 use zksync_utils::h256_to_u256;
 
 pub(super) use self::result::SubmitTxError;
-use self::tx_sink::TxSink;
+use self::{master_pool_sink::MasterPoolSink, tx_sink::TxSink};
 use crate::{
-    api_server::{
-        execution_sandbox::{
-            BlockArgs, SubmitTxStage, TransactionExecutor, TxExecutionArgs, TxSharedArgs,
-            VmConcurrencyLimiter, VmPermit, SANDBOX_METRICS,
-        },
-        tx_sender::result::ApiCallResult,
+    execution_sandbox::{
+        BlockArgs, SubmitTxStage, TransactionExecutor, TxExecutionArgs, TxSharedArgs,
+        VmConcurrencyBarrier, VmConcurrencyLimiter, VmPermit, SANDBOX_METRICS,
     },
-    state_keeper::seal_criteria::{ConditionalSealer, NoopSealer, SealData},
-    utils::pending_protocol_version,
+    tx_sender::result::ApiCallResult,
 };
 
 pub mod master_pool_sink;
@@ -52,6 +53,39 @@ mod result;
 pub(crate) mod tests;
 pub mod tx_sink;
 
+pub async fn build_tx_sender(
+    tx_sender_config: &TxSenderConfig,
+    web3_json_config: &Web3JsonRpcConfig,
+    state_keeper_config: &StateKeeperConfig,
+    replica_pool: ConnectionPool<Core>,
+    master_pool: ConnectionPool<Core>,
+    batch_fee_model_input_provider: Arc<dyn BatchFeeModelInputProvider>,
+    storage_caches: PostgresStorageCaches,
+) -> anyhow::Result<(TxSender, VmConcurrencyBarrier)> {
+    let sequencer_sealer = SequencerSealer::new(state_keeper_config.clone());
+    let master_pool_sink = MasterPoolSink::new(master_pool);
+    let tx_sender_builder = TxSenderBuilder::new(
+        tx_sender_config.clone(),
+        replica_pool.clone(),
+        Arc::new(master_pool_sink),
+    )
+    .with_sealer(Arc::new(sequencer_sealer));
+
+    let max_concurrency = web3_json_config.vm_concurrency_limit();
+    let (vm_concurrency_limiter, vm_barrier) = VmConcurrencyLimiter::new(max_concurrency);
+
+    let batch_fee_input_provider =
+        ApiFeeInputProvider::new(batch_fee_model_input_provider, replica_pool);
+
+    let tx_sender = tx_sender_builder.build(
+        Arc::new(batch_fee_input_provider),
+        Arc::new(vm_concurrency_limiter),
+        ApiContracts::load_from_disk().await?,
+        storage_caches,
+    );
+    Ok((tx_sender, vm_barrier))
+}
+
 #[derive(Debug, Clone)]
 pub struct MultiVMBaseSystemContracts {
     /// Contracts to be used for pre-virtual-blocks protocol versions.
@@ -125,7 +159,14 @@ impl ApiContracts {
     /// Loads the contracts from the local file system.
     /// This method is *currently* preferred to be used in all contexts,
     /// given that there is no way to fetch "playground" contracts from the main node.
-    pub fn load_from_disk() -> Self {
+    pub async fn load_from_disk() -> anyhow::Result<Self> {
+        tokio::task::spawn_blocking(Self::load_from_disk_blocking)
+            .await
+            .context("loading `ApiContracts` panicked")
+    }
+
+    /// Blocking version of [`Self::load_from_disk()`].
+    pub fn load_from_disk_blocking() -> Self {
         Self {
             estimate_gas: MultiVMBaseSystemContracts {
                 pre_virtual_blocks: BaseSystemContracts::estimate_gas_pre_virtual_blocks(),
@@ -197,7 +238,7 @@ impl TxSenderBuilder {
         self
     }
 
-    pub async fn build(
+    pub fn build(
         self,
         batch_fee_input_provider: Arc<dyn BatchFeeModelInputProvider>,
         vm_concurrency_limiter: Arc<VmConcurrencyLimiter>,
@@ -320,7 +361,7 @@ impl TxSender {
         let tx_hash = tx.hash();
         let stage_latency = SANDBOX_METRICS.start_tx_submit_stage(tx_hash, SubmitTxStage::Validate);
         let mut connection = self.acquire_replica_connection().await?;
-        let protocol_version = pending_protocol_version(&mut connection).await?;
+        let protocol_version = connection.blocks_dal().pending_protocol_version().await?;
         drop(connection);
         self.validate_tx(&tx, protocol_version).await?;
         stage_latency.observe();
@@ -490,9 +531,9 @@ impl TxSender {
             );
             return Err(SubmitTxError::MaxPriorityFeeGreaterThanMaxFee);
         }
-        if tx.execute.factory_deps_length() > MAX_NEW_FACTORY_DEPS {
+        if tx.execute.factory_deps.len() > MAX_NEW_FACTORY_DEPS {
             return Err(SubmitTxError::TooManyFactoryDependencies(
-                tx.execute.factory_deps_length(),
+                tx.execute.factory_deps.len(),
                 MAX_NEW_FACTORY_DEPS,
             ));
         }
@@ -697,7 +738,9 @@ impl TxSender {
 
         let mut connection = self.acquire_replica_connection().await?;
         let block_args = BlockArgs::pending(&mut connection).await?;
-        let protocol_version = pending_protocol_version(&mut connection)
+        let protocol_version = connection
+            .blocks_dal()
+            .pending_protocol_version()
             .await
             .context("failed getting pending protocol version")?;
         let max_gas_limit = get_max_batch_gas_limit(protocol_version.into());
@@ -928,6 +971,7 @@ impl TxSender {
     pub(super) async fn eth_call(
         &self,
         block_args: BlockArgs,
+        call_overrides: CallOverrides,
         tx: L2Tx,
     ) -> Result<Vec<u8>, SubmitTxError> {
         let vm_permit = self.0.vm_concurrency_limiter.acquire().await;
@@ -940,6 +984,7 @@ impl TxSender {
                 vm_permit,
                 self.shared_args().await?,
                 self.0.replica_connection_pool.clone(),
+                call_overrides,
                 tx,
                 block_args,
                 vm_execution_cache_misses_limit,
@@ -951,7 +996,9 @@ impl TxSender {
 
     pub async fn gas_price(&self) -> anyhow::Result<u64> {
         let mut connection = self.acquire_replica_connection().await?;
-        let protocol_version = pending_protocol_version(&mut connection)
+        let protocol_version = connection
+            .blocks_dal()
+            .pending_protocol_version()
             .await
             .context("failed obtaining pending protocol version")?;
         drop(connection);
@@ -997,4 +1044,19 @@ impl TxSender {
         }
         Ok(())
     }
+
+    pub(crate) async fn get_default_eth_call_gas(
+        &self,
+        block_args: BlockArgs,
+    ) -> anyhow::Result<u64> {
+        let mut connection = self.acquire_replica_connection().await?;
+
+        let protocol_version = block_args
+            .resolve_block_info(&mut connection)
+            .await
+            .context("failed to resolve block info")?
+            .protocol_version;
+
+        Ok(get_eth_call_gas_limit(protocol_version.into()))
+    }
 }
diff --git a/core/node/api_server/src/tx_sender/proxy.rs b/core/node/api_server/src/tx_sender/proxy.rs
new file mode 100644
index 000000000000..e179cdcb7748
--- /dev/null
+++ b/core/node/api_server/src/tx_sender/proxy.rs
@@ -0,0 +1,752 @@
+use std::{
+    collections::{BTreeSet, HashMap, HashSet},
+    sync::Arc,
+    time::Duration,
+};
+
+use anyhow::Context;
+use chrono::{TimeZone, Utc};
+use tokio::sync::{watch, RwLock};
+use zksync_dal::{
+    helpers::wait_for_l1_batch, transactions_dal::L2TxSubmissionResult, Connection, ConnectionPool,
+    Core, CoreDal, DalError,
+};
+use zksync_shared_metrics::{TxStage, APP_METRICS};
+use zksync_types::{api, fee::TransactionExecutionMetrics, l2::L2Tx, Address, Nonce, H256, U256};
+use zksync_web3_decl::{
+    client::{DynClient, L2},
+    error::{ClientRpcContext, EnrichedClientResult, Web3Error},
+    namespaces::EthNamespaceClient,
+};
+
+use super::{tx_sink::TxSink, SubmitTxError};
+
+/// In-memory transaction cache for a full node. Works like an ad-hoc mempool replacement, with the important limitation that
+/// it's not synchronized across the network.
+///
+/// # Managing cache growth
+///
+/// To keep cache at reasonable size, the following garbage collection procedures are implemented:
+///
+/// - [`Self::run_updates()`] periodically gets nonces for all distinct accounts for the transactions in cache and removes
+///   all transactions with stale nonces. This includes both transactions included into L2 blocks and replaced transactions.
+/// - The same nonce filtering logic is applied for the transaction initiator address each time a transaction is fetched from cache.
+///   We don't want to return such transactions if they are already included in an L2 block or replaced locally, but `Self::run_updates()`
+///   hasn't run yet.
+#[derive(Debug, Clone, Default)]
+pub(crate) struct TxCache {
+    inner: Arc<RwLock<TxCacheInner>>,
+}
+
+#[derive(Debug, Default)]
+struct TxCacheInner {
+    transactions_by_hash: HashMap<H256, L2Tx>,
+    tx_hashes_by_initiator: HashMap<(Address, Nonce), HashSet<H256>>,
+    nonces_by_account: HashMap<Address, BTreeSet<Nonce>>,
+}
+
+impl TxCacheInner {
+    /// Removes transactions from the cache based on nonces for accounts loaded from Postgres.
+    fn collect_garbage(&mut self, nonces_for_accounts: &HashMap<Address, Nonce>) {
+        self.nonces_by_account.retain(|address, account_nonces| {
+            let stored_nonce = nonces_for_accounts
+                .get(address)
+                .copied()
+                .unwrap_or(Nonce(0));
+            // Retain only nonces starting from the stored one, and remove transactions with all past nonces;
+            // this includes both successfully executed and replaced transactions.
+            let retained_nonces = account_nonces.split_off(&stored_nonce);
+            for &nonce in &*account_nonces {
+                if let Some(tx_hashes) = self.tx_hashes_by_initiator.remove(&(*address, nonce)) {
+                    for tx_hash in tx_hashes {
+                        self.transactions_by_hash.remove(&tx_hash);
+                    }
+                }
+            }
+            *account_nonces = retained_nonces;
+            // If we've removed all nonces, drop the account entry so we don't request stored nonces for it later.
+            !account_nonces.is_empty()
+        });
+    }
+
+    /// Same as `collect_garbage()`, but optimized for a single `(account, nonce)` entry.
+    fn collect_garbage_for_account(&mut self, initiator_address: Address, stored_nonce: Nonce) {
+        let Some(account_nonces) = self.nonces_by_account.get_mut(&initiator_address) else {
+            return;
+        };
+
+        let retained_nonces = account_nonces.split_off(&stored_nonce);
+        for &nonce in &*account_nonces {
+            if let Some(tx_hashes) = self
+                .tx_hashes_by_initiator
+                .remove(&(initiator_address, nonce))
+            {
+                for tx_hash in tx_hashes {
+                    self.transactions_by_hash.remove(&tx_hash);
+                }
+            }
+        }
+        *account_nonces = retained_nonces;
+
+        if account_nonces.is_empty() {
+            self.nonces_by_account.remove(&initiator_address);
+        }
+    }
+}
+
+impl TxCache {
+    async fn push(&self, tx: L2Tx) {
+        let mut inner = self.inner.write().await;
+        inner
+            .nonces_by_account
+            .entry(tx.initiator_account())
+            .or_default()
+            .insert(tx.nonce());
+        inner
+            .tx_hashes_by_initiator
+            .entry((tx.initiator_account(), tx.nonce()))
+            .or_default()
+            .insert(tx.hash());
+        inner.transactions_by_hash.insert(tx.hash(), tx);
+    }
+
+    async fn get(&self, tx_hash: H256) -> Option<L2Tx> {
+        self.inner
+            .read()
+            .await
+            .transactions_by_hash
+            .get(&tx_hash)
+            .cloned()
+    }
+
+    async fn remove(&self, tx_hash: H256) {
+        let mut inner = self.inner.write().await;
+        let Some(tx) = inner.transactions_by_hash.remove(&tx_hash) else {
+            // The transaction is already removed; this is fine.
+            return;
+        };
+
+        let initiator_and_nonce = (tx.initiator_account(), tx.nonce());
+        if let Some(txs) = inner.tx_hashes_by_initiator.get_mut(&initiator_and_nonce) {
+            txs.remove(&tx_hash);
+            if txs.is_empty() {
+                inner.tx_hashes_by_initiator.remove(&initiator_and_nonce);
+                // No transactions with `initiator_and_nonce` remain in the cache; remove the nonce record as well
+                if let Some(nonces) = inner.nonces_by_account.get_mut(&tx.initiator_account()) {
+                    nonces.remove(&tx.nonce());
+                    if nonces.is_empty() {
+                        inner.nonces_by_account.remove(&tx.initiator_account());
+                    }
+                }
+            }
+        }
+    }
+
+    async fn get_nonces_for_account(&self, account_address: Address) -> BTreeSet<Nonce> {
+        let inner = self.inner.read().await;
+        if let Some(nonces) = inner.nonces_by_account.get(&account_address) {
+            nonces.clone()
+        } else {
+            BTreeSet::new()
+        }
+    }
+
+    async fn step(&self, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+        let addresses: Vec<_> = {
+            // Split into 2 statements for readability.
+            let inner = self.inner.read().await;
+            inner.nonces_by_account.keys().copied().collect()
+        };
+        let mut storage = pool.connection_tagged("api").await?;
+        let nonces_for_accounts = storage
+            .storage_web3_dal()
+            .get_nonces_for_addresses(&addresses)
+            .await?;
+        drop(storage); // Don't hold both `storage` and lock on `inner` at the same time.
+
+        self.inner
+            .write()
+            .await
+            .collect_garbage(&nonces_for_accounts);
+        Ok(())
+    }
+
+    async fn run_updates(
+        self,
+        pool: ConnectionPool<Core>,
+        mut stop_receiver: watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
+        const UPDATE_INTERVAL: Duration = Duration::from_secs(1);
+
+        tracing::info!(
+            "Waiting for at least one L1 batch in Postgres to start TxCache::run_updates"
+        );
+        // Starting the updater before L1 batches are present in Postgres can lead to some invariants the server logic
+        // implicitly assumes not being upheld. The only case when we'll actually wait here is immediately after snapshot recovery.
+        let earliest_l1_batch_number =
+            wait_for_l1_batch(&pool, UPDATE_INTERVAL, &mut stop_receiver)
+                .await
+                .context("error while waiting for L1 batch in Postgres")?;
+        if let Some(number) = earliest_l1_batch_number {
+            tracing::info!("Successfully waited for at least one L1 batch in Postgres; the earliest one is #{number}");
+        } else {
+            tracing::info!(
+                "Received shutdown signal before TxCache::run_updates is started; shutting down"
+            );
+            return Ok(());
+        }
+
+        while !*stop_receiver.borrow() {
+            self.step(&pool).await?;
+            tokio::time::sleep(UPDATE_INTERVAL).await;
+        }
+        Ok(())
+    }
+}
+
+/// Used by external node to proxy transaction to the main node
+/// and store them while they're not synced back yet
+#[derive(Debug)]
+pub struct TxProxy {
+    tx_cache: TxCache,
+    client: Box<DynClient<L2>>,
+}
+
+impl TxProxy {
+    pub fn new(client: Box<DynClient<L2>>) -> Self {
+        Self {
+            tx_cache: TxCache::default(),
+            client: client.for_component("tx_proxy"),
+        }
+    }
+
+    async fn submit_tx_impl(&self, tx: &L2Tx) -> EnrichedClientResult<H256> {
+        let input_data = tx.common_data.input_data().expect("raw tx is absent");
+        let raw_tx = zksync_types::web3::Bytes(input_data.to_vec());
+        let tx_hash = tx.hash();
+        tracing::info!("Proxying tx {tx_hash:?}");
+        self.client
+            .send_raw_transaction(raw_tx)
+            .rpc_context("send_raw_transaction")
+            .with_arg("tx_hash", &tx_hash)
+            .await
+    }
+
+    async fn find_tx(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        tx_hash: H256,
+    ) -> Result<Option<L2Tx>, Web3Error> {
+        let Some(tx) = self.tx_cache.get(tx_hash).await else {
+            return Ok(None);
+        };
+
+        let initiator_address = tx.initiator_account();
+        let nonce_map = storage
+            .storage_web3_dal()
+            .get_nonces_for_addresses(&[initiator_address])
+            .await
+            .map_err(DalError::generalize)?;
+        if let Some(&stored_nonce) = nonce_map.get(&initiator_address) {
+            // `stored_nonce` is the *next* nonce of the `initiator_address` account, thus, strict inequality check
+            if tx.nonce() < stored_nonce {
+                // Transaction is included in a block or replaced; either way, it should be removed from the cache.
+                self.tx_cache
+                    .inner
+                    .write()
+                    .await
+                    .collect_garbage_for_account(initiator_address, stored_nonce);
+                return Ok(None);
+            }
+        }
+        Ok(Some(tx))
+    }
+
+    async fn next_nonce_by_initiator_account(
+        &self,
+        account_address: Address,
+        current_nonce: u32,
+    ) -> Nonce {
+        let mut pending_nonce = Nonce(current_nonce);
+        let nonces = self.tx_cache.get_nonces_for_account(account_address).await;
+        for nonce in nonces.range(pending_nonce + 1..) {
+            // If nonce is not sequential, then we should not increment nonce.
+            if nonce == &pending_nonce {
+                pending_nonce += 1;
+            } else {
+                break;
+            }
+        }
+
+        pending_nonce
+    }
+
+    pub fn account_nonce_sweeper_task(
+        &self,
+        pool: ConnectionPool<Core>,
+    ) -> AccountNonceSweeperTask {
+        let cache = self.tx_cache.clone();
+        AccountNonceSweeperTask { cache, pool }
+    }
+}
+
+#[derive(Debug)]
+pub struct AccountNonceSweeperTask {
+    cache: TxCache,
+    pool: ConnectionPool<Core>,
+}
+
+impl AccountNonceSweeperTask {
+    pub async fn run(self, stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        self.cache.run_updates(self.pool, stop_receiver).await
+    }
+}
+
+#[async_trait::async_trait]
+impl TxSink for TxProxy {
+    async fn submit_tx(
+        &self,
+        tx: &L2Tx,
+        _execution_metrics: TransactionExecutionMetrics,
+    ) -> Result<L2TxSubmissionResult, SubmitTxError> {
+        // We're running an external node: we have to proxy the transaction to the main node.
+        // But before we do that, save the tx to cache in case someone will request it
+        // Before it reaches the main node.
+        self.tx_cache.push(tx.clone()).await;
+        if let Err(err) = self.submit_tx_impl(tx).await {
+            // Remove the transaction from the cache on failure so that it doesn't occupy space in the cache indefinitely.
+            self.tx_cache.remove(tx.hash()).await;
+            return Err(err.into());
+        }
+        APP_METRICS.processed_txs[&TxStage::Proxied].inc();
+        Ok(L2TxSubmissionResult::Proxied)
+    }
+
+    async fn lookup_pending_nonce(
+        &self,
+        account_address: Address,
+        last_known_nonce: u32,
+    ) -> Result<Option<Nonce>, Web3Error> {
+        // EN: get pending nonces from the transaction cache
+        // We don't have mempool in EN, it's safe to use the proxy cache as a mempool
+        Ok(Some(
+            self.next_nonce_by_initiator_account(account_address, last_known_nonce)
+                .await
+                .0
+                .into(),
+        ))
+    }
+
+    async fn lookup_tx(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        id: api::TransactionId,
+    ) -> Result<Option<api::Transaction>, Web3Error> {
+        if let api::TransactionId::Hash(hash) = id {
+            // If the transaction is not in the db, check the cache
+            if let Some(tx) = self.find_tx(storage, hash).await? {
+                // check nonce for initiator
+                return Ok(Some(tx.into()));
+            }
+        }
+        Ok(None)
+    }
+
+    async fn lookup_tx_details(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        hash: H256,
+    ) -> Result<Option<api::TransactionDetails>, Web3Error> {
+        if let Some(tx) = self.find_tx(storage, hash).await? {
+            let received_at_ms =
+                i64::try_from(tx.received_timestamp_ms).context("received timestamp overflow")?;
+            let received_at = Utc
+                .timestamp_millis_opt(received_at_ms)
+                .single()
+                .context("received timestamp overflow")?;
+            return Ok(Some(api::TransactionDetails {
+                is_l1_originated: false,
+                status: api::TransactionStatus::Pending,
+                fee: U256::zero(), // always zero for pending transactions
+                gas_per_pubdata: tx.common_data.fee.gas_per_pubdata_limit,
+                initiator_address: tx.initiator_account(),
+                received_at,
+                eth_commit_tx_hash: None,
+                eth_prove_tx_hash: None,
+                eth_execute_tx_hash: None,
+            }));
+        }
+        Ok(None)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::atomic::{AtomicBool, Ordering};
+
+    use test_casing::test_casing;
+    use zksync_node_genesis::{insert_genesis_batch, mock_genesis_config, GenesisParams};
+    use zksync_node_test_utils::{create_l2_block, create_l2_transaction};
+    use zksync_types::{get_nonce_key, web3::Bytes, L2BlockNumber, StorageLog};
+    use zksync_web3_decl::{client::MockClient, jsonrpsee::core::ClientError};
+
+    use super::*;
+
+    #[tokio::test]
+    async fn tx_cache_basics() {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut storage = pool.connection().await.unwrap();
+        let params = GenesisParams::load_genesis_params(mock_genesis_config()).unwrap();
+        insert_genesis_batch(&mut storage, &params).await.unwrap();
+
+        let tx = create_l2_transaction(10, 100);
+        let send_tx_called = Arc::new(AtomicBool::new(false));
+        let main_node_client = MockClient::builder(L2::default())
+            .method("eth_sendRawTransaction", {
+                let send_tx_called = send_tx_called.clone();
+                let tx = tx.clone();
+                move |bytes: Bytes| {
+                    assert_eq!(bytes.0, tx.common_data.input_data().unwrap());
+                    send_tx_called.store(true, Ordering::Relaxed);
+                    Ok(tx.hash())
+                }
+            })
+            .build();
+
+        let proxy = TxProxy::new(Box::new(main_node_client));
+        proxy
+            .submit_tx(&tx, TransactionExecutionMetrics::default())
+            .await
+            .unwrap();
+        assert!(send_tx_called.load(Ordering::Relaxed));
+
+        // Check that the transaction is present in the cache
+        assert_eq!(proxy.tx_cache.get(tx.hash()).await.unwrap(), tx);
+        let found_tx = proxy
+            .lookup_tx(&mut storage, api::TransactionId::Hash(tx.hash()))
+            .await
+            .unwrap()
+            .expect("no transaction");
+        assert_eq!(found_tx.hash, tx.hash());
+
+        let pending_nonce = proxy
+            .lookup_pending_nonce(tx.initiator_account(), 0)
+            .await
+            .unwrap()
+            .expect("no nonce");
+        assert_eq!(pending_nonce, tx.nonce());
+
+        let tx_details = proxy
+            .lookup_tx_details(&mut storage, tx.hash())
+            .await
+            .unwrap()
+            .expect("no transaction");
+        assert_eq!(tx_details.initiator_address, tx.initiator_account());
+    }
+
+    #[tokio::test]
+    async fn low_level_transaction_cache_operations() {
+        let tx_cache = TxCache::default();
+        let tx = create_l2_transaction(10, 100);
+        let tx_hash = tx.hash();
+
+        tx_cache.push(tx.clone()).await;
+        assert_eq!(tx_cache.get(tx_hash).await.unwrap(), tx);
+        assert_eq!(
+            tx_cache
+                .get_nonces_for_account(tx.initiator_account())
+                .await,
+            BTreeSet::from([Nonce(0)])
+        );
+
+        tx_cache.remove(tx_hash).await;
+        assert_eq!(tx_cache.get(tx_hash).await, None);
+        assert_eq!(
+            tx_cache
+                .get_nonces_for_account(tx.initiator_account())
+                .await,
+            BTreeSet::new()
+        );
+
+        {
+            let inner = tx_cache.inner.read().await;
+            assert!(inner.transactions_by_hash.is_empty(), "{inner:?}");
+            assert!(inner.nonces_by_account.is_empty(), "{inner:?}");
+            assert!(inner.tx_hashes_by_initiator.is_empty(), "{inner:?}");
+        }
+    }
+
+    #[tokio::test]
+    async fn low_level_transaction_cache_operations_with_replacing_transaction() {
+        let tx_cache = TxCache::default();
+        let tx = create_l2_transaction(10, 100);
+        let tx_hash = tx.hash();
+        let mut replacing_tx = create_l2_transaction(10, 100);
+        replacing_tx.common_data.initiator_address = tx.initiator_account();
+        let replacing_tx_hash = replacing_tx.hash();
+        assert_ne!(replacing_tx_hash, tx_hash);
+
+        tx_cache.push(tx.clone()).await;
+        tx_cache.push(replacing_tx).await;
+        tx_cache.get(tx_hash).await.unwrap();
+        tx_cache.get(replacing_tx_hash).await.unwrap();
+        // Both transactions have the same nonce
+        assert_eq!(
+            tx_cache
+                .get_nonces_for_account(tx.initiator_account())
+                .await,
+            BTreeSet::from([Nonce(0)])
+        );
+
+        tx_cache.remove(tx_hash).await;
+        assert_eq!(tx_cache.get(tx_hash).await, None);
+        assert_eq!(
+            tx_cache
+                .get_nonces_for_account(tx.initiator_account())
+                .await,
+            BTreeSet::from([Nonce(0)])
+        );
+    }
+
+    #[tokio::test]
+    async fn transaction_is_not_stored_in_cache_on_main_node_failure() {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut storage = pool.connection().await.unwrap();
+        let params = GenesisParams::load_genesis_params(mock_genesis_config()).unwrap();
+        insert_genesis_batch(&mut storage, &params).await.unwrap();
+
+        let tx = create_l2_transaction(10, 100);
+        let main_node_client = MockClient::builder(L2::default())
+            .method("eth_sendRawTransaction", |_bytes: Bytes| {
+                Err::<H256, _>(ClientError::RequestTimeout)
+            })
+            .build();
+
+        let proxy = TxProxy::new(Box::new(main_node_client));
+        proxy
+            .submit_tx(&tx, TransactionExecutionMetrics::default())
+            .await
+            .unwrap_err();
+
+        let found_tx = proxy.find_tx(&mut storage, tx.hash()).await.unwrap();
+        assert!(found_tx.is_none(), "{found_tx:?}");
+    }
+
+    #[derive(Debug, Clone, Copy)]
+    enum CacheUpdateMethod {
+        BackgroundTask,
+        Query,
+        QueryDetails,
+    }
+
+    impl CacheUpdateMethod {
+        const ALL: [Self; 3] = [Self::BackgroundTask, Self::Query, Self::QueryDetails];
+
+        async fn apply(self, pool: &ConnectionPool<Core>, proxy: &TxProxy, tx_hash: H256) {
+            match self {
+                CacheUpdateMethod::BackgroundTask => {
+                    proxy.tx_cache.step(pool).await.unwrap();
+                }
+                CacheUpdateMethod::Query => {
+                    let looked_up_tx = proxy
+                        .lookup_tx(
+                            &mut pool.connection().await.unwrap(),
+                            api::TransactionId::Hash(tx_hash),
+                        )
+                        .await
+                        .unwrap();
+                    assert!(looked_up_tx.is_none());
+                }
+                CacheUpdateMethod::QueryDetails => {
+                    let looked_up_tx = proxy
+                        .lookup_tx_details(&mut pool.connection().await.unwrap(), tx_hash)
+                        .await
+                        .unwrap();
+                    assert!(looked_up_tx.is_none());
+                }
+            }
+        }
+    }
+
+    #[test_casing(3, CacheUpdateMethod::ALL)]
+    #[tokio::test]
+    async fn removing_sealed_transaction_from_cache(cache_update_method: CacheUpdateMethod) {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut storage = pool.connection().await.unwrap();
+        let params = GenesisParams::load_genesis_params(mock_genesis_config()).unwrap();
+        insert_genesis_batch(&mut storage, &params).await.unwrap();
+
+        let tx = create_l2_transaction(10, 100);
+        let main_node_client = MockClient::builder(L2::default())
+            .method("eth_sendRawTransaction", |_bytes: Bytes| Ok(H256::zero()))
+            .build();
+
+        // Add transaction to the cache
+        let proxy = TxProxy::new(Box::new(main_node_client));
+        proxy
+            .submit_tx(&tx, TransactionExecutionMetrics::default())
+            .await
+            .unwrap();
+        assert_eq!(proxy.tx_cache.get(tx.hash()).await.unwrap(), tx);
+        {
+            let cache_inner = proxy.tx_cache.inner.read().await;
+            assert!(cache_inner.transactions_by_hash.contains_key(&tx.hash()));
+            assert!(cache_inner
+                .nonces_by_account
+                .contains_key(&tx.initiator_account()));
+            assert!(cache_inner
+                .tx_hashes_by_initiator
+                .contains_key(&(tx.initiator_account(), Nonce(0))));
+        }
+
+        // Emulate the transaction getting sealed.
+        storage
+            .blocks_dal()
+            .insert_l2_block(&create_l2_block(1))
+            .await
+            .unwrap();
+        let nonce_key = get_nonce_key(&tx.initiator_account());
+        let nonce_log = StorageLog::new_write_log(nonce_key, H256::from_low_u64_be(1));
+        storage
+            .storage_logs_dal()
+            .insert_storage_logs(L2BlockNumber(1), &[nonce_log])
+            .await
+            .unwrap();
+
+        cache_update_method.apply(&pool, &proxy, tx.hash()).await;
+
+        // Transaction should be removed from the cache
+        assert!(proxy.tx_cache.get(tx.hash()).await.is_none());
+        {
+            let cache_inner = proxy.tx_cache.inner.read().await;
+            assert!(!cache_inner.transactions_by_hash.contains_key(&tx.hash()));
+            assert!(!cache_inner
+                .nonces_by_account
+                .contains_key(&tx.initiator_account()));
+            assert!(!cache_inner
+                .tx_hashes_by_initiator
+                .contains_key(&(tx.initiator_account(), Nonce(0))));
+        }
+
+        let looked_up_tx = proxy
+            .lookup_tx(&mut storage, api::TransactionId::Hash(tx.hash()))
+            .await
+            .unwrap();
+        assert!(looked_up_tx.is_none());
+        let looked_up_tx = proxy
+            .lookup_tx_details(&mut storage, tx.hash())
+            .await
+            .unwrap();
+        assert!(looked_up_tx.is_none());
+    }
+
+    #[test_casing(3, CacheUpdateMethod::ALL)]
+    #[tokio::test]
+    async fn removing_replaced_transaction_from_cache(cache_update_method: CacheUpdateMethod) {
+        let pool = ConnectionPool::<Core>::test_pool().await;
+        let mut storage = pool.connection().await.unwrap();
+        let params = GenesisParams::load_genesis_params(mock_genesis_config()).unwrap();
+        insert_genesis_batch(&mut storage, &params).await.unwrap();
+
+        let tx = create_l2_transaction(10, 100);
+        let mut replacing_tx = create_l2_transaction(10, 100);
+        assert_eq!(tx.nonce(), replacing_tx.nonce());
+        replacing_tx.common_data.initiator_address = tx.initiator_account();
+        let mut future_tx = create_l2_transaction(10, 100);
+        future_tx.common_data.initiator_address = tx.initiator_account();
+        future_tx.common_data.nonce = Nonce(1);
+
+        let main_node_client = MockClient::builder(L2::default())
+            .method("eth_sendRawTransaction", |_bytes: Bytes| Ok(H256::zero()))
+            .build();
+        let proxy = TxProxy::new(Box::new(main_node_client));
+        proxy
+            .submit_tx(&tx, TransactionExecutionMetrics::default())
+            .await
+            .unwrap();
+        proxy
+            .submit_tx(&replacing_tx, TransactionExecutionMetrics::default())
+            .await
+            .unwrap();
+        proxy
+            .submit_tx(&future_tx, TransactionExecutionMetrics::default())
+            .await
+            .unwrap();
+        {
+            let cache_inner = proxy.tx_cache.inner.read().await;
+            assert_eq!(cache_inner.nonces_by_account.len(), 1);
+            let account_nonces = &cache_inner.nonces_by_account[&tx.initiator_account()];
+            assert_eq!(*account_nonces, BTreeSet::from([Nonce(0), Nonce(1)]));
+            assert_eq!(cache_inner.tx_hashes_by_initiator.len(), 2);
+            assert_eq!(
+                cache_inner.tx_hashes_by_initiator[&(tx.initiator_account(), Nonce(0))],
+                HashSet::from([tx.hash(), replacing_tx.hash()])
+            );
+            assert_eq!(
+                cache_inner.tx_hashes_by_initiator[&(tx.initiator_account(), Nonce(1))],
+                HashSet::from([future_tx.hash()])
+            );
+        }
+
+        // Emulate the replacing transaction getting sealed.
+        storage
+            .blocks_dal()
+            .insert_l2_block(&create_l2_block(1))
+            .await
+            .unwrap();
+        let nonce_key = get_nonce_key(&tx.initiator_account());
+        let nonce_log = StorageLog::new_write_log(nonce_key, H256::from_low_u64_be(1));
+        storage
+            .storage_logs_dal()
+            .insert_storage_logs(L2BlockNumber(1), &[nonce_log])
+            .await
+            .unwrap();
+
+        cache_update_method
+            .apply(&pool, &proxy, replacing_tx.hash())
+            .await;
+
+        // Original and replacing transactions should be removed from the cache, and the future transaction should be retained.
+        {
+            let cache_inner = proxy.tx_cache.inner.read().await;
+            assert!(!cache_inner.transactions_by_hash.contains_key(&tx.hash()));
+            assert!(!cache_inner
+                .transactions_by_hash
+                .contains_key(&replacing_tx.hash()));
+            assert_eq!(
+                cache_inner.nonces_by_account[&tx.initiator_account()],
+                BTreeSet::from([Nonce(1)])
+            );
+            assert!(!cache_inner
+                .tx_hashes_by_initiator
+                .contains_key(&(tx.initiator_account(), Nonce(0))));
+            assert_eq!(
+                cache_inner.tx_hashes_by_initiator[&(tx.initiator_account(), Nonce(1))],
+                HashSet::from([future_tx.hash()])
+            );
+        }
+
+        for missing_hash in [tx.hash(), replacing_tx.hash()] {
+            let looked_up_tx = proxy
+                .lookup_tx(&mut storage, api::TransactionId::Hash(missing_hash))
+                .await
+                .unwrap();
+            assert!(looked_up_tx.is_none());
+            let looked_up_tx = proxy
+                .lookup_tx_details(&mut storage, missing_hash)
+                .await
+                .unwrap();
+            assert!(looked_up_tx.is_none());
+        }
+        proxy
+            .lookup_tx(&mut storage, api::TransactionId::Hash(future_tx.hash()))
+            .await
+            .unwrap()
+            .expect("no transaction");
+        proxy
+            .lookup_tx_details(&mut storage, future_tx.hash())
+            .await
+            .unwrap()
+            .expect("no transaction");
+    }
+}
diff --git a/core/lib/zksync_core/src/api_server/tx_sender/result.rs b/core/node/api_server/src/tx_sender/result.rs
similarity index 98%
rename from core/lib/zksync_core/src/api_server/tx_sender/result.rs
rename to core/node/api_server/src/tx_sender/result.rs
index 18dbf7bbf893..f4bda54efc65 100644
--- a/core/lib/zksync_core/src/api_server/tx_sender/result.rs
+++ b/core/node/api_server/src/tx_sender/result.rs
@@ -1,9 +1,9 @@
-use multivm::interface::{ExecutionResult, VmExecutionResultAndLogs};
 use thiserror::Error;
+use zksync_multivm::interface::{ExecutionResult, VmExecutionResultAndLogs};
 use zksync_types::{l2::error::TxCheckError, U256};
 use zksync_web3_decl::error::EnrichedClientError;
 
-use crate::api_server::execution_sandbox::{SandboxExecutionError, ValidationError};
+use crate::execution_sandbox::{SandboxExecutionError, ValidationError};
 
 /// Errors that con occur submitting a transaction or estimating gas for its execution.
 #[derive(Debug, Error)]
diff --git a/core/lib/zksync_core/src/api_server/tx_sender/tests.rs b/core/node/api_server/src/tx_sender/tests.rs
similarity index 76%
rename from core/lib/zksync_core/src/api_server/tx_sender/tests.rs
rename to core/node/api_server/src/tx_sender/tests.rs
index 4c8709f1e404..06b6b7a1301b 100644
--- a/core/lib/zksync_core/src/api_server/tx_sender/tests.rs
+++ b/core/node/api_server/src/tx_sender/tests.rs
@@ -1,8 +1,7 @@
 //! Tests for the transaction sender.
 
 use assert_matches::assert_matches;
-use multivm::interface::ExecutionResult;
-use zksync_config::configs::wallets::Wallets;
+use zksync_multivm::interface::ExecutionResult;
 use zksync_node_fee_model::MockBatchFeeParamsProvider;
 use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
 use zksync_node_test_utils::{create_l2_block, create_l2_transaction, prepare_recovery_snapshot};
@@ -10,42 +9,10 @@ use zksync_types::{get_nonce_key, L1BatchNumber, L2BlockNumber, StorageLog};
 use zksync_utils::u256_to_h256;
 
 use super::*;
-use crate::api_server::execution_sandbox::{
-    testonly::MockTransactionExecutor, VmConcurrencyBarrier,
+use crate::{
+    execution_sandbox::testonly::MockTransactionExecutor, web3::testonly::create_test_tx_sender,
 };
 
-pub(crate) async fn create_test_tx_sender(
-    pool: ConnectionPool<Core>,
-    l2_chain_id: L2ChainId,
-    tx_executor: TransactionExecutor,
-) -> (TxSender, VmConcurrencyBarrier) {
-    let web3_config = Web3JsonRpcConfig::for_tests();
-    let state_keeper_config = StateKeeperConfig::for_tests();
-    let wallets = Wallets::for_tests();
-    let tx_sender_config = TxSenderConfig::new(
-        &state_keeper_config,
-        &web3_config,
-        wallets.state_keeper.unwrap().fee_account.address(),
-        l2_chain_id,
-    );
-
-    let storage_caches = PostgresStorageCaches::new(1, 1);
-    let batch_fee_model_input_provider = Arc::new(MockBatchFeeParamsProvider::default());
-    let (mut tx_sender, vm_barrier) = crate::build_tx_sender(
-        &tx_sender_config,
-        &web3_config,
-        &state_keeper_config,
-        pool.clone(),
-        pool,
-        batch_fee_model_input_provider,
-        storage_caches,
-    )
-    .await;
-
-    Arc::get_mut(&mut tx_sender.0).unwrap().executor = tx_executor;
-    (tx_sender, vm_barrier)
-}
-
 #[tokio::test]
 async fn getting_nonce_for_account() {
     let l2_chain_id = L2ChainId::default();
@@ -60,7 +27,7 @@ async fn getting_nonce_for_account() {
     let nonce_log = StorageLog::new_write_log(nonce_key, H256::from_low_u64_be(123));
     storage
         .storage_logs_dal()
-        .append_storage_logs(L2BlockNumber(0), &[(H256::default(), vec![nonce_log])])
+        .append_storage_logs(L2BlockNumber(0), &[nonce_log])
         .await
         .unwrap();
 
@@ -82,7 +49,7 @@ async fn getting_nonce_for_account() {
     };
     storage
         .storage_logs_dal()
-        .insert_storage_logs(L2BlockNumber(1), &[(H256::default(), vec![nonce_log])])
+        .insert_storage_logs(L2BlockNumber(1), &[nonce_log])
         .await
         .unwrap();
 
@@ -128,10 +95,7 @@ async fn getting_nonce_for_account_after_snapshot_recovery() {
     )];
     storage
         .storage_logs_dal()
-        .insert_storage_logs(
-            SNAPSHOT_L2_BLOCK_NUMBER + 1,
-            &[(H256::default(), new_nonce_logs)],
-        )
+        .insert_storage_logs(SNAPSHOT_L2_BLOCK_NUMBER + 1, &new_nonce_logs)
         .await
         .unwrap();
 
@@ -167,7 +131,7 @@ async fn submitting_tx_requires_one_connection() {
     let storage_log = StorageLog::new_write_log(balance_key, u256_to_h256(U256::one() << 64));
     storage
         .storage_logs_dal()
-        .append_storage_logs(L2BlockNumber(0), &[(H256::zero(), vec![storage_log])])
+        .append_storage_logs(L2BlockNumber(0), &[storage_log])
         .await
         .unwrap();
     drop(storage);
diff --git a/core/lib/zksync_core/src/api_server/tx_sender/tx_sink.rs b/core/node/api_server/src/tx_sender/tx_sink.rs
similarity index 88%
rename from core/lib/zksync_core/src/api_server/tx_sender/tx_sink.rs
rename to core/node/api_server/src/tx_sender/tx_sink.rs
index 89a69345965b..5edf21b0701c 100644
--- a/core/lib/zksync_core/src/api_server/tx_sender/tx_sink.rs
+++ b/core/node/api_server/src/tx_sender/tx_sink.rs
@@ -1,4 +1,4 @@
-use zksync_dal::transactions_dal::L2TxSubmissionResult;
+use zksync_dal::{transactions_dal::L2TxSubmissionResult, Connection, Core};
 use zksync_types::{
     api::{Transaction, TransactionDetails, TransactionId},
     fee::TransactionExecutionMetrics,
@@ -42,7 +42,11 @@ pub trait TxSink: std::fmt::Debug + Send + Sync + 'static {
 
     /// Attempts to look up the transaction by its API ID in the sink-specific storage.
     /// By default, returns `Ok(None)`.
-    async fn lookup_tx(&self, _id: TransactionId) -> Result<Option<Transaction>, Web3Error> {
+    async fn lookup_tx(
+        &self,
+        _storage: &mut Connection<'_, Core>,
+        _id: TransactionId,
+    ) -> Result<Option<Transaction>, Web3Error> {
         Ok(None)
     }
 
@@ -50,6 +54,7 @@ pub trait TxSink: std::fmt::Debug + Send + Sync + 'static {
     /// By default, returns `Ok(None)`.
     async fn lookup_tx_details(
         &self,
+        _storage: &mut Connection<'_, Core>,
         _hash: H256,
     ) -> Result<Option<TransactionDetails>, Web3Error> {
         Ok(None)
diff --git a/core/lib/zksync_core/src/api_server/utils.rs b/core/node/api_server/src/utils.rs
similarity index 78%
rename from core/lib/zksync_core/src/api_server/utils.rs
rename to core/node/api_server/src/utils.rs
index e95ed019f8c4..6769e773dc77 100644
--- a/core/lib/zksync_core/src/api_server/utils.rs
+++ b/core/node/api_server/src/utils.rs
@@ -6,6 +6,21 @@ use std::{
     time::{Duration, Instant},
 };
 
+use zksync_dal::{Connection, Core, DalError};
+use zksync_web3_decl::error::Web3Error;
+
+/// Opens a readonly transaction over the specified connection.
+pub(crate) async fn open_readonly_transaction<'r>(
+    conn: &'r mut Connection<'_, Core>,
+) -> Result<Connection<'r, Core>, Web3Error> {
+    let builder = conn.transaction_builder().map_err(DalError::generalize)?;
+    Ok(builder
+        .set_readonly()
+        .build()
+        .await
+        .map_err(DalError::generalize)?)
+}
+
 /// Allows filtering events (e.g., for logging) so that they are reported no more frequently than with a configurable interval.
 ///
 /// Current implementation uses thread-local vars in order to not rely on mutexes or other cross-thread primitives.
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/metadata.rs b/core/node/api_server/src/web3/backend_jsonrpsee/metadata.rs
similarity index 90%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/metadata.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/metadata.rs
index a2f8082aeeaa..b703033c1eee 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/metadata.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/metadata.rs
@@ -4,14 +4,11 @@ use std::{cell::RefCell, mem, sync::Arc, time::Instant};
 
 use thread_local::ThreadLocal;
 use zksync_types::api;
-use zksync_web3_decl::{
-    error::Web3Error,
-    jsonrpsee::{helpers::MethodResponseResult, MethodResponse},
-};
+use zksync_web3_decl::{error::Web3Error, jsonrpsee::MethodResponse};
 
 #[cfg(test)]
 use super::testonly::RecordedMethodCalls;
-use crate::api_server::web3::metrics::{ObservedRpcParams, API_METRICS};
+use crate::web3::metrics::{ObservedRpcParams, API_METRICS};
 
 /// Metadata assigned to a JSON-RPC method call.
 #[derive(Debug, Clone)]
@@ -60,7 +57,7 @@ impl Drop for CurrentMethodGuard<'_> {
 // is being polled. We use the drop guard pattern to handle corner cases like the handler panicking.
 // Method handlers are wrapped using RPC-level middleware in `jsonrpsee`.
 #[derive(Debug, Default)]
-pub(crate) struct MethodTracer {
+pub struct MethodTracer {
     inner: ThreadLocal<CurrentMethodInner>,
     #[cfg(test)]
     recorder: RecordedMethodCalls,
@@ -113,11 +110,11 @@ impl MethodTracer {
 #[cfg(test)]
 impl MethodTracer {
     /// Copies current method metadata.
-    pub fn meta(&self) -> Option<MethodMetadata> {
+    pub(crate) fn meta(&self) -> Option<MethodMetadata> {
         self.inner.get_or_default().borrow().clone()
     }
 
-    pub fn recorded_calls(&self) -> &RecordedMethodCalls {
+    pub(crate) fn recorded_calls(&self) -> &RecordedMethodCalls {
         &self.recorder
     }
 }
@@ -154,11 +151,11 @@ impl MethodCall<'_> {
         self.is_completed = true;
         let meta = &self.meta;
         let params = &self.params;
-        match response.success_or_error {
-            MethodResponseResult::Success => {
-                API_METRICS.observe_response_size(meta.name, params, response.result.len());
+        match response.as_error_code() {
+            None => {
+                API_METRICS.observe_response_size(meta.name, params, response.as_result().len());
             }
-            MethodResponseResult::Failed(error_code) => {
+            Some(error_code) => {
                 API_METRICS.observe_protocol_error(
                     meta.name,
                     params,
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/middleware.rs b/core/node/api_server/src/web3/backend_jsonrpsee/middleware.rs
similarity index 95%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/middleware.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/middleware.rs
index 664dda3f81ab..564adf01d82c 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/middleware.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/middleware.rs
@@ -30,7 +30,7 @@ use zksync_web3_decl::jsonrpsee::{
 };
 
 use super::metadata::{MethodCall, MethodTracer};
-use crate::api_server::web3::metrics::{ObservedRpcParams, API_METRICS};
+use crate::web3::metrics::{ObservedRpcParams, API_METRICS};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
 #[metrics(label = "transport", rename_all = "snake_case")]
@@ -92,10 +92,8 @@ where
                 let rp = MethodResponse::error(
                     request.id,
                     ErrorObject::borrowed(
-                        ErrorCode::ServerError(
-                            reqwest::StatusCode::TOO_MANY_REQUESTS.as_u16().into(),
-                        )
-                        .code(),
+                        ErrorCode::ServerError(http::StatusCode::TOO_MANY_REQUESTS.as_u16().into())
+                            .code(),
                         "Too many requests",
                         None,
                     ),
@@ -336,10 +334,10 @@ where
 mod tests {
     use std::time::Duration;
 
-    use jsonrpsee::helpers::MethodResponseResult;
     use rand::{thread_rng, Rng};
     use test_casing::{test_casing, Product};
     use zksync_types::api;
+    use zksync_web3_decl::jsonrpsee::{types::Id, ResponsePayload};
 
     use super::*;
 
@@ -368,11 +366,11 @@ mod tests {
                     }
                 }
 
-                MethodResponse {
-                    result: "{}".to_string(),
-                    success_or_error: MethodResponseResult::Success,
-                    is_subscription: false,
-                }
+                MethodResponse::response(
+                    Id::Number(1),
+                    ResponsePayload::success("{}".to_string()),
+                    usize::MAX,
+                )
             };
 
             WithMethodCall::new(
@@ -396,7 +394,7 @@ mod tests {
             assert_eq!(call.metadata.name, "test");
             assert!(call.metadata.block_id.is_some());
             assert_eq!(call.metadata.block_diff, Some(9));
-            assert!(call.response.is_success());
+            assert!(call.error_code.is_none());
         }
     }
 
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/mod.rs b/core/node/api_server/src/web3/backend_jsonrpsee/mod.rs
similarity index 95%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/mod.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/mod.rs
index 060ee68d3bb7..856ddb35ca3f 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/mod.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/mod.rs
@@ -13,7 +13,7 @@ pub(crate) use self::{
         CorrelationMiddleware, LimitMiddleware, MetadataLayer, ShutdownMiddleware, TrafficTracker,
     },
 };
-use crate::api_server::tx_sender::SubmitTxError;
+use crate::tx_sender::SubmitTxError;
 
 mod metadata;
 mod middleware;
@@ -31,7 +31,7 @@ impl MethodTracer {
             _ => None,
         };
         let code = match err {
-            Web3Error::NotImplemented => ErrorCode::MethodNotFound.code(),
+            Web3Error::MethodNotImplemented => ErrorCode::MethodNotFound.code(),
             Web3Error::InternalError(_) => ErrorCode::InternalError.code(),
             Web3Error::NoBlock
             | Web3Error::PrunedBlock(_)
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/debug.rs b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/debug.rs
similarity index 94%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/debug.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/namespaces/debug.rs
index a628c3f8c7bb..726beae2cc90 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/debug.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/debug.rs
@@ -6,10 +6,10 @@ use zksync_types::{
 };
 use zksync_web3_decl::{
     jsonrpsee::core::{async_trait, RpcResult},
-    namespaces::debug::DebugNamespaceServer,
+    namespaces::DebugNamespaceServer,
 };
 
-use crate::api_server::web3::namespaces::DebugNamespace;
+use crate::web3::namespaces::DebugNamespace;
 
 #[async_trait]
 impl DebugNamespaceServer for DebugNamespace {
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/en.rs b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/en.rs
similarity index 94%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/en.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/namespaces/en.rs
index f9de0638f47c..ef5c6ee40dd9 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/en.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/en.rs
@@ -2,10 +2,10 @@ use zksync_config::{configs::EcosystemContracts, GenesisConfig};
 use zksync_types::{api::en, tokens::TokenInfo, Address, L2BlockNumber};
 use zksync_web3_decl::{
     jsonrpsee::core::{async_trait, RpcResult},
-    namespaces::en::EnNamespaceServer,
+    namespaces::EnNamespaceServer,
 };
 
-use crate::api_server::web3::namespaces::EnNamespace;
+use crate::web3::namespaces::EnNamespace;
 
 #[async_trait]
 impl EnNamespaceServer for EnNamespace {
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/eth.rs b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/eth.rs
similarity index 98%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/eth.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/namespaces/eth.rs
index 03abcef7799b..c4a16b132421 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/eth.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/eth.rs
@@ -9,11 +9,11 @@ use zksync_types::{
 };
 use zksync_web3_decl::{
     jsonrpsee::core::{async_trait, RpcResult},
-    namespaces::eth::EthNamespaceServer,
+    namespaces::EthNamespaceServer,
     types::{Filter, FilterChanges},
 };
 
-use crate::api_server::web3::EthNamespace;
+use crate::web3::EthNamespace;
 
 #[async_trait]
 impl EthNamespaceServer for EthNamespace {
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/mod.rs b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/mod.rs
similarity index 84%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/mod.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/namespaces/mod.rs
index 3f0f043f8d4a..1d00e90b0e84 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/mod.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/mod.rs
@@ -3,5 +3,6 @@ pub mod en;
 pub mod eth;
 pub mod net;
 pub mod snapshots;
+pub mod unstable;
 pub mod web3;
 pub mod zks;
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/net.rs b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/net.rs
similarity index 71%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/net.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/namespaces/net.rs
index 8b3743ac483a..bc7c430e3320 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/net.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/net.rs
@@ -1,7 +1,7 @@
 use zksync_types::U256;
-use zksync_web3_decl::{jsonrpsee::core::RpcResult, namespaces::net::NetNamespaceServer};
+use zksync_web3_decl::{jsonrpsee::core::RpcResult, namespaces::NetNamespaceServer};
 
-use crate::api_server::web3::NetNamespace;
+use crate::web3::NetNamespace;
 
 impl NetNamespaceServer for NetNamespace {
     fn version(&self) -> RpcResult<String> {
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/snapshots.rs b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/snapshots.rs
similarity index 92%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/snapshots.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/namespaces/snapshots.rs
index f2c0a80a122e..824e09e5d0e7 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/snapshots.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/snapshots.rs
@@ -5,7 +5,7 @@ use zksync_types::{
 };
 use zksync_web3_decl::{jsonrpsee::core::RpcResult, namespaces::SnapshotsNamespaceServer};
 
-use crate::api_server::web3::namespaces::SnapshotsNamespace;
+use crate::web3::namespaces::SnapshotsNamespace;
 
 #[async_trait]
 impl SnapshotsNamespaceServer for SnapshotsNamespace {
diff --git a/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/unstable.rs b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/unstable.rs
new file mode 100644
index 000000000000..6abaa718a050
--- /dev/null
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/unstable.rs
@@ -0,0 +1,19 @@
+use zksync_types::{api::TransactionExecutionInfo, H256};
+use zksync_web3_decl::{
+    jsonrpsee::core::{async_trait, RpcResult},
+    namespaces::UnstableNamespaceServer,
+};
+
+use crate::web3::namespaces::UnstableNamespace;
+
+#[async_trait]
+impl UnstableNamespaceServer for UnstableNamespace {
+    async fn transaction_execution_info(
+        &self,
+        hash: H256,
+    ) -> RpcResult<Option<TransactionExecutionInfo>> {
+        self.transaction_execution_info_impl(hash)
+            .await
+            .map_err(|err| self.current_method().map_err(err))
+    }
+}
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/web3.rs b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/web3.rs
similarity index 51%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/web3.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/namespaces/web3.rs
index 8de5cd3fe2c9..dfd9f414ad88 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/web3.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/web3.rs
@@ -1,6 +1,6 @@
-use zksync_web3_decl::{jsonrpsee::core::RpcResult, namespaces::web3::Web3NamespaceServer};
+use zksync_web3_decl::{jsonrpsee::core::RpcResult, namespaces::Web3NamespaceServer};
 
-use crate::api_server::web3::Web3Namespace;
+use crate::web3::Web3Namespace;
 
 impl Web3NamespaceServer for Web3Namespace {
     fn client_version(&self) -> RpcResult<String> {
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/zks.rs b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/zks.rs
similarity index 96%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/zks.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/namespaces/zks.rs
index a119422c97fc..45cb312dde6e 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/namespaces/zks.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/namespaces/zks.rs
@@ -10,15 +10,15 @@ use zksync_types::{
     fee_model::{FeeParams, PubdataIndependentBatchFeeModelInput},
     transaction_request::CallRequest,
     web3::Bytes,
-    Address, L1BatchNumber, L2BlockNumber, StorageLogQueryType, H256, U256, U64,
+    Address, L1BatchNumber, L2BlockNumber, H256, U256, U64,
 };
 use zksync_web3_decl::{
     jsonrpsee::core::{async_trait, RpcResult},
-    namespaces::zks::ZksNamespaceServer,
+    namespaces::ZksNamespaceServer,
     types::Token,
 };
 
-use crate::api_server::web3::ZksNamespace;
+use crate::web3::ZksNamespace;
 
 #[async_trait]
 impl ZksNamespaceServer for ZksNamespace {
@@ -198,7 +198,7 @@ impl ZksNamespaceServer for ZksNamespace {
                     .logs
                     .storage_logs
                     .iter()
-                    .filter(|x| x.log_type != StorageLogQueryType::Read)
+                    .filter(|x| x.log.is_write())
                     .map(ApiStorageLog::from)
                     .collect_vec(),
                 events: result
diff --git a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/testonly.rs b/core/node/api_server/src/web3/backend_jsonrpsee/testonly.rs
similarity index 85%
rename from core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/testonly.rs
rename to core/node/api_server/src/web3/backend_jsonrpsee/testonly.rs
index e93f6c886fdc..79f5009eb978 100644
--- a/core/lib/zksync_core/src/api_server/web3/backend_jsonrpsee/testonly.rs
+++ b/core/node/api_server/src/web3/backend_jsonrpsee/testonly.rs
@@ -2,14 +2,14 @@
 
 use std::{mem, sync::Mutex};
 
-use jsonrpsee::{helpers::MethodResponseResult, MethodResponse};
+use zksync_web3_decl::jsonrpsee::MethodResponse;
 
 use super::metadata::MethodMetadata;
 
 #[derive(Debug, Clone)]
 pub(crate) struct RecordedCall {
     pub metadata: MethodMetadata,
-    pub response: MethodResponseResult,
+    pub error_code: Option<i32>,
 }
 
 /// Test-only JSON-RPC recorded of all calls passing through `MetadataMiddleware`.
@@ -24,7 +24,7 @@ impl RecordedMethodCalls {
             .expect("recorded calls are poisoned")
             .push(RecordedCall {
                 metadata: metadata.clone(),
-                response: response.success_or_error,
+                error_code: response.as_error_code(),
             });
     }
 
diff --git a/core/lib/zksync_core/src/api_server/web3/mempool_cache.rs b/core/node/api_server/src/web3/mempool_cache.rs
similarity index 100%
rename from core/lib/zksync_core/src/api_server/web3/mempool_cache.rs
rename to core/node/api_server/src/web3/mempool_cache.rs
diff --git a/core/lib/zksync_core/src/api_server/web3/metrics.rs b/core/node/api_server/src/web3/metrics.rs
similarity index 98%
rename from core/lib/zksync_core/src/api_server/web3/metrics.rs
rename to core/node/api_server/src/web3/metrics.rs
index f2ec4a683c97..9d8cbf813b03 100644
--- a/core/lib/zksync_core/src/api_server/web3/metrics.rs
+++ b/core/node/api_server/src/web3/metrics.rs
@@ -13,7 +13,7 @@ use super::{
     backend_jsonrpsee::MethodMetadata, ApiTransport, InternalApiConfig, OptionalApiParams,
     TypedFilter,
 };
-use crate::api_server::utils::ReportFilter;
+use crate::utils::ReportFilter;
 
 /// Observed version of RPC parameters. Have a bounded upper-limit size (256 bytes), so that we don't over-allocate.
 #[derive(Debug)]
@@ -81,7 +81,7 @@ impl<'a> ObservedRpcParams<'a> {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
 #[metrics(label = "scheme", rename_all = "UPPERCASE")]
-pub(in crate::api_server) enum ApiTransportLabel {
+pub(crate) enum ApiTransportLabel {
     Http,
     Ws,
 }
@@ -102,6 +102,7 @@ enum BlockIdLabel {
     Committed,
     Finalized,
     Latest,
+    L1Committed,
     Earliest,
     Pending,
     Number,
@@ -139,6 +140,7 @@ impl From<&MethodMetadata> for MethodLabels {
             api::BlockId::Number(api::BlockNumber::Committed) => BlockIdLabel::Committed,
             api::BlockId::Number(api::BlockNumber::Finalized) => BlockIdLabel::Finalized,
             api::BlockId::Number(api::BlockNumber::Latest) => BlockIdLabel::Latest,
+            api::BlockId::Number(api::BlockNumber::L1Committed) => BlockIdLabel::L1Committed,
             api::BlockId::Number(api::BlockNumber::Earliest) => BlockIdLabel::Earliest,
             api::BlockId::Number(api::BlockNumber::Pending) => BlockIdLabel::Pending,
         });
@@ -185,7 +187,7 @@ impl Web3ErrorKind {
             Web3Error::LogsLimitExceeded(..) => Self::LogsLimitExceeded,
             Web3Error::InvalidFilterBlockHash => Self::InvalidFilterBlockHash,
             Web3Error::TreeApiUnavailable => Self::TreeApiUnavailable,
-            Web3Error::InternalError(_) | Web3Error::NotImplemented => Self::Internal,
+            Web3Error::InternalError(_) | Web3Error::MethodNotImplemented => Self::Internal,
         }
     }
 }
@@ -235,7 +237,7 @@ const RESPONSE_SIZE_BUCKETS: Buckets = Buckets::exponential(1.0..=1_048_576.0, 4
 /// General-purpose API server metrics.
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "api")]
-pub(in crate::api_server) struct ApiMetrics {
+pub(crate) struct ApiMetrics {
     /// Web3 server configuration.
     web3_info: Family<ApiTransportLabel, Info<Web3ConfigLabels>>,
 
@@ -411,11 +413,11 @@ impl ApiMetrics {
 }
 
 #[vise::register]
-pub(in crate::api_server) static API_METRICS: vise::Global<ApiMetrics> = vise::Global::new();
+pub(crate) static API_METRICS: vise::Global<ApiMetrics> = vise::Global::new();
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
 #[metrics(label = "subscription_type", rename_all = "snake_case")]
-pub(super) enum SubscriptionType {
+pub enum SubscriptionType {
     Blocks,
     Txs,
     Logs,
diff --git a/core/lib/zksync_core/src/api_server/web3/mod.rs b/core/node/api_server/src/web3/mod.rs
similarity index 96%
rename from core/lib/zksync_core/src/api_server/web3/mod.rs
rename to core/node/api_server/src/web3/mod.rs
index 00050fb85812..bad1b493a5fd 100644
--- a/core/lib/zksync_core/src/api_server/web3/mod.rs
+++ b/core/node/api_server/src/web3/mod.rs
@@ -10,8 +10,10 @@ use tokio::{
 };
 use tower_http::{cors::CorsLayer, metrics::InFlightRequestsLayer};
 use zksync_config::configs::api::{MaxResponseSize, MaxResponseSizeOverrides};
-use zksync_dal::{ConnectionPool, Core};
+use zksync_dal::{helpers::wait_for_l1_batch, ConnectionPool, Core};
 use zksync_health_check::{HealthStatus, HealthUpdater, ReactiveHealthCheck};
+use zksync_metadata_calculator::api_server::TreeApiClient;
+use zksync_node_sync::SyncState;
 use zksync_types::L2BlockNumber;
 use zksync_web3_decl::{
     jsonrpsee::{
@@ -22,7 +24,8 @@ use zksync_web3_decl::{
     },
     namespaces::{
         DebugNamespaceServer, EnNamespaceServer, EthNamespaceServer, EthPubSubServer,
-        NetNamespaceServer, SnapshotsNamespaceServer, Web3NamespaceServer, ZksNamespaceServer,
+        NetNamespaceServer, SnapshotsNamespaceServer, UnstableNamespaceServer, Web3NamespaceServer,
+        ZksNamespaceServer,
     },
     types::Filter,
 };
@@ -35,20 +38,15 @@ use self::{
     mempool_cache::MempoolCache,
     metrics::API_METRICS,
     namespaces::{
-        DebugNamespace, EnNamespace, EthNamespace, NetNamespace, SnapshotsNamespace, Web3Namespace,
-        ZksNamespace,
+        DebugNamespace, EnNamespace, EthNamespace, NetNamespace, SnapshotsNamespace,
+        UnstableNamespace, Web3Namespace, ZksNamespace,
     },
     pubsub::{EthSubscribe, EthSubscriptionIdProvider, PubSubEvent},
     state::{Filters, InternalApiConfig, RpcState, SealedL2BlockNumber},
 };
 use crate::{
-    api_server::{
-        execution_sandbox::{BlockStartInfo, VmConcurrencyBarrier},
-        tree::TreeApiClient,
-        tx_sender::TxSender,
-    },
-    sync_layer::SyncState,
-    utils::wait_for_l1_batch,
+    execution_sandbox::{BlockStartInfo, VmConcurrencyBarrier},
+    tx_sender::TxSender,
 };
 
 pub mod backend_jsonrpsee;
@@ -57,6 +55,7 @@ pub(super) mod metrics;
 pub mod namespaces;
 mod pubsub;
 pub mod state;
+pub mod testonly;
 #[cfg(test)]
 pub(crate) mod tests;
 
@@ -88,8 +87,9 @@ enum ApiTransport {
     Http(SocketAddr),
 }
 
-#[derive(Debug, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Deserialize, Clone, PartialEq, strum::EnumString)]
 #[serde(rename_all = "lowercase")]
+#[strum(serialize_all = "lowercase")]
 pub enum Namespace {
     Eth,
     Net,
@@ -99,6 +99,7 @@ pub enum Namespace {
     En,
     Pubsub,
     Snapshots,
+    Unstable,
 }
 
 impl Namespace {
@@ -284,13 +285,15 @@ impl ApiBuilder {
         self
     }
 
-    #[cfg(test)]
+    // Intended for tests only.
+    #[doc(hidden)]
     fn with_pub_sub_events(mut self, sender: mpsc::UnboundedSender<PubSubEvent>) -> Self {
         self.optional.pub_sub_events_sender = Some(sender);
         self
     }
 
-    #[cfg(test)]
+    // Intended for tests only.
+    #[doc(hidden)]
     fn with_method_tracer(mut self, method_tracer: Arc<MethodTracer>) -> Self {
         self.method_tracer = method_tracer;
         self
@@ -406,9 +409,13 @@ impl ApiServer {
                 .context("cannot merge en namespace")?;
         }
         if namespaces.contains(&Namespace::Snapshots) {
-            rpc.merge(SnapshotsNamespace::new(rpc_state).into_rpc())
+            rpc.merge(SnapshotsNamespace::new(rpc_state.clone()).into_rpc())
                 .context("cannot merge snapshots namespace")?;
         }
+        if namespaces.contains(&Namespace::Unstable) {
+            rpc.merge(UnstableNamespace::new(rpc_state).into_rpc())
+                .context("cannot merge unstable namespace")?;
+        }
         Ok(rpc)
     }
 
@@ -539,8 +546,8 @@ impl ApiServer {
                         "Overriding max response size to {limit}B for sync method `{method_name}`"
                     );
                     let sync_method = sync_method.clone();
-                    MethodCallback::Sync(Arc::new(move |id, params, _max_response_size| {
-                        sync_method(id, params, limit)
+                    MethodCallback::Sync(Arc::new(move |id, params, _max_response_size, ext| {
+                        sync_method(id, params, limit, ext)
                     }))
                 }
                 (MethodCallback::Async(async_method), Some(limit)) => {
@@ -549,8 +556,8 @@ impl ApiServer {
                     );
                     let async_method = async_method.clone();
                     MethodCallback::Async(Arc::new(
-                        move |id, params, connection_id, _max_response_size| {
-                            async_method(id, params, connection_id, limit)
+                        move |id, params, connection_id, _max_response_size, ext| {
+                            async_method(id, params, connection_id, limit, ext)
                         },
                     ))
                 }
@@ -560,8 +567,8 @@ impl ApiServer {
                     );
                     let unsub_method = unsub_method.clone();
                     MethodCallback::Unsubscription(Arc::new(
-                        move |id, params, connection_id, _max_response_size| {
-                            unsub_method(id, params, connection_id, limit)
+                        move |id, params, connection_id, _max_response_size, ext| {
+                            unsub_method(id, params, connection_id, limit, ext)
                         },
                     ))
                 }
@@ -645,10 +652,10 @@ impl ApiServer {
         let cors = is_http.then(|| {
             CorsLayer::new()
                 // Allow `POST` when accessing the resource
-                .allow_methods([reqwest::Method::POST])
+                .allow_methods([http::Method::POST])
                 // Allow requests from any origin
                 .allow_origin(tower_http::cors::Any)
-                .allow_headers([reqwest::header::CONTENT_TYPE])
+                .allow_headers([http::header::CONTENT_TYPE])
         });
         // Setup metrics for the number of in-flight requests.
         let (in_flight_requests, counter) = InFlightRequestsLayer::pair();
diff --git a/core/lib/zksync_core/src/api_server/web3/namespaces/debug.rs b/core/node/api_server/src/web3/namespaces/debug.rs
similarity index 89%
rename from core/lib/zksync_core/src/api_server/web3/namespaces/debug.rs
rename to core/node/api_server/src/web3/namespaces/debug.rs
index aee048a16890..a2e6e2782ac5 100644
--- a/core/lib/zksync_core/src/api_server/web3/namespaces/debug.rs
+++ b/core/node/api_server/src/web3/namespaces/debug.rs
@@ -1,9 +1,11 @@
 use std::sync::Arc;
 
 use anyhow::Context as _;
-use multivm::{interface::ExecutionResult, vm_latest::constants::BATCH_COMPUTATIONAL_GAS_LIMIT};
 use once_cell::sync::OnceCell;
 use zksync_dal::{CoreDal, DalError};
+use zksync_multivm::{
+    interface::ExecutionResult, vm_latest::constants::BATCH_COMPUTATIONAL_GAS_LIMIT,
+};
 use zksync_system_constants::MAX_ENCODED_TX_SIZE;
 use zksync_types::{
     api::{BlockId, BlockNumber, DebugCall, ResultDebugCall, TracerConfig},
@@ -16,7 +18,7 @@ use zksync_types::{
 };
 use zksync_web3_decl::error::Web3Error;
 
-use crate::api_server::{
+use crate::{
     execution_sandbox::{ApiTracer, TxSharedArgs},
     tx_sender::{ApiContracts, TxSenderConfig},
     web3::{backend_jsonrpsee::MethodTracer, state::RpcState},
@@ -31,7 +33,7 @@ pub(crate) struct DebugNamespace {
 
 impl DebugNamespace {
     pub async fn new(state: RpcState) -> anyhow::Result<Self> {
-        let api_contracts = ApiContracts::load_from_disk();
+        let api_contracts = ApiContracts::load_from_disk().await?;
         let fee_input_provider = &state.tx_sender.0.batch_fee_input_provider;
         let batch_fee_input = fee_input_provider
             .get_batch_fee_input_scaled(
@@ -63,6 +65,10 @@ impl DebugNamespace {
         options: Option<TracerConfig>,
     ) -> Result<Vec<ResultDebugCall>, Web3Error> {
         self.current_method().set_block_id(block_id);
+        if matches!(block_id, BlockId::Number(BlockNumber::Pending)) {
+            // See `EthNamespace::get_block_impl()` for an explanation why this check is needed.
+            return Ok(vec![]);
+        }
 
         let only_top_call = options
             .map(|options| options.tracer_config.only_top_call)
@@ -125,7 +131,7 @@ impl DebugNamespace {
 
     pub async fn debug_trace_call_impl(
         &self,
-        request: CallRequest,
+        mut request: CallRequest,
         block_id: Option<BlockId>,
         options: Option<TracerConfig>,
     ) -> Result<DebugCall, Web3Error> {
@@ -148,6 +154,19 @@ impl DebugNamespace {
                 .last_sealed_l2_block
                 .diff_with_block_args(&block_args),
         );
+
+        if request.gas.is_none() {
+            request.gas = Some(
+                self.state
+                    .tx_sender
+                    .get_default_eth_call_gas(block_args)
+                    .await
+                    .map_err(Web3Error::InternalError)?
+                    .into(),
+            )
+        }
+
+        let call_overrides = request.get_call_overrides()?;
         let tx = L2Tx::from_request(request.into(), MAX_ENCODED_TX_SIZE)?;
 
         let shared_args = self.shared_args().await;
@@ -173,6 +192,7 @@ impl DebugNamespace {
                 vm_permit,
                 shared_args,
                 self.state.connection_pool.clone(),
+                call_overrides,
                 tx.clone(),
                 block_args,
                 self.sender_config().vm_execution_cache_misses_limit,
diff --git a/core/lib/zksync_core/src/api_server/web3/namespaces/en.rs b/core/node/api_server/src/web3/namespaces/en.rs
similarity index 77%
rename from core/lib/zksync_core/src/api_server/web3/namespaces/en.rs
rename to core/node/api_server/src/web3/namespaces/en.rs
index 621b62a53ec1..2661d9d81bf7 100644
--- a/core/lib/zksync_core/src/api_server/web3/namespaces/en.rs
+++ b/core/node/api_server/src/web3/namespaces/en.rs
@@ -1,10 +1,13 @@
 use anyhow::Context as _;
 use zksync_config::{configs::EcosystemContracts, GenesisConfig};
 use zksync_dal::{CoreDal, DalError};
-use zksync_types::{api::en, tokens::TokenInfo, Address, L1BatchNumber, L2BlockNumber, H256};
+use zksync_types::{
+    api::en, protocol_version::ProtocolSemanticVersion, tokens::TokenInfo, Address, L1BatchNumber,
+    L2BlockNumber,
+};
 use zksync_web3_decl::error::Web3Error;
 
-use crate::api_server::web3::{backend_jsonrpsee::MethodTracer, state::RpcState};
+use crate::web3::{backend_jsonrpsee::MethodTracer, state::RpcState};
 
 /// Namespace for External Node unique methods.
 /// Main use case for it is the EN synchronization.
@@ -90,17 +93,24 @@ impl EnNamespace {
         let mut storage = self.state.acquire_connection().await?;
         let genesis_batch = storage
             .blocks_dal()
-            .get_storage_l1_batch(L1BatchNumber(0))
+            .get_l1_batch_metadata(L1BatchNumber(0))
             .await
             .map_err(DalError::generalize)?
             .context("Genesis batch doesn't exist")?;
-
-        let protocol_version = genesis_batch
+        let minor = genesis_batch
+            .header
             .protocol_version
-            .context("Genesis is not finished")? as u16;
+            .context("Genesis is not finished")?;
+        let patch = storage
+            .protocol_versions_dal()
+            .first_patch_for_version(minor)
+            .await
+            .map_err(DalError::generalize)?
+            .context("Genesis is not finished")?;
+        let protocol_version = ProtocolSemanticVersion { minor, patch };
         let verifier_config = storage
             .protocol_versions_dal()
-            .l1_verifier_config_for_version(protocol_version.try_into().unwrap())
+            .l1_verifier_config_for_version(protocol_version)
             .await
             .context("Genesis is not finished")?;
         let fee_account = storage
@@ -112,31 +122,12 @@ impl EnNamespace {
 
         let config = GenesisConfig {
             protocol_version: Some(protocol_version),
-            genesis_root_hash: Some(H256::from_slice(
-                &genesis_batch.hash.context("Genesis is not finished")?,
-            )),
-            rollup_last_leaf_index: Some(
-                genesis_batch
-                    .rollup_last_leaf_index
-                    .context("Genesis is not finished")? as u64,
-            ),
-            genesis_commitment: Some(H256::from_slice(
-                &genesis_batch
-                    .commitment
-                    .context("Genesis is not finished")?,
-            )),
-            bootloader_hash: Some(H256::from_slice(
-                &genesis_batch
-                    .bootloader_code_hash
-                    .context("Genesis is not finished")?,
-            )),
-            default_aa_hash: Some(H256::from_slice(
-                &genesis_batch
-                    .default_aa_code_hash
-                    .context("Genesis is not finished")?,
-            )),
+            genesis_root_hash: Some(genesis_batch.metadata.root_hash),
+            rollup_last_leaf_index: Some(genesis_batch.metadata.rollup_last_leaf_index),
+            genesis_commitment: Some(genesis_batch.metadata.commitment),
+            bootloader_hash: Some(genesis_batch.header.base_system_contracts_hashes.bootloader),
+            default_aa_hash: Some(genesis_batch.header.base_system_contracts_hashes.default_aa),
             l1_chain_id: self.state.api_config.l1_chain_id,
-
             l2_chain_id: self.state.api_config.l2_chain_id,
             recursion_node_level_vk_hash: verifier_config.params.recursion_node_level_vk_hash,
             recursion_leaf_level_vk_hash: verifier_config.params.recursion_leaf_level_vk_hash,
diff --git a/core/lib/zksync_core/src/api_server/web3/namespaces/eth.rs b/core/node/api_server/src/web3/namespaces/eth.rs
similarity index 90%
rename from core/lib/zksync_core/src/api_server/web3/namespaces/eth.rs
rename to core/node/api_server/src/web3/namespaces/eth.rs
index 45e938cf2163..7b4710d1cd4a 100644
--- a/core/lib/zksync_core/src/api_server/web3/namespaces/eth.rs
+++ b/core/node/api_server/src/web3/namespaces/eth.rs
@@ -18,8 +18,9 @@ use zksync_web3_decl::{
     types::{Address, Block, Filter, FilterChanges, Log, U64},
 };
 
-use crate::api_server::web3::{
-    backend_jsonrpsee::MethodTracer, metrics::API_METRICS, state::RpcState, TypedFilter,
+use crate::{
+    utils::open_readonly_transaction,
+    web3::{backend_jsonrpsee::MethodTracer, metrics::API_METRICS, state::RpcState, TypedFilter},
 };
 
 pub const EVENT_TOPIC_NUMBER_LIMIT: usize = 4;
@@ -52,7 +53,7 @@ impl EthNamespace {
 
     pub async fn call_impl(
         &self,
-        request: CallRequest,
+        mut request: CallRequest,
         block_id: Option<BlockId>,
     ) -> Result<Bytes, Web3Error> {
         let block_id = block_id.unwrap_or(BlockId::Number(BlockNumber::Pending));
@@ -70,8 +71,25 @@ impl EthNamespace {
         );
         drop(connection);
 
+        if request.gas.is_none() {
+            request.gas = Some(
+                self.state
+                    .tx_sender
+                    .get_default_eth_call_gas(block_args)
+                    .await
+                    .map_err(Web3Error::InternalError)?
+                    .into(),
+            )
+        }
+        let call_overrides = request.get_call_overrides()?;
         let tx = L2Tx::from_request(request.into(), self.state.api_config.max_tx_size)?;
-        let call_result = self.state.tx_sender.eth_call(block_args, tx).await?;
+
+        // It is assumed that the previous checks has already enforced that the `max_fee_per_gas` is at most u64.
+        let call_result: Vec<u8> = self
+            .state
+            .tx_sender
+            .eth_call(block_args, call_overrides, tx)
+            .await?;
         Ok(call_result.into())
     }
 
@@ -179,7 +197,7 @@ impl EthNamespace {
             .state
             .installed_filters
             .as_ref()
-            .ok_or(Web3Error::NotImplemented)?;
+            .ok_or(Web3Error::MethodNotImplemented)?;
         // We clone the filter to not hold the filter lock for an extended period of time.
         let maybe_filter = installed_filters.lock().await.get_and_update_stats(idx);
 
@@ -206,8 +224,15 @@ impl EthNamespace {
         full_transactions: bool,
     ) -> Result<Option<Block<TransactionVariant>>, Web3Error> {
         self.current_method().set_block_id(block_id);
-        let mut storage = self.state.acquire_connection().await?;
+        if matches!(block_id, BlockId::Number(BlockNumber::Pending)) {
+            // Shortcut here on a somewhat unlikely case of the client requesting a pending block.
+            // Otherwise, since we don't read DB data in a transaction,
+            // we might resolve a block number to a block that will be inserted to the DB immediately after,
+            // and return `Ok(Some(_))`.
+            return Ok(None);
+        }
 
+        let mut storage = self.state.acquire_connection().await?;
         self.state
             .start_info
             .ensure_not_pruned(block_id, &mut storage)
@@ -271,8 +296,12 @@ impl EthNamespace {
         block_id: BlockId,
     ) -> Result<Option<U256>, Web3Error> {
         self.current_method().set_block_id(block_id);
-        let mut storage = self.state.acquire_connection().await?;
+        if matches!(block_id, BlockId::Number(BlockNumber::Pending)) {
+            // See `get_block_impl()` for an explanation why this check is needed.
+            return Ok(None);
+        }
 
+        let mut storage = self.state.acquire_connection().await?;
         self.state
             .start_info
             .ensure_not_pruned(block_id, &mut storage)
@@ -302,8 +331,12 @@ impl EthNamespace {
         block_id: BlockId,
     ) -> Result<Option<Vec<TransactionReceipt>>, Web3Error> {
         self.current_method().set_block_id(block_id);
-        let mut storage = self.state.acquire_connection().await?;
+        if matches!(block_id, BlockId::Number(BlockNumber::Pending)) {
+            // See `get_block_impl()` for an explanation why this check is needed.
+            return Ok(None);
+        }
 
+        let mut storage = self.state.acquire_connection().await?;
         self.state
             .start_info
             .ensure_not_pruned(block_id, &mut storage)
@@ -374,7 +407,7 @@ impl EthNamespace {
         self.set_block_diff(block_number);
         let value = connection
             .storage_web3_dal()
-            .get_historical_value_unchecked(&storage_key, block_number)
+            .get_historical_value_unchecked(storage_key.hashed_key(), block_number)
             .await
             .map_err(DalError::generalize)?;
         Ok(value)
@@ -431,6 +464,9 @@ impl EthNamespace {
         id: TransactionId,
     ) -> Result<Option<Transaction>, Web3Error> {
         let mut storage = self.state.acquire_connection().await?;
+        // Open a readonly transaction to have a consistent view of Postgres
+        let mut storage = open_readonly_transaction(&mut storage).await?;
+
         let chain_id = self.state.api_config.l2_chain_id;
         let mut transaction = match id {
             TransactionId::Hash(hash) => storage
@@ -440,6 +476,11 @@ impl EthNamespace {
                 .map_err(DalError::generalize)?,
 
             TransactionId::Block(block_id, idx) => {
+                if matches!(block_id, BlockId::Number(BlockNumber::Pending)) {
+                    // See `get_block_impl()` for an explanation why this check is needed.
+                    return Ok(None);
+                }
+
                 let Ok(idx) = u32::try_from(idx) else {
                     return Ok(None); // index overflow means no transaction
                 };
@@ -460,7 +501,7 @@ impl EthNamespace {
         };
 
         if transaction.is_none() {
-            transaction = self.state.tx_sink().lookup_tx(id).await?;
+            transaction = self.state.tx_sink().lookup_tx(&mut storage, id).await?;
         }
         Ok(transaction)
     }
@@ -483,7 +524,7 @@ impl EthNamespace {
             .state
             .installed_filters
             .as_ref()
-            .ok_or(Web3Error::NotImplemented)?;
+            .ok_or(Web3Error::MethodNotImplemented)?;
         let mut storage = self.state.acquire_connection().await?;
         let last_block_number = storage
             .blocks_dal()
@@ -505,7 +546,7 @@ impl EthNamespace {
             .state
             .installed_filters
             .as_ref()
-            .ok_or(Web3Error::NotImplemented)?;
+            .ok_or(Web3Error::MethodNotImplemented)?;
         if let Some(topics) = filter.topics.as_ref() {
             if topics.len() > EVENT_TOPIC_NUMBER_LIMIT {
                 return Err(Web3Error::TooManyTopics);
@@ -525,7 +566,7 @@ impl EthNamespace {
             .state
             .installed_filters
             .as_ref()
-            .ok_or(Web3Error::NotImplemented)?;
+            .ok_or(Web3Error::MethodNotImplemented)?;
         Ok(installed_filters
             .lock()
             .await
@@ -539,7 +580,7 @@ impl EthNamespace {
             .state
             .installed_filters
             .as_ref()
-            .ok_or(Web3Error::NotImplemented)?;
+            .ok_or(Web3Error::MethodNotImplemented)?;
         let mut filter = installed_filters
             .lock()
             .await
@@ -565,7 +606,7 @@ impl EthNamespace {
             .state
             .installed_filters
             .as_ref()
-            .ok_or(Web3Error::NotImplemented)?;
+            .ok_or(Web3Error::MethodNotImplemented)?;
         Ok(installed_filters.lock().await.remove(idx))
     }
 
@@ -647,6 +688,10 @@ impl EthNamespace {
             base_fee_per_gas.len()
         ]);
 
+        // We do not support EIP-4844, but per API specification we should return 0 for pre EIP-4844 blocks.
+        let base_fee_per_blob_gas = vec![U256::zero(); base_fee_per_gas.len()];
+        let blob_gas_used_ratio = vec![0.0; base_fee_per_gas.len()];
+
         // `base_fee_per_gas` for next L2 block cannot be calculated, appending last fee as a placeholder.
         base_fee_per_gas.push(*base_fee_per_gas.last().unwrap());
         Ok(FeeHistory {
@@ -654,6 +699,8 @@ impl EthNamespace {
             base_fee_per_gas,
             gas_used_ratio,
             reward,
+            base_fee_per_blob_gas,
+            blob_gas_used_ratio,
         })
     }
 
@@ -766,7 +813,7 @@ impl EthNamespace {
                         return Err(Web3Error::LogsLimitExceeded(
                             self.state.api_config.req_entities_limit,
                             from_block.0,
-                            l2_block_number.0 - 1,
+                            from_block.0.max(l2_block_number.0 - 1),
                         ));
                     }
                 }
@@ -799,17 +846,17 @@ impl EthNamespace {
     }
 
     pub fn uncle_count_impl(&self, _block: BlockId) -> Option<U256> {
-        // We don't have uncles in zkSync.
+        // We don't have uncles in ZKsync.
         Some(0.into())
     }
 
     pub fn hashrate_impl(&self) -> U256 {
-        // zkSync is not a PoW chain.
+        // ZKsync is not a PoW chain.
         U256::zero()
     }
 
     pub fn mining_impl(&self) -> bool {
-        // zkSync is not a PoW chain.
+        // ZKsync is not a PoW chain.
         false
     }
 
diff --git a/core/lib/zksync_core/src/api_server/web3/namespaces/mod.rs b/core/node/api_server/src/web3/namespaces/mod.rs
similarity index 71%
rename from core/lib/zksync_core/src/api_server/web3/namespaces/mod.rs
rename to core/node/api_server/src/web3/namespaces/mod.rs
index b9355f7181ff..bf35cac0409e 100644
--- a/core/lib/zksync_core/src/api_server/web3/namespaces/mod.rs
+++ b/core/node/api_server/src/web3/namespaces/mod.rs
@@ -6,10 +6,12 @@ mod en;
 pub(crate) mod eth;
 mod net;
 mod snapshots;
+mod unstable;
 mod web3;
 mod zks;
 
 pub(super) use self::{
     debug::DebugNamespace, en::EnNamespace, eth::EthNamespace, net::NetNamespace,
-    snapshots::SnapshotsNamespace, web3::Web3Namespace, zks::ZksNamespace,
+    snapshots::SnapshotsNamespace, unstable::UnstableNamespace, web3::Web3Namespace,
+    zks::ZksNamespace,
 };
diff --git a/core/lib/zksync_core/src/api_server/web3/namespaces/net.rs b/core/node/api_server/src/web3/namespaces/net.rs
similarity index 100%
rename from core/lib/zksync_core/src/api_server/web3/namespaces/net.rs
rename to core/node/api_server/src/web3/namespaces/net.rs
diff --git a/core/lib/zksync_core/src/api_server/web3/namespaces/snapshots.rs b/core/node/api_server/src/web3/namespaces/snapshots.rs
similarity index 97%
rename from core/lib/zksync_core/src/api_server/web3/namespaces/snapshots.rs
rename to core/node/api_server/src/web3/namespaces/snapshots.rs
index 9397d24479df..0586940b0eb0 100644
--- a/core/lib/zksync_core/src/api_server/web3/namespaces/snapshots.rs
+++ b/core/node/api_server/src/web3/namespaces/snapshots.rs
@@ -6,7 +6,7 @@ use zksync_types::{
 };
 use zksync_web3_decl::error::Web3Error;
 
-use crate::api_server::web3::{backend_jsonrpsee::MethodTracer, state::RpcState};
+use crate::web3::{backend_jsonrpsee::MethodTracer, state::RpcState};
 
 #[derive(Debug, Clone)]
 pub(crate) struct SnapshotsNamespace {
diff --git a/core/node/api_server/src/web3/namespaces/unstable.rs b/core/node/api_server/src/web3/namespaces/unstable.rs
new file mode 100644
index 000000000000..b46ecd6dc530
--- /dev/null
+++ b/core/node/api_server/src/web3/namespaces/unstable.rs
@@ -0,0 +1,33 @@
+use zksync_dal::{CoreDal, DalError};
+use zksync_types::api::TransactionExecutionInfo;
+use zksync_web3_decl::{error::Web3Error, types::H256};
+
+use crate::web3::{backend_jsonrpsee::MethodTracer, RpcState};
+
+#[derive(Debug)]
+pub(crate) struct UnstableNamespace {
+    state: RpcState,
+}
+
+impl UnstableNamespace {
+    pub fn new(state: RpcState) -> Self {
+        Self { state }
+    }
+
+    pub(crate) fn current_method(&self) -> &MethodTracer {
+        &self.state.current_method
+    }
+
+    pub async fn transaction_execution_info_impl(
+        &self,
+        hash: H256,
+    ) -> Result<Option<TransactionExecutionInfo>, Web3Error> {
+        let mut storage = self.state.acquire_connection().await?;
+        Ok(storage
+            .transactions_web3_dal()
+            .get_unstable_transaction_execution_info(hash)
+            .await
+            .map_err(DalError::generalize)?
+            .map(|execution_info| TransactionExecutionInfo { execution_info }))
+    }
+}
diff --git a/core/lib/zksync_core/src/api_server/web3/namespaces/web3.rs b/core/node/api_server/src/web3/namespaces/web3.rs
similarity index 100%
rename from core/lib/zksync_core/src/api_server/web3/namespaces/web3.rs
rename to core/node/api_server/src/web3/namespaces/web3.rs
diff --git a/core/lib/zksync_core/src/api_server/web3/namespaces/zks.rs b/core/node/api_server/src/web3/namespaces/zks.rs
similarity index 94%
rename from core/lib/zksync_core/src/api_server/web3/namespaces/zks.rs
rename to core/node/api_server/src/web3/namespaces/zks.rs
index 339961f7dd60..2b3fbbcd55ca 100644
--- a/core/lib/zksync_core/src/api_server/web3/namespaces/zks.rs
+++ b/core/node/api_server/src/web3/namespaces/zks.rs
@@ -1,9 +1,10 @@
 use std::{collections::HashMap, convert::TryInto};
 
 use anyhow::Context as _;
-use multivm::interface::VmExecutionResultAndLogs;
 use zksync_dal::{Connection, Core, CoreDal, DalError};
+use zksync_metadata_calculator::api_server::TreeApiError;
 use zksync_mini_merkle_tree::MiniMerkleTree;
+use zksync_multivm::interface::VmExecutionResultAndLogs;
 use zksync_system_constants::DEFAULT_L2_TX_GAS_PER_PUBDATA_BYTE;
 use zksync_types::{
     api::{
@@ -28,8 +29,8 @@ use zksync_web3_decl::{
     types::{Address, Token, H256},
 };
 
-use crate::api_server::{
-    tree::TreeApiError,
+use crate::{
+    utils::open_readonly_transaction,
     web3::{backend_jsonrpsee::MethodTracer, metrics::API_METRICS, RpcState},
 };
 
@@ -401,15 +402,20 @@ impl ZksNamespace {
         hash: H256,
     ) -> Result<Option<TransactionDetails>, Web3Error> {
         let mut storage = self.state.acquire_connection().await?;
+        // Open a readonly transaction to have a consistent view of Postgres
+        let mut storage = open_readonly_transaction(&mut storage).await?;
         let mut tx_details = storage
             .transactions_web3_dal()
             .get_transaction_details(hash)
             .await
             .map_err(DalError::generalize)?;
-        drop(storage);
 
         if tx_details.is_none() {
-            tx_details = self.state.tx_sink().lookup_tx_details(hash).await?;
+            tx_details = self
+                .state
+                .tx_sink()
+                .lookup_tx_details(&mut storage, hash)
+                .await?;
         }
         Ok(tx_details)
     }
@@ -438,7 +444,7 @@ impl ZksNamespace {
         let mut storage = self.state.acquire_connection().await?;
         Ok(storage
             .factory_deps_dal()
-            .get_factory_dep(hash)
+            .get_sealed_factory_dep(hash)
             .await
             .map_err(DalError::generalize)?)
     }
@@ -494,11 +500,11 @@ impl ZksNamespace {
             .state
             .tree_api
             .as_deref()
-            .ok_or(Web3Error::TreeApiUnavailable)?;
+            .ok_or(Web3Error::MethodNotImplemented)?;
         let proofs_result = tree_api.get_proofs(l1_batch_number, hashed_keys).await;
         let proofs = match proofs_result {
             Ok(proofs) => proofs,
-            Err(TreeApiError::NotReady) => return Err(Web3Error::TreeApiUnavailable),
+            Err(TreeApiError::NotReady(_)) => return Err(Web3Error::TreeApiUnavailable),
             Err(TreeApiError::NoVersion(err)) => {
                 return if err.missing_version > err.version_count {
                     Ok(None)
@@ -509,6 +515,12 @@ impl ZksNamespace {
                 };
             }
             Err(TreeApiError::Internal(err)) => return Err(Web3Error::InternalError(err)),
+            Err(_) => {
+                // This branch is not expected to be executed, but has to be provided since the error is non-exhaustive.
+                return Err(Web3Error::InternalError(anyhow::anyhow!(
+                    "Unspecified tree API error"
+                )));
+            }
         };
 
         let storage_proof = proofs
@@ -532,7 +544,7 @@ impl ZksNamespace {
         self.state
             .api_config
             .base_token_address
-            .ok_or(Web3Error::NotImplemented)
+            .ok_or(Web3Error::MethodNotImplemented)
     }
 
     #[tracing::instrument(skip(self))]
diff --git a/core/lib/zksync_core/src/api_server/web3/pubsub.rs b/core/node/api_server/src/web3/pubsub.rs
similarity index 99%
rename from core/lib/zksync_core/src/api_server/web3/pubsub.rs
rename to core/node/api_server/src/web3/pubsub.rs
index 0ce5698ecea6..f3fa564c3e44 100644
--- a/core/lib/zksync_core/src/api_server/web3/pubsub.rs
+++ b/core/node/api_server/src/web3/pubsub.rs
@@ -41,7 +41,7 @@ impl IdProvider for EthSubscriptionIdProvider {
 
 /// Events emitted by the subscription logic. Only used in WebSocket server tests so far.
 #[derive(Debug)]
-pub(super) enum PubSubEvent {
+pub enum PubSubEvent {
     Subscribed(SubscriptionType),
     NotifyIterationFinished(SubscriptionType),
     L2BlockAdvanced(SubscriptionType, L2BlockNumber),
diff --git a/core/lib/zksync_core/src/api_server/web3/state.rs b/core/node/api_server/src/web3/state.rs
similarity index 95%
rename from core/lib/zksync_core/src/api_server/web3/state.rs
rename to core/node/api_server/src/web3/state.rs
index fd11ac012ed6..b0db480b2fa9 100644
--- a/core/lib/zksync_core/src/api_server/web3/state.rs
+++ b/core/node/api_server/src/web3/state.rs
@@ -13,13 +13,15 @@ use lru::LruCache;
 use tokio::sync::{watch, Mutex};
 use vise::GaugeGuard;
 use zksync_config::{
-    configs::{api::Web3JsonRpcConfig, chain::L1BatchCommitDataGeneratorMode, ContractsConfig},
+    configs::{api::Web3JsonRpcConfig, ContractsConfig},
     GenesisConfig,
 };
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal, DalError};
+use zksync_metadata_calculator::api_server::TreeApiClient;
+use zksync_node_sync::SyncState;
 use zksync_types::{
-    api, l2::L2Tx, transaction_request::CallRequest, Address, L1BatchNumber, L1ChainId,
-    L2BlockNumber, L2ChainId, H256, U256, U64,
+    api, commitment::L1BatchCommitmentMode, l2::L2Tx, transaction_request::CallRequest, Address,
+    L1BatchNumber, L1ChainId, L2BlockNumber, L2ChainId, H256, U256, U64,
 };
 use zksync_web3_decl::{error::Web3Error, types::Filter};
 
@@ -30,12 +32,8 @@ use super::{
     TypedFilter,
 };
 use crate::{
-    api_server::{
-        execution_sandbox::{BlockArgs, BlockArgsError, BlockStartInfo},
-        tree::TreeApiClient,
-        tx_sender::{tx_sink::TxSink, TxSender},
-    },
-    sync_layer::SyncState,
+    execution_sandbox::{BlockArgs, BlockArgsError, BlockStartInfo},
+    tx_sender::{tx_sink::TxSink, TxSender},
 };
 
 #[derive(Debug)]
@@ -113,7 +111,7 @@ pub struct InternalApiConfig {
     pub base_token_address: Option<Address>,
     pub filters_disabled: bool,
     pub dummy_verifier: bool,
-    pub l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
 }
 
 impl InternalApiConfig {
@@ -134,8 +132,16 @@ impl InternalApiConfig {
                 l2_erc20_default_bridge: contracts_config.l2_erc20_bridge_addr,
                 l1_shared_default_bridge: contracts_config.l1_shared_bridge_proxy_addr,
                 l2_shared_default_bridge: contracts_config.l2_shared_bridge_addr,
-                l1_weth_bridge: contracts_config.l1_weth_bridge_proxy_addr,
-                l2_weth_bridge: contracts_config.l2_weth_bridge_addr,
+                l1_weth_bridge: Some(
+                    contracts_config
+                        .l1_weth_bridge_proxy_addr
+                        .unwrap_or_default(),
+                ),
+                l2_weth_bridge: Some(
+                    contracts_config
+                        .l1_weth_bridge_proxy_addr
+                        .unwrap_or_default(),
+                ),
             },
             bridgehub_proxy_addr: contracts_config
                 .ecosystem_contracts
diff --git a/core/node/api_server/src/web3/testonly.rs b/core/node/api_server/src/web3/testonly.rs
new file mode 100644
index 000000000000..0f8c71aa6281
--- /dev/null
+++ b/core/node/api_server/src/web3/testonly.rs
@@ -0,0 +1,179 @@
+//! Test utilities useful for writing unit tests outside of this crate.
+
+use std::{pin::Pin, time::Instant};
+
+use tokio::sync::watch;
+use zksync_config::configs::{api::Web3JsonRpcConfig, chain::StateKeeperConfig, wallets::Wallets};
+use zksync_dal::ConnectionPool;
+use zksync_health_check::CheckHealth;
+use zksync_node_fee_model::MockBatchFeeParamsProvider;
+use zksync_state::PostgresStorageCaches;
+use zksync_types::L2ChainId;
+
+use super::{metrics::ApiTransportLabel, *};
+use crate::{
+    execution_sandbox::{testonly::MockTransactionExecutor, TransactionExecutor},
+    tx_sender::TxSenderConfig,
+};
+
+const TEST_TIMEOUT: Duration = Duration::from_secs(90);
+const POLL_INTERVAL: Duration = Duration::from_millis(50);
+
+pub(crate) async fn create_test_tx_sender(
+    pool: ConnectionPool<Core>,
+    l2_chain_id: L2ChainId,
+    tx_executor: TransactionExecutor,
+) -> (TxSender, VmConcurrencyBarrier) {
+    let web3_config = Web3JsonRpcConfig::for_tests();
+    let state_keeper_config = StateKeeperConfig::for_tests();
+    let wallets = Wallets::for_tests();
+    let tx_sender_config = TxSenderConfig::new(
+        &state_keeper_config,
+        &web3_config,
+        wallets.state_keeper.unwrap().fee_account.address(),
+        l2_chain_id,
+    );
+
+    let storage_caches = PostgresStorageCaches::new(1, 1);
+    let batch_fee_model_input_provider = Arc::new(MockBatchFeeParamsProvider::default());
+    let (mut tx_sender, vm_barrier) = crate::tx_sender::build_tx_sender(
+        &tx_sender_config,
+        &web3_config,
+        &state_keeper_config,
+        pool.clone(),
+        pool,
+        batch_fee_model_input_provider,
+        storage_caches,
+    )
+    .await
+    .expect("failed building transaction sender");
+
+    Arc::get_mut(&mut tx_sender.0).unwrap().executor = tx_executor;
+    (tx_sender, vm_barrier)
+}
+
+impl ApiServerHandles {
+    /// Waits until the server health check reports the ready state. Must be called once per server instance.
+    pub async fn wait_until_ready(&mut self) -> SocketAddr {
+        let started_at = Instant::now();
+        loop {
+            assert!(
+                started_at.elapsed() <= TEST_TIMEOUT,
+                "Timed out waiting for API server"
+            );
+            let health = self.health_check.check_health().await;
+            if health.status().is_healthy() {
+                break;
+            }
+            tokio::time::sleep(POLL_INTERVAL).await;
+        }
+
+        let mut local_addr_future = Pin::new(&mut self.local_addr);
+        local_addr_future
+            .as_mut()
+            .await
+            .expect("API server panicked");
+        local_addr_future.output_mut().copied().unwrap()
+    }
+
+    pub async fn shutdown(self) {
+        let stop_server = async {
+            for task in self.tasks {
+                match task.await {
+                    Ok(Ok(())) => { /* Task successfully completed */ }
+                    Err(err) if err.is_cancelled() => {
+                        // Task was canceled since the server runtime which runs the task was dropped.
+                        // This is fine.
+                    }
+                    Err(err) => panic!("Server task panicked: {err:?}"),
+                    Ok(Err(err)) => panic!("Server task failed: {err:?}"),
+                }
+            }
+        };
+        tokio::time::timeout(TEST_TIMEOUT, stop_server)
+            .await
+            .unwrap_or_else(|_| panic!("panicking at {}", chrono::Utc::now()));
+    }
+}
+
+pub async fn spawn_http_server(
+    api_config: InternalApiConfig,
+    pool: ConnectionPool<Core>,
+    tx_executor: MockTransactionExecutor,
+    method_tracer: Arc<MethodTracer>,
+    stop_receiver: watch::Receiver<bool>,
+) -> ApiServerHandles {
+    spawn_server(
+        ApiTransportLabel::Http,
+        api_config,
+        pool,
+        None,
+        tx_executor,
+        method_tracer,
+        stop_receiver,
+    )
+    .await
+    .0
+}
+
+pub async fn spawn_ws_server(
+    api_config: InternalApiConfig,
+    pool: ConnectionPool<Core>,
+    stop_receiver: watch::Receiver<bool>,
+    websocket_requests_per_minute_limit: Option<NonZeroU32>,
+) -> (ApiServerHandles, mpsc::UnboundedReceiver<PubSubEvent>) {
+    spawn_server(
+        ApiTransportLabel::Ws,
+        api_config,
+        pool,
+        websocket_requests_per_minute_limit,
+        MockTransactionExecutor::default(),
+        Arc::default(),
+        stop_receiver,
+    )
+    .await
+}
+
+async fn spawn_server(
+    transport: ApiTransportLabel,
+    api_config: InternalApiConfig,
+    pool: ConnectionPool<Core>,
+    websocket_requests_per_minute_limit: Option<NonZeroU32>,
+    tx_executor: MockTransactionExecutor,
+    method_tracer: Arc<MethodTracer>,
+    stop_receiver: watch::Receiver<bool>,
+) -> (ApiServerHandles, mpsc::UnboundedReceiver<PubSubEvent>) {
+    let (tx_sender, vm_barrier) =
+        create_test_tx_sender(pool.clone(), api_config.l2_chain_id, tx_executor.into()).await;
+    let (pub_sub_events_sender, pub_sub_events_receiver) = mpsc::unbounded_channel();
+
+    let mut namespaces = Namespace::DEFAULT.to_vec();
+    namespaces.extend([Namespace::Debug, Namespace::Snapshots]);
+
+    let server_builder = match transport {
+        ApiTransportLabel::Http => ApiBuilder::jsonrpsee_backend(api_config, pool).http(0),
+        ApiTransportLabel::Ws => {
+            let mut builder = ApiBuilder::jsonrpsee_backend(api_config, pool)
+                .ws(0)
+                .with_subscriptions_limit(100);
+            if let Some(websocket_requests_per_minute_limit) = websocket_requests_per_minute_limit {
+                builder = builder
+                    .with_websocket_requests_per_minute_limit(websocket_requests_per_minute_limit);
+            }
+            builder
+        }
+    };
+    let server_handles = server_builder
+        .with_polling_interval(POLL_INTERVAL)
+        .with_tx_sender(tx_sender)
+        .with_vm_barrier(vm_barrier)
+        .with_pub_sub_events(pub_sub_events_sender)
+        .with_method_tracer(method_tracer)
+        .enable_api_namespaces(namespaces)
+        .build()
+        .expect("Unable to build API server")
+        .run(stop_receiver)
+        .await
+        .expect("Failed spawning JSON-RPC server");
+    (server_handles, pub_sub_events_receiver)
+}
diff --git a/core/lib/zksync_core/src/api_server/web3/tests/debug.rs b/core/node/api_server/src/web3/tests/debug.rs
similarity index 92%
rename from core/lib/zksync_core/src/api_server/web3/tests/debug.rs
rename to core/node/api_server/src/web3/tests/debug.rs
index a025aff3085b..a074c1430578 100644
--- a/core/lib/zksync_core/src/api_server/web3/tests/debug.rs
+++ b/core/node/api_server/src/web3/tests/debug.rs
@@ -1,7 +1,10 @@
 //! Tests for the `debug` Web3 namespace.
 
 use zksync_types::{tx::TransactionExecutionResult, vm_trace::Call, BOOTLOADER_ADDRESS};
-use zksync_web3_decl::namespaces::DebugNamespaceClient;
+use zksync_web3_decl::{
+    client::{DynClient, L2},
+    namespaces::DebugNamespaceClient,
+};
 
 use super::*;
 
@@ -34,7 +37,11 @@ struct TraceBlockTest(L2BlockNumber);
 
 #[async_trait]
 impl HttpTest for TraceBlockTest {
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let tx_results = [0, 1, 2].map(execute_l2_transaction_with_traces);
         let mut storage = pool.connection().await?;
         let new_l2_block = store_l2_block(&mut storage, self.0, &tx_results).await?;
@@ -97,7 +104,11 @@ struct TraceBlockFlatTest(L2BlockNumber);
 
 #[async_trait]
 impl HttpTest for TraceBlockFlatTest {
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let tx_results = [0, 1, 2].map(execute_l2_transaction_with_traces);
         let mut storage = pool.connection().await?;
         store_l2_block(&mut storage, self.0, &tx_results).await?;
@@ -173,7 +184,11 @@ struct TraceTransactionTest;
 
 #[async_trait]
 impl HttpTest for TraceTransactionTest {
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let tx_results = [execute_l2_transaction_with_traces(0)];
         let mut storage = pool.connection().await?;
         store_l2_block(&mut storage, L2BlockNumber(1), &tx_results).await?;
@@ -212,7 +227,11 @@ impl HttpTest for TraceBlockTestWithSnapshotRecovery {
         StorageInitialization::empty_recovery()
     }
 
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let snapshot_l2_block_number = StorageInitialization::SNAPSHOT_RECOVERY_BLOCK;
         let missing_l2_block_numbers = [
             L2BlockNumber(0),
diff --git a/core/lib/zksync_core/src/api_server/web3/tests/filters.rs b/core/node/api_server/src/web3/tests/filters.rs
similarity index 92%
rename from core/lib/zksync_core/src/api_server/web3/tests/filters.rs
rename to core/node/api_server/src/web3/tests/filters.rs
index 7fb384253101..7342ce7e979f 100644
--- a/core/lib/zksync_core/src/api_server/web3/tests/filters.rs
+++ b/core/node/api_server/src/web3/tests/filters.rs
@@ -1,9 +1,14 @@
 //! Tests for filter-related methods in the `eth` namespace.
 
-use std::fmt::Debug;
+use std::fmt;
 
-use jsonrpsee::{core::client::Error, types::error::ErrorCode};
-use zksync_web3_decl::{jsonrpsee::core::ClientError as RpcError, types::FilterChanges};
+use zksync_web3_decl::{
+    jsonrpsee::{
+        core::{client::Error, ClientError as RpcError},
+        types::error::ErrorCode,
+    },
+    types::FilterChanges,
+};
 
 use super::*;
 
@@ -22,7 +27,11 @@ impl HttpTest for BasicFilterChangesTest {
         }
     }
 
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let block_filter_id = client.new_block_filter().await?;
         let tx_filter_id = client.new_pending_transaction_filter().await?;
 
@@ -104,7 +113,11 @@ impl HttpTest for LogFilterChangesTest {
         }
     }
 
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let all_logs_filter_id = client.new_filter(Filter::default()).await?;
         let address_filter = Filter {
             address: Some(Address::repeat_byte(23).into()),
@@ -175,7 +188,11 @@ struct LogFilterChangesWithBlockBoundariesTest;
 
 #[async_trait]
 impl HttpTest for LogFilterChangesWithBlockBoundariesTest {
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let lower_bound_filter = Filter {
             from_block: Some(api::BlockNumber::Number(2.into())),
             ..Filter::default()
@@ -267,10 +284,10 @@ async fn log_filter_changes_with_block_boundaries() {
     test_http_server(LogFilterChangesWithBlockBoundariesTest).await;
 }
 
-fn assert_not_implemented<T: Debug>(result: Result<T, Error>) {
+fn assert_not_implemented<T: fmt::Debug>(result: Result<T, Error>) {
     assert_matches!(result, Err(Error::Call(e)) => {
         assert_eq!(e.code(), ErrorCode::MethodNotFound.code());
-        assert_eq!(e.message(), "Not implemented");
+        assert_eq!(e.message(), "Method not implemented");
     });
 }
 
@@ -279,7 +296,11 @@ struct DisableFiltersTest;
 
 #[async_trait]
 impl HttpTest for DisableFiltersTest {
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let filter = Filter {
             from_block: Some(api::BlockNumber::Number(2.into())),
             ..Filter::default()
diff --git a/core/lib/zksync_core/src/api_server/web3/tests/mod.rs b/core/node/api_server/src/web3/tests/mod.rs
similarity index 80%
rename from core/lib/zksync_core/src/api_server/web3/tests/mod.rs
rename to core/node/api_server/src/web3/tests/mod.rs
index 7f2751b3e0bd..d136971734aa 100644
--- a/core/lib/zksync_core/src/api_server/web3/tests/mod.rs
+++ b/core/node/api_server/src/web3/tests/mod.rs
@@ -2,19 +2,11 @@ use std::{
     collections::{HashMap, HashSet},
     net::Ipv4Addr,
     num::NonZeroUsize,
-    pin::Pin,
     slice,
-    time::Instant,
 };
 
 use assert_matches::assert_matches;
 use async_trait::async_trait;
-use jsonrpsee::{
-    core::{client::ClientT, params::BatchRequestBuilder, ClientError},
-    rpc_params,
-    types::{error::OVERSIZED_RESPONSE_CODE, ErrorObjectOwned},
-};
-use multivm::zk_evm_latest::ethereum_types::U256;
 use tokio::sync::watch;
 use zksync_config::{
     configs::{
@@ -25,7 +17,7 @@ use zksync_config::{
     GenesisConfig,
 };
 use zksync_dal::{transactions_dal::L2TxSubmissionResult, Connection, ConnectionPool, CoreDal};
-use zksync_health_check::CheckHealth;
+use zksync_multivm::zk_evm_latest::ethereum_types::U256;
 use zksync_node_genesis::{insert_genesis_batch, mock_genesis_config, GenesisParams};
 use zksync_node_test_utils::{
     create_l1_batch, create_l1_batch_metadata, create_l2_block, create_l2_transaction,
@@ -44,17 +36,28 @@ use zksync_types::{
         TransactionExecutionResult,
     },
     utils::{storage_key_for_eth_balance, storage_key_for_standard_token_balance},
-    AccountTreeId, Address, L1BatchNumber, Nonce, StorageKey, StorageLog, VmEvent, H256, U64,
+    AccountTreeId, Address, L1BatchNumber, Nonce, ProtocolVersionId, StorageKey, StorageLog,
+    VmEvent, H256, U64,
 };
 use zksync_utils::u256_to_h256;
 use zksync_web3_decl::{
-    jsonrpsee::{http_client::HttpClient, types::error::ErrorCode},
+    client::{Client, DynClient, L2},
+    jsonrpsee::{
+        core::{client::ClientT, params::BatchRequestBuilder, ClientError},
+        http_client::HttpClient,
+        rpc_params,
+        types::{
+            error::{ErrorCode, OVERSIZED_RESPONSE_CODE},
+            ErrorObjectOwned,
+        },
+    },
     namespaces::{EnNamespaceClient, EthNamespaceClient, ZksNamespaceClient},
 };
 
-use super::{metrics::ApiTransportLabel, *};
-use crate::api_server::{
-    execution_sandbox::testonly::MockTransactionExecutor, tx_sender::tests::create_test_tx_sender,
+use super::*;
+use crate::{
+    execution_sandbox::testonly::MockTransactionExecutor,
+    web3::testonly::{spawn_http_server, spawn_ws_server},
 };
 
 mod debug;
@@ -70,13 +73,13 @@ const POLL_INTERVAL: Duration = Duration::from_millis(50);
 async fn setting_response_size_limits() {
     let mut rpc_module = RpcModule::new(());
     rpc_module
-        .register_method("test_limited", |params, _ctx| {
+        .register_method("test_limited", |params, _ctx, _ext| {
             let response_size: usize = params.one()?;
             Ok::<_, ErrorObjectOwned>("!".repeat(response_size))
         })
         .unwrap();
     rpc_module
-        .register_method("test_unlimited", |params, _ctx| {
+        .register_method("test_unlimited", |params, _ctx, _ext| {
             let response_size: usize = params.one()?;
             Ok::<_, ErrorObjectOwned>("!".repeat(response_size))
         })
@@ -126,132 +129,6 @@ async fn setting_response_size_limits() {
     server_handle.stop().ok();
 }
 
-impl ApiServerHandles {
-    /// Waits until the server health check reports the ready state. Must be called once per server instance.
-    pub(crate) async fn wait_until_ready(&mut self) -> SocketAddr {
-        let started_at = Instant::now();
-        loop {
-            assert!(
-                started_at.elapsed() <= TEST_TIMEOUT,
-                "Timed out waiting for API server"
-            );
-            let health = self.health_check.check_health().await;
-            if health.status().is_healthy() {
-                break;
-            }
-            tokio::time::sleep(POLL_INTERVAL).await;
-        }
-
-        let mut local_addr_future = Pin::new(&mut self.local_addr);
-        local_addr_future
-            .as_mut()
-            .await
-            .expect("API server panicked");
-        local_addr_future.output_mut().copied().unwrap()
-    }
-
-    pub(crate) async fn shutdown(self) {
-        let stop_server = async {
-            for task in self.tasks {
-                match task.await {
-                    Ok(Ok(())) => { /* Task successfully completed */ }
-                    Err(err) if err.is_cancelled() => {
-                        // Task was canceled since the server runtime which runs the task was dropped.
-                        // This is fine.
-                    }
-                    Err(err) => panic!("Server task panicked: {err:?}"),
-                    Ok(Err(err)) => panic!("Server task failed: {err:?}"),
-                }
-            }
-        };
-        tokio::time::timeout(TEST_TIMEOUT, stop_server)
-            .await
-            .unwrap_or_else(|_| panic!("panicking at {}", chrono::Utc::now()));
-    }
-}
-
-pub(crate) async fn spawn_http_server(
-    api_config: InternalApiConfig,
-    pool: ConnectionPool<Core>,
-    tx_executor: MockTransactionExecutor,
-    method_tracer: Arc<MethodTracer>,
-    stop_receiver: watch::Receiver<bool>,
-) -> ApiServerHandles {
-    spawn_server(
-        ApiTransportLabel::Http,
-        api_config,
-        pool,
-        None,
-        tx_executor,
-        method_tracer,
-        stop_receiver,
-    )
-    .await
-    .0
-}
-
-async fn spawn_ws_server(
-    api_config: InternalApiConfig,
-    pool: ConnectionPool<Core>,
-    stop_receiver: watch::Receiver<bool>,
-    websocket_requests_per_minute_limit: Option<NonZeroU32>,
-) -> (ApiServerHandles, mpsc::UnboundedReceiver<PubSubEvent>) {
-    spawn_server(
-        ApiTransportLabel::Ws,
-        api_config,
-        pool,
-        websocket_requests_per_minute_limit,
-        MockTransactionExecutor::default(),
-        Arc::default(),
-        stop_receiver,
-    )
-    .await
-}
-
-async fn spawn_server(
-    transport: ApiTransportLabel,
-    api_config: InternalApiConfig,
-    pool: ConnectionPool<Core>,
-    websocket_requests_per_minute_limit: Option<NonZeroU32>,
-    tx_executor: MockTransactionExecutor,
-    method_tracer: Arc<MethodTracer>,
-    stop_receiver: watch::Receiver<bool>,
-) -> (ApiServerHandles, mpsc::UnboundedReceiver<PubSubEvent>) {
-    let (tx_sender, vm_barrier) =
-        create_test_tx_sender(pool.clone(), api_config.l2_chain_id, tx_executor.into()).await;
-    let (pub_sub_events_sender, pub_sub_events_receiver) = mpsc::unbounded_channel();
-
-    let mut namespaces = Namespace::DEFAULT.to_vec();
-    namespaces.extend([Namespace::Debug, Namespace::Snapshots]);
-
-    let server_builder = match transport {
-        ApiTransportLabel::Http => ApiBuilder::jsonrpsee_backend(api_config, pool).http(0),
-        ApiTransportLabel::Ws => {
-            let mut builder = ApiBuilder::jsonrpsee_backend(api_config, pool)
-                .ws(0)
-                .with_subscriptions_limit(100);
-            if let Some(websocket_requests_per_minute_limit) = websocket_requests_per_minute_limit {
-                builder = builder
-                    .with_websocket_requests_per_minute_limit(websocket_requests_per_minute_limit);
-            }
-            builder
-        }
-    };
-    let server_handles = server_builder
-        .with_polling_interval(POLL_INTERVAL)
-        .with_tx_sender(tx_sender)
-        .with_vm_barrier(vm_barrier)
-        .with_pub_sub_events(pub_sub_events_sender)
-        .with_method_tracer(method_tracer)
-        .enable_api_namespaces(namespaces)
-        .build()
-        .expect("Unable to build API server")
-        .run(stop_receiver)
-        .await
-        .expect("Failed spawning JSON-RPC server");
-    (server_handles, pub_sub_events_receiver)
-}
-
 #[async_trait]
 trait HttpTest: Send + Sync {
     /// Prepares the storage before the server is started. The default implementation performs genesis.
@@ -267,7 +144,8 @@ trait HttpTest: Send + Sync {
         Arc::default()
     }
 
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()>;
+    async fn test(&self, client: &DynClient<L2>, pool: &ConnectionPool<Core>)
+        -> anyhow::Result<()>;
 
     /// Overrides the `filters_disabled` configuration parameter for HTTP server startup
     fn filters_disabled(&self) -> bool {
@@ -360,9 +238,9 @@ async fn test_http_server(test: impl HttpTest) {
     .await;
 
     let local_addr = server_handles.wait_until_ready().await;
-    let client = <HttpClient>::builder()
-        .build(format!("http://{local_addr}/"))
-        .unwrap();
+    let client = Client::http(format!("http://{local_addr}/").parse().unwrap())
+        .unwrap()
+        .build();
     test.test(&client, &pool).await.unwrap();
 
     stop_sender.send_replace(true);
@@ -425,7 +303,13 @@ async fn store_l2_block(
     storage.blocks_dal().insert_l2_block(&new_l2_block).await?;
     storage
         .transactions_dal()
-        .mark_txs_as_executed_in_l2_block(new_l2_block.number, transaction_results, 1.into())
+        .mark_txs_as_executed_in_l2_block(
+            new_l2_block.number,
+            transaction_results,
+            1.into(),
+            ProtocolVersionId::latest(),
+            false,
+        )
         .await?;
     Ok(new_l2_block)
 }
@@ -513,7 +397,11 @@ struct HttpServerBasicsTest;
 
 #[async_trait]
 impl HttpTest for HttpServerBasicsTest {
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let block_number = client.get_block_number().await?;
         assert_eq!(block_number, U64::from(0));
 
@@ -543,7 +431,11 @@ impl HttpTest for BlockMethodsWithSnapshotRecovery {
         StorageInitialization::empty_recovery()
     }
 
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let block = client.get_block_by_number(1_000.into(), false).await?;
         assert!(block.is_none());
 
@@ -616,7 +508,11 @@ impl HttpTest for L1BatchMethodsWithSnapshotRecovery {
         StorageInitialization::empty_recovery()
     }
 
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let l2_block_number = StorageInitialization::SNAPSHOT_RECOVERY_BLOCK + 1;
         let l1_batch_number = StorageInitialization::SNAPSHOT_RECOVERY_BATCH + 1;
         assert_eq!(
@@ -707,7 +603,11 @@ impl HttpTest for StorageAccessWithSnapshotRecovery {
         StorageInitialization::Recovery { logs, factory_deps }
     }
 
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let address = Address::repeat_byte(1);
         let first_local_l2_block = StorageInitialization::SNAPSHOT_RECOVERY_BLOCK + 1;
         for number in [0, 1, first_local_l2_block.0 - 1] {
@@ -748,7 +648,11 @@ struct TransactionCountTest;
 
 #[async_trait]
 impl HttpTest for TransactionCountTest {
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let test_address = Address::repeat_byte(11);
         let mut storage = pool.connection().await?;
         let mut l2_block_number = L2BlockNumber(0);
@@ -769,7 +673,7 @@ impl HttpTest for TransactionCountTest {
             );
             storage
                 .storage_logs_dal()
-                .insert_storage_logs(l2_block_number, &[(H256::zero(), vec![nonce_log])])
+                .insert_storage_logs(l2_block_number, &[nonce_log])
                 .await?;
         }
 
@@ -846,7 +750,11 @@ impl HttpTest for TransactionCountAfterSnapshotRecoveryTest {
         }
     }
 
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let test_address = Address::repeat_byte(11);
         let pending_count = client.get_transaction_count(test_address, None).await?;
         assert_eq!(pending_count, 3.into());
@@ -901,7 +809,11 @@ struct TransactionReceiptsTest;
 
 #[async_trait]
 impl HttpTest for TransactionReceiptsTest {
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let mut storage = pool.connection().await?;
         let l2_block_number = L2BlockNumber(1);
 
@@ -959,7 +871,11 @@ impl AllAccountBalancesTest {
 
 #[async_trait]
 impl HttpTest for AllAccountBalancesTest {
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let balances = client.get_all_account_balances(Self::ADDRESS).await?;
         assert_eq!(balances, HashMap::new());
 
@@ -971,7 +887,7 @@ impl HttpTest for AllAccountBalancesTest {
         let eth_balance_log = StorageLog::new_write_log(eth_balance_key, u256_to_h256(eth_balance));
         storage
             .storage_logs_dal()
-            .insert_storage_logs(L2BlockNumber(1), &[(H256::zero(), vec![eth_balance_log])])
+            .insert_storage_logs(L2BlockNumber(1), &[eth_balance_log])
             .await?;
         // Create a custom token, but don't set balance for it yet.
         let custom_token = TokenInfo {
@@ -997,7 +913,7 @@ impl HttpTest for AllAccountBalancesTest {
             StorageLog::new_write_log(token_balance_key, u256_to_h256(token_balance));
         storage
             .storage_logs_dal()
-            .insert_storage_logs(L2BlockNumber(2), &[(H256::zero(), vec![token_balance_log])])
+            .insert_storage_logs(L2BlockNumber(2), &[token_balance_log])
             .await?;
 
         let balances = client.get_all_account_balances(Self::ADDRESS).await?;
@@ -1028,13 +944,17 @@ impl HttpTest for RpcCallsTracingTest {
         self.tracer.clone()
     }
 
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let block_number = client.get_block_number().await?;
         assert_eq!(block_number, U64::from(0));
 
         let calls = self.tracer.recorded_calls().take();
         assert_eq!(calls.len(), 1);
-        assert!(calls[0].response.is_success());
+        assert!(calls[0].error_code.is_none());
         assert_eq!(calls[0].metadata.name, "eth_blockNumber");
         assert_eq!(calls[0].metadata.block_id, None);
         assert_eq!(calls[0].metadata.block_diff, None);
@@ -1045,7 +965,7 @@ impl HttpTest for RpcCallsTracingTest {
 
         let calls = self.tracer.recorded_calls().take();
         assert_eq!(calls.len(), 1);
-        assert!(calls[0].response.is_success());
+        assert!(calls[0].error_code.is_none());
         assert_eq!(calls[0].metadata.name, "eth_getBlockByNumber");
         assert_eq!(
             calls[0].metadata.block_id,
@@ -1058,7 +978,7 @@ impl HttpTest for RpcCallsTracingTest {
 
         let calls = self.tracer.recorded_calls().take();
         assert_eq!(calls.len(), 1);
-        assert!(calls[0].response.is_success());
+        assert!(calls[0].error_code.is_none());
         assert_eq!(calls[0].metadata.name, "eth_getBlockByNumber");
         assert_eq!(
             calls[0].metadata.block_id,
@@ -1067,54 +987,43 @@ impl HttpTest for RpcCallsTracingTest {
         assert_eq!(calls[0].metadata.block_diff, None);
 
         // Check protocol-level errors.
-        client
-            .request::<serde_json::Value, _>("eth_unknownMethod", jsonrpsee::rpc_params![])
+        ClientT::request::<serde_json::Value, _>(&client, "eth_unknownMethod", rpc_params![])
             .await
             .unwrap_err();
 
         let calls = self.tracer.recorded_calls().take();
         assert_eq!(calls.len(), 1);
-        assert_eq!(
-            calls[0].response.as_error_code(),
-            Some(ErrorCode::MethodNotFound.code())
-        );
+        assert_eq!(calls[0].error_code, Some(ErrorCode::MethodNotFound.code()));
         assert!(!calls[0].metadata.has_app_error);
 
-        client
-            .request::<serde_json::Value, _>("eth_getBlockByNumber", jsonrpsee::rpc_params![0])
+        ClientT::request::<serde_json::Value, _>(&client, "eth_getBlockByNumber", rpc_params![0])
             .await
             .unwrap_err();
 
         let calls = self.tracer.recorded_calls().take();
         assert_eq!(calls.len(), 1);
-        assert_eq!(
-            calls[0].response.as_error_code(),
-            Some(ErrorCode::InvalidParams.code())
-        );
+        assert_eq!(calls[0].error_code, Some(ErrorCode::InvalidParams.code()));
         assert!(!calls[0].metadata.has_app_error);
 
         // Check app-level error.
-        client
-            .request::<serde_json::Value, _>(
-                "eth_getFilterLogs",
-                jsonrpsee::rpc_params![U256::from(1)],
-            )
-            .await
-            .unwrap_err();
+        ClientT::request::<serde_json::Value, _>(
+            &client,
+            "eth_getFilterLogs",
+            rpc_params![U256::from(1)],
+        )
+        .await
+        .unwrap_err();
 
         let calls = self.tracer.recorded_calls().take();
         assert_eq!(calls.len(), 1);
-        assert_eq!(
-            calls[0].response.as_error_code(),
-            Some(ErrorCode::InvalidParams.code())
-        );
+        assert_eq!(calls[0].error_code, Some(ErrorCode::InvalidParams.code()));
         assert!(calls[0].metadata.has_app_error);
 
         // Check batch RPC request.
         let mut batch = BatchRequestBuilder::new();
-        batch.insert("eth_blockNumber", jsonrpsee::rpc_params![])?;
-        batch.insert("zks_L1BatchNumber", jsonrpsee::rpc_params![])?;
-        let response = client.batch_request::<U64>(batch).await?;
+        batch.insert("eth_blockNumber", rpc_params![])?;
+        batch.insert("zks_L1BatchNumber", rpc_params![])?;
+        let response = ClientT::batch_request::<U64>(&client, batch).await?;
         for response_part in response {
             assert_eq!(response_part.unwrap(), U64::from(0));
         }
@@ -1141,7 +1050,11 @@ struct GenesisConfigTest;
 
 #[async_trait]
 impl HttpTest for GenesisConfigTest {
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         // It's enough to check that we fill all fields and deserialization is correct.
         // Mocking values is not suitable since they will always change
         client.genesis_config().await.unwrap();
diff --git a/core/lib/zksync_core/src/api_server/web3/tests/snapshots.rs b/core/node/api_server/src/web3/tests/snapshots.rs
similarity index 96%
rename from core/lib/zksync_core/src/api_server/web3/tests/snapshots.rs
rename to core/node/api_server/src/web3/tests/snapshots.rs
index d8af509dd6bd..46261c8c6fb7 100644
--- a/core/lib/zksync_core/src/api_server/web3/tests/snapshots.rs
+++ b/core/node/api_server/src/web3/tests/snapshots.rs
@@ -28,7 +28,11 @@ impl SnapshotBasicsTest {
 
 #[async_trait]
 impl HttpTest for SnapshotBasicsTest {
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let mut storage = pool.connection().await.unwrap();
         store_l2_block(
             &mut storage,
diff --git a/core/lib/zksync_core/src/api_server/web3/tests/vm.rs b/core/node/api_server/src/web3/tests/vm.rs
similarity index 88%
rename from core/lib/zksync_core/src/api_server/web3/tests/vm.rs
rename to core/node/api_server/src/web3/tests/vm.rs
index cde7a9be79c4..1bce1b732b13 100644
--- a/core/lib/zksync_core/src/api_server/web3/tests/vm.rs
+++ b/core/node/api_server/src/web3/tests/vm.rs
@@ -3,7 +3,7 @@
 use std::sync::atomic::{AtomicU32, Ordering};
 
 use itertools::Itertools;
-use multivm::{
+use zksync_multivm::{
     interface::{ExecutionResult, VmRevertReason},
     vm_latest::{VmExecutionLogs, VmExecutionResultAndLogs},
 };
@@ -11,8 +11,8 @@ use zksync_types::{
     api::{ApiStorageLog, Log},
     get_intrinsic_constants,
     transaction_request::CallRequest,
-    zk_evm_types::{LogQuery, Timestamp},
-    K256PrivateKey, L2ChainId, PackedEthSignature, StorageLogQuery, StorageLogQueryType, U256,
+    K256PrivateKey, L2ChainId, PackedEthSignature, StorageLogKind, StorageLogWithPreviousValue,
+    U256,
 };
 use zksync_utils::u256_to_h256;
 use zksync_web3_decl::namespaces::DebugNamespaceClient;
@@ -58,7 +58,11 @@ impl HttpTest for CallTest {
         Self::create_executor(L2BlockNumber(0))
     }
 
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let call_result = client.call(Self::call_request(b"pending"), None).await?;
         assert_eq!(call_result.0, b"output");
 
@@ -110,7 +114,11 @@ impl HttpTest for CallTestAfterSnapshotRecovery {
         CallTest::create_executor(first_local_l2_block)
     }
 
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let call_result = client
             .call(CallTest::call_request(b"pending"), None)
             .await?;
@@ -170,14 +178,12 @@ impl SendRawTransactionTest {
             input: vec![1, 2, 3, 4].into(),
             ..api::TransactionRequest::default()
         };
-        let mut rlp = Default::default();
-        tx_request.rlp(&mut rlp, L2ChainId::default().as_u64(), None);
-        let data = rlp.out();
+        let data = tx_request.get_rlp().unwrap();
         let signed_message = PackedEthSignature::message_to_signed_bytes(&data);
         let signature = PackedEthSignature::sign_raw(&private_key, &signed_message).unwrap();
 
         let mut rlp = Default::default();
-        tx_request.rlp(&mut rlp, L2ChainId::default().as_u64(), Some(&signature));
+        tx_request.rlp(&mut rlp, Some(&signature)).unwrap();
         let data = rlp.out();
         let (_, tx_hash) =
             api::TransactionRequest::from_bytes(&data, L2ChainId::default()).unwrap();
@@ -223,16 +229,17 @@ impl HttpTest for SendRawTransactionTest {
         tx_executor
     }
 
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         if !self.snapshot_recovery {
             // Manually set sufficient balance for the transaction account.
             let mut storage = pool.connection().await?;
             storage
                 .storage_logs_dal()
-                .append_storage_logs(
-                    L2BlockNumber(0),
-                    &[(H256::zero(), vec![Self::balance_storage_log()])],
-                )
+                .append_storage_logs(L2BlockNumber(0), &[Self::balance_storage_log()])
                 .await?;
         }
 
@@ -263,40 +270,35 @@ async fn send_raw_transaction_after_snapshot_recovery() {
 struct SendTransactionWithDetailedOutputTest;
 
 impl SendTransactionWithDetailedOutputTest {
-    fn storage_logs(&self) -> Vec<StorageLogQuery> {
-        let log_query = LogQuery {
-            timestamp: Timestamp(100),
-            tx_number_in_block: 1,
-            aux_byte: 1,
-            shard_id: 2,
-            address: Address::zero(),
-            key: U256::one(),
-            read_value: U256::one(),
-            written_value: U256::one(),
-            rw_flag: false,
-            rollback: false,
-            is_service: false,
+    fn storage_logs(&self) -> Vec<StorageLogWithPreviousValue> {
+        let log = StorageLog {
+            key: StorageKey::new(
+                AccountTreeId::new(Address::zero()),
+                u256_to_h256(U256::one()),
+            ),
+            value: u256_to_h256(U256::one()),
+            kind: StorageLogKind::Read,
         };
-        vec![
-            StorageLogQuery {
-                log_query,
-                log_type: StorageLogQueryType::Read,
+        [
+            StorageLog {
+                kind: StorageLogKind::Read,
+                ..log
             },
-            StorageLogQuery {
-                log_query: LogQuery {
-                    tx_number_in_block: 2,
-                    ..log_query
-                },
-                log_type: StorageLogQueryType::InitialWrite,
+            StorageLog {
+                kind: StorageLogKind::InitialWrite,
+                ..log
             },
-            StorageLogQuery {
-                log_query: LogQuery {
-                    tx_number_in_block: 3,
-                    ..log_query
-                },
-                log_type: StorageLogQueryType::RepeatedWrite,
+            StorageLog {
+                kind: StorageLogKind::RepeatedWrite,
+                ..log
             },
         ]
+        .into_iter()
+        .map(|log| StorageLogWithPreviousValue {
+            log,
+            previous_value: u256_to_h256(U256::one()),
+        })
+        .collect()
     }
 
     fn vm_events(&self) -> Vec<VmEvent> {
@@ -335,17 +337,18 @@ impl HttpTest for SendTransactionWithDetailedOutputTest {
         tx_executor
     }
 
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         // Manually set sufficient balance for the transaction account.
         let mut storage = pool.connection().await?;
         storage
             .storage_logs_dal()
             .append_storage_logs(
                 L2BlockNumber(0),
-                &[(
-                    H256::zero(),
-                    vec![SendRawTransactionTest::balance_storage_log()],
-                )],
+                &[SendRawTransactionTest::balance_storage_log()],
             )
             .await?;
 
@@ -369,7 +372,7 @@ impl HttpTest for SendTransactionWithDetailedOutputTest {
             send_result.storage_logs,
             self.storage_logs()
                 .iter()
-                .filter(|x| x.log_type != StorageLogQueryType::Read)
+                .filter(|x| x.log.is_write())
                 .map(ApiStorageLog::from)
                 .collect_vec()
         );
@@ -408,7 +411,11 @@ impl HttpTest for TraceCallTest {
         CallTest::create_executor(L2BlockNumber(0))
     }
 
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let call_request = CallTest::call_request(b"pending");
         let call_result = client.trace_call(call_request.clone(), None, None).await?;
         Self::assert_debug_call(&call_request, &call_result);
@@ -473,7 +480,11 @@ impl HttpTest for TraceCallTestAfterSnapshotRecovery {
         CallTest::create_executor(number)
     }
 
-    async fn test(&self, client: &HttpClient, _pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        _pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let call_request = CallTest::call_request(b"pending");
         let call_result = client.trace_call(call_request.clone(), None, None).await?;
         TraceCallTest::assert_debug_call(&call_request, &call_result);
@@ -559,7 +570,11 @@ impl HttpTest for EstimateGasTest {
         tx_executor
     }
 
-    async fn test(&self, client: &HttpClient, pool: &ConnectionPool<Core>) -> anyhow::Result<()> {
+    async fn test(
+        &self,
+        client: &DynClient<L2>,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
         let l2_transaction = create_l2_transaction(10, 100);
         for threshold in [10_000, 50_000, 100_000, 1_000_000] {
             self.gas_limit_threshold.store(threshold, Ordering::Relaxed);
@@ -583,7 +598,7 @@ impl HttpTest for EstimateGasTest {
             let mut storage = pool.connection().await?;
             storage
                 .storage_logs_dal()
-                .append_storage_logs(L2BlockNumber(0), &[(H256::zero(), vec![storage_log])])
+                .append_storage_logs(L2BlockNumber(0), &[storage_log])
                 .await?;
         }
         let mut call_request = CallRequest::from(l2_transaction);
diff --git a/core/lib/zksync_core/src/api_server/web3/tests/ws.rs b/core/node/api_server/src/web3/tests/ws.rs
similarity index 91%
rename from core/lib/zksync_core/src/api_server/web3/tests/ws.rs
rename to core/node/api_server/src/web3/tests/ws.rs
index 646fb96d4780..cccebdd6ddd1 100644
--- a/core/lib/zksync_core/src/api_server/web3/tests/ws.rs
+++ b/core/node/api_server/src/web3/tests/ws.rs
@@ -1,28 +1,31 @@
 //! WS-related tests.
 
-use std::collections::HashSet;
+use std::{collections::HashSet, str::FromStr};
 
+use assert_matches::assert_matches;
 use async_trait::async_trait;
-use jsonrpsee::core::{client::ClientT, params::BatchRequestBuilder, ClientError};
-use reqwest::StatusCode;
+use http::StatusCode;
 use tokio::sync::watch;
 use zksync_config::configs::chain::NetworkConfig;
 use zksync_dal::ConnectionPool;
-use zksync_types::{api, Address, L1BatchNumber, H256, U64};
+use zksync_types::{api, Address, L1BatchNumber, H160, H2048, H256, U64};
 use zksync_web3_decl::{
+    client::{WsClient, L2},
     jsonrpsee::{
-        core::client::{Subscription, SubscriptionClientT},
+        core::{
+            client::{ClientT, Subscription, SubscriptionClientT},
+            params::BatchRequestBuilder,
+            ClientError,
+        },
         rpc_params,
-        ws_client::{WsClient, WsClientBuilder},
     },
     namespaces::{EthNamespaceClient, ZksNamespaceClient},
-    types::{BlockHeader, PubSubFilter},
+    types::{BlockHeader, Bytes, PubSubFilter},
 };
 
 use super::*;
-use crate::api_server::web3::metrics::SubscriptionType;
+use crate::web3::metrics::SubscriptionType;
 
-#[allow(clippy::needless_pass_by_ref_mut)] // false positive
 async fn wait_for_subscription(
     events: &mut mpsc::UnboundedReceiver<PubSubEvent>,
     sub_type: SubscriptionType,
@@ -45,7 +48,6 @@ async fn wait_for_subscription(
         .expect("Timed out waiting for subscription")
 }
 
-#[allow(clippy::needless_pass_by_ref_mut)] // false positive
 async fn wait_for_notifiers(
     events: &mut mpsc::UnboundedReceiver<PubSubEvent>,
     sub_types: &[SubscriptionType],
@@ -70,7 +72,6 @@ async fn wait_for_notifiers(
     wait_future.await.expect("Timed out waiting for notifier");
 }
 
-#[allow(clippy::needless_pass_by_ref_mut)] // false positive
 async fn wait_for_notifier_l2_block(
     events: &mut mpsc::UnboundedReceiver<PubSubEvent>,
     sub_type: SubscriptionType,
@@ -151,7 +152,7 @@ trait WsTest: Send + Sync {
 
     async fn test(
         &self,
-        client: &WsClient,
+        client: &WsClient<L2>,
         pool: &ConnectionPool<Core>,
         pub_sub_events: mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<()>;
@@ -185,10 +186,10 @@ async fn test_ws_server(test: impl WsTest) {
     .await;
 
     let local_addr = server_handles.wait_until_ready().await;
-    let client = WsClientBuilder::default()
-        .build(format!("ws://{local_addr}"))
+    let client = Client::ws(format!("ws://{local_addr}").parse().unwrap())
         .await
-        .unwrap();
+        .unwrap()
+        .build();
     test.test(&client, &pool, pub_sub_events).await.unwrap();
 
     stop_sender.send_replace(true);
@@ -202,7 +203,7 @@ struct WsServerCanStartTest;
 impl WsTest for WsServerCanStartTest {
     async fn test(
         &self,
-        client: &WsClient,
+        client: &WsClient<L2>,
         _pool: &ConnectionPool<Core>,
         _pub_sub_events: mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<()> {
@@ -243,7 +244,7 @@ impl WsTest for BasicSubscriptionsTest {
 
     async fn test(
         &self,
-        client: &WsClient,
+        client: &WsClient<L2>,
         pool: &ConnectionPool<Core>,
         mut pub_sub_events: mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<()> {
@@ -287,15 +288,45 @@ impl WsTest for BasicSubscriptionsTest {
             .await
             .context("Timed out waiting for new block header")?
             .context("New blocks subscription terminated")??;
+
+        let sha3_uncles_hash =
+            H256::from_str("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347")
+                .unwrap();
+
         assert_eq!(
             received_block_header.number,
             Some(new_l2_block.number.0.into())
         );
         assert_eq!(received_block_header.hash, Some(new_l2_block.hash));
+        assert_matches!(received_block_header.parent_hash, H256(_));
+        assert_eq!(received_block_header.uncles_hash, sha3_uncles_hash);
+        assert_eq!(received_block_header.author, H160::zero());
+        assert_eq!(received_block_header.state_root, H256::zero());
+        assert_eq!(received_block_header.transactions_root, H256::zero());
+        assert_eq!(received_block_header.receipts_root, H256::zero());
+        assert_eq!(
+            received_block_header.number,
+            Some(U64::from(new_l2_block.number.0))
+        );
+        assert_matches!(received_block_header.gas_used, U256(_));
+        assert_eq!(
+            received_block_header.gas_limit,
+            new_l2_block.gas_limit.into()
+        );
+        assert_eq!(
+            received_block_header.base_fee_per_gas,
+            Some(new_l2_block.base_fee_per_gas.into())
+        );
+        assert_eq!(received_block_header.extra_data, Bytes::default());
+        assert_eq!(received_block_header.logs_bloom, H2048::default());
         assert_eq!(
             received_block_header.timestamp,
             new_l2_block.timestamp.into()
         );
+        assert_eq!(received_block_header.difficulty, U256::zero());
+        assert_eq!(received_block_header.mix_hash, None);
+        assert_eq!(received_block_header.nonce, None);
+
         blocks_subscription.unsubscribe().await?;
         Ok(())
     }
@@ -331,7 +362,7 @@ struct LogSubscriptions {
 
 impl LogSubscriptions {
     async fn new(
-        client: &WsClient,
+        client: &WsClient<L2>,
         pub_sub_events: &mut mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<Self> {
         // Wait for the notifier to get initialized so that it doesn't skip notifications
@@ -382,7 +413,7 @@ impl WsTest for LogSubscriptionsTest {
 
     async fn test(
         &self,
-        client: &WsClient,
+        client: &WsClient<L2>,
         pool: &ConnectionPool<Core>,
         mut pub_sub_events: mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<()> {
@@ -471,7 +502,7 @@ struct LogSubscriptionsWithNewBlockTest;
 impl WsTest for LogSubscriptionsWithNewBlockTest {
     async fn test(
         &self,
-        client: &WsClient,
+        client: &WsClient<L2>,
         pool: &ConnectionPool<Core>,
         mut pub_sub_events: mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<()> {
@@ -519,7 +550,7 @@ struct LogSubscriptionsWithManyBlocksTest;
 impl WsTest for LogSubscriptionsWithManyBlocksTest {
     async fn test(
         &self,
-        client: &WsClient,
+        client: &WsClient<L2>,
         pool: &ConnectionPool<Core>,
         mut pub_sub_events: mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<()> {
@@ -565,7 +596,7 @@ struct LogSubscriptionsWithDelayTest;
 impl WsTest for LogSubscriptionsWithDelayTest {
     async fn test(
         &self,
-        client: &WsClient,
+        client: &WsClient<L2>,
         pool: &ConnectionPool<Core>,
         mut pub_sub_events: mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<()> {
@@ -635,7 +666,7 @@ struct RateLimitingTest;
 impl WsTest for RateLimitingTest {
     async fn test(
         &self,
-        client: &WsClient,
+        client: &WsClient<L2>,
         _pool: &ConnectionPool<Core>,
         _pub_sub_events: mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<()> {
@@ -672,7 +703,7 @@ struct BatchGetsRateLimitedTest;
 impl WsTest for BatchGetsRateLimitedTest {
     async fn test(
         &self,
-        client: &WsClient,
+        client: &WsClient<L2>,
         _pool: &ConnectionPool<Core>,
         _pub_sub_events: mpsc::UnboundedReceiver<PubSubEvent>,
     ) -> anyhow::Result<()> {
diff --git a/core/node/base_token_adjuster/Cargo.toml b/core/node/base_token_adjuster/Cargo.toml
new file mode 100644
index 000000000000..7e5c5bcaae43
--- /dev/null
+++ b/core/node/base_token_adjuster/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "zksync_base_token_adjuster"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+
+[dependencies]
+zksync_dal.workspace = true
+zksync_config.workspace = true
+zksync_types.workspace = true
+
+tokio = { workspace = true, features = ["time"] }
+anyhow.workspace = true
+tracing.workspace = true
+chrono.workspace = true
+rand.workspace = true
+async-trait.workspace = true
diff --git a/core/node/base_token_adjuster/README.md b/core/node/base_token_adjuster/README.md
new file mode 100644
index 000000000000..c5b6dec2b17c
--- /dev/null
+++ b/core/node/base_token_adjuster/README.md
@@ -0,0 +1,20 @@
+# Base Token Adjuster
+
+This crate contains all the logic to handle ZK Chain with custom base tokens.
+
+## Overview
+
+### The Base Token Ratio Persister
+
+Contains the building blockss for the `BaseTokenRatioPersisterLayer`.
+
+- Connects with external APIs to get the current price of the base token and of ETH.
+- Persists the ETH<->BaseToken ratio in the database.
+- Upon certain configured threshold, update the L1 ETH<->BaseToken conversion ratio.
+
+### The Base Token Ratio Provider
+
+Contains the building blocks for the `BaseTokenRatioProviderLayer`.
+
+- Periodically fetches from the DB and caches the latest ETH<->BaseToken conversion ratio.
+- Exposes this ratio upon request.
diff --git a/core/node/base_token_adjuster/src/base_token_ratio_persister.rs b/core/node/base_token_adjuster/src/base_token_ratio_persister.rs
new file mode 100644
index 000000000000..b730737b992f
--- /dev/null
+++ b/core/node/base_token_adjuster/src/base_token_ratio_persister.rs
@@ -0,0 +1,76 @@
+use std::{fmt::Debug, num::NonZero};
+
+use anyhow::Context as _;
+use chrono::Utc;
+use tokio::sync::watch;
+use zksync_config::configs::base_token_adjuster::BaseTokenAdjusterConfig;
+use zksync_dal::{ConnectionPool, Core, CoreDal};
+use zksync_types::base_token_ratio::BaseTokenAPIRatio;
+
+#[derive(Debug, Clone)]
+pub struct BaseTokenRatioPersister {
+    pool: ConnectionPool<Core>,
+    config: BaseTokenAdjusterConfig,
+}
+
+impl BaseTokenRatioPersister {
+    pub fn new(pool: ConnectionPool<Core>, config: BaseTokenAdjusterConfig) -> Self {
+        Self { pool, config }
+    }
+
+    /// Main loop for the base token ratio persister.
+    /// Orchestrates fetching a new ratio, persisting it, and conditionally updating the L1 with it.
+    pub async fn run(&mut self, mut stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        let mut timer = tokio::time::interval(self.config.price_polling_interval());
+        let pool = self.pool.clone();
+
+        while !*stop_receiver.borrow_and_update() {
+            tokio::select! {
+                _ = timer.tick() => { /* continue iterations */ }
+                _ = stop_receiver.changed() => break,
+            }
+
+            let new_ratio = self.fetch_new_ratio().await?;
+            self.persist_ratio(&new_ratio, &pool).await?;
+            // TODO(PE-128): Update L1 ratio
+        }
+
+        tracing::info!("Stop signal received, base_token_ratio_persister is shutting down");
+        Ok(())
+    }
+
+    // TODO (PE-135): Use real API client to fetch new ratio through self.PriceAPIClient & mock for tests.
+    //  For now, these are hard coded dummy values.
+    async fn fetch_new_ratio(&self) -> anyhow::Result<BaseTokenAPIRatio> {
+        let ratio_timestamp = Utc::now();
+
+        Ok(BaseTokenAPIRatio {
+            numerator: NonZero::new(1).unwrap(),
+            denominator: NonZero::new(100000).unwrap(),
+            ratio_timestamp,
+        })
+    }
+
+    async fn persist_ratio(
+        &self,
+        api_price: &BaseTokenAPIRatio,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<usize> {
+        let mut conn = pool
+            .connection_tagged("base_token_ratio_persister")
+            .await
+            .context("Failed to obtain connection to the database")?;
+
+        let id = conn
+            .base_token_dal()
+            .insert_token_ratio(
+                api_price.numerator,
+                api_price.denominator,
+                &api_price.ratio_timestamp.naive_utc(),
+            )
+            .await
+            .context("Failed to insert base token ratio into the database")?;
+
+        Ok(id)
+    }
+}
diff --git a/core/node/base_token_adjuster/src/base_token_ratio_provider.rs b/core/node/base_token_adjuster/src/base_token_ratio_provider.rs
new file mode 100644
index 000000000000..39a96556f8de
--- /dev/null
+++ b/core/node/base_token_adjuster/src/base_token_ratio_provider.rs
@@ -0,0 +1,124 @@
+use std::{fmt::Debug, num::NonZeroU64, time::Duration};
+
+use anyhow::Context;
+use async_trait::async_trait;
+use tokio::sync::watch;
+use zksync_dal::{ConnectionPool, Core, CoreDal};
+use zksync_types::fee_model::BaseTokenConversionRatio;
+
+const CACHE_UPDATE_INTERVAL: Duration = Duration::from_millis(500);
+
+#[async_trait]
+pub trait BaseTokenRatioProvider: Debug + Send + Sync {
+    fn get_conversion_ratio(&self) -> BaseTokenConversionRatio;
+}
+
+#[derive(Debug, Clone)]
+pub struct DBBaseTokenRatioProvider {
+    pub pool: ConnectionPool<Core>,
+    pub latest_ratio: BaseTokenConversionRatio,
+}
+
+impl DBBaseTokenRatioProvider {
+    pub async fn new(pool: ConnectionPool<Core>) -> anyhow::Result<Self> {
+        let mut fetcher = Self {
+            pool,
+            latest_ratio: BaseTokenConversionRatio::default(),
+        };
+        fetcher.latest_ratio = fetcher.get_latest_price().await?;
+
+        // TODO(PE-129): Implement latest ratio usability logic.
+
+        tracing::debug!(
+            "Starting the base token ratio provider with conversion ratio: {:?}",
+            fetcher.latest_ratio
+        );
+        Ok(fetcher)
+    }
+
+    pub async fn run(&mut self, mut stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        let mut timer = tokio::time::interval(CACHE_UPDATE_INTERVAL);
+
+        while !*stop_receiver.borrow_and_update() {
+            tokio::select! {
+                _ = timer.tick() => { /* continue iterations */ }
+                _ = stop_receiver.changed() => break,
+            }
+
+            let latest_storage_ratio = self.get_latest_price().await?;
+
+            // TODO(PE-129): Implement latest ratio usability logic.
+            self.latest_ratio = BaseTokenConversionRatio {
+                numerator: latest_storage_ratio.numerator,
+                denominator: latest_storage_ratio.denominator,
+            };
+        }
+
+        tracing::info!("Stop signal received, base_token_ratio_provider is shutting down");
+        Ok(())
+    }
+
+    async fn get_latest_price(&self) -> anyhow::Result<BaseTokenConversionRatio> {
+        let latest_storage_ratio = self
+            .pool
+            .connection_tagged("db_base_token_ratio_provider")
+            .await
+            .context("Failed to obtain connection to the database")?
+            .base_token_dal()
+            .get_latest_ratio()
+            .await;
+
+        match latest_storage_ratio {
+            Ok(Some(latest_storage_price)) => Ok(BaseTokenConversionRatio {
+                numerator: latest_storage_price.numerator,
+                denominator: latest_storage_price.denominator,
+            }),
+            Ok(None) => {
+                // TODO(PE-136): Insert initial ratio from genesis.
+                // Though the DB should be populated very soon after the server starts, it is possible
+                // to have no ratios in the DB right after genesis. Having initial ratios in the DB
+                // from the genesis stage will eliminate this possibility.
+                tracing::error!("No latest price found in the database. Using default ratio.");
+                Ok(BaseTokenConversionRatio::default())
+            }
+            Err(err) => anyhow::bail!("Failed to get latest base token ratio: {:?}", err),
+        }
+    }
+}
+
+#[async_trait]
+impl BaseTokenRatioProvider for DBBaseTokenRatioProvider {
+    fn get_conversion_ratio(&self) -> BaseTokenConversionRatio {
+        self.latest_ratio
+    }
+}
+
+// Struct for a no-op BaseTokenRatioProvider (conversion ratio is either always 1:1 or a forced ratio).
+#[derive(Debug, Clone)]
+pub struct NoOpRatioProvider {
+    pub latest_ratio: BaseTokenConversionRatio,
+}
+
+impl NoOpRatioProvider {
+    pub fn new(latest_ratio: BaseTokenConversionRatio) -> Self {
+        Self { latest_ratio }
+    }
+}
+
+impl Default for NoOpRatioProvider {
+    fn default() -> Self {
+        Self {
+            latest_ratio: BaseTokenConversionRatio {
+                numerator: NonZeroU64::new(1).unwrap(),
+                denominator: NonZeroU64::new(1).unwrap(),
+            },
+        }
+    }
+}
+
+#[async_trait]
+impl BaseTokenRatioProvider for NoOpRatioProvider {
+    fn get_conversion_ratio(&self) -> BaseTokenConversionRatio {
+        self.latest_ratio
+    }
+}
diff --git a/core/node/base_token_adjuster/src/lib.rs b/core/node/base_token_adjuster/src/lib.rs
new file mode 100644
index 000000000000..2340ca56c2a7
--- /dev/null
+++ b/core/node/base_token_adjuster/src/lib.rs
@@ -0,0 +1,9 @@
+pub use self::{
+    base_token_ratio_persister::BaseTokenRatioPersister,
+    base_token_ratio_provider::{
+        BaseTokenRatioProvider, DBBaseTokenRatioProvider, NoOpRatioProvider,
+    },
+};
+
+mod base_token_ratio_persister;
+mod base_token_ratio_provider;
diff --git a/core/node/block_reverter/Cargo.toml b/core/node/block_reverter/Cargo.toml
index 178e3da6c58a..68fdf72acd83 100644
--- a/core/node/block_reverter/Cargo.toml
+++ b/core/node/block_reverter/Cargo.toml
@@ -21,11 +21,13 @@ zksync_state.workspace = true
 zksync_merkle_tree.workspace = true
 
 anyhow.workspace = true
+futures.workspace = true
 tokio = { workspace = true, features = ["time", "fs"] }
 serde.workspace = true
 tracing.workspace = true
 
 [dev-dependencies]
 assert_matches.workspace = true
+async-trait.workspace = true
 tempfile.workspace = true
 test-casing.workspace = true
diff --git a/core/node/block_reverter/README.md b/core/node/block_reverter/README.md
index 9d82fb0d189d..0c696dca4761 100644
--- a/core/node/block_reverter/README.md
+++ b/core/node/block_reverter/README.md
@@ -1,4 +1,4 @@
-# zkSync Era Block reverter
+# ZKsync Era Block reverter
 
-This crate contains functionality for rolling back state of a zkSync Era node and reverting committed L1 batches on
+This crate contains functionality for rolling back state of a ZKsync Era node and reverting committed L1 batches on
 Ethereum.
diff --git a/core/node/block_reverter/src/lib.rs b/core/node/block_reverter/src/lib.rs
index 1a9e71c38c1c..da1bf091ea3b 100644
--- a/core/node/block_reverter/src/lib.rs
+++ b/core/node/block_reverter/src/lib.rs
@@ -2,13 +2,16 @@ use std::{path::Path, sync::Arc, time::Duration};
 
 use anyhow::Context as _;
 use serde::Serialize;
-use tokio::fs;
-use zksync_config::{configs::chain::NetworkConfig, ContractsConfig, EthConfig};
+use tokio::{fs, sync::Semaphore};
+use zksync_config::{ContractsConfig, EthConfig};
 use zksync_contracts::hyperchain_contract;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 // Public re-export to simplify the API use.
 pub use zksync_eth_client as eth_client;
-use zksync_eth_client::{BoundEthInterface, CallFunctionArgs, EthInterface, Options};
+use zksync_eth_client::{
+    clients::{DynClient, L1},
+    BoundEthInterface, CallFunctionArgs, EthInterface, Options,
+};
 use zksync_merkle_tree::domain::ZkSyncTree;
 use zksync_object_store::{ObjectStore, ObjectStoreError};
 use zksync_state::RocksdbStorage;
@@ -33,15 +36,13 @@ pub struct BlockReverterEthConfig {
     validator_timelock_addr: H160,
     default_priority_fee_per_gas: u64,
     hyperchain_id: L2ChainId,
-    era_chain_id: L2ChainId,
 }
 
 impl BlockReverterEthConfig {
     pub fn new(
         eth_config: &EthConfig,
         contract: &ContractsConfig,
-        network_config: &NetworkConfig,
-        era_chain_id: L2ChainId,
+        hyperchain_id: L2ChainId,
     ) -> anyhow::Result<Self> {
         Ok(Self {
             diamond_proxy_addr: contract.diamond_proxy_addr,
@@ -51,8 +52,7 @@ impl BlockReverterEthConfig {
                 .as_ref()
                 .context("gas adjuster")?
                 .default_priority_fee_per_gas,
-            hyperchain_id: network_config.zksync_network_id,
-            era_chain_id,
+            hyperchain_id,
         })
     }
 }
@@ -165,7 +165,7 @@ impl BlockReverter {
             vec![]
         };
 
-        if let Some(object_store) = &self.snapshots_object_store {
+        if let Some(object_store) = self.snapshots_object_store.as_deref() {
             Self::delete_snapshot_files(object_store, &deleted_snapshots).await?;
         } else if !deleted_snapshots.is_empty() {
             tracing::info!(
@@ -245,13 +245,15 @@ impl BlockReverter {
         storage_root_hash: H256,
     ) -> anyhow::Result<()> {
         let db = RocksDB::new(path).context("failed initializing RocksDB for Merkle tree")?;
-        let mut tree = ZkSyncTree::new_lightweight(db.into());
+        let mut tree =
+            ZkSyncTree::new_lightweight(db.into()).context("failed initializing Merkle tree")?;
 
         if tree.next_l1_batch_number() <= last_l1_batch_to_keep {
             tracing::info!("Tree is behind the L1 batch to roll back to; skipping");
             return Ok(());
         }
-        tree.roll_back_logs(last_l1_batch_to_keep);
+        tree.roll_back_logs(last_l1_batch_to_keep)
+            .context("cannot roll back Merkle tree")?;
 
         tracing::info!("Checking match of the tree root hash and root hash from Postgres");
         let tree_root_hash = tree.root_hash();
@@ -260,7 +262,7 @@ impl BlockReverter {
             "Mismatch between the tree root hash {tree_root_hash:?} and storage root hash {storage_root_hash:?} after rollback"
         );
         tracing::info!("Saving tree changes to disk");
-        tree.save();
+        tree.save().context("failed saving tree changes")?;
         Ok(())
     }
 
@@ -377,6 +379,8 @@ impl BlockReverter {
         object_store: &dyn ObjectStore,
         deleted_snapshots: &[SnapshotMetadata],
     ) -> anyhow::Result<()> {
+        const CONCURRENT_REMOVE_REQUESTS: usize = 20;
+
         fn ignore_not_found_errors(err: ObjectStoreError) -> Result<(), ObjectStoreError> {
             match err {
                 ObjectStoreError::KeyNotFound(err) => {
@@ -416,18 +420,46 @@ impl BlockReverter {
                 });
             combine_results(&mut overall_result, result);
 
-            for chunk_id in 0..snapshot.storage_logs_filepaths.len() as u64 {
+            let mut is_incomplete_snapshot = false;
+            let chunk_ids_iter = (0_u64..)
+                .zip(&snapshot.storage_logs_filepaths)
+                .filter_map(|(chunk_id, path)| {
+                    if path.is_none() {
+                        if !is_incomplete_snapshot {
+                            is_incomplete_snapshot = true;
+                            tracing::warn!(
+                                "Snapshot for L1 batch #{} is incomplete (misses al least storage logs chunk ID {chunk_id}). \
+                                 It is probable that it's currently being created, in which case you'll need to clean up produced files \
+                                 manually afterwards",
+                                snapshot.l1_batch_number
+                            );
+                        }
+                        return None;
+                    }
+                    Some(chunk_id)
+                });
+
+            let remove_semaphore = &Semaphore::new(CONCURRENT_REMOVE_REQUESTS);
+            let remove_futures = chunk_ids_iter.map(|chunk_id| async move {
+                let _permit = remove_semaphore
+                    .acquire()
+                    .await
+                    .context("semaphore is never closed")?;
+
                 let key = SnapshotStorageLogsStorageKey {
                     l1_batch_number: snapshot.l1_batch_number,
                     chunk_id,
                 };
                 tracing::info!("Removing storage logs chunk {key:?}");
-
-                let result = object_store
+                object_store
                     .remove::<SnapshotStorageLogsChunk>(key)
                     .await
                     .or_else(ignore_not_found_errors)
-                    .with_context(|| format!("failed removing storage logs chunk {key:?}"));
+                    .with_context(|| format!("failed removing storage logs chunk {key:?}"))
+            });
+            let remove_results = futures::future::join_all(remove_futures).await;
+
+            for result in remove_results {
                 combine_results(&mut overall_result, result);
             }
         }
@@ -449,27 +481,15 @@ impl BlockReverter {
 
         let contract = hyperchain_contract();
 
-        // It is expected that for all new chains `revertBatchesSharedBridge` can be used.
-        // For Era, we are using `revertBatches` function for backwards compatibility in case the migration
-        // to the shared bridge is not yet complete.
-        let data = if eth_config.hyperchain_id == eth_config.era_chain_id {
-            let revert_function = contract
-                .function("revertBatches")
-                .context("`revertBatches` function must be present in contract")?;
-            revert_function
-                .encode_input(&[Token::Uint(last_l1_batch_to_keep.0.into())])
-                .context("failed encoding `revertBatches` input")?
-        } else {
-            let revert_function = contract
-                .function("revertBatchesSharedBridge")
-                .context("`revertBatchesSharedBridge` function must be present in contract")?;
-            revert_function
-                .encode_input(&[
-                    Token::Uint(eth_config.hyperchain_id.as_u64().into()),
-                    Token::Uint(last_l1_batch_to_keep.0.into()),
-                ])
-                .context("failed encoding `revertBatchesSharedBridge` input")?
-        };
+        let revert_function = contract
+            .function("revertBatchesSharedBridge")
+            .context("`revertBatchesSharedBridge` function must be present in contract")?;
+        let data = revert_function
+            .encode_input(&[
+                Token::Uint(eth_config.hyperchain_id.as_u64().into()),
+                Token::Uint(last_l1_batch_to_keep.0.into()),
+            ])
+            .context("failed encoding `revertBatchesSharedBridge` input")?;
 
         let options = Options {
             nonce: Some(nonce.into()),
@@ -511,7 +531,7 @@ impl BlockReverter {
 
     #[tracing::instrument(err)]
     async fn get_l1_batch_number_from_contract(
-        eth_client: &dyn EthInterface,
+        eth_client: &DynClient<L1>,
         contract_address: Address,
         op: AggregatedActionType,
     ) -> anyhow::Result<L1BatchNumber> {
@@ -533,7 +553,7 @@ impl BlockReverter {
     /// Returns suggested values for a reversion.
     pub async fn suggested_values(
         &self,
-        eth_client: &dyn EthInterface,
+        eth_client: &DynClient<L1>,
         eth_config: &BlockReverterEthConfig,
         reverter_address: Address,
     ) -> anyhow::Result<SuggestedRevertValues> {
diff --git a/core/node/block_reverter/src/tests.rs b/core/node/block_reverter/src/tests.rs
index 668704b27153..161ac3ed00c4 100644
--- a/core/node/block_reverter/src/tests.rs
+++ b/core/node/block_reverter/src/tests.rs
@@ -1,11 +1,14 @@
 //! Tests for block reverter.
 
+use std::{collections::HashSet, sync::Mutex};
+
 use assert_matches::assert_matches;
+use async_trait::async_trait;
 use test_casing::test_casing;
 use tokio::sync::watch;
 use zksync_dal::Connection;
 use zksync_merkle_tree::TreeInstruction;
-use zksync_object_store::ObjectStoreFactory;
+use zksync_object_store::{Bucket, MockObjectStore};
 use zksync_state::ReadStorage;
 use zksync_types::{
     block::{L1BatchHeader, L2BlockHeader},
@@ -26,11 +29,16 @@ fn gen_storage_logs() -> Vec<StorageLog> {
 
 fn initialize_merkle_tree(path: &Path, storage_logs: &[StorageLog]) -> Vec<H256> {
     let db = RocksDB::new(path).unwrap().with_sync_writes();
-    let mut tree = ZkSyncTree::new(db.into());
+    let mut tree = ZkSyncTree::new(db.into()).unwrap();
     let hashes = storage_logs.iter().enumerate().map(|(i, log)| {
-        let output =
-            tree.process_l1_batch(&[TreeInstruction::write(log.key, i as u64 + 1, log.value)]);
-        tree.save();
+        let output = tree
+            .process_l1_batch(&[TreeInstruction::write(
+                log.key.hashed_key_u256(),
+                i as u64 + 1,
+                log.value,
+            )])
+            .unwrap();
+        tree.save().unwrap();
         output.root_hash
     });
     hashes.collect()
@@ -92,15 +100,12 @@ async fn setup_storage(storage: &mut Connection<'_, Core>, storage_logs: &[Stora
 
         storage
             .storage_logs_dal()
-            .insert_storage_logs(
-                l2_block_header.number,
-                &[(H256::zero(), vec![*storage_log])],
-            )
+            .insert_storage_logs(l2_block_header.number, &[*storage_log])
             .await
             .unwrap();
         storage
             .storage_logs_dedup_dal()
-            .insert_initial_writes(l1_batch_header.number, &[storage_log.key])
+            .insert_initial_writes(l1_batch_header.number, &[storage_log.key.hashed_key()])
             .await
             .unwrap();
     }
@@ -181,7 +186,7 @@ async fn block_reverter_basics(sync_merkle_tree: bool) {
     }
 
     let db = RocksDB::new(&merkle_tree_path).unwrap();
-    let tree = ZkSyncTree::new(db.into());
+    let tree = ZkSyncTree::new(db.into()).unwrap();
     assert_eq!(tree.next_l1_batch_number(), L1BatchNumber(6));
 
     let sk_cache = RocksdbStorage::builder(&sk_cache_path).await.unwrap();
@@ -200,8 +205,13 @@ async fn create_mock_snapshot(
     storage: &mut Connection<'_, Core>,
     object_store: &dyn ObjectStore,
     l1_batch_number: L1BatchNumber,
+    chunk_ids: impl Iterator<Item = u64> + Clone,
 ) {
-    let storage_logs_chunk_count = 5;
+    let storage_logs_chunk_count = chunk_ids
+        .clone()
+        .max()
+        .expect("`chunk_ids` cannot be empty")
+        + 1;
 
     let factory_deps_key = object_store
         .put(
@@ -223,7 +233,7 @@ async fn create_mock_snapshot(
         .await
         .unwrap();
 
-    for chunk_id in 0..storage_logs_chunk_count {
+    for chunk_id in chunk_ids {
         let key = SnapshotStorageLogsStorageKey {
             l1_batch_number,
             chunk_id,
@@ -231,7 +241,7 @@ async fn create_mock_snapshot(
         let key = object_store
             .put(
                 key,
-                &SnapshotStorageLogsChunk {
+                &SnapshotStorageLogsChunk::<H256> {
                     storage_logs: vec![],
                 },
             )
@@ -253,8 +263,8 @@ async fn reverting_snapshot(remove_objects: bool) {
     let mut storage = pool.connection().await.unwrap();
     setup_storage(&mut storage, &storage_logs).await;
 
-    let object_store = ObjectStoreFactory::mock().create_store().await;
-    create_mock_snapshot(&mut storage, &object_store, L1BatchNumber(7)).await;
+    let object_store = MockObjectStore::arc();
+    create_mock_snapshot(&mut storage, &*object_store, L1BatchNumber(7), 0..5).await;
     // Sanity check: snapshot should be visible.
     let all_snapshots = storage
         .snapshots_dal()
@@ -303,3 +313,160 @@ async fn reverting_snapshot(remove_objects: bool) {
         }
     }
 }
+
+#[tokio::test]
+async fn reverting_snapshot_ignores_not_found_object_store_errors() {
+    let storage_logs = gen_storage_logs();
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    setup_storage(&mut storage, &storage_logs).await;
+
+    let object_store = MockObjectStore::arc();
+    create_mock_snapshot(&mut storage, &*object_store, L1BatchNumber(7), 0..5).await;
+
+    // Manually remove some data from the store.
+    object_store
+        .remove::<SnapshotFactoryDependencies>(L1BatchNumber(7))
+        .await
+        .unwrap();
+    let key = SnapshotStorageLogsStorageKey {
+        l1_batch_number: L1BatchNumber(7),
+        chunk_id: 1,
+    };
+    object_store
+        .remove::<SnapshotStorageLogsChunk>(key)
+        .await
+        .unwrap();
+
+    let mut block_reverter = BlockReverter::new(NodeRole::External, pool.clone());
+    block_reverter.enable_rolling_back_postgres();
+    block_reverter.enable_rolling_back_snapshot_objects(object_store);
+    block_reverter.roll_back(L1BatchNumber(5)).await.unwrap();
+
+    // Check that snapshot metadata has been removed.
+    let all_snapshots = storage
+        .snapshots_dal()
+        .get_all_complete_snapshots()
+        .await
+        .unwrap();
+    assert_eq!(all_snapshots.snapshots_l1_batch_numbers, []);
+}
+
+#[derive(Debug, Default)]
+struct ErroneousStore {
+    object_keys: Mutex<HashSet<(Bucket, String)>>,
+}
+
+#[async_trait]
+impl ObjectStore for ErroneousStore {
+    async fn get_raw(&self, _bucket: Bucket, _key: &str) -> Result<Vec<u8>, ObjectStoreError> {
+        unreachable!("not called by reverter")
+    }
+
+    async fn put_raw(
+        &self,
+        bucket: Bucket,
+        key: &str,
+        _value: Vec<u8>,
+    ) -> Result<(), ObjectStoreError> {
+        self.object_keys
+            .lock()
+            .unwrap()
+            .insert((bucket, key.to_owned()));
+        Ok(())
+    }
+
+    async fn remove_raw(&self, bucket: Bucket, key: &str) -> Result<(), ObjectStoreError> {
+        self.object_keys
+            .lock()
+            .unwrap()
+            .remove(&(bucket, key.to_owned()));
+        Err(ObjectStoreError::Other {
+            is_transient: false,
+            source: "fatal error".into(),
+        })
+    }
+
+    fn storage_prefix_raw(&self, bucket: Bucket) -> String {
+        bucket.to_string()
+    }
+}
+
+#[tokio::test]
+async fn reverting_snapshot_propagates_fatal_errors() {
+    let storage_logs = gen_storage_logs();
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    setup_storage(&mut storage, &storage_logs).await;
+
+    let object_store = Arc::new(ErroneousStore::default());
+    create_mock_snapshot(&mut storage, &*object_store, L1BatchNumber(7), 0..5).await;
+
+    let mut block_reverter = BlockReverter::new(NodeRole::External, pool.clone());
+    block_reverter.enable_rolling_back_postgres();
+    block_reverter.enable_rolling_back_snapshot_objects(object_store.clone());
+    let err = block_reverter
+        .roll_back(L1BatchNumber(5))
+        .await
+        .unwrap_err();
+    assert!(err.chain().any(|source| {
+        if let Some(err) = source.downcast_ref::<ObjectStoreError>() {
+            matches!(err, ObjectStoreError::Other { .. })
+        } else {
+            false
+        }
+    }));
+
+    // Check that snapshot metadata has been removed (it's not atomic with snapshot removal).
+    let all_snapshots = storage
+        .snapshots_dal()
+        .get_all_complete_snapshots()
+        .await
+        .unwrap();
+    assert_eq!(all_snapshots.snapshots_l1_batch_numbers, []);
+
+    // Check that removal was called for all objects (i.e., the reverter doesn't bail early).
+    let retained_object_keys = object_store.object_keys.lock().unwrap();
+    assert!(retained_object_keys.is_empty(), "{retained_object_keys:?}");
+}
+
+#[tokio::test]
+async fn reverter_handles_incomplete_snapshot() {
+    let storage_logs = gen_storage_logs();
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    setup_storage(&mut storage, &storage_logs).await;
+
+    let object_store = MockObjectStore::arc();
+    let chunk_ids = [0, 1, 4].into_iter();
+    create_mock_snapshot(
+        &mut storage,
+        &*object_store,
+        L1BatchNumber(7),
+        chunk_ids.clone(),
+    )
+    .await;
+
+    let mut block_reverter = BlockReverter::new(NodeRole::External, pool.clone());
+    block_reverter.enable_rolling_back_postgres();
+    block_reverter.enable_rolling_back_snapshot_objects(object_store.clone());
+    block_reverter.roll_back(L1BatchNumber(5)).await.unwrap();
+
+    // Check that snapshot metadata has been removed.
+    let all_snapshots = storage
+        .snapshots_dal()
+        .get_all_complete_snapshots()
+        .await
+        .unwrap();
+    assert_eq!(all_snapshots.snapshots_l1_batch_numbers, []);
+
+    // Check that chunk files have been removed.
+    for chunk_id in chunk_ids {
+        let key = SnapshotStorageLogsStorageKey {
+            l1_batch_number: L1BatchNumber(7),
+            chunk_id,
+        };
+        let chunk_result = object_store.get::<SnapshotStorageLogsChunk>(key).await;
+        assert_matches!(chunk_result.unwrap_err(), ObjectStoreError::KeyNotFound(_));
+    }
+}
diff --git a/core/node/commitment_generator/Cargo.toml b/core/node/commitment_generator/Cargo.toml
index a15266c7a679..c43343e3614a 100644
--- a/core/node/commitment_generator/Cargo.toml
+++ b/core/node/commitment_generator/Cargo.toml
@@ -16,7 +16,9 @@ zksync_dal.workspace = true
 zksync_health_check.workspace = true
 zksync_l1_contract_interface.workspace = true
 zksync_utils.workspace = true
-multivm.workspace = true
+zksync_eth_client.workspace = true
+zksync_contracts.workspace = true
+zksync_multivm.workspace = true
 circuit_sequencer_api_1_4_0.workspace = true
 circuit_sequencer_api_1_4_1.workspace = true
 circuit_sequencer_api_1_5_0.workspace = true
@@ -26,8 +28,16 @@ zk_evm_1_4_1.workspace = true
 zk_evm_1_3_3.workspace = true
 
 tokio = { workspace = true, features = ["time"] }
+futures.workspace = true
+num_cpus.workspace = true
 anyhow.workspace = true
 tracing.workspace = true
 itertools.workspace = true
 serde_json.workspace = true
 
+[dev-dependencies]
+zksync_web3_decl.workspace = true
+zksync_node_genesis.workspace = true
+zksync_node_test_utils.workspace = true
+
+rand.workspace = true
diff --git a/core/node/commitment_generator/README.md b/core/node/commitment_generator/README.md
index da99ca9403a1..eaa5017e8f0d 100644
--- a/core/node/commitment_generator/README.md
+++ b/core/node/commitment_generator/README.md
@@ -1,4 +1,4 @@
-# zkSync Era commitment generator
+# ZKsync Era commitment generator
 
-This crate contains an implementation of the zkSync Era commitment generator component, which is responsible for the
+This crate contains an implementation of the ZKsync Era commitment generator component, which is responsible for the
 calculation commitment info for L1 batches.
diff --git a/core/node/commitment_generator/src/input_generation.rs b/core/node/commitment_generator/src/input_generation.rs
deleted file mode 100644
index db32776dbacd..000000000000
--- a/core/node/commitment_generator/src/input_generation.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use std::fmt;
-
-use zksync_types::{commitment::CommitmentInput, H256};
-
-#[derive(Debug)]
-pub struct ValidiumInputGenerator;
-
-#[derive(Debug)]
-pub struct RollupInputGenerator;
-
-/// Definition of trait handling computing the input needed for batch commitments. At the current moment
-/// this is run after we've already pulled the data but in the future this should handle taking raw
-/// data and transforming it into the input.
-pub trait InputGenerator: 'static + fmt::Debug + Send + Sync {
-    fn compute_input(&self, input: CommitmentInput) -> CommitmentInput;
-}
-
-impl InputGenerator for ValidiumInputGenerator {
-    fn compute_input(&self, input: CommitmentInput) -> CommitmentInput {
-        match input {
-            CommitmentInput::PostBoojum {
-                common,
-                system_logs,
-                state_diffs,
-                aux_commitments,
-                blob_commitments,
-            } => CommitmentInput::PostBoojum {
-                common,
-                system_logs,
-                state_diffs,
-                aux_commitments,
-                blob_commitments: vec![H256::zero(); blob_commitments.len()],
-            },
-            _ => input,
-        }
-    }
-}
-
-impl InputGenerator for RollupInputGenerator {
-    fn compute_input(&self, input: CommitmentInput) -> CommitmentInput {
-        input
-    }
-}
diff --git a/core/node/commitment_generator/src/lib.rs b/core/node/commitment_generator/src/lib.rs
index f2975383d760..6dc1ef2d29fa 100644
--- a/core/node/commitment_generator/src/lib.rs
+++ b/core/node/commitment_generator/src/lib.rs
@@ -1,15 +1,18 @@
-use std::time::Duration;
+use std::{num::NonZeroU32, ops, sync::Arc, time::Duration};
 
 use anyhow::Context;
 use itertools::Itertools;
-use multivm::zk_evm_latest::ethereum_types::U256;
 use tokio::{sync::watch, task::JoinHandle};
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_health_check::{Health, HealthStatus, HealthUpdater, ReactiveHealthCheck};
 use zksync_l1_contract_interface::i_executor::commit::kzg::pubdata_to_blob_commitments;
+use zksync_multivm::zk_evm_latest::ethereum_types::U256;
 use zksync_types::{
     blob::num_blobs_required,
-    commitment::{AuxCommitments, CommitmentCommonInput, CommitmentInput, L1BatchCommitment},
+    commitment::{
+        AuxCommitments, CommitmentCommonInput, CommitmentInput, L1BatchAuxiliaryOutput,
+        L1BatchCommitment, L1BatchCommitmentArtifacts, L1BatchCommitmentMode,
+    },
     event::convert_vm_events_to_log_queries,
     writes::{InitialStorageWrite, RepeatedStorageWrite, StateDiffRecord},
     L1BatchNumber, ProtocolVersionId, StorageKey, H256,
@@ -17,36 +20,57 @@ use zksync_types::{
 use zksync_utils::h256_to_u256;
 
 use crate::{
-    input_generation::InputGenerator,
     metrics::{CommitmentStage, METRICS},
-    utils::{bootloader_initial_content_commitment, events_queue_commitment},
+    utils::{CommitmentComputer, RealCommitmentComputer},
 };
 
-pub mod input_generation;
 mod metrics;
+#[cfg(test)]
+mod tests;
 mod utils;
+pub mod validation_task;
 
 const SLEEP_INTERVAL: Duration = Duration::from_millis(100);
 
+/// Component responsible for generating commitments for L1 batches.
 #[derive(Debug)]
 pub struct CommitmentGenerator {
+    computer: Arc<dyn CommitmentComputer>,
     connection_pool: ConnectionPool<Core>,
     health_updater: HealthUpdater,
-    input_generator: Box<dyn InputGenerator>,
+    commitment_mode: L1BatchCommitmentMode,
+    parallelism: NonZeroU32,
 }
 
 impl CommitmentGenerator {
+    /// Creates a commitment generator with the provided mode.
     pub fn new(
         connection_pool: ConnectionPool<Core>,
-        input_generator: Box<dyn InputGenerator>,
+        commitment_mode: L1BatchCommitmentMode,
     ) -> Self {
         Self {
+            computer: Arc::new(RealCommitmentComputer),
             connection_pool,
             health_updater: ReactiveHealthCheck::new("commitment_generator").1,
-            input_generator,
+            commitment_mode,
+            parallelism: Self::default_parallelism(),
         }
     }
 
+    /// Returns default parallelism for commitment generation based on the number of CPU cores available.
+    pub fn default_parallelism() -> NonZeroU32 {
+        // Leave at least one core free to handle other blocking tasks. `unwrap()`s are safe by design.
+        let cpus = u32::try_from(num_cpus::get().saturating_sub(1).clamp(1, 16)).unwrap();
+        NonZeroU32::new(cpus).unwrap()
+    }
+
+    /// Sets the degree of parallelism to be used by this generator. A reasonable value can be obtained
+    /// using [`Self::default_parallelism()`].
+    pub fn set_max_parallelism(&mut self, parallelism: NonZeroU32) {
+        self.parallelism = parallelism;
+    }
+
+    /// Returns a health check for this generator.
     pub fn health_check(&self) -> ReactiveHealthCheck {
         self.health_updater.subscribe()
     }
@@ -80,25 +104,26 @@ impl CommitmentGenerator {
             })?;
         drop(connection);
 
+        let computer = self.computer.clone();
         let events_commitment_task: JoinHandle<anyhow::Result<H256>> =
             tokio::task::spawn_blocking(move || {
                 let latency = METRICS.events_queue_commitment_latency.start();
                 let events_queue_commitment =
-                    events_queue_commitment(&events_queue, protocol_version)
-                        .context("Events queue commitment is required for post-boojum batch")?;
+                    computer.events_queue_commitment(&events_queue, protocol_version)?;
                 latency.observe();
 
                 Ok(events_queue_commitment)
             });
 
+        let computer = self.computer.clone();
         let bootloader_memory_commitment_task: JoinHandle<anyhow::Result<H256>> =
             tokio::task::spawn_blocking(move || {
                 let latency = METRICS.bootloader_content_commitment_latency.start();
-                let bootloader_initial_content_commitment = bootloader_initial_content_commitment(
-                    &initial_bootloader_contents,
-                    protocol_version,
-                )
-                .context("Bootloader content commitment is required for post-boojum batch")?;
+                let bootloader_initial_content_commitment = computer
+                    .bootloader_initial_content_commitment(
+                        &initial_bootloader_contents,
+                        protocol_version,
+                    )?;
                 latency.observe();
 
                 Ok(bootloader_initial_content_commitment)
@@ -155,7 +180,7 @@ impl CommitmentGenerator {
         };
         let touched_slots = connection
             .storage_logs_dal()
-            .get_touched_slots_for_l1_batch(l1_batch_number)
+            .get_touched_slots_for_executed_l1_batch(l1_batch_number)
             .await?;
         let touched_hashed_keys: Vec<_> =
             touched_slots.keys().map(|key| key.hashed_key()).collect();
@@ -169,7 +194,7 @@ impl CommitmentGenerator {
             .await?;
         drop(connection);
 
-        let input = if protocol_version.is_pre_boojum() {
+        let mut input = if protocol_version.is_pre_boojum() {
             let mut initial_writes = Vec::new();
             let mut repeated_writes = Vec::new();
             for (key, value) in touched_slots.into_iter().sorted_by_key(|(key, _)| *key) {
@@ -256,12 +281,14 @@ impl CommitmentGenerator {
             }
         };
 
-        let input = self.input_generator.compute_input(input);
-
+        self.tweak_input(&mut input);
         Ok(input)
     }
 
-    async fn step(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<()> {
+    async fn process_batch(
+        &self,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<L1BatchCommitmentArtifacts> {
         let latency =
             METRICS.generate_commitment_latency_stage[&CommitmentStage::PrepareInput].start();
         let input = self.prepare_input(l1_batch_number).await?;
@@ -270,57 +297,159 @@ impl CommitmentGenerator {
 
         let latency =
             METRICS.generate_commitment_latency_stage[&CommitmentStage::Calculate].start();
-        let commitment = L1BatchCommitment::new(input);
+        let mut commitment = L1BatchCommitment::new(input);
+        self.post_process_commitment(&mut commitment);
         let artifacts = commitment.artifacts();
         let latency = latency.observe();
         tracing::debug!(
             "Generated commitment artifacts for L1 batch #{l1_batch_number} in {latency:?}"
         );
+        Ok(artifacts)
+    }
 
-        let latency =
-            METRICS.generate_commitment_latency_stage[&CommitmentStage::SaveResults].start();
-        self.connection_pool
+    async fn step(
+        &self,
+        l1_batch_numbers: ops::RangeInclusive<L1BatchNumber>,
+    ) -> anyhow::Result<()> {
+        let iterable_numbers =
+            (l1_batch_numbers.start().0..=l1_batch_numbers.end().0).map(L1BatchNumber);
+        let batch_futures = iterable_numbers.map(|number| async move {
+            let artifacts = self
+                .process_batch(number)
+                .await
+                .with_context(|| format!("failed processing L1 batch #{number}"))?;
+            anyhow::Ok((number, artifacts))
+        });
+        let artifacts = futures::future::try_join_all(batch_futures).await?;
+
+        let mut connection = self
+            .connection_pool
             .connection_tagged("commitment_generator")
-            .await?
-            .blocks_dal()
-            .save_l1_batch_commitment_artifacts(l1_batch_number, &artifacts)
             .await?;
-        let latency = latency.observe();
-        tracing::debug!(
-            "Stored commitment artifacts for L1 batch #{l1_batch_number} in {latency:?}"
-        );
+        // Saving changes atomically is not required here; since we save batches in order, if we encounter a DB error,
+        // the commitment generator will be able to recover gracefully.
+        for (l1_batch_number, artifacts) in artifacts {
+            let latency =
+                METRICS.generate_commitment_latency_stage[&CommitmentStage::SaveResults].start();
+            connection
+                .blocks_dal()
+                .save_l1_batch_commitment_artifacts(l1_batch_number, &artifacts)
+                .await?;
+            let latency = latency.observe();
+            tracing::debug!(
+                "Stored commitment artifacts for L1 batch #{l1_batch_number} in {latency:?}"
+            );
+        }
 
         let health_details = serde_json::json!({
-            "l1_batch_number": l1_batch_number,
+            "l1_batch_number": *l1_batch_numbers.end(),
         });
         self.health_updater
             .update(Health::from(HealthStatus::Ready).with_details(health_details));
         Ok(())
     }
 
+    fn tweak_input(&self, input: &mut CommitmentInput) {
+        match (self.commitment_mode, input) {
+            (L1BatchCommitmentMode::Rollup, _) => {
+                // Do nothing
+            }
+
+            (
+                L1BatchCommitmentMode::Validium,
+                CommitmentInput::PostBoojum {
+                    blob_commitments, ..
+                },
+            ) => {
+                blob_commitments.fill(H256::zero());
+            }
+            (L1BatchCommitmentMode::Validium, _) => { /* Do nothing */ }
+        }
+    }
+
+    fn post_process_commitment(&self, commitment: &mut L1BatchCommitment) {
+        match (self.commitment_mode, &mut commitment.auxiliary_output) {
+            (
+                L1BatchCommitmentMode::Validium,
+                L1BatchAuxiliaryOutput::PostBoojum {
+                    blob_linear_hashes,
+                    blob_commitments,
+                    ..
+                },
+            ) => {
+                blob_linear_hashes.fill(H256::zero());
+                blob_commitments.fill(H256::zero());
+            }
+            _ => { /* Do nothing */ }
+        }
+    }
+
+    async fn next_batch_range(&self) -> anyhow::Result<Option<ops::RangeInclusive<L1BatchNumber>>> {
+        let mut connection = self
+            .connection_pool
+            .connection_tagged("commitment_generator")
+            .await?;
+        let Some(next_batch_number) = connection
+            .blocks_dal()
+            .get_next_l1_batch_ready_for_commitment_generation()
+            .await?
+        else {
+            return Ok(None);
+        };
+
+        let Some(last_batch_number) = connection
+            .blocks_dal()
+            .get_last_l1_batch_ready_for_commitment_generation()
+            .await?
+        else {
+            return Ok(None);
+        };
+        anyhow::ensure!(
+            next_batch_number <= last_batch_number,
+            "Unexpected node state: next L1 batch ready for commitment generation (#{next_batch_number}) is greater than \
+             the last L1 batch ready for commitment generation (#{last_batch_number})"
+        );
+        let last_batch_number =
+            last_batch_number.min(next_batch_number + self.parallelism.get() - 1);
+        Ok(Some(next_batch_number..=last_batch_number))
+    }
+
+    /// Runs this commitment generator indefinitely. It will process L1 batches added to the database
+    /// processed by the Merkle tree (or a tree fetcher), with a previously configured max parallelism.
     pub async fn run(self, stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        tracing::info!(
+            "Starting commitment generator with mode {:?} and parallelism {}",
+            self.commitment_mode,
+            self.parallelism
+        );
+        if self.connection_pool.max_size() < self.parallelism.get() {
+            tracing::warn!(
+                "Connection pool for commitment generation has fewer connections ({pool_size}) than \
+                 configured max parallelism ({parallelism}); commitment generation may be slowed down as a result",
+                pool_size = self.connection_pool.max_size(),
+                parallelism = self.parallelism.get()
+            );
+        }
         self.health_updater.update(HealthStatus::Ready.into());
+
         loop {
             if *stop_receiver.borrow() {
                 tracing::info!("Stop signal received, commitment generator is shutting down");
                 break;
             }
 
-            let Some(l1_batch_number) = self
-                .connection_pool
-                .connection_tagged("commitment_generator")
-                .await?
-                .blocks_dal()
-                .get_next_l1_batch_ready_for_commitment_generation()
-                .await?
-            else {
+            let Some(l1_batch_numbers) = self.next_batch_range().await? else {
                 tokio::time::sleep(SLEEP_INTERVAL).await;
                 continue;
             };
 
-            tracing::info!("Started commitment generation for L1 batch #{l1_batch_number}");
-            self.step(l1_batch_number).await?;
-            tracing::info!("Finished commitment generation for L1 batch #{l1_batch_number}");
+            tracing::info!("Started commitment generation for L1 batches #{l1_batch_numbers:?}");
+            let step_latency = METRICS.step_latency.start();
+            self.step(l1_batch_numbers.clone()).await?;
+            let step_latency = step_latency.observe();
+            let batch_count = l1_batch_numbers.end().0 - l1_batch_numbers.start().0 + 1;
+            METRICS.step_batch_count.observe(batch_count.into());
+            tracing::info!("Finished commitment generation for L1 batches #{l1_batch_numbers:?} in {step_latency:?} ({:?} per batch)", step_latency / batch_count);
         }
         Ok(())
     }
diff --git a/core/node/commitment_generator/src/metrics.rs b/core/node/commitment_generator/src/metrics.rs
index 78cb82fff2bd..767e2874915b 100644
--- a/core/node/commitment_generator/src/metrics.rs
+++ b/core/node/commitment_generator/src/metrics.rs
@@ -10,19 +10,28 @@ pub(super) enum CommitmentStage {
     SaveResults,
 }
 
+const BATCH_COUNT_BUCKETS: Buckets = Buckets::linear(1.0..=16.0, 1.0);
+
 /// Metrics for the commitment generator.
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "server_commitment_generator")]
 pub(super) struct CommitmentGeneratorMetrics {
-    /// Latency of generating commitment per stage.
+    /// Latency of generating commitment for a single L1 batch per stage.
     #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
     pub generate_commitment_latency_stage: Family<CommitmentStage, Histogram<Duration>>,
-    /// Latency of generating bootloader content commitment.
+    /// Latency of generating bootloader content commitment for a single L1 batch.
     #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
     pub bootloader_content_commitment_latency: Histogram<Duration>,
-    /// Latency of generating events queue commitment.
+    /// Latency of generating events queue commitment for a single L1 batch.
     #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
     pub events_queue_commitment_latency: Histogram<Duration>,
+
+    /// Latency of processing a continuous chunk of L1 batches during a single step of the generator.
+    #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
+    pub step_latency: Histogram<Duration>,
+    /// Number of L1 batches processed during a single step.
+    #[metrics(buckets = BATCH_COUNT_BUCKETS)]
+    pub step_batch_count: Histogram<u64>,
 }
 
 #[vise::register]
diff --git a/core/node/commitment_generator/src/tests.rs b/core/node/commitment_generator/src/tests.rs
new file mode 100644
index 000000000000..d857013a7699
--- /dev/null
+++ b/core/node/commitment_generator/src/tests.rs
@@ -0,0 +1,301 @@
+//! Tests for `CommitmentGenerator`.
+
+use std::thread;
+
+use rand::{thread_rng, Rng};
+use zksync_dal::Connection;
+use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
+use zksync_node_test_utils::{create_l1_batch, create_l2_block};
+use zksync_types::{
+    block::L1BatchTreeData, zk_evm_types::LogQuery, AccountTreeId, Address, StorageLog,
+};
+
+use super::*;
+
+async fn seal_l1_batch(storage: &mut Connection<'_, Core>, number: L1BatchNumber) {
+    let l2_block = create_l2_block(number.0);
+    storage
+        .blocks_dal()
+        .insert_l2_block(&l2_block)
+        .await
+        .unwrap();
+    let storage_key = StorageKey::new(
+        AccountTreeId::new(Address::repeat_byte(1)),
+        H256::from_low_u64_be(number.0.into()),
+    );
+    let storage_log = StorageLog::new_write_log(storage_key, H256::repeat_byte(0xff));
+    storage
+        .storage_logs_dal()
+        .insert_storage_logs(l2_block.number, &[storage_log])
+        .await
+        .unwrap();
+    storage
+        .storage_logs_dedup_dal()
+        .insert_initial_writes(number, &[storage_key.hashed_key()])
+        .await
+        .unwrap();
+
+    let header = create_l1_batch(number.0);
+    storage
+        .blocks_dal()
+        .insert_mock_l1_batch(&header)
+        .await
+        .unwrap();
+    storage
+        .blocks_dal()
+        .mark_l2_blocks_as_executed_in_l1_batch(number)
+        .await
+        .unwrap();
+}
+
+async fn save_l1_batch_tree_data(storage: &mut Connection<'_, Core>, number: L1BatchNumber) {
+    let tree_data = L1BatchTreeData {
+        hash: H256::from_low_u64_be(number.0.into()),
+        rollup_last_leaf_index: 20 + 10 * u64::from(number.0),
+    };
+    storage
+        .blocks_dal()
+        .save_l1_batch_tree_data(number, &tree_data)
+        .await
+        .unwrap();
+}
+
+#[derive(Debug)]
+struct MockCommitmentComputer {
+    delay: Duration,
+}
+
+impl MockCommitmentComputer {
+    const EVENTS_QUEUE_COMMITMENT: H256 = H256::repeat_byte(1);
+    const BOOTLOADER_COMMITMENT: H256 = H256::repeat_byte(2);
+}
+
+impl CommitmentComputer for MockCommitmentComputer {
+    fn events_queue_commitment(
+        &self,
+        _events_queue: &[LogQuery],
+        protocol_version: ProtocolVersionId,
+    ) -> anyhow::Result<H256> {
+        assert_eq!(protocol_version, ProtocolVersionId::latest());
+        thread::sleep(self.delay);
+        Ok(Self::EVENTS_QUEUE_COMMITMENT)
+    }
+
+    fn bootloader_initial_content_commitment(
+        &self,
+        _initial_bootloader_contents: &[(usize, U256)],
+        protocol_version: ProtocolVersionId,
+    ) -> anyhow::Result<H256> {
+        assert_eq!(protocol_version, ProtocolVersionId::latest());
+        thread::sleep(self.delay);
+        Ok(Self::BOOTLOADER_COMMITMENT)
+    }
+}
+
+fn create_commitment_generator(pool: ConnectionPool<Core>) -> CommitmentGenerator {
+    let mut generator = CommitmentGenerator::new(pool, L1BatchCommitmentMode::Rollup);
+    generator.computer = Arc::new(MockCommitmentComputer {
+        delay: Duration::from_millis(20),
+    });
+    generator
+}
+
+fn processed_batch(health: &Health, expected_number: L1BatchNumber) -> bool {
+    if !matches!(health.status(), HealthStatus::Ready) {
+        return false;
+    }
+    let Some(details) = health.details() else {
+        return false;
+    };
+    *details == serde_json::json!({ "l1_batch_number": expected_number })
+}
+
+#[tokio::test]
+async fn determining_batch_range() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    let mut generator = create_commitment_generator(pool.clone());
+    generator.parallelism = NonZeroU32::new(4).unwrap(); // to be deterministic
+    assert_eq!(generator.next_batch_range().await.unwrap(), None);
+
+    seal_l1_batch(&mut storage, L1BatchNumber(1)).await;
+    assert_eq!(generator.next_batch_range().await.unwrap(), None); // No tree data for L1 batch #1
+
+    save_l1_batch_tree_data(&mut storage, L1BatchNumber(1)).await;
+    assert_eq!(
+        generator.next_batch_range().await.unwrap(),
+        Some(L1BatchNumber(1)..=L1BatchNumber(1))
+    );
+
+    seal_l1_batch(&mut storage, L1BatchNumber(2)).await;
+    assert_eq!(
+        generator.next_batch_range().await.unwrap(),
+        Some(L1BatchNumber(1)..=L1BatchNumber(1))
+    );
+
+    save_l1_batch_tree_data(&mut storage, L1BatchNumber(2)).await;
+    assert_eq!(
+        generator.next_batch_range().await.unwrap(),
+        Some(L1BatchNumber(1)..=L1BatchNumber(2))
+    );
+
+    for number in 3..=5 {
+        seal_l1_batch(&mut storage, L1BatchNumber(number)).await;
+    }
+    assert_eq!(
+        generator.next_batch_range().await.unwrap(),
+        Some(L1BatchNumber(1)..=L1BatchNumber(2))
+    );
+
+    for number in 3..=5 {
+        save_l1_batch_tree_data(&mut storage, L1BatchNumber(number)).await;
+    }
+    // L1 batch #5 is excluded because of the parallelism limit
+    assert_eq!(
+        generator.next_batch_range().await.unwrap(),
+        Some(L1BatchNumber(1)..=L1BatchNumber(4))
+    );
+}
+
+#[tokio::test]
+async fn commitment_generator_normal_operation() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    let generator = create_commitment_generator(pool.clone());
+    let mut health_check = generator.health_check();
+    let (stop_sender, stop_receiver) = watch::channel(false);
+    let generator_handle = tokio::spawn(generator.run(stop_receiver));
+
+    for number in 1..=5 {
+        let number = L1BatchNumber(number);
+        seal_l1_batch(&mut storage, number).await;
+        save_l1_batch_tree_data(&mut storage, number).await;
+        // Wait until the batch is processed by the generator
+        health_check
+            .wait_for(|health| processed_batch(health, number))
+            .await;
+        // Check data in Postgres
+        let metadata = storage
+            .blocks_dal()
+            .get_l1_batch_metadata(number)
+            .await
+            .unwrap()
+            .expect("no batch metadata");
+        assert_eq!(
+            metadata.metadata.events_queue_commitment,
+            Some(MockCommitmentComputer::EVENTS_QUEUE_COMMITMENT)
+        );
+        assert_eq!(
+            metadata.metadata.bootloader_initial_content_commitment,
+            Some(MockCommitmentComputer::BOOTLOADER_COMMITMENT)
+        );
+    }
+
+    stop_sender.send_replace(true);
+    generator_handle.await.unwrap().unwrap();
+}
+
+#[tokio::test]
+async fn commitment_generator_bulk_processing() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    for number in 1..=5 {
+        seal_l1_batch(&mut storage, L1BatchNumber(number)).await;
+        save_l1_batch_tree_data(&mut storage, L1BatchNumber(number)).await;
+    }
+
+    let mut generator = create_commitment_generator(pool.clone());
+    generator.parallelism = NonZeroU32::new(10).unwrap(); // enough to process all batches at once
+    let mut health_check = generator.health_check();
+    let (stop_sender, stop_receiver) = watch::channel(false);
+    let generator_handle = tokio::spawn(generator.run(stop_receiver));
+
+    health_check
+        .wait_for(|health| processed_batch(health, L1BatchNumber(5)))
+        .await;
+    for number in 1..=5 {
+        let metadata = storage
+            .blocks_dal()
+            .get_l1_batch_metadata(L1BatchNumber(number))
+            .await
+            .unwrap()
+            .expect("no batch metadata");
+        assert_eq!(
+            metadata.metadata.events_queue_commitment,
+            Some(MockCommitmentComputer::EVENTS_QUEUE_COMMITMENT)
+        );
+        assert_eq!(
+            metadata.metadata.bootloader_initial_content_commitment,
+            Some(MockCommitmentComputer::BOOTLOADER_COMMITMENT)
+        );
+    }
+
+    stop_sender.send_replace(true);
+    generator_handle.await.unwrap().unwrap();
+}
+
+#[tokio::test]
+async fn commitment_generator_with_tree_emulation() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+    drop(storage);
+
+    // Emulates adding new batches to the storage.
+    let new_batches_pool = pool.clone();
+    let new_batches_handle = tokio::spawn(async move {
+        for number in 1..=10 {
+            let sleep_delay = Duration::from_millis(thread_rng().gen_range(1..20));
+            tokio::time::sleep(sleep_delay).await;
+            let mut storage = new_batches_pool.connection().await.unwrap();
+            seal_l1_batch(&mut storage, L1BatchNumber(number)).await;
+        }
+    });
+
+    let tree_emulator_pool = pool.clone();
+    let tree_emulator_handle = tokio::spawn(async move {
+        for number in 1..=10 {
+            let mut storage = tree_emulator_pool.connection().await.unwrap();
+            while storage
+                .blocks_dal()
+                .get_sealed_l1_batch_number()
+                .await
+                .unwrap()
+                < Some(L1BatchNumber(number))
+            {
+                let sleep_delay = Duration::from_millis(thread_rng().gen_range(5..10));
+                tokio::time::sleep(sleep_delay).await;
+            }
+            save_l1_batch_tree_data(&mut storage, L1BatchNumber(number)).await;
+        }
+    });
+
+    let mut generator = create_commitment_generator(pool.clone());
+    generator.parallelism = NonZeroU32::new(10).unwrap(); // enough to process all batches at once
+    let mut health_check = generator.health_check();
+    let (stop_sender, stop_receiver) = watch::channel(false);
+    let generator_handle = tokio::spawn(generator.run(stop_receiver));
+
+    health_check
+        .wait_for(|health| processed_batch(health, L1BatchNumber(10)))
+        .await;
+
+    new_batches_handle.await.unwrap();
+    tree_emulator_handle.await.unwrap();
+    stop_sender.send_replace(true);
+    generator_handle.await.unwrap().unwrap();
+}
diff --git a/core/node/commitment_generator/src/utils.rs b/core/node/commitment_generator/src/utils.rs
index 433d1345903e..b4e6bc542e97 100644
--- a/core/node/commitment_generator/src/utils.rs
+++ b/core/node/commitment_generator/src/utils.rs
@@ -1,5 +1,7 @@
 //! Utils for commitment calculation.
-use multivm::utils::get_used_bootloader_memory_bytes;
+
+use std::fmt;
+
 use zk_evm_1_3_3::{
     aux_structures::Timestamp as Timestamp_1_3_3,
     zk_evm_abstractions::queries::LogQuery as LogQuery_1_3_3,
@@ -12,76 +14,100 @@ use zk_evm_1_5_0::{
     aux_structures::Timestamp as Timestamp_1_5_0,
     zk_evm_abstractions::queries::LogQuery as LogQuery_1_5_0,
 };
+use zksync_multivm::utils::get_used_bootloader_memory_bytes;
 use zksync_types::{zk_evm_types::LogQuery, ProtocolVersionId, VmVersion, H256, U256};
 use zksync_utils::expand_memory_contents;
 
-pub fn events_queue_commitment(
-    events_queue: &[LogQuery],
-    protocol_version: ProtocolVersionId,
-) -> Option<H256> {
-    match VmVersion::from(protocol_version) {
-        VmVersion::VmBoojumIntegration => Some(H256(
-            circuit_sequencer_api_1_4_0::commitments::events_queue_commitment_fixed(
-                &events_queue
-                    .iter()
-                    .map(|x| to_log_query_1_3_3(*x))
-                    .collect(),
-            ),
-        )),
-        VmVersion::Vm1_4_1 | VmVersion::Vm1_4_2 => Some(H256(
-            circuit_sequencer_api_1_4_1::commitments::events_queue_commitment_fixed(
-                &events_queue
-                    .iter()
-                    .map(|x| to_log_query_1_4_1(*x))
-                    .collect(),
-            ),
-        )),
-        VmVersion::Vm1_5_0SmallBootloaderMemory | VmVersion::Vm1_5_0IncreasedBootloaderMemory => {
-            Some(H256(
+/// Encapsulates computations of commitment components.
+///
+/// - All methods are considered to be blocking.
+/// - Returned errors are considered unrecoverable (i.e., they bubble up and lead to commitment generator termination).
+pub(crate) trait CommitmentComputer: fmt::Debug + Send + Sync + 'static {
+    fn events_queue_commitment(
+        &self,
+        events_queue: &[LogQuery],
+        protocol_version: ProtocolVersionId,
+    ) -> anyhow::Result<H256>;
+
+    fn bootloader_initial_content_commitment(
+        &self,
+        initial_bootloader_contents: &[(usize, U256)],
+        protocol_version: ProtocolVersionId,
+    ) -> anyhow::Result<H256>;
+}
+
+#[derive(Debug)]
+pub(crate) struct RealCommitmentComputer;
+
+impl CommitmentComputer for RealCommitmentComputer {
+    fn events_queue_commitment(
+        &self,
+        events_queue: &[LogQuery],
+        protocol_version: ProtocolVersionId,
+    ) -> anyhow::Result<H256> {
+        match VmVersion::from(protocol_version) {
+            VmVersion::VmBoojumIntegration => Ok(H256(
+                circuit_sequencer_api_1_4_0::commitments::events_queue_commitment_fixed(
+                    &events_queue
+                        .iter()
+                        .map(|x| to_log_query_1_3_3(*x))
+                        .collect(),
+                ),
+            )),
+            VmVersion::Vm1_4_1 | VmVersion::Vm1_4_2 => Ok(H256(
+                circuit_sequencer_api_1_4_1::commitments::events_queue_commitment_fixed(
+                    &events_queue
+                        .iter()
+                        .map(|x| to_log_query_1_4_1(*x))
+                        .collect(),
+                ),
+            )),
+            VmVersion::Vm1_5_0SmallBootloaderMemory
+            | VmVersion::Vm1_5_0IncreasedBootloaderMemory => Ok(H256(
                 circuit_sequencer_api_1_5_0::commitments::events_queue_commitment_fixed(
                     &events_queue
                         .iter()
                         .map(|x| to_log_query_1_5_0(*x))
                         .collect(),
                 ),
-            ))
+            )),
+            _ => anyhow::bail!("Unsupported protocol version: {protocol_version:?}"),
         }
-        _ => None,
     }
-}
 
-pub fn bootloader_initial_content_commitment(
-    initial_bootloader_contents: &[(usize, U256)],
-    protocol_version: ProtocolVersionId,
-) -> Option<H256> {
-    let expanded_memory_size = if protocol_version.is_pre_boojum() {
-        return None;
-    } else {
-        get_used_bootloader_memory_bytes(protocol_version.into())
-    };
+    fn bootloader_initial_content_commitment(
+        &self,
+        initial_bootloader_contents: &[(usize, U256)],
+        protocol_version: ProtocolVersionId,
+    ) -> anyhow::Result<H256> {
+        let expanded_memory_size = if protocol_version.is_pre_boojum() {
+            anyhow::bail!("Unsupported protocol version: {protocol_version:?}");
+        } else {
+            get_used_bootloader_memory_bytes(protocol_version.into())
+        };
 
-    let full_bootloader_memory =
-        expand_memory_contents(initial_bootloader_contents, expanded_memory_size);
+        let full_bootloader_memory =
+            expand_memory_contents(initial_bootloader_contents, expanded_memory_size);
 
-    match VmVersion::from(protocol_version) {
-        VmVersion::VmBoojumIntegration => Some(H256(
-            circuit_sequencer_api_1_4_0::commitments::initial_heap_content_commitment_fixed(
-                &full_bootloader_memory,
-            ),
-        )),
-        VmVersion::Vm1_4_1 | VmVersion::Vm1_4_2 => Some(H256(
-            circuit_sequencer_api_1_4_1::commitments::initial_heap_content_commitment_fixed(
-                &full_bootloader_memory,
-            ),
-        )),
-        VmVersion::Vm1_5_0SmallBootloaderMemory | VmVersion::Vm1_5_0IncreasedBootloaderMemory => {
-            Some(H256(
+        match VmVersion::from(protocol_version) {
+            VmVersion::VmBoojumIntegration => Ok(H256(
+                circuit_sequencer_api_1_4_0::commitments::initial_heap_content_commitment_fixed(
+                    &full_bootloader_memory,
+                ),
+            )),
+            VmVersion::Vm1_4_1 | VmVersion::Vm1_4_2 => Ok(H256(
+                circuit_sequencer_api_1_4_1::commitments::initial_heap_content_commitment_fixed(
+                    &full_bootloader_memory,
+                ),
+            )),
+            VmVersion::Vm1_5_0SmallBootloaderMemory
+            | VmVersion::Vm1_5_0IncreasedBootloaderMemory => Ok(H256(
                 circuit_sequencer_api_1_5_0::commitments::initial_heap_content_commitment_fixed(
                     &full_bootloader_memory,
                 ),
-            ))
+            )),
+            _ => unreachable!(),
         }
-        _ => unreachable!(),
     }
 }
 
diff --git a/core/node/commitment_generator/src/validation_task.rs b/core/node/commitment_generator/src/validation_task.rs
new file mode 100644
index 000000000000..cf93a4899b89
--- /dev/null
+++ b/core/node/commitment_generator/src/validation_task.rs
@@ -0,0 +1,260 @@
+use std::time::Duration;
+
+use tokio::sync::watch;
+use zksync_eth_client::{
+    clients::{DynClient, L1},
+    CallFunctionArgs, ClientError, ContractCallError,
+};
+use zksync_types::{commitment::L1BatchCommitmentMode, Address};
+
+/// Managed task that asynchronously validates that the commitment mode (rollup or validium) from the node config
+/// matches the mode in the L1 diamond proxy contract.
+#[derive(Debug)]
+pub struct L1BatchCommitmentModeValidationTask {
+    diamond_proxy_address: Address,
+    expected_mode: L1BatchCommitmentMode,
+    eth_client: Box<DynClient<L1>>,
+    retry_interval: Duration,
+    exit_on_success: bool,
+}
+
+impl L1BatchCommitmentModeValidationTask {
+    const DEFAULT_RETRY_INTERVAL: Duration = Duration::from_secs(5);
+
+    /// Creates a new task with the specified params and Ethereum client.
+    pub fn new(
+        diamond_proxy_address: Address,
+        expected_mode: L1BatchCommitmentMode,
+        eth_client: Box<DynClient<L1>>,
+    ) -> Self {
+        Self {
+            diamond_proxy_address,
+            expected_mode,
+            eth_client: eth_client.for_component("commitment_mode_validation"),
+            retry_interval: Self::DEFAULT_RETRY_INTERVAL,
+            exit_on_success: false,
+        }
+    }
+
+    /// Makes the task exit after the commitment mode was successfully verified. By default, the task
+    /// will only exit on error or after getting a stop signal.
+    pub fn exit_on_success(mut self) -> Self {
+        self.exit_on_success = true;
+        self
+    }
+
+    async fn validate_commitment_mode(self) -> anyhow::Result<()> {
+        let expected_mode = self.expected_mode;
+        let diamond_proxy_address = self.diamond_proxy_address;
+        let eth_client = self.eth_client.as_ref();
+        loop {
+            let result = Self::get_pubdata_pricing_mode(diamond_proxy_address, eth_client).await;
+            match result {
+                Ok(mode) => {
+                    anyhow::ensure!(
+                        mode == self.expected_mode,
+                        "Configured L1 batch commitment mode ({expected_mode:?}) does not match the commitment mode \
+                         used on L1 contract {diamond_proxy_address:?} ({mode:?})"
+                    );
+                    tracing::info!(
+                        "Checked that the configured L1 batch commitment mode ({expected_mode:?}) matches the commitment mode \
+                         used on L1 contract {diamond_proxy_address:?}"
+                    );
+                    return Ok(());
+                }
+
+                // Getters contract does not support `getPubdataPricingMode` method.
+                // This case is accepted for backwards compatibility with older contracts, but emits a
+                // warning in case the wrong contract address was passed by the caller.
+                Err(ContractCallError::EthereumGateway(err))
+                    if matches!(err.as_ref(), ClientError::Call(_)) =>
+                {
+                    tracing::warn!("Contract {diamond_proxy_address:?} does not support getPubdataPricingMode method: {err}");
+                    return Ok(());
+                }
+
+                Err(ContractCallError::EthereumGateway(err)) if err.is_transient() => {
+                    tracing::warn!(
+                        "Transient error validating commitment mode, will retry after {:?}: {err}",
+                        self.retry_interval
+                    );
+                    tokio::time::sleep(self.retry_interval).await;
+                }
+
+                Err(err) => {
+                    tracing::error!("Fatal error validating commitment mode: {err}");
+                    return Err(err.into());
+                }
+            }
+        }
+    }
+
+    async fn get_pubdata_pricing_mode(
+        diamond_proxy_address: Address,
+        eth_client: &DynClient<L1>,
+    ) -> Result<L1BatchCommitmentMode, ContractCallError> {
+        CallFunctionArgs::new("getPubdataPricingMode", ())
+            .for_contract(
+                diamond_proxy_address,
+                &zksync_contracts::hyperchain_contract(),
+            )
+            .call(eth_client)
+            .await
+    }
+
+    /// Runs this task. The task will exit on error (and on success if `exit_on_success` is set),
+    /// or when a stop signal is received.
+    pub async fn run(self, mut stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        let exit_on_success = self.exit_on_success;
+        let validation = self.validate_commitment_mode();
+        tokio::select! {
+            result = validation => {
+                if exit_on_success || result.is_err() {
+                    return result;
+                }
+                stop_receiver.changed().await.ok();
+                Ok(())
+            },
+            _ = stop_receiver.changed() => Ok(()),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::{mem, sync::Mutex};
+
+    use zksync_eth_client::clients::MockEthereum;
+    use zksync_types::{ethabi, U256};
+    use zksync_web3_decl::{client::MockClient, jsonrpsee::types::ErrorObject};
+
+    use super::*;
+
+    fn mock_ethereum(token: ethabi::Token, err: Option<ClientError>) -> MockClient<L1> {
+        let err_mutex = Mutex::new(err);
+        MockEthereum::builder()
+            .with_fallible_call_handler(move |_, _| {
+                let err = mem::take(&mut *err_mutex.lock().unwrap());
+                if let Some(err) = err {
+                    Err(err)
+                } else {
+                    Ok(token.clone())
+                }
+            })
+            .build()
+            .into_client()
+    }
+
+    fn mock_ethereum_with_legacy_contract() -> MockClient<L1> {
+        let err = ClientError::Call(ErrorObject::owned(3, "execution reverted: F", None::<()>));
+        mock_ethereum(ethabi::Token::Uint(U256::zero()), Some(err))
+    }
+
+    fn mock_ethereum_with_transport_error() -> MockClient<L1> {
+        let err = ClientError::Transport(anyhow::anyhow!("unreachable"));
+        mock_ethereum(ethabi::Token::Uint(U256::zero()), Some(err))
+    }
+
+    fn mock_ethereum_with_rollup_contract() -> MockClient<L1> {
+        mock_ethereum(ethabi::Token::Uint(U256::zero()), None)
+    }
+
+    fn mock_ethereum_with_validium_contract() -> MockClient<L1> {
+        mock_ethereum(ethabi::Token::Uint(U256::one()), None)
+    }
+
+    fn commitment_task(
+        expected_mode: L1BatchCommitmentMode,
+        eth_client: MockClient<L1>,
+    ) -> L1BatchCommitmentModeValidationTask {
+        let diamond_proxy_address = Address::repeat_byte(0x01);
+        L1BatchCommitmentModeValidationTask {
+            diamond_proxy_address,
+            expected_mode,
+            eth_client: Box::new(eth_client),
+            exit_on_success: true,
+            retry_interval: Duration::ZERO,
+        }
+    }
+
+    #[tokio::test]
+    async fn ensure_l1_batch_commit_data_generation_mode_succeeds_when_both_match() {
+        let task = commitment_task(
+            L1BatchCommitmentMode::Rollup,
+            mock_ethereum_with_rollup_contract(),
+        );
+        task.validate_commitment_mode().await.unwrap();
+
+        let task = commitment_task(
+            L1BatchCommitmentMode::Validium,
+            mock_ethereum_with_validium_contract(),
+        );
+        task.validate_commitment_mode().await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn ensure_l1_batch_commit_data_generation_mode_succeeds_on_legacy_contracts() {
+        let task = commitment_task(
+            L1BatchCommitmentMode::Rollup,
+            mock_ethereum_with_legacy_contract(),
+        );
+        task.validate_commitment_mode().await.unwrap();
+
+        let task = commitment_task(
+            L1BatchCommitmentMode::Validium,
+            mock_ethereum_with_legacy_contract(),
+        );
+        task.validate_commitment_mode().await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn ensure_l1_batch_commit_data_generation_mode_fails_on_mismatch() {
+        let task = commitment_task(
+            L1BatchCommitmentMode::Validium,
+            mock_ethereum_with_rollup_contract(),
+        );
+        let err = task
+            .validate_commitment_mode()
+            .await
+            .unwrap_err()
+            .to_string();
+        assert!(err.contains("commitment mode"), "{err}");
+
+        let task = commitment_task(
+            L1BatchCommitmentMode::Rollup,
+            mock_ethereum_with_validium_contract(),
+        );
+        let err = task
+            .validate_commitment_mode()
+            .await
+            .unwrap_err()
+            .to_string();
+        assert!(err.contains("commitment mode"), "{err}");
+    }
+
+    #[tokio::test]
+    async fn ensure_l1_batch_commit_data_generation_mode_recovers_from_request_failure() {
+        let task = commitment_task(
+            L1BatchCommitmentMode::Rollup,
+            mock_ethereum_with_transport_error(),
+        );
+        task.validate_commitment_mode().await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn ensure_l1_batch_commit_data_generation_mode_fails_on_parse_error() {
+        let task = commitment_task(
+            L1BatchCommitmentMode::Rollup,
+            mock_ethereum(ethabi::Token::String("what".into()), None),
+        );
+        let err = task
+            .validate_commitment_mode()
+            .await
+            .unwrap_err()
+            .to_string();
+        assert!(
+            err.contains("L1BatchCommitDataGeneratorMode::from_tokens"),
+            "{err}",
+        );
+    }
+}
diff --git a/core/node/consensus/Cargo.toml b/core/node/consensus/Cargo.toml
new file mode 100644
index 000000000000..6332ac8c1a9d
--- /dev/null
+++ b/core/node/consensus/Cargo.toml
@@ -0,0 +1,51 @@
+[package]
+name = "zksync_node_consensus"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_config.workspace = true
+zksync_concurrency.workspace = true
+zksync_consensus_crypto.workspace = true
+zksync_consensus_network.workspace = true
+zksync_consensus_roles.workspace = true
+zksync_consensus_storage.workspace = true
+zksync_consensus_executor.workspace = true
+zksync_consensus_bft.workspace = true
+zksync_consensus_utils.workspace = true
+zksync_protobuf.workspace = true
+zksync_dal.workspace = true
+zksync_state.workspace = true
+zksync_l1_contract_interface.workspace = true
+zksync_metadata_calculator.workspace = true
+zksync_merkle_tree.workspace = true
+zksync_state_keeper.workspace = true
+zksync_node_sync.workspace = true
+zksync_system_constants.workspace = true
+zksync_types.workspace = true
+zksync_utils.workspace = true
+zksync_web3_decl.workspace = true
+
+anyhow.workspace = true
+async-trait.workspace = true
+secrecy.workspace = true
+tempfile.workspace = true
+thiserror.workspace = true
+tracing.workspace = true
+
+[dev-dependencies]
+zksync_node_genesis.workspace = true
+zksync_node_test_utils.workspace = true
+zksync_node_api_server.workspace = true
+zksync_test_account.workspace = true
+zksync_contracts.workspace=  true
+
+tokio.workspace = true
+test-casing.workspace = true
+rand.workspace = true
diff --git a/core/node/consensus/README.md b/core/node/consensus/README.md
new file mode 100644
index 000000000000..191104555ad8
--- /dev/null
+++ b/core/node/consensus/README.md
@@ -0,0 +1,3 @@
+# `zksync_node_consensus`
+
+Set of components that add the support of consensus to the ZK Stack.
diff --git a/core/node/consensus/src/batch.rs b/core/node/consensus/src/batch.rs
new file mode 100644
index 000000000000..08246c4e5c04
--- /dev/null
+++ b/core/node/consensus/src/batch.rs
@@ -0,0 +1,275 @@
+//! L1 Batch representation for sending over p2p network.
+use anyhow::Context as _;
+use zksync_concurrency::{ctx, error::Wrap as _};
+use zksync_consensus_roles::validator;
+use zksync_dal::consensus_dal::Payload;
+use zksync_l1_contract_interface::i_executor;
+use zksync_metadata_calculator::api_server::{TreeApiClient, TreeEntryWithProof};
+use zksync_system_constants as constants;
+use zksync_types::{
+    abi,
+    block::{unpack_block_info, L2BlockHasher},
+    AccountTreeId, L1BatchNumber, L2BlockNumber, ProtocolVersionId, StorageKey, Transaction, H256,
+    U256,
+};
+use zksync_utils::{h256_to_u256, u256_to_h256};
+
+use crate::storage::ConnectionPool;
+
+/// Commitment to the last block of a batch.
+pub(crate) struct LastBlockCommit {
+    /// Hash of the `StoredBatchInfo` which is stored on L1.
+    /// The hashed `StoredBatchInfo` contains a `root_hash` of the L2 state,
+    /// which contains state of the `SystemContext` contract,
+    /// which contains enough data to reconstruct the hash
+    /// of the last L2 block of the batch.
+    pub(crate) info: H256,
+}
+
+/// Witness proving what is the last block of a batch.
+/// Contains the hash and the number of the last block.
+pub(crate) struct LastBlockWitness {
+    info: i_executor::structures::StoredBatchInfo,
+    protocol_version: ProtocolVersionId,
+
+    current_l2_block_info: TreeEntryWithProof,
+    tx_rolling_hash: TreeEntryWithProof,
+    l2_block_hash_entry: TreeEntryWithProof,
+}
+
+/// Commitment to an L1 batch.
+pub(crate) struct L1BatchCommit {
+    pub(crate) number: L1BatchNumber,
+    pub(crate) this_batch: LastBlockCommit,
+    pub(crate) prev_batch: LastBlockCommit,
+}
+
+/// L1Batch with witness that can be
+/// verified against `L1BatchCommit`.
+pub struct L1BatchWithWitness {
+    pub(crate) blocks: Vec<Payload>,
+    pub(crate) this_batch: LastBlockWitness,
+    pub(crate) prev_batch: LastBlockWitness,
+}
+
+impl LastBlockWitness {
+    /// Address of the SystemContext contract.
+    fn system_context_addr() -> AccountTreeId {
+        AccountTreeId::new(constants::SYSTEM_CONTEXT_ADDRESS)
+    }
+
+    /// Storage key of the `SystemContext.current_l2_block_info` field.
+    fn current_l2_block_info_key() -> U256 {
+        StorageKey::new(
+            Self::system_context_addr(),
+            constants::SYSTEM_CONTEXT_CURRENT_L2_BLOCK_INFO_POSITION,
+        )
+        .hashed_key_u256()
+    }
+
+    /// Storage key of the `SystemContext.tx_rolling_hash` field.
+    fn tx_rolling_hash_key() -> U256 {
+        StorageKey::new(
+            Self::system_context_addr(),
+            constants::SYSTEM_CONTEXT_CURRENT_TX_ROLLING_HASH_POSITION,
+        )
+        .hashed_key_u256()
+    }
+
+    /// Storage key of the entry of the `SystemContext.l2BlockHash[]` array, corresponding to l2
+    /// block with number i.
+    fn l2_block_hash_entry_key(i: L2BlockNumber) -> U256 {
+        let key = h256_to_u256(constants::SYSTEM_CONTEXT_CURRENT_L2_BLOCK_HASHES_POSITION)
+            + U256::from(i.0) % U256::from(constants::SYSTEM_CONTEXT_STORED_L2_BLOCK_HASHES);
+        StorageKey::new(Self::system_context_addr(), u256_to_h256(key)).hashed_key_u256()
+    }
+
+    /// Loads a `LastBlockWitness` from storage.
+    async fn load(
+        ctx: &ctx::Ctx,
+        n: L1BatchNumber,
+        pool: &ConnectionPool,
+        tree: &dyn TreeApiClient,
+    ) -> ctx::Result<Self> {
+        let mut conn = pool.connection(ctx).await.wrap("pool.connection()")?;
+        let batch = conn
+            .batch(ctx, n)
+            .await
+            .wrap("batch()")?
+            .context("batch not in storage")?;
+
+        let proofs = tree
+            .get_proofs(
+                n,
+                vec![
+                    Self::current_l2_block_info_key(),
+                    Self::tx_rolling_hash_key(),
+                ],
+            )
+            .await
+            .context("get_proofs()")?;
+        if proofs.len() != 2 {
+            return Err(anyhow::format_err!("proofs.len()!=2").into());
+        }
+        let current_l2_block_info = proofs[0].clone();
+        let tx_rolling_hash = proofs[1].clone();
+        let (block_number, _) = unpack_block_info(current_l2_block_info.value.as_bytes().into());
+        let prev = L2BlockNumber(
+            block_number
+                .checked_sub(1)
+                .context("L2BlockNumber underflow")?
+                .try_into()
+                .context("L2BlockNumber overflow")?,
+        );
+        let proofs = tree
+            .get_proofs(n, vec![Self::l2_block_hash_entry_key(prev)])
+            .await
+            .context("get_proofs()")?;
+        if proofs.len() != 1 {
+            return Err(anyhow::format_err!("proofs.len()!=1").into());
+        }
+        let l2_block_hash_entry = proofs[0].clone();
+        Ok(Self {
+            info: i_executor::structures::StoredBatchInfo::from(&batch),
+            protocol_version: batch
+                .header
+                .protocol_version
+                .context("missing protocol_version")?,
+
+            current_l2_block_info,
+            tx_rolling_hash,
+            l2_block_hash_entry,
+        })
+    }
+
+    /// Verifies the proof against the commit and returns the hash
+    /// of the last L2 block.
+    pub(crate) fn verify(&self, comm: &LastBlockCommit) -> anyhow::Result<(L2BlockNumber, H256)> {
+        // Verify info.
+        anyhow::ensure!(comm.info == self.info.hash());
+
+        // Check the protocol version.
+        anyhow::ensure!(
+            self.protocol_version >= ProtocolVersionId::Version13,
+            "unsupported protocol version"
+        );
+
+        let (block_number, block_timestamp) =
+            unpack_block_info(self.current_l2_block_info.value.as_bytes().into());
+        let prev = L2BlockNumber(
+            block_number
+                .checked_sub(1)
+                .context("L2BlockNumber underflow")?
+                .try_into()
+                .context("L2BlockNumber overflow")?,
+        );
+
+        // Verify merkle paths.
+        self.current_l2_block_info
+            .verify(Self::current_l2_block_info_key(), self.info.batch_hash)
+            .context("invalid merkle path for current_l2_block_info")?;
+        self.tx_rolling_hash
+            .verify(Self::tx_rolling_hash_key(), self.info.batch_hash)
+            .context("invalid merkle path for tx_rolling_hash")?;
+        self.l2_block_hash_entry
+            .verify(Self::l2_block_hash_entry_key(prev), self.info.batch_hash)
+            .context("invalid merkle path for l2_block_hash entry")?;
+
+        let block_number = L2BlockNumber(block_number.try_into().context("block_number overflow")?);
+        // Derive hash of the last block
+        Ok((
+            block_number,
+            L2BlockHasher::hash(
+                block_number,
+                block_timestamp,
+                self.l2_block_hash_entry.value,
+                self.tx_rolling_hash.value,
+                self.protocol_version,
+            ),
+        ))
+    }
+
+    /// Last L2 block of the batch.
+    pub fn last_block(&self) -> validator::BlockNumber {
+        let (n, _) = unpack_block_info(self.current_l2_block_info.value.as_bytes().into());
+        validator::BlockNumber(n)
+    }
+}
+
+impl L1BatchWithWitness {
+    /// Loads an `L1BatchWithWitness` from storage.
+    pub(crate) async fn load(
+        ctx: &ctx::Ctx,
+        number: L1BatchNumber,
+        pool: &ConnectionPool,
+        tree: &dyn TreeApiClient,
+    ) -> ctx::Result<Self> {
+        let prev_batch = LastBlockWitness::load(ctx, number - 1, pool, tree)
+            .await
+            .with_wrap(|| format!("LastBlockWitness::make({})", number - 1))?;
+        let this_batch = LastBlockWitness::load(ctx, number, pool, tree)
+            .await
+            .with_wrap(|| format!("LastBlockWitness::make({number})"))?;
+        let mut conn = pool.connection(ctx).await.wrap("connection()")?;
+        let this = Self {
+            blocks: conn
+                .payloads(
+                    ctx,
+                    std::ops::Range {
+                        start: prev_batch.last_block() + 1,
+                        end: this_batch.last_block() + 1,
+                    },
+                )
+                .await
+                .wrap("payloads()")?,
+            prev_batch,
+            this_batch,
+        };
+        Ok(this)
+    }
+
+    /// Verifies the L1Batch and witness against the commitment.
+    /// WARNING: the following fields of the payload are not currently verified:
+    /// * `l1_gas_price`
+    /// * `l2_fair_gas_price`
+    /// * `fair_pubdata_price`
+    /// * `virtual_blocks`
+    /// * `operator_address`
+    /// * `protocol_version` (present both in payload and witness, but neither has a commitment)
+    pub(crate) fn verify(&self, comm: &L1BatchCommit) -> anyhow::Result<()> {
+        let (last_number, last_hash) = self.this_batch.verify(&comm.this_batch)?;
+        let (mut prev_number, mut prev_hash) = self.prev_batch.verify(&comm.prev_batch)?;
+        anyhow::ensure!(
+            self.prev_batch
+                .info
+                .batch_number
+                .checked_add(1)
+                .context("batch_number overflow")?
+                == u64::from(comm.number.0)
+        );
+        anyhow::ensure!(self.this_batch.info.batch_number == u64::from(comm.number.0));
+        for (i, b) in self.blocks.iter().enumerate() {
+            anyhow::ensure!(b.l1_batch_number == comm.number);
+            anyhow::ensure!(b.protocol_version == self.this_batch.protocol_version);
+            anyhow::ensure!(b.last_in_batch == (i + 1 == self.blocks.len()));
+            prev_number += 1;
+            let mut hasher = L2BlockHasher::new(prev_number, b.timestamp, prev_hash);
+            for t in &b.transactions {
+                // Reconstruct transaction by converting it back and forth to `abi::Transaction`.
+                // This allows us to verify that the transaction actually matches the transaction
+                // hash.
+                // TODO: make consensus payload contain `abi::Transaction` instead.
+                // TODO: currently the payload doesn't contain the block number, which is
+                // annoying. Consider adding it to payload.
+                let t2: Transaction = abi::Transaction::try_from(t.clone())?.try_into()?;
+                anyhow::ensure!(t == &t2);
+                hasher.push_tx_hash(t.hash());
+            }
+            prev_hash = hasher.finalize(self.this_batch.protocol_version);
+            anyhow::ensure!(prev_hash == b.hash);
+        }
+        anyhow::ensure!(prev_hash == last_hash);
+        anyhow::ensure!(prev_number == last_number);
+        Ok(())
+    }
+}
diff --git a/core/node/consensus/src/config.rs b/core/node/consensus/src/config.rs
new file mode 100644
index 000000000000..cac9e9296227
--- /dev/null
+++ b/core/node/consensus/src/config.rs
@@ -0,0 +1,117 @@
+//! Configuration utilities for the consensus component.
+use std::collections::HashMap;
+
+use anyhow::Context as _;
+use secrecy::{ExposeSecret as _, Secret};
+use zksync_concurrency::net;
+use zksync_config::{
+    configs,
+    configs::consensus::{ConsensusConfig, ConsensusSecrets, Host, NodePublicKey},
+};
+use zksync_consensus_crypto::{Text, TextFmt};
+use zksync_consensus_executor as executor;
+use zksync_consensus_roles::{node, validator};
+
+fn read_secret_text<T: TextFmt>(text: Option<&Secret<String>>) -> anyhow::Result<Option<T>> {
+    text.map(|text| Text::new(text.expose_secret()).decode())
+        .transpose()
+        .map_err(|_| anyhow::format_err!("invalid format"))
+}
+
+pub(super) fn validator_key(
+    secrets: &ConsensusSecrets,
+) -> anyhow::Result<Option<validator::SecretKey>> {
+    read_secret_text(secrets.validator_key.as_ref().map(|x| &x.0))
+}
+
+/// Consensus genesis specification.
+/// It is a digest of the `validator::Genesis`,
+/// which allows to initialize genesis (if not present)
+/// decide whether a hard fork is necessary (if present).
+#[derive(Debug, PartialEq)]
+pub(super) struct GenesisSpec {
+    pub(super) chain_id: validator::ChainId,
+    pub(super) protocol_version: validator::ProtocolVersion,
+    pub(super) validators: validator::Committee,
+    pub(super) leader_selection: validator::LeaderSelectionMode,
+}
+
+impl GenesisSpec {
+    pub(super) fn from_genesis(g: &validator::Genesis) -> Self {
+        Self {
+            chain_id: g.chain_id,
+            protocol_version: g.protocol_version,
+            validators: g.validators.clone(),
+            leader_selection: g.leader_selection.clone(),
+        }
+    }
+
+    pub(super) fn parse(x: &configs::consensus::GenesisSpec) -> anyhow::Result<Self> {
+        let validators: Vec<_> = x
+            .validators
+            .iter()
+            .enumerate()
+            .map(|(i, v)| {
+                Ok(validator::WeightedValidator {
+                    key: Text::new(&v.key.0).decode().context("key").context(i)?,
+                    weight: v.weight,
+                })
+            })
+            .collect::<anyhow::Result<_>>()
+            .context("validators")?;
+        Ok(Self {
+            chain_id: validator::ChainId(x.chain_id.as_u64()),
+            protocol_version: validator::ProtocolVersion(x.protocol_version.0),
+            leader_selection: validator::LeaderSelectionMode::Sticky(
+                Text::new(&x.leader.0).decode().context("leader")?,
+            ),
+            validators: validator::Committee::new(validators).context("validators")?,
+        })
+    }
+}
+
+pub(super) fn node_key(secrets: &ConsensusSecrets) -> anyhow::Result<Option<node::SecretKey>> {
+    read_secret_text(secrets.node_key.as_ref().map(|x| &x.0))
+}
+
+pub(super) fn executor(
+    cfg: &ConsensusConfig,
+    secrets: &ConsensusSecrets,
+) -> anyhow::Result<executor::Config> {
+    let mut gossip_static_outbound = HashMap::new();
+    {
+        let mut append = |key: &NodePublicKey, addr: &Host| {
+            gossip_static_outbound.insert(
+                Text::new(&key.0).decode().context("key")?,
+                net::Host(addr.0.clone()),
+            );
+            anyhow::Ok(())
+        };
+        for (i, (k, v)) in cfg.gossip_static_outbound.iter().enumerate() {
+            append(k, v).with_context(|| format!("gossip_static_outbound[{i}]"))?;
+        }
+    }
+
+    let mut rpc = executor::RpcConfig::default();
+    rpc.get_block_rate = cfg.rpc().get_block_rate();
+
+    Ok(executor::Config {
+        server_addr: cfg.server_addr,
+        public_addr: net::Host(cfg.public_addr.0.clone()),
+        max_payload_size: cfg.max_payload_size,
+        node_key: node_key(secrets)
+            .context("node_key")?
+            .context("missing node_key")?,
+        gossip_dynamic_inbound_limit: cfg.gossip_dynamic_inbound_limit,
+        gossip_static_inbound: cfg
+            .gossip_static_inbound
+            .iter()
+            .enumerate()
+            .map(|(i, x)| Text::new(&x.0).decode().context(i))
+            .collect::<Result<_, _>>()
+            .context("gossip_static_inbound")?,
+        gossip_static_outbound,
+        rpc,
+        debug_page: None,
+    })
+}
diff --git a/core/lib/zksync_core/src/consensus/fetcher.rs b/core/node/consensus/src/en.rs
similarity index 72%
rename from core/lib/zksync_core/src/consensus/fetcher.rs
rename to core/node/consensus/src/en.rs
index 787be42dbcc8..66326756fb77 100644
--- a/core/lib/zksync_core/src/consensus/fetcher.rs
+++ b/core/node/consensus/src/en.rs
@@ -2,33 +2,35 @@ use anyhow::Context as _;
 use zksync_concurrency::{ctx, error::Wrap as _, scope, time};
 use zksync_consensus_executor as executor;
 use zksync_consensus_roles::validator;
-use zksync_types::L2BlockNumber;
-use zksync_web3_decl::client::BoxedL2Client;
-
-use crate::{
-    consensus::{storage, Store},
-    sync_layer::{
-        fetcher::FetchedBlock, sync_action::ActionQueueSender, MainNodeClient, SyncState,
-    },
+use zksync_consensus_storage::{BatchStore, BlockStore};
+use zksync_node_sync::{
+    fetcher::FetchedBlock, sync_action::ActionQueueSender, MainNodeClient, SyncState,
 };
+use zksync_types::L2BlockNumber;
+use zksync_web3_decl::client::{DynClient, L2};
 
-pub type P2PConfig = executor::Config;
+use super::{config, storage::Store, ConsensusConfig, ConsensusSecrets};
+use crate::storage::{self, ConnectionPool};
 
-/// L2 block fetcher.
-pub struct Fetcher {
-    pub store: Store,
-    pub sync_state: SyncState,
-    pub client: BoxedL2Client,
+/// External node.
+pub(super) struct EN {
+    pub(super) pool: ConnectionPool,
+    pub(super) sync_state: SyncState,
+    pub(super) client: Box<DynClient<L2>>,
 }
 
-impl Fetcher {
-    /// Task fetching L2 blocks using peer-to-peer gossip network.
-    /// NOTE: it still uses main node json RPC in some cases for now.
-    pub async fn run_p2p(
+impl EN {
+    /// Task running a consensus node for the external node.
+    /// It may be a validator, but it cannot be a leader (cannot propose blocks).
+    ///
+    /// NOTE: Before starting the consensus node if fetches all the blocks
+    /// older than consensus genesis from the main node using json RPC.
+    pub async fn run(
         self,
         ctx: &ctx::Ctx,
         actions: ActionQueueSender,
-        p2p: P2PConfig,
+        cfg: ConsensusConfig,
+        secrets: ConsensusSecrets,
     ) -> anyhow::Result<()> {
         let res: ctx::Result<()> = scope::run!(ctx, |ctx, s| async {
             // Update sync state in the background.
@@ -36,12 +38,12 @@ impl Fetcher {
 
             // Initialize genesis.
             let genesis = self.fetch_genesis(ctx).await.wrap("fetch_genesis()")?;
-            let mut conn = self.store.access(ctx).await.wrap("access()")?;
+            let mut conn = self.pool.connection(ctx).await.wrap("connection()")?;
             conn.try_update_genesis(ctx, &genesis)
                 .await
                 .wrap("set_genesis()")?;
             let mut payload_queue = conn
-                .new_payload_queue(ctx, actions)
+                .new_payload_queue(ctx, actions, self.sync_state.clone())
                 .await
                 .wrap("new_payload_queue()")?;
             drop(conn);
@@ -67,17 +69,32 @@ impl Fetcher {
             });
 
             // Run consensus component.
-            let (block_store, runner) = self
-                .store
-                .clone()
-                .into_block_store(ctx, Some(payload_queue))
+            let (store, runner) = Store::new(ctx, self.pool.clone(), Some(payload_queue))
+                .await
+                .wrap("Store::new()")?;
+            s.spawn_bg(async { Ok(runner.run(ctx).await?) });
+            let (block_store, runner) = BlockStore::new(ctx, Box::new(store.clone()))
+                .await
+                .wrap("BlockStore::new()")?;
+            s.spawn_bg(async { Ok(runner.run(ctx).await?) });
+            // Dummy batch store - we don't gossip batches yet, but we need one anyway.
+            let (batch_store, runner) = BatchStore::new(ctx, Box::new(store.clone()))
                 .await
-                .wrap("into_block_store()")?;
+                .wrap("BatchStore::new()")?;
             s.spawn_bg(async { Ok(runner.run(ctx).await?) });
+
             let executor = executor::Executor {
-                config: p2p.clone(),
+                config: config::executor(&cfg, &secrets)?,
                 block_store,
-                validator: None,
+                batch_store,
+                attester: None,
+                validator: config::validator_key(&secrets)
+                    .context("validator_key")?
+                    .map(|key| executor::Validator {
+                        key,
+                        replica_store: Box::new(store.clone()),
+                        payload_manager: Box::new(store.clone()),
+                    }),
             };
             executor.run(ctx).await?;
             Ok(())
@@ -90,7 +107,7 @@ impl Fetcher {
     }
 
     /// Task fetching L2 blocks using JSON-RPC endpoint of the main node.
-    pub async fn run_centralized(
+    pub async fn run_fetcher(
         self,
         ctx: &ctx::Ctx,
         actions: ActionQueueSender,
@@ -99,11 +116,11 @@ impl Fetcher {
             // Update sync state in the background.
             s.spawn_bg(self.fetch_state_loop(ctx));
             let mut payload_queue = self
-                .store
-                .access(ctx)
+                .pool
+                .connection(ctx)
                 .await
-                .wrap("access()")?
-                .new_payload_queue(ctx, actions)
+                .wrap("connection()")?
+                .new_payload_queue(ctx, actions, self.sync_state.clone())
                 .await
                 .wrap("new_fetcher_cursor()")?;
             self.fetch_blocks(ctx, &mut payload_queue, None).await
@@ -193,7 +210,7 @@ impl Fetcher {
         .await?;
         // If fetched anything, wait for the last block to be stored persistently.
         if first < queue.next() {
-            self.store
+            self.pool
                 .wait_for_payload(ctx, queue.next().prev().unwrap())
                 .await?;
         }
diff --git a/core/lib/zksync_core/src/consensus/era.rs b/core/node/consensus/src/era.rs
similarity index 50%
rename from core/lib/zksync_core/src/consensus/era.rs
rename to core/node/consensus/src/era.rs
index 9deb137a9a4d..6d69432d8e1b 100644
--- a/core/lib/zksync_core/src/consensus/era.rs
+++ b/core/node/consensus/src/era.rs
@@ -1,56 +1,54 @@
 //! This module provides convenience functions to run consensus components in different modes
-//! as expected by the zkSync Era.
+//! as expected by the ZKsync Era.
 //!
 //! This module simply glues APIs that are already publicly exposed by the `consensus` module,
 //! so in case any custom behavior is needed, these APIs should be used directly.
 
 use zksync_concurrency::ctx;
 use zksync_config::configs::consensus::{ConsensusConfig, ConsensusSecrets};
-use zksync_dal::{ConnectionPool, Core};
-use zksync_web3_decl::client::BoxedL2Client;
+use zksync_dal::Core;
+use zksync_node_sync::{sync_action::ActionQueueSender, SyncState};
+use zksync_web3_decl::client::{DynClient, L2};
 
-use super::{config, fetcher::Fetcher, storage::Store};
-use crate::sync_layer::{sync_action::ActionQueueSender, SyncState};
+use super::{en, mn, storage::ConnectionPool};
 
 /// Runs the consensus task in the main node mode.
 pub async fn run_main_node(
     ctx: &ctx::Ctx,
-    cfg: super::MainNodeConfig,
-    pool: ConnectionPool<Core>,
+    cfg: ConsensusConfig,
+    secrets: ConsensusSecrets,
+    pool: zksync_dal::ConnectionPool<Core>,
 ) -> anyhow::Result<()> {
     // Consensus is a new component.
     // For now in case of error we just log it and allow the server
     // to continue running.
-    if let Err(err) = cfg.run(ctx, Store(pool)).await {
-        tracing::error!(%err, "Consensus actor failed");
+    if let Err(err) = mn::run_main_node(ctx, cfg, secrets, ConnectionPool(pool)).await {
+        tracing::error!("Consensus actor failed: {err:#}");
     } else {
         tracing::info!("Consensus actor stopped");
     }
     Ok(())
 }
 
-/// Runs the consensus in the fetcher mode (e.g. for the external node needs).
-/// The fetcher implementation may either be p2p or centralized.
-pub async fn run_fetcher(
+/// Runs the consensus node for the external node.
+/// If `cfg` is `None`, it will just fetch blocks from the main node
+/// using JSON RPC, without starting the consensus node.
+pub async fn run_external_node(
     ctx: &ctx::Ctx,
     cfg: Option<(ConsensusConfig, ConsensusSecrets)>,
-    pool: ConnectionPool<Core>,
+    pool: zksync_dal::ConnectionPool<Core>,
     sync_state: SyncState,
-    main_node_client: BoxedL2Client,
+    main_node_client: Box<DynClient<L2>>,
     actions: ActionQueueSender,
 ) -> anyhow::Result<()> {
-    let fetcher = Fetcher {
-        store: Store(pool),
+    let en = en::EN {
+        pool: ConnectionPool(pool),
         sync_state: sync_state.clone(),
-        client: main_node_client,
+        client: main_node_client.for_component("block_fetcher"),
     };
     let res = match cfg {
-        Some((cfg, secrets)) => {
-            fetcher
-                .run_p2p(ctx, actions, config::p2p(&cfg, &secrets)?)
-                .await
-        }
-        None => fetcher.run_centralized(ctx, actions).await,
+        Some((cfg, secrets)) => en.run(ctx, actions, cfg, secrets).await,
+        None => en.run_fetcher(ctx, actions).await,
     };
     tracing::info!("Consensus actor stopped");
     res
diff --git a/core/node/consensus/src/lib.rs b/core/node/consensus/src/lib.rs
new file mode 100644
index 000000000000..13d918b5b6ee
--- /dev/null
+++ b/core/node/consensus/src/lib.rs
@@ -0,0 +1,20 @@
+//! Consensus-related functionality.
+
+#![allow(clippy::redundant_locals)]
+#![allow(clippy::needless_pass_by_ref_mut)]
+
+use zksync_config::configs::consensus::{ConsensusConfig, ConsensusSecrets};
+
+// Currently `batch` module is only used in tests,
+// but will be used in production once batch syncing is implemented in consensus.
+#[allow(unused)]
+mod batch;
+mod config;
+mod en;
+pub mod era;
+mod mn;
+mod storage;
+#[cfg(test)]
+pub(crate) mod testonly;
+#[cfg(test)]
+mod tests;
diff --git a/core/node/consensus/src/mn.rs b/core/node/consensus/src/mn.rs
new file mode 100644
index 000000000000..0aac43b8ef87
--- /dev/null
+++ b/core/node/consensus/src/mn.rs
@@ -0,0 +1,72 @@
+use anyhow::Context as _;
+use zksync_concurrency::{ctx, error::Wrap as _, scope};
+use zksync_config::configs::consensus::{ConsensusConfig, ConsensusSecrets};
+use zksync_consensus_executor::{self as executor};
+use zksync_consensus_roles::validator;
+use zksync_consensus_storage::{BatchStore, BlockStore};
+
+use crate::{
+    config,
+    storage::{ConnectionPool, Store},
+};
+
+/// Task running a consensus validator for the main node.
+/// Main node is currently the only leader of the consensus - i.e. it proposes all the
+/// L2 blocks (generated by `Statekeeper`).
+pub async fn run_main_node(
+    ctx: &ctx::Ctx,
+    cfg: ConsensusConfig,
+    secrets: ConsensusSecrets,
+    pool: ConnectionPool,
+) -> anyhow::Result<()> {
+    let validator_key = config::validator_key(&secrets)
+        .context("validator_key")?
+        .context("missing validator_key")?;
+
+    scope::run!(&ctx, |ctx, s| async {
+        if let Some(spec) = &cfg.genesis_spec {
+            let spec = config::GenesisSpec::parse(spec).context("GenesisSpec::parse()")?;
+
+            pool.connection(ctx)
+                .await
+                .wrap("connection()")?
+                .adjust_genesis(ctx, &spec)
+                .await
+                .wrap("adjust_genesis()")?;
+        }
+
+        let (store, runner) = Store::new(ctx, pool, None).await.wrap("Store::new()")?;
+        s.spawn_bg(runner.run(ctx));
+
+        let (block_store, runner) = BlockStore::new(ctx, Box::new(store.clone()))
+            .await
+            .wrap("BlockStore::new()")?;
+        s.spawn_bg(runner.run(ctx));
+
+        anyhow::ensure!(
+            block_store.genesis().leader_selection
+                == validator::LeaderSelectionMode::Sticky(validator_key.public()),
+            "unsupported leader selection mode - main node has to be the leader"
+        );
+
+        // Dummy batch store - we don't gossip batches yet, but we need one anyway.
+        let (batch_store, runner) = BatchStore::new(ctx, Box::new(store.clone()))
+            .await
+            .wrap("BatchStore::new()")?;
+        s.spawn_bg(async { runner.run(ctx).await.context("BatchStore::runner()") });
+
+        let executor = executor::Executor {
+            config: config::executor(&cfg, &secrets)?,
+            block_store,
+            batch_store,
+            attester: None,
+            validator: Some(executor::Validator {
+                key: validator_key,
+                replica_store: Box::new(store.clone()),
+                payload_manager: Box::new(store.clone()),
+            }),
+        };
+        executor.run(ctx).await
+    })
+    .await
+}
diff --git a/core/node/consensus/src/storage/connection.rs b/core/node/consensus/src/storage/connection.rs
new file mode 100644
index 000000000000..673cb87d2f4e
--- /dev/null
+++ b/core/node/consensus/src/storage/connection.rs
@@ -0,0 +1,255 @@
+use anyhow::Context as _;
+use zksync_concurrency::{ctx, error::Wrap as _, time};
+use zksync_consensus_roles::validator;
+use zksync_consensus_storage as storage;
+use zksync_dal::{consensus_dal::Payload, Core, CoreDal, DalError};
+use zksync_node_sync::{fetcher::IoCursorExt as _, ActionQueueSender, SyncState};
+use zksync_state_keeper::io::common::IoCursor;
+use zksync_types::{commitment::L1BatchWithMetadata, L1BatchNumber};
+
+use super::{InsertCertificateError, PayloadQueue};
+use crate::config;
+
+/// Context-aware `zksync_dal::ConnectionPool<Core>` wrapper.
+#[derive(Debug, Clone)]
+pub(crate) struct ConnectionPool(pub(crate) zksync_dal::ConnectionPool<Core>);
+
+impl ConnectionPool {
+    /// Wrapper for `connection_tagged()`.
+    pub(crate) async fn connection<'a>(&'a self, ctx: &ctx::Ctx) -> ctx::Result<Connection<'a>> {
+        Ok(Connection(
+            ctx.wait(self.0.connection_tagged("consensus"))
+                .await?
+                .map_err(DalError::generalize)?,
+        ))
+    }
+
+    /// Waits for the `number` L2 block.
+    pub async fn wait_for_payload(
+        &self,
+        ctx: &ctx::Ctx,
+        number: validator::BlockNumber,
+    ) -> ctx::Result<Payload> {
+        const POLL_INTERVAL: time::Duration = time::Duration::milliseconds(50);
+        loop {
+            if let Some(payload) = self
+                .connection(ctx)
+                .await
+                .wrap("connection()")?
+                .payload(ctx, number)
+                .await
+                .with_wrap(|| format!("payload({number})"))?
+            {
+                return Ok(payload);
+            }
+            ctx.sleep(POLL_INTERVAL).await?;
+        }
+    }
+}
+
+/// Context-aware `zksync_dal::Connection<Core>` wrapper.
+pub(crate) struct Connection<'a>(pub(crate) zksync_dal::Connection<'a, Core>);
+
+impl<'a> Connection<'a> {
+    /// Wrapper for `start_transaction()`.
+    pub async fn start_transaction<'b, 'c: 'b>(
+        &'c mut self,
+        ctx: &ctx::Ctx,
+    ) -> ctx::Result<Connection<'b>> {
+        Ok(Connection(
+            ctx.wait(self.0.start_transaction())
+                .await?
+                .context("sqlx")?,
+        ))
+    }
+
+    /// Wrapper for `commit()`.
+    pub async fn commit(self, ctx: &ctx::Ctx) -> ctx::Result<()> {
+        Ok(ctx.wait(self.0.commit()).await?.context("sqlx")?)
+    }
+
+    /// Wrapper for `consensus_dal().block_payload()`.
+    pub async fn payload(
+        &mut self,
+        ctx: &ctx::Ctx,
+        number: validator::BlockNumber,
+    ) -> ctx::Result<Option<Payload>> {
+        Ok(ctx
+            .wait(self.0.consensus_dal().block_payload(number))
+            .await?
+            .map_err(DalError::generalize)?)
+    }
+
+    /// Wrapper for `consensus_dal().block_payloads()`.
+    pub async fn payloads(
+        &mut self,
+        ctx: &ctx::Ctx,
+        numbers: std::ops::Range<validator::BlockNumber>,
+    ) -> ctx::Result<Vec<Payload>> {
+        Ok(ctx
+            .wait(self.0.consensus_dal().block_payloads(numbers))
+            .await?
+            .map_err(DalError::generalize)?)
+    }
+
+    /// Wrapper for `consensus_dal().certificate()`.
+    pub async fn certificate(
+        &mut self,
+        ctx: &ctx::Ctx,
+        number: validator::BlockNumber,
+    ) -> ctx::Result<Option<validator::CommitQC>> {
+        Ok(ctx
+            .wait(self.0.consensus_dal().certificate(number))
+            .await??)
+    }
+
+    /// Wrapper for `consensus_dal().insert_certificate()`.
+    pub async fn insert_certificate(
+        &mut self,
+        ctx: &ctx::Ctx,
+        cert: &validator::CommitQC,
+    ) -> Result<(), InsertCertificateError> {
+        Ok(ctx
+            .wait(self.0.consensus_dal().insert_certificate(cert))
+            .await??)
+    }
+
+    /// Wrapper for `consensus_dal().replica_state()`.
+    pub async fn replica_state(&mut self, ctx: &ctx::Ctx) -> ctx::Result<storage::ReplicaState> {
+        Ok(ctx
+            .wait(self.0.consensus_dal().replica_state())
+            .await?
+            .map_err(DalError::generalize)?)
+    }
+
+    /// Wrapper for `consensus_dal().set_replica_state()`.
+    pub async fn set_replica_state(
+        &mut self,
+        ctx: &ctx::Ctx,
+        state: &storage::ReplicaState,
+    ) -> ctx::Result<()> {
+        Ok(ctx
+            .wait(self.0.consensus_dal().set_replica_state(state))
+            .await?
+            .context("sqlx")?)
+    }
+
+    /// Wrapper for `consensus_dal().get_l1_batch_metadata()`.
+    pub async fn batch(
+        &mut self,
+        ctx: &ctx::Ctx,
+        number: L1BatchNumber,
+    ) -> ctx::Result<Option<L1BatchWithMetadata>> {
+        Ok(ctx
+            .wait(self.0.blocks_dal().get_l1_batch_metadata(number))
+            .await?
+            .context("get_l1_batch_metadata()")?)
+    }
+
+    /// Wrapper for `FetcherCursor::new()`.
+    pub async fn new_payload_queue(
+        &mut self,
+        ctx: &ctx::Ctx,
+        actions: ActionQueueSender,
+        sync_state: SyncState,
+    ) -> ctx::Result<PayloadQueue> {
+        Ok(PayloadQueue {
+            inner: ctx.wait(IoCursor::for_fetcher(&mut self.0)).await??,
+            actions,
+            sync_state,
+        })
+    }
+
+    /// Wrapper for `consensus_dal().genesis()`.
+    pub async fn genesis(&mut self, ctx: &ctx::Ctx) -> ctx::Result<Option<validator::Genesis>> {
+        Ok(ctx
+            .wait(self.0.consensus_dal().genesis())
+            .await?
+            .map_err(DalError::generalize)?)
+    }
+
+    /// Wrapper for `consensus_dal().try_update_genesis()`.
+    pub async fn try_update_genesis(
+        &mut self,
+        ctx: &ctx::Ctx,
+        genesis: &validator::Genesis,
+    ) -> ctx::Result<()> {
+        Ok(ctx
+            .wait(self.0.consensus_dal().try_update_genesis(genesis))
+            .await??)
+    }
+
+    /// Wrapper for `consensus_dal().next_block()`.
+    async fn next_block(&mut self, ctx: &ctx::Ctx) -> ctx::Result<validator::BlockNumber> {
+        Ok(ctx.wait(self.0.consensus_dal().next_block()).await??)
+    }
+
+    /// Wrapper for `consensus_dal().certificates_range()`.
+    pub(crate) async fn certificates_range(
+        &mut self,
+        ctx: &ctx::Ctx,
+    ) -> ctx::Result<storage::BlockStoreState> {
+        Ok(ctx
+            .wait(self.0.consensus_dal().certificates_range())
+            .await??)
+    }
+
+    /// (Re)initializes consensus genesis to start at the last L2 block in storage.
+    /// Noop if `spec` matches the current genesis.
+    pub(crate) async fn adjust_genesis(
+        &mut self,
+        ctx: &ctx::Ctx,
+        spec: &config::GenesisSpec,
+    ) -> ctx::Result<()> {
+        let mut txn = self
+            .start_transaction(ctx)
+            .await
+            .wrap("start_transaction()")?;
+        let old = txn.genesis(ctx).await.wrap("genesis()")?;
+        if let Some(old) = &old {
+            if &config::GenesisSpec::from_genesis(old) == spec {
+                // Hard fork is not needed.
+                return Ok(());
+            }
+        }
+        tracing::info!("Performing a hard fork of consensus.");
+        let genesis = validator::GenesisRaw {
+            chain_id: spec.chain_id,
+            fork_number: old
+                .as_ref()
+                .map_or(validator::ForkNumber(0), |old| old.fork_number.next()),
+            first_block: txn.next_block(ctx).await.context("next_block()")?,
+
+            protocol_version: spec.protocol_version,
+            validators: spec.validators.clone(),
+            attesters: None,
+            leader_selection: spec.leader_selection.clone(),
+        }
+        .with_hash();
+        txn.try_update_genesis(ctx, &genesis)
+            .await
+            .wrap("try_update_genesis()")?;
+        txn.commit(ctx).await.wrap("commit()")?;
+        Ok(())
+    }
+
+    /// Fetches a block from storage.
+    pub(crate) async fn block(
+        &mut self,
+        ctx: &ctx::Ctx,
+        number: validator::BlockNumber,
+    ) -> ctx::Result<Option<validator::FinalBlock>> {
+        let Some(justification) = self.certificate(ctx, number).await.wrap("certificate()")? else {
+            return Ok(None);
+        };
+        let payload = self
+            .payload(ctx, number)
+            .await
+            .wrap("payload()")?
+            .context("L2 block disappeared from storage")?;
+        Ok(Some(validator::FinalBlock {
+            payload: payload.encode(),
+            justification,
+        }))
+    }
+}
diff --git a/core/node/consensus/src/storage/mod.rs b/core/node/consensus/src/storage/mod.rs
new file mode 100644
index 000000000000..6660f75332bc
--- /dev/null
+++ b/core/node/consensus/src/storage/mod.rs
@@ -0,0 +1,59 @@
+//! Storage implementation based on DAL.
+
+use zksync_concurrency::ctx;
+use zksync_consensus_roles::validator;
+use zksync_dal::consensus_dal;
+use zksync_node_sync::{
+    fetcher::{FetchedBlock, IoCursorExt as _},
+    sync_action::ActionQueueSender,
+    SyncState,
+};
+use zksync_state_keeper::io::common::IoCursor;
+
+mod connection;
+mod store;
+
+pub(crate) use connection::*;
+pub(crate) use store::*;
+
+#[cfg(test)]
+pub(crate) mod testonly;
+
+#[derive(thiserror::Error, Debug)]
+pub enum InsertCertificateError {
+    #[error(transparent)]
+    Canceled(#[from] ctx::Canceled),
+    #[error(transparent)]
+    Inner(#[from] consensus_dal::InsertCertificateError),
+}
+
+#[derive(Debug)]
+pub(crate) struct PayloadQueue {
+    inner: IoCursor,
+    actions: ActionQueueSender,
+    sync_state: SyncState,
+}
+
+impl PayloadQueue {
+    pub(crate) fn next(&self) -> validator::BlockNumber {
+        validator::BlockNumber(self.inner.next_l2_block.0.into())
+    }
+
+    /// Advances the cursor by converting the block into actions and pushing them
+    /// to the actions queue.
+    /// Does nothing and returns `Ok(())` if the block has been already processed.
+    /// Returns an error if a block with an earlier block number was expected.
+    pub(crate) async fn send(&mut self, block: FetchedBlock) -> anyhow::Result<()> {
+        let want = self.inner.next_l2_block;
+        // Some blocks are missing.
+        if block.number > want {
+            anyhow::bail!("expected {want:?}, got {:?}", block.number);
+        }
+        // Block already processed.
+        if block.number < want {
+            return Ok(());
+        }
+        self.actions.push_actions(self.inner.advance(block)).await?;
+        Ok(())
+    }
+}
diff --git a/core/node/consensus/src/storage/store.rs b/core/node/consensus/src/storage/store.rs
new file mode 100644
index 000000000000..fa6309bc2ef7
--- /dev/null
+++ b/core/node/consensus/src/storage/store.rs
@@ -0,0 +1,381 @@
+use std::sync::Arc;
+
+use anyhow::Context as _;
+use zksync_concurrency::{ctx, error::Wrap as _, scope, sync, time};
+use zksync_consensus_bft::PayloadManager;
+use zksync_consensus_roles::{attester, validator};
+use zksync_consensus_storage as storage;
+use zksync_dal::consensus_dal::{self, Payload};
+use zksync_node_sync::fetcher::{FetchedBlock, FetchedTransaction};
+use zksync_types::L2BlockNumber;
+
+use super::PayloadQueue;
+use crate::storage::{ConnectionPool, InsertCertificateError};
+
+fn to_fetched_block(
+    number: validator::BlockNumber,
+    payload: &validator::Payload,
+) -> anyhow::Result<FetchedBlock> {
+    let number = L2BlockNumber(
+        number
+            .0
+            .try_into()
+            .context("Integer overflow converting block number")?,
+    );
+    let payload = Payload::decode(payload).context("Payload::decode()")?;
+    Ok(FetchedBlock {
+        number,
+        l1_batch_number: payload.l1_batch_number,
+        last_in_batch: payload.last_in_batch,
+        protocol_version: payload.protocol_version,
+        timestamp: payload.timestamp,
+        reference_hash: Some(payload.hash),
+        l1_gas_price: payload.l1_gas_price,
+        l2_fair_gas_price: payload.l2_fair_gas_price,
+        fair_pubdata_price: payload.fair_pubdata_price,
+        virtual_blocks: payload.virtual_blocks,
+        operator_address: payload.operator_address,
+        transactions: payload
+            .transactions
+            .into_iter()
+            .map(FetchedTransaction::new)
+            .collect(),
+    })
+}
+
+/// Wrapper of `ConnectionPool` implementing `ReplicaStore`, `PayloadManager`,
+/// `PersistentBlockStore` and `PersistentBatchStore`.
+///
+/// Contains queues to save Quorum Certificates received over gossip to the store
+/// as and when the payload they are over becomes available.
+#[derive(Clone, Debug)]
+pub(crate) struct Store {
+    pub(super) pool: ConnectionPool,
+    payloads: Arc<sync::Mutex<Option<PayloadQueue>>>,
+    /// L2 block QCs received over gossip
+    certificates: ctx::channel::UnboundedSender<validator::CommitQC>,
+    /// Range of L2 blocks for which we have a QC persisted.
+    persisted: sync::watch::Receiver<storage::BlockStoreState>,
+}
+
+struct PersistedState(sync::watch::Sender<storage::BlockStoreState>);
+
+/// Background task of the `Store`.
+pub struct StoreRunner {
+    pool: ConnectionPool,
+    persisted: PersistedState,
+    certificates: ctx::channel::UnboundedReceiver<validator::CommitQC>,
+}
+
+impl Store {
+    pub(crate) async fn new(
+        ctx: &ctx::Ctx,
+        pool: ConnectionPool,
+        payload_queue: Option<PayloadQueue>,
+    ) -> ctx::Result<(Store, StoreRunner)> {
+        let persisted = pool
+            .connection(ctx)
+            .await
+            .wrap("connection()")?
+            .certificates_range(ctx)
+            .await
+            .wrap("certificates_range()")?;
+        let persisted = sync::watch::channel(persisted).0;
+        let (certs_send, certs_recv) = ctx::channel::unbounded();
+        Ok((
+            Store {
+                pool: pool.clone(),
+                certificates: certs_send,
+                payloads: Arc::new(sync::Mutex::new(payload_queue)),
+                persisted: persisted.subscribe(),
+            },
+            StoreRunner {
+                pool,
+                persisted: PersistedState(persisted),
+                certificates: certs_recv,
+            },
+        ))
+    }
+}
+
+impl PersistedState {
+    /// Updates `persisted` to new.
+    /// Ends of the range can only be moved forward.
+    /// If `persisted.first` is moved forward, it means that blocks have been pruned.
+    /// If `persisted.last` is moved forward, it means that new blocks with certificates have been
+    /// persisted.
+    fn update(&self, new: storage::BlockStoreState) {
+        self.0.send_if_modified(|p| {
+            if &new == p {
+                return false;
+            }
+            p.first = p.first.max(new.first);
+            if p.next() < new.next() {
+                p.last = new.last;
+            }
+            true
+        });
+    }
+
+    /// Checks if the given certificate is exactly the next one that should
+    /// be persisted.
+    fn should_be_persisted(&self, cert: &validator::CommitQC) -> bool {
+        self.0.borrow().next() == cert.header().number
+    }
+
+    /// Appends the `cert` to `persisted` range.
+    fn advance(&self, cert: validator::CommitQC) {
+        self.0.send_if_modified(|p| {
+            if p.next() != cert.header().number {
+                return false;
+            }
+            p.last = Some(cert);
+            true
+        });
+    }
+}
+
+impl StoreRunner {
+    pub async fn run(mut self, ctx: &ctx::Ctx) -> anyhow::Result<()> {
+        let res = scope::run!(ctx, |ctx, s| async {
+            s.spawn::<()>(async {
+                // Loop updating `persisted` whenever blocks get pruned.
+                const POLL_INTERVAL: time::Duration = time::Duration::seconds(1);
+                loop {
+                    let range = self
+                        .pool
+                        .connection(ctx)
+                        .await
+                        .wrap("connection")?
+                        .certificates_range(ctx)
+                        .await
+                        .wrap("certificates_range()")?;
+                    self.persisted.update(range);
+                    ctx.sleep(POLL_INTERVAL).await?;
+                }
+            });
+
+            // Loop inserting certs to storage.
+            const POLL_INTERVAL: time::Duration = time::Duration::milliseconds(50);
+            loop {
+                let cert = self.certificates.recv(ctx).await?;
+                // Wait for the block to be persisted, so that we can attach a cert to it.
+                // We may exit this loop without persisting the certificate in case the
+                // corresponding block has been pruned in the meantime.
+                while self.persisted.should_be_persisted(&cert) {
+                    use consensus_dal::InsertCertificateError as E;
+                    // Try to insert the cert.
+                    let res = self
+                        .pool
+                        .connection(ctx)
+                        .await
+                        .wrap("connection")?
+                        .insert_certificate(ctx, &cert)
+                        .await;
+                    match res {
+                        Ok(()) => {
+                            // Insertion succeeded: update persisted state
+                            // and wait for the next cert.
+                            self.persisted.advance(cert);
+                            break;
+                        }
+                        Err(InsertCertificateError::Inner(E::MissingPayload)) => {
+                            // the payload is not in storage, it's either not yet persisted
+                            // or already pruned. We will retry after a delay.
+                            ctx.sleep(POLL_INTERVAL).await?;
+                        }
+                        Err(InsertCertificateError::Canceled(err)) => {
+                            return Err(ctx::Error::Canceled(err))
+                        }
+                        Err(InsertCertificateError::Inner(err)) => {
+                            return Err(ctx::Error::Internal(anyhow::Error::from(err)))
+                        }
+                    }
+                }
+            }
+        })
+        .await;
+        match res {
+            Err(ctx::Error::Canceled(_)) | Ok(()) => Ok(()),
+            Err(ctx::Error::Internal(err)) => Err(err),
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl storage::PersistentBlockStore for Store {
+    async fn genesis(&self, ctx: &ctx::Ctx) -> ctx::Result<validator::Genesis> {
+        Ok(self
+            .pool
+            .connection(ctx)
+            .await
+            .wrap("connection")?
+            .genesis(ctx)
+            .await?
+            .context("not found")?)
+    }
+
+    fn persisted(&self) -> sync::watch::Receiver<storage::BlockStoreState> {
+        self.persisted.clone()
+    }
+
+    async fn block(
+        &self,
+        ctx: &ctx::Ctx,
+        number: validator::BlockNumber,
+    ) -> ctx::Result<validator::FinalBlock> {
+        Ok(self
+            .pool
+            .connection(ctx)
+            .await
+            .wrap("connection")?
+            .block(ctx, number)
+            .await?
+            .context("not found")?)
+    }
+
+    /// If actions queue is set (and the block has not been stored yet),
+    /// the block will be translated into a sequence of actions.
+    /// The received actions should be fed
+    /// to `ExternalIO`, so that `StateKeeper` will store the corresponding L2 block in the db.
+    ///
+    /// `store_next_block()` call will wait synchronously for the L2 block.
+    /// Once the L2 block is observed in storage, `store_next_block()` will store a cert for this
+    /// L2 block.
+    async fn queue_next_block(
+        &self,
+        ctx: &ctx::Ctx,
+        block: validator::FinalBlock,
+    ) -> ctx::Result<()> {
+        let mut payloads = sync::lock(ctx, &self.payloads).await?.into_async();
+        if let Some(payloads) = &mut *payloads {
+            payloads
+                .send(to_fetched_block(block.number(), &block.payload).context("to_fetched_block")?)
+                .await
+                .context("payload_queue.send()")?;
+        }
+        self.certificates.send(block.justification);
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl storage::ReplicaStore for Store {
+    async fn state(&self, ctx: &ctx::Ctx) -> ctx::Result<storage::ReplicaState> {
+        self.pool
+            .connection(ctx)
+            .await
+            .wrap("connection()")?
+            .replica_state(ctx)
+            .await
+            .wrap("replica_state()")
+    }
+
+    async fn set_state(&self, ctx: &ctx::Ctx, state: &storage::ReplicaState) -> ctx::Result<()> {
+        self.pool
+            .connection(ctx)
+            .await
+            .wrap("connection()")?
+            .set_replica_state(ctx, state)
+            .await
+            .wrap("set_replica_state()")
+    }
+}
+
+#[async_trait::async_trait]
+impl PayloadManager for Store {
+    /// Currently (for the main node) proposing is implemented as just converting an L2 block from db (without a cert) into a payload.
+    async fn propose(
+        &self,
+        ctx: &ctx::Ctx,
+        block_number: validator::BlockNumber,
+    ) -> ctx::Result<validator::Payload> {
+        const LARGE_PAYLOAD_SIZE: usize = 1 << 20;
+        let payload = self
+            .pool
+            .wait_for_payload(ctx, block_number)
+            .await
+            .wrap("wait_for_payload")?;
+        let encoded_payload = payload.encode();
+        if encoded_payload.0.len() > LARGE_PAYLOAD_SIZE {
+            tracing::warn!(
+                "large payload ({}B) with {} transactions",
+                encoded_payload.0.len(),
+                payload.transactions.len()
+            );
+        }
+        Ok(encoded_payload)
+    }
+
+    /// Verify that `payload` is a correct proposal for the block `block_number`.
+    /// * for the main node it checks whether the same block is already present in storage.
+    /// * for the EN validator
+    ///   * if the block with this number was already applied, it checks that it was the
+    ///     same block. It should always be true, because main node is the only proposer and
+    ///     to propose a different block a hard fork is needed.
+    ///   * otherwise, EN attempts to apply the received block. If the block was incorrect
+    ///     the statekeeper is expected to crash the whole EN. Otherwise OK is returned.
+    async fn verify(
+        &self,
+        ctx: &ctx::Ctx,
+        block_number: validator::BlockNumber,
+        payload: &validator::Payload,
+    ) -> ctx::Result<()> {
+        let mut payloads = sync::lock(ctx, &self.payloads).await?.into_async();
+        if let Some(payloads) = &mut *payloads {
+            let block = to_fetched_block(block_number, payload).context("to_fetched_block")?;
+            let n = block.number;
+            payloads.send(block).await.context("payload_queue.send()")?;
+            // Wait for the block to be processed, without waiting for it to be stored.
+            // TODO(BFT-459): this is not ideal, because we don't check here whether the
+            // processed block is the same as `payload`. It will work correctly
+            // with the current implementation of EN, but we should make it more
+            // precise when block reverting support is implemented.
+            ctx.wait(payloads.sync_state.wait_for_local_block(n))
+                .await?;
+        } else {
+            let want = self.pool.wait_for_payload(ctx, block_number).await?;
+            let got = Payload::decode(payload).context("Payload::decode(got)")?;
+            if got != want {
+                return Err(
+                    anyhow::format_err!("unexpected payload: got {got:?} want {want:?}").into(),
+                );
+            }
+        }
+        Ok(())
+    }
+}
+
+// Dummy implementation
+#[async_trait::async_trait]
+impl storage::PersistentBatchStore for Store {
+    async fn last_batch(&self) -> attester::BatchNumber {
+        unimplemented!()
+    }
+    async fn last_batch_qc(&self) -> attester::BatchQC {
+        unimplemented!()
+    }
+    async fn get_batch(&self, _number: attester::BatchNumber) -> Option<attester::SyncBatch> {
+        None
+    }
+    async fn get_batch_qc(&self, _number: attester::BatchNumber) -> Option<attester::BatchQC> {
+        None
+    }
+    async fn store_qc(&self, _qc: attester::BatchQC) {
+        unimplemented!()
+    }
+    fn persisted(&self) -> sync::watch::Receiver<storage::BatchStoreState> {
+        sync::watch::channel(storage::BatchStoreState {
+            first: attester::BatchNumber(0),
+            last: None,
+        })
+        .1
+    }
+    async fn queue_next_batch(
+        &self,
+        _ctx: &ctx::Ctx,
+        _batch: attester::SyncBatch,
+    ) -> ctx::Result<()> {
+        Err(anyhow::format_err!("unimplemented").into())
+    }
+}
diff --git a/core/node/consensus/src/storage/testonly.rs b/core/node/consensus/src/storage/testonly.rs
new file mode 100644
index 000000000000..2f632b84a4d5
--- /dev/null
+++ b/core/node/consensus/src/storage/testonly.rs
@@ -0,0 +1,191 @@
+//! Storage test helpers.
+
+use anyhow::Context as _;
+use zksync_concurrency::{ctx, error::Wrap as _, time};
+use zksync_consensus_roles::validator;
+use zksync_contracts::BaseSystemContracts;
+use zksync_dal::CoreDal as _;
+use zksync_node_genesis::{insert_genesis_batch, mock_genesis_config, GenesisParams};
+use zksync_node_test_utils::{recover, snapshot, Snapshot};
+use zksync_types::{
+    commitment::L1BatchWithMetadata, protocol_version::ProtocolSemanticVersion,
+    system_contracts::get_system_smart_contracts, L1BatchNumber, L2BlockNumber, ProtocolVersionId,
+};
+
+use super::ConnectionPool;
+
+pub(crate) fn mock_genesis_params(protocol_version: ProtocolVersionId) -> GenesisParams {
+    let mut cfg = mock_genesis_config();
+    cfg.protocol_version = Some(ProtocolSemanticVersion {
+        minor: protocol_version,
+        patch: 0.into(),
+    });
+    GenesisParams::from_genesis_config(
+        cfg,
+        BaseSystemContracts::load_from_disk(),
+        get_system_smart_contracts(),
+    )
+    .unwrap()
+}
+
+impl ConnectionPool {
+    pub(crate) async fn test(
+        from_snapshot: bool,
+        protocol_version: ProtocolVersionId,
+    ) -> ConnectionPool {
+        match from_snapshot {
+            true => {
+                ConnectionPool::from_snapshot(Snapshot::new(
+                    L1BatchNumber(23),
+                    L2BlockNumber(87),
+                    vec![],
+                    mock_genesis_params(protocol_version),
+                ))
+                .await
+            }
+            false => ConnectionPool::from_genesis(protocol_version).await,
+        }
+    }
+
+    /// Waits for the `number` L2 block to have a certificate.
+    pub async fn wait_for_certificate(
+        &self,
+        ctx: &ctx::Ctx,
+        number: validator::BlockNumber,
+    ) -> ctx::Result<()> {
+        const POLL_INTERVAL: time::Duration = time::Duration::milliseconds(100);
+        while self
+            .connection(ctx)
+            .await
+            .wrap("connection()")?
+            .certificate(ctx, number)
+            .await
+            .wrap("certificate()")?
+            .is_none()
+        {
+            ctx.sleep(POLL_INTERVAL).await?;
+        }
+        Ok(())
+    }
+
+    /// Waits for the `number` L1 batch.
+    pub async fn wait_for_batch(
+        &self,
+        ctx: &ctx::Ctx,
+        number: L1BatchNumber,
+    ) -> ctx::Result<L1BatchWithMetadata> {
+        const POLL_INTERVAL: time::Duration = time::Duration::milliseconds(50);
+        loop {
+            if let Some(payload) = self
+                .connection(ctx)
+                .await
+                .wrap("connection()")?
+                .batch(ctx, number)
+                .await
+                .wrap("batch()")?
+            {
+                return Ok(payload);
+            }
+            ctx.sleep(POLL_INTERVAL).await?;
+        }
+    }
+
+    /// Takes a storage snapshot at the last sealed L1 batch.
+    pub(crate) async fn snapshot(&self, ctx: &ctx::Ctx) -> ctx::Result<Snapshot> {
+        let mut conn = self.connection(ctx).await.wrap("connection()")?;
+        Ok(ctx.wait(snapshot(&mut conn.0)).await?)
+    }
+
+    /// Constructs a new db initialized with genesis state.
+    pub(crate) async fn from_genesis(protocol_version: ProtocolVersionId) -> Self {
+        let pool = zksync_dal::ConnectionPool::test_pool().await;
+        {
+            let mut storage = pool.connection().await.unwrap();
+            insert_genesis_batch(&mut storage, &mock_genesis_params(protocol_version))
+                .await
+                .unwrap();
+        }
+        Self(pool)
+    }
+
+    /// Recovers storage from a snapshot.
+    pub(crate) async fn from_snapshot(snapshot: Snapshot) -> Self {
+        let pool = zksync_dal::ConnectionPool::test_pool().await;
+        {
+            let mut storage = pool.connection().await.unwrap();
+            recover(&mut storage, snapshot).await;
+        }
+        Self(pool)
+    }
+
+    /// Waits for `want_last` block to have certificate then fetches all L2 blocks with certificates.
+    pub async fn wait_for_certificates(
+        &self,
+        ctx: &ctx::Ctx,
+        want_last: validator::BlockNumber,
+    ) -> ctx::Result<Vec<validator::FinalBlock>> {
+        self.wait_for_certificate(ctx, want_last).await?;
+        let mut conn = self.connection(ctx).await.wrap("connection()")?;
+        let range = conn
+            .certificates_range(ctx)
+            .await
+            .wrap("certificates_range()")?;
+        assert_eq!(want_last.next(), range.next());
+        let mut blocks: Vec<validator::FinalBlock> = vec![];
+        for i in range.first.0..range.next().0 {
+            let i = validator::BlockNumber(i);
+            let block = conn.block(ctx, i).await.context("block()")?.unwrap();
+            blocks.push(block);
+        }
+        Ok(blocks)
+    }
+
+    /// Same as `wait_for_certificates`, but additionally verifies all the blocks against genesis.
+    pub async fn wait_for_certificates_and_verify(
+        &self,
+        ctx: &ctx::Ctx,
+        want_last: validator::BlockNumber,
+    ) -> ctx::Result<Vec<validator::FinalBlock>> {
+        let blocks = self.wait_for_certificates(ctx, want_last).await?;
+        let genesis = self
+            .connection(ctx)
+            .await
+            .wrap("connection()")?
+            .genesis(ctx)
+            .await
+            .wrap("genesis()")?
+            .context("genesis is missing")?;
+        for block in &blocks {
+            block.verify(&genesis).context(block.number())?;
+        }
+        Ok(blocks)
+    }
+
+    pub async fn prune_batches(
+        &self,
+        ctx: &ctx::Ctx,
+        last_batch: L1BatchNumber,
+    ) -> ctx::Result<()> {
+        let mut conn = self.connection(ctx).await.context("connection()")?;
+        let (_, last_block) = ctx
+            .wait(
+                conn.0
+                    .blocks_dal()
+                    .get_l2_block_range_of_l1_batch(last_batch),
+            )
+            .await?
+            .context("get_l2_block_range_of_l1_batch()")?
+            .context("batch not found")?;
+        conn.0
+            .pruning_dal()
+            .soft_prune_batches_range(last_batch, last_block)
+            .await
+            .context("soft_prune_batches_range()")?;
+        conn.0
+            .pruning_dal()
+            .hard_prune_batches_range(last_batch, last_block)
+            .await
+            .context("hard_prune_batches_range()")?;
+        Ok(())
+    }
+}
diff --git a/core/node/consensus/src/testonly.rs b/core/node/consensus/src/testonly.rs
new file mode 100644
index 000000000000..81084b8f599a
--- /dev/null
+++ b/core/node/consensus/src/testonly.rs
@@ -0,0 +1,668 @@
+//! Utilities for testing the consensus module.
+use std::sync::Arc;
+
+use anyhow::Context as _;
+use rand::Rng;
+use zksync_concurrency::{ctx, error::Wrap as _, scope, sync, time};
+use zksync_config::{
+    configs,
+    configs::{
+        chain::{OperationsManagerConfig, StateKeeperConfig},
+        consensus as config,
+        database::{MerkleTreeConfig, MerkleTreeMode},
+    },
+};
+use zksync_consensus_crypto::TextFmt as _;
+use zksync_consensus_network as network;
+use zksync_consensus_roles::validator;
+use zksync_dal::{CoreDal, DalError};
+use zksync_l1_contract_interface::i_executor::structures::StoredBatchInfo;
+use zksync_metadata_calculator::{
+    LazyAsyncTreeReader, MetadataCalculator, MetadataCalculatorConfig,
+};
+use zksync_node_api_server::web3::{state::InternalApiConfig, testonly::spawn_http_server};
+use zksync_node_genesis::GenesisParams;
+use zksync_node_sync::{
+    fetcher::{FetchedTransaction, IoCursorExt as _},
+    sync_action::{ActionQueue, ActionQueueSender, SyncAction},
+    testonly::MockMainNodeClient,
+    ExternalIO, MainNodeClient, SyncState,
+};
+use zksync_node_test_utils::{create_l1_batch_metadata, l1_batch_metadata_to_commitment_artifacts};
+use zksync_state::RocksdbStorageOptions;
+use zksync_state_keeper::{
+    io::{IoCursor, L1BatchParams, L2BlockParams},
+    seal_criteria::NoopSealer,
+    testonly::{
+        fund, l1_transaction, l2_transaction, test_batch_executor::MockReadStorageFactory,
+        MockBatchExecutor,
+    },
+    AsyncRocksdbCache, MainBatchExecutor, OutputHandler, StateKeeperPersistence,
+    TreeWritesPersistence, ZkSyncStateKeeper,
+};
+use zksync_test_account::Account;
+use zksync_types::{
+    fee_model::{BatchFeeInput, L1PeggedBatchFeeModelInput},
+    Address, L1BatchNumber, L2BlockNumber, L2ChainId, PriorityOpId, ProtocolVersionId,
+};
+use zksync_web3_decl::client::{Client, DynClient, L2};
+
+use crate::{
+    batch::{L1BatchCommit, L1BatchWithWitness, LastBlockCommit},
+    en,
+    storage::ConnectionPool,
+};
+
+/// Fake StateKeeper for tests.
+pub(super) struct StateKeeper {
+    protocol_version: ProtocolVersionId,
+    // Batch of the `last_block`.
+    last_batch: L1BatchNumber,
+    last_block: L2BlockNumber,
+    // timestamp of the last block.
+    last_timestamp: u64,
+    batch_sealed: bool,
+    // test L2 account
+    account: Account,
+    next_priority_op: PriorityOpId,
+
+    actions_sender: ActionQueueSender,
+    sync_state: SyncState,
+    addr: sync::watch::Receiver<Option<std::net::SocketAddr>>,
+    pool: ConnectionPool,
+    tree_reader: LazyAsyncTreeReader,
+}
+
+pub(super) fn config(cfg: &network::Config) -> (config::ConsensusConfig, config::ConsensusSecrets) {
+    (
+        config::ConsensusConfig {
+            server_addr: *cfg.server_addr,
+            public_addr: config::Host(cfg.public_addr.0.clone()),
+            max_payload_size: usize::MAX,
+            gossip_dynamic_inbound_limit: cfg.gossip.dynamic_inbound_limit,
+            gossip_static_inbound: cfg
+                .gossip
+                .static_inbound
+                .iter()
+                .map(|k| config::NodePublicKey(k.encode()))
+                .collect(),
+            gossip_static_outbound: cfg
+                .gossip
+                .static_outbound
+                .iter()
+                .map(|(k, v)| (config::NodePublicKey(k.encode()), config::Host(v.0.clone())))
+                .collect(),
+            genesis_spec: cfg.validator_key.as_ref().map(|key| config::GenesisSpec {
+                chain_id: L2ChainId::default(),
+                protocol_version: config::ProtocolVersion(validator::ProtocolVersion::CURRENT.0),
+                validators: vec![config::WeightedValidator {
+                    key: config::ValidatorPublicKey(key.public().encode()),
+                    weight: 1,
+                }],
+                leader: config::ValidatorPublicKey(key.public().encode()),
+            }),
+            rpc: None,
+        },
+        config::ConsensusSecrets {
+            node_key: Some(config::NodeSecretKey(cfg.gossip.key.encode().into())),
+            validator_key: cfg
+                .validator_key
+                .as_ref()
+                .map(|k| config::ValidatorSecretKey(k.encode().into())),
+        },
+    )
+}
+
+/// Fake StateKeeper task to be executed in the background.
+pub(super) struct StateKeeperRunner {
+    actions_queue: ActionQueue,
+    sync_state: SyncState,
+    pool: ConnectionPool,
+
+    addr: sync::watch::Sender<Option<std::net::SocketAddr>>,
+    rocksdb_dir: tempfile::TempDir,
+    metadata_calculator: MetadataCalculator,
+    account: Account,
+}
+
+impl StateKeeper {
+    /// Constructs and initializes a new `StateKeeper`.
+    /// Caller has to run `StateKeeperRunner.run()` task in the background.
+    pub async fn new(
+        ctx: &ctx::Ctx,
+        pool: ConnectionPool,
+    ) -> ctx::Result<(Self, StateKeeperRunner)> {
+        let mut conn = pool.connection(ctx).await.wrap("connection()")?;
+        // We fetch the last protocol version from storage.
+        // `protocol_version_id_by_timestamp` does a wrapping conversion to `i64`.
+        let protocol_version = ctx
+            .wait(
+                conn.0
+                    .protocol_versions_dal()
+                    .protocol_version_id_by_timestamp(i64::MAX.try_into().unwrap()),
+            )
+            .await?
+            .context("protocol_version_id_by_timestamp()")?;
+        let cursor = ctx
+            .wait(IoCursor::for_fetcher(&mut conn.0))
+            .await?
+            .context("IoCursor::new()")?;
+        let pending_batch = ctx
+            .wait(conn.0.blocks_dal().pending_batch_exists())
+            .await?
+            .context("pending_batch_exists()")?;
+        let (actions_sender, actions_queue) = ActionQueue::new();
+        let addr = sync::watch::channel(None).0;
+        let sync_state = SyncState::default();
+
+        let rocksdb_dir = tempfile::tempdir().context("tempdir()")?;
+        let merkle_tree_config = MerkleTreeConfig {
+            path: rocksdb_dir
+                .path()
+                .join("merkle_tree")
+                .to_string_lossy()
+                .into(),
+            mode: MerkleTreeMode::Lightweight,
+            ..Default::default()
+        };
+        let operation_manager_config = OperationsManagerConfig {
+            delay_interval: 100, //`100ms`
+        };
+        let state_keeper_config = StateKeeperConfig {
+            protective_reads_persistence_enabled: true,
+            ..Default::default()
+        };
+        let config = MetadataCalculatorConfig::for_main_node(
+            &merkle_tree_config,
+            &operation_manager_config,
+            &state_keeper_config,
+        );
+        let metadata_calculator = MetadataCalculator::new(config, None, pool.0.clone())
+            .await
+            .context("MetadataCalculator::new()")?;
+        let tree_reader = metadata_calculator.tree_reader();
+        let account = Account::random();
+        Ok((
+            Self {
+                protocol_version,
+                last_batch: cursor.l1_batch,
+                last_block: cursor.next_l2_block - 1,
+                last_timestamp: cursor.prev_l2_block_timestamp,
+                batch_sealed: !pending_batch,
+                next_priority_op: PriorityOpId(1),
+                actions_sender,
+                sync_state: sync_state.clone(),
+                addr: addr.subscribe(),
+                pool: pool.clone(),
+                tree_reader,
+                account: account.clone(),
+            },
+            StateKeeperRunner {
+                actions_queue,
+                sync_state,
+                pool: pool.clone(),
+                addr,
+                rocksdb_dir,
+                metadata_calculator,
+                account,
+            },
+        ))
+    }
+
+    fn open_block(&mut self) -> SyncAction {
+        if self.batch_sealed {
+            self.last_batch += 1;
+            self.last_block += 1;
+            self.last_timestamp += 5;
+            self.batch_sealed = false;
+            SyncAction::OpenBatch {
+                params: L1BatchParams {
+                    protocol_version: self.protocol_version,
+                    validation_computational_gas_limit: u32::MAX,
+                    operator_address: GenesisParams::mock().config().fee_account,
+                    fee_input: BatchFeeInput::L1Pegged(L1PeggedBatchFeeModelInput {
+                        fair_l2_gas_price: 10,
+                        l1_gas_price: 100,
+                    }),
+                    first_l2_block: L2BlockParams {
+                        timestamp: self.last_timestamp,
+                        virtual_blocks: 1,
+                    },
+                },
+                number: self.last_batch,
+                first_l2_block_number: self.last_block,
+            }
+        } else {
+            self.last_block += 1;
+            self.last_timestamp += 2;
+            SyncAction::L2Block {
+                params: L2BlockParams {
+                    timestamp: self.last_timestamp,
+                    virtual_blocks: 0,
+                },
+                number: self.last_block,
+            }
+        }
+    }
+
+    /// Pushes a new L2 block with `transactions` transactions to the `StateKeeper`.
+    pub async fn push_random_block(&mut self, rng: &mut impl Rng) {
+        let mut actions = vec![self.open_block()];
+        for _ in 0..rng.gen_range(3..8) {
+            let tx = match rng.gen() {
+                true => l2_transaction(&mut self.account, 1_000_000),
+                false => {
+                    let tx = l1_transaction(&mut self.account, self.next_priority_op);
+                    self.next_priority_op += 1;
+                    tx
+                }
+            };
+            actions.push(FetchedTransaction::new(tx).into());
+        }
+        actions.push(SyncAction::SealL2Block);
+        self.actions_sender.push_actions(actions).await.unwrap();
+    }
+
+    /// Pushes `SealBatch` command to the `StateKeeper`.
+    pub async fn seal_batch(&mut self) {
+        // Each batch ends with an empty block (aka fictive block).
+        let mut actions = vec![self.open_block()];
+        actions.push(SyncAction::SealBatch);
+        self.actions_sender.push_actions(actions).await.unwrap();
+        self.batch_sealed = true;
+    }
+
+    /// Pushes `count` random L2 blocks to the StateKeeper.
+    pub async fn push_random_blocks(&mut self, rng: &mut impl Rng, count: usize) {
+        for _ in 0..count {
+            // 20% chance to seal an L1 batch.
+            // `seal_batch()` also produces a (fictive) block.
+            if rng.gen_range(0..100) < 20 {
+                self.seal_batch().await;
+            } else {
+                self.push_random_block(rng).await;
+            }
+        }
+    }
+
+    /// Last block that has been pushed to the `StateKeeper` via `ActionQueue`.
+    /// It might NOT be present in storage yet.
+    pub fn last_block(&self) -> validator::BlockNumber {
+        validator::BlockNumber(self.last_block.0.into())
+    }
+
+    /// Last L1 batch that has been sealed and will have
+    /// metadata computed eventually.
+    pub fn last_sealed_batch(&self) -> L1BatchNumber {
+        self.last_batch - (!self.batch_sealed) as u32
+    }
+
+    /// Loads a commitment to L1 batch directly from the database.
+    // TODO: ideally, we should rather fake fetching it from Ethereum.
+    // We can use `zksync_eth_client::clients::MockEthereum` for that,
+    // which implements `EthInterface`. It should be enough to use
+    // `MockEthereum.with_call_handler()`.
+    pub async fn load_batch_commit(
+        &self,
+        ctx: &ctx::Ctx,
+        number: L1BatchNumber,
+    ) -> ctx::Result<L1BatchCommit> {
+        // TODO: we should mock the `eth_sender` as well.
+        let mut conn = self.pool.connection(ctx).await?;
+        let this = conn.batch(ctx, number).await?.context("missing batch")?;
+        let prev = conn
+            .batch(ctx, number - 1)
+            .await?
+            .context("missing batch")?;
+        Ok(L1BatchCommit {
+            number,
+            this_batch: LastBlockCommit {
+                info: StoredBatchInfo::from(&this).hash(),
+            },
+            prev_batch: LastBlockCommit {
+                info: StoredBatchInfo::from(&prev).hash(),
+            },
+        })
+    }
+
+    /// Loads an `L1BatchWithWitness`.
+    pub async fn load_batch_with_witness(
+        &self,
+        ctx: &ctx::Ctx,
+        n: L1BatchNumber,
+    ) -> ctx::Result<L1BatchWithWitness> {
+        L1BatchWithWitness::load(ctx, n, &self.pool, &self.tree_reader).await
+    }
+
+    /// Connects to the json RPC endpoint exposed by the state keeper.
+    pub async fn connect(&self, ctx: &ctx::Ctx) -> ctx::Result<Box<DynClient<L2>>> {
+        let addr = sync::wait_for(ctx, &mut self.addr.clone(), Option::is_some)
+            .await?
+            .unwrap();
+        let client = Client::http(format!("http://{addr}/").parse().context("url")?)
+            .context("json_rpc()")?
+            .build();
+        let client: Box<DynClient<L2>> = Box::new(client);
+        // Wait until the server is actually available.
+        loop {
+            let res = ctx.wait(client.fetch_l2_block_number()).await?;
+            match res {
+                Ok(_) => return Ok(client),
+                Err(err) if err.is_transient() => {
+                    ctx.sleep(time::Duration::seconds(5)).await?;
+                }
+                Err(err) => {
+                    return Err(anyhow::format_err!("{err}").into());
+                }
+            }
+        }
+    }
+
+    /// Runs the centralized fetcher.
+    pub async fn run_fetcher(
+        self,
+        ctx: &ctx::Ctx,
+        client: Box<DynClient<L2>>,
+    ) -> anyhow::Result<()> {
+        en::EN {
+            pool: self.pool,
+            client,
+            sync_state: self.sync_state.clone(),
+        }
+        .run_fetcher(ctx, self.actions_sender)
+        .await
+    }
+
+    /// Runs consensus node for the external node.
+    pub async fn run_consensus(
+        self,
+        ctx: &ctx::Ctx,
+        client: Box<DynClient<L2>>,
+        cfg: &network::Config,
+    ) -> anyhow::Result<()> {
+        let (cfg, secrets) = config(cfg);
+        en::EN {
+            pool: self.pool,
+            client,
+            sync_state: self.sync_state.clone(),
+        }
+        .run(ctx, self.actions_sender, cfg, secrets)
+        .await
+    }
+}
+
+async fn mock_commitment_generator_step(ctx: &ctx::Ctx, pool: &ConnectionPool) -> ctx::Result<()> {
+    let mut conn = pool.connection(ctx).await.wrap("connection()")?;
+    let Some(first) = ctx
+        .wait(
+            conn.0
+                .blocks_dal()
+                .get_next_l1_batch_ready_for_commitment_generation(),
+        )
+        .await?
+        .map_err(|e| e.generalize())?
+    else {
+        return Ok(());
+    };
+    let last = ctx
+        .wait(
+            conn.0
+                .blocks_dal()
+                .get_last_l1_batch_ready_for_commitment_generation(),
+        )
+        .await?
+        .map_err(|e| e.generalize())?
+        .context("batch disappeared")?;
+    // Create artificial `L1BatchCommitmentArtifacts`.
+    for i in (first.0..=last.0).map(L1BatchNumber) {
+        let metadata = create_l1_batch_metadata(i.0);
+        let artifacts = l1_batch_metadata_to_commitment_artifacts(&metadata);
+        ctx.wait(
+            conn.0
+                .blocks_dal()
+                .save_l1_batch_commitment_artifacts(i, &artifacts),
+        )
+        .await??;
+    }
+    Ok(())
+}
+
+async fn mock_metadata_calculator_step(ctx: &ctx::Ctx, pool: &ConnectionPool) -> ctx::Result<()> {
+    let mut conn = pool.connection(ctx).await.wrap("connection()")?;
+    let Some(last) = ctx
+        .wait(conn.0.blocks_dal().get_sealed_l1_batch_number())
+        .await?
+        .map_err(DalError::generalize)?
+    else {
+        return Ok(());
+    };
+    let prev = ctx
+        .wait(
+            conn.0
+                .blocks_dal()
+                .get_last_l1_batch_number_with_tree_data(),
+        )
+        .await?
+        .map_err(DalError::generalize)?;
+    let mut first = match prev {
+        Some(prev) => prev + 1,
+        None => ctx
+            .wait(conn.0.blocks_dal().get_earliest_l1_batch_number())
+            .await?
+            .map_err(DalError::generalize)?
+            .context("batches disappeared")?,
+    };
+    while first <= last {
+        let metadata = create_l1_batch_metadata(first.0);
+        ctx.wait(
+            conn.0
+                .blocks_dal()
+                .save_l1_batch_tree_data(first, &metadata.tree_data()),
+        )
+        .await?
+        .context("save_l1_batch_tree_data()")?;
+        first += 1;
+    }
+    Ok(())
+}
+
+impl StateKeeperRunner {
+    // Executes the state keeper task with real metadata calculator task
+    // and fake commitment generator (because real one is too slow).
+    pub async fn run_real(self, ctx: &ctx::Ctx) -> anyhow::Result<()> {
+        let res = scope::run!(ctx, |ctx, s| async {
+            // Fund the test account. Required for L2 transactions to succeed.
+            fund(&self.pool.0, &[self.account.address]).await;
+
+            let (stop_send, stop_recv) = sync::watch::channel(false);
+            let (persistence, l2_block_sealer) =
+                StateKeeperPersistence::new(self.pool.0.clone(), Address::repeat_byte(11), 5);
+
+            let io = ExternalIO::new(
+                self.pool.0.clone(),
+                self.actions_queue,
+                Box::<MockMainNodeClient>::default(),
+                L2ChainId::default(),
+            )
+            .await?;
+
+            s.spawn_bg(async {
+                Ok(l2_block_sealer
+                    .run()
+                    .await
+                    .context("l2_block_sealer.run()")?)
+            });
+
+            s.spawn_bg({
+                let stop_recv = stop_recv.clone();
+                async {
+                    self.metadata_calculator.run(stop_recv).await?;
+                    Ok(())
+                }
+            });
+
+            // TODO: should be replaceable with `PostgresFactory`.
+            // Caching shouldn't be needed for tests.
+            let (async_cache, async_catchup_task) = AsyncRocksdbCache::new(
+                self.pool.0.clone(),
+                self.rocksdb_dir
+                    .path()
+                    .join("cache")
+                    .to_string_lossy()
+                    .into(),
+                RocksdbStorageOptions {
+                    block_cache_capacity: (1 << 20), // `1MB`
+                    max_open_files: None,
+                },
+            );
+            s.spawn_bg({
+                let stop_recv = stop_recv.clone();
+                async {
+                    async_catchup_task.run(stop_recv).await?;
+                    Ok(())
+                }
+            });
+            s.spawn_bg::<()>(async {
+                loop {
+                    mock_commitment_generator_step(ctx, &self.pool).await?;
+                    // Sleep real time.
+                    ctx.wait(tokio::time::sleep(tokio::time::Duration::from_millis(100)))
+                        .await?;
+                }
+            });
+
+            s.spawn_bg({
+                let stop_recv = stop_recv.clone();
+                async {
+                    ZkSyncStateKeeper::new(
+                        stop_recv,
+                        Box::new(io),
+                        Box::new(MainBatchExecutor::new(false, false)),
+                        OutputHandler::new(Box::new(persistence.with_tx_insertion()))
+                            .with_handler(Box::new(self.sync_state.clone())),
+                        Arc::new(NoopSealer),
+                        Arc::new(async_cache),
+                    )
+                    .run()
+                    .await
+                    .context("ZkSyncStateKeeper::run()")?;
+                    Ok(())
+                }
+            });
+            s.spawn_bg(async {
+                // Spawn HTTP server.
+                let cfg = InternalApiConfig::new(
+                    &configs::api::Web3JsonRpcConfig::for_tests(),
+                    &configs::contracts::ContractsConfig::for_tests(),
+                    &configs::GenesisConfig::for_tests(),
+                );
+                let mut server = spawn_http_server(
+                    cfg,
+                    self.pool.0.clone(),
+                    Default::default(),
+                    Arc::default(),
+                    stop_recv,
+                )
+                .await;
+                if let Ok(addr) = ctx.wait(server.wait_until_ready()).await {
+                    self.addr.send_replace(Some(addr));
+                    tracing::info!("API server ready!");
+                }
+                ctx.canceled().await;
+                server.shutdown().await;
+                Ok(())
+            });
+            ctx.canceled().await;
+            stop_send.send_replace(true);
+            Ok(())
+        })
+        .await;
+        match res {
+            Ok(()) | Err(ctx::Error::Canceled(_)) => Ok(()),
+            Err(ctx::Error::Internal(err)) => Err(err),
+        }
+    }
+
+    /// Executes the StateKeeper task.
+    pub async fn run(self, ctx: &ctx::Ctx) -> anyhow::Result<()> {
+        let res = scope::run!(ctx, |ctx, s| async {
+            let (stop_send, stop_recv) = sync::watch::channel(false);
+            let (persistence, l2_block_sealer) =
+                StateKeeperPersistence::new(self.pool.0.clone(), Address::repeat_byte(11), 5);
+            let tree_writes_persistence = TreeWritesPersistence::new(self.pool.0.clone());
+
+            let io = ExternalIO::new(
+                self.pool.0.clone(),
+                self.actions_queue,
+                Box::<MockMainNodeClient>::default(),
+                L2ChainId::default(),
+            )
+            .await?;
+            s.spawn_bg(async {
+                Ok(l2_block_sealer
+                    .run()
+                    .await
+                    .context("l2_block_sealer.run()")?)
+            });
+            s.spawn_bg::<()>(async {
+                loop {
+                    mock_metadata_calculator_step(ctx, &self.pool).await?;
+                    mock_commitment_generator_step(ctx, &self.pool).await?;
+                    // Sleep real time.
+                    ctx.wait(tokio::time::sleep(tokio::time::Duration::from_millis(100)))
+                        .await?;
+                }
+            });
+            s.spawn_bg({
+                let stop_recv = stop_recv.clone();
+                async {
+                    ZkSyncStateKeeper::new(
+                        stop_recv,
+                        Box::new(io),
+                        Box::new(MockBatchExecutor),
+                        OutputHandler::new(Box::new(persistence.with_tx_insertion()))
+                            .with_handler(Box::new(tree_writes_persistence))
+                            .with_handler(Box::new(self.sync_state.clone())),
+                        Arc::new(NoopSealer),
+                        Arc::new(MockReadStorageFactory),
+                    )
+                    .run()
+                    .await
+                    .context("ZkSyncStateKeeper::run()")?;
+                    Ok(())
+                }
+            });
+            s.spawn_bg(async {
+                // Spawn HTTP server.
+                let cfg = InternalApiConfig::new(
+                    &configs::api::Web3JsonRpcConfig::for_tests(),
+                    &configs::contracts::ContractsConfig::for_tests(),
+                    &configs::GenesisConfig::for_tests(),
+                );
+                let mut server = spawn_http_server(
+                    cfg,
+                    self.pool.0.clone(),
+                    Default::default(),
+                    Arc::default(),
+                    stop_recv,
+                )
+                .await;
+                if let Ok(addr) = ctx.wait(server.wait_until_ready()).await {
+                    self.addr.send_replace(Some(addr));
+                    tracing::info!("API server ready!");
+                }
+                ctx.canceled().await;
+                server.shutdown().await;
+                Ok(())
+            });
+            ctx.canceled().await;
+            stop_send.send_replace(true);
+            Ok(())
+        })
+        .await;
+        match res {
+            Ok(()) | Err(ctx::Error::Canceled(_)) => Ok(()),
+            Err(ctx::Error::Internal(err)) => Err(err),
+        }
+    }
+}
diff --git a/core/node/consensus/src/tests.rs b/core/node/consensus/src/tests.rs
new file mode 100644
index 000000000000..3f57e4beeade
--- /dev/null
+++ b/core/node/consensus/src/tests.rs
@@ -0,0 +1,641 @@
+use anyhow::Context as _;
+use storage::Store;
+use test_casing::{test_casing, Product};
+use tracing::Instrument as _;
+use zksync_concurrency::{ctx, error::Wrap, scope};
+use zksync_config::configs::consensus::{ValidatorPublicKey, WeightedValidator};
+use zksync_consensus_crypto::TextFmt as _;
+use zksync_consensus_network::testonly::{new_configs, new_fullnode};
+use zksync_consensus_roles::{
+    validator,
+    validator::testonly::{Setup, SetupSpec},
+};
+use zksync_consensus_storage::BlockStore;
+use zksync_types::{L1BatchNumber, ProtocolVersionId};
+
+use super::*;
+use crate::{mn::run_main_node, storage::ConnectionPool};
+
+const VERSIONS: [ProtocolVersionId; 2] = [ProtocolVersionId::latest(), ProtocolVersionId::next()];
+const FROM_SNAPSHOT: [bool; 2] = [true, false];
+
+#[test_casing(2, VERSIONS)]
+#[tokio::test]
+async fn test_validator_block_store(version: ProtocolVersionId) {
+    zksync_concurrency::testonly::abort_on_panic();
+    let ctx = &ctx::test_root(&ctx::RealClock);
+    let rng = &mut ctx.rng();
+    let pool = ConnectionPool::test(false, version).await;
+
+    // Fill storage with unsigned L2 blocks.
+    // Fetch a suffix of blocks that we will generate (fake) certs for.
+    let want = scope::run!(ctx, |ctx, s| async {
+        // Start state keeper.
+        let (mut sk, runner) = testonly::StateKeeper::new(ctx, pool.clone()).await?;
+        s.spawn_bg(runner.run(ctx));
+        sk.push_random_blocks(rng, 10).await;
+        pool.wait_for_payload(ctx, sk.last_block()).await?;
+        let mut setup = SetupSpec::new(rng, 3);
+        setup.first_block = validator::BlockNumber(4);
+        let mut setup = Setup::from(setup);
+        let mut conn = pool.connection(ctx).await.wrap("connection()")?;
+        conn.try_update_genesis(ctx, &setup.genesis)
+            .await
+            .wrap("try_update_genesis()")?;
+        for i in setup.genesis.first_block.0..sk.last_block().next().0 {
+            let i = validator::BlockNumber(i);
+            let payload = conn
+                .payload(ctx, i)
+                .await
+                .wrap(i)?
+                .with_context(|| format!("payload for {i:?} not found"))?
+                .encode();
+            setup.push_block(payload);
+        }
+        Ok(setup.blocks.clone())
+    })
+    .await
+    .unwrap();
+
+    // Insert blocks one by one and check the storage state.
+    for (i, block) in want.iter().enumerate() {
+        scope::run!(ctx, |ctx, s| async {
+            let (store, runner) = Store::new(ctx, pool.clone(), None).await.unwrap();
+            s.spawn_bg(runner.run(ctx));
+            let (block_store, runner) =
+                BlockStore::new(ctx, Box::new(store.clone())).await.unwrap();
+            s.spawn_bg(runner.run(ctx));
+            block_store.queue_block(ctx, block.clone()).await.unwrap();
+            block_store
+                .wait_until_persisted(ctx, block.number())
+                .await
+                .unwrap();
+            let got = pool
+                .wait_for_certificates(ctx, block.number())
+                .await
+                .unwrap();
+            assert_eq!(want[..=i], got);
+            Ok(())
+        })
+        .await
+        .unwrap();
+    }
+}
+
+// In the current implementation, consensus certificates are created asynchronously
+// for the L2 blocks constructed by the StateKeeper. This means that consensus actor
+// is effectively just back filling the consensus certificates for the L2 blocks in storage.
+#[test_casing(4, Product((FROM_SNAPSHOT,VERSIONS)))]
+#[tokio::test]
+async fn test_validator(from_snapshot: bool, version: ProtocolVersionId) {
+    zksync_concurrency::testonly::abort_on_panic();
+    let ctx = &ctx::test_root(&ctx::AffineClock::new(10.));
+    let rng = &mut ctx.rng();
+    let setup = Setup::new(rng, 1);
+    let cfgs = new_configs(rng, &setup, 0);
+
+    scope::run!(ctx, |ctx, s| async {
+        tracing::info!("Start state keeper.");
+        let pool = ConnectionPool::test(from_snapshot,version).await;
+        let (mut sk, runner) = testonly::StateKeeper::new(ctx, pool.clone()).await?;
+        s.spawn_bg(runner.run(ctx));
+
+        tracing::info!("Populate storage with a bunch of blocks.");
+        sk.push_random_blocks(rng, 5).await;
+        pool
+            .wait_for_payload(ctx, sk.last_block())
+            .await
+            .context("sk.wait_for_payload(<1st phase>)")?;
+
+        tracing::info!("Restart consensus actor a couple times, making it process a bunch of blocks each time.");
+        for iteration in 0..3 {
+            tracing::info!("iteration {iteration}");
+            scope::run!(ctx, |ctx, s| async {
+                tracing::info!("Start consensus actor");
+                // In the first iteration it will initialize genesis.
+                let (cfg,secrets) = testonly::config(&cfgs[0]);
+                s.spawn_bg(run_main_node(ctx, cfg, secrets, pool.clone()));
+
+                tracing::info!("Generate couple more blocks and wait for consensus to catch up.");
+                sk.push_random_blocks(rng, 3).await;
+                pool
+                    .wait_for_certificate(ctx, sk.last_block())
+                    .await
+                    .context("wait_for_certificate(<2nd phase>)")?;
+
+                tracing::info!("Synchronously produce blocks one by one, and wait for consensus.");
+                for _ in 0..2 {
+                    sk.push_random_blocks(rng, 1).await;
+                    pool
+                        .wait_for_certificate(ctx, sk.last_block())
+                        .await
+                        .context("wait_for_certificate(<3rd phase>)")?;
+                }
+
+                tracing::info!("Verify all certificates");
+                pool
+                    .wait_for_certificates_and_verify(ctx, sk.last_block())
+                    .await
+                    .context("wait_for_certificates_and_verify()")?;
+                Ok(())
+            })
+            .await
+            .context(iteration)?;
+        }
+        Ok(())
+    })
+    .await
+    .unwrap();
+}
+
+// Test running a validator node and 2 full nodes recovered from different snapshots.
+#[test_casing(2, VERSIONS)]
+#[tokio::test]
+async fn test_nodes_from_various_snapshots(version: ProtocolVersionId) {
+    zksync_concurrency::testonly::abort_on_panic();
+    let ctx = &ctx::test_root(&ctx::AffineClock::new(10.));
+    let rng = &mut ctx.rng();
+    let setup = Setup::new(rng, 1);
+    let validator_cfg = new_configs(rng, &setup, 0).pop().unwrap();
+
+    scope::run!(ctx, |ctx, s| async {
+        tracing::info!("spawn validator");
+        let validator_pool = ConnectionPool::from_genesis(version).await;
+        let (mut validator, runner) =
+            testonly::StateKeeper::new(ctx, validator_pool.clone()).await?;
+        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("validator")));
+        let (cfg, secrets) = testonly::config(&validator_cfg);
+        s.spawn_bg(run_main_node(ctx, cfg, secrets, validator_pool.clone()));
+
+        tracing::info!("produce some batches");
+        validator.push_random_blocks(rng, 5).await;
+        validator.seal_batch().await;
+        validator_pool
+            .wait_for_certificate(ctx, validator.last_block())
+            .await?;
+
+        tracing::info!("take snapshot and start a node from it");
+        let snapshot = validator_pool.snapshot(ctx).await?;
+        let node_pool = ConnectionPool::from_snapshot(snapshot).await;
+        let (node, runner) = testonly::StateKeeper::new(ctx, node_pool.clone()).await?;
+        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("node1")));
+        let conn = validator.connect(ctx).await?;
+        s.spawn_bg(async {
+            let cfg = new_fullnode(&mut ctx.rng(), &validator_cfg);
+            node.run_consensus(ctx, conn, &cfg).await
+        });
+
+        tracing::info!("produce more batches");
+        validator.push_random_blocks(rng, 5).await;
+        validator.seal_batch().await;
+        node_pool
+            .wait_for_certificate(ctx, validator.last_block())
+            .await?;
+
+        tracing::info!("take another snapshot and start a node from it");
+        let snapshot = validator_pool.snapshot(ctx).await?;
+        let node_pool2 = ConnectionPool::from_snapshot(snapshot).await;
+        let (node, runner) = testonly::StateKeeper::new(ctx, node_pool2.clone()).await?;
+        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("node2")));
+        let conn = validator.connect(ctx).await?;
+        s.spawn_bg(async {
+            let cfg = new_fullnode(&mut ctx.rng(), &validator_cfg);
+            node.run_consensus(ctx, conn, &cfg).await
+        });
+
+        tracing::info!("produce more blocks and compare storages");
+        validator.push_random_blocks(rng, 5).await;
+        let want = validator_pool
+            .wait_for_certificates_and_verify(ctx, validator.last_block())
+            .await?;
+        // node stores should be suffixes for validator store.
+        for got in [
+            node_pool
+                .wait_for_certificates_and_verify(ctx, validator.last_block())
+                .await?,
+            node_pool2
+                .wait_for_certificates_and_verify(ctx, validator.last_block())
+                .await?,
+        ] {
+            assert_eq!(want[want.len() - got.len()..], got[..]);
+        }
+        Ok(())
+    })
+    .await
+    .unwrap();
+}
+
+// Test running a validator node and a couple of full nodes.
+// Validator is producing signed blocks and fetchers are expected to fetch
+// them directly or indirectly.
+#[test_casing(4, Product((FROM_SNAPSHOT,VERSIONS)))]
+#[tokio::test]
+async fn test_full_nodes(from_snapshot: bool, version: ProtocolVersionId) {
+    const NODES: usize = 2;
+
+    zksync_concurrency::testonly::abort_on_panic();
+    let ctx = &ctx::test_root(&ctx::AffineClock::new(10.));
+    let rng = &mut ctx.rng();
+    let setup = Setup::new(rng, 1);
+    let validator_cfgs = new_configs(rng, &setup, 0);
+
+    // topology:
+    // validator <-> node <-> node <-> ...
+    let mut node_cfgs = vec![];
+    for _ in 0..NODES {
+        node_cfgs.push(new_fullnode(
+            rng,
+            node_cfgs.last().unwrap_or(&validator_cfgs[0]),
+        ));
+    }
+
+    // Run validator and fetchers in parallel.
+    scope::run!(ctx, |ctx, s| async {
+        let validator_pool = ConnectionPool::test(from_snapshot, version).await;
+        let (mut validator, runner) =
+            testonly::StateKeeper::new(ctx, validator_pool.clone()).await?;
+        s.spawn_bg(async {
+            runner
+                .run(ctx)
+                .instrument(tracing::info_span!("validator"))
+                .await
+                .context("validator")
+        });
+        tracing::info!("Generate a couple of blocks, before initializing consensus genesis.");
+        validator.push_random_blocks(rng, 5).await;
+        // API server needs at least 1 L1 batch to start.
+        validator.seal_batch().await;
+        validator_pool
+            .wait_for_payload(ctx, validator.last_block())
+            .await?;
+
+        tracing::info!("Run validator.");
+        let (cfg, secrets) = testonly::config(&validator_cfgs[0]);
+        s.spawn_bg(run_main_node(ctx, cfg, secrets, validator_pool.clone()));
+
+        tracing::info!("Run nodes.");
+        let mut node_pools = vec![];
+        for (i, cfg) in node_cfgs.iter().enumerate() {
+            let i = ctx::NoCopy(i);
+            let pool = ConnectionPool::test(from_snapshot, version).await;
+            let (node, runner) = testonly::StateKeeper::new(ctx, pool.clone()).await?;
+            node_pools.push(pool.clone());
+            s.spawn_bg(async {
+                let i = i;
+                runner
+                    .run(ctx)
+                    .instrument(tracing::info_span!("node", i = *i))
+                    .await
+                    .with_context(|| format!("node{}", *i))
+            });
+            s.spawn_bg(node.run_consensus(ctx, validator.connect(ctx).await?, cfg));
+        }
+
+        tracing::info!("Make validator produce blocks and wait for fetchers to get them.");
+        // Note that block from before and after genesis have to be fetched.
+        validator.push_random_blocks(rng, 5).await;
+        let want_last = validator.last_block();
+        let want = validator_pool
+            .wait_for_certificates_and_verify(ctx, want_last)
+            .await?;
+        for pool in &node_pools {
+            assert_eq!(
+                want,
+                pool.wait_for_certificates_and_verify(ctx, want_last)
+                    .await?
+            );
+        }
+        Ok(())
+    })
+    .await
+    .unwrap();
+}
+
+// Test running external node (non-leader) validators.
+#[test_casing(4, Product((FROM_SNAPSHOT,VERSIONS)))]
+#[tokio::test]
+async fn test_en_validators(from_snapshot: bool, version: ProtocolVersionId) {
+    const NODES: usize = 3;
+
+    zksync_concurrency::testonly::abort_on_panic();
+    let ctx = &ctx::test_root(&ctx::AffineClock::new(10.));
+    let rng = &mut ctx.rng();
+    let setup = Setup::new(rng, NODES);
+    let cfgs = new_configs(rng, &setup, 1);
+
+    // Run all nodes in parallel.
+    scope::run!(ctx, |ctx, s| async {
+        let main_node_pool = ConnectionPool::test(from_snapshot, version).await;
+        let (mut main_node, runner) =
+            testonly::StateKeeper::new(ctx, main_node_pool.clone()).await?;
+        s.spawn_bg(async {
+            runner
+                .run(ctx)
+                .instrument(tracing::info_span!("main_node"))
+                .await
+                .context("main_node")
+        });
+        tracing::info!("Generate a couple of blocks, before initializing consensus genesis.");
+        main_node.push_random_blocks(rng, 5).await;
+        // API server needs at least 1 L1 batch to start.
+        main_node.seal_batch().await;
+        main_node_pool
+            .wait_for_payload(ctx, main_node.last_block())
+            .await
+            .unwrap();
+
+        tracing::info!("wait until the API server is actually available");
+        // as otherwise waiting for view synchronization will take a while.
+        main_node.connect(ctx).await?;
+
+        tracing::info!("Run main node with all nodes being validators.");
+        let (mut cfg, secrets) = testonly::config(&cfgs[0]);
+        cfg.genesis_spec.as_mut().unwrap().validators = setup
+            .validator_keys
+            .iter()
+            .map(|k| WeightedValidator {
+                key: ValidatorPublicKey(k.public().encode()),
+                weight: 1,
+            })
+            .collect();
+        s.spawn_bg(run_main_node(ctx, cfg, secrets, main_node_pool.clone()));
+
+        tracing::info!("Run external nodes.");
+        let mut ext_node_pools = vec![];
+        for (i, cfg) in cfgs[1..].iter().enumerate() {
+            let i = ctx::NoCopy(i);
+            let pool = ConnectionPool::test(from_snapshot, version).await;
+            let (ext_node, runner) = testonly::StateKeeper::new(ctx, pool.clone()).await?;
+            ext_node_pools.push(pool.clone());
+            s.spawn_bg(async {
+                let i = i;
+                runner
+                    .run(ctx)
+                    .instrument(tracing::info_span!("en", i = *i))
+                    .await
+                    .with_context(|| format!("en{}", *i))
+            });
+            s.spawn_bg(ext_node.run_consensus(ctx, main_node.connect(ctx).await?, cfg));
+        }
+
+        tracing::info!("Make the main node produce blocks and wait for consensus to finalize them");
+        main_node.push_random_blocks(rng, 5).await;
+        let want_last = main_node.last_block();
+        let want = main_node_pool
+            .wait_for_certificates_and_verify(ctx, want_last)
+            .await?;
+        for pool in &ext_node_pools {
+            assert_eq!(
+                want,
+                pool.wait_for_certificates_and_verify(ctx, want_last)
+                    .await?
+            );
+        }
+        Ok(())
+    })
+    .await
+    .unwrap();
+}
+
+// Test fetcher back filling missing certs.
+#[test_casing(4, Product((FROM_SNAPSHOT,VERSIONS)))]
+#[tokio::test]
+async fn test_p2p_fetcher_backfill_certs(from_snapshot: bool, version: ProtocolVersionId) {
+    zksync_concurrency::testonly::abort_on_panic();
+    let ctx = &ctx::test_root(&ctx::AffineClock::new(10.));
+    let rng = &mut ctx.rng();
+    let setup = Setup::new(rng, 1);
+    let validator_cfg = new_configs(rng, &setup, 0)[0].clone();
+    let node_cfg = new_fullnode(rng, &validator_cfg);
+
+    scope::run!(ctx, |ctx, s| async {
+        tracing::info!("Spawn validator.");
+        let validator_pool = ConnectionPool::test(from_snapshot, version).await;
+        let (mut validator, runner) =
+            testonly::StateKeeper::new(ctx, validator_pool.clone()).await?;
+        s.spawn_bg(runner.run(ctx));
+        let (cfg, secrets) = testonly::config(&validator_cfg);
+        s.spawn_bg(run_main_node(ctx, cfg, secrets, validator_pool.clone()));
+        // API server needs at least 1 L1 batch to start.
+        validator.seal_batch().await;
+        let client = validator.connect(ctx).await?;
+
+        let node_pool = ConnectionPool::test(from_snapshot, version).await;
+
+        tracing::info!("Run p2p fetcher.");
+        scope::run!(ctx, |ctx, s| async {
+            let (node, runner) = testonly::StateKeeper::new(ctx, node_pool.clone()).await?;
+            s.spawn_bg(runner.run(ctx));
+            s.spawn_bg(node.run_consensus(ctx, client.clone(), &node_cfg));
+            validator.push_random_blocks(rng, 3).await;
+            node_pool
+                .wait_for_certificate(ctx, validator.last_block())
+                .await?;
+            Ok(())
+        })
+        .await
+        .unwrap();
+
+        tracing::info!("Run centralized fetcher.");
+        scope::run!(ctx, |ctx, s| async {
+            let (node, runner) = testonly::StateKeeper::new(ctx, node_pool.clone()).await?;
+            s.spawn_bg(runner.run(ctx));
+            s.spawn_bg(node.run_fetcher(ctx, client.clone()));
+            validator.push_random_blocks(rng, 3).await;
+            node_pool
+                .wait_for_payload(ctx, validator.last_block())
+                .await?;
+            Ok(())
+        })
+        .await
+        .unwrap();
+
+        tracing::info!("Run p2p fetcher again.");
+        scope::run!(ctx, |ctx, s| async {
+            let (node, runner) = testonly::StateKeeper::new(ctx, node_pool.clone()).await?;
+            s.spawn_bg(runner.run(ctx));
+            s.spawn_bg(node.run_consensus(ctx, client.clone(), &node_cfg));
+            validator.push_random_blocks(rng, 3).await;
+            let want = validator_pool
+                .wait_for_certificates_and_verify(ctx, validator.last_block())
+                .await?;
+            let got = node_pool
+                .wait_for_certificates_and_verify(ctx, validator.last_block())
+                .await?;
+            assert_eq!(want, got);
+            Ok(())
+        })
+        .await
+        .unwrap();
+        Ok(())
+    })
+    .await
+    .unwrap();
+}
+
+#[test_casing(2, VERSIONS)]
+#[tokio::test]
+async fn test_with_pruning(version: ProtocolVersionId) {
+    zksync_concurrency::testonly::abort_on_panic();
+    let ctx = &ctx::test_root(&ctx::RealClock);
+    let rng = &mut ctx.rng();
+    let setup = Setup::new(rng, 1);
+    let validator_cfg = new_configs(rng, &setup, 0)[0].clone();
+    let node_cfg = new_fullnode(rng, &validator_cfg);
+
+    scope::run!(ctx, |ctx, s| async {
+        let validator_pool = ConnectionPool::test(false, version).await;
+        let (mut validator, runner) =
+            testonly::StateKeeper::new(ctx, validator_pool.clone()).await?;
+        s.spawn_bg(async {
+            runner
+                .run(ctx)
+                .instrument(tracing::info_span!("validator"))
+                .await
+                .context("validator")
+        });
+        tracing::info!("Run validator.");
+        let (cfg, secrets) = testonly::config(&validator_cfg);
+        s.spawn_bg({
+            let validator_pool = validator_pool.clone();
+            async {
+                run_main_node(ctx, cfg, secrets, validator_pool)
+                    .await
+                    .context("run_main_node()")
+            }
+        });
+        // TODO: ensure at least L1 batch in `testonly::StateKeeper::new()` to make it fool proof.
+        validator.seal_batch().await;
+
+        tracing::info!("Run node.");
+        let node_pool = ConnectionPool::test(false, version).await;
+        let (node, runner) = testonly::StateKeeper::new(ctx, node_pool.clone()).await?;
+        s.spawn_bg(async {
+            runner
+                .run(ctx)
+                .instrument(tracing::info_span!("node"))
+                .await
+                .context("node")
+        });
+        let conn = validator.connect(ctx).await?;
+        s.spawn_bg(async {
+            node.run_consensus(ctx, conn, &node_cfg)
+                .await
+                .context("run_consensus()")
+        });
+
+        tracing::info!("Sync some blocks");
+        validator.push_random_blocks(rng, 5).await;
+        validator.seal_batch().await;
+        let to_prune = validator.last_sealed_batch();
+        tracing::info!(
+            "to_prune = batch {}; block {}",
+            to_prune,
+            validator.last_block()
+        );
+        tracing::info!(
+            "Seal another batch to make sure that there is at least 1 sealed batch after pruning."
+        );
+        validator.push_random_blocks(rng, 5).await;
+        validator.seal_batch().await;
+        validator_pool
+            .wait_for_batch(ctx, validator.last_sealed_batch())
+            .await?;
+
+        tracing::info!("Prune some blocks and sync more");
+        validator_pool
+            .prune_batches(ctx, to_prune)
+            .await
+            .context("prune_batches")?;
+        validator.push_random_blocks(rng, 5).await;
+        node_pool
+            .wait_for_certificates(ctx, validator.last_block())
+            .await
+            .context("wait_for_certificates()")?;
+        Ok(())
+    })
+    .await
+    .unwrap();
+}
+
+#[test_casing(4, Product((FROM_SNAPSHOT,VERSIONS)))]
+#[tokio::test]
+async fn test_centralized_fetcher(from_snapshot: bool, version: ProtocolVersionId) {
+    zksync_concurrency::testonly::abort_on_panic();
+    let ctx = &ctx::test_root(&ctx::RealClock);
+    let rng = &mut ctx.rng();
+
+    scope::run!(ctx, |ctx, s| async {
+        tracing::info!("Spawn a validator.");
+        let validator_pool = ConnectionPool::test(from_snapshot, version).await;
+        let (mut validator, runner) =
+            testonly::StateKeeper::new(ctx, validator_pool.clone()).await?;
+        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("validator")));
+
+        tracing::info!("Produce a batch (to make api server start)");
+        // TODO: ensure at least L1 batch in `testonly::StateKeeper::new()` to make it fool proof.
+        validator.seal_batch().await;
+
+        tracing::info!("Spawn a node.");
+        let node_pool = ConnectionPool::test(from_snapshot, version).await;
+        let (node, runner) = testonly::StateKeeper::new(ctx, node_pool.clone()).await?;
+        s.spawn_bg(runner.run(ctx).instrument(tracing::info_span!("fetcher")));
+        s.spawn_bg(node.run_fetcher(ctx, validator.connect(ctx).await?));
+
+        tracing::info!("Produce some blocks and wait for node to fetch them");
+        validator.push_random_blocks(rng, 10).await;
+        let want = validator_pool
+            .wait_for_payload(ctx, validator.last_block())
+            .await?;
+        let got = node_pool
+            .wait_for_payload(ctx, validator.last_block())
+            .await?;
+        assert_eq!(want, got);
+        Ok(())
+    })
+    .await
+    .unwrap();
+}
+
+/// Tests that generated L1 batch witnesses can be verified successfully.
+/// TODO: add tests for verification failures.
+#[test_casing(2, VERSIONS)]
+#[tokio::test]
+async fn test_batch_witness(version: ProtocolVersionId) {
+    zksync_concurrency::testonly::abort_on_panic();
+    let ctx = &ctx::test_root(&ctx::RealClock);
+    let rng = &mut ctx.rng();
+
+    scope::run!(ctx, |ctx, s| async {
+        let pool = ConnectionPool::from_genesis(version).await;
+        let (mut node, runner) = testonly::StateKeeper::new(ctx, pool.clone()).await?;
+        s.spawn_bg(runner.run_real(ctx));
+
+        tracing::info!("analyzing storage");
+        {
+            let mut conn = pool.connection(ctx).await.unwrap();
+            let mut n = validator::BlockNumber(0);
+            while let Some(p) = conn.payload(ctx, n).await? {
+                tracing::info!("block[{n}] = {p:?}");
+                n = n + 1;
+            }
+        }
+
+        // Seal a bunch of batches.
+        node.push_random_blocks(rng, 10).await;
+        node.seal_batch().await;
+        pool.wait_for_batch(ctx, node.last_sealed_batch()).await?;
+        // We can verify only 2nd batch onward, because
+        // batch witness verifies parent of the last block of the
+        // previous batch (and 0th batch contains only 1 block).
+        for n in 2..=node.last_sealed_batch().0 {
+            let n = L1BatchNumber(n);
+            let batch_with_witness = node.load_batch_with_witness(ctx, n).await?;
+            let commit = node.load_batch_commit(ctx, n).await?;
+            batch_with_witness.verify(&commit)?;
+        }
+        Ok(())
+    })
+    .await
+    .unwrap();
+}
diff --git a/core/node/consistency_checker/Cargo.toml b/core/node/consistency_checker/Cargo.toml
new file mode 100644
index 000000000000..41fe90fabe27
--- /dev/null
+++ b/core/node/consistency_checker/Cargo.toml
@@ -0,0 +1,36 @@
+[package]
+name = "zksync_consistency_checker"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_contracts.workspace = true
+zksync_dal.workspace = true
+zksync_eth_client.workspace = true
+zksync_eth_sender.workspace = true
+zksync_health_check.workspace = true
+zksync_l1_contract_interface.workspace = true
+zksync_shared_metrics.workspace = true
+zksync_types.workspace = true
+
+anyhow.workspace = true
+serde.workspace = true
+tokio = { workspace = true, features = ["time"] }
+tracing.workspace = true
+thiserror.workspace = true
+
+[dev-dependencies]
+assert_matches.workspace = true
+test-casing.workspace = true
+chrono.workspace = true
+once_cell.workspace = true
+
+zksync_node_genesis.workspace = true
+zksync_node_test_utils.workspace = true
+zksync_config.workspace = true
diff --git a/core/node/consistency_checker/README.md b/core/node/consistency_checker/README.md
new file mode 100644
index 000000000000..1c2a621640f1
--- /dev/null
+++ b/core/node/consistency_checker/README.md
@@ -0,0 +1,3 @@
+# `zksync_consistency_checker`
+
+Component responsible for ensuring consistency between a local and remote instance of ZK Stack.
diff --git a/core/lib/zksync_core/src/consistency_checker/mod.rs b/core/node/consistency_checker/src/lib.rs
similarity index 87%
rename from core/lib/zksync_core/src/consistency_checker/mod.rs
rename to core/node/consistency_checker/src/lib.rs
index 9b94a9c5ef67..ba8085333a4c 100644
--- a/core/lib/zksync_core/src/consistency_checker/mod.rs
+++ b/core/node/consistency_checker/src/lib.rs
@@ -1,29 +1,37 @@
-use std::{borrow::Cow, collections::HashSet, fmt, sync::Arc, time::Duration};
+use std::{borrow::Cow, collections::HashSet, fmt, time::Duration};
 
 use anyhow::Context as _;
 use serde::Serialize;
 use tokio::sync::watch;
 use zksync_contracts::PRE_BOOJUM_COMMIT_FUNCTION;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
-use zksync_eth_client::{CallFunctionArgs, ClientError, Error as L1ClientError, EthInterface};
-use zksync_eth_sender::l1_batch_commit_data_generator::L1BatchCommitDataGenerator;
+use zksync_eth_client::{
+    clients::{DynClient, L1},
+    CallFunctionArgs, ContractCallError, EnrichedClientError, EthInterface,
+};
 use zksync_health_check::{Health, HealthStatus, HealthUpdater, ReactiveHealthCheck};
-use zksync_l1_contract_interface::i_executor::commit::kzg::ZK_SYNC_BYTES_PER_BLOB;
+use zksync_l1_contract_interface::{
+    i_executor::{commit::kzg::ZK_SYNC_BYTES_PER_BLOB, structures::CommitBatchInfo},
+    Tokenizable,
+};
 use zksync_shared_metrics::{CheckerComponent, EN_METRICS};
 use zksync_types::{
-    commitment::L1BatchWithMetadata, ethabi, ethabi::Token, pubdata_da::PubdataDA, Address,
-    L1BatchNumber, ProtocolVersionId, H256, U256,
+    commitment::{L1BatchCommitmentMode, L1BatchWithMetadata},
+    ethabi,
+    ethabi::Token,
+    pubdata_da::PubdataDA,
+    Address, L1BatchNumber, ProtocolVersionId, H256, U256,
 };
 
-use crate::utils::wait_for_l1_batch_with_metadata;
-
 #[cfg(test)]
 mod tests;
 
 #[derive(Debug, thiserror::Error)]
 enum CheckError {
     #[error("Web3 error communicating with L1")]
-    Web3(#[from] L1ClientError),
+    Web3(#[from] EnrichedClientError),
+    #[error("error calling L1 contract")]
+    ContractCall(#[from] ContractCallError),
     /// Error that is caused by the main node providing incorrect information etc.
     #[error("failed validating commit transaction")]
     Validation(anyhow::Error),
@@ -34,12 +42,12 @@ enum CheckError {
 
 impl CheckError {
     fn is_transient(&self) -> bool {
-        matches!(
-            self,
-            Self::Web3(L1ClientError::EthereumGateway(
-                ClientError::Transport(_) | ClientError::RequestTimeout
-            ))
-        )
+        match self {
+            Self::Web3(err) | Self::ContractCall(ContractCallError::EthereumGateway(err)) => {
+                err.is_transient()
+            }
+            _ => false,
+        }
     }
 }
 
@@ -135,7 +143,7 @@ enum L1DataMismatchBehavior {
 struct LocalL1BatchCommitData {
     l1_batch: L1BatchWithMetadata,
     commit_tx_hash: H256,
-    l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 impl LocalL1BatchCommitData {
@@ -144,19 +152,16 @@ impl LocalL1BatchCommitData {
     async fn new(
         storage: &mut Connection<'_, Core>,
         batch_number: L1BatchNumber,
-        l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
+        commitment_mode: L1BatchCommitmentMode,
     ) -> anyhow::Result<Option<Self>> {
-        let Some(storage_l1_batch) = storage
+        let Some(commit_tx_id) = storage
             .blocks_dal()
-            .get_storage_l1_batch(batch_number)
+            .get_eth_commit_tx_id(batch_number)
             .await?
         else {
             return Ok(None);
         };
 
-        let Some(commit_tx_id) = storage_l1_batch.eth_commit_tx_id else {
-            return Ok(None);
-        };
         let commit_tx_hash = storage
             .eth_sender_dal()
             .get_confirmed_tx_hash_by_eth_tx_id(commit_tx_id as u32)
@@ -167,7 +172,7 @@ impl LocalL1BatchCommitData {
 
         let Some(l1_batch) = storage
             .blocks_dal()
-            .get_l1_batch_with_metadata(storage_l1_batch)
+            .get_l1_batch_metadata(batch_number)
             .await?
         else {
             return Ok(None);
@@ -176,7 +181,7 @@ impl LocalL1BatchCommitData {
         let this = Self {
             l1_batch,
             commit_tx_hash,
-            l1_batch_commit_data_generator,
+            commitment_mode,
         };
         let metadata = &this.l1_batch.metadata;
 
@@ -233,9 +238,8 @@ impl LocalL1BatchCommitData {
             );
         }
 
-        let local_token = self
-            .l1_batch_commit_data_generator
-            .l1_commit_batch(&self.l1_batch, &da);
+        let local_token =
+            CommitBatchInfo::new(self.commitment_mode, &self.l1_batch, da).into_token();
         anyhow::ensure!(
             local_token == *reference,
             "Locally reproduced commitment differs from the reference obtained from L1; \
@@ -258,6 +262,7 @@ pub fn detect_da(
     /// These are used by the L1 Contracts to indicate what DA layer is used for pubdata
     const PUBDATA_SOURCE_CALLDATA: u8 = 0;
     const PUBDATA_SOURCE_BLOBS: u8 = 1;
+    const PUBDATA_SOURCE_CUSTOM: u8 = 2;
 
     fn parse_error(message: impl Into<Cow<'static, str>>) -> ethabi::Error {
         ethabi::Error::Other(message.into())
@@ -288,6 +293,7 @@ pub fn detect_da(
     match last_reference_token.first() {
         Some(&byte) if byte == PUBDATA_SOURCE_CALLDATA => Ok(PubdataDA::Calldata),
         Some(&byte) if byte == PUBDATA_SOURCE_BLOBS => Ok(PubdataDA::Blobs),
+        Some(&byte) if byte == PUBDATA_SOURCE_CUSTOM => Ok(PubdataDA::Custom),
         Some(&byte) => Err(parse_error(format!(
             "unexpected first byte of the last reference token; expected one of [{PUBDATA_SOURCE_CALLDATA}, {PUBDATA_SOURCE_BLOBS}], \
                 got {byte}"
@@ -298,29 +304,29 @@ pub fn detect_da(
 
 #[derive(Debug)]
 pub struct ConsistencyChecker {
-    /// ABI of the zkSync contract
+    /// ABI of the ZKsync contract
     contract: ethabi::Contract,
-    /// Address of the zkSync diamond proxy on L1
+    /// Address of the ZKsync diamond proxy on L1
     diamond_proxy_addr: Option<Address>,
     /// How many past batches to check when starting
     max_batches_to_recheck: u32,
     sleep_interval: Duration,
-    l1_client: Box<dyn EthInterface>,
+    l1_client: Box<DynClient<L1>>,
     event_handler: Box<dyn HandleConsistencyCheckerEvent>,
     l1_data_mismatch_behavior: L1DataMismatchBehavior,
     pool: ConnectionPool<Core>,
     health_check: ReactiveHealthCheck,
-    l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 impl ConsistencyChecker {
     const DEFAULT_SLEEP_INTERVAL: Duration = Duration::from_secs(5);
 
     pub fn new(
-        l1_client: Box<dyn EthInterface>,
+        l1_client: Box<DynClient<L1>>,
         max_batches_to_recheck: u32,
         pool: ConnectionPool<Core>,
-        l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
+        commitment_mode: L1BatchCommitmentMode,
     ) -> anyhow::Result<Self> {
         let (health_check, health_updater) = ConsistencyCheckerHealthUpdater::new();
         Ok(Self {
@@ -333,7 +339,7 @@ impl ConsistencyChecker {
             l1_data_mismatch_behavior: L1DataMismatchBehavior::Log,
             pool,
             health_check,
-            l1_batch_commit_data_generator,
+            commitment_mode,
         })
     }
 
@@ -378,7 +384,7 @@ impl ConsistencyChecker {
             let event = self
                 .contract
                 .event("BlockCommit")
-                .context("`BlockCommit` event not found for zkSync L1 contract")
+                .context("`BlockCommit` event not found for ZKsync L1 contract")
                 .map_err(CheckError::Internal)?;
 
             let committed_batch_numbers_by_logs =
@@ -530,7 +536,10 @@ impl ConsistencyChecker {
 
         while let Err(err) = self.sanity_check_diamond_proxy_addr().await {
             if err.is_transient() {
-                tracing::warn!("Transient error checking diamond proxy contract; will retry after a delay: {err}");
+                tracing::warn!(
+                    "Transient error checking diamond proxy contract; will retry after a delay: {:#}",
+                    anyhow::Error::from(err)
+                );
                 if tokio::time::timeout(self.sleep_interval, stop_receiver.changed())
                     .await
                     .is_ok()
@@ -587,13 +596,10 @@ impl ConsistencyChecker {
             // The batch might be already committed but not yet processed by the external node's tree
             // OR the batch might be processed by the external node's tree but not yet committed.
             // We need both.
-            let Some(local) = LocalL1BatchCommitData::new(
-                &mut storage,
-                batch_number,
-                self.l1_batch_commit_data_generator.clone(),
-            )
-            .await?
-            else {
+            let local =
+                LocalL1BatchCommitData::new(&mut storage, batch_number, self.commitment_mode)
+                    .await?;
+            let Some(local) = local else {
                 if tokio::time::timeout(self.sleep_interval, stop_receiver.changed())
                     .await
                     .is_ok()
@@ -630,7 +636,10 @@ impl ConsistencyChecker {
                     }
                 }
                 Err(err) if err.is_transient() => {
-                    tracing::warn!("Transient error while verifying L1 batch #{batch_number}; will retry after a delay: {err}");
+                    tracing::warn!(
+                        "Transient error while verifying L1 batch #{batch_number}; will retry after a delay: {:#}",
+                        anyhow::Error::from(err)
+                    );
                     if tokio::time::timeout(self.sleep_interval, stop_receiver.changed())
                         .await
                         .is_ok()
@@ -650,3 +659,36 @@ impl ConsistencyChecker {
         Ok(())
     }
 }
+
+/// Repeatedly polls the DB until there is an L1 batch with metadata. We may not have such a batch initially
+/// if the DB is recovered from an application-level snapshot.
+///
+/// Returns the number of the *earliest* L1 batch with metadata, or `None` if the stop signal is received.
+async fn wait_for_l1_batch_with_metadata(
+    pool: &ConnectionPool<Core>,
+    poll_interval: Duration,
+    stop_receiver: &mut watch::Receiver<bool>,
+) -> anyhow::Result<Option<L1BatchNumber>> {
+    loop {
+        if *stop_receiver.borrow() {
+            return Ok(None);
+        }
+
+        let mut storage = pool.connection().await?;
+        let sealed_l1_batch_number = storage
+            .blocks_dal()
+            .get_earliest_l1_batch_number_with_metadata()
+            .await?;
+        drop(storage);
+
+        if let Some(number) = sealed_l1_batch_number {
+            return Ok(Some(number));
+        }
+        tracing::debug!(
+            "No L1 batches with metadata are present in DB; trying again in {poll_interval:?}"
+        );
+        tokio::time::timeout(poll_interval, stop_receiver.changed())
+            .await
+            .ok();
+    }
+}
diff --git a/core/lib/zksync_core/src/consistency_checker/tests/commit_l1_batch_200000_testnet_goerli.calldata b/core/node/consistency_checker/src/tests/commit_l1_batch_200000_testnet_goerli.calldata
similarity index 100%
rename from core/lib/zksync_core/src/consistency_checker/tests/commit_l1_batch_200000_testnet_goerli.calldata
rename to core/node/consistency_checker/src/tests/commit_l1_batch_200000_testnet_goerli.calldata
diff --git a/core/lib/zksync_core/src/consistency_checker/tests/commit_l1_batch_351000-351004_mainnet.calldata b/core/node/consistency_checker/src/tests/commit_l1_batch_351000-351004_mainnet.calldata
similarity index 100%
rename from core/lib/zksync_core/src/consistency_checker/tests/commit_l1_batch_351000-351004_mainnet.calldata
rename to core/node/consistency_checker/src/tests/commit_l1_batch_351000-351004_mainnet.calldata
diff --git a/core/lib/zksync_core/src/consistency_checker/tests/commit_l1_batch_4470_testnet_sepolia.calldata b/core/node/consistency_checker/src/tests/commit_l1_batch_4470_testnet_sepolia.calldata
similarity index 100%
rename from core/lib/zksync_core/src/consistency_checker/tests/commit_l1_batch_4470_testnet_sepolia.calldata
rename to core/node/consistency_checker/src/tests/commit_l1_batch_4470_testnet_sepolia.calldata
diff --git a/core/lib/zksync_core/src/consistency_checker/tests/mod.rs b/core/node/consistency_checker/src/tests/mod.rs
similarity index 80%
rename from core/lib/zksync_core/src/consistency_checker/tests/mod.rs
rename to core/node/consistency_checker/src/tests/mod.rs
index 061bc3e7ea56..853090b1907d 100644
--- a/core/lib/zksync_core/src/consistency_checker/tests/mod.rs
+++ b/core/node/consistency_checker/src/tests/mod.rs
@@ -8,17 +8,14 @@ use tokio::sync::mpsc;
 use zksync_config::GenesisConfig;
 use zksync_dal::Connection;
 use zksync_eth_client::{clients::MockEthereum, Options};
-use zksync_eth_sender::l1_batch_commit_data_generator::{
-    RollupModeL1BatchCommitDataGenerator, ValidiumModeL1BatchCommitDataGenerator,
-};
+use zksync_l1_contract_interface::{i_executor::methods::CommitBatches, Tokenizable, Tokenize};
 use zksync_node_genesis::{insert_genesis_batch, mock_genesis_config, GenesisParams};
 use zksync_node_test_utils::{
     create_l1_batch, create_l1_batch_metadata, l1_batch_metadata_to_commitment_artifacts,
-    DeploymentMode,
 };
 use zksync_types::{
-    aggregated_operations::AggregatedActionType, commitment::L1BatchWithMetadata, web3::Log,
-    ProtocolVersion, ProtocolVersionId, H256,
+    aggregated_operations::AggregatedActionType, commitment::L1BatchWithMetadata,
+    protocol_version::ProtocolSemanticVersion, web3::Log, ProtocolVersion, ProtocolVersionId, H256,
 };
 
 use super::*;
@@ -36,6 +33,10 @@ const PRE_BOOJUM_PROTOCOL_VERSION: ProtocolVersionId = ProtocolVersionId::Versio
 const DIAMOND_PROXY_ADDR: Address = Address::repeat_byte(1);
 const VALIDATOR_TIMELOCK_ADDR: Address = Address::repeat_byte(23);
 const CHAIN_ID: u32 = 270;
+const COMMITMENT_MODES: [L1BatchCommitmentMode; 2] = [
+    L1BatchCommitmentMode::Rollup,
+    L1BatchCommitmentMode::Validium,
+];
 
 pub(crate) fn create_pre_boojum_l1_batch_with_metadata(number: u32) -> L1BatchWithMetadata {
     let mut l1_batch = L1BatchWithMetadata {
@@ -51,18 +52,21 @@ pub(crate) fn create_pre_boojum_l1_batch_with_metadata(number: u32) -> L1BatchWi
 
 pub(crate) fn build_commit_tx_input_data(
     batches: &[L1BatchWithMetadata],
-    l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
+    mode: L1BatchCommitmentMode,
 ) -> Vec<u8> {
-    let pubdata_da = PubdataDA::Calldata;
-
     let protocol_version = batches[0].header.protocol_version.unwrap();
     let contract = zksync_contracts::hyperchain_contract();
 
     // Mock an additional argument used in real `commitBlocks` / `commitBatches`. In real transactions,
     // it's taken from the L1 batch previous to `batches[0]`, but since this argument is not checked,
     // it's OK to use `batches[0]`.
-    let tokens =
-        l1_batch_commit_data_generator.l1_commit_batches(&batches[0], batches, &pubdata_da);
+    let tokens = CommitBatches {
+        last_committed_l1_batch: &batches[0],
+        l1_batches: batches,
+        pubdata_da: PubdataDA::Calldata,
+        mode,
+    }
+    .into_tokens();
 
     if protocol_version.is_pre_boojum() {
         PRE_BOOJUM_COMMIT_FUNCTION.encode_input(&tokens).unwrap()
@@ -89,7 +93,7 @@ pub(crate) fn build_commit_tx_input_data(
 pub(crate) fn create_mock_checker(
     client: MockEthereum,
     pool: ConnectionPool<Core>,
-    l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
+    commitment_mode: L1BatchCommitmentMode,
 ) -> ConsistencyChecker {
     let (health_check, health_updater) = ConsistencyCheckerHealthUpdater::new();
     ConsistencyChecker {
@@ -97,18 +101,19 @@ pub(crate) fn create_mock_checker(
         diamond_proxy_addr: Some(DIAMOND_PROXY_ADDR),
         max_batches_to_recheck: 100,
         sleep_interval: Duration::from_millis(10),
-        l1_client: Box::new(client),
+        l1_client: Box::new(client.into_client()),
         event_handler: Box::new(health_updater),
         l1_data_mismatch_behavior: L1DataMismatchBehavior::Bail,
         pool,
-        l1_batch_commit_data_generator,
+        commitment_mode,
         health_check,
     }
 }
 
 fn create_mock_ethereum() -> MockEthereum {
-    MockEthereum::default().with_call_handler(|call, _block_id| {
+    let mock = MockEthereum::builder().with_call_handler(|call, _block_id| {
         assert_eq!(call.to, Some(DIAMOND_PROXY_ADDR));
+        let packed_semver = ProtocolVersionId::latest().into_packed_semver_with_patch(0);
         let contract = zksync_contracts::hyperchain_contract();
         let expected_input = contract
             .function("getProtocolVersion")
@@ -116,8 +121,10 @@ fn create_mock_ethereum() -> MockEthereum {
             .encode_input(&[])
             .unwrap();
         assert_eq!(call.data, Some(expected_input.into()));
-        ethabi::Token::Uint((ProtocolVersionId::latest() as u16).into())
-    })
+
+        ethabi::Token::Uint(packed_semver)
+    });
+    mock.build()
 }
 
 impl HandleConsistencyCheckerEvent for mpsc::UnboundedSender<L1BatchNumber> {
@@ -138,15 +145,9 @@ impl HandleConsistencyCheckerEvent for mpsc::UnboundedSender<L1BatchNumber> {
     }
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[test]
-fn build_commit_tx_input_data_is_correct(deployment_mode: DeploymentMode) {
-    let l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator> = match deployment_mode
-    {
-        DeploymentMode::Validium => Arc::new(RollupModeL1BatchCommitDataGenerator {}),
-        DeploymentMode::Rollup => Arc::new(ValidiumModeL1BatchCommitDataGenerator {}),
-    };
-
+fn build_commit_tx_input_data_is_correct(commitment_mode: L1BatchCommitmentMode) {
     let contract = zksync_contracts::hyperchain_contract();
     let commit_function = contract.function("commitBatchesSharedBridge").unwrap();
     let batches = vec![
@@ -154,8 +155,7 @@ fn build_commit_tx_input_data_is_correct(deployment_mode: DeploymentMode) {
         create_l1_batch_with_metadata(2),
     ];
 
-    let commit_tx_input_data =
-        build_commit_tx_input_data(&batches, l1_batch_commit_data_generator.clone());
+    let commit_tx_input_data = build_commit_tx_input_data(&batches, commitment_mode);
 
     for batch in &batches {
         let commit_data = ConsistencyChecker::extract_commit_data(
@@ -166,7 +166,7 @@ fn build_commit_tx_input_data_is_correct(deployment_mode: DeploymentMode) {
         .unwrap();
         assert_eq!(
             commit_data,
-            l1_batch_commit_data_generator.l1_commit_batch(batch, &PubdataDA::Calldata),
+            CommitBatchInfo::new(commitment_mode, batch, PubdataDA::Calldata).into_token(),
         );
     }
 }
@@ -385,19 +385,13 @@ fn l1_batch_commit_log(l1_batch: &L1BatchWithMetadata) -> Log {
     }
 }
 
-#[test_casing(24, Product(([10, 3, 1], SAVE_ACTION_MAPPERS, [DeploymentMode::Rollup, DeploymentMode::Validium])))]
+#[test_casing(24, Product(([10, 3, 1], SAVE_ACTION_MAPPERS, COMMITMENT_MODES)))]
 #[tokio::test]
 async fn normal_checker_function(
     batches_per_transaction: usize,
     (mapper_name, save_actions_mapper): (&'static str, SaveActionMapper),
-    deployment_mode: DeploymentMode,
+    commitment_mode: L1BatchCommitmentMode,
 ) {
-    let l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator> = match deployment_mode
-    {
-        DeploymentMode::Validium => Arc::new(RollupModeL1BatchCommitDataGenerator {}),
-        DeploymentMode::Rollup => Arc::new(ValidiumModeL1BatchCommitDataGenerator {}),
-    };
-
     println!("Using save_actions_mapper={mapper_name}");
 
     let pool = ConnectionPool::<Core>::test_pool().await;
@@ -411,8 +405,7 @@ async fn normal_checker_function(
     let client = create_mock_ethereum();
 
     for (i, l1_batches) in l1_batches.chunks(batches_per_transaction).enumerate() {
-        let input_data =
-            build_commit_tx_input_data(l1_batches, l1_batch_commit_data_generator.clone());
+        let input_data = build_commit_tx_input_data(l1_batches, commitment_mode);
         let signed_tx = client.sign_prepared_tx(
             input_data.clone(),
             VALIDATOR_TIMELOCK_ADDR,
@@ -422,7 +415,7 @@ async fn normal_checker_function(
             },
         );
         let signed_tx = signed_tx.unwrap();
-        client.send_raw_tx(signed_tx.raw_tx).await.unwrap();
+        client.as_ref().send_raw_tx(signed_tx.raw_tx).await.unwrap();
         client
             .execute_tx(signed_tx.hash, true, 1)
             .with_logs(l1_batches.iter().map(l1_batch_commit_log).collect());
@@ -437,7 +430,7 @@ async fn normal_checker_function(
     let (l1_batch_updates_sender, mut l1_batch_updates_receiver) = mpsc::unbounded_channel();
     let checker = ConsistencyChecker {
         event_handler: Box::new(l1_batch_updates_sender),
-        ..create_mock_checker(client, pool.clone(), l1_batch_commit_data_generator)
+        ..create_mock_checker(client, pool.clone(), commitment_mode)
     };
 
     let (stop_sender, stop_receiver) = watch::channel(false);
@@ -464,24 +457,21 @@ async fn normal_checker_function(
     checker_task.await.unwrap().unwrap();
 }
 
-#[test_casing(8, Product((SAVE_ACTION_MAPPERS, [DeploymentMode::Rollup, DeploymentMode::Validium])))]
+#[test_casing(8, Product((SAVE_ACTION_MAPPERS, COMMITMENT_MODES)))]
 #[tokio::test]
 async fn checker_processes_pre_boojum_batches(
     (mapper_name, save_actions_mapper): (&'static str, SaveActionMapper),
-    deployment_mode: DeploymentMode,
+    commitment_mode: L1BatchCommitmentMode,
 ) {
-    let l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator> = match deployment_mode
-    {
-        DeploymentMode::Validium => Arc::new(RollupModeL1BatchCommitDataGenerator {}),
-        DeploymentMode::Rollup => Arc::new(ValidiumModeL1BatchCommitDataGenerator {}),
-    };
-
     println!("Using save_actions_mapper={mapper_name}");
 
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut storage = pool.connection().await.unwrap();
     let genesis_params = GenesisParams::load_genesis_params(GenesisConfig {
-        protocol_version: Some(PRE_BOOJUM_PROTOCOL_VERSION as u16),
+        protocol_version: Some(ProtocolSemanticVersion {
+            minor: PRE_BOOJUM_PROTOCOL_VERSION,
+            patch: 0.into(),
+        }),
         ..mock_genesis_config()
     })
     .unwrap();
@@ -502,10 +492,7 @@ async fn checker_processes_pre_boojum_batches(
     let client = create_mock_ethereum();
 
     for (i, l1_batch) in l1_batches.iter().enumerate() {
-        let input_data = build_commit_tx_input_data(
-            slice::from_ref(l1_batch),
-            l1_batch_commit_data_generator.clone(),
-        );
+        let input_data = build_commit_tx_input_data(slice::from_ref(l1_batch), commitment_mode);
         let signed_tx = client.sign_prepared_tx(
             input_data.clone(),
             VALIDATOR_TIMELOCK_ADDR,
@@ -515,7 +502,7 @@ async fn checker_processes_pre_boojum_batches(
             },
         );
         let signed_tx = signed_tx.unwrap();
-        client.send_raw_tx(signed_tx.raw_tx).await.unwrap();
+        client.as_ref().send_raw_tx(signed_tx.raw_tx).await.unwrap();
         client
             .execute_tx(signed_tx.hash, true, 1)
             .with_logs(vec![l1_batch_commit_log(l1_batch)]);
@@ -526,7 +513,7 @@ async fn checker_processes_pre_boojum_batches(
     let (l1_batch_updates_sender, mut l1_batch_updates_receiver) = mpsc::unbounded_channel();
     let checker = ConsistencyChecker {
         event_handler: Box::new(l1_batch_updates_sender),
-        ..create_mock_checker(client, pool.clone(), l1_batch_commit_data_generator)
+        ..create_mock_checker(client, pool.clone(), commitment_mode)
     };
 
     let (stop_sender, stop_receiver) = watch::channel(false);
@@ -553,18 +540,12 @@ async fn checker_processes_pre_boojum_batches(
     checker_task.await.unwrap().unwrap();
 }
 
-#[test_casing(4, Product(([false, true], [DeploymentMode::Rollup, DeploymentMode::Validium])))]
+#[test_casing(4, Product(([false, true], COMMITMENT_MODES)))]
 #[tokio::test]
 async fn checker_functions_after_snapshot_recovery(
     delay_batch_insertion: bool,
-    deployment_mode: DeploymentMode,
+    commitment_mode: L1BatchCommitmentMode,
 ) {
-    let l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator> = match deployment_mode
-    {
-        DeploymentMode::Validium => Arc::new(RollupModeL1BatchCommitDataGenerator {}),
-        DeploymentMode::Rollup => Arc::new(ValidiumModeL1BatchCommitDataGenerator {}),
-    };
-
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut storage = pool.connection().await.unwrap();
     storage
@@ -575,10 +556,8 @@ async fn checker_functions_after_snapshot_recovery(
 
     let l1_batch = create_l1_batch_with_metadata(99);
 
-    let commit_tx_input_data = build_commit_tx_input_data(
-        slice::from_ref(&l1_batch),
-        l1_batch_commit_data_generator.clone(),
-    );
+    let commit_tx_input_data =
+        build_commit_tx_input_data(slice::from_ref(&l1_batch), commitment_mode);
     let client = create_mock_ethereum();
     let signed_tx = client.sign_prepared_tx(
         commit_tx_input_data.clone(),
@@ -590,7 +569,7 @@ async fn checker_functions_after_snapshot_recovery(
     );
     let signed_tx = signed_tx.unwrap();
     let commit_tx_hash = signed_tx.hash;
-    client.send_raw_tx(signed_tx.raw_tx).await.unwrap();
+    client.as_ref().send_raw_tx(signed_tx.raw_tx).await.unwrap();
     client
         .execute_tx(commit_tx_hash, true, 1)
         .with_logs(vec![l1_batch_commit_log(&l1_batch)]);
@@ -613,7 +592,7 @@ async fn checker_functions_after_snapshot_recovery(
     let (l1_batch_updates_sender, mut l1_batch_updates_receiver) = mpsc::unbounded_channel();
     let checker = ConsistencyChecker {
         event_handler: Box::new(l1_batch_updates_sender),
-        ..create_mock_checker(client, pool.clone(), l1_batch_commit_data_generator)
+        ..create_mock_checker(client, pool.clone(), commitment_mode)
     };
     let (stop_sender, stop_receiver) = watch::channel(false);
     let checker_task = tokio::spawn(checker.run(stop_receiver));
@@ -671,7 +650,7 @@ impl IncorrectDataKind {
         self,
         client: &MockEthereum,
         l1_batch: &L1BatchWithMetadata,
-        l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
+        commitment_mode: L1BatchCommitmentMode,
     ) -> H256 {
         let mut log_origin = Some(DIAMOND_PROXY_ADDR);
         let (commit_tx_input_data, successful_status) = match self {
@@ -679,41 +658,31 @@ impl IncorrectDataKind {
                 return H256::zero(); // Do not execute the transaction
             }
             Self::MismatchedStatus => {
-                let commit_tx_input_data = build_commit_tx_input_data(
-                    slice::from_ref(l1_batch),
-                    l1_batch_commit_data_generator.clone(),
-                );
+                let commit_tx_input_data =
+                    build_commit_tx_input_data(slice::from_ref(l1_batch), commitment_mode);
                 (commit_tx_input_data, false)
             }
             Self::NoCommitLog => {
                 log_origin = None;
-                let commit_tx_input_data = build_commit_tx_input_data(
-                    slice::from_ref(l1_batch),
-                    l1_batch_commit_data_generator.clone(),
-                );
+                let commit_tx_input_data =
+                    build_commit_tx_input_data(slice::from_ref(l1_batch), commitment_mode);
                 (commit_tx_input_data, true)
             }
             Self::BogusCommitLogOrigin => {
                 log_origin = Some(VALIDATOR_TIMELOCK_ADDR);
-                let commit_tx_input_data = build_commit_tx_input_data(
-                    slice::from_ref(l1_batch),
-                    l1_batch_commit_data_generator.clone(),
-                );
+                let commit_tx_input_data =
+                    build_commit_tx_input_data(slice::from_ref(l1_batch), commitment_mode);
                 (commit_tx_input_data, true)
             }
             Self::BogusSoliditySelector => {
-                let mut commit_tx_input_data = build_commit_tx_input_data(
-                    slice::from_ref(l1_batch),
-                    l1_batch_commit_data_generator.clone(),
-                );
+                let mut commit_tx_input_data =
+                    build_commit_tx_input_data(slice::from_ref(l1_batch), commitment_mode);
                 commit_tx_input_data[..4].copy_from_slice(b"test");
                 (commit_tx_input_data, true)
             }
             Self::BogusCommitDataFormat => {
-                let commit_tx_input_data = build_commit_tx_input_data(
-                    slice::from_ref(l1_batch),
-                    l1_batch_commit_data_generator.clone(),
-                );
+                let commit_tx_input_data =
+                    build_commit_tx_input_data(slice::from_ref(l1_batch), commitment_mode);
                 let mut bogus_tx_input_data = commit_tx_input_data[..4].to_vec(); // Preserve the function selector
                 bogus_tx_input_data
                     .extend_from_slice(&ethabi::encode(&[ethabi::Token::Bool(true)]));
@@ -722,27 +691,21 @@ impl IncorrectDataKind {
             Self::MismatchedCommitDataTimestamp => {
                 let mut l1_batch = create_l1_batch_with_metadata(1);
                 l1_batch.header.timestamp += 1;
-                let bogus_tx_input_data = build_commit_tx_input_data(
-                    slice::from_ref(&l1_batch),
-                    l1_batch_commit_data_generator,
-                );
+                let bogus_tx_input_data =
+                    build_commit_tx_input_data(slice::from_ref(&l1_batch), commitment_mode);
                 (bogus_tx_input_data, true)
             }
             Self::CommitDataForAnotherBatch => {
                 let l1_batch = create_l1_batch_with_metadata(100);
-                let bogus_tx_input_data = build_commit_tx_input_data(
-                    slice::from_ref(&l1_batch),
-                    l1_batch_commit_data_generator,
-                );
+                let bogus_tx_input_data =
+                    build_commit_tx_input_data(slice::from_ref(&l1_batch), commitment_mode);
                 (bogus_tx_input_data, true)
             }
             Self::CommitDataForPreBoojum => {
                 let mut l1_batch = create_l1_batch_with_metadata(1);
                 l1_batch.header.protocol_version = Some(ProtocolVersionId::Version0);
-                let bogus_tx_input_data = build_commit_tx_input_data(
-                    slice::from_ref(&l1_batch),
-                    l1_batch_commit_data_generator,
-                );
+                let bogus_tx_input_data =
+                    build_commit_tx_input_data(slice::from_ref(&l1_batch), commitment_mode);
                 (bogus_tx_input_data, true)
             }
         };
@@ -764,7 +727,7 @@ impl IncorrectDataKind {
         } else {
             vec![]
         };
-        client.send_raw_tx(signed_tx.raw_tx).await.unwrap();
+        client.as_ref().send_raw_tx(signed_tx.raw_tx).await.unwrap();
         client
             .execute_tx(signed_tx.hash, successful_status, 1)
             .with_logs(tx_logs);
@@ -772,20 +735,14 @@ impl IncorrectDataKind {
     }
 }
 
-#[test_casing(18, Product((IncorrectDataKind::ALL, [false], [DeploymentMode::Rollup, DeploymentMode::Validium])))]
+#[test_casing(18, Product((IncorrectDataKind::ALL, [false], COMMITMENT_MODES)))]
 // ^ `snapshot_recovery = true` is tested below; we don't want to run it with all incorrect data kinds
 #[tokio::test]
 async fn checker_detects_incorrect_tx_data(
     kind: IncorrectDataKind,
     snapshot_recovery: bool,
-    deployment_mode: DeploymentMode,
+    commitment_mode: L1BatchCommitmentMode,
 ) {
-    let l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator> = match deployment_mode
-    {
-        DeploymentMode::Validium => Arc::new(RollupModeL1BatchCommitDataGenerator {}),
-        DeploymentMode::Rollup => Arc::new(ValidiumModeL1BatchCommitDataGenerator {}),
-    };
-
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut storage = pool.connection().await.unwrap();
     if snapshot_recovery {
@@ -802,9 +759,7 @@ async fn checker_detects_incorrect_tx_data(
 
     let l1_batch = create_l1_batch_with_metadata(if snapshot_recovery { 99 } else { 1 });
     let client = create_mock_ethereum();
-    let commit_tx_hash = kind
-        .apply(&client, &l1_batch, l1_batch_commit_data_generator.clone())
-        .await;
+    let commit_tx_hash = kind.apply(&client, &l1_batch, commitment_mode).await;
     let commit_tx_hash_by_l1_batch = HashMap::from([(l1_batch.header.number, commit_tx_hash)]);
 
     let save_actions = [
@@ -819,7 +774,7 @@ async fn checker_detects_incorrect_tx_data(
     }
     drop(storage);
 
-    let checker = create_mock_checker(client, pool, l1_batch_commit_data_generator);
+    let checker = create_mock_checker(client, pool, commitment_mode);
     let (_stop_sender, stop_receiver) = watch::channel(false);
     // The checker must stop with an error.
     tokio::time::timeout(Duration::from_secs(30), checker.run(stop_receiver))
@@ -828,15 +783,15 @@ async fn checker_detects_incorrect_tx_data(
         .unwrap_err();
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
 async fn checker_detects_incorrect_tx_data_after_snapshot_recovery(
-    deployment_mode: DeploymentMode,
+    commitment_mode: L1BatchCommitmentMode,
 ) {
     checker_detects_incorrect_tx_data(
         IncorrectDataKind::CommitDataForAnotherBatch,
         true,
-        deployment_mode,
+        commitment_mode,
     )
     .await;
 }
diff --git a/core/node/contract_verification_server/Cargo.toml b/core/node/contract_verification_server/Cargo.toml
new file mode 100644
index 000000000000..ee38d30906fb
--- /dev/null
+++ b/core/node/contract_verification_server/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "zksync_contract_verification_server"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_config.workspace = true
+zksync_dal.workspace = true
+zksync_types.workspace = true
+vise.workspace = true
+
+anyhow.workspace = true
+axum.workspace = true
+tokio = { workspace = true, features = ["time"] }
+tower-http.workspace = true
+tracing.workspace = true
+serde.workspace = true
+serde_json.workspace = true
diff --git a/core/node/contract_verification_server/README.md b/core/node/contract_verification_server/README.md
new file mode 100644
index 000000000000..ab18bbcde432
--- /dev/null
+++ b/core/node/contract_verification_server/README.md
@@ -0,0 +1,3 @@
+# `zksync_contract_verification_server`
+
+Implementation of the backend used for contract verification.
diff --git a/core/lib/zksync_core/src/api_server/contract_verification/api_decl.rs b/core/node/contract_verification_server/src/api_decl.rs
similarity index 100%
rename from core/lib/zksync_core/src/api_server/contract_verification/api_decl.rs
rename to core/node/contract_verification_server/src/api_decl.rs
diff --git a/core/lib/zksync_core/src/api_server/contract_verification/api_impl.rs b/core/node/contract_verification_server/src/api_impl.rs
similarity index 100%
rename from core/lib/zksync_core/src/api_server/contract_verification/api_impl.rs
rename to core/node/contract_verification_server/src/api_impl.rs
diff --git a/core/lib/zksync_core/src/api_server/contract_verification/mod.rs b/core/node/contract_verification_server/src/lib.rs
similarity index 86%
rename from core/lib/zksync_core/src/api_server/contract_verification/mod.rs
rename to core/node/contract_verification_server/src/lib.rs
index 83a53cfc98f3..eea45f8564bf 100644
--- a/core/lib/zksync_core/src/api_server/contract_verification/mod.rs
+++ b/core/node/contract_verification_server/src/lib.rs
@@ -18,8 +18,10 @@ pub async fn start_server(
     let bind_address = config.bind_addr();
     let api = RestApi::new(master_connection_pool, replica_connection_pool).into_router();
 
-    axum::Server::bind(&bind_address)
-        .serve(api.into_make_service())
+    let listener = tokio::net::TcpListener::bind(bind_address)
+        .await
+        .context("Cannot bind to the specified address")?;
+    axum::serve(listener, api)
         .with_graceful_shutdown(async move {
             if stop_receiver.changed().await.is_err() {
                 tracing::warn!("Stop signal sender for contract verification server was dropped without sending a signal");
diff --git a/core/lib/zksync_core/src/api_server/contract_verification/metrics.rs b/core/node/contract_verification_server/src/metrics.rs
similarity index 100%
rename from core/lib/zksync_core/src/api_server/contract_verification/metrics.rs
rename to core/node/contract_verification_server/src/metrics.rs
diff --git a/core/node/da_dispatcher/Cargo.toml b/core/node/da_dispatcher/Cargo.toml
new file mode 100644
index 000000000000..159c8f40ef47
--- /dev/null
+++ b/core/node/da_dispatcher/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "zksync_da_dispatcher"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+
+[dependencies]
+vise.workspace = true
+zksync_dal.workspace = true
+zksync_utils.workspace = true
+zksync_config.workspace = true
+zksync_types.workspace = true
+zksync_da_client.workspace = true
+
+tokio = { workspace = true, features = ["time"] }
+anyhow.workspace = true
+tracing.workspace = true
+chrono.workspace = true
+rand.workspace = true
+futures.workspace = true
diff --git a/core/node/da_dispatcher/README.md b/core/node/da_dispatcher/README.md
new file mode 100644
index 000000000000..a7ea6351a5ed
--- /dev/null
+++ b/core/node/da_dispatcher/README.md
@@ -0,0 +1,18 @@
+# DA dispatcher
+
+This crate contains an implementation of the DataAvailability dispatcher component, which sends a blobs of data to the
+corresponding DA layer.
+
+## Overview
+
+The implementation of the DA clients is abstracted away from the dispatcher. The dispatcher is responsible for storing
+the DA blobs info in the Postgres database and use it to get the inclusion proofs for the blobs. The retries logic is
+also part of the DA dispatcher.
+
+This component assumes that batches are being sent to the L1 sequentially and that there is no need to fetch the
+inclusion data for their DA in parallel. Same with dispatching DA blobs, there is no need to do that in parallel unless
+we are facing performance issues when the sequencer is trying to catch up after some outage.
+
+This is a singleton component, only one instance of the DA dispatcher should be running at a time. In case multiple
+instances are started, they will be dispatching the same pubdata blobs to the DA layer. It is not going to cause any
+critical issues, but it is wasteful.
diff --git a/core/node/da_dispatcher/src/da_dispatcher.rs b/core/node/da_dispatcher/src/da_dispatcher.rs
new file mode 100644
index 000000000000..80c030dff338
--- /dev/null
+++ b/core/node/da_dispatcher/src/da_dispatcher.rs
@@ -0,0 +1,211 @@
+use std::{future::Future, time::Duration};
+
+use anyhow::Context;
+use chrono::{NaiveDateTime, Utc};
+use rand::Rng;
+use tokio::sync::watch::Receiver;
+use zksync_config::DADispatcherConfig;
+use zksync_da_client::{types::DAError, DataAvailabilityClient};
+use zksync_dal::{ConnectionPool, Core, CoreDal};
+use zksync_types::L1BatchNumber;
+
+use crate::metrics::METRICS;
+
+#[derive(Debug)]
+pub struct DataAvailabilityDispatcher {
+    client: Box<dyn DataAvailabilityClient>,
+    pool: ConnectionPool<Core>,
+    config: DADispatcherConfig,
+}
+
+impl DataAvailabilityDispatcher {
+    pub fn new(
+        pool: ConnectionPool<Core>,
+        config: DADispatcherConfig,
+        client: Box<dyn DataAvailabilityClient>,
+    ) -> Self {
+        Self {
+            pool,
+            config,
+            client,
+        }
+    }
+
+    pub async fn run(self, mut stop_receiver: Receiver<bool>) -> anyhow::Result<()> {
+        loop {
+            if *stop_receiver.borrow() {
+                break;
+            }
+
+            let subtasks = futures::future::join(
+                async {
+                    if let Err(err) = self.dispatch().await {
+                        tracing::error!("dispatch error {err:?}");
+                    }
+                },
+                async {
+                    if let Err(err) = self.poll_for_inclusion().await {
+                        tracing::error!("poll_for_inclusion error {err:?}");
+                    }
+                },
+            );
+
+            tokio::select! {
+                _ = subtasks => {},
+                _ = stop_receiver.changed() => {
+                    break;
+                }
+            }
+
+            if tokio::time::timeout(self.config.polling_interval(), stop_receiver.changed())
+                .await
+                .is_ok()
+            {
+                break;
+            }
+        }
+
+        tracing::info!("Stop signal received, da_dispatcher is shutting down");
+        Ok(())
+    }
+
+    /// Dispatches the blobs to the data availability layer, and saves the blob_id in the database.
+    async fn dispatch(&self) -> anyhow::Result<()> {
+        let mut conn = self.pool.connection_tagged("da_dispatcher").await?;
+        let batches = conn
+            .data_availability_dal()
+            .get_ready_for_da_dispatch_l1_batches(self.config.max_rows_to_dispatch() as usize)
+            .await?;
+        drop(conn);
+
+        for batch in batches {
+            let dispatch_latency = METRICS.blob_dispatch_latency.start();
+            let dispatch_response = retry(self.config.max_retries(), batch.l1_batch_number, || {
+                self.client
+                    .dispatch_blob(batch.l1_batch_number.0, batch.pubdata.clone())
+            })
+            .await
+            .with_context(|| {
+                format!(
+                    "failed to dispatch a blob with batch_number: {}, pubdata_len: {}",
+                    batch.l1_batch_number,
+                    batch.pubdata.len()
+                )
+            })?;
+            let dispatch_latency_duration = dispatch_latency.observe();
+
+            let sent_at =
+                NaiveDateTime::from_timestamp_millis(Utc::now().timestamp_millis()).unwrap();
+
+            let mut conn = self.pool.connection_tagged("da_dispatcher").await?;
+            conn.data_availability_dal()
+                .insert_l1_batch_da(
+                    batch.l1_batch_number,
+                    dispatch_response.blob_id.as_str(),
+                    sent_at,
+                )
+                .await?;
+            drop(conn);
+
+            METRICS
+                .last_dispatched_l1_batch
+                .set(batch.l1_batch_number.0 as usize);
+            METRICS.blob_size.observe(batch.pubdata.len());
+            tracing::info!(
+                "Dispatched a DA for batch_number: {}, pubdata_size: {}, dispatch_latency: {dispatch_latency_duration:?}",
+                batch.l1_batch_number,
+                batch.pubdata.len(),
+            );
+        }
+
+        Ok(())
+    }
+
+    /// Polls the data availability layer for inclusion data, and saves it in the database.
+    async fn poll_for_inclusion(&self) -> anyhow::Result<()> {
+        let mut conn = self.pool.connection_tagged("da_dispatcher").await?;
+        let blob_info = conn
+            .data_availability_dal()
+            .get_first_da_blob_awaiting_inclusion()
+            .await?;
+        drop(conn);
+
+        let Some(blob_info) = blob_info else {
+            return Ok(());
+        };
+
+        let inclusion_data = self
+            .client
+            .get_inclusion_data(blob_info.blob_id.as_str())
+            .await
+            .with_context(|| {
+                format!(
+                    "failed to get inclusion data for blob_id: {}, batch_number: {}",
+                    blob_info.blob_id, blob_info.l1_batch_number
+                )
+            })?;
+
+        let Some(inclusion_data) = inclusion_data else {
+            return Ok(());
+        };
+
+        let mut conn = self.pool.connection_tagged("da_dispatcher").await?;
+        conn.data_availability_dal()
+            .save_l1_batch_inclusion_data(
+                L1BatchNumber(blob_info.l1_batch_number.0),
+                inclusion_data.data.as_slice(),
+            )
+            .await?;
+        drop(conn);
+
+        let inclusion_latency = Utc::now().signed_duration_since(blob_info.sent_at);
+        if let Ok(latency) = inclusion_latency.to_std() {
+            METRICS.inclusion_latency.observe(latency);
+        }
+        METRICS
+            .last_included_l1_batch
+            .set(blob_info.l1_batch_number.0 as usize);
+
+        tracing::info!(
+            "Received an inclusion data for a batch_number: {}, inclusion_latency_seconds: {}",
+            blob_info.l1_batch_number,
+            inclusion_latency.num_seconds()
+        );
+
+        Ok(())
+    }
+}
+
+async fn retry<T, Fut, F>(
+    max_retries: u16,
+    batch_number: L1BatchNumber,
+    mut f: F,
+) -> Result<T, DAError>
+where
+    Fut: Future<Output = Result<T, DAError>>,
+    F: FnMut() -> Fut,
+{
+    let mut retries = 1;
+    let mut backoff_secs = 1;
+    loop {
+        match f().await {
+            Ok(result) => {
+                METRICS.dispatch_call_retries.observe(retries as usize);
+                return Ok(result);
+            }
+            Err(err) => {
+                if !err.is_transient() || retries > max_retries {
+                    return Err(err);
+                }
+
+                retries += 1;
+                let sleep_duration = Duration::from_secs(backoff_secs)
+                    .mul_f32(rand::thread_rng().gen_range(0.8..1.2));
+                tracing::warn!(%err, "Failed DA dispatch request {retries}/{max_retries} for batch {batch_number}, retrying in {} milliseconds.", sleep_duration.as_millis());
+                tokio::time::sleep(sleep_duration).await;
+
+                backoff_secs = (backoff_secs * 2).min(128); // cap the back-off at 128 seconds
+            }
+        }
+    }
+}
diff --git a/core/node/da_dispatcher/src/lib.rs b/core/node/da_dispatcher/src/lib.rs
new file mode 100644
index 000000000000..cb41ea1f7c25
--- /dev/null
+++ b/core/node/da_dispatcher/src/lib.rs
@@ -0,0 +1,4 @@
+pub use self::da_dispatcher::DataAvailabilityDispatcher;
+
+mod da_dispatcher;
+mod metrics;
diff --git a/core/node/da_dispatcher/src/metrics.rs b/core/node/da_dispatcher/src/metrics.rs
new file mode 100644
index 000000000000..67ac5ed68222
--- /dev/null
+++ b/core/node/da_dispatcher/src/metrics.rs
@@ -0,0 +1,33 @@
+use std::time::Duration;
+
+use vise::{Buckets, Gauge, Histogram, Metrics, Unit};
+
+/// Buckets for `blob_dispatch_latency` (from 0.1 to 120 seconds).
+const DISPATCH_LATENCIES: Buckets =
+    Buckets::values(&[0.1, 0.5, 1.0, 2.0, 5.0, 10.0, 30.0, 60.0, 120.0]);
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "server_da_dispatcher")]
+pub(super) struct DataAvailabilityDispatcherMetrics {
+    /// Latency of the dispatch of the blob.
+    #[metrics(buckets = DISPATCH_LATENCIES, unit = Unit::Seconds)]
+    pub blob_dispatch_latency: Histogram<Duration>,
+    /// The duration between the moment when the blob is dispatched and the moment when it is included.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub inclusion_latency: Histogram<Duration>,
+    /// Size of the dispatched blob.
+    /// Buckets are bytes ranging from 1 KB to 16 MB, which has to satisfy all blob size values.
+    #[metrics(buckets = Buckets::exponential(1_024.0..=16.0 * 1_024.0 * 1_024.0, 2.0), unit = Unit::Bytes)]
+    pub blob_size: Histogram<usize>,
+
+    /// Number of transactions resent by the DA dispatcher.
+    #[metrics(buckets = Buckets::linear(0.0..=10.0, 1.0))]
+    pub dispatch_call_retries: Histogram<usize>,
+    /// Last L1 batch that was dispatched to the DA layer.
+    pub last_dispatched_l1_batch: Gauge<usize>,
+    /// Last L1 batch that has its inclusion finalized by DA layer.
+    pub last_included_l1_batch: Gauge<usize>,
+}
+
+#[vise::register]
+pub(super) static METRICS: vise::Global<DataAvailabilityDispatcherMetrics> = vise::Global::new();
diff --git a/core/node/db_pruner/Cargo.toml b/core/node/db_pruner/Cargo.toml
index 2015a7e85100..d56d9fb4df55 100644
--- a/core/node/db_pruner/Cargo.toml
+++ b/core/node/db_pruner/Cargo.toml
@@ -27,5 +27,7 @@ serde_json.workspace = true
 assert_matches.workspace = true
 test-casing.workspace = true
 test-log.workspace = true
+
+zksync_node_genesis.workspace = true
 zksync_node_test_utils.workspace = true
 zksync_db_connection.workspace = true
diff --git a/core/node/db_pruner/README.md b/core/node/db_pruner/README.md
index 4ae0b848b3d1..ee1317d01e46 100644
--- a/core/node/db_pruner/README.md
+++ b/core/node/db_pruner/README.md
@@ -3,15 +3,20 @@
 Database pruner is a component that regularly removes the oldest l1 batches from the database together with
 corresponding L2 blocks, events, etc.
 
-**There are two types of objects that are not fully cleaned:**
+There are two types of objects that are not fully cleaned:
 
-**Transactions** - Transactions only have BYTEA fields cleaned as many of other components rely on transactions
-existence.
+- **Transactions** only have `BYTEA` fields cleaned as some components rely on transactions existence.
+- **Storage logs:** only storage logs that have been overwritten are removed
 
-**Storage logs** - We only remove storage logs that have been overwritten
+## Pruning workflow
 
-### Soft and Hard pruning
+_(See [node docs](../../../docs/guides/external-node/08_pruning.md) for a high-level pruning overview)_
 
-There are two 'phases' of pruning an L1 batch, soft pruning and hard pruning. Every batch that would have it's records
-removed if first soft pruned. Soft pruned batches can't safely be used. One minute (this is configurable) after soft
-pruning, hard pruning is performed, where hard means physically removing those batches from the database
+There are two phases of pruning an L1 batch, soft pruning and hard pruning. Every batch that would have its records
+removed if first _soft-pruned_. Soft-pruned batches cannot safely be used. One minute (this is configurable) after soft
+pruning, _hard pruning_ is performed, where hard means physically removing data from the database.
+
+The reasoning behind this split is to allow node components such as the API server to become aware of planned data
+pruning, and restrict access to the pruned data in advance. This ensures that data does not unexpectedly (from the
+component perspective) disappear from Postgres in a middle of an operation (like serving a Web3 request). At least in
+some case, like in VM-related Web3 methods, we cannot rely on database transactions for this purpose.
diff --git a/core/node/db_pruner/src/lib.rs b/core/node/db_pruner/src/lib.rs
index 4b7eec11ad58..4b4a53c68aa0 100644
--- a/core/node/db_pruner/src/lib.rs
+++ b/core/node/db_pruner/src/lib.rs
@@ -1,20 +1,22 @@
 //! Postgres pruning component.
 
-use std::{fmt, sync::Arc, time::Duration};
+use std::{
+    sync::Arc,
+    time::{Duration, Instant},
+};
 
 use anyhow::Context as _;
-use async_trait::async_trait;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use tokio::sync::watch;
 use zksync_dal::{pruning_dal::PruningInfo, Connection, ConnectionPool, Core, CoreDal};
 use zksync_health_check::{Health, HealthStatus, HealthUpdater, ReactiveHealthCheck};
 use zksync_types::{L1BatchNumber, L2BlockNumber};
 
 use self::{
-    metrics::{MetricPruneType, METRICS},
+    metrics::{ConditionOutcome, PruneType, METRICS},
     prune_conditions::{
         ConsistencyCheckerProcessedBatch, L1BatchExistsCondition, L1BatchOlderThanPruneCondition,
-        NextL1BatchHasMetadataCondition, NextL1BatchWasExecutedCondition,
+        NextL1BatchHasMetadataCondition, NextL1BatchWasExecutedCondition, PruneCondition,
     },
 };
 
@@ -36,7 +38,7 @@ pub struct DbPrunerConfig {
     pub minimum_l1_batch_age: Duration,
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Serialize, Deserialize)]
 struct DbPrunerHealth {
     #[serde(skip_serializing_if = "Option::is_none")]
     last_soft_pruned_l1_batch: Option<L1BatchNumber>,
@@ -59,6 +61,17 @@ impl From<PruningInfo> for DbPrunerHealth {
     }
 }
 
+/// Outcome of a single pruning iteration.
+#[derive(Debug)]
+enum PruningIterationOutcome {
+    /// Nothing to prune.
+    NoOp,
+    /// Iteration resulted in pruning.
+    Pruned,
+    /// Pruning was interrupted because of a stop signal.
+    Interrupted,
+}
+
 /// Postgres database pruning component.
 #[derive(Debug)]
 pub struct DbPruner {
@@ -68,33 +81,27 @@ pub struct DbPruner {
     prune_conditions: Vec<Arc<dyn PruneCondition>>,
 }
 
-/// Interface to be used for health checks.
-#[async_trait]
-trait PruneCondition: fmt::Debug + fmt::Display + Send + Sync + 'static {
-    async fn is_batch_prunable(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<bool>;
-}
-
 impl DbPruner {
     pub fn new(config: DbPrunerConfig, connection_pool: ConnectionPool<Core>) -> Self {
         let mut conditions: Vec<Arc<dyn PruneCondition>> = vec![
             Arc::new(L1BatchExistsCondition {
-                conn: connection_pool.clone(),
+                pool: connection_pool.clone(),
             }),
             Arc::new(NextL1BatchHasMetadataCondition {
-                conn: connection_pool.clone(),
+                pool: connection_pool.clone(),
             }),
             Arc::new(NextL1BatchWasExecutedCondition {
-                conn: connection_pool.clone(),
+                pool: connection_pool.clone(),
             }),
             Arc::new(ConsistencyCheckerProcessedBatch {
-                conn: connection_pool.clone(),
+                pool: connection_pool.clone(),
             }),
         ];
         if config.minimum_l1_batch_age > Duration::ZERO {
             // Do not add a condition if it's trivial in order to not clutter logs.
             conditions.push(Arc::new(L1BatchOlderThanPruneCondition {
                 minimum_age: config.minimum_l1_batch_age,
-                conn: connection_pool.clone(),
+                pool: connection_pool.clone(),
             }));
         }
 
@@ -124,15 +131,24 @@ impl DbPruner {
         let mut errored_conditions = vec![];
 
         for condition in &self.prune_conditions {
-            match condition.is_batch_prunable(l1_batch_number).await {
-                Ok(true) => successful_conditions.push(condition.to_string()),
-                Ok(false) => failed_conditions.push(condition.to_string()),
+            let outcome = match condition.is_batch_prunable(l1_batch_number).await {
+                Ok(true) => {
+                    successful_conditions.push(condition.to_string());
+                    ConditionOutcome::Success
+                }
+                Ok(false) => {
+                    failed_conditions.push(condition.to_string());
+                    ConditionOutcome::Fail
+                }
                 Err(error) => {
                     errored_conditions.push(condition.to_string());
                     tracing::warn!("Pruning condition '{condition}' resulted in an error: {error}");
+                    ConditionOutcome::Error
                 }
-            }
+            };
+            METRICS.observe_condition(condition.as_ref(), outcome);
         }
+
         let result = failed_conditions.is_empty() && errored_conditions.is_empty();
         if !result {
             tracing::debug!(
@@ -168,7 +184,7 @@ impl DbPruner {
     }
 
     async fn soft_prune(&self, storage: &mut Connection<'_, Core>) -> anyhow::Result<bool> {
-        let latency = METRICS.pruning_chunk_duration[&MetricPruneType::Soft].start();
+        let start = Instant::now();
         let mut transaction = storage.start_transaction().await?;
 
         let mut current_pruning_info = transaction.pruning_dal().get_pruning_info().await?;
@@ -180,7 +196,7 @@ impl DbPruner {
                 + self.config.pruned_batch_chunk_size,
         );
         if !self.is_l1_batch_prunable(next_l1_batch_to_prune).await {
-            latency.observe();
+            METRICS.pruning_chunk_duration[&PruneType::NoOp].observe(start.elapsed());
             return Ok(false);
         }
 
@@ -196,7 +212,8 @@ impl DbPruner {
 
         transaction.commit().await?;
 
-        let latency = latency.observe();
+        let latency = start.elapsed();
+        METRICS.pruning_chunk_duration[&PruneType::Soft].observe(latency);
         tracing::info!(
             "Soft pruned db l1_batches up to {next_l1_batch_to_prune} and L2 blocks up to {next_l2_block_to_prune}, operation took {latency:?}",
         );
@@ -207,8 +224,12 @@ impl DbPruner {
         Ok(true)
     }
 
-    async fn hard_prune(&self, storage: &mut Connection<'_, Core>) -> anyhow::Result<()> {
-        let latency = METRICS.pruning_chunk_duration[&MetricPruneType::Hard].start();
+    async fn hard_prune(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        stop_receiver: &mut watch::Receiver<bool>,
+    ) -> anyhow::Result<PruningIterationOutcome> {
+        let latency = METRICS.pruning_chunk_duration[&PruneType::Hard].start();
         let mut transaction = storage.start_transaction().await?;
 
         let mut current_pruning_info = transaction.pruning_dal().get_pruning_info().await?;
@@ -221,19 +242,24 @@ impl DbPruner {
                 format!("bogus pruning info {current_pruning_info:?}: trying to hard-prune data, but there is no soft-pruned L2 block")
             })?;
 
-        let stats = transaction
-            .pruning_dal()
-            .hard_prune_batches_range(last_soft_pruned_l1_batch, last_soft_pruned_l2_block)
-            .await?;
+        let mut dal = transaction.pruning_dal();
+        let stats = tokio::select! {
+            result = dal.hard_prune_batches_range(
+                last_soft_pruned_l1_batch,
+                last_soft_pruned_l2_block,
+            ) => result?,
+
+            _ = stop_receiver.changed() => {
+                // `hard_prune_batches_range()` can take a long time. It looks better to roll back it explicitly here if a node is getting shut down
+                // rather than waiting a node to force-exit after a timeout, which would interrupt the DB connection and will lead to an implicit rollback.
+                tracing::info!("Hard pruning interrupted; rolling back pruning transaction");
+                transaction.rollback().await?;
+                return Ok(PruningIterationOutcome::Interrupted);
+            }
+        };
         METRICS.observe_hard_pruning(stats);
         transaction.commit().await?;
 
-        let mut storage = self.connection_pool.connection_tagged("db_pruner").await?;
-        storage
-            .pruning_dal()
-            .run_vacuum_after_hard_pruning()
-            .await?;
-
         let latency = latency.observe();
         tracing::info!(
             "Hard pruned db l1_batches up to {last_soft_pruned_l1_batch} and L2 blocks up to {last_soft_pruned_l2_block}, \
@@ -242,10 +268,13 @@ impl DbPruner {
         current_pruning_info.last_hard_pruned_l1_batch = Some(last_soft_pruned_l1_batch);
         current_pruning_info.last_hard_pruned_l2_block = Some(last_soft_pruned_l2_block);
         self.update_health(current_pruning_info);
-        Ok(())
+        Ok(PruningIterationOutcome::Pruned)
     }
 
-    async fn run_single_iteration(&self) -> anyhow::Result<bool> {
+    async fn run_single_iteration(
+        &self,
+        stop_receiver: &mut watch::Receiver<bool>,
+    ) -> anyhow::Result<PruningIterationOutcome> {
         let mut storage = self.connection_pool.connection_tagged("db_pruner").await?;
         let current_pruning_info = storage.pruning_dal().get_pruning_info().await?;
         self.update_health(current_pruning_info);
@@ -256,15 +285,20 @@ impl DbPruner {
         {
             let pruning_done = self.soft_prune(&mut storage).await?;
             if !pruning_done {
-                return Ok(false);
+                return Ok(PruningIterationOutcome::NoOp);
             }
         }
         drop(storage); // Don't hold a connection across a timeout
 
-        tokio::time::sleep(self.config.removal_delay).await;
+        if tokio::time::timeout(self.config.removal_delay, stop_receiver.changed())
+            .await
+            .is_ok()
+        {
+            return Ok(PruningIterationOutcome::Interrupted);
+        }
+
         let mut storage = self.connection_pool.connection_tagged("db_pruner").await?;
-        self.hard_prune(&mut storage).await?;
-        Ok(true)
+        self.hard_prune(&mut storage, stop_receiver).await
     }
 
     pub async fn run(self, mut stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
@@ -283,7 +317,7 @@ impl DbPruner {
                 tracing::warn!("Error updating DB pruning metrics: {err:?}");
             }
 
-            let should_sleep = match self.run_single_iteration().await {
+            let should_sleep = match self.run_single_iteration(&mut stop_receiver).await {
                 Err(err) => {
                     // As this component is not really mission-critical, all errors are generally ignored
                     tracing::warn!(
@@ -296,7 +330,9 @@ impl DbPruner {
                     self.health_updater.update(health);
                     true
                 }
-                Ok(pruning_done) => !pruning_done,
+                Ok(PruningIterationOutcome::Interrupted) => break,
+                Ok(PruningIterationOutcome::Pruned) => false,
+                Ok(PruningIterationOutcome::NoOp) => true,
             };
 
             if should_sleep
diff --git a/core/node/db_pruner/src/metrics.rs b/core/node/db_pruner/src/metrics.rs
index 73bcefd041dd..2833bc97f9c1 100644
--- a/core/node/db_pruner/src/metrics.rs
+++ b/core/node/db_pruner/src/metrics.rs
@@ -1,11 +1,16 @@
 use std::time::Duration;
 
-use vise::{Buckets, EncodeLabelSet, EncodeLabelValue, Family, Gauge, Histogram, Metrics, Unit};
+use vise::{
+    Buckets, Counter, EncodeLabelSet, EncodeLabelValue, Family, Gauge, Histogram, Metrics, Unit,
+};
 use zksync_dal::pruning_dal::HardPruningStats;
 
+use crate::prune_conditions::PruneCondition;
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
 #[metrics(label = "prune_type", rename_all = "snake_case")]
-pub(super) enum MetricPruneType {
+pub(super) enum PruneType {
+    NoOp,
     Soft,
     Hard,
 }
@@ -15,15 +20,29 @@ pub(super) enum MetricPruneType {
 enum PrunedEntityType {
     L1Batch,
     L2Block,
-    StorageLogFromPrunedBatch,
-    StorageLogFromPastBatch,
+    StorageLog,
     Event,
     L2ToL1Log,
     CallTrace,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue)]
+#[metrics(rename_all = "snake_case")]
+pub(crate) enum ConditionOutcome {
+    Success,
+    Fail,
+    Error,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelSet)]
+struct ConditionOutcomeLabels {
+    condition: &'static str,
+    outcome: ConditionOutcome,
+}
+
 const ENTITY_COUNT_BUCKETS: Buckets = Buckets::values(&[
     1.0, 2.0, 5.0, 10.0, 20.0, 50.0, 100.0, 200.0, 500.0, 1_000.0, 2_000.0, 5_000.0, 10_000.0,
+    20_000.0, 50_000.0, 100_000.0,
 ]);
 
 #[derive(Debug, Metrics)]
@@ -31,12 +50,14 @@ const ENTITY_COUNT_BUCKETS: Buckets = Buckets::values(&[
 pub(super) struct DbPrunerMetrics {
     /// Total latency of pruning chunk of L1 batches.
     #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
-    pub pruning_chunk_duration: Family<MetricPruneType, Histogram<Duration>>,
+    pub pruning_chunk_duration: Family<PruneType, Histogram<Duration>>,
     /// Number of not-pruned L1 batches.
     pub not_pruned_l1_batches_count: Gauge<u64>,
     /// Number of entities deleted during a single hard pruning iteration, grouped by entity type.
     #[metrics(buckets = ENTITY_COUNT_BUCKETS)]
     deleted_entities: Family<PrunedEntityType, Histogram<u64>>,
+    /// Number of times a certain condition has resulted in a specific outcome (succeeded, failed, or errored).
+    condition_outcomes: Family<ConditionOutcomeLabels, Counter>,
 }
 
 impl DbPrunerMetrics {
@@ -44,31 +65,32 @@ impl DbPrunerMetrics {
         let HardPruningStats {
             deleted_l1_batches,
             deleted_l2_blocks,
-            deleted_storage_logs_from_past_batches,
-            deleted_storage_logs_from_pruned_batches,
+            deleted_storage_logs,
             deleted_events,
             deleted_call_traces,
             deleted_l2_to_l1_logs,
         } = stats;
-        let deleted_storage_logs =
-            deleted_storage_logs_from_past_batches + deleted_storage_logs_from_pruned_batches;
         tracing::info!(
             "Performed pruning of database, deleted {deleted_l1_batches} L1 batches, {deleted_l2_blocks} L2 blocks, \
-             {deleted_storage_logs} storage logs ({deleted_storage_logs_from_pruned_batches} from pruned batches + \
-             {deleted_storage_logs_from_past_batches} from past batches), \
+             {deleted_storage_logs} storage logs, \
              {deleted_events} events, {deleted_call_traces} call traces, {deleted_l2_to_l1_logs} L2-to-L1 logs"
         );
 
         self.deleted_entities[&PrunedEntityType::L1Batch].observe(deleted_l1_batches);
         self.deleted_entities[&PrunedEntityType::L2Block].observe(deleted_l2_blocks);
-        self.deleted_entities[&PrunedEntityType::StorageLogFromPastBatch]
-            .observe(deleted_storage_logs_from_past_batches);
-        self.deleted_entities[&PrunedEntityType::StorageLogFromPrunedBatch]
-            .observe(deleted_storage_logs_from_pruned_batches);
+        self.deleted_entities[&PrunedEntityType::StorageLog].observe(deleted_storage_logs);
         self.deleted_entities[&PrunedEntityType::Event].observe(deleted_events);
         self.deleted_entities[&PrunedEntityType::L2ToL1Log].observe(deleted_l2_to_l1_logs);
         self.deleted_entities[&PrunedEntityType::CallTrace].observe(deleted_call_traces);
     }
+
+    pub fn observe_condition(&self, condition: &dyn PruneCondition, outcome: ConditionOutcome) {
+        let labels = ConditionOutcomeLabels {
+            condition: condition.metric_label(),
+            outcome,
+        };
+        self.condition_outcomes[&labels].inc();
+    }
 }
 
 #[vise::register]
diff --git a/core/node/db_pruner/src/prune_conditions.rs b/core/node/db_pruner/src/prune_conditions.rs
index 477a7b556088..42f225f4a44b 100644
--- a/core/node/db_pruner/src/prune_conditions.rs
+++ b/core/node/db_pruner/src/prune_conditions.rs
@@ -5,12 +5,17 @@ use chrono::Utc;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_types::L1BatchNumber;
 
-use crate::PruneCondition;
+#[async_trait]
+pub(crate) trait PruneCondition: fmt::Debug + fmt::Display + Send + Sync + 'static {
+    fn metric_label(&self) -> &'static str;
+
+    async fn is_batch_prunable(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<bool>;
+}
 
 #[derive(Debug)]
 pub(super) struct L1BatchOlderThanPruneCondition {
     pub minimum_age: Duration,
-    pub conn: ConnectionPool<Core>,
+    pub pool: ConnectionPool<Core>,
 }
 
 impl fmt::Display for L1BatchOlderThanPruneCondition {
@@ -21,8 +26,12 @@ impl fmt::Display for L1BatchOlderThanPruneCondition {
 
 #[async_trait]
 impl PruneCondition for L1BatchOlderThanPruneCondition {
+    fn metric_label(&self) -> &'static str {
+        "l1_batch_older_than_minimum_age"
+    }
+
     async fn is_batch_prunable(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<bool> {
-        let mut storage = self.conn.connection().await?;
+        let mut storage = self.pool.connection_tagged("db_pruner").await?;
         let l1_batch_header = storage
             .blocks_dal()
             .get_l1_batch_header(l1_batch_number)
@@ -36,19 +45,23 @@ impl PruneCondition for L1BatchOlderThanPruneCondition {
 
 #[derive(Debug)]
 pub(super) struct NextL1BatchWasExecutedCondition {
-    pub conn: ConnectionPool<Core>,
+    pub pool: ConnectionPool<Core>,
 }
 
 impl fmt::Display for NextL1BatchWasExecutedCondition {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(formatter, "next L1 batch was executed")
+        formatter.write_str("next L1 batch was executed")
     }
 }
 
 #[async_trait]
 impl PruneCondition for NextL1BatchWasExecutedCondition {
+    fn metric_label(&self) -> &'static str {
+        "next_l1_batch_was_executed"
+    }
+
     async fn is_batch_prunable(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<bool> {
-        let mut storage = self.conn.connection().await?;
+        let mut storage = self.pool.connection_tagged("db_pruner").await?;
         let next_l1_batch_number = L1BatchNumber(l1_batch_number.0 + 1);
         let last_executed_batch = storage
             .blocks_dal()
@@ -62,53 +75,68 @@ impl PruneCondition for NextL1BatchWasExecutedCondition {
 
 #[derive(Debug)]
 pub(super) struct NextL1BatchHasMetadataCondition {
-    pub conn: ConnectionPool<Core>,
+    pub pool: ConnectionPool<Core>,
 }
 
 impl fmt::Display for NextL1BatchHasMetadataCondition {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(formatter, "next L1 batch has metadata")
+        formatter.write_str("next L1 batch has metadata")
     }
 }
 
 #[async_trait]
 impl PruneCondition for NextL1BatchHasMetadataCondition {
+    fn metric_label(&self) -> &'static str {
+        "next_l1_batch_has_metadata"
+    }
+
     async fn is_batch_prunable(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<bool> {
-        let mut storage = self.conn.connection().await?;
+        let mut storage = self.pool.connection_tagged("db_pruner").await?;
         let next_l1_batch_number = L1BatchNumber(l1_batch_number.0 + 1);
-        let protocol_version = storage
-            .blocks_dal()
-            .get_batch_protocol_version_id(next_l1_batch_number)
-            .await?;
-        // That old l1 batches must have been processed and those old batches are problematic
-        // as they have metadata that is not easily retrievable(misses some fields in db)
-        let old_protocol_version = protocol_version.map_or(true, |ver| ver.is_pre_1_4_1());
-        if old_protocol_version {
-            return Ok(true);
-        }
-        let l1_batch_metadata = storage
+        let Some(batch) = storage
             .blocks_dal()
-            .get_l1_batch_metadata(next_l1_batch_number)
-            .await?;
-        Ok(l1_batch_metadata.is_some())
+            .get_optional_l1_batch_metadata(next_l1_batch_number)
+            .await?
+        else {
+            return Ok(false);
+        };
+
+        Ok(if let Err(err) = &batch.metadata {
+            // Metadata may be incomplete for very old batches on full nodes.
+            let protocol_version = batch.header.protocol_version;
+            let is_old = protocol_version.map_or(true, |ver| ver.is_pre_1_4_1());
+            if is_old {
+                tracing::info!(
+                    "Error getting metadata for L1 batch #{next_l1_batch_number} \
+                    with old protocol version {protocol_version:?}: {err}"
+                );
+            }
+            is_old
+        } else {
+            true
+        })
     }
 }
 
 #[derive(Debug)]
 pub(super) struct L1BatchExistsCondition {
-    pub conn: ConnectionPool<Core>,
+    pub pool: ConnectionPool<Core>,
 }
 
 impl fmt::Display for L1BatchExistsCondition {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(formatter, "L1 batch exists")
+        formatter.write_str("L1 batch exists")
     }
 }
 
 #[async_trait]
 impl PruneCondition for L1BatchExistsCondition {
+    fn metric_label(&self) -> &'static str {
+        "l1_batch_exists"
+    }
+
     async fn is_batch_prunable(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<bool> {
-        let mut storage = self.conn.connection().await?;
+        let mut storage = self.pool.connection_tagged("db_pruner").await?;
         let l1_batch_header = storage
             .blocks_dal()
             .get_l1_batch_header(l1_batch_number)
@@ -119,19 +147,23 @@ impl PruneCondition for L1BatchExistsCondition {
 
 #[derive(Debug)]
 pub(super) struct ConsistencyCheckerProcessedBatch {
-    pub conn: ConnectionPool<Core>,
+    pub pool: ConnectionPool<Core>,
 }
 
 impl fmt::Display for ConsistencyCheckerProcessedBatch {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(formatter, "L1 batch was processed by consistency checker")
+        formatter.write_str("L1 batch was processed by consistency checker")
     }
 }
 
 #[async_trait]
 impl PruneCondition for ConsistencyCheckerProcessedBatch {
+    fn metric_label(&self) -> &'static str {
+        "l1_batch_consistency_checked"
+    }
+
     async fn is_batch_prunable(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<bool> {
-        let mut storage = self.conn.connection().await?;
+        let mut storage = self.pool.connection_tagged("db_pruner").await?;
         let last_processed_l1_batch = storage
             .blocks_dal()
             .get_consistency_checker_last_processed_l1_batch()
diff --git a/core/node/db_pruner/src/tests.rs b/core/node/db_pruner/src/tests.rs
index 5dfde041df42..d4dbe4546035 100644
--- a/core/node/db_pruner/src/tests.rs
+++ b/core/node/db_pruner/src/tests.rs
@@ -1,11 +1,20 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt};
 
 use assert_matches::assert_matches;
+use async_trait::async_trait;
 use test_log::test;
 use zksync_dal::pruning_dal::PruningInfo;
 use zksync_db_connection::connection::Connection;
 use zksync_health_check::CheckHealth;
-use zksync_types::{block::L2BlockHeader, Address, L2BlockNumber, ProtocolVersion, H256};
+use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
+use zksync_node_test_utils::{
+    create_l1_batch, create_l1_batch_metadata, create_l2_block,
+    l1_batch_metadata_to_commitment_artifacts,
+};
+use zksync_types::{
+    aggregated_operations::AggregatedActionType, block::L2BlockHeader, Address, L2BlockNumber,
+    ProtocolVersion, H256,
+};
 
 use super::*;
 
@@ -38,10 +47,14 @@ impl fmt::Display for ConditionMock {
 
 #[async_trait]
 impl PruneCondition for ConditionMock {
+    fn metric_label(&self) -> &'static str {
+        "mock"
+    }
+
     async fn is_batch_prunable(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<bool> {
         self.is_batch_prunable_responses
             .get(&l1_batch_number)
-            .cloned()
+            .copied()
             .context("error!")
     }
 }
@@ -145,7 +158,11 @@ async fn hard_pruning_ignores_conditions_checks() {
     );
     let health_check = pruner.health_check();
 
-    pruner.run_single_iteration().await.unwrap();
+    let (_stop_sender, mut stop_receiver) = watch::channel(false);
+    pruner
+        .run_single_iteration(&mut stop_receiver)
+        .await
+        .unwrap();
 
     assert_eq!(
         PruningInfo {
@@ -179,7 +196,11 @@ async fn pruner_catches_up_with_hard_pruning_up_to_soft_pruning_boundary_ignorin
         vec![], //No checks, so every batch is prunable
     );
 
-    pruner.run_single_iteration().await.unwrap();
+    let (_stop_sender, mut stop_receiver) = watch::channel(false);
+    pruner
+        .run_single_iteration(&mut stop_receiver)
+        .await
+        .unwrap();
 
     assert_eq!(
         PruningInfo {
@@ -191,7 +212,10 @@ async fn pruner_catches_up_with_hard_pruning_up_to_soft_pruning_boundary_ignorin
         conn.pruning_dal().get_pruning_info().await.unwrap()
     );
 
-    pruner.run_single_iteration().await.unwrap();
+    pruner
+        .run_single_iteration(&mut stop_receiver)
+        .await
+        .unwrap();
     assert_eq!(
         PruningInfo {
             last_soft_pruned_l1_batch: Some(L1BatchNumber(7)),
@@ -220,7 +244,11 @@ async fn unconstrained_pruner_with_fresh_database() {
         vec![], //No checks, so every batch is prunable
     );
 
-    pruner.run_single_iteration().await.unwrap();
+    let (_stop_sender, mut stop_receiver) = watch::channel(false);
+    pruner
+        .run_single_iteration(&mut stop_receiver)
+        .await
+        .unwrap();
 
     assert_eq!(
         PruningInfo {
@@ -232,7 +260,10 @@ async fn unconstrained_pruner_with_fresh_database() {
         conn.pruning_dal().get_pruning_info().await.unwrap()
     );
 
-    pruner.run_single_iteration().await.unwrap();
+    pruner
+        .run_single_iteration(&mut stop_receiver)
+        .await
+        .unwrap();
     assert_eq!(
         PruningInfo {
             last_soft_pruned_l1_batch: Some(L1BatchNumber(6)),
@@ -262,7 +293,11 @@ async fn pruning_blocked_after_first_chunk() {
         pool.clone(),
         vec![first_chunk_prunable_check],
     );
-    pruner.run_single_iteration().await.unwrap();
+    let (_stop_sender, mut stop_receiver) = watch::channel(false);
+    pruner
+        .run_single_iteration(&mut stop_receiver)
+        .await
+        .unwrap();
 
     assert_eq!(
         PruningInfo {
@@ -274,7 +309,11 @@ async fn pruning_blocked_after_first_chunk() {
         conn.pruning_dal().get_pruning_info().await.unwrap()
     );
 
-    pruner.run_single_iteration().await.unwrap();
+    let outcome = pruner
+        .run_single_iteration(&mut stop_receiver)
+        .await
+        .unwrap();
+    assert_matches!(outcome, PruningIterationOutcome::NoOp);
     // pruning shouldn't have progressed as chunk 6 cannot be pruned
     assert_eq!(
         PruningInfo {
@@ -304,7 +343,11 @@ async fn pruner_is_resistant_to_errors() {
         pool.clone(),
         vec![erroneous_condition],
     );
-    pruner.run_single_iteration().await.unwrap_err();
+    let (_stop_sender, mut stop_receiver) = watch::channel(false);
+    pruner
+        .run_single_iteration(&mut stop_receiver)
+        .await
+        .unwrap_err();
 
     let mut health_check = pruner.health_check();
     let (stop_sender, stop_receiver) = watch::channel(false);
@@ -324,3 +367,244 @@ async fn pruner_is_resistant_to_errors() {
     stop_sender.send_replace(true);
     pruner_task_handle.await.unwrap().unwrap();
 }
+
+/// Seals an L1 batch with a single L2 block.
+async fn seal_l1_batch(storage: &mut Connection<'_, Core>, number: u32) {
+    let block_header = create_l2_block(number);
+    storage
+        .blocks_dal()
+        .insert_l2_block(&block_header)
+        .await
+        .unwrap();
+
+    let header = create_l1_batch(number);
+    storage
+        .blocks_dal()
+        .insert_mock_l1_batch(&header)
+        .await
+        .unwrap();
+    storage
+        .blocks_dal()
+        .mark_l2_blocks_as_executed_in_l1_batch(L1BatchNumber(number))
+        .await
+        .unwrap();
+}
+
+async fn save_l1_batch_metadata(storage: &mut Connection<'_, Core>, number: u32) {
+    let metadata = create_l1_batch_metadata(number);
+    storage
+        .blocks_dal()
+        .save_l1_batch_tree_data(L1BatchNumber(number), &metadata.tree_data())
+        .await
+        .unwrap();
+    storage
+        .blocks_dal()
+        .save_l1_batch_commitment_artifacts(
+            L1BatchNumber(number),
+            &l1_batch_metadata_to_commitment_artifacts(&metadata),
+        )
+        .await
+        .unwrap();
+}
+
+async fn mark_l1_batch_as_executed(storage: &mut Connection<'_, Core>, number: u32) {
+    storage
+        .eth_sender_dal()
+        .insert_bogus_confirmed_eth_tx(
+            L1BatchNumber(number),
+            AggregatedActionType::Execute,
+            H256::from_low_u64_be(number.into()),
+            chrono::Utc::now(),
+        )
+        .await
+        .unwrap();
+}
+
+async fn mark_l1_batch_as_consistent(storage: &mut Connection<'_, Core>, number: u32) {
+    storage
+        .blocks_dal()
+        .set_consistency_checker_last_processed_l1_batch(L1BatchNumber(number))
+        .await
+        .unwrap();
+}
+
+async fn collect_conditions_output(
+    conditions: &[Arc<dyn PruneCondition>],
+    number: L1BatchNumber,
+) -> Vec<bool> {
+    let mut output = Vec::with_capacity(conditions.len());
+    for condition in conditions {
+        output.push(condition.is_batch_prunable(number).await.unwrap());
+    }
+    output
+}
+
+#[tokio::test]
+async fn real_conditions_work_as_expected() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    let conditions: Vec<Arc<dyn PruneCondition>> = vec![
+        Arc::new(L1BatchExistsCondition { pool: pool.clone() }),
+        Arc::new(NextL1BatchHasMetadataCondition { pool: pool.clone() }),
+        Arc::new(NextL1BatchWasExecutedCondition { pool: pool.clone() }),
+        Arc::new(ConsistencyCheckerProcessedBatch { pool: pool.clone() }),
+    ];
+
+    assert_eq!(
+        collect_conditions_output(&conditions, L1BatchNumber(1)).await,
+        [false; 4]
+    );
+
+    // Add 2 batches to the storage.
+    for number in 1..=2 {
+        seal_l1_batch(&mut storage, number).await;
+    }
+    assert_eq!(
+        collect_conditions_output(&conditions, L1BatchNumber(1)).await,
+        [true, false, false, false]
+    );
+
+    // Add metadata for both batches.
+    for number in 1..=2 {
+        save_l1_batch_metadata(&mut storage, number).await;
+    }
+    assert_eq!(
+        collect_conditions_output(&conditions, L1BatchNumber(1)).await,
+        [true, true, false, false]
+    );
+
+    // Mark both batches as executed.
+    for number in 1..=2 {
+        mark_l1_batch_as_executed(&mut storage, number).await;
+    }
+    assert_eq!(
+        collect_conditions_output(&conditions, L1BatchNumber(1)).await,
+        [true, true, true, false]
+    );
+
+    // Mark both batches as consistent.
+    for number in 1..=2 {
+        mark_l1_batch_as_consistent(&mut storage, number).await;
+    }
+    assert_eq!(
+        collect_conditions_output(&conditions, L1BatchNumber(1)).await,
+        [true, true, true, true]
+    );
+}
+
+#[tokio::test]
+async fn pruner_with_real_conditions() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    let config = DbPrunerConfig {
+        removal_delay: Duration::from_millis(10), // non-zero to not have a tight loop in `DbPruner::run()`
+        pruned_batch_chunk_size: 1,
+        minimum_l1_batch_age: Duration::ZERO,
+    };
+    let pruner = DbPruner::new(config, pool.clone());
+    let mut health_check = pruner.health_check();
+    let (stop_sender, stop_receiver) = watch::channel(false);
+    let pruner_handle = tokio::spawn(pruner.run(stop_receiver));
+
+    let batch_handles = (1_u32..=5).map(|number| {
+        let pool = pool.clone();
+        tokio::spawn(async move {
+            // Emulate producing batches with overlapping life cycle.
+            tokio::time::sleep(Duration::from_millis(u64::from(number) * 10)).await;
+
+            let mut storage = pool.connection().await.unwrap();
+            seal_l1_batch(&mut storage, number).await;
+            tokio::time::sleep(Duration::from_millis(15)).await;
+            save_l1_batch_metadata(&mut storage, number).await;
+            tokio::time::sleep(Duration::from_millis(12)).await;
+            mark_l1_batch_as_consistent(&mut storage, number).await;
+            tokio::time::sleep(Duration::from_millis(17)).await;
+            mark_l1_batch_as_executed(&mut storage, number).await;
+        })
+    });
+
+    // Wait until all batches went through their life cycle.
+    for handle in batch_handles {
+        handle.await.unwrap();
+    }
+
+    health_check
+        .wait_for(|health| {
+            if !matches!(health.status(), HealthStatus::Ready) {
+                return false;
+            }
+            let Some(details) = health.details() else {
+                return false;
+            };
+            let details: DbPrunerHealth = serde_json::from_value(details.clone()).unwrap();
+            details.last_hard_pruned_l1_batch == Some(L1BatchNumber(4))
+        })
+        .await;
+
+    stop_sender.send_replace(true);
+    pruner_handle.await.unwrap().unwrap();
+}
+
+#[tokio::test]
+async fn pruning_iteration_timely_shuts_down() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut conn = pool.connection().await.unwrap();
+    insert_l2_blocks(&mut conn, 10, 2).await;
+
+    let pruner = DbPruner::with_conditions(
+        DbPrunerConfig {
+            removal_delay: Duration::MAX, // intentionally chosen so that pruning iterations stuck
+            pruned_batch_chunk_size: 3,
+            minimum_l1_batch_age: Duration::ZERO,
+        },
+        pool.clone(),
+        vec![], //No checks, so every batch is prunable
+    );
+
+    let (stop_sender, mut stop_receiver) = watch::channel(false);
+    let pruning_handle =
+        tokio::spawn(async move { pruner.run_single_iteration(&mut stop_receiver).await });
+
+    // Give some time for the task to get stuck
+    tokio::time::sleep(Duration::from_millis(50)).await;
+    assert!(!pruning_handle.is_finished());
+
+    stop_sender.send_replace(true);
+    let outcome = pruning_handle.await.unwrap().unwrap();
+    assert_matches!(outcome, PruningIterationOutcome::Interrupted);
+}
+
+#[tokio::test]
+async fn pruner_timely_shuts_down() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut conn = pool.connection().await.unwrap();
+    insert_l2_blocks(&mut conn, 10, 2).await;
+
+    let pruner = DbPruner::with_conditions(
+        DbPrunerConfig {
+            removal_delay: Duration::MAX, // intentionally chosen so that pruning iterations stuck
+            pruned_batch_chunk_size: 3,
+            minimum_l1_batch_age: Duration::ZERO,
+        },
+        pool.clone(),
+        vec![], //No checks, so every batch is prunable
+    );
+
+    let (stop_sender, stop_receiver) = watch::channel(false);
+    let pruner_handle = tokio::spawn(pruner.run(stop_receiver));
+
+    // Give some time for pruning to get stuck
+    tokio::time::sleep(Duration::from_millis(50)).await;
+    assert!(!pruner_handle.is_finished());
+
+    stop_sender.send_replace(true);
+    pruner_handle.await.unwrap().unwrap();
+}
diff --git a/core/node/eth_sender/src/abstract_l1_interface.rs b/core/node/eth_sender/src/abstract_l1_interface.rs
new file mode 100644
index 000000000000..acc7c265186d
--- /dev/null
+++ b/core/node/eth_sender/src/abstract_l1_interface.rs
@@ -0,0 +1,250 @@
+use std::fmt;
+
+use async_trait::async_trait;
+use vise::{EncodeLabelSet, EncodeLabelValue};
+use zksync_eth_client::{
+    clients::{DynClient, L1},
+    BoundEthInterface, EnrichedClientResult, EthInterface, ExecutedTxStatus, FailureInfo, Options,
+    RawTransactionBytes, SignedCallResult,
+};
+#[cfg(test)]
+use zksync_types::web3;
+use zksync_types::{
+    aggregated_operations::AggregatedActionType,
+    eth_sender::{EthTx, EthTxBlobSidecar},
+    web3::{BlockId, BlockNumber},
+    Address, L1BlockNumber, Nonce, EIP_1559_TX_TYPE, EIP_4844_TX_TYPE, H256, U256,
+};
+
+use crate::EthSenderError;
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct OperatorNonce {
+    // Nonce on finalized block
+    pub finalized: Nonce,
+    // Nonce on latest block
+    pub latest: Nonce,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub(crate) struct L1BlockNumbers {
+    pub safe: L1BlockNumber,
+    pub finalized: L1BlockNumber,
+    pub latest: L1BlockNumber,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelSet, EncodeLabelValue)]
+#[metrics(label = "type", rename_all = "snake_case")]
+pub(crate) enum OperatorType {
+    NonBlob,
+    Blob,
+}
+
+#[async_trait]
+pub(super) trait AbstractL1Interface: 'static + Sync + Send + fmt::Debug {
+    async fn failure_reason(&self, tx_hash: H256) -> Option<FailureInfo>;
+
+    #[cfg(test)]
+    async fn get_tx(&self, tx_hash: H256) -> EnrichedClientResult<Option<web3::Transaction>>;
+
+    async fn get_tx_status(
+        &self,
+        tx_hash: H256,
+    ) -> Result<Option<ExecutedTxStatus>, EthSenderError>;
+
+    async fn send_raw_tx(&self, tx_bytes: RawTransactionBytes) -> EnrichedClientResult<H256>;
+
+    fn get_blobs_operator_account(&self) -> Option<Address>;
+
+    async fn get_operator_nonce(
+        &self,
+        block_numbers: L1BlockNumbers,
+        operator_type: OperatorType,
+    ) -> Result<Option<OperatorNonce>, EthSenderError>;
+
+    async fn sign_tx(
+        &self,
+        tx: &EthTx,
+        base_fee_per_gas: u64,
+        priority_fee_per_gas: u64,
+        blob_gas_price: Option<U256>,
+        max_aggregated_tx_gas: U256,
+    ) -> SignedCallResult;
+
+    async fn get_l1_block_numbers(&self) -> Result<L1BlockNumbers, EthSenderError>;
+
+    fn ethereum_gateway(&self) -> &dyn BoundEthInterface;
+
+    fn ethereum_gateway_blobs(&self) -> Option<&dyn BoundEthInterface>;
+}
+
+#[derive(Debug)]
+pub(super) struct RealL1Interface {
+    pub ethereum_gateway: Box<dyn BoundEthInterface>,
+    pub ethereum_gateway_blobs: Option<Box<dyn BoundEthInterface>>,
+    pub wait_confirmations: Option<u64>,
+}
+
+impl RealL1Interface {
+    pub(crate) fn query_client(&self) -> &DynClient<L1> {
+        self.ethereum_gateway().as_ref()
+    }
+}
+#[async_trait]
+impl AbstractL1Interface for RealL1Interface {
+    async fn failure_reason(&self, tx_hash: H256) -> Option<FailureInfo> {
+        self.query_client().failure_reason(tx_hash).await.expect(
+            "Tx is already failed, it's safe to fail here and apply the status on the next run",
+        )
+    }
+
+    #[cfg(test)]
+    async fn get_tx(&self, tx_hash: H256) -> EnrichedClientResult<Option<web3::Transaction>> {
+        self.query_client().get_tx(tx_hash).await
+    }
+
+    async fn get_tx_status(
+        &self,
+        tx_hash: H256,
+    ) -> Result<Option<ExecutedTxStatus>, EthSenderError> {
+        self.query_client()
+            .get_tx_status(tx_hash)
+            .await
+            .map_err(Into::into)
+    }
+
+    async fn send_raw_tx(&self, tx_bytes: RawTransactionBytes) -> EnrichedClientResult<H256> {
+        self.query_client().send_raw_tx(tx_bytes).await
+    }
+
+    fn get_blobs_operator_account(&self) -> Option<Address> {
+        self.ethereum_gateway_blobs()
+            .as_ref()
+            .map(|s| s.sender_account())
+    }
+
+    async fn get_operator_nonce(
+        &self,
+        block_numbers: L1BlockNumbers,
+        operator_type: OperatorType,
+    ) -> Result<Option<OperatorNonce>, EthSenderError> {
+        let gateway = match operator_type {
+            OperatorType::NonBlob => Some(self.ethereum_gateway()),
+            OperatorType::Blob => self.ethereum_gateway_blobs(),
+        };
+        match gateway {
+            None => Ok(None),
+            Some(gateway) => {
+                let finalized = gateway
+                    .nonce_at(block_numbers.finalized.0.into())
+                    .await?
+                    .as_u32()
+                    .into();
+
+                let latest = gateway
+                    .nonce_at(block_numbers.latest.0.into())
+                    .await?
+                    .as_u32()
+                    .into();
+                Ok(Some(OperatorNonce { finalized, latest }))
+            }
+        }
+    }
+
+    async fn sign_tx(
+        &self,
+        tx: &EthTx,
+        base_fee_per_gas: u64,
+        priority_fee_per_gas: u64,
+        blob_gas_price: Option<U256>,
+        max_aggregated_tx_gas: U256,
+    ) -> SignedCallResult {
+        // Chose the signing gateway. Use a custom one in case
+        // the operator is in 4844 mode and the operation at hand is Commit.
+        // then the optional gateway is used to send this transaction from a
+        // custom sender account.
+        let signing_gateway = if let Some(blobs_gateway) = self.ethereum_gateway_blobs() {
+            if tx.tx_type == AggregatedActionType::Commit {
+                blobs_gateway
+            } else {
+                self.ethereum_gateway()
+            }
+        } else {
+            self.ethereum_gateway()
+        };
+
+        signing_gateway
+            .sign_prepared_tx_for_addr(
+                tx.raw_tx.clone(),
+                tx.contract_address,
+                Options::with(|opt| {
+                    // TODO Calculate gas for every operation SMA-1436
+                    opt.gas = Some(max_aggregated_tx_gas);
+                    opt.max_fee_per_gas = Some(U256::from(base_fee_per_gas + priority_fee_per_gas));
+                    opt.max_priority_fee_per_gas = Some(U256::from(priority_fee_per_gas));
+                    opt.nonce = Some(tx.nonce.0.into());
+                    opt.transaction_type = if tx.blob_sidecar.is_some() {
+                        opt.max_fee_per_blob_gas = blob_gas_price;
+                        Some(EIP_4844_TX_TYPE.into())
+                    } else {
+                        Some(EIP_1559_TX_TYPE.into())
+                    };
+                    opt.blob_versioned_hashes = tx.blob_sidecar.as_ref().map(|s| match s {
+                        EthTxBlobSidecar::EthTxBlobSidecarV1(s) => s
+                            .blobs
+                            .iter()
+                            .map(|blob| H256::from_slice(&blob.versioned_hash))
+                            .collect(),
+                    });
+                }),
+            )
+            .await
+            .expect("Failed to sign transaction")
+    }
+
+    async fn get_l1_block_numbers(&self) -> Result<L1BlockNumbers, EthSenderError> {
+        let (finalized, safe) = if let Some(confirmations) = self.wait_confirmations {
+            let latest_block_number = self.query_client().block_number().await?.as_u64();
+
+            let finalized = (latest_block_number.saturating_sub(confirmations) as u32).into();
+            (finalized, finalized)
+        } else {
+            let finalized = self
+                .query_client()
+                .block(BlockId::Number(BlockNumber::Finalized))
+                .await?
+                .expect("Finalized block must be present on L1")
+                .number
+                .expect("Finalized block must contain number")
+                .as_u32()
+                .into();
+
+            let safe = self
+                .query_client()
+                .block(BlockId::Number(BlockNumber::Safe))
+                .await?
+                .expect("Safe block must be present on L1")
+                .number
+                .expect("Safe block must contain number")
+                .as_u32()
+                .into();
+            (finalized, safe)
+        };
+
+        let latest = self.query_client().block_number().await?.as_u32().into();
+
+        Ok(L1BlockNumbers {
+            finalized,
+            latest,
+            safe,
+        })
+    }
+
+    fn ethereum_gateway(&self) -> &dyn BoundEthInterface {
+        self.ethereum_gateway.as_ref()
+    }
+
+    fn ethereum_gateway_blobs(&self) -> Option<&dyn BoundEthInterface> {
+        self.ethereum_gateway_blobs.as_deref()
+    }
+}
diff --git a/core/node/eth_sender/src/aggregator.rs b/core/node/eth_sender/src/aggregator.rs
index 07d81efd2abd..de6a6982088b 100644
--- a/core/node/eth_sender/src/aggregator.rs
+++ b/core/node/eth_sender/src/aggregator.rs
@@ -1,20 +1,22 @@
 use std::sync::Arc;
 
-use zksync_config::configs::eth_sender::{ProofLoadingMode, ProofSendingMode, SenderConfig};
+use zksync_config::configs::eth_sender::{ProofSendingMode, SenderConfig};
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{Connection, Core, CoreDal};
 use zksync_l1_contract_interface::i_executor::methods::{ExecuteBatches, ProveBatches};
 use zksync_object_store::{ObjectStore, ObjectStoreError};
 use zksync_prover_interface::outputs::L1BatchProofForL1;
 use zksync_types::{
-    aggregated_operations::AggregatedActionType, commitment::L1BatchWithMetadata,
-    helpers::unix_timestamp_ms, protocol_version::L1VerifierConfig, pubdata_da::PubdataDA,
+    aggregated_operations::AggregatedActionType,
+    commitment::{L1BatchCommitmentMode, L1BatchWithMetadata},
+    helpers::unix_timestamp_ms,
+    protocol_version::{L1VerifierConfig, ProtocolSemanticVersion},
+    pubdata_da::PubdataDA,
     L1BatchNumber, ProtocolVersionId,
 };
 
 use super::{
     aggregated_operations::AggregatedOperation,
-    l1_batch_commit_data_generator::L1BatchCommitDataGenerator,
     publish_criterion::{
         DataSizeCriterion, GasCriterion, L1BatchPublishCriterion, NumberCriterion,
         TimestampDeadlineCriterion,
@@ -35,6 +37,7 @@ pub struct Aggregator {
     /// transactions.
     operate_4844_mode: bool,
     pubdata_da: PubdataDA,
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 impl Aggregator {
@@ -42,7 +45,7 @@ impl Aggregator {
         config: SenderConfig,
         blob_store: Arc<dyn ObjectStore>,
         operate_4844_mode: bool,
-        l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
+        commitment_mode: L1BatchCommitmentMode,
     ) -> Self {
         let pubdata_da = config.pubdata_sending_mode.into();
 
@@ -60,7 +63,7 @@ impl Aggregator {
                     op: AggregatedActionType::Commit,
                     data_limit: config.max_eth_tx_data_size,
                     pubdata_da,
-                    l1_batch_commit_data_generator,
+                    commitment_mode,
                 }),
                 Box::from(TimestampDeadlineCriterion {
                     op: AggregatedActionType::Commit,
@@ -105,6 +108,7 @@ impl Aggregator {
             blob_store,
             operate_4844_mode,
             pubdata_da,
+            commitment_mode,
         }
     }
 
@@ -212,6 +216,7 @@ impl Aggregator {
                     base_system_contracts_hashes.bootloader,
                     base_system_contracts_hashes.default_aa,
                     protocol_version_id,
+                    self.commitment_mode != L1BatchCommitmentMode::Rollup,
                 )
                 .await
                 .unwrap()
@@ -288,7 +293,6 @@ impl Aggregator {
     async fn load_real_proof_operation(
         storage: &mut Connection<'_, Core>,
         l1_verifier_config: L1VerifierConfig,
-        proof_loading_mode: &ProofLoadingMode,
         blob_store: &dyn ObjectStore,
         is_4844_mode: bool,
     ) -> Option<ProveBatches> {
@@ -317,35 +321,46 @@ impl Aggregator {
             return None;
         }
 
-        if let Some(version_id) = storage
+        let minor_version = storage
             .blocks_dal()
             .get_batch_protocol_version_id(batch_to_prove)
             .await
             .unwrap()
-        {
-            let verifier_config_for_next_batch = storage
-                .protocol_versions_dal()
-                .l1_verifier_config_for_version(version_id)
-                .await
-                .unwrap();
-            if verifier_config_for_next_batch != l1_verifier_config {
-                return None;
-            }
-        }
-        let proofs = match proof_loading_mode {
-            ProofLoadingMode::OldProofFromDb => {
-                unreachable!("OldProofFromDb is not supported anymore")
-            }
-            ProofLoadingMode::FriProofFromGcs => {
-                load_wrapped_fri_proofs_for_range(batch_to_prove, batch_to_prove, blob_store).await
-            }
+            .unwrap();
+
+        // `l1_verifier_config.recursion_scheduler_level_vk_hash` is a VK hash that L1 uses.
+        // We may have multiple versions with different verification keys, so we check only for proofs that use
+        // keys that correspond to one on L1.
+        let allowed_patch_versions = storage
+            .protocol_versions_dal()
+            .get_patch_versions_for_vk(
+                minor_version,
+                l1_verifier_config.recursion_scheduler_level_vk_hash,
+            )
+            .await
+            .unwrap();
+        if allowed_patch_versions.is_empty() {
+            tracing::warn!(
+                "No patch version corresponds to the verification key on L1: {:?}",
+                l1_verifier_config.recursion_scheduler_level_vk_hash
+            );
+            return None;
         };
-        if proofs.is_empty() {
+
+        let allowed_versions: Vec<_> = allowed_patch_versions
+            .into_iter()
+            .map(|patch| ProtocolSemanticVersion {
+                minor: minor_version,
+                patch,
+            })
+            .collect();
+
+        let proof =
+            load_wrapped_fri_proofs_for_range(batch_to_prove, blob_store, &allowed_versions).await;
+        let Some(proof) = proof else {
             // The proof for the next L1 batch is not generated yet
             return None;
-        }
-
-        assert_eq!(proofs.len(), 1);
+        };
 
         let previous_proven_batch_metadata = storage
             .blocks_dal()
@@ -373,7 +388,7 @@ impl Aggregator {
         Some(ProveBatches {
             prev_l1_batch: previous_proven_batch_metadata,
             l1_batches: vec![metadata_for_batch_being_proved],
-            proofs,
+            proofs: vec![proof],
             should_verify: true,
         })
     }
@@ -419,7 +434,6 @@ impl Aggregator {
                 Self::load_real_proof_operation(
                     storage,
                     l1_verifier_config,
-                    &self.config.proof_loading_mode,
                     &*self.blob_store,
                     self.operate_4844_mode,
                 )
@@ -442,7 +456,6 @@ impl Aggregator {
                 if let Some(op) = Self::load_real_proof_operation(
                     storage,
                     l1_verifier_config,
-                    &self.config.proof_loading_mode,
                     &*self.blob_store,
                     self.operate_4844_mode,
                 )
@@ -469,6 +482,10 @@ impl Aggregator {
     pub fn pubdata_da(&self) -> PubdataDA {
         self.pubdata_da
     }
+
+    pub fn mode(&self) -> L1BatchCommitmentMode {
+        self.commitment_mode
+    }
 }
 
 async fn extract_ready_subrange(
@@ -497,15 +514,13 @@ async fn extract_ready_subrange(
 }
 
 pub async fn load_wrapped_fri_proofs_for_range(
-    from: L1BatchNumber,
-    to: L1BatchNumber,
+    l1_batch_number: L1BatchNumber,
     blob_store: &dyn ObjectStore,
-) -> Vec<L1BatchProofForL1> {
-    let mut proofs = Vec::new();
-    for l1_batch_number in from.0..=to.0 {
-        let l1_batch_number = L1BatchNumber(l1_batch_number);
-        match blob_store.get(l1_batch_number).await {
-            Ok(proof) => proofs.push(proof),
+    allowed_versions: &[ProtocolSemanticVersion],
+) -> Option<L1BatchProofForL1> {
+    for version in allowed_versions {
+        match blob_store.get((l1_batch_number, *version)).await {
+            Ok(proof) => return Some(proof),
             Err(ObjectStoreError::KeyNotFound(_)) => (), // do nothing, proof is not ready yet
             Err(err) => panic!(
                 "Failed to load proof for batch {}: {}",
@@ -513,5 +528,23 @@ pub async fn load_wrapped_fri_proofs_for_range(
             ),
         }
     }
-    proofs
+
+    // We also check file with deprecated name if patch 0 is allowed.
+    // TODO: remove in the next release.
+    let is_patch_0_present = allowed_versions.iter().any(|v| v.patch.0 == 0);
+    if is_patch_0_present {
+        match blob_store
+            .get_by_encoded_key(format!("l1_batch_proof_{l1_batch_number}.bin"))
+            .await
+        {
+            Ok(proof) => return Some(proof),
+            Err(ObjectStoreError::KeyNotFound(_)) => (), // do nothing, proof is not ready yet
+            Err(err) => panic!(
+                "Failed to load proof for batch {}: {}",
+                l1_batch_number.0, err
+            ),
+        }
+    }
+
+    None
 }
diff --git a/core/node/eth_sender/src/error.rs b/core/node/eth_sender/src/error.rs
index 206bbf2d583a..ed4fdaaec25a 100644
--- a/core/node/eth_sender/src/error.rs
+++ b/core/node/eth_sender/src/error.rs
@@ -1,9 +1,21 @@
+use zksync_eth_client::{ContractCallError, EnrichedClientError};
 use zksync_types::web3::contract;
 
 #[derive(Debug, thiserror::Error)]
-pub enum ETHSenderError {
-    #[error("Ethereum gateway Error {0}")]
-    EthereumGateWayError(#[from] zksync_eth_client::Error),
-    #[error("Token parsing Error: {0}")]
-    ParseError(#[from] contract::Error),
+pub enum EthSenderError {
+    #[error("Ethereum gateway error: {0}")]
+    EthereumGateway(#[from] EnrichedClientError),
+    #[error("Contract call error: {0}")]
+    ContractCall(#[from] ContractCallError),
+    #[error("Token parsing error: {0}")]
+    Parse(#[from] contract::Error),
+}
+
+impl EthSenderError {
+    pub fn is_transient(&self) -> bool {
+        match self {
+            EthSenderError::EthereumGateway(err) => err.is_transient(),
+            _ => false,
+        }
+    }
 }
diff --git a/core/node/eth_sender/src/eth_fees_oracle.rs b/core/node/eth_sender/src/eth_fees_oracle.rs
new file mode 100644
index 000000000000..ba106d1d6b92
--- /dev/null
+++ b/core/node/eth_sender/src/eth_fees_oracle.rs
@@ -0,0 +1,149 @@
+use std::{
+    cmp::{max, min},
+    fmt,
+    sync::Arc,
+};
+
+use zksync_eth_client::{ClientError, EnrichedClientError};
+use zksync_node_fee_model::l1_gas_price::L1TxParamsProvider;
+use zksync_types::eth_sender::TxHistory;
+
+use crate::EthSenderError;
+
+#[derive(Debug)]
+pub(crate) struct EthFees {
+    pub(crate) base_fee_per_gas: u64,
+    pub(crate) priority_fee_per_gas: u64,
+    pub(crate) blob_base_fee_per_gas: Option<u64>,
+}
+
+pub(crate) trait EthFeesOracle: 'static + Sync + Send + fmt::Debug {
+    fn calculate_fees(
+        &self,
+        previous_sent_tx: &Option<TxHistory>,
+        has_blob_sidecar: bool,
+        time_in_mempool: u32,
+    ) -> Result<EthFees, EthSenderError>;
+}
+
+#[derive(Debug)]
+pub(crate) struct GasAdjusterFeesOracle {
+    pub gas_adjuster: Arc<dyn L1TxParamsProvider>,
+    pub max_acceptable_priority_fee_in_gwei: u64,
+}
+
+impl GasAdjusterFeesOracle {
+    fn calculate_fees_with_blob_sidecar(
+        &self,
+        previous_sent_tx: &Option<TxHistory>,
+    ) -> Result<EthFees, EthSenderError> {
+        let base_fee_per_gas = self.gas_adjuster.get_blob_tx_base_fee();
+        let priority_fee_per_gas = self.gas_adjuster.get_blob_tx_priority_fee();
+        let blob_base_fee_per_gas = Some(self.gas_adjuster.get_blob_tx_blob_base_fee());
+
+        if let Some(previous_sent_tx) = previous_sent_tx {
+            // for blob transactions on re-sending need to double all gas prices
+            return Ok(EthFees {
+                base_fee_per_gas: max(previous_sent_tx.base_fee_per_gas * 2, base_fee_per_gas),
+                priority_fee_per_gas: max(
+                    previous_sent_tx.priority_fee_per_gas * 2,
+                    priority_fee_per_gas,
+                ),
+                blob_base_fee_per_gas: max(
+                    previous_sent_tx.blob_base_fee_per_gas.map(|v| v * 2),
+                    blob_base_fee_per_gas,
+                ),
+            });
+        }
+        Ok(EthFees {
+            base_fee_per_gas,
+            priority_fee_per_gas,
+            blob_base_fee_per_gas,
+        })
+    }
+
+    fn calculate_fees_no_blob_sidecar(
+        &self,
+        previous_sent_tx: &Option<TxHistory>,
+        time_in_mempool: u32,
+    ) -> Result<EthFees, EthSenderError> {
+        let base_fee_per_gas = self.gas_adjuster.get_base_fee(time_in_mempool);
+        if let Some(previous_sent_tx) = previous_sent_tx {
+            self.verify_base_fee_not_too_low_on_resend(
+                previous_sent_tx.id,
+                previous_sent_tx.base_fee_per_gas,
+                base_fee_per_gas,
+            )?;
+        }
+
+        let mut priority_fee_per_gas = self.gas_adjuster.get_priority_fee();
+
+        if let Some(previous_sent_tx) = previous_sent_tx {
+            // Increase `priority_fee_per_gas` by at least 20% to prevent "replacement transaction under-priced" error.
+            priority_fee_per_gas = max(
+                priority_fee_per_gas,
+                (previous_sent_tx.priority_fee_per_gas * 6) / 5 + 1,
+            );
+        }
+
+        // Extra check to prevent sending transaction will extremely high priority fee.
+        if priority_fee_per_gas > self.max_acceptable_priority_fee_in_gwei {
+            panic!(
+                "Extremely high value of priority_fee_per_gas is suggested: {}, while max acceptable is {}",
+                priority_fee_per_gas,
+                self.max_acceptable_priority_fee_in_gwei
+            );
+        }
+
+        Ok(EthFees {
+            base_fee_per_gas,
+            blob_base_fee_per_gas: None,
+            priority_fee_per_gas,
+        })
+    }
+
+    fn verify_base_fee_not_too_low_on_resend(
+        &self,
+        tx_id: u32,
+        previous_base_fee: u64,
+        base_fee_to_use: u64,
+    ) -> Result<(), EthSenderError> {
+        let next_block_minimal_base_fee = self.gas_adjuster.get_next_block_minimal_base_fee();
+        if base_fee_to_use <= min(next_block_minimal_base_fee, previous_base_fee) {
+            // If the base fee is lower than the previous used one
+            // or is lower than the minimal possible value for the next block, sending is skipped.
+            tracing::info!(
+                "Base fee too low for resend detected for tx {}, \
+                 suggested base_fee_per_gas {:?}, \
+                 previous_base_fee {:?}, \
+                 next_block_minimal_base_fee {:?}",
+                tx_id,
+                base_fee_to_use,
+                previous_base_fee,
+                next_block_minimal_base_fee
+            );
+            let err = ClientError::Custom("base_fee_per_gas is too low".into());
+            let err = EnrichedClientError::new(err, "increase_priority_fee")
+                .with_arg("base_fee_to_use", &base_fee_to_use)
+                .with_arg("previous_base_fee", &previous_base_fee)
+                .with_arg("next_block_minimal_base_fee", &next_block_minimal_base_fee);
+            return Err(err.into());
+        }
+        Ok(())
+    }
+}
+
+impl EthFeesOracle for GasAdjusterFeesOracle {
+    fn calculate_fees(
+        &self,
+        previous_sent_tx: &Option<TxHistory>,
+        has_blob_sidecar: bool,
+        time_in_mempool: u32,
+    ) -> Result<EthFees, EthSenderError> {
+        if has_blob_sidecar {
+            self.calculate_fees_with_blob_sidecar(previous_sent_tx)
+        } else {
+            self.calculate_fees_no_blob_sidecar(previous_sent_tx, time_in_mempool)
+        }
+    }
+}
diff --git a/core/node/eth_sender/src/eth_tx_aggregator.rs b/core/node/eth_sender/src/eth_tx_aggregator.rs
index 59e40d7f26d0..ee5806c72f54 100644
--- a/core/node/eth_sender/src/eth_tx_aggregator.rs
+++ b/core/node/eth_sender/src/eth_tx_aggregator.rs
@@ -1,12 +1,13 @@
-use std::{convert::TryInto, sync::Arc};
-
 use tokio::sync::watch;
 use zksync_config::configs::eth_sender::SenderConfig;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
-use zksync_eth_client::{BoundEthInterface, CallFunctionArgs};
+use zksync_eth_client::{BoundEthInterface, CallFunctionArgs, EthInterface};
 use zksync_l1_contract_interface::{
-    i_executor::commit::kzg::{KzgInfo, ZK_SYNC_BYTES_PER_BLOB},
+    i_executor::{
+        commit::kzg::{KzgInfo, ZK_SYNC_BYTES_PER_BLOB},
+        methods::CommitBatches,
+    },
     multicall3::{Multicall3Call, Multicall3Result},
     Tokenizable, Tokenize,
 };
@@ -17,7 +18,7 @@ use zksync_types::{
     eth_sender::{EthTx, EthTxBlobSidecar, EthTxBlobSidecarV1, SidecarBlobV1},
     ethabi::{Function, Token},
     l2_to_l1_log::UserL2ToL1Log,
-    protocol_version::{L1VerifierConfig, VerifierParams},
+    protocol_version::{L1VerifierConfig, VerifierParams, PACKED_SEMVER_MINOR_MASK},
     pubdata_da::PubdataDA,
     web3::{contract::Error as Web3ContractError, BlockNumber},
     Address, L2ChainId, ProtocolVersionId, H256, U256,
@@ -25,11 +26,10 @@ use zksync_types::{
 
 use super::aggregated_operations::AggregatedOperation;
 use crate::{
-    l1_batch_commit_data_generator::L1BatchCommitDataGenerator,
     metrics::{PubdataKind, METRICS},
     utils::agg_l1_batch_base_cost,
     zksync_functions::ZkSyncFunctions,
-    Aggregator, ETHSenderError,
+    Aggregator, EthSenderError,
 };
 
 /// Data queried from L1 using multicall contract.
@@ -62,7 +62,6 @@ pub struct EthTxAggregator {
     /// address.
     custom_commit_sender_addr: Option<Address>,
     pool: ConnectionPool<Core>,
-    l1_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
 }
 
 struct TxData {
@@ -82,7 +81,6 @@ impl EthTxAggregator {
         state_transition_chain_contract: Address,
         rollup_chain_id: L2ChainId,
         custom_commit_sender_addr: Option<Address>,
-        l1_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
     ) -> Self {
         let eth_client = eth_client.for_component("eth_tx_aggregator");
         let functions = ZkSyncFunctions::default();
@@ -112,7 +110,6 @@ impl EthTxAggregator {
             rollup_chain_id,
             custom_commit_sender_addr,
             pool,
-            l1_commit_data_generator,
         }
     }
 
@@ -137,7 +134,7 @@ impl EthTxAggregator {
         Ok(())
     }
 
-    pub(super) async fn get_multicall_data(&mut self) -> Result<MulticallData, ETHSenderError> {
+    pub(super) async fn get_multicall_data(&mut self) -> Result<MulticallData, EthSenderError> {
         let calldata = self.generate_calldata_for_multicall();
         let args = CallFunctionArgs::new(&self.functions.aggregate3.name, calldata).for_contract(
             self.l1_multicall3_address,
@@ -224,14 +221,11 @@ impl EthTxAggregator {
     pub(super) fn parse_multicall_data(
         &self,
         token: Token,
-    ) -> Result<MulticallData, ETHSenderError> {
+    ) -> Result<MulticallData, EthSenderError> {
         let parse_error = |tokens: &[Token]| {
-            Err(ETHSenderError::ParseError(
-                Web3ContractError::InvalidOutputType(format!(
-                    "Failed to parse multicall token: {:?}",
-                    tokens
-                )),
-            ))
+            Err(EthSenderError::Parse(Web3ContractError::InvalidOutputType(
+                format!("Failed to parse multicall token: {:?}", tokens),
+            )))
         };
 
         if let Token::Array(call_results) = token {
@@ -245,24 +239,24 @@ impl EthTxAggregator {
                 Multicall3Result::from_token(call_results_iterator.next().unwrap())?.return_data;
 
             if multicall3_bootloader.len() != 32 {
-                return Err(ETHSenderError::ParseError(
-                    Web3ContractError::InvalidOutputType(format!(
+                return Err(EthSenderError::Parse(Web3ContractError::InvalidOutputType(
+                    format!(
                         "multicall3 bootloader hash data is not of the len of 32: {:?}",
                         multicall3_bootloader
-                    )),
-                ));
+                    ),
+                )));
             }
             let bootloader = H256::from_slice(&multicall3_bootloader);
 
             let multicall3_default_aa =
                 Multicall3Result::from_token(call_results_iterator.next().unwrap())?.return_data;
             if multicall3_default_aa.len() != 32 {
-                return Err(ETHSenderError::ParseError(
-                    Web3ContractError::InvalidOutputType(format!(
+                return Err(EthSenderError::Parse(Web3ContractError::InvalidOutputType(
+                    format!(
                         "multicall3 default aa hash data is not of the len of 32: {:?}",
                         multicall3_default_aa
-                    )),
-                ));
+                    ),
+                )));
             }
             let default_aa = H256::from_slice(&multicall3_default_aa);
             let base_system_contracts_hashes = BaseSystemContractsHashes {
@@ -273,12 +267,12 @@ impl EthTxAggregator {
             let multicall3_verifier_params =
                 Multicall3Result::from_token(call_results_iterator.next().unwrap())?.return_data;
             if multicall3_verifier_params.len() != 96 {
-                return Err(ETHSenderError::ParseError(
-                    Web3ContractError::InvalidOutputType(format!(
+                return Err(EthSenderError::Parse(Web3ContractError::InvalidOutputType(
+                    format!(
                         "multicall3 verifier params data is not of the len of 96: {:?}",
                         multicall3_default_aa
-                    )),
-                ));
+                    ),
+                )));
             }
             let recursion_node_level_vk_hash = H256::from_slice(&multicall3_verifier_params[..32]);
             let recursion_leaf_level_vk_hash =
@@ -294,28 +288,34 @@ impl EthTxAggregator {
             let multicall3_verifier_address =
                 Multicall3Result::from_token(call_results_iterator.next().unwrap())?.return_data;
             if multicall3_verifier_address.len() != 32 {
-                return Err(ETHSenderError::ParseError(
-                    Web3ContractError::InvalidOutputType(format!(
+                return Err(EthSenderError::Parse(Web3ContractError::InvalidOutputType(
+                    format!(
                         "multicall3 verifier address data is not of the len of 32: {:?}",
                         multicall3_verifier_address
-                    )),
-                ));
+                    ),
+                )));
             }
             let verifier_address = Address::from_slice(&multicall3_verifier_address[12..]);
 
             let multicall3_protocol_version =
                 Multicall3Result::from_token(call_results_iterator.next().unwrap())?.return_data;
             if multicall3_protocol_version.len() != 32 {
-                return Err(ETHSenderError::ParseError(
-                    Web3ContractError::InvalidOutputType(format!(
+                return Err(EthSenderError::Parse(Web3ContractError::InvalidOutputType(
+                    format!(
                         "multicall3 protocol version data is not of the len of 32: {:?}",
                         multicall3_protocol_version
-                    )),
-                ));
+                    ),
+                )));
             }
-            let protocol_version_id = U256::from_big_endian(&multicall3_protocol_version)
-                .try_into()
-                .unwrap();
+
+            let protocol_version = U256::from_big_endian(&multicall3_protocol_version);
+            // In case the protocol version is smaller than `PACKED_SEMVER_MINOR_MASK`, it will mean that it is
+            // equal to the `protocol_version_id` value, since it the interface from before the semver was supported.
+            let protocol_version_id = if protocol_version < U256::from(PACKED_SEMVER_MINOR_MASK) {
+                ProtocolVersionId::try_from(protocol_version.as_u32() as u16).unwrap()
+            } else {
+                ProtocolVersionId::try_from_packed_semver(protocol_version).unwrap()
+            };
 
             return Ok(MulticallData {
                 base_system_contracts_hashes,
@@ -331,7 +331,7 @@ impl EthTxAggregator {
     async fn get_recursion_scheduler_level_vk_hash(
         &mut self,
         verifier_address: Address,
-    ) -> Result<H256, ETHSenderError> {
+    ) -> Result<H256, EthSenderError> {
         let get_vk_hash = &self.functions.verification_key_hash;
         let vk_hash: H256 = CallFunctionArgs::new(&get_vk_hash.name, ())
             .for_contract(verifier_address, &self.functions.verifier_contract)
@@ -344,7 +344,7 @@ impl EthTxAggregator {
     async fn loop_iteration(
         &mut self,
         storage: &mut Connection<'_, Core>,
-    ) -> Result<(), ETHSenderError> {
+    ) -> Result<(), EthSenderError> {
         let MulticallData {
             base_system_contracts_hashes,
             verifier_params,
@@ -380,14 +380,14 @@ impl EthTxAggregator {
             let tx = self
                 .save_eth_tx(storage, &agg_op, contracts_are_pre_shared_bridge)
                 .await?;
-            Self::report_eth_tx_saving(storage, agg_op, &tx).await;
+            Self::report_eth_tx_saving(storage, &agg_op, &tx).await;
         }
         Ok(())
     }
 
     async fn report_eth_tx_saving(
         storage: &mut Connection<'_, Core>,
-        aggregated_op: AggregatedOperation,
+        aggregated_op: &AggregatedOperation,
         tx: &EthTx,
     ) {
         let l1_batch_number_range = aggregated_op.l1_batch_range();
@@ -397,7 +397,7 @@ impl EthTxAggregator {
             aggregated_op.get_action_caption()
         );
 
-        if let AggregatedOperation::Commit(_, l1_batches, _) = &aggregated_op {
+        if let AggregatedOperation::Commit(_, l1_batches, _) = aggregated_op {
             for batch in l1_batches {
                 METRICS.pubdata_size[&PubdataKind::StateDiffs]
                     .observe(batch.metadata.state_diffs_compressed.len());
@@ -432,13 +432,16 @@ impl EthTxAggregator {
 
         let mut args = vec![Token::Uint(self.rollup_chain_id.as_u64().into())];
 
-        let (calldata, sidecar) = match op.clone() {
+        let (calldata, sidecar) = match op {
             AggregatedOperation::Commit(last_committed_l1_batch, l1_batches, pubdata_da) => {
-                let commit_data_base = self.l1_commit_data_generator.l1_commit_batches(
-                    &last_committed_l1_batch,
-                    &l1_batches,
-                    &pubdata_da,
-                );
+                let commit_batches = CommitBatches {
+                    last_committed_l1_batch,
+                    l1_batches,
+                    pubdata_da: *pubdata_da,
+                    mode: self.aggregator.mode(),
+                };
+                let commit_data_base = commit_batches.into_tokens();
+
                 let (encoding_fn, commit_data) = if contracts_are_pre_shared_bridge {
                     (&self.functions.pre_shared_bridge_commit, commit_data_base)
                 } else {
@@ -540,7 +543,7 @@ impl EthTxAggregator {
         storage: &mut Connection<'_, Core>,
         aggregated_op: &AggregatedOperation,
         contracts_are_pre_shared_bridge: bool,
-    ) -> Result<EthTx, ETHSenderError> {
+    ) -> Result<EthTx, EthSenderError> {
         let mut transaction = storage.start_transaction().await.unwrap();
         let op_type = aggregated_op.get_action_type();
         // We may be using a custom sender for commit transactions, so use this
@@ -589,7 +592,7 @@ impl EthTxAggregator {
         &self,
         storage: &mut Connection<'_, Core>,
         from_addr: Option<Address>,
-    ) -> Result<u64, ETHSenderError> {
+    ) -> Result<u64, EthSenderError> {
         let db_nonce = storage
             .eth_sender_dal()
             .get_next_nonce(from_addr)
diff --git a/core/node/eth_sender/src/eth_tx_manager.rs b/core/node/eth_sender/src/eth_tx_manager.rs
index 5570d3bd6fa9..7e69a23c16ff 100644
--- a/core/node/eth_sender/src/eth_tx_manager.rs
+++ b/core/node/eth_sender/src/eth_tx_manager.rs
@@ -5,42 +5,21 @@ use tokio::sync::watch;
 use zksync_config::configs::eth_sender::SenderConfig;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
 use zksync_eth_client::{
-    encode_blob_tx_with_sidecar, BoundEthInterface, ClientError, Error, EthInterface,
-    ExecutedTxStatus, Options, RawTransactionBytes, SignedCallResult,
+    encode_blob_tx_with_sidecar, BoundEthInterface, ExecutedTxStatus, RawTransactionBytes,
 };
 use zksync_node_fee_model::l1_gas_price::L1TxParamsProvider;
 use zksync_shared_metrics::BlockL1Stage;
-use zksync_types::{
-    aggregated_operations::AggregatedActionType,
-    eth_sender::{EthTx, EthTxBlobSidecar},
-    web3::{BlockId, BlockNumber},
-    Address, L1BlockNumber, Nonce, EIP_1559_TX_TYPE, EIP_4844_TX_TYPE, H256, U256,
-};
+use zksync_types::{eth_sender::EthTx, Address, L1BlockNumber, H256, U256};
 use zksync_utils::time::seconds_since_epoch;
 
-use super::{metrics::METRICS, ETHSenderError};
-
-#[derive(Debug)]
-struct EthFee {
-    base_fee_per_gas: u64,
-    priority_fee_per_gas: u64,
-    blob_base_fee_per_gas: Option<u64>,
-}
-
-#[derive(Debug, Clone, Copy)]
-struct OperatorNonce {
-    // Nonce on finalized block
-    finalized: Nonce,
-    // Nonce on latest block
-    latest: Nonce,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub(super) struct L1BlockNumbers {
-    pub safe: L1BlockNumber,
-    pub finalized: L1BlockNumber,
-    pub latest: L1BlockNumber,
-}
+use super::{metrics::METRICS, EthSenderError};
+use crate::{
+    abstract_l1_interface::{
+        AbstractL1Interface, L1BlockNumbers, OperatorNonce, OperatorType, RealL1Interface,
+    },
+    eth_fees_oracle::{EthFees, EthFeesOracle, GasAdjusterFeesOracle},
+    metrics::TransactionType,
+};
 
 /// The component is responsible for managing sending eth_txs attempts:
 /// Based on eth_tx queue the component generates new attempt with the minimum possible fee,
@@ -49,13 +28,9 @@ pub(super) struct L1BlockNumbers {
 /// with higher gas price
 #[derive(Debug)]
 pub struct EthTxManager {
-    /// A gateway through which the operator normally sends all its transactions.
-    ethereum_gateway: Box<dyn BoundEthInterface>,
-    /// If the operator is in 4844 mode this is sent to `Some` and used to send
-    /// commit transactions.
-    ethereum_gateway_blobs: Option<Box<dyn BoundEthInterface>>,
+    l1_interface: Box<dyn AbstractL1Interface>,
     config: SenderConfig,
-    gas_adjuster: Arc<dyn L1TxParamsProvider>,
+    fees_oracle: Box<dyn EthFeesOracle>,
     pool: ConnectionPool<Core>,
 }
 
@@ -67,35 +42,35 @@ impl EthTxManager {
         ethereum_gateway: Box<dyn BoundEthInterface>,
         ethereum_gateway_blobs: Option<Box<dyn BoundEthInterface>>,
     ) -> Self {
+        let ethereum_gateway = ethereum_gateway.for_component("eth_tx_manager");
+        let ethereum_gateway_blobs =
+            ethereum_gateway_blobs.map(|eth| eth.for_component("eth_tx_manager"));
+        let fees_oracle = GasAdjusterFeesOracle {
+            gas_adjuster,
+            max_acceptable_priority_fee_in_gwei: config.max_acceptable_priority_fee_in_gwei,
+        };
         Self {
-            ethereum_gateway: ethereum_gateway.for_component("eth_tx_manager"),
-            ethereum_gateway_blobs: ethereum_gateway_blobs
-                .map(|eth| eth.for_component("eth_tx_manager")),
+            l1_interface: Box::new(RealL1Interface {
+                ethereum_gateway,
+                ethereum_gateway_blobs,
+                wait_confirmations: config.wait_confirmations,
+            }),
             config,
-            gas_adjuster,
+            fees_oracle: Box::new(fees_oracle),
             pool,
         }
     }
 
-    fn query_client(&self) -> &dyn EthInterface {
-        (*self.ethereum_gateway).as_ref()
-    }
-
-    async fn get_tx_status(
-        &self,
-        tx_hash: H256,
-    ) -> Result<Option<ExecutedTxStatus>, ETHSenderError> {
-        self.query_client()
-            .get_tx_status(tx_hash)
-            .await
-            .map_err(Into::into)
+    #[cfg(test)]
+    pub(crate) fn l1_interface(&self) -> &dyn AbstractL1Interface {
+        self.l1_interface.as_ref()
     }
 
     async fn check_all_sending_attempts(
         &self,
         storage: &mut Connection<'_, Core>,
         op: &EthTx,
-    ) -> Option<ExecutedTxStatus> {
+    ) -> Result<Option<ExecutedTxStatus>, EthSenderError> {
         // Checking history items, starting from most recently sent.
         for history_item in storage
             .eth_sender_dal()
@@ -106,150 +81,84 @@ impl EthTxManager {
             // `status` is a Result here and we don't unwrap it with `?`
             // because if we do and get an `Err`, we won't finish the for loop,
             // which means we might miss the transaction that actually succeeded.
-            match self.get_tx_status(history_item.tx_hash).await {
-                Ok(Some(s)) => return Some(s),
+            match self.l1_interface.get_tx_status(history_item.tx_hash).await {
+                Ok(Some(s)) => return Ok(Some(s)),
                 Ok(_) => continue,
-                Err(err) => tracing::warn!(
-                    "Can't check transaction {:?}: {:?}",
-                    history_item.tx_hash,
-                    err
-                ),
+                Err(err) => {
+                    tracing::warn!(
+                        "Can't check transaction {:?}: {:?}",
+                        history_item.tx_hash,
+                        err
+                    );
+                    return Err(err);
+                }
             }
         }
-        None
+        Ok(None)
     }
 
-    async fn calculate_fee(
-        &self,
+    pub(crate) async fn send_eth_tx(
+        &mut self,
         storage: &mut Connection<'_, Core>,
         tx: &EthTx,
         time_in_mempool: u32,
-    ) -> Result<EthFee, ETHSenderError> {
-        let base_fee_per_gas = self.gas_adjuster.get_base_fee(0);
-        let priority_fee_per_gas = self.gas_adjuster.get_priority_fee();
-        let blob_base_fee_per_gas = Some(self.gas_adjuster.get_blob_base_fee());
-
-        if tx.blob_sidecar.is_some() {
-            if time_in_mempool != 0 {
-                // for blob transactions on re-sending need to double all gas prices
-                let previous_sent_tx = storage
-                    .eth_sender_dal()
-                    .get_last_sent_eth_tx(tx.id)
-                    .await
-                    .unwrap()
-                    .unwrap();
-                return Ok(EthFee {
-                    base_fee_per_gas: std::cmp::max(
-                        previous_sent_tx.base_fee_per_gas * 2,
-                        base_fee_per_gas,
-                    ),
-                    priority_fee_per_gas: std::cmp::max(
-                        previous_sent_tx.priority_fee_per_gas * 2,
-                        priority_fee_per_gas,
-                    ),
-                    blob_base_fee_per_gas: std::cmp::max(
-                        previous_sent_tx.blob_base_fee_per_gas.map(|v| v * 2),
-                        blob_base_fee_per_gas,
-                    ),
-                });
-            }
-            return Ok(EthFee {
-                base_fee_per_gas,
-                priority_fee_per_gas,
-                blob_base_fee_per_gas,
-            });
-        }
+        current_block: L1BlockNumber,
+    ) -> Result<H256, EthSenderError> {
+        let previous_sent_tx = storage
+            .eth_sender_dal()
+            .get_last_sent_eth_tx(tx.id)
+            .await
+            .unwrap();
+        let has_blob_sidecar = tx.blob_sidecar.is_some();
 
-        let base_fee_per_gas = self.gas_adjuster.get_base_fee(time_in_mempool);
+        let EthFees {
+            base_fee_per_gas,
+            priority_fee_per_gas,
+            blob_base_fee_per_gas,
+        } = self.fees_oracle.calculate_fees(
+            &previous_sent_tx,
+            has_blob_sidecar,
+            time_in_mempool,
+        )?;
 
-        let priority_fee_per_gas = if time_in_mempool != 0 {
+        if let Some(previous_sent_tx) = previous_sent_tx {
             METRICS.transaction_resent.inc();
-            let priority_fee_per_gas = self
-                .increase_priority_fee(storage, tx.id, base_fee_per_gas)
-                .await?;
             tracing::info!(
-                "Resending operation {} with base fee {:?} and priority fee {:?}",
+                "Resending tx {} at block {current_block} with \
+                base_fee_per_gas {base_fee_per_gas:?}, \
+                priority_fee_per_gas {priority_fee_per_gas:?}, \
+                blob_fee_per_gas {blob_base_fee_per_gas:?}, \
+                previously sent with \
+                base_fee_per_gas {:?}, \
+                priority_fee_per_gas {:?}, \
+                blob_fee_per_gas {:?}, \
+                ",
                 tx.id,
-                base_fee_per_gas,
-                priority_fee_per_gas
+                previous_sent_tx.base_fee_per_gas,
+                previous_sent_tx.priority_fee_per_gas,
+                previous_sent_tx.blob_base_fee_per_gas
             );
-            priority_fee_per_gas
         } else {
-            self.gas_adjuster.get_priority_fee()
-        };
-
-        // Extra check to prevent sending transaction will extremely high priority fee.
-        if priority_fee_per_gas > self.config.max_acceptable_priority_fee_in_gwei {
-            panic!(
-                "Extremely high value of priority_fee_per_gas is suggested: {}, while max acceptable is {}",
-                priority_fee_per_gas,
-                self.config.max_acceptable_priority_fee_in_gwei
-            );
-        }
-
-        Ok(EthFee {
-            base_fee_per_gas,
-            blob_base_fee_per_gas: None,
-            priority_fee_per_gas,
-        })
-    }
-
-    async fn increase_priority_fee(
-        &self,
-        storage: &mut Connection<'_, Core>,
-        eth_tx_id: u32,
-        base_fee_per_gas: u64,
-    ) -> Result<u64, ETHSenderError> {
-        let previous_sent_tx = storage
-            .eth_sender_dal()
-            .get_last_sent_eth_tx(eth_tx_id)
-            .await
-            .unwrap()
-            .unwrap();
-
-        let previous_base_fee = previous_sent_tx.base_fee_per_gas;
-        let previous_priority_fee = previous_sent_tx.priority_fee_per_gas;
-        let next_block_minimal_base_fee = self.gas_adjuster.get_next_block_minimal_base_fee();
-
-        if base_fee_per_gas <= next_block_minimal_base_fee.min(previous_base_fee) {
-            // If the base fee is lower than the previous used one
-            // or is lower than the minimal possible value for the next block, sending is skipped.
             tracing::info!(
-                "Skipping gas adjustment for operation {}, \
-                 base_fee_per_gas: suggested for resending {:?}, previously sent {:?}, next block minimum {:?}",
-                eth_tx_id,
-                base_fee_per_gas,
-                previous_base_fee,
-                next_block_minimal_base_fee
+                "Sending tx {} at block {current_block} with \
+                base_fee_per_gas {base_fee_per_gas:?}, \
+                priority_fee_per_gas {priority_fee_per_gas:?}, \
+                blob_fee_per_gas {blob_base_fee_per_gas:?}",
+                tx.id
             );
-            let err = ClientError::Custom("base_fee_per_gas is too low".into());
-            return Err(ETHSenderError::from(Error::EthereumGateway(err)));
         }
 
-        // Increase `priority_fee_per_gas` by at least 20% to prevent "replacement transaction under-priced" error.
-        Ok((previous_priority_fee + (previous_priority_fee / 5) + 1)
-            .max(self.gas_adjuster.get_priority_fee()))
-    }
-
-    pub(crate) async fn send_eth_tx(
-        &mut self,
-        storage: &mut Connection<'_, Core>,
-        tx: &EthTx,
-        time_in_mempool: u32,
-        current_block: L1BlockNumber,
-    ) -> Result<H256, ETHSenderError> {
-        let EthFee {
-            base_fee_per_gas,
-            priority_fee_per_gas,
-            blob_base_fee_per_gas,
-        } = self.calculate_fee(storage, tx, time_in_mempool).await?;
-
-        METRICS.used_base_fee_per_gas.observe(base_fee_per_gas);
-        METRICS
-            .used_priority_fee_per_gas
-            .observe(priority_fee_per_gas);
+        if let Some(blob_base_fee_per_gas) = blob_base_fee_per_gas {
+            METRICS.used_blob_fee_per_gas[&TransactionType::Blob].observe(blob_base_fee_per_gas);
+            METRICS.used_base_fee_per_gas[&TransactionType::Blob].observe(base_fee_per_gas);
+            METRICS.used_priority_fee_per_gas[&TransactionType::Blob].observe(priority_fee_per_gas);
+        } else {
+            METRICS.used_base_fee_per_gas[&TransactionType::Regular].observe(base_fee_per_gas);
+            METRICS.used_priority_fee_per_gas[&TransactionType::Regular]
+                .observe(priority_fee_per_gas);
+        }
 
-        let blob_gas_price = if tx.blob_sidecar.is_some() {
+        let blob_gas_price = if has_blob_sidecar {
             Some(
                 blob_base_fee_per_gas
                     .expect("always ready to query blob gas price for blob transactions; qed")
@@ -260,7 +169,14 @@ impl EthTxManager {
         };
 
         let mut signed_tx = self
-            .sign_tx(tx, base_fee_per_gas, priority_fee_per_gas, blob_gas_price)
+            .l1_interface
+            .sign_tx(
+                tx,
+                base_fee_per_gas,
+                priority_fee_per_gas,
+                blob_gas_price,
+                self.config.max_aggregated_tx_gas.into(),
+            )
             .await;
 
         if let Some(blob_sidecar) = &tx.blob_sidecar {
@@ -279,20 +195,22 @@ impl EthTxManager {
                 blob_base_fee_per_gas,
                 signed_tx.hash,
                 signed_tx.raw_tx.as_ref(),
+                current_block.0,
             )
             .await
             .unwrap()
         {
             if let Err(error) = self
-                .send_raw_transaction(storage, tx_history_id, signed_tx.raw_tx, current_block)
+                .send_raw_transaction(storage, tx_history_id, signed_tx.raw_tx)
                 .await
             {
                 tracing::warn!(
-                    "Error when sending new signed tx for tx {}, base_fee_per_gas {}, priority_fee_per_gas: {}: {}",
-                    tx.id,
-                    base_fee_per_gas,
-                    priority_fee_per_gas,
-                    error
+                    "Error Sending tx {} at block {current_block} with \
+                    base_fee_per_gas {base_fee_per_gas:?}, \
+                    priority_fee_per_gas {priority_fee_per_gas:?}, \
+                    blob_fee_per_gas {blob_base_fee_per_gas:?},\
+                    error {error}",
+                    tx.id
                 );
             }
         }
@@ -304,142 +222,60 @@ impl EthTxManager {
         storage: &mut Connection<'_, Core>,
         tx_history_id: u32,
         raw_tx: RawTransactionBytes,
-        current_block: L1BlockNumber,
-    ) -> Result<H256, ETHSenderError> {
-        match self.query_client().send_raw_tx(raw_tx).await {
-            Ok(tx_hash) => {
-                storage
-                    .eth_sender_dal()
-                    .set_sent_at_block(tx_history_id, current_block.0)
-                    .await
-                    .unwrap();
-                Ok(tx_hash)
-            }
+    ) -> Result<(), EthSenderError> {
+        match self.l1_interface.send_raw_tx(raw_tx).await {
+            Ok(_) => Ok(()),
             Err(error) => {
-                storage
-                    .eth_sender_dal()
-                    .remove_tx_history(tx_history_id)
-                    .await
-                    .unwrap();
+                // In transient errors, server may have received the transaction
+                // we don't want to loose record about it in case that happens
+                if !error.is_transient() {
+                    storage
+                        .eth_sender_dal()
+                        .remove_tx_history(tx_history_id)
+                        .await
+                        .unwrap();
+                } else {
+                    METRICS.l1_transient_errors.inc();
+                }
                 Err(error.into())
             }
         }
     }
 
-    async fn get_operator_nonce(
-        &self,
-        block_numbers: L1BlockNumbers,
-    ) -> Result<OperatorNonce, ETHSenderError> {
-        let finalized = self
-            .ethereum_gateway
-            .nonce_at(block_numbers.finalized.0.into())
-            .await?
-            .as_u32()
-            .into();
-
-        let latest = self
-            .ethereum_gateway
-            .nonce_at(block_numbers.latest.0.into())
-            .await?
-            .as_u32()
-            .into();
-        Ok(OperatorNonce { finalized, latest })
-    }
-
-    async fn get_blobs_operator_nonce(
-        &self,
-        block_numbers: L1BlockNumbers,
-    ) -> Result<Option<OperatorNonce>, ETHSenderError> {
-        match &self.ethereum_gateway_blobs {
-            None => Ok(None),
-            Some(gateway) => {
-                let finalized = gateway
-                    .nonce_at(block_numbers.finalized.0.into())
-                    .await?
-                    .as_u32()
-                    .into();
-
-                let latest = gateway
-                    .nonce_at(block_numbers.latest.0.into())
-                    .await?
-                    .as_u32()
-                    .into();
-                Ok(Some(OperatorNonce { finalized, latest }))
-            }
-        }
-    }
-
-    async fn get_l1_block_numbers(&self) -> Result<L1BlockNumbers, ETHSenderError> {
-        let (finalized, safe) = if let Some(confirmations) = self.config.wait_confirmations {
-            let latest_block_number = self.query_client().block_number().await?.as_u64();
-
-            let finalized = (latest_block_number.saturating_sub(confirmations) as u32).into();
-            (finalized, finalized)
+    pub(crate) fn operator_address(&self, operator_type: OperatorType) -> Option<Address> {
+        if operator_type == OperatorType::NonBlob {
+            None
         } else {
-            let finalized = self
-                .query_client()
-                .block(BlockId::Number(BlockNumber::Finalized))
-                .await?
-                .expect("Finalized block must be present on L1")
-                .number
-                .expect("Finalized block must contain number")
-                .as_u32()
-                .into();
-
-            let safe = self
-                .query_client()
-                .block(BlockId::Number(BlockNumber::Safe))
-                .await?
-                .expect("Safe block must be present on L1")
-                .number
-                .expect("Safe block must contain number")
-                .as_u32()
-                .into();
-            (finalized, safe)
-        };
-
-        let latest = self.query_client().block_number().await?.as_u32().into();
-
-        Ok(L1BlockNumbers {
-            finalized,
-            latest,
-            safe,
-        })
+            self.l1_interface.get_blobs_operator_account()
+        }
     }
-
     // Monitors the in-flight transactions, marks mined ones as confirmed,
     // returns the one that has to be resent (if there is one).
-    pub(super) async fn monitor_inflight_transactions(
+    pub(super) async fn monitor_inflight_transactions_single_operator(
         &mut self,
         storage: &mut Connection<'_, Core>,
         l1_block_numbers: L1BlockNumbers,
-    ) -> Result<Option<(EthTx, u32)>, ETHSenderError> {
-        METRICS.track_block_numbers(&l1_block_numbers);
-        let operator_nonce = self.get_operator_nonce(l1_block_numbers).await?;
-        let blobs_operator_nonce = self.get_blobs_operator_nonce(l1_block_numbers).await?;
-        let blobs_operator_address = self
-            .ethereum_gateway_blobs
-            .as_ref()
-            .map(|s| s.sender_account());
-
-        if let Some(res) = self
-            .monitor_inflight_transactions_inner(storage, l1_block_numbers, operator_nonce, None)
-            .await?
-        {
-            return Ok(Some(res));
-        };
+        operator_type: OperatorType,
+    ) -> Result<Option<(EthTx, u32)>, EthSenderError> {
+        let operator_nonce = self
+            .l1_interface
+            .get_operator_nonce(l1_block_numbers, operator_type)
+            .await?;
+
+        if let Some(operator_nonce) = operator_nonce {
+            let inflight_txs = storage
+                .eth_sender_dal()
+                .get_inflight_txs(self.operator_address(operator_type))
+                .await
+                .unwrap();
+            METRICS.number_of_inflight_txs[&operator_type].set(inflight_txs.len());
 
-        if let Some(blobs_operator_nonce) = blobs_operator_nonce {
-            // need to check if both nonce and address are `Some`
-            if blobs_operator_address.is_none() {
-                panic!("blobs_operator_address has to be set its nonce is known; qed");
-            }
             Ok(self
-                .monitor_inflight_transactions_inner(
+                .apply_inflight_txs_statuses_and_get_first_to_resend(
                     storage,
                     l1_block_numbers,
-                    blobs_operator_nonce,
-                    blobs_operator_address,
+                    operator_nonce,
+                    inflight_txs,
                 )
                 .await?)
         } else {
@@ -447,16 +283,13 @@ impl EthTxManager {
         }
     }
 
-    async fn monitor_inflight_transactions_inner(
+    async fn apply_inflight_txs_statuses_and_get_first_to_resend(
         &mut self,
         storage: &mut Connection<'_, Core>,
         l1_block_numbers: L1BlockNumbers,
         operator_nonce: OperatorNonce,
-        operator_address: Option<Address>,
-    ) -> Result<Option<(EthTx, u32)>, ETHSenderError> {
-        let inflight_txs = storage.eth_sender_dal().get_inflight_txs().await.unwrap();
-        METRICS.number_of_inflight_txs.set(inflight_txs.len());
-
+        inflight_txs: Vec<EthTx>,
+    ) -> Result<Option<(EthTx, u32)>, EthSenderError> {
         tracing::trace!(
             "Going through not confirmed txs. \
              Block numbers: latest {}, finalized {}, \
@@ -469,10 +302,12 @@ impl EthTxManager {
 
         // Not confirmed transactions, ordered by nonce
         for tx in inflight_txs {
-            tracing::trace!("Checking tx id: {}", tx.id,);
-            if tx.from_addr != operator_address {
-                continue;
-            }
+            tracing::trace!(
+                "Checking tx id: {}, operator_nonce: {:?}, tx nonce: {}",
+                tx.id,
+                operator_nonce,
+                tx.nonce,
+            );
 
             // If the `operator_nonce.latest` <= `tx.nonce`, this means
             // that `tx` is not mined and we should resend it.
@@ -483,9 +318,15 @@ impl EthTxManager {
                     .eth_sender_dal()
                     .get_block_number_on_first_sent_attempt(tx.id)
                     .await
-                    .unwrap()
-                    .unwrap_or(l1_block_numbers.latest.0);
-                return Ok(Some((tx, first_sent_at_block)));
+                    .unwrap();
+                // the transaction may still be included in block, we shouldn't resend it yet
+                if first_sent_at_block == Some(l1_block_numbers.latest.0) {
+                    continue;
+                }
+                return Ok(Some((
+                    tx,
+                    first_sent_at_block.unwrap_or(l1_block_numbers.latest.0),
+                )));
             }
 
             // If on finalized block sender's nonce was > tx.nonce,
@@ -503,12 +344,18 @@ impl EthTxManager {
                 tx.nonce,
             );
 
+            tracing::info!(
+                "Updating status of tx {} of type {} with nonce {}",
+                tx.id,
+                tx.tx_type,
+                tx.nonce
+            );
             match self.check_all_sending_attempts(storage, &tx).await {
-                Some(tx_status) => {
+                Ok(Some(tx_status)) => {
                     self.apply_tx_status(storage, &tx, tx_status, l1_block_numbers.finalized)
                         .await;
                 }
-                None => {
+                Ok(None) => {
                     // The nonce has increased but we did not find the receipt.
                     // This is an error because such a big re-org may cause transactions that were
                     // previously recorded as confirmed to become pending again and we have to
@@ -518,61 +365,18 @@ impl EthTxManager {
                         &tx
                     );
                 }
+                Err(err) => {
+                    // An error here means that we weren't able to check status of one of the txs
+                    // we can't continue to avoid situations with out-of-order confirmed txs
+                    // (for instance Execute tx confirmed before PublishProof tx) as this would make
+                    // our API return inconsistent block info
+                    return Err(err);
+                }
             }
         }
         Ok(None)
     }
 
-    async fn sign_tx(
-        &self,
-        tx: &EthTx,
-        base_fee_per_gas: u64,
-        priority_fee_per_gas: u64,
-        blob_gas_price: Option<U256>,
-    ) -> SignedCallResult {
-        // Chose the signing gateway. Use a custom one in case
-        // the operator is in 4844 mode and the operation at hand is Commit.
-        // then the optional gateway is used to send this transaction from a
-        // custom sender account.
-        let signing_gateway = if let Some(blobs_gateway) = self.ethereum_gateway_blobs.as_ref() {
-            if tx.tx_type == AggregatedActionType::Commit {
-                blobs_gateway
-            } else {
-                &self.ethereum_gateway
-            }
-        } else {
-            &self.ethereum_gateway
-        };
-
-        signing_gateway
-            .sign_prepared_tx_for_addr(
-                tx.raw_tx.clone(),
-                tx.contract_address,
-                Options::with(|opt| {
-                    // TODO Calculate gas for every operation SMA-1436
-                    opt.gas = Some(self.config.max_aggregated_tx_gas.into());
-                    opt.max_fee_per_gas = Some(U256::from(base_fee_per_gas + priority_fee_per_gas));
-                    opt.max_priority_fee_per_gas = Some(U256::from(priority_fee_per_gas));
-                    opt.nonce = Some(tx.nonce.0.into());
-                    opt.transaction_type = if tx.blob_sidecar.is_some() {
-                        opt.max_fee_per_blob_gas = blob_gas_price;
-                        Some(EIP_4844_TX_TYPE.into())
-                    } else {
-                        Some(EIP_1559_TX_TYPE.into())
-                    };
-                    opt.blob_versioned_hashes = tx.blob_sidecar.as_ref().map(|s| match s {
-                        EthTxBlobSidecar::EthTxBlobSidecarV1(s) => s
-                            .blobs
-                            .iter()
-                            .map(|blob| H256::from_slice(&blob.versioned_hash))
-                            .collect(),
-                    });
-                }),
-            )
-            .await
-            .expect("Failed to sign transaction")
-    }
-
     async fn send_unsent_txs(
         &mut self,
         storage: &mut Connection<'_, Core>,
@@ -582,7 +386,7 @@ impl EthTxManager {
             // Check already sent txs not marked as sent and mark them as sent.
             // The common reason for this behavior is that we sent tx and stop the server
             // before updating the database
-            let tx_status = self.get_tx_status(tx.tx_hash).await;
+            let tx_status = self.l1_interface.get_tx_status(tx.tx_hash).await;
 
             if let Ok(Some(tx_status)) = tx_status {
                 tracing::info!("The tx {:?} has been already sent", tx.tx_hash);
@@ -601,16 +405,22 @@ impl EthTxManager {
 
                 self.apply_tx_status(storage, &eth_tx, tx_status, l1_block_numbers.finalized)
                     .await;
-            } else if let Err(error) = self
-                .send_raw_transaction(
-                    storage,
-                    tx.id,
-                    RawTransactionBytes::new_unchecked(tx.signed_raw_tx.clone()),
-                    l1_block_numbers.latest,
-                )
-                .await
-            {
-                tracing::warn!("Error sending transaction {tx:?}: {error}");
+            } else {
+                storage
+                    .eth_sender_dal()
+                    .set_sent_at_block(tx.id, l1_block_numbers.latest.0)
+                    .await
+                    .unwrap();
+                if let Err(error) = self
+                    .send_raw_transaction(
+                        storage,
+                        tx.id,
+                        RawTransactionBytes::new_unchecked(tx.signed_raw_tx.clone()),
+                    )
+                    .await
+                {
+                    tracing::warn!("Error sending transaction {tx:?}: {error}");
+                }
             }
         }
     }
@@ -650,12 +460,9 @@ impl EthTxManager {
             .await
             .unwrap();
         let failure_reason = self
-            .query_client()
+            .l1_interface
             .failure_reason(tx_status.receipt.transaction_hash)
-            .await
-            .expect(
-                "Tx is already failed, it's safe to fail here and apply the status on the next run",
-            );
+            .await;
 
         tracing::error!(
             "Eth tx failed {:?}, {:?}, failure reason {:?}",
@@ -721,6 +528,7 @@ impl EthTxManager {
         let pool = self.pool.clone();
         {
             let l1_block_numbers = self
+                .l1_interface
                 .get_l1_block_numbers()
                 .await
                 .context("get_l1_block_numbers()")?;
@@ -738,16 +546,13 @@ impl EthTxManager {
                 tracing::info!("Stop signal received, eth_tx_manager is shutting down");
                 break;
             }
+            let l1_block_numbers = self.l1_interface.get_l1_block_numbers().await?;
+            METRICS.track_block_numbers(&l1_block_numbers);
 
-            match self.loop_iteration(&mut storage, last_known_l1_block).await {
-                Ok(block) => last_known_l1_block = block,
-                Err(e) => {
-                    // Web3 API request failures can cause this,
-                    // and anything more important is already properly reported.
-                    tracing::warn!("eth_sender error {:?}", e);
-                }
+            if last_known_l1_block < l1_block_numbers.latest {
+                self.loop_iteration(&mut storage, l1_block_numbers).await;
+                last_known_l1_block = l1_block_numbers.latest;
             }
-
             tokio::time::sleep(self.config.tx_poll_period()).await;
         }
         Ok(())
@@ -757,10 +562,11 @@ impl EthTxManager {
         &mut self,
         storage: &mut Connection<'_, Core>,
         current_block: L1BlockNumber,
+        operator_type: OperatorType,
     ) {
         let number_inflight_txs = storage
             .eth_sender_dal()
-            .get_inflight_txs()
+            .get_inflight_txs(self.operator_address(operator_type))
             .await
             .unwrap()
             .len();
@@ -773,7 +579,10 @@ impl EthTxManager {
             // Get the new eth tx and create history item for them
             let new_eth_tx = storage
                 .eth_sender_dal()
-                .get_new_eth_txs(number_of_available_slots_for_eth_txs)
+                .get_new_eth_txs(
+                    number_of_available_slots_for_eth_txs,
+                    &self.operator_address(operator_type),
+                )
                 .await
                 .unwrap();
 
@@ -783,24 +592,14 @@ impl EthTxManager {
         }
     }
 
-    #[tracing::instrument(skip(self, storage))]
-    async fn loop_iteration(
+    async fn update_statuses_and_resend_if_needed(
         &mut self,
         storage: &mut Connection<'_, Core>,
-        previous_block: L1BlockNumber,
-    ) -> Result<L1BlockNumber, ETHSenderError> {
-        let l1_block_numbers = self.get_l1_block_numbers().await?;
-
-        self.send_new_eth_txs(storage, l1_block_numbers.latest)
-            .await;
-
-        if l1_block_numbers.latest <= previous_block {
-            // Nothing to do - no new blocks were mined.
-            return Ok(previous_block);
-        }
-
+        l1_block_numbers: L1BlockNumbers,
+        operator_type: OperatorType,
+    ) -> Result<(), EthSenderError> {
         if let Some((tx, sent_at_block)) = self
-            .monitor_inflight_transactions(storage, l1_block_numbers)
+            .monitor_inflight_transactions_single_operator(storage, l1_block_numbers, operator_type)
             .await?
         {
             // New gas price depends on the time this tx spent in mempool.
@@ -811,9 +610,37 @@ impl EthTxManager {
             // sending new operations.
             let _ = self
                 .send_eth_tx(storage, &tx, time_in_mempool, l1_block_numbers.latest)
-                .await;
+                .await?;
         }
+        Ok(())
+    }
+
+    #[tracing::instrument(skip(self, storage))]
+    async fn loop_iteration(
+        &mut self,
+        storage: &mut Connection<'_, Core>,
+        l1_block_numbers: L1BlockNumbers,
+    ) {
+        tracing::info!("Loop iteration at block {}", l1_block_numbers.latest);
+        // We can treat those two operators independently as they have different nonces and
+        // aggregator makes sure that corresponding Commit transaction is confirmed before creating
+        // a PublishProof transaction
+        for operator_type in [OperatorType::NonBlob, OperatorType::Blob] {
+            self.send_new_eth_txs(storage, l1_block_numbers.latest, operator_type)
+                .await;
+            let result = self
+                .update_statuses_and_resend_if_needed(storage, l1_block_numbers, operator_type)
+                .await;
 
-        Ok(l1_block_numbers.latest)
+            //We don't want an error in sending non-blob transactions interrupt sending blob txs
+            if let Err(error) = result {
+                // Web3 API request failures can cause this,
+                // and anything more important is already properly reported.
+                tracing::warn!("eth_sender error {:?}", error);
+                if error.is_transient() {
+                    METRICS.l1_transient_errors.inc();
+                }
+            }
+        }
     }
 }
diff --git a/core/node/eth_sender/src/l1_batch_commit_data_generator.rs b/core/node/eth_sender/src/l1_batch_commit_data_generator.rs
deleted file mode 100644
index 32ae80b1e176..000000000000
--- a/core/node/eth_sender/src/l1_batch_commit_data_generator.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use zksync_l1_contract_interface::{
-    i_executor::{
-        methods::{CommitBatchesRollup, CommitBatchesValidium},
-        structures::{CommitBatchInfoRollup, CommitBatchInfoValidium},
-    },
-    Tokenizable, Tokenize,
-};
-use zksync_types::{commitment::L1BatchWithMetadata, ethabi::Token, pubdata_da::PubdataDA};
-
-/// [`L1BatchCommitDataGenerator`] abstracts how a batch or list of batches need to be tokenized
-/// for committing to L1.
-pub trait L1BatchCommitDataGenerator
-where
-    Self: std::fmt::Debug + Send + Sync,
-{
-    /// [`l1_commit_batches`] is the method you want when committing a block.
-    /// It uses metadata from `last_committed_l1_batch` and the batches in `l1_batches` to produce
-    /// the full commit data.
-    fn l1_commit_batches(
-        &self,
-        last_committed_l1_batch: &L1BatchWithMetadata,
-        l1_batches: &[L1BatchWithMetadata],
-        pubdata_da: &PubdataDA,
-    ) -> Vec<Token>;
-
-    /// [`l1_commit_batch`] is used mostly for size calculations for sealing criteria and for
-    /// consistency checks. Instead of preparing a full commit, it will tokenize an individual batch.
-    fn l1_commit_batch(&self, l1_batch: &L1BatchWithMetadata, pubdata_da: &PubdataDA) -> Token;
-}
-
-/// [`RollupModeL1BatchCommitDataGenerator`] implements [`L1BatchCommitDataGenerator`] for
-/// contracts operating in rollup mode. It differs from [`ValidiumModeL1BatchCommitDataGenerator`]
-/// in that it includes the pubdata in the produced message.
-#[derive(Debug, Clone)]
-pub struct RollupModeL1BatchCommitDataGenerator;
-
-/// [`ValidiumModeL1BatchCommitDataGenerator`] implements [`L1BatchCommitDataGenerator`] for
-/// contracts operating in validium mode. It differs from [`RollupModeL1BatchCommitDataGenerator`]
-/// in that it does not include the pubdata in the produced message.
-#[derive(Debug, Clone)]
-pub struct ValidiumModeL1BatchCommitDataGenerator;
-
-impl L1BatchCommitDataGenerator for RollupModeL1BatchCommitDataGenerator {
-    fn l1_commit_batches(
-        &self,
-        last_committed_l1_batch: &L1BatchWithMetadata,
-        l1_batches: &[L1BatchWithMetadata],
-        pubdata_da: &PubdataDA,
-    ) -> Vec<Token> {
-        CommitBatchesRollup {
-            last_committed_l1_batch: last_committed_l1_batch.clone(),
-            l1_batches: l1_batches.to_vec(),
-            pubdata_da: *pubdata_da,
-        }
-        .into_tokens()
-    }
-
-    fn l1_commit_batch(&self, l1_batch: &L1BatchWithMetadata, pubdata_da: &PubdataDA) -> Token {
-        CommitBatchInfoRollup {
-            l1_batch_with_metadata: l1_batch,
-            pubdata_da: *pubdata_da,
-        }
-        .into_token()
-    }
-}
-
-impl L1BatchCommitDataGenerator for ValidiumModeL1BatchCommitDataGenerator {
-    fn l1_commit_batches(
-        &self,
-        last_committed_l1_batch: &L1BatchWithMetadata,
-        l1_batches: &[L1BatchWithMetadata],
-        pubdata_da: &PubdataDA,
-    ) -> Vec<Token> {
-        CommitBatchesValidium {
-            last_committed_l1_batch: last_committed_l1_batch.clone(),
-            l1_batches: l1_batches.to_vec(),
-            pubdata_da: *pubdata_da,
-        }
-        .into_tokens()
-    }
-
-    fn l1_commit_batch(&self, l1_batch: &L1BatchWithMetadata, pubdata_da: &PubdataDA) -> Token {
-        CommitBatchInfoValidium {
-            l1_batch_with_metadata: l1_batch,
-            pubdata_da: *pubdata_da,
-        }
-        .into_token()
-    }
-}
diff --git a/core/node/eth_sender/src/lib.rs b/core/node/eth_sender/src/lib.rs
index ff404b50e808..504c9b68a63c 100644
--- a/core/node/eth_sender/src/lib.rs
+++ b/core/node/eth_sender/src/lib.rs
@@ -3,16 +3,18 @@ mod aggregator;
 mod error;
 mod eth_tx_aggregator;
 mod eth_tx_manager;
-pub mod l1_batch_commit_data_generator;
 mod metrics;
 mod publish_criterion;
 mod utils;
 mod zksync_functions;
 
+mod abstract_l1_interface;
+
+mod eth_fees_oracle;
 #[cfg(test)]
 mod tests;
 
 pub use self::{
-    aggregator::Aggregator, error::ETHSenderError, eth_tx_aggregator::EthTxAggregator,
+    aggregator::Aggregator, error::EthSenderError, eth_tx_aggregator::EthTxAggregator,
     eth_tx_manager::EthTxManager,
 };
diff --git a/core/node/eth_sender/src/metrics.rs b/core/node/eth_sender/src/metrics.rs
index 50c0e218692f..462fe3ed6e59 100644
--- a/core/node/eth_sender/src/metrics.rs
+++ b/core/node/eth_sender/src/metrics.rs
@@ -8,7 +8,7 @@ use zksync_shared_metrics::{BlockL1Stage, BlockStage, APP_METRICS};
 use zksync_types::{aggregated_operations::AggregatedActionType, eth_sender::EthTx};
 use zksync_utils::time::seconds_since_epoch;
 
-use crate::eth_tx_manager::L1BlockNumbers;
+use crate::abstract_l1_interface::{L1BlockNumbers, OperatorType};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelSet, EncodeLabelValue)]
 #[metrics(label = "kind", rename_all = "snake_case")]
@@ -33,6 +33,13 @@ pub(super) enum BlockNumberVariant {
 #[metrics(label = "type")]
 pub(super) struct ActionTypeLabel(AggregatedActionType);
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelSet, EncodeLabelValue)]
+#[metrics(label = "transaction_type", rename_all = "snake_case")]
+pub(super) enum TransactionType {
+    Blob,
+    Regular,
+}
+
 impl From<AggregatedActionType> for ActionTypeLabel {
     fn from(action_type: AggregatedActionType) -> Self {
         Self(action_type)
@@ -83,13 +90,15 @@ pub(super) struct EthSenderMetrics {
     /// Number of transactions resent by the Ethereum sender.
     pub transaction_resent: Counter,
     #[metrics(buckets = FEE_BUCKETS)]
-    pub used_base_fee_per_gas: Histogram<u64>,
+    pub used_base_fee_per_gas: Family<TransactionType, Histogram<u64>>,
+    #[metrics(buckets = FEE_BUCKETS)]
+    pub used_priority_fee_per_gas: Family<TransactionType, Histogram<u64>>,
     #[metrics(buckets = FEE_BUCKETS)]
-    pub used_priority_fee_per_gas: Histogram<u64>,
+    pub used_blob_fee_per_gas: Family<TransactionType, Histogram<u64>>,
     /// Last L1 block observed by the Ethereum sender.
     pub last_known_l1_block: Family<BlockNumberVariant, Gauge<usize>>,
     /// Number of in-flight txs produced by the Ethereum sender.
-    pub number_of_inflight_txs: Gauge<usize>,
+    pub number_of_inflight_txs: Family<OperatorType, Gauge<usize>>,
     #[metrics(buckets = GAS_BUCKETS)]
     pub l1_gas_used: Family<ActionTypeLabel, Histogram<f64>>,
     #[metrics(buckets = Buckets::LATENCIES)]
@@ -98,6 +107,7 @@ pub(super) struct EthSenderMetrics {
     pub l1_blocks_waited_in_mempool: Family<ActionTypeLabel, Histogram<u64>>,
     /// Number of L1 batches aggregated for publishing with a specific reason.
     pub block_aggregation_reason: Family<AggregationReasonLabels, Counter>,
+    pub l1_transient_errors: Counter,
 }
 
 impl EthSenderMetrics {
@@ -121,24 +131,25 @@ impl EthSenderMetrics {
             tx_type: tx.tx_type,
         };
 
-        let l1_batch_headers = connection
+        let l1_batches_statistics = connection
             .blocks_dal()
-            .get_l1_batches_for_eth_tx_id(tx.id)
+            .get_l1_batches_statistics_for_eth_tx_id(tx.id)
             .await
             .unwrap();
 
         // This should be only the case when some blocks were reverted.
-        if l1_batch_headers.is_empty() {
+        if l1_batches_statistics.is_empty() {
             tracing::warn!("No L1 batches were found for eth_tx with id = {}", tx.id);
             return;
         }
 
-        for header in l1_batch_headers {
+        for statistics in l1_batches_statistics {
             APP_METRICS.block_latency[&stage].observe(Duration::from_secs(
-                seconds_since_epoch() - header.timestamp,
+                seconds_since_epoch() - statistics.timestamp,
             ));
-            APP_METRICS.processed_txs[&stage.into()].inc_by(header.tx_count() as u64);
-            APP_METRICS.processed_l1_txs[&stage.into()].inc_by(header.tx_count() as u64);
+            APP_METRICS.processed_txs[&stage.into()]
+                .inc_by(statistics.l2_tx_count as u64 + statistics.l1_tx_count as u64);
+            APP_METRICS.processed_l1_txs[&stage.into()].inc_by(statistics.l1_tx_count as u64);
         }
         metrics_latency.observe();
     }
diff --git a/core/node/eth_sender/src/publish_criterion.rs b/core/node/eth_sender/src/publish_criterion.rs
index b8ae45fe5b42..52d861ce0af6 100644
--- a/core/node/eth_sender/src/publish_criterion.rs
+++ b/core/node/eth_sender/src/publish_criterion.rs
@@ -1,20 +1,22 @@
-use std::{fmt, sync::Arc};
+use std::fmt;
 
 use async_trait::async_trait;
 use chrono::Utc;
 use zksync_dal::{Connection, Core, CoreDal};
+use zksync_l1_contract_interface::{i_executor::structures::CommitBatchInfo, Tokenizable};
 use zksync_types::{
-    aggregated_operations::AggregatedActionType, commitment::L1BatchWithMetadata, ethabi,
-    pubdata_da::PubdataDA, L1BatchNumber,
+    aggregated_operations::AggregatedActionType,
+    commitment::{L1BatchCommitmentMode, L1BatchWithMetadata},
+    ethabi,
+    pubdata_da::PubdataDA,
+    L1BatchNumber,
 };
 
-use super::{
-    l1_batch_commit_data_generator::L1BatchCommitDataGenerator, metrics::METRICS,
-    utils::agg_l1_batch_base_cost,
-};
+use super::{metrics::METRICS, utils::agg_l1_batch_base_cost};
 
 #[async_trait]
 pub trait L1BatchPublishCriterion: fmt::Debug + Send + Sync {
+    #[allow(dead_code)]
     // Takes `&self` receiver for the trait to be object-safe
     fn name(&self) -> &'static str;
 
@@ -201,7 +203,7 @@ pub struct DataSizeCriterion {
     pub op: AggregatedActionType,
     pub data_limit: usize,
     pub pubdata_da: PubdataDA,
-    pub l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator>,
+    pub commitment_mode: L1BatchCommitmentMode,
 }
 
 #[async_trait]
@@ -221,10 +223,9 @@ impl L1BatchPublishCriterion for DataSizeCriterion {
 
         for (index, l1_batch) in consecutive_l1_batches.iter().enumerate() {
             // TODO (PLA-771): Make sure that this estimation is correct.
-            let l1_commit_data_size = ethabi::encode(&[self
-                .l1_batch_commit_data_generator
-                .l1_commit_batch(l1_batch, &self.pubdata_da)])
-            .len();
+            let commit_token =
+                CommitBatchInfo::new(self.commitment_mode, l1_batch, self.pubdata_da).into_token();
+            let l1_commit_data_size = ethabi::encode(&[commit_token]).len();
 
             if data_size_left < l1_commit_data_size {
                 if index == 0 {
diff --git a/core/node/eth_sender/src/tests.rs b/core/node/eth_sender/src/tests.rs
index e576c0072b2a..45835a50c33b 100644
--- a/core/node/eth_sender/src/tests.rs
+++ b/core/node/eth_sender/src/tests.rs
@@ -7,33 +7,30 @@ use zksync_config::{
     configs::eth_sender::{ProofSendingMode, PubdataSendingMode, SenderConfig},
     ContractsConfig, EthConfig, GasAdjusterConfig,
 };
+use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
-use zksync_eth_client::{clients::MockEthereum, EthInterface};
+use zksync_eth_client::{clients::MockEthereum, BaseFees};
 use zksync_l1_contract_interface::i_executor::methods::{ExecuteBatches, ProveBatches};
-use zksync_node_fee_model::l1_gas_price::{
-    GasAdjuster, PubdataPricing, RollupPubdataPricing, ValidiumPubdataPricing,
-};
-use zksync_node_test_utils::{
-    create_l1_batch, l1_batch_metadata_to_commitment_artifacts, DeploymentMode,
-};
-use zksync_object_store::ObjectStoreFactory;
+use zksync_node_fee_model::l1_gas_price::GasAdjuster;
+use zksync_node_test_utils::{create_l1_batch, l1_batch_metadata_to_commitment_artifacts};
+use zksync_object_store::MockObjectStore;
 use zksync_types::{
     block::L1BatchHeader,
-    commitment::{L1BatchMetaParameters, L1BatchMetadata, L1BatchWithMetadata},
+    commitment::{
+        L1BatchCommitmentMode, L1BatchMetaParameters, L1BatchMetadata, L1BatchWithMetadata,
+    },
     ethabi::Token,
     helpers::unix_timestamp_ms,
+    l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log},
     pubdata_da::PubdataDA,
     web3::contract::Error,
-    Address, L1BatchNumber, L1BlockNumber, ProtocolVersion, ProtocolVersionId, H256,
+    Address, L1BatchNumber, ProtocolVersion, ProtocolVersionId, H256,
 };
 
-use super::l1_batch_commit_data_generator::{
-    L1BatchCommitDataGenerator, RollupModeL1BatchCommitDataGenerator,
-    ValidiumModeL1BatchCommitDataGenerator,
-};
 use crate::{
-    aggregated_operations::AggregatedOperation, eth_tx_manager::L1BlockNumbers, Aggregator,
-    ETHSenderError, EthTxAggregator, EthTxManager,
+    abstract_l1_interface::{L1BlockNumbers, OperatorType},
+    aggregated_operations::AggregatedOperation,
+    Aggregator, EthSenderError, EthTxAggregator, EthTxManager,
 };
 
 // Alias to conveniently call static methods of `ETHSender`.
@@ -49,6 +46,47 @@ static DUMMY_OPERATION: Lazy<AggregatedOperation> = Lazy::new(|| {
     })
 });
 
+fn get_dummy_operation(number: u32) -> AggregatedOperation {
+    AggregatedOperation::Execute(ExecuteBatches {
+        l1_batches: vec![L1BatchWithMetadata {
+            header: create_l1_batch(number),
+            metadata: default_l1_batch_metadata(),
+            raw_published_factory_deps: Vec::new(),
+        }],
+    })
+}
+
+const COMMITMENT_MODES: [L1BatchCommitmentMode; 2] = [
+    L1BatchCommitmentMode::Rollup,
+    L1BatchCommitmentMode::Validium,
+];
+
+fn mock_l1_batch_header(number: u32) -> L1BatchHeader {
+    let mut header = L1BatchHeader::new(
+        L1BatchNumber(number),
+        100,
+        BaseSystemContractsHashes {
+            bootloader: H256::repeat_byte(1),
+            default_aa: H256::repeat_byte(42),
+        },
+        ProtocolVersionId::latest(),
+    );
+    header.l1_tx_count = 3;
+    header.l2_tx_count = 5;
+    header.l2_to_l1_logs.push(UserL2ToL1Log(L2ToL1Log {
+        shard_id: 0,
+        is_service: false,
+        tx_number_in_block: 2,
+        sender: Address::repeat_byte(2),
+        key: H256::repeat_byte(3),
+        value: H256::zero(),
+    }));
+    header.l2_to_l1_messages.push(vec![22; 22]);
+    header.l2_to_l1_messages.push(vec![33; 33]);
+
+    header
+}
+
 fn mock_multicall_response() -> Token {
     Token::Array(vec![
         Token::Tuple(vec![Token::Bool(true), Token::Bytes(vec![1u8; 32])]),
@@ -84,7 +122,7 @@ impl EthSenderTester {
         history: Vec<u64>,
         non_ordering_confirmations: bool,
         aggregator_operate_4844_mode: bool,
-        deployment_mode: &DeploymentMode,
+        commitment_mode: L1BatchCommitmentMode,
     ) -> Self {
         let eth_sender_config = EthConfig::for_tests();
         let contracts_config = ContractsConfig::for_tests();
@@ -93,29 +131,36 @@ impl EthSenderTester {
             ..eth_sender_config.clone().sender.unwrap()
         };
 
-        let gateway = MockEthereum::default()
+        let history: Vec<_> = history
+            .into_iter()
+            .map(|base_fee_per_gas| BaseFees {
+                base_fee_per_gas,
+                base_fee_per_blob_gas: 0.into(),
+            })
+            .collect();
+
+        let gateway = MockEthereum::builder()
             .with_fee_history(
-                std::iter::repeat(0)
-                    .take(Self::WAIT_CONFIRMATIONS as usize)
-                    .chain(history)
-                    .collect(),
+                std::iter::repeat_with(|| BaseFees {
+                    base_fee_per_gas: 0,
+                    base_fee_per_blob_gas: 0.into(),
+                })
+                .take(Self::WAIT_CONFIRMATIONS as usize)
+                .chain(history)
+                .collect(),
             )
             .with_non_ordering_confirmation(non_ordering_confirmations)
             .with_call_handler(move |call, _| {
                 assert_eq!(call.to, Some(contracts_config.l1_multicall3_addr));
                 mock_multicall_response()
-            });
+            })
+            .build();
         gateway.advance_block_number(Self::WAIT_CONFIRMATIONS);
         let gateway = Box::new(gateway);
 
-        let pubdata_pricing: Arc<dyn PubdataPricing> = match deployment_mode {
-            DeploymentMode::Validium => Arc::new(ValidiumPubdataPricing {}),
-            DeploymentMode::Rollup => Arc::new(RollupPubdataPricing {}),
-        };
-
         let gas_adjuster = Arc::new(
             GasAdjuster::new(
-                gateway.clone(),
+                Box::new(gateway.clone().into_client()),
                 GasAdjusterConfig {
                     max_base_fee_samples: Self::MAX_BASE_FEE_SAMPLES,
                     pricing_formula_parameter_a: 3.0,
@@ -123,18 +168,11 @@ impl EthSenderTester {
                     ..eth_sender_config.gas_adjuster.unwrap()
                 },
                 PubdataSendingMode::Calldata,
-                pubdata_pricing,
+                commitment_mode,
             )
             .await
             .unwrap(),
         );
-        let store_factory = ObjectStoreFactory::mock();
-
-        let l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator> =
-            match deployment_mode {
-                DeploymentMode::Validium => Arc::new(ValidiumModeL1BatchCommitDataGenerator {}),
-                DeploymentMode::Rollup => Arc::new(RollupModeL1BatchCommitDataGenerator {}),
-            };
 
         let eth_sender = eth_sender_config.sender.clone().unwrap();
         let aggregator = EthTxAggregator::new(
@@ -147,18 +185,17 @@ impl EthSenderTester {
             // Aggregator - unused
             Aggregator::new(
                 aggregator_config.clone(),
-                store_factory.create_store().await,
+                MockObjectStore::arc(),
                 aggregator_operate_4844_mode,
-                l1_batch_commit_data_generator.clone(),
+                commitment_mode,
             ),
             gateway.clone(),
-            // zkSync contract address
+            // ZKsync contract address
             Address::random(),
             contracts_config.l1_multicall3_addr,
             Address::random(),
             Default::default(),
             None,
-            l1_batch_commit_data_generator,
         )
         .await;
 
@@ -183,7 +220,13 @@ impl EthSenderTester {
     }
 
     async fn get_block_numbers(&self) -> L1BlockNumbers {
-        let latest = self.gateway.block_number().await.unwrap().as_u32().into();
+        let latest = self
+            .manager
+            .l1_interface()
+            .get_l1_block_numbers()
+            .await
+            .unwrap()
+            .latest;
         let finalized = latest - Self::WAIT_CONFIRMATIONS as u32;
         L1BlockNumbers {
             finalized,
@@ -203,21 +246,21 @@ fn l1_batch_with_metadata(header: L1BatchHeader) -> L1BatchWithMetadata {
 
 fn default_l1_batch_metadata() -> L1BatchMetadata {
     L1BatchMetadata {
-        root_hash: Default::default(),
+        root_hash: H256::default(),
         rollup_last_leaf_index: 0,
         initial_writes_compressed: Some(vec![]),
         repeated_writes_compressed: Some(vec![]),
-        commitment: Default::default(),
-        l2_l1_merkle_root: Default::default(),
+        commitment: H256::default(),
+        l2_l1_merkle_root: H256::default(),
         block_meta_params: L1BatchMetaParameters {
             zkporter_is_available: false,
-            bootloader_code_hash: Default::default(),
-            default_aa_code_hash: Default::default(),
-            protocol_version: Default::default(),
+            bootloader_code_hash: H256::default(),
+            default_aa_code_hash: H256::default(),
+            protocol_version: Some(ProtocolVersionId::default()),
         },
-        aux_data_hash: Default::default(),
-        meta_parameters_hash: Default::default(),
-        pass_through_data_hash: Default::default(),
+        aux_data_hash: H256::default(),
+        meta_parameters_hash: H256::default(),
+        pass_through_data_hash: H256::default(),
         events_queue_commitment: Some(H256::zero()),
         bootloader_initial_content_commitment: Some(H256::zero()),
         state_diffs_compressed: vec![],
@@ -225,30 +268,49 @@ fn default_l1_batch_metadata() -> L1BatchMetadata {
 }
 
 // Tests that we send multiple transactions and confirm them all in one iteration.
-#[test_casing(4, Product(([false, true], [DeploymentMode::Rollup, DeploymentMode::Validium])))]
+#[test_casing(4, Product(([false, true], COMMITMENT_MODES)))]
 #[tokio::test]
 async fn confirm_many(
     aggregator_operate_4844_mode: bool,
-    deployment_mode: DeploymentMode,
+    commitment_mode: L1BatchCommitmentMode,
 ) -> anyhow::Result<()> {
     let connection_pool = ConnectionPool::<Core>::test_pool().await;
     let mut tester = EthSenderTester::new(
-        connection_pool,
+        connection_pool.clone(),
         vec![10; 100],
         false,
         aggregator_operate_4844_mode,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
 
     let mut hashes = vec![];
 
-    for _ in 0..5 {
+    connection_pool
+        .clone()
+        .connection()
+        .await
+        .unwrap()
+        .protocol_versions_dal()
+        .save_protocol_version_with_tx(&ProtocolVersion::default())
+        .await
+        .unwrap();
+
+    for number in 0..5 {
+        connection_pool
+            .clone()
+            .connection()
+            .await
+            .unwrap()
+            .blocks_dal()
+            .insert_mock_l1_batch(&mock_l1_batch_header(number + 1))
+            .await
+            .unwrap();
         let tx = tester
             .aggregator
             .save_eth_tx(
                 &mut tester.conn.connection().await.unwrap(),
-                &DUMMY_OPERATION,
+                &get_dummy_operation(number + 1),
                 false,
             )
             .await?;
@@ -258,7 +320,7 @@ async fn confirm_many(
                 &mut tester.conn.connection().await.unwrap(),
                 &tx,
                 0,
-                L1BlockNumber(tester.gateway.block_number().await?.as_u32()),
+                tester.get_block_numbers().await.latest,
             )
             .await?;
         hashes.push(hash);
@@ -271,7 +333,7 @@ async fn confirm_many(
             .storage()
             .await
             .eth_sender_dal()
-            .get_inflight_txs()
+            .get_inflight_txs(tester.manager.operator_address(OperatorType::NonBlob))
             .await
             .unwrap()
             .len(),
@@ -286,9 +348,10 @@ async fn confirm_many(
 
     let to_resend = tester
         .manager
-        .monitor_inflight_transactions(
+        .monitor_inflight_transactions_single_operator(
             &mut tester.conn.connection().await.unwrap(),
             tester.get_block_numbers().await,
+            OperatorType::NonBlob,
         )
         .await?;
 
@@ -298,7 +361,7 @@ async fn confirm_many(
             .storage()
             .await
             .eth_sender_dal()
-            .get_inflight_txs()
+            .get_inflight_txs(tester.manager.operator_address(OperatorType::NonBlob))
             .await
             .unwrap()
             .len(),
@@ -312,15 +375,16 @@ async fn confirm_many(
 }
 
 // Tests that we resend first un-mined transaction every block with an increased gas price.
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn resend_each_block(deployment_mode: DeploymentMode) -> anyhow::Result<()> {
+async fn resend_each_block(commitment_mode: L1BatchCommitmentMode) -> anyhow::Result<()> {
+    let connection_pool = ConnectionPool::<Core>::test_pool().await;
     let mut tester = EthSenderTester::new(
-        ConnectionPool::<Core>::test_pool().await,
+        connection_pool.clone(),
         vec![7, 6, 5, 5, 5, 2, 1],
         false,
         false,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
 
@@ -328,12 +392,33 @@ async fn resend_each_block(deployment_mode: DeploymentMode) -> anyhow::Result<()
     tester.gateway.advance_block_number(3);
     tester.gas_adjuster.keep_updated().await?;
 
-    let block = L1BlockNumber(tester.gateway.block_number().await?.as_u32());
+    connection_pool
+        .clone()
+        .connection()
+        .await
+        .unwrap()
+        .protocol_versions_dal()
+        .save_protocol_version_with_tx(&ProtocolVersion::default())
+        .await
+        .unwrap();
+
+    connection_pool
+        .clone()
+        .connection()
+        .await
+        .unwrap()
+        .blocks_dal()
+        .insert_mock_l1_batch(&mock_l1_batch_header(1))
+        .await
+        .unwrap();
+
+    let block = tester.get_block_numbers().await.latest;
+
     let tx = tester
         .aggregator
         .save_eth_tx(
             &mut tester.conn.connection().await.unwrap(),
-            &DUMMY_OPERATION,
+            &get_dummy_operation(1),
             false,
         )
         .await?;
@@ -350,7 +435,7 @@ async fn resend_each_block(deployment_mode: DeploymentMode) -> anyhow::Result<()
             .storage()
             .await
             .eth_sender_dal()
-            .get_inflight_txs()
+            .get_inflight_txs(tester.manager.operator_address(OperatorType::NonBlob))
             .await
             .unwrap()
             .len(),
@@ -358,7 +443,8 @@ async fn resend_each_block(deployment_mode: DeploymentMode) -> anyhow::Result<()
     );
 
     let sent_tx = tester
-        .gateway
+        .manager
+        .l1_interface()
         .get_tx(hash)
         .await
         .unwrap()
@@ -377,7 +463,11 @@ async fn resend_each_block(deployment_mode: DeploymentMode) -> anyhow::Result<()
 
     let (to_resend, _) = tester
         .manager
-        .monitor_inflight_transactions(&mut tester.conn.connection().await.unwrap(), block_numbers)
+        .monitor_inflight_transactions_single_operator(
+            &mut tester.conn.connection().await.unwrap(),
+            block_numbers,
+            OperatorType::NonBlob,
+        )
         .await?
         .unwrap();
 
@@ -398,7 +488,7 @@ async fn resend_each_block(deployment_mode: DeploymentMode) -> anyhow::Result<()
             .storage()
             .await
             .eth_sender_dal()
-            .get_inflight_txs()
+            .get_inflight_txs(tester.manager.operator_address(OperatorType::NonBlob))
             .await
             .unwrap()
             .len(),
@@ -406,7 +496,8 @@ async fn resend_each_block(deployment_mode: DeploymentMode) -> anyhow::Result<()
     );
 
     let resent_tx = tester
-        .gateway
+        .manager
+        .l1_interface()
         .get_tx(resent_hash)
         .await
         .unwrap()
@@ -422,18 +513,39 @@ async fn resend_each_block(deployment_mode: DeploymentMode) -> anyhow::Result<()
 
 // Tests that if transaction was mined, but not enough blocks has been mined since,
 // we won't mark it as confirmed but also won't resend it.
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn dont_resend_already_mined(deployment_mode: DeploymentMode) -> anyhow::Result<()> {
+async fn dont_resend_already_mined(commitment_mode: L1BatchCommitmentMode) -> anyhow::Result<()> {
+    let connection_pool = ConnectionPool::<Core>::test_pool().await;
     let mut tester = EthSenderTester::new(
-        ConnectionPool::<Core>::test_pool().await,
+        connection_pool.clone(),
         vec![100; 100],
         false,
         false,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
 
+    connection_pool
+        .clone()
+        .connection()
+        .await
+        .unwrap()
+        .protocol_versions_dal()
+        .save_protocol_version_with_tx(&ProtocolVersion::default())
+        .await
+        .unwrap();
+
+    connection_pool
+        .clone()
+        .connection()
+        .await
+        .unwrap()
+        .blocks_dal()
+        .insert_mock_l1_batch(&mock_l1_batch_header(1))
+        .await
+        .unwrap();
+
     let tx = tester
         .aggregator
         .save_eth_tx(
@@ -450,7 +562,7 @@ async fn dont_resend_already_mined(deployment_mode: DeploymentMode) -> anyhow::R
             &mut tester.conn.connection().await.unwrap(),
             &tx,
             0,
-            L1BlockNumber(tester.gateway.block_number().await.unwrap().as_u32()),
+            tester.get_block_numbers().await.latest,
         )
         .await
         .unwrap();
@@ -462,7 +574,7 @@ async fn dont_resend_already_mined(deployment_mode: DeploymentMode) -> anyhow::R
             .storage()
             .await
             .eth_sender_dal()
-            .get_inflight_txs()
+            .get_inflight_txs(tester.manager.operator_address(OperatorType::NonBlob))
             .await
             .unwrap()
             .len(),
@@ -476,9 +588,10 @@ async fn dont_resend_already_mined(deployment_mode: DeploymentMode) -> anyhow::R
 
     let to_resend = tester
         .manager
-        .monitor_inflight_transactions(
+        .monitor_inflight_transactions_single_operator(
             &mut tester.conn.connection().await.unwrap(),
             tester.get_block_numbers().await,
+            OperatorType::NonBlob,
         )
         .await?;
 
@@ -488,7 +601,7 @@ async fn dont_resend_already_mined(deployment_mode: DeploymentMode) -> anyhow::R
             .storage()
             .await
             .eth_sender_dal()
-            .get_inflight_txs()
+            .get_inflight_txs(tester.manager.operator_address(OperatorType::NonBlob))
             .await
             .unwrap()
             .len(),
@@ -501,26 +614,46 @@ async fn dont_resend_already_mined(deployment_mode: DeploymentMode) -> anyhow::R
     Ok(())
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn three_scenarios(deployment_mode: DeploymentMode) -> anyhow::Result<()> {
+async fn three_scenarios(commitment_mode: L1BatchCommitmentMode) -> anyhow::Result<()> {
+    let connection_pool = ConnectionPool::<Core>::test_pool().await;
     let mut tester = EthSenderTester::new(
-        ConnectionPool::<Core>::test_pool().await,
+        connection_pool.clone(),
         vec![100; 100],
         false,
         false,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
 
     let mut hashes = vec![];
 
-    for _ in 0..3 {
+    connection_pool
+        .clone()
+        .connection()
+        .await
+        .unwrap()
+        .protocol_versions_dal()
+        .save_protocol_version_with_tx(&ProtocolVersion::default())
+        .await
+        .unwrap();
+
+    for number in 0..3 {
+        connection_pool
+            .clone()
+            .connection()
+            .await
+            .unwrap()
+            .blocks_dal()
+            .insert_mock_l1_batch(&mock_l1_batch_header(number + 1))
+            .await
+            .unwrap();
         let tx = tester
             .aggregator
             .save_eth_tx(
                 &mut tester.conn.connection().await.unwrap(),
-                &DUMMY_OPERATION,
+                &get_dummy_operation(number + 1),
                 false,
             )
             .await
@@ -532,7 +665,7 @@ async fn three_scenarios(deployment_mode: DeploymentMode) -> anyhow::Result<()>
                 &mut tester.conn.connection().await.unwrap(),
                 &tx,
                 0,
-                L1BlockNumber(tester.gateway.block_number().await.unwrap().as_u32()),
+                tester.get_block_numbers().await.latest,
             )
             .await
             .unwrap();
@@ -554,9 +687,10 @@ async fn three_scenarios(deployment_mode: DeploymentMode) -> anyhow::Result<()>
 
     let (to_resend, _) = tester
         .manager
-        .monitor_inflight_transactions(
+        .monitor_inflight_transactions_single_operator(
             &mut tester.conn.connection().await.unwrap(),
             tester.get_block_numbers().await,
+            OperatorType::NonBlob,
         )
         .await?
         .expect("we should be trying to resend the last tx");
@@ -567,7 +701,7 @@ async fn three_scenarios(deployment_mode: DeploymentMode) -> anyhow::Result<()>
             .storage()
             .await
             .eth_sender_dal()
-            .get_inflight_txs()
+            .get_inflight_txs(tester.manager.operator_address(OperatorType::NonBlob))
             .await
             .unwrap()
             .len(),
@@ -581,18 +715,39 @@ async fn three_scenarios(deployment_mode: DeploymentMode) -> anyhow::Result<()>
 }
 
 #[should_panic(expected = "We can't operate after tx fail")]
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn failed_eth_tx(deployment_mode: DeploymentMode) {
+async fn failed_eth_tx(commitment_mode: L1BatchCommitmentMode) {
+    let connection_pool = ConnectionPool::<Core>::test_pool().await;
     let mut tester = EthSenderTester::new(
-        ConnectionPool::<Core>::test_pool().await,
+        connection_pool.clone(),
         vec![100; 100],
         false,
         false,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
 
+    connection_pool
+        .clone()
+        .connection()
+        .await
+        .unwrap()
+        .protocol_versions_dal()
+        .save_protocol_version_with_tx(&ProtocolVersion::default())
+        .await
+        .unwrap();
+
+    connection_pool
+        .clone()
+        .connection()
+        .await
+        .unwrap()
+        .blocks_dal()
+        .insert_mock_l1_batch(&mock_l1_batch_header(1))
+        .await
+        .unwrap();
+
     let tx = tester
         .aggregator
         .save_eth_tx(
@@ -609,7 +764,7 @@ async fn failed_eth_tx(deployment_mode: DeploymentMode) {
             &mut tester.conn.connection().await.unwrap(),
             &tx,
             0,
-            L1BlockNumber(tester.gateway.block_number().await.unwrap().as_u32()),
+            tester.get_block_numbers().await.latest,
         )
         .await
         .unwrap();
@@ -620,23 +775,26 @@ async fn failed_eth_tx(deployment_mode: DeploymentMode) {
         .execute_tx(hash, false, EthSenderTester::WAIT_CONFIRMATIONS);
     tester
         .manager
-        .monitor_inflight_transactions(
+        .monitor_inflight_transactions_single_operator(
             &mut tester.conn.connection().await.unwrap(),
             tester.get_block_numbers().await,
+            OperatorType::NonBlob,
         )
         .await
         .unwrap();
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn correct_order_for_confirmations(deployment_mode: DeploymentMode) -> anyhow::Result<()> {
+async fn correct_order_for_confirmations(
+    commitment_mode: L1BatchCommitmentMode,
+) -> anyhow::Result<()> {
     let mut tester = EthSenderTester::new(
         ConnectionPool::<Core>::test_pool().await,
         vec![100; 100],
         true,
         false,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
 
@@ -697,15 +855,17 @@ async fn correct_order_for_confirmations(deployment_mode: DeploymentMode) -> any
     Ok(())
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn skipped_l1_batch_at_the_start(deployment_mode: DeploymentMode) -> anyhow::Result<()> {
+async fn skipped_l1_batch_at_the_start(
+    commitment_mode: L1BatchCommitmentMode,
+) -> anyhow::Result<()> {
     let mut tester = EthSenderTester::new(
         ConnectionPool::<Core>::test_pool().await,
         vec![100; 100],
         true,
         false,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
 
@@ -798,15 +958,17 @@ async fn skipped_l1_batch_at_the_start(deployment_mode: DeploymentMode) -> anyho
     Ok(())
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn skipped_l1_batch_in_the_middle(deployment_mode: DeploymentMode) -> anyhow::Result<()> {
+async fn skipped_l1_batch_in_the_middle(
+    commitment_mode: L1BatchCommitmentMode,
+) -> anyhow::Result<()> {
     let mut tester = EthSenderTester::new(
         ConnectionPool::<Core>::test_pool().await,
         vec![100; 100],
         true,
         false,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
 
@@ -893,15 +1055,15 @@ async fn skipped_l1_batch_in_the_middle(deployment_mode: DeploymentMode) -> anyh
     Ok(())
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn test_parse_multicall_data(deployment_mode: DeploymentMode) {
+async fn test_parse_multicall_data(commitment_mode: L1BatchCommitmentMode) {
     let tester = EthSenderTester::new(
         ConnectionPool::<Core>::test_pool().await,
         vec![100; 100],
         false,
         false,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
 
@@ -960,20 +1122,20 @@ async fn test_parse_multicall_data(deployment_mode: DeploymentMode) {
             tester
                 .aggregator
                 .parse_multicall_data(wrong_data_instance.clone()),
-            Err(ETHSenderError::ParseError(Error::InvalidOutputType(_)))
+            Err(EthSenderError::Parse(Error::InvalidOutputType(_)))
         );
     }
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn get_multicall_data(deployment_mode: DeploymentMode) {
+async fn get_multicall_data(commitment_mode: L1BatchCommitmentMode) {
     let mut tester = EthSenderTester::new(
         ConnectionPool::<Core>::test_pool().await,
         vec![100; 100],
         false,
         false,
-        &deployment_mode,
+        commitment_mode,
     )
     .await;
     let multicall_data = tester.aggregator.get_multicall_data().await;
@@ -1083,7 +1245,7 @@ async fn send_operation(
             &mut tester.conn.connection().await.unwrap(),
             &tx,
             0,
-            L1BlockNumber(tester.gateway.block_number().await.unwrap().as_u32()),
+            tester.get_block_numbers().await.latest,
         )
         .await
         .unwrap();
@@ -1100,9 +1262,20 @@ async fn confirm_tx(tester: &mut EthSenderTester, hash: H256) {
         .execute_tx(hash, true, EthSenderTester::WAIT_CONFIRMATIONS);
     tester
         .manager
-        .monitor_inflight_transactions(
+        .monitor_inflight_transactions_single_operator(
+            &mut tester.conn.connection().await.unwrap(),
+            tester.get_block_numbers().await,
+            OperatorType::NonBlob,
+        )
+        .await
+        .unwrap();
+
+    tester
+        .manager
+        .monitor_inflight_transactions_single_operator(
             &mut tester.conn.connection().await.unwrap(),
             tester.get_block_numbers().await,
+            OperatorType::Blob,
         )
         .await
         .unwrap();
diff --git a/core/node/eth_watch/Cargo.toml b/core/node/eth_watch/Cargo.toml
index e3a2e33d8ff4..4e85d1332603 100644
--- a/core/node/eth_watch/Cargo.toml
+++ b/core/node/eth_watch/Cargo.toml
@@ -23,3 +23,6 @@ anyhow.workspace = true
 thiserror.workspace = true
 async-trait.workspace = true
 tracing.workspace = true
+
+[dev-dependencies]
+zksync_concurrency.workspace = true
diff --git a/core/node/eth_watch/README.md b/core/node/eth_watch/README.md
index f805f3e4c389..5b4dd5c2ea0d 100644
--- a/core/node/eth_watch/README.md
+++ b/core/node/eth_watch/README.md
@@ -1,6 +1,6 @@
-# zkSync Era Eth Watcher
+# ZKsync Era Eth Watcher
 
-This crate contains an implementation of the zkSync Era Eth Watcher component, which fetches the changes from the
+This crate contains an implementation of the ZKsync Era Eth Watcher component, which fetches the changes from the
 corresponding L1 contract.
 
 ## Overview
diff --git a/core/node/eth_watch/src/client.rs b/core/node/eth_watch/src/client.rs
index f617b1f18264..764573002996 100644
--- a/core/node/eth_watch/src/client.rs
+++ b/core/node/eth_watch/src/client.rs
@@ -1,8 +1,11 @@
 use std::fmt;
 
 use zksync_contracts::verifier_contract;
-pub(super) use zksync_eth_client::Error as EthClientError;
-use zksync_eth_client::{CallFunctionArgs, ClientError, EthInterface};
+use zksync_eth_client::{
+    clients::{DynClient, L1},
+    CallFunctionArgs, ClientError, ContractCallError, EnrichedClientError, EnrichedClientResult,
+    EthInterface,
+};
 use zksync_types::{
     ethabi::Contract,
     web3::{BlockId, BlockNumber, FilterBuilder, Log},
@@ -18,11 +21,12 @@ pub trait EthClient: 'static + fmt::Debug + Send + Sync {
         from: BlockNumber,
         to: BlockNumber,
         retries_left: usize,
-    ) -> Result<Vec<Log>, EthClientError>;
+    ) -> EnrichedClientResult<Vec<Log>>;
     /// Returns finalized L1 block number.
-    async fn finalized_block_number(&self) -> Result<u64, EthClientError>;
+    async fn finalized_block_number(&self) -> EnrichedClientResult<u64>;
     /// Returns scheduler verification key hash by verifier address.
-    async fn scheduler_vk_hash(&self, verifier_address: Address) -> Result<H256, EthClientError>;
+    async fn scheduler_vk_hash(&self, verifier_address: Address)
+        -> Result<H256, ContractCallError>;
     /// Sets list of topics to return events for.
     fn set_topics(&mut self, topics: Vec<H256>);
 }
@@ -34,7 +38,7 @@ const TOO_MANY_RESULTS_ALCHEMY: &str = "response size exceeded";
 /// Implementation of [`EthClient`] based on HTTP JSON-RPC (encapsulated via [`EthInterface`]).
 #[derive(Debug)]
 pub struct EthHttpQueryClient {
-    client: Box<dyn EthInterface>,
+    client: Box<DynClient<L1>>,
     topics: Vec<H256>,
     diamond_proxy_addr: Address,
     governance_address: Address,
@@ -46,14 +50,14 @@ pub struct EthHttpQueryClient {
 
 impl EthHttpQueryClient {
     pub fn new(
-        client: Box<dyn EthInterface>,
+        client: Box<DynClient<L1>>,
         diamond_proxy_addr: Address,
         state_transition_manager_address: Option<Address>,
         governance_address: Address,
         confirmations_for_eth_event: Option<u64>,
     ) -> Self {
         tracing::debug!(
-            "New eth client, zkSync addr: {:x}, governance addr: {:?}",
+            "New eth client, ZKsync addr: {:x}, governance addr: {:?}",
             diamond_proxy_addr,
             governance_address
         );
@@ -73,7 +77,7 @@ impl EthHttpQueryClient {
         from: BlockNumber,
         to: BlockNumber,
         topics: Vec<H256>,
-    ) -> Result<Vec<Log>, EthClientError> {
+    ) -> EnrichedClientResult<Vec<Log>> {
         let filter = FilterBuilder::default()
             .address(
                 [
@@ -89,13 +93,16 @@ impl EthHttpQueryClient {
             .to_block(to)
             .topics(Some(topics), None, None, None)
             .build();
-        self.client.logs(filter).await
+        self.client.logs(&filter).await
     }
 }
 
 #[async_trait::async_trait]
 impl EthClient for EthHttpQueryClient {
-    async fn scheduler_vk_hash(&self, verifier_address: Address) -> Result<H256, EthClientError> {
+    async fn scheduler_vk_hash(
+        &self,
+        verifier_address: Address,
+    ) -> Result<H256, ContractCallError> {
         // New verifier returns the hash of the verification key.
         CallFunctionArgs::new("verificationKeyHash", ())
             .for_contract(verifier_address, &self.verifier_contract_abi)
@@ -108,15 +115,15 @@ impl EthClient for EthHttpQueryClient {
         from: BlockNumber,
         to: BlockNumber,
         retries_left: usize,
-    ) -> Result<Vec<Log>, EthClientError> {
+    ) -> EnrichedClientResult<Vec<Log>> {
         let mut result = self.get_filter_logs(from, to, self.topics.clone()).await;
 
         // This code is compatible with both Infura and Alchemy API providers.
         // Note: we don't handle rate-limits here - assumption is that we're never going to hit them.
-        if let Err(EthClientError::EthereumGateway(err)) = &result {
-            tracing::warn!("Provider returned error message: {:?}", err);
-            let err_message = err.to_string();
-            let err_code = if let ClientError::Call(err) = err {
+        if let Err(err) = &result {
+            tracing::warn!("Provider returned error message: {err}");
+            let err_message = err.as_ref().to_string();
+            let err_code = if let ClientError::Call(err) = err.as_ref() {
                 Some(err.code())
             } else {
                 None
@@ -178,7 +185,7 @@ impl EthClient for EthHttpQueryClient {
         result
     }
 
-    async fn finalized_block_number(&self) -> Result<u64, EthClientError> {
+    async fn finalized_block_number(&self) -> EnrichedClientResult<u64> {
         if let Some(confirmations) = self.confirmations_for_eth_event {
             let latest_block_number = self.client.block_number().await?.as_u64();
             Ok(latest_block_number.saturating_sub(confirmations))
@@ -188,11 +195,13 @@ impl EthClient for EthHttpQueryClient {
                 .block(BlockId::Number(BlockNumber::Finalized))
                 .await?
                 .ok_or_else(|| {
-                    ClientError::Custom("Finalized block must be present on L1".into())
+                    let err = ClientError::Custom("Finalized block must be present on L1".into());
+                    EnrichedClientError::new(err, "block")
                 })?;
-            let block_number = block
-                .number
-                .ok_or_else(|| ClientError::Custom("Finalized block must contain number".into()))?;
+            let block_number = block.number.ok_or_else(|| {
+                let err = ClientError::Custom("Finalized block must contain number".into());
+                EnrichedClientError::new(err, "block").with_arg("block", &block)
+            })?;
             Ok(block_number.as_u64())
         }
     }
diff --git a/core/node/eth_watch/src/event_processors/governance_upgrades.rs b/core/node/eth_watch/src/event_processors/governance_upgrades.rs
index b2e06cf6c89e..72f5c411892f 100644
--- a/core/node/eth_watch/src/event_processors/governance_upgrades.rs
+++ b/core/node/eth_watch/src/event_processors/governance_upgrades.rs
@@ -1,8 +1,8 @@
 use anyhow::Context as _;
 use zksync_dal::{Connection, Core, CoreDal, DalError};
 use zksync_types::{
-    ethabi::Contract, protocol_upgrade::GovernanceOperation, web3::Log, Address, ProtocolUpgrade,
-    ProtocolVersionId, H256,
+    ethabi::Contract, protocol_upgrade::GovernanceOperation,
+    protocol_version::ProtocolSemanticVersion, web3::Log, Address, ProtocolUpgrade, H256,
 };
 
 use crate::{
@@ -14,22 +14,22 @@ use crate::{
 /// Listens to operation events coming from the governance contract and saves new protocol upgrade proposals to the database.
 #[derive(Debug)]
 pub struct GovernanceUpgradesEventProcessor {
-    // zkSync diamond proxy if pre-shared bridge; state transition manager if post shared bridge.
+    // ZKsync diamond proxy
     target_contract_address: Address,
     /// Last protocol version seen. Used to skip events for already known upgrade proposals.
-    last_seen_version_id: ProtocolVersionId,
+    last_seen_protocol_version: ProtocolSemanticVersion,
     upgrade_proposal_signature: H256,
 }
 
 impl GovernanceUpgradesEventProcessor {
     pub fn new(
         target_contract_address: Address,
-        last_seen_version_id: ProtocolVersionId,
+        last_seen_protocol_version: ProtocolSemanticVersion,
         governance_contract: &Contract,
     ) -> Self {
         Self {
             target_contract_address,
-            last_seen_version_id,
+            last_seen_protocol_version,
             upgrade_proposal_signature: governance_contract
                 .event("TransparentOperationScheduled")
                 .context("TransparentOperationScheduled event is missing in ABI")
@@ -79,39 +79,60 @@ impl EventProcessor for GovernanceUpgradesEventProcessor {
 
         let new_upgrades: Vec<_> = upgrades
             .into_iter()
-            .skip_while(|(v, _)| v.id as u16 <= self.last_seen_version_id as u16)
+            .skip_while(|(v, _)| v.version <= self.last_seen_protocol_version)
             .collect();
 
         let Some((last_upgrade, _)) = new_upgrades.last() else {
             return Ok(());
         };
-        let ids: Vec<_> = new_upgrades.iter().map(|(u, _)| u.id as u16).collect();
-        tracing::debug!("Received upgrades with ids: {ids:?}");
+        let versions: Vec<_> = new_upgrades
+            .iter()
+            .map(|(u, _)| u.version.to_string())
+            .collect();
+        tracing::debug!("Received upgrades with versions: {versions:?}");
 
-        let last_id = last_upgrade.id;
+        let last_version = last_upgrade.version;
         let stage_latency = METRICS.poll_eth_node[&PollStage::PersistUpgrades].start();
         for (upgrade, scheduler_vk_hash) in new_upgrades {
-            let previous_version = storage
+            let latest_semantic_version = storage
                 .protocol_versions_dal()
-                .load_previous_version(upgrade.id)
+                .latest_semantic_version()
                 .await
                 .map_err(DalError::generalize)?
-                .with_context(|| {
-                    format!(
-                        "expected some version preceding {:?} to be present in DB",
-                        upgrade.id
-                    )
-                })?;
-            let new_version = previous_version.apply_upgrade(upgrade, scheduler_vk_hash);
-            storage
-                .protocol_versions_dal()
-                .save_protocol_version_with_tx(&new_version)
-                .await
-                .map_err(DalError::generalize)?;
+                .context("expected some version to be present in DB")?;
+
+            if upgrade.version > latest_semantic_version {
+                let latest_version = storage
+                    .protocol_versions_dal()
+                    .get_protocol_version_with_latest_patch(latest_semantic_version.minor)
+                    .await
+                    .map_err(DalError::generalize)?
+                    .with_context(|| {
+                        format!(
+                            "expected minor version {} to be present in DB",
+                            latest_semantic_version.minor as u16
+                        )
+                    })?;
+
+                let new_version = latest_version.apply_upgrade(upgrade, scheduler_vk_hash);
+                if new_version.version.minor == latest_semantic_version.minor {
+                    // Only verification parameters may change if only patch is bumped.
+                    assert_eq!(
+                        new_version.base_system_contracts_hashes,
+                        latest_version.base_system_contracts_hashes
+                    );
+                    assert!(new_version.tx.is_none());
+                }
+                storage
+                    .protocol_versions_dal()
+                    .save_protocol_version_with_tx(&new_version)
+                    .await
+                    .map_err(DalError::generalize)?;
+            }
         }
         stage_latency.observe();
 
-        self.last_seen_version_id = last_id;
+        self.last_seen_protocol_version = last_version;
         Ok(())
     }
 
diff --git a/core/node/eth_watch/src/event_processors/mod.rs b/core/node/eth_watch/src/event_processors/mod.rs
index 2a3a6344bdbc..396bcc2e1ca5 100644
--- a/core/node/eth_watch/src/event_processors/mod.rs
+++ b/core/node/eth_watch/src/event_processors/mod.rs
@@ -1,12 +1,13 @@
 use std::fmt;
 
 use zksync_dal::{Connection, Core};
+use zksync_eth_client::{ContractCallError, EnrichedClientError};
 use zksync_types::{web3::Log, H256};
 
 pub(crate) use self::{
     governance_upgrades::GovernanceUpgradesEventProcessor, priority_ops::PriorityOpsEventProcessor,
 };
-use crate::client::{EthClient, EthClientError};
+use crate::client::EthClient;
 
 mod governance_upgrades;
 mod priority_ops;
@@ -21,7 +22,9 @@ pub(super) enum EventProcessorError {
         source: anyhow::Error,
     },
     #[error("Eth client error: {0}")]
-    Client(#[from] EthClientError),
+    Client(#[from] EnrichedClientError),
+    #[error("Contract call error: {0}")]
+    ContractCall(#[from] ContractCallError),
     /// Internal errors are considered fatal (i.e., they bubble up and lead to the watcher termination).
     #[error("internal processing error: {0:?}")]
     Internal(#[from] anyhow::Error),
diff --git a/core/node/eth_watch/src/lib.rs b/core/node/eth_watch/src/lib.rs
index a8042bb2a92c..7c27a6322c2f 100644
--- a/core/node/eth_watch/src/lib.rs
+++ b/core/node/eth_watch/src/lib.rs
@@ -1,6 +1,6 @@
 //! Ethereum watcher polls the Ethereum node for the relevant events, such as priority operations (aka L1 transactions),
 //! protocol upgrades etc.
-//! New events are accepted to the zkSync network once they have the sufficient amount of L1 confirmations.
+//! New events are accepted to the ZKsync network once they have the sufficient amount of L1 confirmations.
 
 use std::time::Duration;
 
@@ -9,8 +9,8 @@ use tokio::sync::watch;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
 use zksync_system_constants::PRIORITY_EXPIRATION;
 use zksync_types::{
-    ethabi::Contract, web3::BlockNumber as Web3BlockNumber, Address, PriorityOpId,
-    ProtocolVersionId,
+    ethabi::Contract, protocol_version::ProtocolSemanticVersion,
+    web3::BlockNumber as Web3BlockNumber, Address, PriorityOpId,
 };
 
 pub use self::client::EthHttpQueryClient;
@@ -31,7 +31,7 @@ mod tests;
 
 #[derive(Debug)]
 struct EthWatchState {
-    last_seen_version_id: ProtocolVersionId,
+    last_seen_protocol_version: ProtocolSemanticVersion,
     next_expected_priority_id: PriorityOpId,
     last_processed_ethereum_block: u64,
 }
@@ -49,7 +49,6 @@ pub struct EthWatch {
 impl EthWatch {
     pub async fn new(
         diamond_proxy_addr: Address,
-        state_transition_manager_address: Option<Address>,
         governance_contract: &Contract,
         mut client: Box<dyn EthClient>,
         pool: ConnectionPool<Core>,
@@ -63,8 +62,8 @@ impl EthWatch {
         let priority_ops_processor =
             PriorityOpsEventProcessor::new(state.next_expected_priority_id)?;
         let governance_upgrades_processor = GovernanceUpgradesEventProcessor::new(
-            state_transition_manager_address.unwrap_or(diamond_proxy_addr),
-            state.last_seen_version_id,
+            diamond_proxy_addr,
+            state.last_seen_protocol_version,
             governance_contract,
         );
         let event_processors: Vec<Box<dyn EventProcessor>> = vec![
@@ -97,9 +96,9 @@ impl EthWatch {
             .await?
             .map_or(PriorityOpId(0), |e| e + 1);
 
-        let last_seen_version_id = storage
+        let last_seen_protocol_version = storage
             .protocol_versions_dal()
-            .last_version_id()
+            .latest_semantic_version()
             .await?
             .context("expected at least one (genesis) version to be present in DB")?;
 
@@ -121,7 +120,7 @@ impl EthWatch {
 
         Ok(EthWatchState {
             next_expected_priority_id,
-            last_seen_version_id,
+            last_seen_protocol_version,
             last_processed_ethereum_block,
         })
     }
@@ -185,7 +184,7 @@ impl EthWatch {
             let relevant_topic = processor.relevant_topic();
             let processor_events = events
                 .iter()
-                .filter(|event| event.topics.get(0) == Some(&relevant_topic))
+                .filter(|event| event.topics.first() == Some(&relevant_topic))
                 .cloned()
                 .collect();
             processor
diff --git a/core/node/eth_watch/src/tests.rs b/core/node/eth_watch/src/tests.rs
index a3dfda07bf11..6b15c71bd140 100644
--- a/core/node/eth_watch/src/tests.rs
+++ b/core/node/eth_watch/src/tests.rs
@@ -3,19 +3,19 @@ use std::{collections::HashMap, convert::TryInto, sync::Arc};
 use tokio::sync::RwLock;
 use zksync_contracts::{governance_contract, hyperchain_contract};
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
+use zksync_eth_client::{ContractCallError, EnrichedClientResult};
 use zksync_types::{
-    ethabi::{encode, Hash, Token},
+    abi, ethabi,
+    ethabi::{Hash, Token},
     l1::{L1Tx, OpProcessingType, PriorityQueueType},
     protocol_upgrade::{ProtocolUpgradeTx, ProtocolUpgradeTxCommonData},
+    protocol_version::ProtocolSemanticVersion,
     web3::{BlockNumber, Log},
     Address, Execute, L1TxCommonData, PriorityOpId, ProtocolUpgrade, ProtocolVersion,
     ProtocolVersionId, Transaction, H256, U256,
 };
 
-use crate::{
-    client::{EthClient, EthClientError},
-    EthWatch,
-};
+use crate::{client::EthClient, EthWatch};
 
 #[derive(Debug)]
 struct FakeEthClientData {
@@ -105,7 +105,7 @@ impl EthClient for MockEthClient {
         from: BlockNumber,
         to: BlockNumber,
         _retries_left: usize,
-    ) -> Result<Vec<Log>, EthClientError> {
+    ) -> EnrichedClientResult<Vec<Log>> {
         let from = self.block_to_number(from).await;
         let to = self.block_to_number(to).await;
         let mut logs = vec![];
@@ -125,28 +125,29 @@ impl EthClient for MockEthClient {
 
     fn set_topics(&mut self, _topics: Vec<Hash>) {}
 
-    async fn scheduler_vk_hash(&self, _verifier_address: Address) -> Result<H256, EthClientError> {
+    async fn scheduler_vk_hash(
+        &self,
+        _verifier_address: Address,
+    ) -> Result<H256, ContractCallError> {
         Ok(H256::zero())
     }
 
-    async fn finalized_block_number(&self) -> Result<u64, EthClientError> {
+    async fn finalized_block_number(&self) -> EnrichedClientResult<u64> {
         Ok(self.inner.read().await.last_finalized_block_number)
     }
 }
 
 fn build_l1_tx(serial_id: u64, eth_block: u64) -> L1Tx {
-    L1Tx {
+    let tx = L1Tx {
         execute: Execute {
             contract_address: Address::repeat_byte(0x11),
             calldata: vec![1, 2, 3],
-            factory_deps: None,
+            factory_deps: vec![],
             value: U256::zero(),
         },
         common_data: L1TxCommonData {
             serial_id: PriorityOpId(serial_id),
             sender: [1u8; 20].into(),
-            deadline_block: 0,
-            eth_hash: [2; 32].into(),
             eth_block,
             gas_limit: Default::default(),
             max_fee_per_gas: Default::default(),
@@ -157,41 +158,48 @@ fn build_l1_tx(serial_id: u64, eth_block: u64) -> L1Tx {
             to_mint: Default::default(),
             priority_queue_type: PriorityQueueType::Deque,
             op_processing_type: OpProcessingType::Common,
-            canonical_tx_hash: H256::from_low_u64_le(serial_id),
+            canonical_tx_hash: H256::default(),
         },
         received_timestamp_ms: 0,
-    }
+    };
+    // Convert to abi::Transaction and back, so that canonical_tx_hash is computed.
+    let tx =
+        Transaction::try_from(abi::Transaction::try_from(Transaction::from(tx)).unwrap()).unwrap();
+    tx.try_into().unwrap()
 }
 
 fn build_upgrade_tx(id: ProtocolVersionId, eth_block: u64) -> ProtocolUpgradeTx {
-    ProtocolUpgradeTx {
+    let tx = ProtocolUpgradeTx {
         execute: Execute {
             contract_address: Address::repeat_byte(0x11),
             calldata: vec![1, 2, 3],
-            factory_deps: None,
+            factory_deps: vec![],
             value: U256::zero(),
         },
         common_data: ProtocolUpgradeTxCommonData {
             upgrade_id: id,
             sender: [1u8; 20].into(),
-            eth_hash: [2; 32].into(),
             eth_block,
             gas_limit: Default::default(),
             max_fee_per_gas: Default::default(),
             gas_per_pubdata_limit: 1u32.into(),
             refund_recipient: Address::zero(),
             to_mint: Default::default(),
-            canonical_tx_hash: H256::from_low_u64_be(id as u64),
+            canonical_tx_hash: H256::zero(),
         },
         received_timestamp_ms: 0,
-    }
+    };
+    // Convert to abi::Transaction and back, so that canonical_tx_hash is computed.
+    Transaction::try_from(abi::Transaction::try_from(Transaction::from(tx)).unwrap())
+        .unwrap()
+        .try_into()
+        .unwrap()
 }
 
 async fn create_test_watcher(connection_pool: ConnectionPool<Core>) -> (EthWatch, MockEthClient) {
     let client = MockEthClient::new();
     let watcher = EthWatch::new(
         Address::default(),
-        None,
         &governance_contract(),
         Box::new(client.clone()),
         connection_pool,
@@ -252,7 +260,10 @@ async fn test_gap_in_governance_upgrades() {
     client
         .add_governance_upgrades(&[(
             ProtocolUpgrade {
-                id: ProtocolVersionId::next(),
+                version: ProtocolSemanticVersion {
+                    minor: ProtocolVersionId::next(),
+                    patch: 0.into(),
+                },
                 tx: None,
                 ..Default::default()
             },
@@ -262,25 +273,25 @@ async fn test_gap_in_governance_upgrades() {
     client.set_last_finalized_block_number(15).await;
     watcher.loop_iteration(&mut storage).await.unwrap();
 
-    let db_ids = storage.protocol_versions_dal().all_version_ids().await;
+    let db_versions = storage.protocol_versions_dal().all_versions().await;
     // there should be genesis version and just added version
-    assert_eq!(db_ids.len(), 2);
+    assert_eq!(db_versions.len(), 2);
 
     let previous_version = (ProtocolVersionId::latest() as u16 - 1).try_into().unwrap();
     let next_version = ProtocolVersionId::next();
-    assert_eq!(db_ids[0], previous_version);
-    assert_eq!(db_ids[1], next_version);
+    assert_eq!(db_versions[0].minor, previous_version);
+    assert_eq!(db_versions[1].minor, next_version);
 }
 
 #[tokio::test]
 async fn test_normal_operation_governance_upgrades() {
+    zksync_concurrency::testonly::abort_on_panic();
     let connection_pool = ConnectionPool::<Core>::test_pool().await;
     setup_db(&connection_pool).await;
 
     let mut client = MockEthClient::new();
     let mut watcher = EthWatch::new(
         Address::default(),
-        None,
         &governance_contract(),
         Box::new(client.clone()),
         connection_pool.clone(),
@@ -294,7 +305,6 @@ async fn test_normal_operation_governance_upgrades() {
         .add_governance_upgrades(&[
             (
                 ProtocolUpgrade {
-                    id: ProtocolVersionId::latest(),
                     tx: None,
                     ..Default::default()
                 },
@@ -302,31 +312,51 @@ async fn test_normal_operation_governance_upgrades() {
             ),
             (
                 ProtocolUpgrade {
-                    id: ProtocolVersionId::next(),
+                    version: ProtocolSemanticVersion {
+                        minor: ProtocolVersionId::next(),
+                        patch: 0.into(),
+                    },
                     tx: Some(build_upgrade_tx(ProtocolVersionId::next(), 18)),
                     ..Default::default()
                 },
                 18,
             ),
+            (
+                ProtocolUpgrade {
+                    version: ProtocolSemanticVersion {
+                        minor: ProtocolVersionId::next(),
+                        patch: 1.into(),
+                    },
+                    tx: None,
+                    ..Default::default()
+                },
+                19,
+            ),
         ])
         .await;
     client.set_last_finalized_block_number(15).await;
-    // second upgrade will not be processed, as it has less than 5 confirmations
+    // The second upgrade will not be processed, as it has less than 5 confirmations.
     watcher.loop_iteration(&mut storage).await.unwrap();
 
-    let db_ids = storage.protocol_versions_dal().all_version_ids().await;
-    // there should be genesis version and just added version
-    assert_eq!(db_ids.len(), 2);
-    assert_eq!(db_ids[1], ProtocolVersionId::latest());
+    let db_versions = storage.protocol_versions_dal().all_versions().await;
+    // There should be genesis version and just added version.
+    assert_eq!(db_versions.len(), 2);
+    assert_eq!(db_versions[1].minor, ProtocolVersionId::latest());
 
     client.set_last_finalized_block_number(20).await;
-    // now the second upgrade will be processed
+    // Now the second and the third upgrades will be processed.
     watcher.loop_iteration(&mut storage).await.unwrap();
-    let db_ids = storage.protocol_versions_dal().all_version_ids().await;
-    assert_eq!(db_ids.len(), 3);
-    assert_eq!(db_ids[2], ProtocolVersionId::next());
+    let db_versions = storage.protocol_versions_dal().all_versions().await;
+    let mut expected_version = ProtocolSemanticVersion {
+        minor: ProtocolVersionId::next(),
+        patch: 0.into(),
+    };
+    assert_eq!(db_versions.len(), 4);
+    assert_eq!(db_versions[2], expected_version);
+    expected_version.patch += 1;
+    assert_eq!(db_versions[3], expected_version);
 
-    // check that tx was saved with the last upgrade
+    // Check that tx was saved with the second upgrade.
     let tx = storage
         .protocol_versions_dal()
         .get_protocol_upgrade_tx(ProtocolVersionId::next())
@@ -387,6 +417,7 @@ async fn test_gap_between_batches() {
 
 #[tokio::test]
 async fn test_overlapping_batches() {
+    zksync_concurrency::testonly::abort_on_panic();
     let connection_pool = ConnectionPool::<Core>::test_pool().await;
     setup_db(&connection_pool).await;
     let (mut watcher, mut client) = create_test_watcher(connection_pool.clone()).await;
@@ -437,39 +468,27 @@ async fn get_all_db_txs(storage: &mut Connection<'_, Core>) -> Vec<Transaction>
 }
 
 fn tx_into_log(tx: L1Tx) -> Log {
-    let eth_block = tx.eth_block().0.into();
-
-    let tx_data_token = Token::Tuple(vec![
-        Token::Uint(0xff.into()),
-        Token::Address(tx.common_data.sender),
-        Token::Address(tx.execute.contract_address),
-        Token::Uint(tx.common_data.gas_limit),
-        Token::Uint(tx.common_data.gas_per_pubdata_limit),
-        Token::Uint(tx.common_data.max_fee_per_gas),
-        Token::Uint(U256::zero()),
-        Token::Address(Address::zero()),
-        Token::Uint(tx.common_data.serial_id.0.into()),
-        Token::Uint(tx.execute.value),
-        Token::FixedArray(vec![
-            Token::Uint(U256::zero()),
-            Token::Uint(U256::zero()),
-            Token::Uint(U256::zero()),
-            Token::Uint(U256::zero()),
-        ]),
-        Token::Bytes(tx.execute.calldata),
-        Token::Bytes(Vec::new()),
-        Token::Array(Vec::new()),
-        Token::Bytes(Vec::new()),
-        Token::Bytes(Vec::new()),
-    ]);
+    let tx = abi::Transaction::try_from(Transaction::from(tx)).unwrap();
+    let abi::Transaction::L1 {
+        tx,
+        factory_deps,
+        eth_block,
+        ..
+    } = tx
+    else {
+        unreachable!()
+    };
 
-    let data = encode(&[
-        Token::Uint(tx.common_data.serial_id.0.into()),
-        Token::FixedBytes(H256::random().0.to_vec()),
-        Token::Uint(u64::MAX.into()),
-        tx_data_token,
-        Token::Array(Vec::new()),
-    ]);
+    let data = ethabi::encode(
+        &abi::NewPriorityRequest {
+            tx_id: tx.nonce,
+            tx_hash: tx.hash().into(),
+            expiration_timestamp: u64::MAX,
+            transaction: tx,
+            factory_deps,
+        }
+        .encode(),
+    );
 
     Log {
         address: Address::repeat_byte(0x1),
@@ -479,8 +498,8 @@ fn tx_into_log(tx: L1Tx) -> Log {
             .signature()],
         data: data.into(),
         block_hash: Some(H256::repeat_byte(0x11)),
-        block_number: Some(eth_block),
-        transaction_hash: Some(H256::random()),
+        block_number: Some(eth_block.into()),
+        transaction_hash: Some(H256::default()),
         transaction_index: Some(0u64.into()),
         log_index: Some(0u64.into()),
         transaction_log_index: Some(0u64.into()),
@@ -498,7 +517,7 @@ fn upgrade_into_governor_log(upgrade: ProtocolUpgrade, eth_block: u64) -> Log {
     let diamond_upgrade_calldata = execute_upgrade_selector
         .iter()
         .copied()
-        .chain(encode(&[diamond_cut]))
+        .chain(ethabi::encode(&[diamond_cut]))
         .collect();
     let governance_call = Token::Tuple(vec![
         Token::Address(Default::default()),
@@ -510,7 +529,7 @@ fn upgrade_into_governor_log(upgrade: ProtocolUpgrade, eth_block: u64) -> Log {
         Token::FixedBytes(vec![0u8; 32]),
         Token::FixedBytes(vec![0u8; 32]),
     ]);
-    let final_data = encode(&[Token::FixedBytes(vec![0u8; 32]), governance_operation]);
+    let final_data = ethabi::encode(&[Token::FixedBytes(vec![0u8; 32]), governance_operation]);
 
     Log {
         address: Address::repeat_byte(0x1),
@@ -534,114 +553,39 @@ fn upgrade_into_governor_log(upgrade: ProtocolUpgrade, eth_block: u64) -> Log {
 }
 
 fn upgrade_into_diamond_cut(upgrade: ProtocolUpgrade) -> Token {
-    let tx_data_token = if let Some(tx) = upgrade.tx {
-        Token::Tuple(vec![
-            Token::Uint(0xfe.into()),
-            Token::Address(tx.common_data.sender),
-            Token::Address(tx.execute.contract_address),
-            Token::Uint(tx.common_data.gas_limit),
-            Token::Uint(tx.common_data.gas_per_pubdata_limit),
-            Token::Uint(tx.common_data.max_fee_per_gas),
-            Token::Uint(U256::zero()),
-            Token::Address(Address::zero()),
-            Token::Uint((tx.common_data.upgrade_id as u16).into()),
-            Token::Uint(tx.execute.value),
-            Token::FixedArray(vec![
-                Token::Uint(U256::zero()),
-                Token::Uint(U256::zero()),
-                Token::Uint(U256::zero()),
-                Token::Uint(U256::zero()),
-            ]),
-            Token::Bytes(tx.execute.calldata),
-            Token::Bytes(Vec::new()),
-            Token::Array(Vec::new()),
-            Token::Bytes(Vec::new()),
-            Token::Bytes(Vec::new()),
-        ])
-    } else {
-        Token::Tuple(vec![
-            Token::Uint(0.into()),
-            Token::Address(Default::default()),
-            Token::Address(Default::default()),
-            Token::Uint(Default::default()),
-            Token::Uint(Default::default()),
-            Token::Uint(Default::default()),
-            Token::Uint(Default::default()),
-            Token::Address(Default::default()),
-            Token::Uint(Default::default()),
-            Token::Uint(Default::default()),
-            Token::FixedArray(vec![
-                Token::Uint(Default::default()),
-                Token::Uint(Default::default()),
-                Token::Uint(Default::default()),
-                Token::Uint(Default::default()),
-            ]),
-            Token::Bytes(Default::default()),
-            Token::Bytes(Default::default()),
-            Token::Array(Default::default()),
-            Token::Bytes(Default::default()),
-            Token::Bytes(Default::default()),
-        ])
+    let abi::Transaction::L1 {
+        tx, factory_deps, ..
+    } = upgrade
+        .tx
+        .map(|tx| Transaction::from(tx).try_into().unwrap())
+        .unwrap_or(abi::Transaction::L1 {
+            tx: Default::default(),
+            factory_deps: vec![],
+            eth_block: 0,
+        })
+    else {
+        unreachable!()
     };
-
-    let upgrade_token = Token::Tuple(vec![
-        tx_data_token,
-        Token::Array(Vec::new()),
-        Token::FixedBytes(
-            upgrade
-                .bootloader_code_hash
-                .unwrap_or_default()
-                .as_bytes()
-                .to_vec(),
-        ),
-        Token::FixedBytes(
-            upgrade
-                .default_account_code_hash
-                .unwrap_or_default()
-                .as_bytes()
-                .to_vec(),
-        ),
-        Token::Address(upgrade.verifier_address.unwrap_or_default()),
-        Token::Tuple(vec![
-            Token::FixedBytes(
-                upgrade
-                    .verifier_params
-                    .unwrap_or_default()
-                    .recursion_node_level_vk_hash
-                    .as_bytes()
-                    .to_vec(),
-            ),
-            Token::FixedBytes(
-                upgrade
-                    .verifier_params
-                    .unwrap_or_default()
-                    .recursion_leaf_level_vk_hash
-                    .as_bytes()
-                    .to_vec(),
-            ),
-            Token::FixedBytes(
-                upgrade
-                    .verifier_params
-                    .unwrap_or_default()
-                    .recursion_circuits_set_vks_hash
-                    .as_bytes()
-                    .to_vec(),
-            ),
-        ]),
-        Token::Bytes(Default::default()),
-        Token::Bytes(Default::default()),
-        Token::Uint(upgrade.timestamp.into()),
-        Token::Uint((upgrade.id as u16).into()),
-        Token::Address(Default::default()),
-    ]);
-
+    let upgrade_token = abi::ProposedUpgrade {
+        l2_protocol_upgrade_tx: tx,
+        factory_deps,
+        bootloader_hash: upgrade.bootloader_code_hash.unwrap_or_default().into(),
+        default_account_hash: upgrade.default_account_code_hash.unwrap_or_default().into(),
+        verifier: upgrade.verifier_address.unwrap_or_default(),
+        verifier_params: upgrade.verifier_params.unwrap_or_default().into(),
+        l1_contracts_upgrade_calldata: vec![],
+        post_upgrade_calldata: vec![],
+        upgrade_timestamp: upgrade.timestamp.into(),
+        new_protocol_version: upgrade.version.pack(),
+    }
+    .encode();
     Token::Tuple(vec![
         Token::Array(vec![]),
         Token::Address(Default::default()),
         Token::Bytes(
             vec![0u8; 4]
                 .into_iter()
-                .chain(encode(&[upgrade_token]))
+                .chain(ethabi::encode(&[upgrade_token]))
                 .collect(),
         ),
     ])
@@ -654,7 +598,10 @@ async fn setup_db(connection_pool: &ConnectionPool<Core>) {
         .unwrap()
         .protocol_versions_dal()
         .save_protocol_version_with_tx(&ProtocolVersion {
-            id: (ProtocolVersionId::latest() as u16 - 1).try_into().unwrap(),
+            version: ProtocolSemanticVersion {
+                minor: (ProtocolVersionId::latest() as u16 - 1).try_into().unwrap(),
+                patch: 0.into(),
+            },
             ..Default::default()
         })
         .await
diff --git a/core/node/fee_model/Cargo.toml b/core/node/fee_model/Cargo.toml
index 55453c7fae21..006a2c22da7e 100644
--- a/core/node/fee_model/Cargo.toml
+++ b/core/node/fee_model/Cargo.toml
@@ -17,6 +17,8 @@ zksync_config.workspace = true
 zksync_eth_client.workspace = true
 zksync_utils.workspace = true
 zksync_web3_decl.workspace = true
+zksync_base_token_adjuster.workspace = true
+bigdecimal.workspace = true
 
 tokio = { workspace = true, features = ["time"] }
 anyhow.workspace = true
@@ -25,4 +27,4 @@ tracing.workspace = true
 
 [dev-dependencies]
 test-casing.workspace = true
-zksync_node_test_utils.workspace = true
\ No newline at end of file
+zksync_node_test_utils.workspace = true
diff --git a/core/node/fee_model/src/l1_gas_price/gas_adjuster/mod.rs b/core/node/fee_model/src/l1_gas_price/gas_adjuster/mod.rs
index a6c8eb0520e8..2032cb9c89fd 100644
--- a/core/node/fee_model/src/l1_gas_price/gas_adjuster/mod.rs
+++ b/core/node/fee_model/src/l1_gas_price/gas_adjuster/mod.rs
@@ -2,17 +2,17 @@
 
 use std::{
     collections::VecDeque,
-    ops::RangeInclusive,
     sync::{Arc, RwLock},
 };
 
 use tokio::sync::watch;
 use zksync_config::{configs::eth_sender::PubdataSendingMode, GasAdjusterConfig};
-use zksync_eth_client::{Error, EthInterface};
-use zksync_types::{U256, U64};
+use zksync_eth_client::EthInterface;
+use zksync_types::{commitment::L1BatchCommitmentMode, L1_GAS_PER_PUBDATA_BYTE, U256};
+use zksync_web3_decl::client::{DynClient, L1};
 
 use self::metrics::METRICS;
-use super::{L1TxParamsProvider, PubdataPricing};
+use super::L1TxParamsProvider;
 
 mod metrics;
 #[cfg(test)]
@@ -30,17 +30,17 @@ pub struct GasAdjuster {
     pub(super) blob_base_fee_statistics: GasStatistics<U256>,
     pub(super) config: GasAdjusterConfig,
     pubdata_sending_mode: PubdataSendingMode,
-    eth_client: Box<dyn EthInterface>,
-    pubdata_pricing: Arc<dyn PubdataPricing>,
+    eth_client: Box<DynClient<L1>>,
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 impl GasAdjuster {
     pub async fn new(
-        eth_client: Box<dyn EthInterface>,
+        eth_client: Box<DynClient<L1>>,
         config: GasAdjusterConfig,
         pubdata_sending_mode: PubdataSendingMode,
-        pubdata_pricing: Arc<dyn PubdataPricing>,
-    ) -> Result<Self, Error> {
+        commitment_mode: L1BatchCommitmentMode,
+    ) -> anyhow::Result<Self> {
         let eth_client = eth_client.for_component("gas_adjuster");
 
         // Subtracting 1 from the "latest" block number to prevent errors in case
@@ -51,36 +51,35 @@ impl GasAdjuster {
             .await?
             .as_usize()
             .saturating_sub(1);
-        let base_fee_history = eth_client
+        let fee_history = eth_client
             .base_fee_history(current_block, config.max_base_fee_samples)
             .await?;
 
-        // Web3 API doesn't provide a method to fetch blob fees for multiple blocks using single request,
-        // so we request blob base fee only for the latest block.
-        let (_, last_block_blob_base_fee) =
-            Self::get_base_fees_history(eth_client.as_ref(), current_block..=current_block).await?;
+        let base_fee_statistics = GasStatistics::new(
+            config.max_base_fee_samples,
+            current_block,
+            fee_history.iter().map(|fee| fee.base_fee_per_gas),
+        );
+
+        let blob_base_fee_statistics = GasStatistics::new(
+            config.num_samples_for_blob_base_fee_estimate,
+            current_block,
+            fee_history.iter().map(|fee| fee.base_fee_per_blob_gas),
+        );
 
         Ok(Self {
-            base_fee_statistics: GasStatistics::new(
-                config.max_base_fee_samples,
-                current_block,
-                &base_fee_history,
-            ),
-            blob_base_fee_statistics: GasStatistics::new(
-                config.num_samples_for_blob_base_fee_estimate,
-                current_block,
-                &last_block_blob_base_fee,
-            ),
+            base_fee_statistics,
+            blob_base_fee_statistics,
             config,
             pubdata_sending_mode,
             eth_client,
-            pubdata_pricing,
+            commitment_mode,
         })
     }
 
     /// Performs an actualization routine for `GasAdjuster`.
     /// This method is intended to be invoked periodically.
-    pub async fn keep_updated(&self) -> Result<(), Error> {
+    pub async fn keep_updated(&self) -> anyhow::Result<()> {
         // Subtracting 1 from the "latest" block number to prevent errors in case
         // the info about the latest block is not yet present on the node.
         // This sometimes happens on Infura.
@@ -94,25 +93,29 @@ impl GasAdjuster {
         let last_processed_block = self.base_fee_statistics.last_processed_block();
 
         if current_block > last_processed_block {
-            let (base_fee_history, blob_base_fee_history) = Self::get_base_fees_history(
-                self.eth_client.as_ref(),
-                (last_processed_block + 1)..=current_block,
-            )
-            .await?;
+            let n_blocks = current_block - last_processed_block;
+            let base_fees = self
+                .eth_client
+                .base_fee_history(current_block, n_blocks)
+                .await?;
 
             // We shouldn't rely on L1 provider to return consistent results, so we check that we have at least one new sample.
-            if let Some(current_base_fee_per_gas) = base_fee_history.last() {
+            if let Some(current_base_fee_per_gas) = base_fees.last().map(|fee| fee.base_fee_per_gas)
+            {
                 METRICS
                     .current_base_fee_per_gas
-                    .set(*current_base_fee_per_gas);
+                    .set(current_base_fee_per_gas);
             }
-            self.base_fee_statistics.add_samples(&base_fee_history);
+            self.base_fee_statistics
+                .add_samples(base_fees.iter().map(|fee| fee.base_fee_per_gas));
 
-            if let Some(current_blob_base_fee) = blob_base_fee_history.last() {
+            if let Some(current_blob_base_fee) =
+                base_fees.last().map(|fee| fee.base_fee_per_blob_gas)
+            {
                 // Blob base fee overflows `u64` only in very extreme cases.
                 // It doesn't worth to observe exact value with metric because anyway values that can be used
                 // are capped by `self.config.max_blob_base_fee()` of `u64` type.
-                if current_blob_base_fee > &U256::from(u64::MAX) {
+                if current_blob_base_fee > U256::from(u64::MAX) {
                     tracing::error!("Failed to report current_blob_base_fee = {current_blob_base_fee}, it exceeds u64::MAX");
                 } else {
                     METRICS
@@ -121,7 +124,7 @@ impl GasAdjuster {
                 }
             }
             self.blob_base_fee_statistics
-                .add_samples(&blob_base_fee_history);
+                .add_samples(base_fees.iter().map(|fee| fee.base_fee_per_blob_gas));
         }
         Ok(())
     }
@@ -194,69 +197,38 @@ impl GasAdjuster {
                     * BLOB_GAS_PER_BYTE as f64
                     * self.config.internal_pubdata_pricing_multiplier;
 
-                self.pubdata_pricing
-                    .bound_blob_base_fee(calculated_price, self.config.max_blob_base_fee())
+                self.bound_blob_base_fee(calculated_price)
             }
             PubdataSendingMode::Calldata => {
-                self.estimate_effective_gas_price() * self.pubdata_pricing.pubdata_byte_gas()
-            }
-        }
-    }
-
-    /// Returns vector of base fees and blob base fees for given block range.
-    /// Note, that data for pre-dencun blocks won't be included in the vector returned.
-    async fn get_base_fees_history(
-        eth_client: &dyn EthInterface,
-        block_range: RangeInclusive<usize>,
-    ) -> Result<(Vec<u64>, Vec<U256>), Error> {
-        let mut base_fee_history = Vec::new();
-        let mut blob_base_fee_history = Vec::new();
-        for block_number in block_range {
-            let header = eth_client.block(U64::from(block_number).into()).await?;
-            if let Some(base_fee_per_gas) =
-                header.as_ref().and_then(|header| header.base_fee_per_gas)
-            {
-                base_fee_history.push(base_fee_per_gas.as_u64())
+                self.estimate_effective_gas_price() * self.pubdata_byte_gas()
             }
-
-            if let Some(excess_blob_gas) = header.as_ref().and_then(|header| header.excess_blob_gas)
-            {
-                blob_base_fee_history.push(Self::blob_base_fee(excess_blob_gas.as_u64()))
+            PubdataSendingMode::Custom => {
+                // Fix this when we have a better understanding of dynamic pricing for custom DA layers.
+                // GitHub issue: https://github.com/matter-labs/zksync-era/issues/2105
+                0
             }
         }
-
-        Ok((base_fee_history, blob_base_fee_history))
     }
 
-    /// Calculates `blob_base_fee` given `excess_blob_gas`.
-    fn blob_base_fee(excess_blob_gas: u64) -> U256 {
-        // Constants and formula are taken from EIP4844 specification.
-        const MIN_BLOB_BASE_FEE: u32 = 1;
-        const BLOB_BASE_FEE_UPDATE_FRACTION: u32 = 3338477;
-
-        Self::fake_exponential(
-            MIN_BLOB_BASE_FEE.into(),
-            excess_blob_gas.into(),
-            BLOB_BASE_FEE_UPDATE_FRACTION.into(),
-        )
+    fn pubdata_byte_gas(&self) -> u64 {
+        match self.commitment_mode {
+            L1BatchCommitmentMode::Validium => 0,
+            L1BatchCommitmentMode::Rollup => L1_GAS_PER_PUBDATA_BYTE.into(),
+        }
     }
 
-    /// approximates `factor * e ** (numerator / denominator)` using Taylor expansion.
-    fn fake_exponential(factor: U256, numerator: U256, denominator: U256) -> U256 {
-        let mut i = 1_u32;
-        let mut output = U256::zero();
-        let mut accum = factor * denominator;
-        while !accum.is_zero() {
-            output += accum;
-
-            accum *= numerator;
-            accum /= denominator;
-            accum /= U256::from(i);
-
-            i += 1;
+    fn bound_blob_base_fee(&self, blob_base_fee: f64) -> u64 {
+        let max_blob_base_fee = self.config.max_blob_base_fee();
+        match self.commitment_mode {
+            L1BatchCommitmentMode::Validium => 0,
+            L1BatchCommitmentMode::Rollup => {
+                if blob_base_fee > max_blob_base_fee as f64 {
+                    tracing::error!("Blob base fee is too high: {blob_base_fee}, using max allowed: {max_blob_base_fee}");
+                    return max_blob_base_fee;
+                }
+                blob_base_fee as u64
+            }
         }
-
-        output / denominator
     }
 }
 
@@ -313,6 +285,22 @@ impl L1TxParamsProvider for GasAdjuster {
     fn get_priority_fee(&self) -> u64 {
         self.config.default_priority_fee_per_gas
     }
+
+    // The idea is that when we finally decide to send blob tx, we want to offer gas fees high
+    // enough to "almost be certain" that the transaction gets included. To never have to double
+    // the gas prices as then we have very little control how much we pay in the end. This strategy
+    // works as no matter if we double or triple such price, we pay the same block base fees.
+    fn get_blob_tx_base_fee(&self) -> u64 {
+        self.base_fee_statistics.last_added_value() * 2
+    }
+
+    fn get_blob_tx_blob_base_fee(&self) -> u64 {
+        self.blob_base_fee_statistics.last_added_value().as_u64() * 2
+    }
+
+    fn get_blob_tx_priority_fee(&self) -> u64 {
+        self.get_priority_fee() * 2
+    }
 }
 
 /// Helper structure responsible for collecting the data about recent transactions,
@@ -326,7 +314,7 @@ pub(super) struct GasStatisticsInner<T> {
 }
 
 impl<T: Ord + Copy + Default> GasStatisticsInner<T> {
-    fn new(max_samples: usize, block: usize, fee_history: &[T]) -> Self {
+    fn new(max_samples: usize, block: usize, fee_history: impl IntoIterator<Item = T>) -> Self {
         let mut statistics = Self {
             max_samples,
             samples: VecDeque::with_capacity(max_samples),
@@ -350,9 +338,11 @@ impl<T: Ord + Copy + Default> GasStatisticsInner<T> {
         self.samples.back().copied().unwrap_or(self.median_cached)
     }
 
-    fn add_samples(&mut self, fees: &[T]) {
+    fn add_samples(&mut self, fees: impl IntoIterator<Item = T>) {
+        let old_len = self.samples.len();
         self.samples.extend(fees);
-        self.last_processed_block += fees.len();
+        let processed_blocks = self.samples.len() - old_len;
+        self.last_processed_block += processed_blocks;
 
         let extra = self.samples.len().saturating_sub(self.max_samples);
         self.samples.drain(..extra);
@@ -370,7 +360,7 @@ impl<T: Ord + Copy + Default> GasStatisticsInner<T> {
 pub(super) struct GasStatistics<T>(RwLock<GasStatisticsInner<T>>);
 
 impl<T: Ord + Copy + Default> GasStatistics<T> {
-    pub fn new(max_samples: usize, block: usize, fee_history: &[T]) -> Self {
+    pub fn new(max_samples: usize, block: usize, fee_history: impl IntoIterator<Item = T>) -> Self {
         Self(RwLock::new(GasStatisticsInner::new(
             max_samples,
             block,
@@ -386,7 +376,7 @@ impl<T: Ord + Copy + Default> GasStatistics<T> {
         self.0.read().unwrap().last_added_value()
     }
 
-    pub fn add_samples(&self, fees: &[T]) {
+    pub fn add_samples(&self, fees: impl IntoIterator<Item = T>) {
         self.0.write().unwrap().add_samples(fees)
     }
 
diff --git a/core/node/fee_model/src/l1_gas_price/gas_adjuster/tests.rs b/core/node/fee_model/src/l1_gas_price/gas_adjuster/tests.rs
index e231d48d2f63..200903b6deda 100644
--- a/core/node/fee_model/src/l1_gas_price/gas_adjuster/tests.rs
+++ b/core/node/fee_model/src/l1_gas_price/gas_adjuster/tests.rs
@@ -1,134 +1,121 @@
-use std::{collections::VecDeque, sync::Arc};
+use std::{collections::VecDeque, sync::RwLockReadGuard};
 
 use test_casing::test_casing;
 use zksync_config::{configs::eth_sender::PubdataSendingMode, GasAdjusterConfig};
-use zksync_eth_client::clients::MockEthereum;
-use zksync_node_test_utils::DeploymentMode;
+use zksync_eth_client::{clients::MockEthereum, BaseFees};
+use zksync_types::commitment::L1BatchCommitmentMode;
 
-use super::{GasAdjuster, GasStatisticsInner, PubdataPricing};
-use crate::l1_gas_price::{RollupPubdataPricing, ValidiumPubdataPricing};
+use super::{GasAdjuster, GasStatistics, GasStatisticsInner};
 
 /// Check that we compute the median correctly
 #[test]
 fn median() {
     // sorted: 4 4 6 7 8
-    assert_eq!(GasStatisticsInner::new(5, 5, &[6, 4, 7, 8, 4]).median(), 6);
+    assert_eq!(GasStatisticsInner::new(5, 5, [6, 4, 7, 8, 4]).median(), 6);
     // sorted: 4 4 8 10
-    assert_eq!(GasStatisticsInner::new(4, 4, &[8, 4, 4, 10]).median(), 8);
+    assert_eq!(GasStatisticsInner::new(4, 4, [8, 4, 4, 10]).median(), 8);
 }
 
 /// Check that we properly manage the block base fee queue
 #[test]
 fn samples_queue() {
-    let mut stats = GasStatisticsInner::new(5, 5, &[6, 4, 7, 8, 4, 5]);
+    let mut stats = GasStatisticsInner::new(5, 5, [6, 4, 7, 8, 4, 5]);
 
     assert_eq!(stats.samples, VecDeque::from([4, 7, 8, 4, 5]));
 
-    stats.add_samples(&[18, 18, 18]);
+    stats.add_samples([18, 18, 18]);
 
     assert_eq!(stats.samples, VecDeque::from([4, 5, 18, 18, 18]));
 }
 
 /// Check that we properly fetch base fees as block are mined
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, [L1BatchCommitmentMode::Rollup, L1BatchCommitmentMode::Validium])]
 #[tokio::test]
-async fn kept_updated(deployment_mode: DeploymentMode) {
-    let eth_client = Box::new(
-        MockEthereum::default()
-            .with_fee_history(vec![0, 4, 6, 8, 7, 5, 5, 8, 10, 9])
-            .with_excess_blob_gas_history(vec![
-                393216,
-                393216 * 2,
-                393216,
-                393216 * 2,
-                393216,
-                393216 * 2,
-                393216 * 3,
-                393216 * 4,
-            ]),
-    );
-    eth_client.advance_block_number(5);
-
-    let pubdata_pricing: Arc<dyn PubdataPricing> = match deployment_mode {
-        DeploymentMode::Validium => Arc::new(ValidiumPubdataPricing {}),
-        DeploymentMode::Rollup => Arc::new(RollupPubdataPricing {}),
+async fn kept_updated(commitment_mode: L1BatchCommitmentMode) {
+    // Helper function to read a value from adjuster
+    fn read<T>(statistics: &GasStatistics<T>) -> RwLockReadGuard<GasStatisticsInner<T>> {
+        statistics.0.read().unwrap()
+    }
+
+    let block_fees = vec![0, 4, 6, 8, 7, 5, 5, 8, 10, 9];
+    let blob_fees = vec![
+        0,
+        393216,
+        393216,
+        393216 * 2,
+        393216,
+        393216 * 2,
+        393216 * 2,
+        393216 * 3,
+        393216 * 4,
+        393216,
+    ];
+    let base_fees = block_fees
+        .into_iter()
+        .zip(blob_fees)
+        .map(|(block, blob)| BaseFees {
+            base_fee_per_gas: block,
+            base_fee_per_blob_gas: blob.into(),
+        })
+        .collect();
+
+    let eth_client = MockEthereum::builder().with_fee_history(base_fees).build();
+    // 5 sampled blocks + additional block to account for latest block subtraction
+    eth_client.advance_block_number(6);
+
+    let config = GasAdjusterConfig {
+        default_priority_fee_per_gas: 5,
+        max_base_fee_samples: 5,
+        pricing_formula_parameter_a: 1.5,
+        pricing_formula_parameter_b: 1.0005,
+        internal_l1_pricing_multiplier: 0.8,
+        internal_enforced_l1_gas_price: None,
+        internal_enforced_pubdata_price: None,
+        poll_period: 5,
+        max_l1_gas_price: None,
+        num_samples_for_blob_base_fee_estimate: 3,
+        internal_pubdata_pricing_multiplier: 1.0,
+        max_blob_base_fee: None,
     };
-
     let adjuster = GasAdjuster::new(
-        eth_client.clone(),
-        GasAdjusterConfig {
-            default_priority_fee_per_gas: 5,
-            max_base_fee_samples: 5,
-            pricing_formula_parameter_a: 1.5,
-            pricing_formula_parameter_b: 1.0005,
-            internal_l1_pricing_multiplier: 0.8,
-            internal_enforced_l1_gas_price: None,
-            internal_enforced_pubdata_price: None,
-            poll_period: 5,
-            max_l1_gas_price: None,
-            num_samples_for_blob_base_fee_estimate: 3,
-            internal_pubdata_pricing_multiplier: 1.0,
-            max_blob_base_fee: None,
-        },
+        Box::new(eth_client.clone().into_client()),
+        config,
         PubdataSendingMode::Calldata,
-        pubdata_pricing,
+        commitment_mode,
     )
     .await
     .unwrap();
 
     assert_eq!(
-        adjuster.base_fee_statistics.0.read().unwrap().samples.len(),
-        5
+        read(&adjuster.base_fee_statistics).samples.len(),
+        config.max_base_fee_samples
     );
-    assert_eq!(adjuster.base_fee_statistics.0.read().unwrap().median(), 6);
+    assert_eq!(read(&adjuster.base_fee_statistics).median(), 6);
 
-    let expected_median_blob_base_fee = GasAdjuster::blob_base_fee(393216);
+    eprintln!("{:?}", read(&adjuster.blob_base_fee_statistics).samples);
+    let expected_median_blob_base_fee = 393216 * 2;
     assert_eq!(
-        adjuster
-            .blob_base_fee_statistics
-            .0
-            .read()
-            .unwrap()
-            .samples
-            .len(),
-        1
+        read(&adjuster.blob_base_fee_statistics).samples.len(),
+        config.num_samples_for_blob_base_fee_estimate
     );
     assert_eq!(
-        adjuster.blob_base_fee_statistics.0.read().unwrap().median(),
-        expected_median_blob_base_fee
+        read(&adjuster.blob_base_fee_statistics).median(),
+        expected_median_blob_base_fee.into()
     );
 
     eth_client.advance_block_number(3);
     adjuster.keep_updated().await.unwrap();
 
     assert_eq!(
-        adjuster.base_fee_statistics.0.read().unwrap().samples.len(),
-        5
+        read(&adjuster.base_fee_statistics).samples.len(),
+        config.max_base_fee_samples
     );
-    assert_eq!(adjuster.base_fee_statistics.0.read().unwrap().median(), 7);
+    assert_eq!(read(&adjuster.base_fee_statistics).median(), 7);
 
-    let expected_median_blob_base_fee = GasAdjuster::blob_base_fee(393216 * 3);
-    assert_eq!(
-        adjuster
-            .blob_base_fee_statistics
-            .0
-            .read()
-            .unwrap()
-            .samples
-            .len(),
-        3
-    );
+    let expected_median_blob_base_fee = 393216 * 3;
+    assert_eq!(read(&adjuster.blob_base_fee_statistics).samples.len(), 3);
     assert_eq!(
-        adjuster.blob_base_fee_statistics.0.read().unwrap().median(),
-        expected_median_blob_base_fee
+        read(&adjuster.blob_base_fee_statistics).median(),
+        expected_median_blob_base_fee.into()
     );
 }
-
-#[test]
-fn blob_base_fee_formula() {
-    const EXCESS_BLOB_GAS: u64 = 0x4b80000;
-    const EXPECTED_BLOB_BASE_FEE: u64 = 19893400088;
-
-    let blob_base_fee = GasAdjuster::blob_base_fee(EXCESS_BLOB_GAS);
-    assert_eq!(blob_base_fee.as_u64(), EXPECTED_BLOB_BASE_FEE);
-}
diff --git a/core/node/fee_model/src/l1_gas_price/main_node_fetcher.rs b/core/node/fee_model/src/l1_gas_price/main_node_fetcher.rs
index 9f8c19ad19f3..259a5e3e3fed 100644
--- a/core/node/fee_model/src/l1_gas_price/main_node_fetcher.rs
+++ b/core/node/fee_model/src/l1_gas_price/main_node_fetcher.rs
@@ -6,7 +6,9 @@ use std::{
 use tokio::sync::watch::Receiver;
 use zksync_types::fee_model::FeeParams;
 use zksync_web3_decl::{
-    client::BoxedL2Client, error::ClientRpcContext, namespaces::ZksNamespaceClient,
+    client::{DynClient, L2},
+    error::ClientRpcContext,
+    namespaces::ZksNamespaceClient,
 };
 
 use crate::BatchFeeModelInputProvider;
@@ -21,12 +23,12 @@ const SLEEP_INTERVAL: Duration = Duration::from_secs(5);
 /// since it relies on the configuration, which may change.
 #[derive(Debug)]
 pub struct MainNodeFeeParamsFetcher {
-    client: BoxedL2Client,
+    client: Box<DynClient<L2>>,
     main_node_fee_params: RwLock<FeeParams>,
 }
 
 impl MainNodeFeeParamsFetcher {
-    pub fn new(client: BoxedL2Client) -> Self {
+    pub fn new(client: Box<DynClient<L2>>) -> Self {
         Self {
             client: client.for_component("fee_params_fetcher"),
             main_node_fee_params: RwLock::new(FeeParams::sensible_v1_default()),
diff --git a/core/node/fee_model/src/l1_gas_price/mod.rs b/core/node/fee_model/src/l1_gas_price/mod.rs
index e22a0bf9ca28..0dab2d921c40 100644
--- a/core/node/fee_model/src/l1_gas_price/mod.rs
+++ b/core/node/fee_model/src/l1_gas_price/mod.rs
@@ -2,15 +2,14 @@
 
 use std::fmt;
 
-pub use gas_adjuster::GasAdjuster;
-pub use main_node_fetcher::MainNodeFeeParamsFetcher;
-pub use pubdata_pricing::{PubdataPricing, RollupPubdataPricing, ValidiumPubdataPricing};
-pub use singleton::GasAdjusterSingleton;
+pub use self::{
+    gas_adjuster::GasAdjuster, main_node_fetcher::MainNodeFeeParamsFetcher,
+    singleton::GasAdjusterSingleton,
+};
 
 mod gas_adjuster;
 mod main_node_fetcher;
-mod pubdata_pricing;
-pub mod singleton;
+mod singleton;
 
 /// Abstraction that provides parameters to set the fee for an L1 transaction, taking the desired
 /// mining time into account.
@@ -28,4 +27,13 @@ pub trait L1TxParamsProvider: fmt::Debug + 'static + Send + Sync {
 
     /// Returns a lower bound for the `base_fee` value for the next L1 block.
     fn get_next_block_minimal_base_fee(&self) -> u64;
+
+    /// Returns the recommended `max_fee_per_gas` value (EIP1559) for blob transaction.
+    fn get_blob_tx_base_fee(&self) -> u64;
+
+    /// Returns the recommended `max_blob_fee_per_gas` value (EIP4844) for blob transaction.
+    fn get_blob_tx_blob_base_fee(&self) -> u64;
+
+    /// Returns the recommended `max_priority_fee_per_gas` value (EIP1559) for blob transaction.
+    fn get_blob_tx_priority_fee(&self) -> u64;
 }
diff --git a/core/node/fee_model/src/l1_gas_price/pubdata_pricing.rs b/core/node/fee_model/src/l1_gas_price/pubdata_pricing.rs
deleted file mode 100644
index 48718bc8d416..000000000000
--- a/core/node/fee_model/src/l1_gas_price/pubdata_pricing.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use zksync_types::L1_GAS_PER_PUBDATA_BYTE;
-
-pub trait PubdataPricing
-where
-    Self: std::fmt::Debug + Sync + Send,
-{
-    /// Returns the amount of L1 gas to publish a single byte of pub data in PubdataSendingMode::Calldata.
-    fn pubdata_byte_gas(&self) -> u64;
-    /// Returns the amount of L1 gas to publish a single byte of pub data in PubdataSendingMode::Blobs.
-    fn bound_blob_base_fee(&self, blob_base_fee: f64, max_blob_base_fee: u64) -> u64;
-}
-
-#[derive(Debug)]
-pub struct ValidiumPubdataPricing;
-#[derive(Debug)]
-pub struct RollupPubdataPricing;
-
-impl PubdataPricing for ValidiumPubdataPricing {
-    fn pubdata_byte_gas(&self) -> u64 {
-        0
-    }
-
-    fn bound_blob_base_fee(&self, _blob_base_fee: f64, _max_blob_base_fee: u64) -> u64 {
-        0
-    }
-}
-
-impl PubdataPricing for RollupPubdataPricing {
-    fn pubdata_byte_gas(&self) -> u64 {
-        L1_GAS_PER_PUBDATA_BYTE.into()
-    }
-
-    fn bound_blob_base_fee(&self, blob_base_fee: f64, max_blob_base_fee: u64) -> u64 {
-        if blob_base_fee > max_blob_base_fee as f64 {
-            tracing::error!("Blob base fee is too high: {blob_base_fee}, using max allowed: {max_blob_base_fee}");
-            return max_blob_base_fee;
-        }
-        blob_base_fee as u64
-    }
-}
diff --git a/core/node/fee_model/src/l1_gas_price/singleton.rs b/core/node/fee_model/src/l1_gas_price/singleton.rs
index 00a6b29ea847..33b6e9b28e29 100644
--- a/core/node/fee_model/src/l1_gas_price/singleton.rs
+++ b/core/node/fee_model/src/l1_gas_price/singleton.rs
@@ -3,36 +3,38 @@ use std::sync::Arc;
 use anyhow::Context as _;
 use tokio::{sync::watch, task::JoinHandle};
 use zksync_config::{configs::eth_sender::PubdataSendingMode, GasAdjusterConfig};
-use zksync_eth_client::clients::QueryClient;
-use zksync_types::url::SensitiveUrl;
+use zksync_types::{commitment::L1BatchCommitmentMode, url::SensitiveUrl, L1ChainId};
+use zksync_web3_decl::client::Client;
 
-use super::PubdataPricing;
 use crate::l1_gas_price::GasAdjuster;
 
 /// Special struct for creating a singleton of `GasAdjuster`.
 /// This is needed only for running the server.
 #[derive(Debug)]
 pub struct GasAdjusterSingleton {
+    chain_id: L1ChainId,
     web3_url: SensitiveUrl,
     gas_adjuster_config: GasAdjusterConfig,
     pubdata_sending_mode: PubdataSendingMode,
     singleton: Option<Arc<GasAdjuster>>,
-    pubdata_pricing: Arc<dyn PubdataPricing>,
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 impl GasAdjusterSingleton {
     pub fn new(
+        chain_id: L1ChainId,
         web3_url: SensitiveUrl,
         gas_adjuster_config: GasAdjusterConfig,
         pubdata_sending_mode: PubdataSendingMode,
-        pubdata_pricing: Arc<dyn PubdataPricing>,
+        commitment_mode: L1BatchCommitmentMode,
     ) -> Self {
         Self {
+            chain_id,
             web3_url,
             gas_adjuster_config,
             pubdata_sending_mode,
             singleton: None,
-            pubdata_pricing,
+            commitment_mode,
         }
     }
 
@@ -40,13 +42,15 @@ impl GasAdjusterSingleton {
         if let Some(adjuster) = &self.singleton {
             Ok(adjuster.clone())
         } else {
-            let query_client =
-                QueryClient::new(self.web3_url.clone()).context("QueryClient::new()")?;
+            let query_client = Client::http(self.web3_url.clone())
+                .context("QueryClient::new()")?
+                .for_network(self.chain_id.into())
+                .build();
             let adjuster = GasAdjuster::new(
                 Box::new(query_client),
                 self.gas_adjuster_config,
                 self.pubdata_sending_mode,
-                self.pubdata_pricing.clone(),
+                self.commitment_mode,
             )
             .await
             .context("GasAdjuster::new()")?;
diff --git a/core/node/fee_model/src/lib.rs b/core/node/fee_model/src/lib.rs
index 793b5d4f8441..00d804de6c81 100644
--- a/core/node/fee_model/src/lib.rs
+++ b/core/node/fee_model/src/lib.rs
@@ -1,6 +1,8 @@
 use std::{fmt, sync::Arc};
 
 use anyhow::Context as _;
+use async_trait::async_trait;
+use zksync_base_token_adjuster::BaseTokenRatioProvider;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_types::{
     fee_model::{
@@ -16,7 +18,7 @@ use crate::l1_gas_price::GasAdjuster;
 pub mod l1_gas_price;
 
 /// Trait responsible for providing fee info for a batch
-#[async_trait::async_trait]
+#[async_trait]
 pub trait BatchFeeModelInputProvider: fmt::Debug + 'static + Send + Sync {
     /// Returns the batch fee with scaling applied. This may be used to account for the fact that the L1 gas and pubdata prices may fluctuate, esp.
     /// in API methods that should return values that are valid for some period of time after the estimation was done.
@@ -42,7 +44,7 @@ pub trait BatchFeeModelInputProvider: fmt::Debug + 'static + Send + Sync {
         })
     }
 
-    /// Returns the fee model parameters.
+    /// Returns the fee model parameters using the denomination of the base token used (WEI for ETH).
     fn get_fee_model_params(&self) -> FeeParams;
 }
 
@@ -53,15 +55,17 @@ impl dyn BatchFeeModelInputProvider {
     }
 }
 
-/// The struct that represents the batch fee input provider to be used in the main node of the server, i.e.
-/// it explicitly gets the L1 gas price from the provider and uses it to calculate the batch fee input instead of getting
-/// it from other node.
+/// The struct that represents the batch fee input provider to be used in the main node of the server.
+/// This struct gets the L1 gas price directly from the provider rather than from another node, as is the
+/// case with the external node.
 #[derive(Debug)]
 pub struct MainNodeFeeInputProvider {
     provider: Arc<GasAdjuster>,
+    base_token_ratio_provider: Arc<dyn BaseTokenRatioProvider>,
     config: FeeModelConfig,
 }
 
+#[async_trait]
 impl BatchFeeModelInputProvider for MainNodeFeeInputProvider {
     fn get_fee_model_params(&self) -> FeeParams {
         match self.config {
@@ -69,18 +73,27 @@ impl BatchFeeModelInputProvider for MainNodeFeeInputProvider {
                 config,
                 l1_gas_price: self.provider.estimate_effective_gas_price(),
             }),
-            FeeModelConfig::V2(config) => FeeParams::V2(FeeParamsV2 {
+            FeeModelConfig::V2(config) => FeeParams::V2(FeeParamsV2::new(
                 config,
-                l1_gas_price: self.provider.estimate_effective_gas_price(),
-                l1_pubdata_price: self.provider.estimate_effective_pubdata_price(),
-            }),
+                self.provider.estimate_effective_gas_price(),
+                self.provider.estimate_effective_pubdata_price(),
+                self.base_token_ratio_provider.get_conversion_ratio(),
+            )),
         }
     }
 }
 
 impl MainNodeFeeInputProvider {
-    pub fn new(provider: Arc<GasAdjuster>, config: FeeModelConfig) -> Self {
-        Self { provider, config }
+    pub fn new(
+        provider: Arc<GasAdjuster>,
+        base_token_ratio_provider: Arc<dyn BaseTokenRatioProvider>,
+        config: FeeModelConfig,
+    ) -> Self {
+        Self {
+            provider,
+            base_token_ratio_provider,
+            config,
+        }
     }
 }
 
@@ -104,7 +117,7 @@ impl ApiFeeInputProvider {
     }
 }
 
-#[async_trait::async_trait]
+#[async_trait]
 impl BatchFeeModelInputProvider for ApiFeeInputProvider {
     async fn get_batch_fee_input_scaled(
         &self,
@@ -156,11 +169,9 @@ fn compute_batch_fee_model_input_v2(
     l1_gas_price_scale_factor: f64,
     l1_pubdata_price_scale_factor: f64,
 ) -> PubdataIndependentBatchFeeModelInput {
-    let FeeParamsV2 {
-        config,
-        l1_gas_price,
-        l1_pubdata_price,
-    } = params;
+    let config = params.config();
+    let l1_gas_price = params.l1_gas_price();
+    let l1_pubdata_price = params.l1_pubdata_price();
 
     let FeeModelConfigV2 {
         minimal_l2_gas_price,
@@ -227,6 +238,7 @@ impl Default for MockBatchFeeParamsProvider {
     }
 }
 
+#[async_trait]
 impl BatchFeeModelInputProvider for MockBatchFeeParamsProvider {
     fn get_fee_model_params(&self) -> FeeParams {
         self.0
@@ -235,6 +247,13 @@ impl BatchFeeModelInputProvider for MockBatchFeeParamsProvider {
 
 #[cfg(test)]
 mod tests {
+    use std::num::NonZeroU64;
+
+    use zksync_base_token_adjuster::NoOpRatioProvider;
+    use zksync_config::{configs::eth_sender::PubdataSendingMode, GasAdjusterConfig};
+    use zksync_eth_client::{clients::MockEthereum, BaseFees};
+    use zksync_types::{commitment::L1BatchCommitmentMode, fee_model::BaseTokenConversionRatio};
+
     use super::*;
 
     // To test that overflow never happens, we'll use giant L1 gas price, i.e.
@@ -261,11 +280,12 @@ mod tests {
             max_pubdata_per_batch: 100_000,
         };
 
-        let params = FeeParamsV2 {
+        let params = FeeParamsV2::new(
             config,
-            l1_gas_price: GIANT_L1_GAS_PRICE,
-            l1_pubdata_price: GIANT_L1_GAS_PRICE,
-        };
+            GIANT_L1_GAS_PRICE,
+            GIANT_L1_GAS_PRICE,
+            BaseTokenConversionRatio::default(),
+        );
 
         // We'll use scale factor of 3.0
         let input = compute_batch_fee_model_input_v2(params, 3.0, 3.0);
@@ -287,11 +307,12 @@ mod tests {
             max_pubdata_per_batch: 100_000,
         };
 
-        let params = FeeParamsV2 {
+        let params = FeeParamsV2::new(
             config,
-            l1_gas_price: SMALL_L1_GAS_PRICE,
-            l1_pubdata_price: SMALL_L1_GAS_PRICE,
-        };
+            SMALL_L1_GAS_PRICE,
+            SMALL_L1_GAS_PRICE,
+            BaseTokenConversionRatio::default(),
+        );
 
         let input = compute_batch_fee_model_input_v2(params, 1.0, 1.0);
 
@@ -312,11 +333,12 @@ mod tests {
             max_pubdata_per_batch: 100_000,
         };
 
-        let params = FeeParamsV2 {
+        let params = FeeParamsV2::new(
             config,
-            l1_gas_price: GIANT_L1_GAS_PRICE,
-            l1_pubdata_price: GIANT_L1_GAS_PRICE,
-        };
+            GIANT_L1_GAS_PRICE,
+            GIANT_L1_GAS_PRICE,
+            BaseTokenConversionRatio::default(),
+        );
 
         let input = compute_batch_fee_model_input_v2(params, 1.0, 1.0);
         assert_eq!(input.l1_gas_price, GIANT_L1_GAS_PRICE);
@@ -327,7 +349,7 @@ mod tests {
     }
 
     #[test]
-    fn test_compute_batch_fee_model_input_v2_only_compute_overhead() {
+    fn test_compute_baxtch_fee_model_input_v2_only_compute_overhead() {
         // Here we use sensible config, but when only compute is used to close the batch
         let config = FeeModelConfigV2 {
             minimal_l2_gas_price: 100_000_000_000,
@@ -338,11 +360,12 @@ mod tests {
             max_pubdata_per_batch: 100_000,
         };
 
-        let params = FeeParamsV2 {
+        let params = FeeParamsV2::new(
             config,
-            l1_gas_price: GIANT_L1_GAS_PRICE,
-            l1_pubdata_price: GIANT_L1_GAS_PRICE,
-        };
+            GIANT_L1_GAS_PRICE,
+            GIANT_L1_GAS_PRICE,
+            BaseTokenConversionRatio::default(),
+        );
 
         let input = compute_batch_fee_model_input_v2(params, 1.0, 1.0);
         assert_eq!(input.l1_gas_price, GIANT_L1_GAS_PRICE);
@@ -364,19 +387,22 @@ mod tests {
             max_pubdata_per_batch: 100_000,
         };
 
-        let base_params = FeeParamsV2 {
-            config: base_config,
-            l1_gas_price: 1_000_000_000,
-            l1_pubdata_price: 1_000_000_000,
-        };
+        let base_params = FeeParamsV2::new(
+            base_config,
+            1_000_000_000,
+            1_000_000_000,
+            BaseTokenConversionRatio::default(),
+        );
 
         let base_input = compute_batch_fee_model_input_v2(base_params, 1.0, 1.0);
 
         let base_input_larger_l1_gas_price = compute_batch_fee_model_input_v2(
-            FeeParamsV2 {
-                l1_gas_price: base_params.l1_gas_price * 2,
-                ..base_params
-            },
+            FeeParamsV2::new(
+                base_config,
+                2_000_000_000, // double the L1 gas price
+                1_000_000_000,
+                BaseTokenConversionRatio::default(),
+            ),
             1.0,
             1.0,
         );
@@ -396,10 +422,12 @@ mod tests {
         );
 
         let base_input_larger_pubdata_price = compute_batch_fee_model_input_v2(
-            FeeParamsV2 {
-                l1_pubdata_price: base_params.l1_pubdata_price * 2,
-                ..base_params
-            },
+            FeeParamsV2::new(
+                base_config,
+                1_000_000_000,
+                2_000_000_000, // double the L1 pubdata price
+                BaseTokenConversionRatio::default(),
+            ),
             1.0,
             1.0,
         );
@@ -419,13 +447,15 @@ mod tests {
         );
 
         let base_input_larger_max_gas = compute_batch_fee_model_input_v2(
-            FeeParamsV2 {
-                config: FeeModelConfigV2 {
+            FeeParamsV2::new(
+                FeeModelConfigV2 {
                     max_gas_per_batch: base_config.max_gas_per_batch * 2,
                     ..base_config
                 },
-                ..base_params
-            },
+                base_params.l1_gas_price(),
+                base_params.l1_pubdata_price(),
+                BaseTokenConversionRatio::default(),
+            ),
             1.0,
             1.0,
         );
@@ -439,13 +469,15 @@ mod tests {
         );
 
         let base_input_larger_max_pubdata = compute_batch_fee_model_input_v2(
-            FeeParamsV2 {
-                config: FeeModelConfigV2 {
+            FeeParamsV2::new(
+                FeeModelConfigV2 {
                     max_pubdata_per_batch: base_config.max_pubdata_per_batch * 2,
                     ..base_config
                 },
-                ..base_params
-            },
+                base_params.l1_gas_price(),
+                base_params.l1_pubdata_price(),
+                BaseTokenConversionRatio::default(),
+            ),
             1.0,
             1.0,
         );
@@ -458,4 +490,194 @@ mod tests {
             "Max pubdata increase lowers pubdata price"
         );
     }
+
+    #[tokio::test]
+    async fn test_get_fee_model_params() {
+        struct TestCase {
+            name: &'static str,
+            conversion_ratio: BaseTokenConversionRatio,
+            input_minimal_l2_gas_price: u64,    // Wei denomination
+            input_l1_gas_price: u64,            // Wei
+            input_l1_pubdata_price: u64,        // Wei
+            expected_minimal_l2_gas_price: u64, // BaseToken denomination
+            expected_l1_gas_price: u64,         // BaseToken
+            expected_l1_pubdata_price: u64,     // BaseToken
+        }
+        let test_cases = vec![
+            TestCase {
+                name: "1 ETH = 2 BaseToken",
+                conversion_ratio: BaseTokenConversionRatio {
+                    numerator: NonZeroU64::new(2).unwrap(),
+                    denominator: NonZeroU64::new(1).unwrap(),
+                },
+                input_minimal_l2_gas_price: 1000,
+                input_l1_gas_price: 2000,
+                input_l1_pubdata_price: 3000,
+                expected_minimal_l2_gas_price: 2000,
+                expected_l1_gas_price: 4000,
+                expected_l1_pubdata_price: 6000,
+            },
+            TestCase {
+                name: "1 ETH = 0.5 BaseToken",
+                conversion_ratio: BaseTokenConversionRatio {
+                    numerator: NonZeroU64::new(1).unwrap(),
+                    denominator: NonZeroU64::new(2).unwrap(),
+                },
+                input_minimal_l2_gas_price: 1000,
+                input_l1_gas_price: 2000,
+                input_l1_pubdata_price: 3000,
+                expected_minimal_l2_gas_price: 500,
+                expected_l1_gas_price: 1000,
+                expected_l1_pubdata_price: 1500,
+            },
+            TestCase {
+                name: "1 ETH = 1 BaseToken",
+                conversion_ratio: BaseTokenConversionRatio {
+                    numerator: NonZeroU64::new(1).unwrap(),
+                    denominator: NonZeroU64::new(1).unwrap(),
+                },
+                input_minimal_l2_gas_price: 1000,
+                input_l1_gas_price: 2000,
+                input_l1_pubdata_price: 3000,
+                expected_minimal_l2_gas_price: 1000,
+                expected_l1_gas_price: 2000,
+                expected_l1_pubdata_price: 3000,
+            },
+            TestCase {
+                name: "Large conversion - 1 ETH = 1_000 BaseToken",
+                conversion_ratio: BaseTokenConversionRatio {
+                    numerator: NonZeroU64::new(1_000_000).unwrap(),
+                    denominator: NonZeroU64::new(1).unwrap(),
+                },
+                input_minimal_l2_gas_price: 1_000_000,
+                input_l1_gas_price: 2_000_000,
+                input_l1_pubdata_price: 3_000_000,
+                expected_minimal_l2_gas_price: 1_000_000_000_000,
+                expected_l1_gas_price: 2_000_000_000_000,
+                expected_l1_pubdata_price: 3_000_000_000_000,
+            },
+            TestCase {
+                name: "Small conversion - 1 ETH = 0.001 BaseToken",
+                conversion_ratio: BaseTokenConversionRatio {
+                    numerator: NonZeroU64::new(1).unwrap(),
+                    denominator: NonZeroU64::new(1_000).unwrap(),
+                },
+                input_minimal_l2_gas_price: 1_000_000,
+                input_l1_gas_price: 2_000_000,
+                input_l1_pubdata_price: 3_000_000,
+                expected_minimal_l2_gas_price: 1_000,
+                expected_l1_gas_price: 2_000,
+                expected_l1_pubdata_price: 3_000,
+            },
+            TestCase {
+                name: "Fractional conversion ratio 123456789",
+                conversion_ratio: BaseTokenConversionRatio {
+                    numerator: NonZeroU64::new(1123456789).unwrap(),
+                    denominator: NonZeroU64::new(1_000_000_000).unwrap(),
+                },
+                input_minimal_l2_gas_price: 1_000_000,
+                input_l1_gas_price: 2_000_000,
+                input_l1_pubdata_price: 3_000_000,
+                expected_minimal_l2_gas_price: 1123456,
+                expected_l1_gas_price: 2246913,
+                expected_l1_pubdata_price: 3370370,
+            },
+            TestCase {
+                name: "Conversion ratio too large so clamp down to u64::MAX",
+                conversion_ratio: BaseTokenConversionRatio {
+                    numerator: NonZeroU64::new(u64::MAX).unwrap(),
+                    denominator: NonZeroU64::new(1).unwrap(),
+                },
+                input_minimal_l2_gas_price: 2,
+                input_l1_gas_price: 2,
+                input_l1_pubdata_price: 2,
+                expected_minimal_l2_gas_price: u64::MAX,
+                expected_l1_gas_price: u64::MAX,
+                expected_l1_pubdata_price: u64::MAX,
+            },
+        ];
+
+        for case in test_cases {
+            let gas_adjuster =
+                setup_gas_adjuster(case.input_l1_gas_price, case.input_l1_pubdata_price).await;
+
+            let base_token_ratio_provider = NoOpRatioProvider::new(case.conversion_ratio);
+
+            let config = FeeModelConfig::V2(FeeModelConfigV2 {
+                minimal_l2_gas_price: case.input_minimal_l2_gas_price,
+                compute_overhead_part: 1.0,
+                pubdata_overhead_part: 1.0,
+                batch_overhead_l1_gas: 1,
+                max_gas_per_batch: 1,
+                max_pubdata_per_batch: 1,
+            });
+
+            let fee_provider = MainNodeFeeInputProvider::new(
+                Arc::new(gas_adjuster),
+                Arc::new(base_token_ratio_provider),
+                config,
+            );
+
+            let fee_params = fee_provider.get_fee_model_params();
+
+            if let FeeParams::V2(params) = fee_params {
+                assert_eq!(
+                    params.l1_gas_price(),
+                    case.expected_l1_gas_price,
+                    "Test case '{}' failed: l1_gas_price mismatch",
+                    case.name
+                );
+                assert_eq!(
+                    params.l1_pubdata_price(),
+                    case.expected_l1_pubdata_price,
+                    "Test case '{}' failed: l1_pubdata_price mismatch",
+                    case.name
+                );
+                assert_eq!(
+                    params.config().minimal_l2_gas_price,
+                    case.expected_minimal_l2_gas_price,
+                    "Test case '{}' failed: minimal_l2_gas_price mismatch",
+                    case.name
+                );
+            } else {
+                panic!("Expected FeeParams::V2 for test case '{}'", case.name);
+            }
+        }
+    }
+
+    // Helper function to create BaseFees.
+    fn base_fees(block: u64, blob: U256) -> BaseFees {
+        BaseFees {
+            base_fee_per_gas: block,
+            base_fee_per_blob_gas: blob,
+        }
+    }
+
+    // Helper function to setup the GasAdjuster.
+    async fn setup_gas_adjuster(l1_gas_price: u64, l1_pubdata_price: u64) -> GasAdjuster {
+        let mock = MockEthereum::builder()
+            .with_fee_history(vec![
+                base_fees(0, U256::from(4)),
+                base_fees(1, U256::from(3)),
+            ])
+            .build();
+        mock.advance_block_number(2); // Ensure we have enough blocks for the fee history
+
+        let gas_adjuster_config = GasAdjusterConfig {
+            internal_enforced_l1_gas_price: Some(l1_gas_price),
+            internal_enforced_pubdata_price: Some(l1_pubdata_price),
+            max_base_fee_samples: 1, // Ensure this is less than the number of blocks
+            num_samples_for_blob_base_fee_estimate: 2,
+            ..Default::default()
+        };
+
+        GasAdjuster::new(
+            Box::new(mock.into_client()),
+            gas_adjuster_config,
+            PubdataSendingMode::Blobs,
+            L1BatchCommitmentMode::Rollup,
+        )
+        .await
+        .expect("Failed to create GasAdjuster")
+    }
 }
diff --git a/core/node/genesis/Cargo.toml b/core/node/genesis/Cargo.toml
index 1f274cab877c..c9d554770338 100644
--- a/core/node/genesis/Cargo.toml
+++ b/core/node/genesis/Cargo.toml
@@ -10,7 +10,7 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-multivm.workspace = true
+zksync_multivm.workspace = true
 vise.workspace = true
 zksync_types.workspace = true
 zksync_dal.workspace = true
diff --git a/core/node/genesis/src/lib.rs b/core/node/genesis/src/lib.rs
index fc95141adee9..de0fc14b177b 100644
--- a/core/node/genesis/src/lib.rs
+++ b/core/node/genesis/src/lib.rs
@@ -1,23 +1,23 @@
-//! This module aims to provide a genesis setup for the zkSync Era network.
+//! This module aims to provide a genesis setup for the ZKsync Era network.
 //! It initializes the Merkle tree with the basic setup (such as fields of special service accounts),
 //! setups the required databases, and outputs the data required to initialize a smart contract.
 
 use std::fmt::Formatter;
 
 use anyhow::Context as _;
-use multivm::utils::get_max_gas_per_pubdata_byte;
-use zksync_config::{GenesisConfig, PostgresConfig};
+use zksync_config::{configs::DatabaseSecrets, GenesisConfig};
 use zksync_contracts::{BaseSystemContracts, BaseSystemContractsHashes, SET_CHAIN_ID_EVENT};
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal, DalError};
-use zksync_eth_client::{clients::QueryClient, EthInterface};
+use zksync_eth_client::EthInterface;
 use zksync_merkle_tree::{domain::ZkSyncTree, TreeInstruction};
+use zksync_multivm::utils::get_max_gas_per_pubdata_byte;
 use zksync_system_constants::PRIORITY_EXPIRATION;
 use zksync_types::{
     block::{BlockGasCount, DeployedContract, L1BatchHeader, L2BlockHasher, L2BlockHeader},
     commitment::{CommitmentInput, L1BatchCommitment},
     fee_model::BatchFeeInput,
     protocol_upgrade::decode_set_chain_id_event,
-    protocol_version::{L1VerifierConfig, VerifierParams},
+    protocol_version::{L1VerifierConfig, ProtocolSemanticVersion, VerifierParams},
     system_contracts::get_system_smart_contracts,
     web3::{BlockNumber, FilterBuilder},
     AccountTreeId, Address, L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersion,
@@ -114,9 +114,8 @@ impl GenesisParams {
         // if the version doesn't exist
         let _: ProtocolVersionId = config
             .protocol_version
-            .ok_or(GenesisError::MalformedConfig("protocol_version"))?
-            .try_into()
-            .map_err(|_| GenesisError::ProtocolVersion(config.protocol_version.unwrap()))?;
+            .map(|p| p.minor)
+            .ok_or(GenesisError::MalformedConfig("protocol_version"))?;
         Ok(GenesisParams {
             base_system_contracts,
             system_contracts,
@@ -138,13 +137,17 @@ impl GenesisParams {
         }
     }
 
-    pub fn protocol_version(&self) -> ProtocolVersionId {
-        // It's impossible to instantiate Genesis params with wrong protocol version
+    pub fn minor_protocol_version(&self) -> ProtocolVersionId {
+        self.config
+            .protocol_version
+            .expect("Protocol version must be set")
+            .minor
+    }
+
+    pub fn protocol_version(&self) -> ProtocolSemanticVersion {
         self.config
             .protocol_version
             .expect("Protocol version must be set")
-            .try_into()
-            .expect("Protocol version must be correctly initialized for genesis")
     }
 }
 
@@ -161,7 +164,10 @@ pub fn mock_genesis_config() -> GenesisConfig {
     let first_l1_verifier_config = L1VerifierConfig::default();
 
     GenesisConfig {
-        protocol_version: Some(ProtocolVersionId::latest() as u16),
+        protocol_version: Some(ProtocolSemanticVersion {
+            minor: ProtocolVersionId::latest(),
+            patch: 0.into(),
+        }),
         genesis_root_hash: Some(H256::default()),
         rollup_last_leaf_index: Some(26),
         genesis_commitment: Some(H256::default()),
@@ -214,12 +220,13 @@ pub async fn insert_genesis_batch(
         .into_iter()
         .partition(|log_query| log_query.rw_flag);
 
-    let storage_logs: Vec<TreeInstruction<StorageKey>> = deduplicated_writes
+    let storage_logs: Vec<TreeInstruction> = deduplicated_writes
         .iter()
         .enumerate()
         .map(|(index, log)| {
             TreeInstruction::write(
-                StorageKey::new(AccountTreeId::new(log.address), u256_to_h256(log.key)),
+                StorageKey::new(AccountTreeId::new(log.address), u256_to_h256(log.key))
+                    .hashed_key_u256(),
                 (index + 1) as u64,
                 u256_to_h256(log.written_value),
             )
@@ -244,7 +251,7 @@ pub async fn insert_genesis_batch(
         genesis_root_hash,
         rollup_last_leaf_index,
         base_system_contract_hashes,
-        genesis_params.protocol_version(),
+        genesis_params.minor_protocol_version(),
     );
     let block_commitment = L1BatchCommitment::new(commitment_input);
 
@@ -324,13 +331,13 @@ pub async fn ensure_genesis_state(
 #[allow(clippy::too_many_arguments)]
 pub async fn create_genesis_l1_batch(
     storage: &mut Connection<'_, Core>,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
     base_system_contracts: &BaseSystemContracts,
     system_contracts: &[DeployedContract],
     l1_verifier_config: L1VerifierConfig,
 ) -> Result<(), GenesisError> {
     let version = ProtocolVersion {
-        id: protocol_version,
+        version: protocol_version,
         timestamp: 0,
         l1_verifier_config,
         base_system_contracts_hashes: base_system_contracts.hashes(),
@@ -341,7 +348,7 @@ pub async fn create_genesis_l1_batch(
         L1BatchNumber(0),
         0,
         base_system_contracts.hashes(),
-        protocol_version,
+        protocol_version.minor,
     );
 
     let genesis_l2_block_header = L2BlockHeader {
@@ -352,10 +359,10 @@ pub async fn create_genesis_l1_batch(
         l2_tx_count: 0,
         fee_account_address: Default::default(),
         base_fee_per_gas: 0,
-        gas_per_pubdata_limit: get_max_gas_per_pubdata_byte(protocol_version.into()),
+        gas_per_pubdata_limit: get_max_gas_per_pubdata_byte(protocol_version.minor.into()),
         batch_fee_input: BatchFeeInput::l1_pegged(0, 0),
         base_system_contracts_hashes: base_system_contracts.hashes(),
-        protocol_version: Some(protocol_version),
+        protocol_version: Some(protocol_version.minor),
         virtual_blocks: 0,
         gas_limit: 0,
     };
@@ -404,12 +411,12 @@ pub async fn create_genesis_l1_batch(
 // Save chain id transaction into the database
 // We keep returning anyhow and will refactor it later
 pub async fn save_set_chain_id_tx(
-    query_client: &QueryClient,
+    query_client: &dyn EthInterface,
     diamond_proxy_address: Address,
     state_transition_manager_address: Address,
-    postgres_config: &PostgresConfig,
+    database_secrets: &DatabaseSecrets,
 ) -> anyhow::Result<()> {
-    let db_url = postgres_config.master_url()?;
+    let db_url = database_secrets.master_url()?;
     let pool = ConnectionPool::<Core>::singleton(db_url).build().await?;
     let mut storage = pool.connection().await?;
 
@@ -426,7 +433,7 @@ pub async fn save_set_chain_id_tx(
         .from_block(from.into())
         .to_block(BlockNumber::Latest)
         .build();
-    let mut logs = query_client.logs(filter).await?;
+    let mut logs = query_client.logs(&filter).await?;
     anyhow::ensure!(
         logs.len() == 1,
         "Expected a single set_chain_id event, got these {}: {:?}",
diff --git a/core/node/genesis/src/tests.rs b/core/node/genesis/src/tests.rs
index 51300bf2a0a2..56b52f5bcc17 100644
--- a/core/node/genesis/src/tests.rs
+++ b/core/node/genesis/src/tests.rs
@@ -53,7 +53,10 @@ async fn running_genesis_with_non_latest_protocol_version() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut conn = pool.connection().await.unwrap();
     let params = GenesisParams::load_genesis_params(GenesisConfig {
-        protocol_version: Some(ProtocolVersionId::Version10 as u16),
+        protocol_version: Some(ProtocolSemanticVersion {
+            minor: ProtocolVersionId::Version10,
+            patch: 0.into(),
+        }),
         ..mock_genesis_config()
     })
     .unwrap();
diff --git a/core/node/genesis/src/utils.rs b/core/node/genesis/src/utils.rs
index cc5abd18cd58..a6c9513dbde8 100644
--- a/core/node/genesis/src/utils.rs
+++ b/core/node/genesis/src/utils.rs
@@ -1,12 +1,12 @@
 use std::collections::HashMap;
 
 use itertools::Itertools;
-use multivm::{
+use zksync_contracts::BaseSystemContracts;
+use zksync_dal::{Connection, Core, CoreDal};
+use zksync_multivm::{
     circuit_sequencer_api_latest::sort_storage_access::sort_storage_access_queries,
     zk_evm_latest::aux_structures::{LogQuery as MultiVmLogQuery, Timestamp as MultiVMTimestamp},
 };
-use zksync_contracts::BaseSystemContracts;
-use zksync_dal::{Connection, Core, CoreDal};
 use zksync_system_constants::{DEFAULT_ERA_CHAIN_ID, ETHEREUM_ADDRESS};
 use zksync_types::{
     block::{DeployedContract, L1BatchTreeData},
@@ -14,8 +14,7 @@ use zksync_types::{
     get_code_key, get_known_code_key, get_system_context_init_logs,
     tokens::{TokenInfo, TokenMetadata},
     zk_evm_types::{LogQuery, Timestamp},
-    AccountTreeId, L1BatchNumber, L2BlockNumber, L2ChainId, StorageKey, StorageLog, StorageLogKind,
-    H256,
+    AccountTreeId, L1BatchNumber, L2BlockNumber, L2ChainId, StorageKey, StorageLog, H256,
 };
 use zksync_utils::{be_words_to_bytes, bytecode::hash_bytecode, h256_to_u256, u256_to_h256};
 
@@ -41,15 +40,12 @@ pub(super) async fn add_eth_token(transaction: &mut Connection<'_, Core>) -> any
     Ok(())
 }
 
-pub(super) fn get_storage_logs(
-    system_contracts: &[DeployedContract],
-) -> Vec<(H256, Vec<StorageLog>)> {
-    let system_context_init_logs = (
-        H256::default(),
+pub(super) fn get_storage_logs(system_contracts: &[DeployedContract]) -> Vec<StorageLog> {
+    let system_context_init_logs =
         // During the genesis all chains have the same id.
         // TODO(EVM-579): make sure that the logic is compatible with Era.
-        get_system_context_init_logs(L2ChainId::from(DEFAULT_ERA_CHAIN_ID)),
-    );
+        get_system_context_init_logs(L2ChainId::from(DEFAULT_ERA_CHAIN_ID))
+    ;
 
     let known_code_storage_logs: Vec<_> = system_contracts
         .iter()
@@ -57,15 +53,10 @@ pub(super) fn get_storage_logs(
             let hash = hash_bytecode(&contract.bytecode);
             let known_code_key = get_known_code_key(&hash);
             let marked_known_value = H256::from_low_u64_be(1u64);
-            (
-                H256::default(),
-                vec![StorageLog::new_write_log(
-                    known_code_key,
-                    marked_known_value,
-                )],
-            )
+
+            StorageLog::new_write_log(known_code_key, marked_known_value)
         })
-        .dedup_by(|a, b| a.1 == b.1)
+        .dedup_by(|a, b| a == b)
         .collect();
 
     let storage_logs: Vec<_> = system_contracts
@@ -73,46 +64,37 @@ pub(super) fn get_storage_logs(
         .map(|contract| {
             let hash = hash_bytecode(&contract.bytecode);
             let code_key = get_code_key(contract.account_id.address());
-            (
-                H256::default(),
-                vec![StorageLog::new_write_log(code_key, hash)],
-            )
+            StorageLog::new_write_log(code_key, hash)
         })
-        .chain(Some(system_context_init_logs))
+        .chain(system_context_init_logs)
         .chain(known_code_storage_logs)
         .collect();
 
     storage_logs
 }
 
-pub(super) fn get_deduped_log_queries(storage_logs: &[(H256, Vec<StorageLog>)]) -> Vec<LogQuery> {
+pub(super) fn get_deduped_log_queries(storage_logs: &[StorageLog]) -> Vec<LogQuery> {
     // we don't produce proof for the genesis block,
     // but we still need to populate the table
     // to have the correct initial state of the merkle tree
     let log_queries: Vec<MultiVmLogQuery> = storage_logs
         .iter()
-        .enumerate()
-        .flat_map(|(tx_index, (_, storage_logs))| {
-            storage_logs
-                .iter()
-                .enumerate()
-                .map(move |(log_index, storage_log)| {
-                    MultiVmLogQuery {
-                        // Monotonically increasing Timestamp. Normally it's generated by the VM, but we don't have a VM in the genesis block.
-                        timestamp: MultiVMTimestamp(((tx_index << 16) + log_index) as u32),
-                        tx_number_in_block: tx_index as u16,
-                        aux_byte: 0,
-                        shard_id: 0,
-                        address: *storage_log.key.address(),
-                        key: h256_to_u256(*storage_log.key.key()),
-                        read_value: h256_to_u256(H256::zero()),
-                        written_value: h256_to_u256(storage_log.value),
-                        rw_flag: storage_log.kind == StorageLogKind::Write,
-                        rollback: false,
-                        is_service: false,
-                    }
-                })
-                .collect::<Vec<_>>()
+        .map(move |storage_log| {
+            MultiVmLogQuery {
+                // Timestamp and `tx_number` in block don't matter.
+                // `sort_storage_access_queries` assumes that the queries are in chronological order.
+                timestamp: MultiVMTimestamp(0),
+                tx_number_in_block: 0,
+                aux_byte: 0,
+                shard_id: 0,
+                address: *storage_log.key.address(),
+                key: h256_to_u256(*storage_log.key.key()),
+                read_value: h256_to_u256(H256::zero()),
+                written_value: h256_to_u256(storage_log.value),
+                rw_flag: storage_log.is_write(),
+                rollback: false,
+                is_service: false,
+            }
         })
         .collect();
 
@@ -191,7 +173,7 @@ pub(super) async fn save_genesis_l1_batch_metadata(
 pub(super) async fn insert_system_contracts(
     storage: &mut Connection<'_, Core>,
     factory_deps: HashMap<H256, Vec<u8>>,
-    storage_logs: &[(H256, Vec<StorageLog>)],
+    storage_logs: &[StorageLog],
 ) -> Result<(), GenesisError> {
     let (deduplicated_writes, protective_reads): (Vec<_>, Vec<_>) =
         get_deduped_log_queries(storage_logs)
@@ -206,12 +188,20 @@ pub(super) async fn insert_system_contracts(
 
     transaction
         .storage_logs_dedup_dal()
-        .insert_protective_reads(L1BatchNumber(0), &protective_reads)
+        .insert_protective_reads(
+            L1BatchNumber(0),
+            &protective_reads
+                .into_iter()
+                .map(StorageLog::from)
+                .collect::<Vec<_>>(),
+        )
         .await?;
 
     let written_storage_keys: Vec<_> = deduplicated_writes
         .iter()
-        .map(|log| StorageKey::new(AccountTreeId::new(log.address), u256_to_h256(log.key)))
+        .map(|log| {
+            StorageKey::new(AccountTreeId::new(log.address), u256_to_h256(log.key)).hashed_key()
+        })
         .collect();
     transaction
         .storage_logs_dedup_dal()
diff --git a/core/node/house_keeper/Cargo.toml b/core/node/house_keeper/Cargo.toml
index 7a2a414116ac..66bdca149a2e 100644
--- a/core/node/house_keeper/Cargo.toml
+++ b/core/node/house_keeper/Cargo.toml
@@ -13,7 +13,7 @@ categories.workspace = true
 vise.workspace = true
 zksync_dal.workspace = true
 zksync_shared_metrics.workspace = true
-prover_dal.workspace = true
+zksync_prover_dal.workspace = true
 zksync_types.workspace = true
 zksync_config.workspace = true
 
@@ -21,4 +21,3 @@ async-trait.workspace = true
 tokio = { workspace = true, features = ["time"] }
 anyhow.workspace = true
 tracing.workspace = true
-metrics.workspace = true
diff --git a/core/node/house_keeper/README.md b/core/node/house_keeper/README.md
index 4f8c399a85b2..eaeb7c14b203 100644
--- a/core/node/house_keeper/README.md
+++ b/core/node/house_keeper/README.md
@@ -1,4 +1,4 @@
-# zkSync Era housekeeper
+# ZKsync Era housekeeper
 
 This crate contains functionality for performing “administrative” work to keep the system flowing. It does:
 
diff --git a/core/node/house_keeper/src/blocks_state_reporter.rs b/core/node/house_keeper/src/blocks_state_reporter.rs
index a0736c003fe3..5285390a2783 100644
--- a/core/node/house_keeper/src/blocks_state_reporter.rs
+++ b/core/node/house_keeper/src/blocks_state_reporter.rs
@@ -28,11 +28,11 @@ impl L1BatchMetricsReporter {
             block_metrics.push((number, BlockStage::Sealed));
         }
 
-        let last_l1_batch_with_metadata = conn
+        let last_l1_batch_with_tree_data = conn
             .blocks_dal()
-            .get_last_l1_batch_number_with_metadata()
+            .get_last_l1_batch_number_with_tree_data()
             .await?;
-        if let Some(number) = last_l1_batch_with_metadata {
+        if let Some(number) = last_l1_batch_with_tree_data {
             block_metrics.push((number, BlockStage::MetadataCalculated));
         }
 
diff --git a/core/node/house_keeper/src/fri_proof_compressor_queue_monitor.rs b/core/node/house_keeper/src/fri_proof_compressor_queue_monitor.rs
deleted file mode 100644
index e743bbd31899..000000000000
--- a/core/node/house_keeper/src/fri_proof_compressor_queue_monitor.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-use async_trait::async_trait;
-use prover_dal::{Prover, ProverDal};
-use zksync_dal::ConnectionPool;
-use zksync_types::prover_dal::JobCountStatistics;
-
-use crate::periodic_job::PeriodicJob;
-
-const PROOF_COMPRESSOR_SERVICE_NAME: &str = "proof_compressor";
-
-#[derive(Debug)]
-pub struct FriProofCompressorStatsReporter {
-    reporting_interval_ms: u64,
-    pool: ConnectionPool<Prover>,
-}
-
-impl FriProofCompressorStatsReporter {
-    pub fn new(reporting_interval_ms: u64, pool: ConnectionPool<Prover>) -> Self {
-        Self {
-            reporting_interval_ms,
-            pool,
-        }
-    }
-
-    async fn get_job_statistics(pool: &ConnectionPool<Prover>) -> JobCountStatistics {
-        pool.connection()
-            .await
-            .unwrap()
-            .fri_proof_compressor_dal()
-            .get_jobs_stats()
-            .await
-    }
-}
-
-/// Invoked periodically to push job statistics to Prometheus
-/// Note: these values will be used for auto-scaling proof compressor
-#[async_trait]
-impl PeriodicJob for FriProofCompressorStatsReporter {
-    const SERVICE_NAME: &'static str = "ProofCompressorStatsReporter";
-
-    async fn run_routine_task(&mut self) -> anyhow::Result<()> {
-        let stats = Self::get_job_statistics(&self.pool).await;
-
-        if stats.queued > 0 {
-            tracing::info!(
-                "Found {} free {} in progress proof compressor jobs",
-                stats.queued,
-                stats.in_progress
-            );
-        }
-
-        metrics::gauge!(
-            format!("prover_fri.{}.jobs", PROOF_COMPRESSOR_SERVICE_NAME),
-            stats.queued as f64,
-            "type" => "queued"
-        );
-
-        metrics::gauge!(
-            format!("prover_fri.{}.jobs", PROOF_COMPRESSOR_SERVICE_NAME),
-            stats.in_progress as f64,
-            "type" => "in_progress"
-        );
-
-        let oldest_not_compressed_batch = self
-            .pool
-            .connection()
-            .await
-            .unwrap()
-            .fri_proof_compressor_dal()
-            .get_oldest_not_compressed_batch()
-            .await;
-
-        if let Some(l1_batch_number) = oldest_not_compressed_batch {
-            metrics::gauge!(
-                format!(
-                    "prover_fri.{}.oldest_not_compressed_batch",
-                    PROOF_COMPRESSOR_SERVICE_NAME
-                ),
-                l1_batch_number.0 as f64
-            );
-        }
-
-        Ok(())
-    }
-
-    fn polling_interval_ms(&self) -> u64 {
-        self.reporting_interval_ms
-    }
-}
diff --git a/core/node/house_keeper/src/fri_witness_generator_queue_monitor.rs b/core/node/house_keeper/src/fri_witness_generator_queue_monitor.rs
deleted file mode 100644
index 38a28d5a7c23..000000000000
--- a/core/node/house_keeper/src/fri_witness_generator_queue_monitor.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use std::collections::HashMap;
-
-use async_trait::async_trait;
-use prover_dal::{Prover, ProverDal};
-use zksync_dal::ConnectionPool;
-use zksync_types::{basic_fri_types::AggregationRound, prover_dal::JobCountStatistics};
-
-use crate::periodic_job::PeriodicJob;
-
-const FRI_WITNESS_GENERATOR_SERVICE_NAME: &str = "fri_witness_generator";
-
-#[derive(Debug)]
-pub struct FriWitnessGeneratorStatsReporter {
-    reporting_interval_ms: u64,
-    pool: ConnectionPool<Prover>,
-}
-
-impl FriWitnessGeneratorStatsReporter {
-    pub fn new(pool: ConnectionPool<Prover>, reporting_interval_ms: u64) -> Self {
-        Self {
-            reporting_interval_ms,
-            pool,
-        }
-    }
-
-    async fn get_job_statistics(&self) -> HashMap<AggregationRound, JobCountStatistics> {
-        let mut conn = self.pool.connection().await.unwrap();
-        HashMap::from([
-            (
-                AggregationRound::BasicCircuits,
-                conn.fri_witness_generator_dal()
-                    .get_witness_jobs_stats(AggregationRound::BasicCircuits)
-                    .await,
-            ),
-            (
-                AggregationRound::LeafAggregation,
-                conn.fri_witness_generator_dal()
-                    .get_witness_jobs_stats(AggregationRound::LeafAggregation)
-                    .await,
-            ),
-            (
-                AggregationRound::NodeAggregation,
-                conn.fri_witness_generator_dal()
-                    .get_witness_jobs_stats(AggregationRound::NodeAggregation)
-                    .await,
-            ),
-            (
-                AggregationRound::RecursionTip,
-                conn.fri_witness_generator_dal()
-                    .get_witness_jobs_stats(AggregationRound::RecursionTip)
-                    .await,
-            ),
-            (
-                AggregationRound::Scheduler,
-                conn.fri_witness_generator_dal()
-                    .get_witness_jobs_stats(AggregationRound::Scheduler)
-                    .await,
-            ),
-        ])
-    }
-}
-
-fn emit_metrics_for_round(round: AggregationRound, stats: JobCountStatistics) {
-    if stats.queued > 0 || stats.in_progress > 0 {
-        tracing::trace!(
-            "Found {} free and {} in progress {:?} FRI witness generators jobs",
-            stats.queued,
-            stats.in_progress,
-            round
-        );
-    }
-
-    metrics::gauge!(
-        format!("server.{}.jobs", FRI_WITNESS_GENERATOR_SERVICE_NAME),
-        stats.queued as f64,
-        "type" => "queued",
-        "round" => format!("{:?}", round)
-    );
-
-    metrics::gauge!(
-        format!("server.{}.jobs", FRI_WITNESS_GENERATOR_SERVICE_NAME),
-        stats.in_progress as f64,
-        "type" => "in_progress",
-        "round" => format!("{:?}", round)
-    );
-}
-
-/// Invoked periodically to push job statistics to Prometheus
-/// Note: these values will be used for auto-scaling job processors
-#[async_trait]
-impl PeriodicJob for FriWitnessGeneratorStatsReporter {
-    const SERVICE_NAME: &'static str = "WitnessGeneratorStatsReporter";
-
-    async fn run_routine_task(&mut self) -> anyhow::Result<()> {
-        let stats_for_all_rounds = self.get_job_statistics().await;
-        let mut aggregated = JobCountStatistics::default();
-        for (round, stats) in stats_for_all_rounds {
-            emit_metrics_for_round(round, stats);
-            aggregated = aggregated + stats;
-        }
-
-        if aggregated.queued > 0 {
-            tracing::trace!(
-                "Found {} free {} in progress witness generators jobs",
-                aggregated.queued,
-                aggregated.in_progress
-            );
-        }
-
-        metrics::gauge!(
-            format!("server.{}.jobs", FRI_WITNESS_GENERATOR_SERVICE_NAME),
-            aggregated.queued as f64,
-            "type" => "queued"
-        );
-
-        metrics::gauge!(
-            format!("server.{}.jobs", FRI_WITNESS_GENERATOR_SERVICE_NAME),
-            aggregated.in_progress as f64,
-            "type" => "in_progress"
-        );
-        Ok(())
-    }
-
-    fn polling_interval_ms(&self) -> u64 {
-        self.reporting_interval_ms
-    }
-}
diff --git a/core/node/house_keeper/src/lib.rs b/core/node/house_keeper/src/lib.rs
index e98c7708201d..68d4ad2f8ba4 100644
--- a/core/node/house_keeper/src/lib.rs
+++ b/core/node/house_keeper/src/lib.rs
@@ -1,12 +1,3 @@
 pub mod blocks_state_reporter;
-pub mod fri_gpu_prover_archiver;
-pub mod fri_proof_compressor_job_retry_manager;
-pub mod fri_proof_compressor_queue_monitor;
-pub mod fri_prover_job_retry_manager;
-pub mod fri_prover_jobs_archiver;
-pub mod fri_prover_queue_monitor;
-pub mod fri_witness_generator_jobs_retry_manager;
-pub mod fri_witness_generator_queue_monitor;
-mod metrics;
 pub mod periodic_job;
-pub mod waiting_to_queued_fri_witness_job_mover;
+pub mod prover;
diff --git a/core/node/house_keeper/src/metrics.rs b/core/node/house_keeper/src/metrics.rs
deleted file mode 100644
index 69615c634cff..000000000000
--- a/core/node/house_keeper/src/metrics.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use vise::{Counter, Metrics};
-
-#[derive(Debug, Metrics)]
-#[metrics(prefix = "house_keeper")]
-pub(crate) struct HouseKeeperMetrics {
-    pub prover_job_archived: Counter,
-    pub gpu_prover_archived: Counter,
-}
-
-#[vise::register]
-pub(crate) static HOUSE_KEEPER_METRICS: vise::Global<HouseKeeperMetrics> = vise::Global::new();
diff --git a/core/node/house_keeper/src/fri_gpu_prover_archiver.rs b/core/node/house_keeper/src/prover/archiver/fri_gpu_prover_archiver.rs
similarity index 81%
rename from core/node/house_keeper/src/fri_gpu_prover_archiver.rs
rename to core/node/house_keeper/src/prover/archiver/fri_gpu_prover_archiver.rs
index 11c727011cd4..5db53710733c 100644
--- a/core/node/house_keeper/src/fri_gpu_prover_archiver.rs
+++ b/core/node/house_keeper/src/prover/archiver/fri_gpu_prover_archiver.rs
@@ -1,10 +1,11 @@
-use prover_dal::{Prover, ProverDal};
 use zksync_dal::ConnectionPool;
+use zksync_prover_dal::{Prover, ProverDal};
 
-use crate::{metrics::HOUSE_KEEPER_METRICS, periodic_job::PeriodicJob};
+use crate::{periodic_job::PeriodicJob, prover::metrics::HOUSE_KEEPER_METRICS};
 
-/// FriGpuProverArchiver is a task that periodically archives old fri GPU prover records.
+/// `FriGpuProverArchiver` is a task that periodically archives old fri GPU prover records.
 /// The task will archive the `dead` prover records that have not been updated for a certain amount of time.
+/// Note: These components speed up provers, in their absence, queries would become sub optimal.
 #[derive(Debug)]
 pub struct FriGpuProverArchiver {
     pool: ConnectionPool<Prover>,
diff --git a/core/node/house_keeper/src/fri_prover_jobs_archiver.rs b/core/node/house_keeper/src/prover/archiver/fri_prover_jobs_archiver.rs
similarity index 63%
rename from core/node/house_keeper/src/fri_prover_jobs_archiver.rs
rename to core/node/house_keeper/src/prover/archiver/fri_prover_jobs_archiver.rs
index 5ec98f2178da..02268c60e5f5 100644
--- a/core/node/house_keeper/src/fri_prover_jobs_archiver.rs
+++ b/core/node/house_keeper/src/prover/archiver/fri_prover_jobs_archiver.rs
@@ -1,16 +1,19 @@
-use prover_dal::{Prover, ProverDal};
 use zksync_dal::ConnectionPool;
+use zksync_prover_dal::{Prover, ProverDal};
 
-use crate::{metrics::HOUSE_KEEPER_METRICS, periodic_job::PeriodicJob};
+use crate::{periodic_job::PeriodicJob, prover::metrics::HOUSE_KEEPER_METRICS};
 
+/// `FriProverJobsArchiver` is a task that periodically archives old finalized prover job.
+/// The task will archive the `successful` prover jobs that have been done for a certain amount of time.
+/// Note: These components speed up provers, in their absence, queries would become sub optimal.
 #[derive(Debug)]
-pub struct FriProverJobArchiver {
+pub struct FriProverJobsArchiver {
     pool: ConnectionPool<Prover>,
     reporting_interval_ms: u64,
     archiving_interval_secs: u64,
 }
 
-impl FriProverJobArchiver {
+impl FriProverJobsArchiver {
     pub fn new(
         pool: ConnectionPool<Prover>,
         reporting_interval_ms: u64,
@@ -25,8 +28,8 @@ impl FriProverJobArchiver {
 }
 
 #[async_trait::async_trait]
-impl PeriodicJob for FriProverJobArchiver {
-    const SERVICE_NAME: &'static str = "FriProverJobArchiver";
+impl PeriodicJob for FriProverJobsArchiver {
+    const SERVICE_NAME: &'static str = "FriProverJobsArchiver";
 
     async fn run_routine_task(&mut self) -> anyhow::Result<()> {
         let archived_jobs = self
diff --git a/core/node/house_keeper/src/prover/archiver/mod.rs b/core/node/house_keeper/src/prover/archiver/mod.rs
new file mode 100644
index 000000000000..36b82a7735ce
--- /dev/null
+++ b/core/node/house_keeper/src/prover/archiver/mod.rs
@@ -0,0 +1,5 @@
+mod fri_gpu_prover_archiver;
+mod fri_prover_jobs_archiver;
+
+pub use fri_gpu_prover_archiver::FriGpuProverArchiver;
+pub use fri_prover_jobs_archiver::FriProverJobsArchiver;
diff --git a/core/node/house_keeper/src/prover/metrics.rs b/core/node/house_keeper/src/prover/metrics.rs
new file mode 100644
index 000000000000..7711c9c04a6b
--- /dev/null
+++ b/core/node/house_keeper/src/prover/metrics.rs
@@ -0,0 +1,123 @@
+use vise::{Counter, EncodeLabelSet, EncodeLabelValue, Family, Gauge, LabeledFamily, Metrics};
+use zksync_types::protocol_version::ProtocolSemanticVersion;
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "house_keeper")]
+pub(crate) struct HouseKeeperMetrics {
+    pub prover_job_archived: Counter,
+    pub gpu_prover_archived: Counter,
+}
+
+#[vise::register]
+pub(crate) static HOUSE_KEEPER_METRICS: vise::Global<HouseKeeperMetrics> = vise::Global::new();
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue)]
+#[metrics(rename_all = "snake_case")]
+#[allow(dead_code)]
+pub enum JobStatus {
+    Queued,
+    InProgress,
+    Successful,
+    Failed,
+    SentToServer,
+    Skipped,
+}
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "prover_fri")]
+pub(crate) struct ProverFriMetrics {
+    pub proof_compressor_requeued_jobs: Counter<u64>,
+    #[metrics(labels = ["type", "protocol_version"])]
+    pub proof_compressor_jobs: LabeledFamily<(JobStatus, String), Gauge<u64>, 2>,
+    pub proof_compressor_oldest_uncompressed_batch: Gauge<u64>,
+}
+
+#[vise::register]
+pub(crate) static PROVER_FRI_METRICS: vise::Global<ProverFriMetrics> = vise::Global::new();
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, EncodeLabelSet)]
+pub(crate) struct ProverJobsLabels {
+    pub r#type: &'static str,
+    pub circuit_id: String,
+    pub aggregation_round: String,
+    pub prover_group_id: String,
+    pub protocol_version: String,
+}
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "fri_prover")]
+pub(crate) struct FriProverMetrics {
+    pub prover_jobs: Family<ProverJobsLabels, Gauge<u64>>,
+    #[metrics(labels = ["circuit_id", "aggregation_round"])]
+    pub block_number: LabeledFamily<(String, String), Gauge<u64>, 2>,
+    pub oldest_unpicked_batch: Gauge<u64>,
+    pub oldest_not_generated_batch: Gauge<u64>,
+    #[metrics(labels = ["round"])]
+    pub oldest_unprocessed_block_by_round: LabeledFamily<String, Gauge<u64>>,
+}
+
+impl FriProverMetrics {
+    pub fn report_prover_jobs(
+        &self,
+        r#type: &'static str,
+        circuit_id: u8,
+        aggregation_round: u8,
+        prover_group_id: u8,
+        protocol_version: ProtocolSemanticVersion,
+        amount: u64,
+    ) {
+        self.prover_jobs[&ProverJobsLabels {
+            r#type,
+            circuit_id: circuit_id.to_string(),
+            aggregation_round: aggregation_round.to_string(),
+            prover_group_id: prover_group_id.to_string(),
+            protocol_version: protocol_version.to_string(),
+        }]
+            .set(amount);
+    }
+}
+
+#[vise::register]
+pub(crate) static FRI_PROVER_METRICS: vise::Global<FriProverMetrics> = vise::Global::new();
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
+#[metrics(label = "type", rename_all = "snake_case")]
+#[allow(clippy::enum_variant_names)]
+pub(crate) enum WitnessType {
+    WitnessInputsFri,
+    LeafAggregationJobsFri,
+    NodeAggregationJobsFri,
+    RecursionTipJobsFri,
+    SchedulerJobsFri,
+}
+
+impl From<&str> for WitnessType {
+    fn from(s: &str) -> Self {
+        match s {
+            "witness_inputs_fri" => Self::WitnessInputsFri,
+            "leaf_aggregations_jobs_fri" => Self::LeafAggregationJobsFri,
+            "node_aggregations_jobs_fri" => Self::NodeAggregationJobsFri,
+            "recursion_tip_jobs_fri" => Self::RecursionTipJobsFri,
+            "scheduler_jobs_fri" => Self::SchedulerJobsFri,
+            _ => panic!("Invalid witness type"),
+        }
+    }
+}
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "server")]
+pub(crate) struct ServerMetrics {
+    pub prover_fri_requeued_jobs: Counter<u64>,
+    pub requeued_jobs: Family<WitnessType, Counter<u64>>,
+    #[metrics(labels = ["type", "round", "protocol_version"])]
+    pub witness_generator_jobs_by_round:
+        LabeledFamily<(&'static str, String, String), Gauge<u64>, 3>,
+    #[metrics(labels = ["type", "protocol_version"])]
+    pub witness_generator_jobs: LabeledFamily<(&'static str, String), Gauge<u64>, 2>,
+    pub leaf_fri_witness_generator_waiting_to_queued_jobs_transitions: Counter<u64>,
+    pub node_fri_witness_generator_waiting_to_queued_jobs_transitions: Counter<u64>,
+    pub recursion_tip_witness_generator_waiting_to_queued_jobs_transitions: Counter<u64>,
+    pub scheduler_witness_generator_waiting_to_queued_jobs_transitions: Counter<u64>,
+}
+
+#[vise::register]
+pub(crate) static SERVER_METRICS: vise::Global<ServerMetrics> = vise::Global::new();
diff --git a/core/node/house_keeper/src/prover/mod.rs b/core/node/house_keeper/src/prover/mod.rs
new file mode 100644
index 000000000000..af315c53cb48
--- /dev/null
+++ b/core/node/house_keeper/src/prover/mod.rs
@@ -0,0 +1,14 @@
+mod archiver;
+mod metrics;
+mod queue_reporter;
+mod retry_manager;
+mod waiting_to_queued_fri_witness_job_mover;
+
+pub use archiver::{FriGpuProverArchiver, FriProverJobsArchiver};
+pub use queue_reporter::{
+    FriProofCompressorQueueReporter, FriProverQueueReporter, FriWitnessGeneratorQueueReporter,
+};
+pub use retry_manager::{
+    FriProofCompressorJobRetryManager, FriProverJobRetryManager, FriWitnessGeneratorJobRetryManager,
+};
+pub use waiting_to_queued_fri_witness_job_mover::WaitingToQueuedFriWitnessJobMover;
diff --git a/core/node/house_keeper/src/prover/queue_reporter/fri_proof_compressor_queue_reporter.rs b/core/node/house_keeper/src/prover/queue_reporter/fri_proof_compressor_queue_reporter.rs
new file mode 100644
index 000000000000..c554bf4616d3
--- /dev/null
+++ b/core/node/house_keeper/src/prover/queue_reporter/fri_proof_compressor_queue_reporter.rs
@@ -0,0 +1,88 @@
+use std::collections::HashMap;
+
+use async_trait::async_trait;
+use zksync_dal::ConnectionPool;
+use zksync_prover_dal::{Prover, ProverDal};
+use zksync_types::{protocol_version::ProtocolSemanticVersion, prover_dal::JobCountStatistics};
+
+use crate::{
+    periodic_job::PeriodicJob,
+    prover::metrics::{JobStatus, PROVER_FRI_METRICS},
+};
+
+/// `FriProofCompressorQueueReporter` is a task that periodically reports compression jobs status.
+/// Note: these values will be used for auto-scaling proof compressor
+#[derive(Debug)]
+pub struct FriProofCompressorQueueReporter {
+    reporting_interval_ms: u64,
+    pool: ConnectionPool<Prover>,
+}
+
+impl FriProofCompressorQueueReporter {
+    pub fn new(reporting_interval_ms: u64, pool: ConnectionPool<Prover>) -> Self {
+        Self {
+            reporting_interval_ms,
+            pool,
+        }
+    }
+
+    async fn get_job_statistics(
+        pool: &ConnectionPool<Prover>,
+    ) -> HashMap<ProtocolSemanticVersion, JobCountStatistics> {
+        pool.connection()
+            .await
+            .unwrap()
+            .fri_proof_compressor_dal()
+            .get_jobs_stats()
+            .await
+    }
+}
+
+#[async_trait]
+impl PeriodicJob for FriProofCompressorQueueReporter {
+    const SERVICE_NAME: &'static str = "FriProofCompressorQueueReporter";
+
+    async fn run_routine_task(&mut self) -> anyhow::Result<()> {
+        let stats = Self::get_job_statistics(&self.pool).await;
+
+        for (protocol_version, stats) in &stats {
+            if stats.queued > 0 {
+                tracing::info!(
+                    "Found {} free {} in progress proof compressor jobs for protocol version {}",
+                    stats.queued,
+                    stats.in_progress,
+                    protocol_version
+                );
+            }
+
+            PROVER_FRI_METRICS.proof_compressor_jobs
+                [&(JobStatus::Queued, protocol_version.to_string())]
+                .set(stats.queued as u64);
+
+            PROVER_FRI_METRICS.proof_compressor_jobs
+                [&(JobStatus::InProgress, protocol_version.to_string())]
+                .set(stats.in_progress as u64);
+        }
+
+        let oldest_not_compressed_batch = self
+            .pool
+            .connection()
+            .await
+            .unwrap()
+            .fri_proof_compressor_dal()
+            .get_oldest_not_compressed_batch()
+            .await;
+
+        if let Some(l1_batch_number) = oldest_not_compressed_batch {
+            PROVER_FRI_METRICS
+                .proof_compressor_oldest_uncompressed_batch
+                .set(l1_batch_number.0 as u64);
+        }
+
+        Ok(())
+    }
+
+    fn polling_interval_ms(&self) -> u64 {
+        self.reporting_interval_ms
+    }
+}
diff --git a/core/node/house_keeper/src/fri_prover_queue_monitor.rs b/core/node/house_keeper/src/prover/queue_reporter/fri_prover_queue_reporter.rs
similarity index 61%
rename from core/node/house_keeper/src/fri_prover_queue_monitor.rs
rename to core/node/house_keeper/src/prover/queue_reporter/fri_prover_queue_reporter.rs
index d577f5668d9e..f429367c44a1 100644
--- a/core/node/house_keeper/src/fri_prover_queue_monitor.rs
+++ b/core/node/house_keeper/src/prover/queue_reporter/fri_prover_queue_reporter.rs
@@ -1,19 +1,21 @@
 use async_trait::async_trait;
-use prover_dal::{Prover, ProverDal};
 use zksync_config::configs::fri_prover_group::FriProverGroupConfig;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
+use zksync_prover_dal::{Prover, ProverDal};
 
-use crate::periodic_job::PeriodicJob;
+use crate::{periodic_job::PeriodicJob, prover::metrics::FRI_PROVER_METRICS};
 
+/// `FriProverQueueReporter` is a task that periodically reports prover jobs status.
+/// Note: these values will be used for auto-scaling provers and Witness Vector Generators.
 #[derive(Debug)]
-pub struct FriProverStatsReporter {
+pub struct FriProverQueueReporter {
     reporting_interval_ms: u64,
     prover_connection_pool: ConnectionPool<Prover>,
     db_connection_pool: ConnectionPool<Core>,
     config: FriProverGroupConfig,
 }
 
-impl FriProverStatsReporter {
+impl FriProverQueueReporter {
     pub fn new(
         reporting_interval_ms: u64,
         prover_connection_pool: ConnectionPool<Prover>,
@@ -29,16 +31,15 @@ impl FriProverStatsReporter {
     }
 }
 
-///  Invoked periodically to push prover queued/in-progress job statistics
 #[async_trait]
-impl PeriodicJob for FriProverStatsReporter {
-    const SERVICE_NAME: &'static str = "FriProverStatsReporter";
+impl PeriodicJob for FriProverQueueReporter {
+    const SERVICE_NAME: &'static str = "FriProverQueueReporter";
 
     async fn run_routine_task(&mut self) -> anyhow::Result<()> {
         let mut conn = self.prover_connection_pool.connection().await.unwrap();
         let stats = conn.fri_prover_jobs_dal().get_prover_jobs_stats().await;
 
-        for ((circuit_id, aggregation_round), stats) in stats.into_iter() {
+        for (job_identifiers, stats) in &stats {
             // BEWARE, HERE BE DRAGONS.
             // In database, the `circuit_id` stored is the circuit for which the aggregation is done,
             // not the circuit which is running.
@@ -46,33 +47,36 @@ impl PeriodicJob for FriProverStatsReporter {
             // This can aggregate multiple leaf nodes (which may belong to different circuits).
             // This reporting is a hacky forced way to use `circuit_id` 2 which will solve auto scalers.
             // A proper fix will be later provided to solve this at database level.
-            let circuit_id = if aggregation_round == 2 {
+            let circuit_id = if job_identifiers.aggregation_round == 2 {
                 2
             } else {
-                circuit_id
+                job_identifiers.circuit_id
             };
 
             let group_id = self
                 .config
-                .get_group_id_for_circuit_id_and_aggregation_round(circuit_id, aggregation_round)
+                .get_group_id_for_circuit_id_and_aggregation_round(
+                    circuit_id,
+                    job_identifiers.aggregation_round,
+                )
                 .unwrap_or(u8::MAX);
 
-            metrics::gauge!(
-              "fri_prover.prover.jobs",
-              stats.queued as f64,
-              "type" => "queued",
-              "circuit_id" => circuit_id.to_string(),
-              "aggregation_round" => aggregation_round.to_string(),
-              "prover_group_id" => group_id.to_string(),
+            FRI_PROVER_METRICS.report_prover_jobs(
+                "queued",
+                circuit_id,
+                job_identifiers.aggregation_round,
+                group_id,
+                job_identifiers.get_semantic_protocol_version(),
+                stats.queued as u64,
             );
 
-            metrics::gauge!(
-              "fri_prover.prover.jobs",
-              stats.in_progress as f64,
-              "type" => "in_progress",
-              "circuit_id" => circuit_id.to_string(),
-              "aggregation_round" => aggregation_round.to_string(),
-              "prover_group_id" => group_id.to_string(),
+            FRI_PROVER_METRICS.report_prover_jobs(
+                "in_progress",
+                circuit_id,
+                job_identifiers.aggregation_round,
+                group_id,
+                job_identifiers.get_semantic_protocol_version(),
+                stats.in_progress as u64,
             );
         }
 
@@ -82,10 +86,9 @@ impl PeriodicJob for FriProverStatsReporter {
             .await;
 
         for ((circuit_id, aggregation_round), l1_batch_number) in lag_by_circuit_type {
-            metrics::gauge!(
-              "fri_prover.block_number", l1_batch_number.0 as f64,
-              "circuit_id" => circuit_id.to_string(),
-              "aggregation_round" => aggregation_round.to_string());
+            FRI_PROVER_METRICS.block_number
+                [&(circuit_id.to_string(), aggregation_round.to_string())]
+                .set(l1_batch_number.0 as u64);
         }
 
         // FIXME: refactor metrics here
@@ -95,9 +98,9 @@ impl PeriodicJob for FriProverStatsReporter {
         let oldest_unpicked_batch = match db_conn
             .proof_generation_dal()
             .get_oldest_unpicked_batch()
-            .await
+            .await?
         {
-            Some(l1_batch_number) => l1_batch_number.0 as f64,
+            Some(l1_batch_number) => l1_batch_number.0 as u64,
             // if there is no unpicked batch in database, we use sealed batch number as a result
             None => {
                 db_conn
@@ -106,20 +109,21 @@ impl PeriodicJob for FriProverStatsReporter {
                     .await
                     .unwrap()
                     .unwrap()
-                    .0 as f64
+                    .0 as u64
             }
         };
-        metrics::gauge!("fri_prover.oldest_unpicked_batch", oldest_unpicked_batch);
+        FRI_PROVER_METRICS
+            .oldest_unpicked_batch
+            .set(oldest_unpicked_batch);
 
         if let Some(l1_batch_number) = db_conn
             .proof_generation_dal()
             .get_oldest_not_generated_batch()
-            .await
+            .await?
         {
-            metrics::gauge!(
-                "fri_prover.oldest_not_generated_batch",
-                l1_batch_number.0 as f64
-            )
+            FRI_PROVER_METRICS
+                .oldest_not_generated_batch
+                .set(l1_batch_number.0 as u64);
         }
 
         for aggregation_round in 0..3 {
@@ -128,11 +132,9 @@ impl PeriodicJob for FriProverStatsReporter {
                 .min_unproved_l1_batch_number_for_aggregation_round(aggregation_round.into())
                 .await
             {
-                metrics::gauge!(
-                    "fri_prover.oldest_unprocessed_block_by_round",
-                    l1_batch_number.0 as f64,
-                    "aggregation_round" => aggregation_round.to_string()
-                )
+                FRI_PROVER_METRICS.oldest_unprocessed_block_by_round
+                    [&aggregation_round.to_string()]
+                    .set(l1_batch_number.0 as u64);
             }
         }
 
diff --git a/core/node/house_keeper/src/prover/queue_reporter/fri_witness_generator_queue_reporter.rs b/core/node/house_keeper/src/prover/queue_reporter/fri_witness_generator_queue_reporter.rs
new file mode 100644
index 000000000000..cd124dffaf67
--- /dev/null
+++ b/core/node/house_keeper/src/prover/queue_reporter/fri_witness_generator_queue_reporter.rs
@@ -0,0 +1,131 @@
+use std::collections::HashMap;
+
+use async_trait::async_trait;
+use zksync_dal::ConnectionPool;
+use zksync_prover_dal::{Prover, ProverDal};
+use zksync_types::{
+    basic_fri_types::AggregationRound, protocol_version::ProtocolSemanticVersion,
+    prover_dal::JobCountStatistics,
+};
+
+use crate::{periodic_job::PeriodicJob, prover::metrics::SERVER_METRICS};
+
+/// `FriWitnessGeneratorQueueReporter` is a task that periodically reports witness generator jobs status.
+/// Note: these values will be used for auto-scaling witness generators (Basic, Leaf, Node, Recursion Tip and Scheduler).
+#[derive(Debug)]
+pub struct FriWitnessGeneratorQueueReporter {
+    reporting_interval_ms: u64,
+    pool: ConnectionPool<Prover>,
+}
+
+impl FriWitnessGeneratorQueueReporter {
+    pub fn new(pool: ConnectionPool<Prover>, reporting_interval_ms: u64) -> Self {
+        Self {
+            reporting_interval_ms,
+            pool,
+        }
+    }
+
+    async fn get_job_statistics(
+        &self,
+    ) -> HashMap<(AggregationRound, ProtocolSemanticVersion), JobCountStatistics> {
+        let mut conn = self.pool.connection().await.unwrap();
+        let mut result = HashMap::new();
+        result.extend(
+            conn.fri_witness_generator_dal()
+                .get_witness_jobs_stats(AggregationRound::BasicCircuits)
+                .await,
+        );
+        result.extend(
+            conn.fri_witness_generator_dal()
+                .get_witness_jobs_stats(AggregationRound::LeafAggregation)
+                .await,
+        );
+        result.extend(
+            conn.fri_witness_generator_dal()
+                .get_witness_jobs_stats(AggregationRound::NodeAggregation)
+                .await,
+        );
+        result.extend(
+            conn.fri_witness_generator_dal()
+                .get_witness_jobs_stats(AggregationRound::RecursionTip)
+                .await,
+        );
+        result.extend(
+            conn.fri_witness_generator_dal()
+                .get_witness_jobs_stats(AggregationRound::Scheduler)
+                .await,
+        );
+
+        result
+    }
+}
+
+fn emit_metrics_for_round(
+    round: AggregationRound,
+    protocol_version: ProtocolSemanticVersion,
+    stats: &JobCountStatistics,
+) {
+    if stats.queued > 0 || stats.in_progress > 0 {
+        tracing::trace!(
+            "Found {} free and {} in progress {:?} FRI witness generators jobs for protocol version {}",
+            stats.queued,
+            stats.in_progress,
+            round,
+            protocol_version
+        );
+    }
+
+    SERVER_METRICS.witness_generator_jobs_by_round[&(
+        "queued",
+        format!("{:?}", round),
+        protocol_version.to_string(),
+    )]
+        .set(stats.queued as u64);
+    SERVER_METRICS.witness_generator_jobs_by_round[&(
+        "in_progress",
+        format!("{:?}", round),
+        protocol_version.to_string(),
+    )]
+        .set(stats.in_progress as u64);
+}
+
+#[async_trait]
+impl PeriodicJob for FriWitnessGeneratorQueueReporter {
+    const SERVICE_NAME: &'static str = "FriWitnessGeneratorQueueReporter";
+
+    async fn run_routine_task(&mut self) -> anyhow::Result<()> {
+        let stats_for_all_rounds = self.get_job_statistics().await;
+        let mut aggregated = HashMap::<ProtocolSemanticVersion, JobCountStatistics>::new();
+        for ((round, protocol_version), stats) in stats_for_all_rounds {
+            emit_metrics_for_round(round, protocol_version, &stats);
+
+            let entry = aggregated.entry(protocol_version).or_default();
+            entry.queued += stats.queued;
+            entry.in_progress += stats.in_progress;
+        }
+
+        for (protocol_version, stats) in &aggregated {
+            if stats.queued > 0 || stats.in_progress > 0 {
+                tracing::trace!(
+                    "Found {} free {} in progress witness generators jobs for protocol version {}",
+                    stats.queued,
+                    stats.in_progress,
+                    protocol_version
+                );
+            }
+
+            SERVER_METRICS.witness_generator_jobs[&("queued", protocol_version.to_string())]
+                .set(stats.queued as u64);
+
+            SERVER_METRICS.witness_generator_jobs[&("in_progress", protocol_version.to_string())]
+                .set(stats.in_progress as u64);
+        }
+
+        Ok(())
+    }
+
+    fn polling_interval_ms(&self) -> u64 {
+        self.reporting_interval_ms
+    }
+}
diff --git a/core/node/house_keeper/src/prover/queue_reporter/mod.rs b/core/node/house_keeper/src/prover/queue_reporter/mod.rs
new file mode 100644
index 000000000000..9eba45320988
--- /dev/null
+++ b/core/node/house_keeper/src/prover/queue_reporter/mod.rs
@@ -0,0 +1,7 @@
+mod fri_proof_compressor_queue_reporter;
+mod fri_prover_queue_reporter;
+mod fri_witness_generator_queue_reporter;
+
+pub use fri_proof_compressor_queue_reporter::FriProofCompressorQueueReporter;
+pub use fri_prover_queue_reporter::FriProverQueueReporter;
+pub use fri_witness_generator_queue_reporter::FriWitnessGeneratorQueueReporter;
diff --git a/core/node/house_keeper/src/fri_proof_compressor_job_retry_manager.rs b/core/node/house_keeper/src/prover/retry_manager/fri_proof_compressor_job_retry_manager.rs
similarity index 80%
rename from core/node/house_keeper/src/fri_proof_compressor_job_retry_manager.rs
rename to core/node/house_keeper/src/prover/retry_manager/fri_proof_compressor_job_retry_manager.rs
index 2ee0e386a91f..4d4d8ceed75e 100644
--- a/core/node/house_keeper/src/fri_proof_compressor_job_retry_manager.rs
+++ b/core/node/house_keeper/src/prover/retry_manager/fri_proof_compressor_job_retry_manager.rs
@@ -1,11 +1,12 @@
 use std::time::Duration;
 
 use async_trait::async_trait;
-use prover_dal::{Prover, ProverDal};
 use zksync_dal::ConnectionPool;
+use zksync_prover_dal::{Prover, ProverDal};
 
-use crate::periodic_job::PeriodicJob;
+use crate::{periodic_job::PeriodicJob, prover::metrics::PROVER_FRI_METRICS};
 
+/// `FriProofCompressorJobRetryManager` is a task that periodically queues stuck compressor jobs.
 #[derive(Debug)]
 pub struct FriProofCompressorJobRetryManager {
     pool: ConnectionPool<Prover>,
@@ -30,7 +31,6 @@ impl FriProofCompressorJobRetryManager {
     }
 }
 
-/// Invoked periodically to re-queue stuck fri prover jobs.
 #[async_trait]
 impl PeriodicJob for FriProofCompressorJobRetryManager {
     const SERVICE_NAME: &'static str = "FriProofCompressorJobRetryManager";
@@ -48,7 +48,9 @@ impl PeriodicJob for FriProofCompressorJobRetryManager {
         for stuck_job in stuck_jobs {
             tracing::info!("re-queuing fri proof compressor job {:?}", stuck_job);
         }
-        metrics::counter!("prover_fri.proof_compressor.requeued_jobs", job_len as u64);
+        PROVER_FRI_METRICS
+            .proof_compressor_requeued_jobs
+            .inc_by(job_len as u64);
         Ok(())
     }
 
diff --git a/core/node/house_keeper/src/fri_prover_job_retry_manager.rs b/core/node/house_keeper/src/prover/retry_manager/fri_prover_job_retry_manager.rs
similarity index 81%
rename from core/node/house_keeper/src/fri_prover_job_retry_manager.rs
rename to core/node/house_keeper/src/prover/retry_manager/fri_prover_job_retry_manager.rs
index 939b9cb8eaad..755944d21634 100644
--- a/core/node/house_keeper/src/fri_prover_job_retry_manager.rs
+++ b/core/node/house_keeper/src/prover/retry_manager/fri_prover_job_retry_manager.rs
@@ -1,11 +1,12 @@
 use std::time::Duration;
 
 use async_trait::async_trait;
-use prover_dal::{Prover, ProverDal};
 use zksync_dal::ConnectionPool;
+use zksync_prover_dal::{Prover, ProverDal};
 
-use crate::periodic_job::PeriodicJob;
+use crate::{periodic_job::PeriodicJob, prover::metrics::SERVER_METRICS};
 
+/// `FriProverJobRetryManager` is a task that periodically queues stuck prover jobs.
 #[derive(Debug)]
 pub struct FriProverJobRetryManager {
     pool: ConnectionPool<Prover>,
@@ -30,7 +31,6 @@ impl FriProverJobRetryManager {
     }
 }
 
-/// Invoked periodically to re-queue stuck fri prover jobs.
 #[async_trait]
 impl PeriodicJob for FriProverJobRetryManager {
     const SERVICE_NAME: &'static str = "FriProverJobRetryManager";
@@ -48,7 +48,9 @@ impl PeriodicJob for FriProverJobRetryManager {
         for stuck_job in stuck_jobs {
             tracing::info!("re-queuing fri prover job {:?}", stuck_job);
         }
-        metrics::counter!("server.prover_fri.requeued_jobs", job_len as u64);
+        SERVER_METRICS
+            .prover_fri_requeued_jobs
+            .inc_by(job_len as u64);
         Ok(())
     }
 
diff --git a/core/node/house_keeper/src/fri_witness_generator_jobs_retry_manager.rs b/core/node/house_keeper/src/prover/retry_manager/fri_witness_generator_jobs_retry_manager.rs
similarity index 91%
rename from core/node/house_keeper/src/fri_witness_generator_jobs_retry_manager.rs
rename to core/node/house_keeper/src/prover/retry_manager/fri_witness_generator_jobs_retry_manager.rs
index 26a86a778c40..817d1e290252 100644
--- a/core/node/house_keeper/src/fri_witness_generator_jobs_retry_manager.rs
+++ b/core/node/house_keeper/src/prover/retry_manager/fri_witness_generator_jobs_retry_manager.rs
@@ -1,11 +1,15 @@
 use async_trait::async_trait;
-use prover_dal::{Prover, ProverDal};
 use zksync_config::configs::fri_witness_generator::WitnessGenerationTimeouts;
 use zksync_dal::ConnectionPool;
+use zksync_prover_dal::{Prover, ProverDal};
 use zksync_types::prover_dal::StuckJobs;
 
-use crate::periodic_job::PeriodicJob;
+use crate::{
+    periodic_job::PeriodicJob,
+    prover::metrics::{WitnessType, SERVER_METRICS},
+};
 
+/// `FriWitnessGeneratorJobRetryManager` is a task that periodically queues stuck prover jobs.
 #[derive(Debug)]
 pub struct FriWitnessGeneratorJobRetryManager {
     pool: ConnectionPool<Prover>,
@@ -33,10 +37,8 @@ impl FriWitnessGeneratorJobRetryManager {
         for stuck_job in stuck_jobs {
             tracing::info!("re-queuing {:?} {:?}", witness_type, stuck_job);
         }
-        metrics::counter!(
-            format!("server.{:?}.requeued_jobs", witness_type),
-            stuck_jobs.len() as u64
-        );
+        SERVER_METRICS.requeued_jobs[&WitnessType::from(witness_type)]
+            .inc_by(stuck_jobs.len() as u64);
     }
 
     pub async fn requeue_stuck_witness_inputs_jobs(&mut self) {
@@ -109,7 +111,6 @@ impl FriWitnessGeneratorJobRetryManager {
     }
 }
 
-/// Invoked periodically to re-queue stuck fri witness generator jobs.
 #[async_trait]
 impl PeriodicJob for FriWitnessGeneratorJobRetryManager {
     const SERVICE_NAME: &'static str = "FriWitnessGeneratorJobRetryManager";
diff --git a/core/node/house_keeper/src/prover/retry_manager/mod.rs b/core/node/house_keeper/src/prover/retry_manager/mod.rs
new file mode 100644
index 000000000000..3b4a8b584817
--- /dev/null
+++ b/core/node/house_keeper/src/prover/retry_manager/mod.rs
@@ -0,0 +1,7 @@
+mod fri_proof_compressor_job_retry_manager;
+mod fri_prover_job_retry_manager;
+mod fri_witness_generator_jobs_retry_manager;
+
+pub use fri_proof_compressor_job_retry_manager::FriProofCompressorJobRetryManager;
+pub use fri_prover_job_retry_manager::FriProverJobRetryManager;
+pub use fri_witness_generator_jobs_retry_manager::FriWitnessGeneratorJobRetryManager;
diff --git a/core/node/house_keeper/src/waiting_to_queued_fri_witness_job_mover.rs b/core/node/house_keeper/src/prover/waiting_to_queued_fri_witness_job_mover.rs
similarity index 84%
rename from core/node/house_keeper/src/waiting_to_queued_fri_witness_job_mover.rs
rename to core/node/house_keeper/src/prover/waiting_to_queued_fri_witness_job_mover.rs
index 76d016b86181..d4d5edc78eb9 100644
--- a/core/node/house_keeper/src/waiting_to_queued_fri_witness_job_mover.rs
+++ b/core/node/house_keeper/src/prover/waiting_to_queued_fri_witness_job_mover.rs
@@ -1,8 +1,8 @@
 use async_trait::async_trait;
-use prover_dal::{Prover, ProverDal};
 use zksync_dal::ConnectionPool;
+use zksync_prover_dal::{Prover, ProverDal};
 
-use crate::periodic_job::PeriodicJob;
+use crate::{periodic_job::PeriodicJob, prover::metrics::SERVER_METRICS};
 
 #[derive(Debug)]
 pub struct WaitingToQueuedFriWitnessJobMover {
@@ -32,10 +32,10 @@ impl WaitingToQueuedFriWitnessJobMover {
                 circuit_id
             );
         }
-        metrics::counter!(
-            "server.node_fri_witness_generator.waiting_to_queued_jobs_transitions",
-            len as u64
-        );
+
+        SERVER_METRICS
+            .node_fri_witness_generator_waiting_to_queued_jobs_transitions
+            .inc_by(len as u64);
     }
 
     async fn move_node_aggregation_jobs_from_waiting_to_queued(&mut self) -> Vec<(i64, u8, u16)> {
@@ -65,10 +65,9 @@ impl WaitingToQueuedFriWitnessJobMover {
                 depth
             );
         }
-        metrics::counter!(
-            "server.leaf_fri_witness_generator.waiting_to_queued_jobs_transitions",
-            len as u64
-        );
+        SERVER_METRICS
+            .leaf_fri_witness_generator_waiting_to_queued_jobs_transitions
+            .inc_by(len as u64);
     }
 
     /// Marks recursion tip witness jobs as queued.
@@ -85,10 +84,9 @@ impl WaitingToQueuedFriWitnessJobMover {
                 l1_batch_number,
             );
         }
-        metrics::counter!(
-            "server.recursion_tip_witness_generator.waiting_to_queued_jobs_transitions",
-            l1_batch_numbers.len() as u64
-        );
+        SERVER_METRICS
+            .recursion_tip_witness_generator_waiting_to_queued_jobs_transitions
+            .inc_by(l1_batch_numbers.len() as u64);
     }
 
     /// Marks scheduler witness jobs as queued.
@@ -105,10 +103,9 @@ impl WaitingToQueuedFriWitnessJobMover {
                 l1_batch_number,
             );
         }
-        metrics::counter!(
-            "server.scheduler_witness_generator.waiting_to_queued_jobs_transitions",
-            l1_batch_numbers.len() as u64
-        );
+        SERVER_METRICS
+            .scheduler_witness_generator_waiting_to_queued_jobs_transitions
+            .inc_by(l1_batch_numbers.len() as u64);
     }
 }
 
diff --git a/core/node/metadata_calculator/Cargo.toml b/core/node/metadata_calculator/Cargo.toml
new file mode 100644
index 000000000000..b694c1d198cd
--- /dev/null
+++ b/core/node/metadata_calculator/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+name = "zksync_metadata_calculator"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_crypto.workspace = true
+zksync_dal.workspace = true
+zksync_health_check.workspace = true
+zksync_merkle_tree.workspace = true
+zksync_types.workspace = true
+zksync_config.workspace = true
+zksync_storage.workspace = true
+zksync_shared_metrics.workspace = true
+zksync_utils.workspace = true
+zksync_object_store.workspace = true
+vise.workspace = true
+
+async-trait.workspace = true
+anyhow.workspace = true
+serde.workspace = true
+tokio = { workspace = true, features = ["time"] }
+thiserror.workspace = true
+tracing.workspace = true
+once_cell.workspace = true
+futures.workspace = true
+itertools.workspace = true
+
+# dependencies for the tree API server
+reqwest.workspace = true
+axum.workspace = true
+serde_json.workspace = true
+
+[dev-dependencies]
+zksync_node_genesis.workspace = true
+zksync_node_test_utils.workspace = true
+zksync_prover_interface.workspace = true
+
+assert_matches.workspace = true
+tempfile.workspace = true
+test-casing.workspace = true
+itertools.workspace = true
diff --git a/core/node/metadata_calculator/README.md b/core/node/metadata_calculator/README.md
new file mode 100644
index 000000000000..38c96c2c4b2b
--- /dev/null
+++ b/core/node/metadata_calculator/README.md
@@ -0,0 +1,6 @@
+# `zksync_metadata_calculator`
+
+Component responsible for calculating any supplementary metadata required for L1 batches. Most notably, this is
+component responsible for maintaining the Merkle Tree.
+
+Additionally, this crate provides ability to spawn the Merkle Tree API server.
diff --git a/core/lib/zksync_core/src/api_server/tree/metrics.rs b/core/node/metadata_calculator/src/api_server/metrics.rs
similarity index 100%
rename from core/lib/zksync_core/src/api_server/tree/metrics.rs
rename to core/node/metadata_calculator/src/api_server/metrics.rs
diff --git a/core/lib/zksync_core/src/api_server/tree/mod.rs b/core/node/metadata_calculator/src/api_server/mod.rs
similarity index 81%
rename from core/lib/zksync_core/src/api_server/tree/mod.rs
rename to core/node/metadata_calculator/src/api_server/mod.rs
index bb6f2528672e..de3d39a14098 100644
--- a/core/lib/zksync_core/src/api_server/tree/mod.rs
+++ b/core/node/metadata_calculator/src/api_server/mod.rs
@@ -12,12 +12,13 @@ use axum::{
 };
 use serde::{Deserialize, Serialize};
 use tokio::sync::watch;
+use zksync_crypto::hasher::blake2::Blake2Hasher;
 use zksync_health_check::{CheckHealth, Health, HealthStatus};
 use zksync_merkle_tree::NoVersionError;
 use zksync_types::{L1BatchNumber, H256, U256};
 
 use self::metrics::{MerkleTreeApiMethod, API_METRICS};
-use crate::metadata_calculator::{AsyncTreeReader, LazyAsyncTreeReader, MerkleTreeInfo};
+use crate::{AsyncTreeReader, LazyAsyncTreeReader, MerkleTreeInfo};
 
 mod metrics;
 #[cfg(test)]
@@ -34,7 +35,7 @@ struct TreeProofsResponse {
     entries: Vec<TreeEntryWithProof>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct TreeEntryWithProof {
     #[serde(default, skip_serializing_if = "H256::is_zero")]
     pub value: H256,
@@ -59,6 +60,21 @@ impl TreeEntryWithProof {
             merkle_path,
         }
     }
+
+    /// Verifies the entry.
+    pub fn verify(&self, key: U256, trusted_root_hash: H256) -> anyhow::Result<()> {
+        let mut merkle_path = self.merkle_path.clone();
+        merkle_path.reverse();
+        zksync_merkle_tree::TreeEntryWithProof {
+            base: zksync_merkle_tree::TreeEntry {
+                value: self.value,
+                leaf_index: self.index,
+                key,
+            },
+            merkle_path,
+        }
+        .verify(&Blake2Hasher, trusted_root_hash)
+    }
 }
 
 /// Server-side tree API error.
@@ -127,13 +143,26 @@ impl IntoResponse for TreeApiServerError {
 pub enum TreeApiError {
     #[error(transparent)]
     NoVersion(NoVersionError),
-    #[error("tree API is temporarily not available because the Merkle tree isn't initialized; repeat request later")]
-    NotReady,
+    #[error("tree API is temporarily unavailable")]
+    NotReady(#[source] Option<anyhow::Error>),
     /// Catch-all variant for internal errors.
     #[error("internal error")]
     Internal(#[from] anyhow::Error),
 }
 
+impl TreeApiError {
+    fn for_request(err: reqwest::Error, request_description: impl fmt::Display) -> Self {
+        let is_not_ready = err.is_timeout() || err.is_connect();
+        let err =
+            anyhow::Error::new(err).context(format!("failed requesting {request_description}"));
+        if is_not_ready {
+            Self::NotReady(Some(err))
+        } else {
+            Self::Internal(err)
+        }
+    }
+}
+
 /// Client accessing Merkle tree API.
 #[async_trait]
 pub trait TreeApiClient: 'static + Send + Sync + fmt::Debug {
@@ -155,7 +184,7 @@ impl TreeApiClient for LazyAsyncTreeReader {
         if let Some(reader) = self.read() {
             Ok(reader.info().await)
         } else {
-            Err(TreeApiError::NotReady)
+            Err(TreeApiError::NotReady(None))
         }
     }
 
@@ -170,7 +199,7 @@ impl TreeApiClient for LazyAsyncTreeReader {
                 .await
                 .map_err(TreeApiError::NoVersion)
         } else {
-            Err(TreeApiError::NotReady)
+            Err(TreeApiError::NotReady(None))
         }
     }
 }
@@ -184,9 +213,15 @@ pub struct TreeApiHttpClient {
 }
 
 impl TreeApiHttpClient {
+    /// Creates a new HTTP client with default settings.
     pub fn new(url_base: &str) -> Self {
+        Self::from_client(reqwest::Client::new(), url_base)
+    }
+
+    /// Wraps a provided HTTP client.
+    pub fn from_client(client: reqwest::Client, url_base: &str) -> Self {
         Self {
-            inner: reqwest::Client::new(),
+            inner: client,
             info_url: url_base.to_owned(),
             proofs_url: format!("{url_base}/proofs"),
         }
@@ -202,9 +237,11 @@ impl CheckHealth for TreeApiHttpClient {
     async fn check_health(&self) -> Health {
         match self.get_info().await {
             Ok(info) => Health::from(HealthStatus::Ready).with_details(info),
-            Err(TreeApiError::NotReady) => HealthStatus::Affected.into(),
-            Err(err) => Health::from(HealthStatus::NotReady).with_details(serde_json::json!({
+            // Tree API is not a critical component, so its errors are not considered fatal for the app health.
+            Err(err) => Health::from(HealthStatus::Affected).with_details(serde_json::json!({
                 "error": err.to_string(),
+                // Transient error detection is a best-effort estimate
+                "is_transient_error": matches!(err, TreeApiError::NotReady(_)),
             })),
         }
     }
@@ -218,7 +255,7 @@ impl TreeApiClient for TreeApiHttpClient {
             .get(&self.info_url)
             .send()
             .await
-            .context("Failed requesting tree info")?;
+            .map_err(|err| TreeApiError::for_request(err, "tree info"))?;
         let response = response
             .error_for_status()
             .context("Requesting tree info returned non-OK response")?;
@@ -242,7 +279,12 @@ impl TreeApiClient for TreeApiHttpClient {
             })
             .send()
             .await
-            .with_context(|| format!("failed requesting proofs for L1 batch #{l1_batch_number}"))?;
+            .map_err(|err| {
+                TreeApiError::for_request(
+                    err,
+                    format_args!("proofs for L1 batch #{l1_batch_number}"),
+                )
+            })?;
 
         let is_problem = response
             .headers()
@@ -301,7 +343,7 @@ impl AsyncTreeReader {
         Ok(Json(response))
     }
 
-    fn create_api_server(
+    async fn create_api_server(
         self,
         bind_address: &SocketAddr,
         mut stop_receiver: watch::Receiver<bool>,
@@ -313,10 +355,11 @@ impl AsyncTreeReader {
             .route("/proofs", routing::post(Self::get_proofs_handler))
             .with_state(self);
 
-        let server = axum::Server::try_bind(bind_address)
-            .with_context(|| format!("Failed binding Merkle tree API server to {bind_address}"))?
-            .serve(app.into_make_service());
-        let local_addr = server.local_addr();
+        let listener = tokio::net::TcpListener::bind(bind_address)
+            .await
+            .with_context(|| format!("Failed binding Merkle tree API server to {bind_address}"))?;
+        let local_addr = listener.local_addr()?;
+        let server = axum::serve(listener, app);
         let server_future = async move {
             server.with_graceful_shutdown(async move {
                 if stop_receiver.changed().await.is_err() {
@@ -345,7 +388,8 @@ impl AsyncTreeReader {
         bind_address: SocketAddr,
         stop_receiver: watch::Receiver<bool>,
     ) -> anyhow::Result<()> {
-        self.create_api_server(&bind_address, stop_receiver)?
+        self.create_api_server(&bind_address, stop_receiver)
+            .await?
             .run()
             .await
     }
diff --git a/core/lib/zksync_core/src/api_server/tree/tests.rs b/core/node/metadata_calculator/src/api_server/tests.rs
similarity index 67%
rename from core/lib/zksync_core/src/api_server/tree/tests.rs
rename to core/node/metadata_calculator/src/api_server/tests.rs
index f3d3cb62390a..42a3152e6b53 100644
--- a/core/lib/zksync_core/src/api_server/tree/tests.rs
+++ b/core/node/metadata_calculator/src/api_server/tests.rs
@@ -1,21 +1,23 @@
 //! Tests for the Merkle tree API.
 
-use std::net::Ipv4Addr;
+use std::{net::Ipv4Addr, time::Duration};
 
 use assert_matches::assert_matches;
 use tempfile::TempDir;
+use tokio::{
+    io::AsyncWriteExt,
+    net::{TcpListener, TcpSocket},
+};
 use zksync_dal::{ConnectionPool, Core};
 
 use super::*;
-use crate::metadata_calculator::tests::{
-    gen_storage_logs, reset_db_state, run_calculator, setup_calculator,
-};
+use crate::tests::{gen_storage_logs, reset_db_state, run_calculator, setup_calculator};
 
 #[tokio::test]
 async fn merkle_tree_api() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
-    let (calculator, _) = setup_calculator(temp_dir.path(), pool.clone()).await;
+    let (calculator, _) = setup_calculator(temp_dir.path(), pool.clone(), true).await;
     let api_addr = (Ipv4Addr::LOCALHOST, 0).into();
 
     reset_db_state(&pool, 5).await;
@@ -26,7 +28,9 @@ async fn merkle_tree_api() {
     let api_server = tree_reader
         .wait()
         .await
+        .unwrap()
         .create_api_server(&api_addr, stop_receiver.clone())
+        .await
         .unwrap();
     let local_addr = *api_server.local_addr();
     let api_server_task = tokio::spawn(api_server.run());
@@ -73,17 +77,51 @@ async fn merkle_tree_api() {
     api_server_task.await.unwrap().unwrap();
 }
 
+#[tokio::test]
+async fn api_client_connection_error() {
+    // Use an address that will definitely fail on a timeout.
+    let socket = TcpSocket::new_v4().unwrap();
+    socket.bind((Ipv4Addr::LOCALHOST, 0).into()).unwrap();
+    let local_addr = socket.local_addr().unwrap();
+
+    let client = reqwest::Client::builder()
+        .timeout(Duration::from_secs(1))
+        .build()
+        .unwrap();
+    let api_client = TreeApiHttpClient::from_client(client, &format!("http://{local_addr}"));
+    let err = api_client.get_info().await.unwrap_err();
+    assert_matches!(err, TreeApiError::NotReady(Some(_)));
+}
+
+#[tokio::test]
+async fn api_client_unparesable_response_error() {
+    let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 0)).await.unwrap();
+    let local_addr = listener.local_addr().unwrap();
+    tokio::spawn(async move {
+        while let Ok((mut stream, _)) = listener.accept().await {
+            stream
+                .write_all(b"HTTP/1.1 200 OK\ncontent-type: application/json\ncontent-length: 13\n\nNot JSON, lol")
+                .await
+                .ok();
+        }
+    });
+
+    let api_client = TreeApiHttpClient::new(&format!("http://{local_addr}"));
+    let err = api_client.get_info().await.unwrap_err();
+    assert_matches!(err, TreeApiError::Internal(_));
+}
+
 #[tokio::test]
 async fn local_merkle_tree_client() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
-    let (calculator, _) = setup_calculator(temp_dir.path(), pool.clone()).await;
+    let (calculator, _) = setup_calculator(temp_dir.path(), pool.clone(), true).await;
 
     reset_db_state(&pool, 5).await;
     let tree_reader = calculator.tree_reader();
 
     let err = tree_reader.get_info().await.unwrap_err();
-    assert_matches!(err, TreeApiError::NotReady);
+    assert_matches!(err, TreeApiError::NotReady(None));
 
     // Wait until the calculator processes initial L1 batches.
     run_calculator(calculator).await;
diff --git a/core/lib/zksync_core/src/metadata_calculator/helpers.rs b/core/node/metadata_calculator/src/helpers.rs
similarity index 70%
rename from core/lib/zksync_core/src/metadata_calculator/helpers.rs
rename to core/node/metadata_calculator/src/helpers.rs
index c09f3a8a3e1f..5e3c1f3d9d73 100644
--- a/core/lib/zksync_core/src/metadata_calculator/helpers.rs
+++ b/core/node/metadata_calculator/src/helpers.rs
@@ -2,7 +2,6 @@
 
 use std::{
     collections::{BTreeMap, HashSet},
-    future,
     future::Future,
     path::Path,
     sync::Arc,
@@ -11,6 +10,7 @@ use std::{
 
 use anyhow::Context as _;
 use async_trait::async_trait;
+use itertools::Itertools;
 use once_cell::sync::OnceCell;
 use serde::{Deserialize, Serialize};
 #[cfg(test)]
@@ -21,17 +21,21 @@ use zksync_dal::{Connection, Core, CoreDal};
 use zksync_health_check::{CheckHealth, Health, HealthStatus, ReactiveHealthCheck};
 use zksync_merkle_tree::{
     domain::{TreeMetadata, ZkSyncTree, ZkSyncTreeReader},
-    recovery::MerkleTreeRecovery,
+    recovery::{MerkleTreeRecovery, PersistenceThreadHandle},
     Database, Key, MerkleTreeColumnFamily, NoVersionError, RocksDBWrapper, TreeEntry,
     TreeEntryWithProof, TreeInstruction,
 };
 use zksync_storage::{RocksDB, RocksDBOptions, StalledWritesRetries, WeakRocksDB};
-use zksync_types::{block::L1BatchHeader, L1BatchNumber, StorageKey, H256};
+use zksync_types::{
+    block::{L1BatchHeader, L1BatchTreeData},
+    writes::TreeWrite,
+    AccountTreeId, L1BatchNumber, StorageKey, H256,
+};
 
 use super::{
     metrics::{LoadChangesStage, TreeUpdateStage, METRICS},
     pruning::PruningHandles,
-    MetadataCalculatorConfig,
+    MetadataCalculatorConfig, MetadataCalculatorRecoveryConfig,
 };
 
 /// General information about the Merkle tree.
@@ -87,9 +91,10 @@ impl MerkleTreeHealthCheck {
         let weak_reader = Arc::<OnceCell<WeakAsyncTreeReader>>::default();
         let weak_reader_for_task = weak_reader.clone();
         tokio::spawn(async move {
-            weak_reader_for_task
-                .set(reader.wait().await.downgrade())
-                .ok();
+            if let Some(reader) = reader.wait().await {
+                weak_reader_for_task.set(reader.downgrade()).ok();
+            }
+            // Otherwise, the tree is dropped before getting initialized; this is not an error in this context.
         });
 
         Self {
@@ -189,15 +194,15 @@ impl AsyncTree {
     const INCONSISTENT_MSG: &'static str =
         "`AsyncTree` is in inconsistent state, which could occur after one of its async methods was cancelled or returned an error";
 
-    pub fn new(db: RocksDBWrapper, mode: MerkleTreeMode) -> Self {
+    pub fn new(db: RocksDBWrapper, mode: MerkleTreeMode) -> anyhow::Result<Self> {
         let tree = match mode {
             MerkleTreeMode::Full => ZkSyncTree::new(db),
             MerkleTreeMode::Lightweight => ZkSyncTree::new_lightweight(db),
-        };
-        Self {
+        }?;
+        Ok(Self {
             inner: Some(tree),
             mode,
-        }
+        })
     }
 
     fn as_ref(&self) -> &ZkSyncTree {
@@ -231,11 +236,23 @@ impl AsyncTree {
         self.as_ref().next_l1_batch_number()
     }
 
+    pub fn min_l1_batch_number(&self) -> Option<L1BatchNumber> {
+        self.as_ref().reader().min_l1_batch_number()
+    }
+
     #[cfg(test)]
     pub fn root_hash(&self) -> H256 {
         self.as_ref().root_hash()
     }
 
+    pub fn data_for_l1_batch(&self, l1_batch_number: L1BatchNumber) -> Option<L1BatchTreeData> {
+        let (hash, leaf_count) = self.as_ref().root_info(l1_batch_number)?;
+        Some(L1BatchTreeData {
+            hash,
+            rollup_last_leaf_index: leaf_count + 1,
+        })
+    }
+
     /// Returned errors are unrecoverable; the tree must not be used after an error is returned.
     pub async fn process_l1_batch(
         &mut self,
@@ -251,13 +268,13 @@ impl AsyncTree {
 
         let mut tree = self.inner.take().context(Self::INCONSISTENT_MSG)?;
         let (tree, metadata) = tokio::task::spawn_blocking(move || {
-            let metadata = tree.process_l1_batch(&batch.storage_logs);
-            (tree, metadata)
+            let metadata = tree.process_l1_batch(&batch.storage_logs)?;
+            anyhow::Ok((tree, metadata))
         })
         .await
         .with_context(|| {
             format!("Merkle tree panicked when processing L1 batch #{batch_number}")
-        })?;
+        })??;
 
         self.inner = Some(tree);
         Ok(metadata)
@@ -268,17 +285,17 @@ impl AsyncTree {
         let mut tree = self.inner.take().context(Self::INCONSISTENT_MSG)?;
         self.inner = Some(
             tokio::task::spawn_blocking(|| {
-                tree.save();
-                tree
+                tree.save()?;
+                anyhow::Ok(tree)
             })
             .await
-            .context("Merkle tree panicked during saving")?,
+            .context("Merkle tree panicked during saving")??,
         );
         Ok(())
     }
 
-    pub fn revert_logs(&mut self, last_l1_batch_to_keep: L1BatchNumber) {
-        self.as_mut().roll_back_logs(last_l1_batch_to_keep);
+    pub fn roll_back_logs(&mut self, last_l1_batch_to_keep: L1BatchNumber) -> anyhow::Result<()> {
+        self.as_mut().roll_back_logs(last_l1_batch_to_keep)
     }
 }
 
@@ -298,12 +315,35 @@ impl AsyncTreeReader {
     }
 
     pub async fn info(self) -> MerkleTreeInfo {
-        tokio::task::spawn_blocking(move || MerkleTreeInfo {
-            mode: self.mode,
-            root_hash: self.inner.root_hash(),
-            next_l1_batch_number: self.inner.next_l1_batch_number(),
-            min_l1_batch_number: self.inner.min_l1_batch_number(),
-            leaf_count: self.inner.leaf_count(),
+        tokio::task::spawn_blocking(move || {
+            loop {
+                let next_l1_batch_number = self.inner.next_l1_batch_number();
+                let latest_l1_batch_number = next_l1_batch_number.checked_sub(1);
+                let root_info = if let Some(number) = latest_l1_batch_number {
+                    self.inner.root_info(L1BatchNumber(number))
+                } else {
+                    // No L1 batches in the tree yet.
+                    Some((ZkSyncTree::empty_tree_hash(), 0))
+                };
+                let Some((root_hash, leaf_count)) = root_info else {
+                    // It is possible (although very unlikely) that the latest tree version was removed after requesting it,
+                    // hence the outer loop; RocksDB doesn't provide consistent data views by default.
+                    tracing::info!(
+                        "Tree version at L1 batch {latest_l1_batch_number:?} was removed after requesting the latest tree L1 batch; \
+                         re-requesting tree information"
+                    );
+                    continue;
+                };
+
+                // `min_l1_batch_number` is not necessarily consistent with other retrieved tree data, but this looks fine.
+                break MerkleTreeInfo {
+                    mode: self.mode,
+                    root_hash,
+                    next_l1_batch_number,
+                    min_l1_batch_number: self.inner.min_l1_batch_number(),
+                    leaf_count,
+                };
+            }
         })
         .await
         .unwrap()
@@ -338,7 +378,7 @@ struct WeakAsyncTreeReader {
 impl WeakAsyncTreeReader {
     fn upgrade(&self) -> Option<AsyncTreeReader> {
         Some(AsyncTreeReader {
-            inner: ZkSyncTreeReader::new(self.db.upgrade()?.into()),
+            inner: ZkSyncTreeReader::new(self.db.upgrade()?.into()).ok()?,
             mode: self.mode,
         })
     }
@@ -350,20 +390,18 @@ pub struct LazyAsyncTreeReader(pub(super) watch::Receiver<Option<AsyncTreeReader
 
 impl LazyAsyncTreeReader {
     /// Returns a reader if it is initialized.
-    pub(crate) fn read(&self) -> Option<AsyncTreeReader> {
+    pub fn read(&self) -> Option<AsyncTreeReader> {
         self.0.borrow().clone()
     }
 
-    /// Waits until the tree is initialized and returns a reader for it.
-    pub async fn wait(mut self) -> AsyncTreeReader {
+    /// Waits until the tree is initialized and returns a reader for it. If the tree is dropped before
+    /// getting initialized, returns `None`.
+    pub async fn wait(mut self) -> Option<AsyncTreeReader> {
         loop {
             if let Some(reader) = self.0.borrow().clone() {
-                break reader;
-            }
-            if self.0.changed().await.is_err() {
-                tracing::info!("Tree dropped without getting ready; not resolving tree reader");
-                future::pending::<()>().await;
+                break Some(reader);
             }
+            self.0.changed().await.ok()?;
         }
     }
 }
@@ -379,11 +417,32 @@ impl AsyncTreeRecovery {
     const INCONSISTENT_MSG: &'static str =
         "`AsyncTreeRecovery` is in inconsistent state, which could occur after one of its async methods was cancelled";
 
-    pub fn new(db: RocksDBWrapper, recovered_version: u64, mode: MerkleTreeMode) -> Self {
-        Self {
-            inner: Some(MerkleTreeRecovery::new(db, recovered_version)),
+    pub fn new(
+        db: RocksDBWrapper,
+        recovered_version: u64,
+        mode: MerkleTreeMode,
+        config: &MetadataCalculatorRecoveryConfig,
+    ) -> anyhow::Result<Self> {
+        Ok(Self::with_handle(db, recovered_version, mode, config)?.0)
+    }
+
+    // Public for testing purposes
+    pub fn with_handle(
+        db: RocksDBWrapper,
+        recovered_version: u64,
+        mode: MerkleTreeMode,
+        config: &MetadataCalculatorRecoveryConfig,
+    ) -> anyhow::Result<(Self, Option<PersistenceThreadHandle>)> {
+        let mut recovery = MerkleTreeRecovery::new(db, recovered_version)?;
+        let handle = config
+            .parallel_persistence_buffer
+            .map(|buffer_capacity| recovery.parallelize_persistence(buffer_capacity.get()))
+            .transpose()?;
+        let this = Self {
+            inner: Some(recovery),
             mode,
-        }
+        };
+        Ok((this, handle))
     }
 
     pub fn recovered_version(&self) -> u64 {
@@ -393,6 +452,40 @@ impl AsyncTreeRecovery {
             .recovered_version()
     }
 
+    pub async fn ensure_desired_chunk_size(
+        &mut self,
+        desired_chunk_size: u64,
+    ) -> anyhow::Result<()> {
+        const CHUNK_SIZE_KEY: &str = "recovery.desired_chunk_size";
+
+        let mut tree = self.inner.take().expect(Self::INCONSISTENT_MSG);
+        let tree = tokio::task::spawn_blocking(move || {
+            // **Important.** Tags should not be mutated on error (i.e., it would be an error to unconditionally call `tags.insert()`
+            // and then check the previous value).
+            tree.update_custom_tags(|tags| {
+                if let Some(chunk_size_in_tree) = tags.get(CHUNK_SIZE_KEY) {
+                    let chunk_size_in_tree: u64 = chunk_size_in_tree
+                        .parse()
+                        .with_context(|| format!("error parsing desired_chunk_size `{chunk_size_in_tree}` in Merkle tree tags"))?;
+                    anyhow::ensure!(
+                        chunk_size_in_tree == desired_chunk_size,
+                        "Mismatch between the configured desired chunk size ({desired_chunk_size}) and one that was used previously ({chunk_size_in_tree}). \
+                         Either change the desired chunk size in configuration, or reset Merkle tree recovery by clearing its RocksDB directory"
+                    );
+                } else {
+                    tags.insert(CHUNK_SIZE_KEY.to_owned(), desired_chunk_size.to_string());
+                }
+                Ok(())
+            })
+            .context("failed updating Merkle tree tags")??;
+            anyhow::Ok(tree)
+        })
+        .await??;
+
+        self.inner = Some(tree);
+        Ok(())
+    }
+
     /// Returns an entry for the specified keys.
     pub async fn entries(&mut self, keys: Vec<Key>) -> Vec<TreeEntry> {
         let tree = self.inner.take().expect(Self::INCONSISTENT_MSG);
@@ -414,23 +507,32 @@ impl AsyncTreeRecovery {
     }
 
     /// Extends the tree with a chunk of recovery entries.
-    pub async fn extend(&mut self, entries: Vec<TreeEntry>) {
+    pub async fn extend(&mut self, entries: Vec<TreeEntry>) -> anyhow::Result<()> {
         let mut tree = self.inner.take().expect(Self::INCONSISTENT_MSG);
         let tree = tokio::task::spawn_blocking(move || {
-            tree.extend_random(entries);
-            tree
+            tree.extend_random(entries)?;
+            anyhow::Ok(tree)
         })
         .await
-        .unwrap();
+        .context("extending tree with recovery entries panicked")??;
 
         self.inner = Some(tree);
+        Ok(())
     }
 
-    pub async fn finalize(self) -> AsyncTree {
+    /// Waits until all pending chunks are persisted.
+    pub async fn wait_for_persistence(self) -> anyhow::Result<()> {
+        let tree = self.inner.expect(Self::INCONSISTENT_MSG);
+        tokio::task::spawn_blocking(|| tree.wait_for_persistence())
+            .await
+            .context("panicked while waiting for pending recovery chunks to be persisted")?
+    }
+
+    pub async fn finalize(self) -> anyhow::Result<AsyncTree> {
         let tree = self.inner.expect(Self::INCONSISTENT_MSG);
         let db = tokio::task::spawn_blocking(|| tree.finalize())
             .await
-            .unwrap();
+            .context("finalizing tree panicked")??;
         AsyncTree::new(db, self.mode)
     }
 }
@@ -450,19 +552,24 @@ pub(super) enum GenericAsyncTree {
 }
 
 impl GenericAsyncTree {
-    pub async fn new(db: RocksDBWrapper, mode: MerkleTreeMode) -> Self {
+    pub async fn new(
+        db: RocksDBWrapper,
+        config: &MetadataCalculatorConfig,
+    ) -> anyhow::Result<Self> {
+        let mode = config.mode;
+        let recovery = config.recovery.clone();
         tokio::task::spawn_blocking(move || {
             let Some(manifest) = db.manifest() else {
-                return Self::Empty { db, mode };
+                return Ok(Self::Empty { db, mode });
             };
-            if let Some(version) = manifest.recovered_version() {
-                Self::Recovering(AsyncTreeRecovery::new(db, version, mode))
+            anyhow::Ok(if let Some(version) = manifest.recovered_version() {
+                Self::Recovering(AsyncTreeRecovery::new(db, version, mode, &recovery)?)
             } else {
-                Self::Ready(AsyncTree::new(db, mode))
-            }
+                Self::Ready(AsyncTree::new(db, mode)?)
+            })
         })
         .await
-        .unwrap()
+        .context("loading Merkle tree panicked")?
     }
 }
 
@@ -505,7 +612,7 @@ impl Delayer {
 #[cfg_attr(test, derive(PartialEq))]
 pub(crate) struct L1BatchWithLogs {
     pub header: L1BatchHeader,
-    pub storage_logs: Vec<TreeInstruction<StorageKey>>,
+    pub storage_logs: Vec<TreeInstruction>,
     mode: MerkleTreeMode,
 }
 
@@ -551,10 +658,85 @@ impl L1BatchWithLogs {
             MerkleTreeMode::Lightweight => HashSet::new(),
         };
 
+        let load_tree_writes_latency = METRICS.start_load_stage(LoadChangesStage::LoadTreeWrites);
+        let mut tree_writes = storage
+            .blocks_dal()
+            .get_tree_writes(l1_batch_number)
+            .await?;
+        if tree_writes.is_none() && l1_batch_number.0 > 0 {
+            // If `tree_writes` are present for the previous L1 batch, then it is expected them to be eventually present for the current batch as well.
+            // Waiting for tree writes should be faster then constructing them, so we wait with a reasonable timeout.
+            let tree_writes_present_for_previous_batch = storage
+                .blocks_dal()
+                .check_tree_writes_presence(l1_batch_number - 1)
+                .await?;
+            if tree_writes_present_for_previous_batch {
+                tree_writes = Self::wait_for_tree_writes(storage, l1_batch_number).await?;
+            }
+        }
+        load_tree_writes_latency.observe();
+
+        let storage_logs = if let Some(tree_writes) = tree_writes {
+            // If tree writes are present in DB then simply use them.
+            let writes = tree_writes.into_iter().map(|tree_write| {
+                let storage_key =
+                    StorageKey::new(AccountTreeId::new(tree_write.address), tree_write.key);
+                TreeInstruction::write(storage_key, tree_write.leaf_index, tree_write.value)
+            });
+            let reads = protective_reads.into_iter().map(TreeInstruction::Read);
+
+            writes
+                .chain(reads)
+                .sorted_by_key(|tree_instruction| tree_instruction.key())
+                .map(TreeInstruction::with_hashed_key)
+                .collect()
+        } else {
+            // Otherwise, load writes' data from other tables.
+            Self::extract_storage_logs_from_db(storage, l1_batch_number, protective_reads).await?
+        };
+
+        load_changes_latency.observe();
+
+        Ok(Some(Self {
+            header,
+            storage_logs,
+            mode,
+        }))
+    }
+
+    async fn wait_for_tree_writes(
+        connection: &mut Connection<'_, Core>,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<Option<Vec<TreeWrite>>> {
+        const INTERVAL: Duration = Duration::from_millis(50);
+        const TIMEOUT: Duration = Duration::from_secs(5);
+
+        tokio::time::timeout(TIMEOUT, async {
+            loop {
+                if let Some(tree_writes) = connection
+                    .blocks_dal()
+                    .get_tree_writes(l1_batch_number)
+                    .await?
+                {
+                    break anyhow::Ok(tree_writes);
+                }
+                tokio::time::sleep(INTERVAL).await;
+            }
+        })
+        .await
+        .ok()
+        .transpose()
+    }
+
+    async fn extract_storage_logs_from_db(
+        connection: &mut Connection<'_, Core>,
+        l1_batch_number: L1BatchNumber,
+        protective_reads: HashSet<StorageKey>,
+    ) -> anyhow::Result<Vec<TreeInstruction>> {
         let touched_slots_latency = METRICS.start_load_stage(LoadChangesStage::LoadTouchedSlots);
-        let mut touched_slots = storage
+        let mut touched_slots = connection
             .storage_logs_dal()
-            .get_touched_slots_for_l1_batch(l1_batch_number)
+            .get_touched_slots_for_executed_l1_batch(l1_batch_number)
             .await
             .context("cannot fetch touched slots")?;
         touched_slots_latency.observe_with_count(touched_slots.len());
@@ -562,7 +744,7 @@ impl L1BatchWithLogs {
         let leaf_indices_latency = METRICS.start_load_stage(LoadChangesStage::LoadLeafIndices);
         let hashed_keys_for_writes: Vec<_> =
             touched_slots.keys().map(StorageKey::hashed_key).collect();
-        let l1_batches_for_initial_writes = storage
+        let l1_batches_for_initial_writes = connection
             .storage_logs_dal()
             .get_l1_batches_and_indices_for_initial_writes(&hashed_keys_for_writes)
             .await
@@ -577,7 +759,7 @@ impl L1BatchWithLogs {
             // their further processing. This is not a required step; the logic below works fine without it.
             // Indeed, extra no-op updates that could be added to `storage_logs` as a consequence of no filtering,
             // are removed on the Merkle tree level (see the tree domain wrapper).
-            let log = TreeInstruction::Read(storage_key);
+            let log = TreeInstruction::Read(storage_key.hashed_key_u256());
             storage_logs.insert(storage_key, log);
         }
         tracing::debug!(
@@ -593,33 +775,28 @@ impl L1BatchWithLogs {
                 if initial_write_batch_for_key <= l1_batch_number {
                     storage_logs.insert(
                         storage_key,
-                        TreeInstruction::write(storage_key, leaf_index, value),
+                        TreeInstruction::write(storage_key.hashed_key_u256(), leaf_index, value),
                     );
                 }
             }
         }
 
-        load_changes_latency.observe();
-        Ok(Some(Self {
-            header,
-            storage_logs: storage_logs.into_values().collect(),
-            mode,
-        }))
+        Ok(storage_logs.into_values().collect())
     }
 }
 
 #[cfg(test)]
 mod tests {
+    use std::collections::HashMap;
+
     use tempfile::TempDir;
     use zksync_dal::{ConnectionPool, Core};
     use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
     use zksync_prover_interface::inputs::PrepareBasicCircuitsJob;
-    use zksync_types::{StorageKey, StorageLog};
+    use zksync_types::{writes::TreeWrite, StorageKey, StorageLog, U256};
 
     use super::*;
-    use crate::metadata_calculator::tests::{
-        extend_db_state, gen_storage_logs, mock_config, reset_db_state,
-    };
+    use crate::tests::{extend_db_state, gen_storage_logs, mock_config, reset_db_state};
 
     impl L1BatchWithLogs {
         /// Old, slower method of loading storage logs. We want to test its equivalence to the new implementation.
@@ -639,7 +816,7 @@ mod tests {
                 .unwrap();
             let touched_slots = storage
                 .storage_logs_dal()
-                .get_touched_slots_for_l1_batch(l1_batch_number)
+                .get_touched_slots_for_executed_l1_batch(l1_batch_number)
                 .await
                 .unwrap();
 
@@ -671,7 +848,10 @@ mod tests {
                     );
                 }
 
-                storage_logs.insert(storage_key, TreeInstruction::Read(storage_key));
+                storage_logs.insert(
+                    storage_key,
+                    TreeInstruction::Read(storage_key.hashed_key_u256()),
+                );
             }
 
             for (storage_key, value) in touched_slots {
@@ -680,7 +860,7 @@ mod tests {
                     let (_, leaf_index) = l1_batches_for_initial_writes[&storage_key.hashed_key()];
                     storage_logs.insert(
                         storage_key,
-                        TreeInstruction::write(storage_key, leaf_index, value),
+                        TreeInstruction::write(storage_key.hashed_key_u256(), leaf_index, value),
                     );
                 }
             }
@@ -705,6 +885,22 @@ mod tests {
         reset_db_state(&pool, 5).await;
 
         let mut storage = pool.connection().await.unwrap();
+        let mut tree_writes = Vec::new();
+
+        // Create a lookup table for storage key preimages
+        let all_storage_logs = storage
+            .storage_logs_dal()
+            .dump_all_storage_logs_for_tests()
+            .await;
+        let logs_by_hashed_key: HashMap<_, _> = all_storage_logs
+            .into_iter()
+            .map(|log| {
+                let tree_key = U256::from_little_endian(log.hashed_key.as_bytes());
+                (tree_key, log)
+            })
+            .collect();
+
+        // Check equivalence in case `tree_writes` are not present in DB.
         for l1_batch_number in 0..=5 {
             let l1_batch_number = L1BatchNumber(l1_batch_number);
             let batch_with_logs =
@@ -716,6 +912,44 @@ mod tests {
                 .await
                 .unwrap();
             assert_eq!(batch_with_logs, slow_batch_with_logs);
+
+            let writes = batch_with_logs
+                .storage_logs
+                .into_iter()
+                .filter_map(|instruction| match instruction {
+                    TreeInstruction::Write(tree_entry) => Some(TreeWrite {
+                        address: logs_by_hashed_key[&tree_entry.key].address.unwrap(),
+                        key: logs_by_hashed_key[&tree_entry.key].key.unwrap(),
+                        value: tree_entry.value,
+                        leaf_index: tree_entry.leaf_index,
+                    }),
+                    _ => None,
+                })
+                .collect::<Vec<_>>();
+            tree_writes.push(writes);
+        }
+
+        // Insert `tree_writes` and check again.
+        for l1_batch_number in 0..5 {
+            let l1_batch_number = L1BatchNumber(l1_batch_number);
+            storage
+                .blocks_dal()
+                .set_tree_writes(
+                    l1_batch_number,
+                    tree_writes[l1_batch_number.0 as usize].clone(),
+                )
+                .await
+                .unwrap();
+
+            let batch_with_logs =
+                L1BatchWithLogs::new(&mut storage, l1_batch_number, MerkleTreeMode::Full)
+                    .await
+                    .unwrap()
+                    .expect("no L1 batch");
+            let slow_batch_with_logs = L1BatchWithLogs::slow(&mut storage, l1_batch_number)
+                .await
+                .unwrap();
+            assert_eq!(batch_with_logs, slow_batch_with_logs);
         }
     }
 
@@ -745,7 +979,7 @@ mod tests {
 
     async fn create_tree(temp_dir: &TempDir) -> AsyncTree {
         let db = create_db(mock_config(temp_dir.path())).await.unwrap();
-        AsyncTree::new(db, MerkleTreeMode::Full)
+        AsyncTree::new(db, MerkleTreeMode::Full).unwrap()
     }
 
     async fn assert_log_equivalence(
@@ -871,11 +1105,7 @@ mod tests {
         let mut logs = gen_storage_logs(100..120, 1);
         let logs_copy = logs[0].clone();
         logs.push(logs_copy);
-        let read_logs: Vec<_> = logs[1]
-            .iter()
-            .step_by(3)
-            .map(StorageLog::to_test_log_query)
-            .collect();
+        let read_logs: Vec<_> = logs[1].iter().step_by(3).cloned().collect();
         extend_db_state(&mut storage, logs).await;
         storage
             .storage_logs_dedup_dal()
diff --git a/core/lib/zksync_core/src/metadata_calculator/mod.rs b/core/node/metadata_calculator/src/lib.rs
similarity index 74%
rename from core/lib/zksync_core/src/metadata_calculator/mod.rs
rename to core/node/metadata_calculator/src/lib.rs
index cab3ceb27c87..451090694b2c 100644
--- a/core/lib/zksync_core/src/metadata_calculator/mod.rs
+++ b/core/node/metadata_calculator/src/lib.rs
@@ -2,7 +2,7 @@
 //! stores them in the DB.
 
 use std::{
-    num::NonZeroU32,
+    num::{NonZeroU32, NonZeroUsize},
     sync::Arc,
     time::{Duration, Instant},
 };
@@ -10,22 +10,25 @@ use std::{
 use anyhow::Context as _;
 use tokio::sync::{oneshot, watch};
 use zksync_config::configs::{
-    chain::OperationsManagerConfig,
+    chain::{OperationsManagerConfig, StateKeeperConfig},
     database::{MerkleTreeConfig, MerkleTreeMode},
 };
 use zksync_dal::{ConnectionPool, Core};
 use zksync_health_check::{CheckHealth, HealthUpdater, ReactiveHealthCheck};
 use zksync_object_store::ObjectStore;
 
-pub(crate) use self::helpers::{AsyncTreeReader, MerkleTreeInfo};
-pub use self::{helpers::LazyAsyncTreeReader, pruning::MerkleTreePruningTask};
 use self::{
     helpers::{create_db, Delayer, GenericAsyncTree, MerkleTreeHealth, MerkleTreeHealthCheck},
     metrics::{ConfigLabels, METRICS},
     pruning::PruningHandles,
     updater::TreeUpdater,
 };
+pub use self::{
+    helpers::{AsyncTreeReader, LazyAsyncTreeReader, MerkleTreeInfo},
+    pruning::MerkleTreePruningTask,
+};
 
+pub mod api_server;
 mod helpers;
 mod metrics;
 mod pruning;
@@ -34,6 +37,30 @@ mod recovery;
 pub(crate) mod tests;
 mod updater;
 
+#[derive(Debug, Clone)]
+pub struct MetadataCalculatorRecoveryConfig {
+    /// Approximate chunk size (measured in the number of entries) to recover on a single iteration.
+    /// Reasonable values are order of 100,000 (meaning an iteration takes several seconds).
+    ///
+    /// **Important.** This value cannot be changed in the middle of tree recovery (i.e., if a node is stopped in the middle
+    /// of recovery and then restarted with a different config).
+    pub desired_chunk_size: u64,
+    /// Buffer capacity for parallel persistence operations. Should be reasonably small since larger buffer means more RAM usage;
+    /// buffer elements are persisted tree chunks. OTOH, small buffer can lead to persistence parallelization being inefficient.
+    ///
+    /// If set to `None`, parallel persistence will be disabled.
+    pub parallel_persistence_buffer: Option<NonZeroUsize>,
+}
+
+impl Default for MetadataCalculatorRecoveryConfig {
+    fn default() -> Self {
+        Self {
+            desired_chunk_size: 200_000,
+            parallel_persistence_buffer: NonZeroUsize::new(4),
+        }
+    }
+}
+
 /// Configuration of [`MetadataCalculator`].
 #[derive(Debug, Clone)]
 pub struct MetadataCalculatorConfig {
@@ -62,12 +89,17 @@ pub struct MetadataCalculatorConfig {
     pub memtable_capacity: usize,
     /// Timeout to wait for the Merkle tree database to run compaction on stalled writes.
     pub stalled_writes_timeout: Duration,
+    /// Whether state keeper writes protective reads when it seals a batch.
+    pub sealed_batches_have_protective_reads: bool,
+    /// Configuration specific to the Merkle tree recovery.
+    pub recovery: MetadataCalculatorRecoveryConfig,
 }
 
 impl MetadataCalculatorConfig {
     pub fn for_main_node(
         merkle_tree_config: &MerkleTreeConfig,
         operation_config: &OperationsManagerConfig,
+        state_keeper_config: &StateKeeperConfig,
     ) -> Self {
         Self {
             db_path: merkle_tree_config.path.clone(),
@@ -80,6 +112,10 @@ impl MetadataCalculatorConfig {
             include_indices_and_filters_in_block_cache: false,
             memtable_capacity: merkle_tree_config.memtable_capacity(),
             stalled_writes_timeout: merkle_tree_config.stalled_writes_timeout(),
+            sealed_batches_have_protective_reads: state_keeper_config
+                .protective_reads_persistence_enabled,
+            // The main node isn't supposed to be recovered yet, so this value doesn't matter much
+            recovery: MetadataCalculatorRecoveryConfig::default(),
         }
     }
 }
@@ -183,34 +219,46 @@ impl MetadataCalculator {
             started_at.elapsed()
         );
 
-        Ok(GenericAsyncTree::new(db, self.config.mode).await)
+        GenericAsyncTree::new(db, &self.config).await
     }
 
-    pub async fn run(self, stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+    pub async fn run(self, mut stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
         let tree = self.create_tree().await?;
         let tree = tree
             .ensure_ready(
+                &self.config.recovery,
                 &self.pool,
                 self.recovery_pool,
-                &stop_receiver,
                 &self.health_updater,
+                &stop_receiver,
             )
             .await?;
         let Some(mut tree) = tree else {
             return Ok(()); // recovery was aborted because a stop signal was received
         };
-
+        // Set a tree reader before the tree is fully initialized to not wait for the first L1 batch to appear in Postgres.
         let tree_reader = tree.reader();
-        let tree_info = tree_reader.clone().info().await;
+        self.tree_reader.send_replace(Some(tree_reader));
+
+        tree.ensure_consistency(&self.delayer, &self.pool, &mut stop_receiver)
+            .await?;
         if !self.pruning_handles_sender.is_closed() {
+            // Unlike tree reader, we shouldn't initialize pruning (as a task modifying the tree) before the tree is guaranteed
+            // to be consistent with Postgres.
             self.pruning_handles_sender.send(tree.pruner()).ok();
         }
-        self.tree_reader.send_replace(Some(tree_reader));
+
+        let tree_info = tree.reader().info().await;
         tracing::info!("Merkle tree is initialized and ready to process L1 batches: {tree_info:?}");
         self.health_updater
             .update(MerkleTreeHealth::MainLoop(tree_info).into());
 
-        let updater = TreeUpdater::new(tree, self.max_l1_batches_per_iter, self.object_store);
+        let updater = TreeUpdater::new(
+            tree,
+            self.max_l1_batches_per_iter,
+            self.object_store,
+            self.config.sealed_batches_have_protective_reads,
+        );
         updater
             .loop_updating_tree(self.delayer, &self.pool, stop_receiver)
             .await
diff --git a/core/lib/zksync_core/src/metadata_calculator/metrics.rs b/core/node/metadata_calculator/src/metrics.rs
similarity index 99%
rename from core/lib/zksync_core/src/metadata_calculator/metrics.rs
rename to core/node/metadata_calculator/src/metrics.rs
index 074f444dea68..7eb49b95afd4 100644
--- a/core/lib/zksync_core/src/metadata_calculator/metrics.rs
+++ b/core/node/metadata_calculator/src/metrics.rs
@@ -76,6 +76,7 @@ pub(super) enum LoadChangesStage {
     LoadProtectiveReads,
     LoadTouchedSlots,
     LoadLeafIndices,
+    LoadTreeWrites,
 }
 
 /// Latency metric for a certain stage of the tree update.
diff --git a/core/lib/zksync_core/src/metadata_calculator/pruning.rs b/core/node/metadata_calculator/src/pruning.rs
similarity index 98%
rename from core/lib/zksync_core/src/metadata_calculator/pruning.rs
rename to core/node/metadata_calculator/src/pruning.rs
index eea448c2324f..abbf9bf6865a 100644
--- a/core/lib/zksync_core/src/metadata_calculator/pruning.rs
+++ b/core/node/metadata_calculator/src/pruning.rs
@@ -112,7 +112,7 @@ impl MerkleTreePruningTask {
                     tracing::error!("Merkle tree pruning thread unexpectedly stopped");
                     return pruner_task_handle
                         .await
-                        .context("Merkle tree pruning thread panicked");
+                        .context("Merkle tree pruning thread panicked")?;
                 };
 
                 if prev_target_version != target_retained_version {
@@ -138,7 +138,7 @@ impl MerkleTreePruningTask {
         drop(pruner_handle);
         pruner_task_handle
             .await
-            .context("Merkle tree pruning thread panicked")
+            .context("Merkle tree pruning thread panicked")?
     }
 }
 
@@ -151,7 +151,7 @@ mod tests {
     use zksync_types::{L1BatchNumber, L2BlockNumber};
 
     use super::*;
-    use crate::metadata_calculator::{
+    use crate::{
         tests::{extend_db_state_from_l1_batch, gen_storage_logs, mock_config, reset_db_state},
         MetadataCalculator,
     };
@@ -183,7 +183,7 @@ mod tests {
             .wait_for(|health| matches!(health.status(), HealthStatus::Ready))
             .await;
         // Wait until the calculator is initialized.
-        let reader = reader.wait().await;
+        let reader = reader.wait().await.unwrap();
         while reader.clone().info().await.next_l1_batch_number < L1BatchNumber(6) {
             tokio::time::sleep(POLL_INTERVAL).await;
         }
@@ -281,7 +281,7 @@ mod tests {
         let pruning_task_handle = tokio::spawn(pruning_task.run(stop_receiver));
 
         // Wait until the calculator is initialized.
-        let reader = reader.wait().await;
+        let reader = reader.wait().await.unwrap();
         let tree_info = reader.clone().info().await;
         assert_eq!(
             tree_info.next_l1_batch_number,
diff --git a/core/lib/zksync_core/src/metadata_calculator/recovery/mod.rs b/core/node/metadata_calculator/src/recovery/mod.rs
similarity index 86%
rename from core/lib/zksync_core/src/metadata_calculator/recovery/mod.rs
rename to core/node/metadata_calculator/src/recovery/mod.rs
index 7e621531dc86..dcbc0a68af92 100644
--- a/core/lib/zksync_core/src/metadata_calculator/recovery/mod.rs
+++ b/core/node/metadata_calculator/src/recovery/mod.rs
@@ -32,7 +32,6 @@ use std::{
 };
 
 use anyhow::Context as _;
-use async_trait::async_trait;
 use futures::future;
 use tokio::sync::{watch, Mutex, Semaphore};
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
@@ -47,6 +46,7 @@ use zksync_types::{
 use super::{
     helpers::{AsyncTree, AsyncTreeRecovery, GenericAsyncTree, MerkleTreeHealth},
     metrics::{ChunkRecoveryStage, RecoveryStage, RECOVERY_METRICS},
+    MetadataCalculatorRecoveryConfig,
 };
 
 #[cfg(test)]
@@ -54,17 +54,12 @@ mod tests;
 
 /// Handler of recovery life cycle events. This functionality is encapsulated in a trait to be able
 /// to control recovery behavior in tests.
-#[async_trait]
 trait HandleRecoveryEvent: fmt::Debug + Send + Sync {
     fn recovery_started(&mut self, _chunk_count: u64, _recovered_chunk_count: u64) {
         // Default implementation does nothing
     }
 
-    async fn chunk_started(&self) {
-        // Default implementation does nothing
-    }
-
-    async fn chunk_recovered(&self) {
+    fn chunk_recovered(&self) {
         // Default implementation does nothing
     }
 }
@@ -87,7 +82,6 @@ impl<'a> RecoveryHealthUpdater<'a> {
     }
 }
 
-#[async_trait]
 impl HandleRecoveryEvent for RecoveryHealthUpdater<'_> {
     fn recovery_started(&mut self, chunk_count: u64, recovered_chunk_count: u64) {
         self.chunk_count = chunk_count;
@@ -97,8 +91,13 @@ impl HandleRecoveryEvent for RecoveryHealthUpdater<'_> {
             .set(recovered_chunk_count);
     }
 
-    async fn chunk_recovered(&self) {
+    fn chunk_recovered(&self) {
         let recovered_chunk_count = self.recovered_chunk_count.fetch_add(1, Ordering::SeqCst) + 1;
+        let chunks_left = self.chunk_count.saturating_sub(recovered_chunk_count);
+        tracing::info!(
+            "Recovered {recovered_chunk_count}/{} Merkle tree chunks, there are {chunks_left} left to process",
+            self.chunk_count
+        );
         RECOVERY_METRICS
             .recovered_chunk_count
             .set(recovered_chunk_count);
@@ -115,21 +114,19 @@ struct SnapshotParameters {
     l2_block: L2BlockNumber,
     expected_root_hash: H256,
     log_count: u64,
+    desired_chunk_size: u64,
 }
 
 impl SnapshotParameters {
-    /// This is intentionally not configurable because chunks must be the same for the entire recovery
-    /// (i.e., not changed after a node restart).
-    const DESIRED_CHUNK_SIZE: u64 = 200_000;
-
     async fn new(
         pool: &ConnectionPool<Core>,
         recovery: &SnapshotRecoveryStatus,
+        config: &MetadataCalculatorRecoveryConfig,
     ) -> anyhow::Result<Self> {
         let l2_block = recovery.l2_block_number;
         let expected_root_hash = recovery.l1_batch_root_hash;
 
-        let mut storage = pool.connection().await?;
+        let mut storage = pool.connection_tagged("metadata_calculator").await?;
         let log_count = storage
             .storage_logs_dal()
             .get_storage_logs_row_count(l2_block)
@@ -139,11 +136,12 @@ impl SnapshotParameters {
             l2_block,
             expected_root_hash,
             log_count,
+            desired_chunk_size: config.desired_chunk_size,
         })
     }
 
     fn chunk_count(&self) -> u64 {
-        self.log_count.div_ceil(Self::DESIRED_CHUNK_SIZE)
+        self.log_count.div_ceil(self.desired_chunk_size)
     }
 }
 
@@ -163,10 +161,11 @@ impl GenericAsyncTree {
     /// with other components).
     pub async fn ensure_ready(
         self,
+        config: &MetadataCalculatorRecoveryConfig,
         main_pool: &ConnectionPool<Core>,
         recovery_pool: ConnectionPool<Core>,
-        stop_receiver: &watch::Receiver<bool>,
         health_updater: &HealthUpdater,
+        stop_receiver: &watch::Receiver<bool>,
     ) -> anyhow::Result<Option<AsyncTree>> {
         let started_at = Instant::now();
         let (tree, snapshot_recovery) = match self {
@@ -190,17 +189,19 @@ impl GenericAsyncTree {
                         "Starting Merkle tree recovery with status {snapshot_recovery:?}"
                     );
                     let l1_batch = snapshot_recovery.l1_batch_number;
-                    let tree = AsyncTreeRecovery::new(db, l1_batch.0.into(), mode);
+                    let tree = AsyncTreeRecovery::new(db, l1_batch.0.into(), mode, config)?;
                     (tree, snapshot_recovery)
                 } else {
                     // Start the tree from scratch. The genesis block will be filled in `TreeUpdater::loop_updating_tree()`.
-                    return Ok(Some(AsyncTree::new(db, mode)));
+                    return Ok(Some(AsyncTree::new(db, mode)?));
                 }
             }
         };
 
-        let snapshot = SnapshotParameters::new(main_pool, &snapshot_recovery).await?;
-        tracing::debug!("Obtained snapshot parameters: {snapshot:?}");
+        let snapshot = SnapshotParameters::new(main_pool, &snapshot_recovery, config).await?;
+        tracing::debug!(
+            "Obtained snapshot parameters: {snapshot:?} based on recovery configuration {config:?}"
+        );
         let recovery_options = RecoveryOptions {
             chunk_count: snapshot.chunk_count(),
             concurrency_limit: recovery_pool.max_size() as usize,
@@ -227,6 +228,9 @@ impl AsyncTreeRecovery {
         pool: &ConnectionPool<Core>,
         stop_receiver: &watch::Receiver<bool>,
     ) -> anyhow::Result<Option<AsyncTree>> {
+        self.ensure_desired_chunk_size(snapshot.desired_chunk_size)
+            .await?;
+
         let start_time = Instant::now();
         let chunk_count = options.chunk_count;
         let chunks: Vec<_> = (0..chunk_count)
@@ -237,7 +241,7 @@ impl AsyncTreeRecovery {
             options.concurrency_limit
         );
 
-        let mut storage = pool.connection().await?;
+        let mut storage = pool.connection_tagged("metadata_calculator").await?;
         let remaining_chunks = self
             .filter_chunks(&mut storage, snapshot.l2_block, &chunks)
             .await?;
@@ -257,26 +261,32 @@ impl AsyncTreeRecovery {
                 .acquire()
                 .await
                 .context("semaphore is never closed")?;
-            options.events.chunk_started().await;
-            Self::recover_key_chunk(&tree, snapshot.l2_block, chunk, pool, stop_receiver).await?;
-            options.events.chunk_recovered().await;
+            if Self::recover_key_chunk(&tree, snapshot.l2_block, chunk, pool, stop_receiver).await?
+            {
+                options.events.chunk_recovered();
+            }
             anyhow::Ok(())
         });
         future::try_join_all(chunk_tasks).await?;
 
+        let mut tree = tree.into_inner();
         if *stop_receiver.borrow() {
+            // Waiting for persistence is mostly useful for tests. Normally, the tree database won't be used in the same process
+            // after a stop signal is received, so there's no risk of data races with the background persistence thread.
+            tree.wait_for_persistence().await?;
             return Ok(None);
         }
 
         let finalize_latency = RECOVERY_METRICS.latency[&RecoveryStage::Finalize].start();
-        let mut tree = tree.into_inner();
         let actual_root_hash = tree.root_hash().await;
         anyhow::ensure!(
             actual_root_hash == snapshot.expected_root_hash,
-            "Root hash of recovered tree {actual_root_hash:?} differs from expected root hash {:?}",
+            "Root hash of recovered tree {actual_root_hash:?} differs from expected root hash {:?}. \
+             If pruning is enabled and the tree is initialized some time after node recovery, \
+             this is caused by snapshot storage logs getting pruned; this setup is currently not supported",
             snapshot.expected_root_hash
         );
-        let tree = tree.finalize().await;
+        let tree = tree.finalize().await?;
         finalize_latency.observe();
         tracing::info!(
             "Tree recovery has finished, the recovery took {:?}! resuming normal tree operation",
@@ -330,20 +340,21 @@ impl AsyncTreeRecovery {
         Ok(output)
     }
 
+    /// Returns `Ok(true)` if the chunk was recovered, `Ok(false)` if the recovery process was interrupted.
     async fn recover_key_chunk(
         tree: &Mutex<AsyncTreeRecovery>,
         snapshot_l2_block: L2BlockNumber,
         key_chunk: ops::RangeInclusive<H256>,
         pool: &ConnectionPool<Core>,
         stop_receiver: &watch::Receiver<bool>,
-    ) -> anyhow::Result<()> {
+    ) -> anyhow::Result<bool> {
         let acquire_connection_latency =
             RECOVERY_METRICS.chunk_latency[&ChunkRecoveryStage::AcquireConnection].start();
-        let mut storage = pool.connection().await?;
+        let mut storage = pool.connection_tagged("metadata_calculator").await?;
         acquire_connection_latency.observe();
 
         if *stop_receiver.borrow() {
-            return Ok(());
+            return Ok(false);
         }
 
         let entries_latency =
@@ -360,7 +371,7 @@ impl AsyncTreeRecovery {
         );
 
         if *stop_receiver.borrow() {
-            return Ok(());
+            return Ok(false);
         }
 
         // Sanity check: all entry keys must be distinct. Otherwise, we may end up writing non-final values
@@ -390,17 +401,17 @@ impl AsyncTreeRecovery {
         lock_tree_latency.observe();
 
         if *stop_receiver.borrow() {
-            return Ok(());
+            return Ok(false);
         }
 
         let extend_tree_latency =
             RECOVERY_METRICS.chunk_latency[&ChunkRecoveryStage::ExtendTree].start();
-        tree.extend(all_entries).await;
+        tree.extend(all_entries).await?;
         let extend_tree_latency = extend_tree_latency.observe();
         tracing::debug!(
             "Extended Merkle tree with entries for chunk {key_chunk:?} in {extend_tree_latency:?}"
         );
-        Ok(())
+        Ok(true)
     }
 }
 
diff --git a/core/lib/zksync_core/src/metadata_calculator/recovery/tests.rs b/core/node/metadata_calculator/src/recovery/tests.rs
similarity index 72%
rename from core/lib/zksync_core/src/metadata_calculator/recovery/tests.rs
rename to core/node/metadata_calculator/src/recovery/tests.rs
index 34cf2abd9c19..3861e8a5a84e 100644
--- a/core/lib/zksync_core/src/metadata_calculator/recovery/tests.rs
+++ b/core/node/metadata_calculator/src/recovery/tests.rs
@@ -1,24 +1,24 @@
 //! Tests for metadata calculator snapshot recovery.
 
-use std::path::Path;
+use std::{path::Path, sync::Mutex};
 
 use assert_matches::assert_matches;
 use tempfile::TempDir;
-use test_casing::test_casing;
+use test_casing::{test_casing, Product};
 use tokio::sync::mpsc;
 use zksync_config::configs::{
-    chain::OperationsManagerConfig,
+    chain::{OperationsManagerConfig, StateKeeperConfig},
     database::{MerkleTreeConfig, MerkleTreeMode},
 };
 use zksync_dal::CoreDal;
 use zksync_health_check::{CheckHealth, HealthStatus, ReactiveHealthCheck};
-use zksync_merkle_tree::{domain::ZkSyncTree, TreeInstruction};
+use zksync_merkle_tree::{domain::ZkSyncTree, recovery::PersistenceThreadHandle, TreeInstruction};
 use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
 use zksync_node_test_utils::prepare_recovery_snapshot;
 use zksync_types::{L1BatchNumber, ProtocolVersionId, StorageLog};
 
 use super::*;
-use crate::metadata_calculator::{
+use crate::{
     helpers::create_db,
     tests::{
         extend_db_state, extend_db_state_from_l1_batch, gen_storage_logs, mock_config,
@@ -33,6 +33,7 @@ fn calculating_chunk_count() {
         l2_block: L2BlockNumber(1),
         log_count: 160_000_000,
         expected_root_hash: H256::zero(),
+        desired_chunk_size: 200_000,
     };
     assert_eq!(snapshot.chunk_count(), 800);
 
@@ -43,9 +44,13 @@ fn calculating_chunk_count() {
     assert_eq!(snapshot.chunk_count(), 1);
 }
 
-async fn create_tree_recovery(path: &Path, l1_batch: L1BatchNumber) -> AsyncTreeRecovery {
+async fn create_tree_recovery(
+    path: &Path,
+    l1_batch: L1BatchNumber,
+    config: &MetadataCalculatorRecoveryConfig,
+) -> (AsyncTreeRecovery, Option<PersistenceThreadHandle>) {
     let db = create_db(mock_config(path)).await.unwrap();
-    AsyncTreeRecovery::new(db, l1_batch.0.into(), MerkleTreeMode::Full)
+    AsyncTreeRecovery::with_handle(db, l1_batch.0.into(), MerkleTreeMode::Full, config).unwrap()
 }
 
 #[tokio::test]
@@ -53,7 +58,8 @@ async fn basic_recovery_workflow() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
     let snapshot_recovery = prepare_recovery_snapshot_with_genesis(pool.clone(), &temp_dir).await;
-    let snapshot = SnapshotParameters::new(&pool, &snapshot_recovery)
+    let config = MetadataCalculatorRecoveryConfig::default();
+    let snapshot = SnapshotParameters::new(&pool, &snapshot_recovery, &config)
         .await
         .unwrap();
 
@@ -64,7 +70,7 @@ async fn basic_recovery_workflow() {
         println!("Recovering tree with {chunk_count} chunks");
 
         let tree_path = temp_dir.path().join(format!("recovery-{chunk_count}"));
-        let tree = create_tree_recovery(&tree_path, L1BatchNumber(1)).await;
+        let (tree, _) = create_tree_recovery(&tree_path, L1BatchNumber(1), &config).await;
         let (health_check, health_updater) = ReactiveHealthCheck::new("tree");
         let recovery_options = RecoveryOptions {
             chunk_count,
@@ -96,7 +102,7 @@ async fn prepare_recovery_snapshot_with_genesis(
     // Add all logs from the genesis L1 batch to `logs` so that they cover all state keys.
     let genesis_logs = storage
         .storage_logs_dal()
-        .get_touched_slots_for_l1_batch(L1BatchNumber(0))
+        .get_touched_slots_for_executed_l1_batch(L1BatchNumber(0))
         .await
         .unwrap();
     let genesis_logs = genesis_logs
@@ -107,7 +113,7 @@ async fn prepare_recovery_snapshot_with_genesis(
     drop(storage);
 
     // Ensure that metadata for L1 batch #1 is present in the DB.
-    let (calculator, _) = setup_calculator(&temp_dir.path().join("init"), pool).await;
+    let (calculator, _) = setup_calculator(&temp_dir.path().join("init"), pool, true).await;
     let l1_batch_root_hash = run_calculator(calculator).await;
 
     SnapshotRecoveryStatus {
@@ -126,6 +132,7 @@ async fn prepare_recovery_snapshot_with_genesis(
 struct TestEventListener {
     expected_recovered_chunks: u64,
     stop_threshold: u64,
+    persistence_handle: Mutex<Option<(PersistenceThreadHandle, u64)>>,
     processed_chunk_count: AtomicU64,
     stop_sender: watch::Sender<bool>,
 }
@@ -135,6 +142,7 @@ impl TestEventListener {
         Self {
             expected_recovered_chunks: 0,
             stop_threshold,
+            persistence_handle: Mutex::default(),
             processed_chunk_count: AtomicU64::new(0),
             stop_sender,
         }
@@ -144,38 +152,72 @@ impl TestEventListener {
         self.expected_recovered_chunks = count;
         self
     }
+
+    fn crash_persistence_after(
+        mut self,
+        chunk_count: u64,
+        handle: PersistenceThreadHandle,
+    ) -> Self {
+        assert!(chunk_count < self.stop_threshold);
+        self.persistence_handle = Mutex::new(Some((handle, chunk_count)));
+        self
+    }
 }
 
-#[async_trait]
 impl HandleRecoveryEvent for TestEventListener {
     fn recovery_started(&mut self, _chunk_count: u64, recovered_chunk_count: u64) {
         assert_eq!(recovered_chunk_count, self.expected_recovered_chunks);
     }
 
-    async fn chunk_recovered(&self) {
+    fn chunk_recovered(&self) {
         let processed_chunk_count = self.processed_chunk_count.fetch_add(1, Ordering::SeqCst) + 1;
         if processed_chunk_count >= self.stop_threshold {
             self.stop_sender.send_replace(true);
         }
+
+        let mut persistence_handle = self.persistence_handle.lock().unwrap();
+        if let Some((_, crash_threshold)) = &*persistence_handle {
+            if processed_chunk_count >= *crash_threshold {
+                let (handle, _) = persistence_handle.take().unwrap();
+                handle.test_stop_processing();
+            }
+        }
     }
 }
 
-#[test_casing(3, [5, 7, 8])]
+#[derive(Debug, Clone, Copy)]
+enum FaultToleranceCase {
+    Sequential,
+    Parallel,
+    ParallelWithCrash,
+}
+
+impl FaultToleranceCase {
+    const ALL: [Self; 3] = [Self::Sequential, Self::Parallel, Self::ParallelWithCrash];
+}
+
+#[test_casing(9, Product(([5, 7, 8], FaultToleranceCase::ALL)))]
 #[tokio::test]
-async fn recovery_fault_tolerance(chunk_count: u64) {
+async fn recovery_fault_tolerance(chunk_count: u64, case: FaultToleranceCase) {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
     let snapshot_recovery = prepare_recovery_snapshot_with_genesis(pool.clone(), &temp_dir).await;
 
     let tree_path = temp_dir.path().join("recovery");
-    let tree = create_tree_recovery(&tree_path, L1BatchNumber(1)).await;
+    let mut config = MetadataCalculatorRecoveryConfig::default();
+    assert!(config.parallel_persistence_buffer.is_some());
+    if matches!(case, FaultToleranceCase::Sequential) {
+        config.parallel_persistence_buffer = None;
+    }
+
+    let (tree, _) = create_tree_recovery(&tree_path, L1BatchNumber(1), &config).await;
     let (stop_sender, stop_receiver) = watch::channel(false);
     let recovery_options = RecoveryOptions {
         chunk_count,
         concurrency_limit: 1,
         events: Box::new(TestEventListener::new(1, stop_sender)),
     };
-    let snapshot = SnapshotParameters::new(&pool, &snapshot_recovery)
+    let snapshot = SnapshotParameters::new(&pool, &snapshot_recovery, &config)
         .await
         .unwrap();
     assert!(tree
@@ -184,29 +226,44 @@ async fn recovery_fault_tolerance(chunk_count: u64) {
         .unwrap()
         .is_none());
 
-    // Emulate a restart and recover 2 more chunks.
-    let mut tree = create_tree_recovery(&tree_path, L1BatchNumber(1)).await;
+    // Emulate a restart and recover 2 more chunks (or 1 + emulated persistence crash).
+    let (mut tree, handle) = create_tree_recovery(&tree_path, L1BatchNumber(1), &config).await;
     assert_ne!(tree.root_hash().await, snapshot_recovery.l1_batch_root_hash);
     let (stop_sender, stop_receiver) = watch::channel(false);
+    let mut event_listener = TestEventListener::new(2, stop_sender).expect_recovered_chunks(1);
+    let expected_recovered_chunks = if matches!(case, FaultToleranceCase::ParallelWithCrash) {
+        event_listener = event_listener.crash_persistence_after(1, handle.unwrap());
+        2
+    } else {
+        drop(handle); // necessary to terminate the background persistence thread in time
+        3
+    };
     let recovery_options = RecoveryOptions {
         chunk_count,
         concurrency_limit: 1,
-        events: Box::new(TestEventListener::new(2, stop_sender).expect_recovered_chunks(1)),
+        events: Box::new(event_listener),
     };
-    assert!(tree
+    let recovery_result = tree
         .recover(snapshot, recovery_options, &pool, &stop_receiver)
-        .await
-        .unwrap()
-        .is_none());
+        .await;
+    if matches!(case, FaultToleranceCase::ParallelWithCrash) {
+        let err = format!("{:#}", recovery_result.unwrap_err());
+        assert!(err.contains("emulated persistence crash"), "{err}");
+    } else {
+        assert!(recovery_result.unwrap().is_none());
+    }
 
     // Emulate another restart and recover remaining chunks.
-    let mut tree = create_tree_recovery(&tree_path, L1BatchNumber(1)).await;
+    let (mut tree, _) = create_tree_recovery(&tree_path, L1BatchNumber(1), &config).await;
     assert_ne!(tree.root_hash().await, snapshot_recovery.l1_batch_root_hash);
     let (stop_sender, stop_receiver) = watch::channel(false);
     let recovery_options = RecoveryOptions {
         chunk_count,
         concurrency_limit: 1,
-        events: Box::new(TestEventListener::new(u64::MAX, stop_sender).expect_recovered_chunks(3)),
+        events: Box::new(
+            TestEventListener::new(u64::MAX, stop_sender)
+                .expect_recovered_chunks(expected_recovered_chunks),
+        ),
     };
     let tree = tree
         .recover(snapshot, recovery_options, &pool, &stop_receiver)
@@ -249,6 +306,10 @@ async fn entire_recovery_workflow(case: RecoveryWorkflowCase) {
     let calculator_config = MetadataCalculatorConfig::for_main_node(
         &merkle_tree_config,
         &OperationsManagerConfig { delay_interval: 50 },
+        &StateKeeperConfig {
+            protective_reads_persistence_enabled: true,
+            ..Default::default()
+        },
     );
     let mut calculator = MetadataCalculator::new(calculator_config, None, pool.clone())
         .await
@@ -263,7 +324,7 @@ async fn entire_recovery_workflow(case: RecoveryWorkflowCase) {
     match case {
         // Wait until the tree is fully initialized and stop the calculator.
         RecoveryWorkflowCase::Stop => {
-            let tree_info = tree_reader.wait().await.info().await;
+            let tree_info = tree_reader.wait().await.unwrap().info().await;
             assert_eq!(tree_info.root_hash, snapshot_recovery.l1_batch_root_hash);
             assert_eq!(tree_info.leaf_count, 200);
             assert_eq!(
@@ -274,7 +335,7 @@ async fn entire_recovery_workflow(case: RecoveryWorkflowCase) {
 
         // Emulate state keeper adding a new L1 batch to Postgres.
         RecoveryWorkflowCase::CreateBatch => {
-            tree_reader.wait().await;
+            tree_reader.wait().await.unwrap();
 
             let mut storage = storage.start_transaction().await.unwrap();
             let mut new_logs = gen_storage_logs(500..600, 1).pop().unwrap();
@@ -301,7 +362,9 @@ async fn entire_recovery_workflow(case: RecoveryWorkflowCase) {
                 .iter()
                 .chain(&new_logs)
                 .enumerate()
-                .map(|(i, log)| TreeInstruction::write(log.key, i as u64 + 1, log.value))
+                .map(|(i, log)| {
+                    TreeInstruction::write(log.key.hashed_key_u256(), i as u64 + 1, log.value)
+                })
                 .collect();
             let expected_new_root_hash =
                 ZkSyncTree::process_genesis_batch(&all_tree_instructions).root_hash;
diff --git a/core/lib/zksync_core/src/metadata_calculator/tests.rs b/core/node/metadata_calculator/src/tests.rs
similarity index 61%
rename from core/lib/zksync_core/src/metadata_calculator/tests.rs
rename to core/node/metadata_calculator/src/tests.rs
index 00522f27896b..8a82927bccd2 100644
--- a/core/lib/zksync_core/src/metadata_calculator/tests.rs
+++ b/core/node/metadata_calculator/src/tests.rs
@@ -5,9 +5,10 @@ use std::{future::Future, ops, panic, path::Path, sync::Arc, time::Duration};
 use assert_matches::assert_matches;
 use itertools::Itertools;
 use tempfile::TempDir;
+use test_casing::{test_casing, Product};
 use tokio::sync::{mpsc, watch};
 use zksync_config::configs::{
-    chain::OperationsManagerConfig,
+    chain::{OperationsManagerConfig, StateKeeperConfig},
     database::{MerkleTreeConfig, MerkleTreeMode},
 };
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
@@ -15,19 +16,22 @@ use zksync_health_check::{CheckHealth, HealthStatus};
 use zksync_merkle_tree::domain::ZkSyncTree;
 use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
 use zksync_node_test_utils::{create_l1_batch, create_l2_block};
-use zksync_object_store::{ObjectStore, ObjectStoreFactory};
+use zksync_object_store::{MockObjectStore, ObjectStore};
 use zksync_prover_interface::inputs::PrepareBasicCircuitsJob;
 use zksync_storage::RocksDB;
 use zksync_types::{
-    block::L1BatchHeader, AccountTreeId, Address, L1BatchNumber, L2BlockNumber, StorageKey,
-    StorageLog, H256,
+    block::{L1BatchHeader, L1BatchTreeData},
+    AccountTreeId, Address, L1BatchNumber, L2BlockNumber, StorageKey, StorageLog, H256,
 };
 use zksync_utils::u32_to_h256;
 
 use super::{
     helpers::L1BatchWithLogs, GenericAsyncTree, MetadataCalculator, MetadataCalculatorConfig,
+    MetadataCalculatorRecoveryConfig,
 };
+use crate::helpers::{AsyncTree, Delayer};
 
+const POLL_INTERVAL: Duration = Duration::from_millis(50);
 const RUN_TIMEOUT: Duration = Duration::from_secs(30);
 
 async fn run_with_timeout<T, F>(timeout: Duration, action: F) -> T
@@ -46,24 +50,28 @@ pub(super) fn mock_config(db_path: &Path) -> MetadataCalculatorConfig {
         db_path: db_path.to_str().unwrap().to_owned(),
         max_open_files: None,
         mode: MerkleTreeMode::Full,
-        delay_interval: Duration::from_millis(100),
+        delay_interval: POLL_INTERVAL,
         max_l1_batches_per_iter: 10,
         multi_get_chunk_size: 500,
         block_cache_capacity: 0,
         include_indices_and_filters_in_block_cache: false,
         memtable_capacity: 16 << 20,            // 16 MiB
         stalled_writes_timeout: Duration::ZERO, // writes should never be stalled in tests
+        sealed_batches_have_protective_reads: true,
+        recovery: MetadataCalculatorRecoveryConfig::default(),
     }
 }
 
+#[test_casing(2, [false, true])]
 #[tokio::test]
-async fn genesis_creation() {
+async fn genesis_creation(sealed_protective_reads: bool) {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
 
-    let (calculator, _) = setup_calculator(temp_dir.path(), pool.clone()).await;
+    let (calculator, _) =
+        setup_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
     run_calculator(calculator).await;
-    let (calculator, _) = setup_calculator(temp_dir.path(), pool).await;
+    let (calculator, _) = setup_calculator(temp_dir.path(), pool, sealed_protective_reads).await;
 
     let tree = calculator.create_tree().await.unwrap();
     let GenericAsyncTree::Ready(tree) = tree else {
@@ -73,17 +81,171 @@ async fn genesis_creation() {
 }
 
 #[tokio::test]
-async fn basic_workflow() {
+async fn low_level_genesis_creation() {
     let pool = ConnectionPool::<Core>::test_pool().await;
+    let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
+    insert_genesis_batch(
+        &mut pool.connection().await.unwrap(),
+        &GenesisParams::mock(),
+    )
+    .await
+    .unwrap();
+    reset_db_state(&pool, 1).await;
+
+    let db = RocksDB::new(temp_dir.path()).unwrap();
+    let mut tree = AsyncTree::new(db.into(), MerkleTreeMode::Lightweight).unwrap();
+    let (_stop_sender, mut stop_receiver) = watch::channel(false);
+    tree.ensure_consistency(&Delayer::new(POLL_INTERVAL), &pool, &mut stop_receiver)
+        .await
+        .unwrap();
+
+    assert!(!tree.is_empty());
+    assert_eq!(tree.next_l1_batch_number(), L1BatchNumber(1));
+}
+
+#[test_casing(16, Product(([1, 4, 7, 9], [false, true], [false, true])))]
+#[tokio::test]
+async fn tree_truncation_on_l1_batch_divergence(
+    last_common_l1_batch: u32,
+    overwrite_tree_data: bool,
+    sealed_protective_reads: bool,
+) {
+    const INITIAL_BATCH_COUNT: usize = 10;
+
+    assert!((last_common_l1_batch as usize) < INITIAL_BATCH_COUNT);
+    let last_common_l1_batch = L1BatchNumber(last_common_l1_batch);
+
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
+    let calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
+    reset_db_state(&pool, INITIAL_BATCH_COUNT).await;
+    run_calculator(calculator).await;
+
+    let mut storage = pool.connection().await.unwrap();
+    remove_l1_batches(&mut storage, last_common_l1_batch).await;
+    // Extend the state with new L1 batches.
+    let logs = gen_storage_logs(100..200, 5);
+    extend_db_state(&mut storage, logs).await;
+
+    if overwrite_tree_data {
+        for number in (last_common_l1_batch.0 + 1)..(last_common_l1_batch.0 + 6) {
+            let new_tree_data = L1BatchTreeData {
+                hash: H256::from_low_u64_be(number.into()),
+                rollup_last_leaf_index: 200, // doesn't matter
+            };
+            storage
+                .blocks_dal()
+                .save_l1_batch_tree_data(L1BatchNumber(number), &new_tree_data)
+                .await
+                .unwrap();
+        }
+    }
+
+    let calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
+    let tree = calculator.create_tree().await.unwrap();
+    let GenericAsyncTree::Ready(mut tree) = tree else {
+        panic!("Unexpected tree state: {tree:?}");
+    };
+    assert_eq!(
+        tree.next_l1_batch_number(),
+        L1BatchNumber(INITIAL_BATCH_COUNT as u32 + 1)
+    );
+
+    let (_stop_sender, mut stop_receiver) = watch::channel(false);
+    tree.ensure_consistency(&Delayer::new(POLL_INTERVAL), &pool, &mut stop_receiver)
+        .await
+        .unwrap();
+    assert_eq!(tree.next_l1_batch_number(), last_common_l1_batch + 1);
+}
+
+#[test_casing(8, Product(([1, 4, 6, 7], [false, true])))]
+#[tokio::test]
+async fn tree_truncation_on_l1_batch_divergence_in_pruned_tree(
+    retained_l1_batch: u32,
+    sealed_protective_reads: bool,
+) {
+    const INITIAL_BATCH_COUNT: usize = 10;
+    const LAST_COMMON_L1_BATCH: L1BatchNumber = L1BatchNumber(6);
+
+    let retained_l1_batch = L1BatchNumber(retained_l1_batch);
 
+    let pool = ConnectionPool::<Core>::test_pool().await;
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
+    let calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
+    reset_db_state(&pool, INITIAL_BATCH_COUNT).await;
+    run_calculator(calculator).await;
 
-    let (calculator, object_store) = setup_calculator(temp_dir.path(), pool.clone()).await;
+    let mut storage = pool.connection().await.unwrap();
+    remove_l1_batches(&mut storage, LAST_COMMON_L1_BATCH).await;
+    // Extend the state with new L1 batches.
+    let logs = gen_storage_logs(100..200, 5);
+    extend_db_state(&mut storage, logs).await;
+
+    for number in (LAST_COMMON_L1_BATCH.0 + 1)..(LAST_COMMON_L1_BATCH.0 + 6) {
+        let new_tree_data = L1BatchTreeData {
+            hash: H256::from_low_u64_be(number.into()),
+            rollup_last_leaf_index: 200, // doesn't matter
+        };
+        storage
+            .blocks_dal()
+            .save_l1_batch_tree_data(L1BatchNumber(number), &new_tree_data)
+            .await
+            .unwrap();
+    }
+
+    let calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
+    let tree = calculator.create_tree().await.unwrap();
+    let GenericAsyncTree::Ready(mut tree) = tree else {
+        panic!("Unexpected tree state: {tree:?}");
+    };
+
+    let reader = tree.reader();
+    let (mut pruner, pruner_handle) = tree.pruner();
+    pruner.set_poll_interval(POLL_INTERVAL);
+    tokio::task::spawn_blocking(|| pruner.run());
+    pruner_handle
+        .set_target_retained_version(retained_l1_batch.0.into())
+        .unwrap();
+    // Wait until the tree is pruned
+    while reader.clone().info().await.min_l1_batch_number < Some(retained_l1_batch) {
+        tokio::time::sleep(POLL_INTERVAL).await;
+    }
+
+    let (_stop_sender, mut stop_receiver) = watch::channel(false);
+    let consistency_result = tree
+        .ensure_consistency(&Delayer::new(POLL_INTERVAL), &pool, &mut stop_receiver)
+        .await;
+
+    if retained_l1_batch <= LAST_COMMON_L1_BATCH {
+        consistency_result.unwrap();
+        assert_eq!(tree.next_l1_batch_number(), LAST_COMMON_L1_BATCH + 1);
+    } else {
+        let err = consistency_result.unwrap_err();
+        assert!(
+            format!("{err:#}").contains("diverging min L1 batch"),
+            "{err:#}"
+        );
+    }
+}
+
+#[test_casing(2, [false, true])]
+#[tokio::test]
+async fn basic_workflow(sealed_protective_reads: bool) {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+
+    let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
+
+    let (calculator, object_store) =
+        setup_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
     reset_db_state(&pool, 1).await;
     let merkle_tree_hash = run_calculator(calculator).await;
 
     // Check the hash against the reference.
-    let expected_tree_hash = expected_tree_hash(&pool).await;
+    let expected_tree_hash = expected_tree_hash(&pool, sealed_protective_reads).await;
     assert_eq!(merkle_tree_hash, expected_tree_hash);
 
     let job: PrepareBasicCircuitsJob = object_store.get(L1BatchNumber(1)).await.unwrap();
@@ -93,7 +255,7 @@ async fn basic_workflow() {
     // ^ The exact values depend on ops in genesis block
     assert!(merkle_paths.iter().all(|log| log.is_write));
 
-    let (calculator, _) = setup_calculator(temp_dir.path(), pool).await;
+    let (calculator, _) = setup_calculator(temp_dir.path(), pool, sealed_protective_reads).await;
     let tree = calculator.create_tree().await.unwrap();
     let GenericAsyncTree::Ready(tree) = tree else {
         panic!("Unexpected tree state: {tree:?}");
@@ -101,16 +263,25 @@ async fn basic_workflow() {
     assert_eq!(tree.next_l1_batch_number(), L1BatchNumber(2));
 }
 
-async fn expected_tree_hash(pool: &ConnectionPool<Core>) -> H256 {
+async fn expected_tree_hash(pool: &ConnectionPool<Core>, sealed_protective_reads: bool) -> H256 {
     let mut storage = pool.connection().await.unwrap();
-    let sealed_l1_batch_number = storage
-        .blocks_dal()
-        .get_sealed_l1_batch_number()
-        .await
-        .unwrap()
-        .expect("No L1 batches in Postgres");
+    let processed_l1_batch_number = if sealed_protective_reads {
+        storage
+            .blocks_dal()
+            .get_sealed_l1_batch_number()
+            .await
+            .unwrap()
+            .expect("No L1 batches in Postgres")
+    } else {
+        storage
+            .vm_runner_dal()
+            .get_protective_reads_latest_processed_batch()
+            .await
+            .unwrap()
+            .unwrap_or_default()
+    };
     let mut all_logs = vec![];
-    for i in 0..=sealed_l1_batch_number.0 {
+    for i in 0..=processed_l1_batch_number.0 {
         let logs =
             L1BatchWithLogs::new(&mut storage, L1BatchNumber(i), MerkleTreeMode::Lightweight)
                 .await
@@ -122,12 +293,14 @@ async fn expected_tree_hash(pool: &ConnectionPool<Core>) -> H256 {
     ZkSyncTree::process_genesis_batch(&all_logs).root_hash
 }
 
+#[test_casing(2, [false, true])]
 #[tokio::test]
-async fn status_receiver_has_correct_states() {
+async fn status_receiver_has_correct_states(sealed_protective_reads: bool) {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
 
-    let (mut calculator, _) = setup_calculator(temp_dir.path(), pool.clone()).await;
+    let (mut calculator, _) =
+        setup_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
     let tree_health_check = calculator.tree_health_check();
     assert_eq!(tree_health_check.name(), "tree");
     let health = tree_health_check.check_health().await;
@@ -175,19 +348,22 @@ async fn status_receiver_has_correct_states() {
         .unwrap();
 }
 
+#[test_casing(2, [false, true])]
 #[tokio::test]
-async fn multi_l1_batch_workflow() {
+async fn multi_l1_batch_workflow(sealed_protective_reads: bool) {
     let pool = ConnectionPool::<Core>::test_pool().await;
 
     // Collect all storage logs in a single L1 batch
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
-    let (calculator, _) = setup_calculator(temp_dir.path(), pool.clone()).await;
+    let (calculator, _) =
+        setup_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
     reset_db_state(&pool, 1).await;
     let root_hash = run_calculator(calculator).await;
 
     // Collect the same logs in multiple L1 batches
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
-    let (calculator, object_store) = setup_calculator(temp_dir.path(), pool.clone()).await;
+    let (calculator, object_store) =
+        setup_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
     reset_db_state(&pool, 10).await;
     let multi_block_root_hash = run_calculator(calculator).await;
     assert_eq!(multi_block_root_hash, root_hash);
@@ -211,16 +387,62 @@ async fn multi_l1_batch_workflow() {
     }
 }
 
+#[test_casing(2, [false, true])]
 #[tokio::test]
-async fn running_metadata_calculator_with_additional_blocks() {
+async fn error_on_pruned_next_l1_batch(sealed_protective_reads: bool) {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
+    let (calculator, _) =
+        setup_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
+    reset_db_state(&pool, 1).await;
+    run_calculator(calculator).await;
+
+    // Add some new blocks to the storage and mock their partial pruning.
+    let mut storage = pool.connection().await.unwrap();
+    let new_logs = gen_storage_logs(100..200, 10);
+    extend_db_state(&mut storage, new_logs).await;
+    storage
+        .pruning_dal()
+        .soft_prune_batches_range(L1BatchNumber(5), L2BlockNumber(5))
+        .await
+        .unwrap();
+    storage
+        .pruning_dal()
+        .hard_prune_batches_range(L1BatchNumber(5), L2BlockNumber(5))
+        .await
+        .unwrap();
+    // Sanity check: there should be no pruned batch headers.
+    let next_l1_batch_header = storage
+        .blocks_dal()
+        .get_l1_batch_header(L1BatchNumber(2))
+        .await
+        .unwrap();
+    assert!(next_l1_batch_header.is_none());
+
+    let (calculator, _) =
+        setup_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
+    let (_stop_sender, stop_receiver) = watch::channel(false);
+    let err = calculator.run(stop_receiver).await.unwrap_err();
+    let err = format!("{err:#}");
+    assert!(
+        err.contains("L1 batch #2, next to be processed by the tree, is pruned"),
+        "{err}"
+    );
+}
+
+#[test_casing(2, [false, true])]
+#[tokio::test]
+async fn running_metadata_calculator_with_additional_blocks(sealed_protective_reads: bool) {
     let pool = ConnectionPool::<Core>::test_pool().await;
 
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
-    let calculator = setup_lightweight_calculator(temp_dir.path(), pool.clone()).await;
+    let calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
     reset_db_state(&pool, 5).await;
     run_calculator(calculator).await;
 
-    let mut calculator = setup_lightweight_calculator(temp_dir.path(), pool.clone()).await;
+    let mut calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
     let (stop_sx, stop_rx) = watch::channel(false);
     let (delay_sx, mut delay_rx) = mpsc::unbounded_channel();
     calculator.delayer.delay_notifier = delay_sx;
@@ -256,7 +478,7 @@ async fn running_metadata_calculator_with_additional_blocks() {
         .unwrap();
 
     // Switch to the full tree. It should pick up from the same spot and result in the same tree root hash.
-    let (calculator, _) = setup_calculator(temp_dir.path(), pool).await;
+    let (calculator, _) = setup_calculator(temp_dir.path(), pool, true).await;
     let root_hash_for_full_tree = run_calculator(calculator).await;
     assert_eq!(root_hash_for_full_tree, updated_root_hash);
 }
@@ -269,15 +491,23 @@ async fn shutting_down_calculator() {
         create_config(temp_dir.path(), MerkleTreeMode::Lightweight);
     operation_config.delay_interval = 30_000; // ms; chosen to be larger than `RUN_TIMEOUT`
 
-    let calculator =
-        setup_calculator_with_options(&merkle_tree_config, &operation_config, pool.clone(), None)
-            .await;
+    let calculator = setup_calculator_with_options(
+        &merkle_tree_config,
+        &operation_config,
+        &StateKeeperConfig {
+            protective_reads_persistence_enabled: true,
+            ..Default::default()
+        },
+        pool.clone(),
+        None,
+    )
+    .await;
 
     reset_db_state(&pool, 5).await;
 
     let (stop_sx, stop_rx) = watch::channel(false);
     let calculator_task = tokio::spawn(calculator.run(stop_rx));
-    tokio::time::sleep(Duration::from_millis(100)).await;
+    tokio::time::sleep(POLL_INTERVAL).await;
     stop_sx.send_replace(true);
     run_with_timeout(RUN_TIMEOUT, calculator_task)
         .await
@@ -288,10 +518,12 @@ async fn shutting_down_calculator() {
 async fn test_postgres_backup_recovery(
     sleep_between_batches: bool,
     insert_batch_without_metadata: bool,
+    sealed_protective_reads: bool,
 ) {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
-    let calculator = setup_lightweight_calculator(temp_dir.path(), pool.clone()).await;
+    let calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
     reset_db_state(&pool, 5).await;
     run_calculator(calculator).await;
 
@@ -312,11 +544,17 @@ async fn test_postgres_backup_recovery(
             .insert_mock_l1_batch(batch_without_metadata)
             .await
             .unwrap();
+        storage
+            .vm_runner_dal()
+            .mark_protective_reads_batch_as_completed(batch_without_metadata.number)
+            .await
+            .unwrap();
         insert_initial_writes_for_batch(&mut storage, batch_without_metadata.number).await;
     }
     drop(storage);
 
-    let mut calculator = setup_lightweight_calculator(temp_dir.path(), pool.clone()).await;
+    let mut calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
     let (stop_sx, stop_rx) = watch::channel(false);
     let (delay_sx, mut delay_rx) = mpsc::unbounded_channel();
     calculator.delayer.delay_notifier = delay_sx;
@@ -337,10 +575,14 @@ async fn test_postgres_backup_recovery(
             .insert_mock_l1_batch(batch_header)
             .await
             .unwrap();
+        txn.vm_runner_dal()
+            .mark_protective_reads_batch_as_completed(batch_header.number)
+            .await
+            .unwrap();
         insert_initial_writes_for_batch(&mut txn, batch_header.number).await;
         txn.commit().await.unwrap();
         if sleep_between_batches {
-            tokio::time::sleep(Duration::from_millis(100)).await;
+            tokio::time::sleep(POLL_INTERVAL).await;
         }
     }
     drop(storage);
@@ -363,40 +605,62 @@ async fn test_postgres_backup_recovery(
         .unwrap();
 }
 
+#[test_casing(2, [false, true])]
 #[tokio::test]
-async fn postgres_backup_recovery() {
-    test_postgres_backup_recovery(false, false).await;
+async fn postgres_backup_recovery(sealed_protective_reads: bool) {
+    test_postgres_backup_recovery(false, false, sealed_protective_reads).await;
 }
 
+#[test_casing(2, [false, true])]
 #[tokio::test]
-async fn postgres_backup_recovery_with_delay_between_batches() {
-    test_postgres_backup_recovery(true, false).await;
+async fn postgres_backup_recovery_with_delay_between_batches(sealed_protective_reads: bool) {
+    test_postgres_backup_recovery(true, false, sealed_protective_reads).await;
 }
 
+#[test_casing(2, [false, true])]
 #[tokio::test]
-async fn postgres_backup_recovery_with_excluded_metadata() {
-    test_postgres_backup_recovery(false, true).await;
+async fn postgres_backup_recovery_with_excluded_metadata(sealed_protective_reads: bool) {
+    test_postgres_backup_recovery(false, true, sealed_protective_reads).await;
 }
 
 pub(crate) async fn setup_calculator(
     db_path: &Path,
     pool: ConnectionPool<Core>,
+    sealed_protective_reads: bool,
 ) -> (MetadataCalculator, Arc<dyn ObjectStore>) {
-    let store_factory = ObjectStoreFactory::mock();
-    let store = store_factory.create_store().await;
+    let store = MockObjectStore::arc();
     let (merkle_tree_config, operation_manager) = create_config(db_path, MerkleTreeMode::Full);
-    let calculator =
-        setup_calculator_with_options(&merkle_tree_config, &operation_manager, pool, Some(store))
-            .await;
-    (calculator, store_factory.create_store().await)
+    let calculator = setup_calculator_with_options(
+        &merkle_tree_config,
+        &operation_manager,
+        &StateKeeperConfig {
+            protective_reads_persistence_enabled: sealed_protective_reads,
+            ..Default::default()
+        },
+        pool,
+        Some(store.clone()),
+    )
+    .await;
+    (calculator, store)
 }
 
 async fn setup_lightweight_calculator(
     db_path: &Path,
     pool: ConnectionPool<Core>,
+    sealed_protective_reads: bool,
 ) -> MetadataCalculator {
     let (db_config, operation_config) = create_config(db_path, MerkleTreeMode::Lightweight);
-    setup_calculator_with_options(&db_config, &operation_config, pool, None).await
+    setup_calculator_with_options(
+        &db_config,
+        &operation_config,
+        &StateKeeperConfig {
+            protective_reads_persistence_enabled: sealed_protective_reads,
+            ..Default::default()
+        },
+        pool,
+        None,
+    )
+    .await
 }
 
 fn create_config(
@@ -418,6 +682,7 @@ fn create_config(
 async fn setup_calculator_with_options(
     merkle_tree_config: &MerkleTreeConfig,
     operation_config: &OperationsManagerConfig,
+    state_keeper_config: &StateKeeperConfig,
     pool: ConnectionPool<Core>,
     object_store: Option<Arc<dyn ObjectStore>>,
 ) -> MetadataCalculator {
@@ -429,8 +694,11 @@ async fn setup_calculator_with_options(
     }
     drop(storage);
 
-    let calculator_config =
-        MetadataCalculatorConfig::for_main_node(merkle_tree_config, operation_config);
+    let calculator_config = MetadataCalculatorConfig::for_main_node(
+        merkle_tree_config,
+        operation_config,
+        state_keeper_config,
+    );
     MetadataCalculator::new(calculator_config, object_store, pool)
         .await
         .unwrap()
@@ -484,6 +752,11 @@ pub(crate) async fn reset_db_state(pool: &ConnectionPool<Core>, num_batches: usi
         .delete_initial_writes(L1BatchNumber(0))
         .await
         .unwrap();
+    storage
+        .vm_runner_dal()
+        .delete_protective_reads(L1BatchNumber(0))
+        .await
+        .unwrap();
 
     let logs = gen_storage_logs(0..100, num_batches);
     extend_db_state(&mut storage, logs).await;
@@ -530,7 +803,7 @@ pub(super) async fn extend_db_state_from_l1_batch(
             .unwrap();
         storage
             .storage_logs_dal()
-            .insert_storage_logs(l2_block_number, &[(H256::zero(), batch_logs)])
+            .insert_storage_logs(l2_block_number, &batch_logs)
             .await
             .unwrap();
         storage
@@ -538,6 +811,11 @@ pub(super) async fn extend_db_state_from_l1_batch(
             .mark_l2_blocks_as_executed_in_l1_batch(batch_number)
             .await
             .unwrap();
+        storage
+            .vm_runner_dal()
+            .mark_protective_reads_batch_as_completed(batch_number)
+            .await
+            .unwrap();
         insert_initial_writes_for_batch(storage, batch_number).await;
     }
 }
@@ -548,7 +826,7 @@ async fn insert_initial_writes_for_batch(
 ) {
     let written_non_zero_slots: Vec<_> = connection
         .storage_logs_dal()
-        .get_touched_slots_for_l1_batch(l1_batch_number)
+        .get_touched_slots_for_executed_l1_batch(l1_batch_number)
         .await
         .unwrap()
         .into_iter()
@@ -568,6 +846,7 @@ async fn insert_initial_writes_for_batch(
         .into_iter()
         .sorted()
         .filter(|key| !pre_written_slots.contains(&key.hashed_key()))
+        .map(|key| key.hashed_key())
         .collect();
     connection
         .storage_logs_dedup_dal()
@@ -635,6 +914,23 @@ async fn remove_l1_batches(
         batch_headers.push(header.unwrap());
     }
 
+    let (_, last_l2_block_to_keep) = storage
+        .blocks_dal()
+        .get_l2_block_range_of_l1_batch(last_l1_batch_to_keep)
+        .await
+        .unwrap()
+        .expect("L1 batch has no blocks");
+
+    storage
+        .storage_logs_dal()
+        .roll_back_storage_logs(last_l2_block_to_keep)
+        .await
+        .unwrap();
+    storage
+        .blocks_dal()
+        .delete_l2_blocks(last_l2_block_to_keep)
+        .await
+        .unwrap();
     storage
         .blocks_dal()
         .delete_l1_batches(last_l1_batch_to_keep)
@@ -645,6 +941,11 @@ async fn remove_l1_batches(
         .delete_initial_writes(last_l1_batch_to_keep)
         .await
         .unwrap();
+    storage
+        .vm_runner_dal()
+        .delete_protective_reads(last_l1_batch_to_keep)
+        .await
+        .unwrap();
     batch_headers
 }
 
@@ -735,3 +1036,34 @@ async fn deduplication_works_as_expected() {
         assert_eq!(initial_writes[key].0, L1BatchNumber(4));
     }
 }
+
+#[test_casing(6, Product(([3, 5, 8], [false, true])))]
+#[tokio::test]
+async fn l1_batch_divergence_entire_workflow(
+    last_common_l1_batch: u32,
+    sealed_protective_reads: bool,
+) {
+    const INITIAL_BATCH_COUNT: usize = 10;
+
+    assert!((last_common_l1_batch as usize) < INITIAL_BATCH_COUNT);
+    let last_common_l1_batch = L1BatchNumber(last_common_l1_batch);
+
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
+    let calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
+    reset_db_state(&pool, INITIAL_BATCH_COUNT).await;
+    run_calculator(calculator).await;
+
+    let mut storage = pool.connection().await.unwrap();
+    remove_l1_batches(&mut storage, last_common_l1_batch).await;
+    // Extend the state with new L1 batches.
+    let logs = gen_storage_logs(100..200, 5);
+    extend_db_state(&mut storage, logs).await;
+    let expected_root_hash = expected_tree_hash(&pool, sealed_protective_reads).await;
+
+    let calculator =
+        setup_lightweight_calculator(temp_dir.path(), pool.clone(), sealed_protective_reads).await;
+    let final_root_hash = run_calculator(calculator).await;
+    assert_eq!(final_root_hash, expected_root_hash);
+}
diff --git a/core/node/metadata_calculator/src/updater.rs b/core/node/metadata_calculator/src/updater.rs
new file mode 100644
index 000000000000..4568ab193e3d
--- /dev/null
+++ b/core/node/metadata_calculator/src/updater.rs
@@ -0,0 +1,464 @@
+//! Tree updater trait and its implementations.
+
+use std::{ops, sync::Arc, time::Instant};
+
+use anyhow::Context as _;
+use futures::{future, FutureExt};
+use tokio::sync::watch;
+use zksync_config::configs::database::MerkleTreeMode;
+use zksync_dal::{helpers::wait_for_l1_batch, Connection, ConnectionPool, Core, CoreDal};
+use zksync_merkle_tree::domain::TreeMetadata;
+use zksync_object_store::ObjectStore;
+use zksync_types::{
+    block::{L1BatchHeader, L1BatchTreeData},
+    L1BatchNumber,
+};
+
+use super::{
+    helpers::{AsyncTree, Delayer, L1BatchWithLogs},
+    metrics::{TreeUpdateStage, METRICS},
+    MetadataCalculator,
+};
+
+#[derive(Debug)]
+pub(super) struct TreeUpdater {
+    tree: AsyncTree,
+    max_l1_batches_per_iter: usize,
+    object_store: Option<Arc<dyn ObjectStore>>,
+    sealed_batches_have_protective_reads: bool,
+}
+
+impl TreeUpdater {
+    pub fn new(
+        tree: AsyncTree,
+        max_l1_batches_per_iter: usize,
+        object_store: Option<Arc<dyn ObjectStore>>,
+        sealed_batches_have_protective_reads: bool,
+    ) -> Self {
+        Self {
+            tree,
+            max_l1_batches_per_iter,
+            object_store,
+            sealed_batches_have_protective_reads,
+        }
+    }
+
+    async fn process_l1_batch(
+        &mut self,
+        l1_batch: L1BatchWithLogs,
+    ) -> anyhow::Result<(L1BatchHeader, TreeMetadata, Option<String>)> {
+        let compute_latency = METRICS.start_stage(TreeUpdateStage::Compute);
+        let l1_batch_header = l1_batch.header.clone();
+        let l1_batch_number = l1_batch_header.number;
+        let mut metadata = self.tree.process_l1_batch(l1_batch).await?;
+        compute_latency.observe();
+
+        let witness_input = metadata.witness.take();
+        let object_key = if let Some(object_store) = &self.object_store {
+            let witness_input =
+                witness_input.context("no witness input provided by tree; this is a bug")?;
+            let save_witnesses_latency = METRICS.start_stage(TreeUpdateStage::SaveGcs);
+            let object_key = object_store
+                .put(l1_batch_number, &witness_input)
+                .await
+                .context("cannot save witness input to object store")?;
+            save_witnesses_latency.observe();
+
+            tracing::info!(
+                "Saved witnesses for L1 batch #{l1_batch_number} to object storage at `{object_key}`"
+            );
+            Some(object_key)
+        } else {
+            None
+        };
+
+        Ok((l1_batch_header, metadata, object_key))
+    }
+
+    /// Processes a range of L1 batches with a single flushing of the tree updates to RocksDB at the end.
+    /// This allows to save on RocksDB I/O ops.
+    ///
+    /// Returns the number of the next L1 batch to be processed by the tree.
+    ///
+    /// # Implementation details
+    ///
+    /// We load L1 batch data from Postgres in parallel with updating the tree. (Naturally, we need to load
+    /// the first L1 batch data beforehand.) This allows saving some time if we actually process
+    /// multiple L1 batches at once (e.g., during the initial tree syncing), and if loading data from Postgres
+    /// is slow for whatever reason.
+    async fn process_multiple_batches(
+        &mut self,
+        pool: &ConnectionPool<Core>,
+        l1_batch_numbers: ops::RangeInclusive<u32>,
+    ) -> anyhow::Result<L1BatchNumber> {
+        let tree_mode = self.tree.mode();
+        let start = Instant::now();
+        tracing::info!("Processing L1 batches #{l1_batch_numbers:?} in {tree_mode:?} mode");
+        let mut storage = pool.connection_tagged("metadata_calculator").await?;
+        let first_l1_batch_number = L1BatchNumber(*l1_batch_numbers.start());
+        let last_l1_batch_number = L1BatchNumber(*l1_batch_numbers.end());
+        let mut l1_batch_data =
+            L1BatchWithLogs::new(&mut storage, first_l1_batch_number, tree_mode)
+                .await
+                .with_context(|| {
+                    format!("failed fetching tree input for L1 batch #{first_l1_batch_number}")
+                })?;
+        drop(storage);
+
+        let mut total_logs = 0;
+        let mut updated_headers = vec![];
+        for l1_batch_number in l1_batch_numbers {
+            let mut storage = pool.connection_tagged("metadata_calculator").await?;
+            let l1_batch_number = L1BatchNumber(l1_batch_number);
+            let Some(current_l1_batch_data) = l1_batch_data else {
+                Self::ensure_not_pruned(&mut storage, l1_batch_number).await?;
+                return Ok(l1_batch_number);
+            };
+            total_logs += current_l1_batch_data.storage_logs.len();
+
+            let process_l1_batch_task = self.process_l1_batch(current_l1_batch_data);
+            let load_next_l1_batch_task = async {
+                if l1_batch_number < last_l1_batch_number {
+                    let next_l1_batch_number = l1_batch_number + 1;
+                    let batch_result =
+                        L1BatchWithLogs::new(&mut storage, next_l1_batch_number, tree_mode).await;
+                    // Drop storage at the earliest possible moment so that it doesn't block logic running concurrently,
+                    // such as tree pruning.
+                    drop(storage);
+                    batch_result.with_context(|| {
+                        format!("failed fetching tree input for L1 batch #{next_l1_batch_number}")
+                    })
+                } else {
+                    Ok(None) // Don't need to load the next L1 batch after the last one we're processing.
+                }
+            };
+            let ((header, metadata, object_key), next_l1_batch_data) =
+                future::try_join(process_l1_batch_task, load_next_l1_batch_task).await?;
+
+            let save_postgres_latency = METRICS.start_stage(TreeUpdateStage::SavePostgres);
+            let tree_data = L1BatchTreeData {
+                hash: metadata.root_hash,
+                rollup_last_leaf_index: metadata.rollup_last_leaf_index,
+            };
+
+            let mut storage = pool.connection_tagged("metadata_calculator").await?;
+            storage
+                .blocks_dal()
+                .save_l1_batch_tree_data(l1_batch_number, &tree_data)
+                .await?;
+            // ^ Note that `save_l1_batch_tree_data()` will not blindly overwrite changes if L1 batch
+            // metadata already exists; instead, it'll check that the old and new metadata match.
+            // That is, if we run multiple tree instances, we'll get metadata correspondence
+            // right away without having to implement dedicated code.
+
+            if let Some(object_key) = &object_key {
+                storage
+                    .tee_verifier_input_producer_dal()
+                    .create_tee_verifier_input_producer_job(l1_batch_number)
+                    .await?;
+                // Save the proof generation details to Postgres
+                storage
+                    .proof_generation_dal()
+                    .insert_proof_generation_details(l1_batch_number, object_key)
+                    .await?;
+            }
+            drop(storage);
+            save_postgres_latency.observe();
+            tracing::info!("Updated metadata for L1 batch #{l1_batch_number} in Postgres");
+
+            updated_headers.push(header);
+            l1_batch_data = next_l1_batch_data;
+        }
+
+        let save_rocksdb_latency = METRICS.start_stage(TreeUpdateStage::SaveRocksdb);
+        self.tree.save().await?;
+        save_rocksdb_latency.observe();
+        MetadataCalculator::update_metrics(&updated_headers, total_logs, start);
+
+        Ok(last_l1_batch_number + 1)
+    }
+
+    /// Checks whether the requested L1 batch was pruned. Right now, the tree cannot recover from this situation,
+    /// so we exit with an error if this happens.
+    async fn ensure_not_pruned(
+        storage: &mut Connection<'_, Core>,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<()> {
+        let pruning_info = storage.pruning_dal().get_pruning_info().await?;
+        anyhow::ensure!(
+            Some(l1_batch_number) > pruning_info.last_soft_pruned_l1_batch,
+            "L1 batch #{l1_batch_number}, next to be processed by the tree, is pruned; the tree cannot continue operating"
+        );
+        Ok(())
+    }
+
+    async fn step(
+        &mut self,
+        pool: &ConnectionPool<Core>,
+        next_l1_batch_to_process: &mut L1BatchNumber,
+    ) -> anyhow::Result<()> {
+        let mut storage = pool.connection_tagged("metadata_calculator").await?;
+        let last_l1_batch_with_protective_reads = if self.tree.mode() == MerkleTreeMode::Lightweight
+            || self.sealed_batches_have_protective_reads
+        {
+            let Some(last_sealed_l1_batch) = storage
+                .blocks_dal()
+                .get_sealed_l1_batch_number()
+                .await
+                .context("failed loading sealed L1 batch number")?
+            else {
+                tracing::trace!("No L1 batches to seal: Postgres storage is empty");
+                return Ok(());
+            };
+            last_sealed_l1_batch
+        } else {
+            storage
+                .vm_runner_dal()
+                .get_protective_reads_latest_processed_batch()
+                .await
+                .context("failed loading latest L1 batch number with protective reads")?
+                .unwrap_or_default()
+        };
+        drop(storage);
+
+        let last_requested_l1_batch =
+            next_l1_batch_to_process.0 + self.max_l1_batches_per_iter as u32 - 1;
+        let last_requested_l1_batch =
+            last_requested_l1_batch.min(last_l1_batch_with_protective_reads.0);
+        let l1_batch_numbers = next_l1_batch_to_process.0..=last_requested_l1_batch;
+        if l1_batch_numbers.is_empty() {
+            tracing::trace!(
+                "No L1 batches to process: batch numbers range to be loaded {l1_batch_numbers:?} is empty"
+            );
+        } else {
+            tracing::info!("Updating Merkle tree with L1 batches #{l1_batch_numbers:?}");
+            *next_l1_batch_to_process = self
+                .process_multiple_batches(pool, l1_batch_numbers)
+                .await?;
+        }
+        Ok(())
+    }
+
+    /// The processing loop for this updater.
+    pub async fn loop_updating_tree(
+        mut self,
+        delayer: Delayer,
+        pool: &ConnectionPool<Core>,
+        mut stop_receiver: watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
+        let tree = &mut self.tree;
+        let mut next_l1_batch_to_process = tree.next_l1_batch_number();
+        tracing::info!(
+            "Initialized metadata calculator with {max_batches_per_iter} max L1 batches per iteration. \
+             Next L1 batch for Merkle tree: {next_l1_batch_to_process}",
+            max_batches_per_iter = self.max_l1_batches_per_iter
+        );
+
+        loop {
+            if *stop_receiver.borrow_and_update() {
+                tracing::info!("Stop signal received, metadata_calculator is shutting down");
+                break;
+            }
+
+            let snapshot = *next_l1_batch_to_process;
+            self.step(pool, &mut next_l1_batch_to_process).await?;
+            let delay = if snapshot == *next_l1_batch_to_process {
+                tracing::trace!(
+                    "Metadata calculator (next L1 batch: #{next_l1_batch_to_process}) \
+                     didn't make any progress; delaying it using {delayer:?}"
+                );
+                delayer.wait(&self.tree).left_future()
+            } else {
+                tracing::trace!(
+                    "Metadata calculator (next L1 batch: #{next_l1_batch_to_process}) made progress from #{snapshot}"
+                );
+                future::ready(()).right_future()
+            };
+
+            // The delays we're operating with are reasonably small, but selecting between the delay
+            // and the stop receiver still allows to be more responsive during shutdown.
+            tokio::select! {
+                _ = stop_receiver.changed() => {
+                    tracing::info!("Stop signal received, metadata_calculator is shutting down");
+                    break;
+                }
+                () = delay => { /* The delay has passed */ }
+            }
+        }
+        Ok(())
+    }
+}
+
+impl AsyncTree {
+    async fn ensure_genesis(
+        &mut self,
+        storage: &mut Connection<'_, Core>,
+        earliest_l1_batch: L1BatchNumber,
+    ) -> anyhow::Result<()> {
+        if !self.is_empty() {
+            return Ok(());
+        }
+
+        anyhow::ensure!(
+            earliest_l1_batch == L1BatchNumber(0),
+            "Non-zero earliest L1 batch #{earliest_l1_batch} is not supported without previous tree recovery"
+        );
+        let batch = L1BatchWithLogs::new(storage, earliest_l1_batch, self.mode())
+            .await
+            .with_context(|| {
+                format!("failed fetching tree input for L1 batch #{earliest_l1_batch}")
+            })?
+            .context("Missing storage logs for the genesis L1 batch")?;
+        self.process_l1_batch(batch).await?;
+        self.save().await?;
+        Ok(())
+    }
+
+    /// Invariant: the tree is not ahead of Postgres.
+    async fn ensure_no_l1_batch_divergence(
+        &mut self,
+        pool: &ConnectionPool<Core>,
+    ) -> anyhow::Result<()> {
+        let Some(last_tree_l1_batch) = self.next_l1_batch_number().checked_sub(1) else {
+            // No L1 batches in the tree means no divergence.
+            return Ok(());
+        };
+        let last_tree_l1_batch = L1BatchNumber(last_tree_l1_batch);
+
+        let mut storage = pool.connection_tagged("metadata_calculator").await?;
+        if self
+            .l1_batch_matches(&mut storage, last_tree_l1_batch)
+            .await?
+        {
+            tracing::debug!(
+                "Last l1 batch in tree #{last_tree_l1_batch} has same data in tree and Postgres"
+            );
+            return Ok(());
+        }
+
+        tracing::debug!("Last l1 batch in tree #{last_tree_l1_batch} has diverging data in tree and Postgres; searching for the last common L1 batch");
+        let min_tree_l1_batch = self
+            .min_l1_batch_number()
+            .context("tree shouldn't be empty at this point")?;
+        anyhow::ensure!(
+            min_tree_l1_batch <= last_tree_l1_batch,
+            "potential Merkle tree corruption: minimum L1 batch number ({min_tree_l1_batch}) exceeds the last L1 batch ({last_tree_l1_batch})"
+        );
+
+        anyhow::ensure!(
+            self.l1_batch_matches(&mut storage, min_tree_l1_batch).await?,
+            "diverging min L1 batch in the tree #{min_tree_l1_batch}; the tree cannot recover from this"
+        );
+
+        let mut left = min_tree_l1_batch.0;
+        let mut right = last_tree_l1_batch.0;
+        while left + 1 < right {
+            let middle = (left + right) / 2;
+            let batch_matches = self
+                .l1_batch_matches(&mut storage, L1BatchNumber(middle))
+                .await?;
+            if batch_matches {
+                left = middle;
+            } else {
+                right = middle;
+            }
+        }
+        let last_common_l1_batch_number = L1BatchNumber(left);
+        tracing::info!("Found last common L1 batch between tree and Postgres: #{last_common_l1_batch_number}; will revert tree to it");
+
+        self.roll_back_logs(last_common_l1_batch_number)?;
+        self.save().await?;
+        Ok(())
+    }
+
+    async fn l1_batch_matches(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        l1_batch: L1BatchNumber,
+    ) -> anyhow::Result<bool> {
+        if l1_batch == L1BatchNumber(0) {
+            // Corner case: root hash for L1 batch #0 persisted in Postgres is fictive (set to `H256::zero()`).
+            return Ok(true);
+        }
+
+        let Some(tree_data) = self.data_for_l1_batch(l1_batch) else {
+            // Corner case: the L1 batch was pruned in the tree.
+            return Ok(true);
+        };
+        let Some(tree_data_from_postgres) = storage
+            .blocks_dal()
+            .get_l1_batch_tree_data(l1_batch)
+            .await?
+        else {
+            // Corner case: the L1 batch was pruned in Postgres (including initial snapshot recovery).
+            return Ok(true);
+        };
+
+        let data_matches = tree_data == tree_data_from_postgres;
+        if !data_matches {
+            tracing::warn!(
+                "Detected diverging tree data for L1 batch #{l1_batch}; data in tree is: {tree_data:?}, \
+                 data in Postgres is: {tree_data_from_postgres:?}"
+            );
+        }
+        Ok(data_matches)
+    }
+
+    /// Ensures that the tree is consistent with Postgres, truncating the tree if necessary.
+    /// This will wait for at least one L1 batch to appear in Postgres if necessary.
+    pub(crate) async fn ensure_consistency(
+        &mut self,
+        delayer: &Delayer,
+        pool: &ConnectionPool<Core>,
+        stop_receiver: &mut watch::Receiver<bool>,
+    ) -> anyhow::Result<()> {
+        let Some(earliest_l1_batch) =
+            wait_for_l1_batch(pool, delayer.delay_interval(), stop_receiver).await?
+        else {
+            return Ok(()); // Stop signal received
+        };
+        let mut storage = pool.connection_tagged("metadata_calculator").await?;
+
+        self.ensure_genesis(&mut storage, earliest_l1_batch).await?;
+        let next_l1_batch_to_process = self.next_l1_batch_number();
+
+        let current_db_batch = storage
+            .vm_runner_dal()
+            .get_protective_reads_latest_processed_batch()
+            .await?
+            .unwrap_or_default();
+        let last_l1_batch_with_tree_data = storage
+            .blocks_dal()
+            .get_last_l1_batch_number_with_tree_data()
+            .await?;
+        drop(storage);
+
+        tracing::info!(
+            "Next L1 batch for Merkle tree: {next_l1_batch_to_process}, current Postgres L1 batch: {current_db_batch:?}, \
+             last L1 batch with metadata: {last_l1_batch_with_tree_data:?}"
+        );
+
+        // It may be the case that we don't have any L1 batches with metadata in Postgres, e.g. after
+        // recovering from a snapshot. We cannot wait for such a batch to appear (*this* is the component
+        // responsible for their appearance!), but fortunately most of the updater doesn't depend on it.
+        if let Some(last_l1_batch_with_tree_data) = last_l1_batch_with_tree_data {
+            let backup_lag =
+                (last_l1_batch_with_tree_data.0 + 1).saturating_sub(next_l1_batch_to_process.0);
+            METRICS.backup_lag.set(backup_lag.into());
+
+            if next_l1_batch_to_process > last_l1_batch_with_tree_data + 1 {
+                tracing::warn!(
+                    "Next L1 batch of the tree ({next_l1_batch_to_process}) is greater than last L1 batch with metadata in Postgres \
+                     ({last_l1_batch_with_tree_data}); this may be a result of restoring Postgres from a snapshot. \
+                     Truncating Merkle tree versions so that this mismatch is fixed..."
+                );
+                self.roll_back_logs(last_l1_batch_with_tree_data)?;
+                self.save().await?;
+                tracing::info!("Truncated Merkle tree to L1 batch #{next_l1_batch_to_process}");
+            }
+
+            self.ensure_no_l1_batch_divergence(pool).await?;
+        }
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/Cargo.toml b/core/node/node_framework/Cargo.toml
index e02266c16546..554083b830c5 100644
--- a/core/node/node_framework/Cargo.toml
+++ b/core/node/node_framework/Cargo.toml
@@ -10,17 +10,17 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-prometheus_exporter.workspace = true
+zksync_node_framework_derive.workspace = true
+zksync_vlog.workspace = true
 zksync_types.workspace = true
 zksync_health_check.workspace = true
 zksync_dal.workspace = true
-prover_dal.workspace = true
+zksync_prover_dal.workspace = true
 zksync_db_connection.workspace = true
 zksync_config.workspace = true
 zksync_protobuf_config.workspace = true
 zksync_state.workspace = true
 zksync_object_store.workspace = true
-zksync_core.workspace = true
 zksync_storage.workspace = true
 zksync_eth_client.workspace = true
 zksync_contracts.workspace = true
@@ -34,7 +34,24 @@ zksync_commitment_generator.workspace = true
 zksync_house_keeper.workspace = true
 zksync_node_fee_model.workspace = true
 zksync_eth_sender.workspace = true
+zksync_da_client.workspace = true
+zksync_da_dispatcher.workspace = true
+zksync_block_reverter.workspace = true
+zksync_state_keeper.workspace = true
+zksync_consistency_checker.workspace = true
+zksync_metadata_calculator.workspace = true
+zksync_node_sync.workspace = true
+zksync_node_api_server.workspace = true
+zksync_node_consensus.workspace = true
+zksync_contract_verification_server.workspace = true
+zksync_tee_verifier_input_producer.workspace = true
+zksync_queued_job_processor.workspace = true
+zksync_reorg_detector.workspace = true
+zksync_vm_runner.workspace = true
+zksync_node_db_pruner.workspace = true
+zksync_base_token_adjuster.workspace = true
 
+pin-project-lite.workspace = true
 tracing.workspace = true
 thiserror.workspace = true
 async-trait.workspace = true
@@ -45,5 +62,6 @@ ctrlc.workspace = true
 
 [dev-dependencies]
 zksync_env_config.workspace = true
-vlog.workspace = true
 assert_matches.workspace = true
+# For running UI tests for proc macro
+trybuild.workspace = true
diff --git a/core/node/node_framework/examples/main_node.rs b/core/node/node_framework/examples/main_node.rs
index b524664c89a1..9fb81aa4069b 100644
--- a/core/node/node_framework/examples/main_node.rs
+++ b/core/node/node_framework/examples/main_node.rs
@@ -9,32 +9,27 @@ use zksync_config::{
             CircuitBreakerConfig, MempoolConfig, NetworkConfig, OperationsManagerConfig,
             StateKeeperConfig,
         },
-        consensus::{ConsensusConfig, ConsensusSecrets},
         fri_prover_group::FriProverGroupConfig,
         house_keeper::HouseKeeperConfig,
         wallets::Wallets,
-        FriProofCompressorConfig, FriProverConfig, FriWitnessGeneratorConfig, ObservabilityConfig,
-        ProofDataHandlerConfig,
+        DatabaseSecrets, FriProofCompressorConfig, FriProverConfig, FriWitnessGeneratorConfig,
+        L1Secrets, ObservabilityConfig, ProofDataHandlerConfig,
     },
     ApiConfig, ContractVerifierConfig, ContractsConfig, DBConfig, EthConfig, EthWatchConfig,
     GasAdjusterConfig, GenesisConfig, ObjectStoreConfig, PostgresConfig,
 };
-use zksync_core::{
-    api_server::{
-        tx_sender::{ApiContracts, TxSenderConfig},
-        web3::{state::InternalApiConfig, Namespace},
-    },
-    metadata_calculator::MetadataCalculatorConfig,
-    temp_config_store::decode_yaml_repr,
-};
 use zksync_env_config::FromEnv;
+use zksync_metadata_calculator::MetadataCalculatorConfig;
+use zksync_node_api_server::{
+    tx_sender::{ApiContracts, TxSenderConfig},
+    web3::{state::InternalApiConfig, Namespace},
+};
 use zksync_node_framework::{
     implementations::layers::{
         circuit_breaker_checker::CircuitBreakerCheckerLayer,
         commitment_generator::CommitmentGeneratorLayer,
-        consensus::{ConsensusLayer, Mode as ConsensusMode},
         contract_verification_api::ContractVerificationApiLayer,
-        eth_sender::EthSenderLayer,
+        eth_sender::{EthTxAggregatorLayer, EthTxManagerLayer},
         eth_watch::EthWatchLayer,
         healtcheck_server::HealthCheckLayer,
         house_keeper::HouseKeeperLayer,
@@ -48,7 +43,7 @@ use zksync_node_framework::{
         sigint::SigintHandlerLayer,
         state_keeper::{
             main_batch_executor::MainBatchExecutorLayer, mempool_io::MempoolIOLayer,
-            StateKeeperLayer,
+            output_handler::OutputHandlerLayer, StateKeeperLayer,
         },
         web3_api::{
             caches::MempoolCacheLayer,
@@ -60,7 +55,7 @@ use zksync_node_framework::{
     },
     service::{ZkStackService, ZkStackServiceBuilder, ZkStackServiceError},
 };
-use zksync_protobuf_config::proto;
+use zksync_state::RocksdbStorageOptions;
 
 struct MainNodeBuilder {
     node: ZkStackServiceBuilder,
@@ -80,7 +75,8 @@ impl MainNodeBuilder {
 
     fn add_pools_layer(mut self) -> anyhow::Result<Self> {
         let config = PostgresConfig::from_env()?;
-        let pools_layer = PoolsLayerBuilder::empty(config)
+        let secrets = DatabaseSecrets::from_env()?;
+        let pools_layer = PoolsLayerBuilder::empty(config, secrets)
             .with_master(true)
             .with_replica(true)
             .with_prover(true)
@@ -103,8 +99,10 @@ impl MainNodeBuilder {
     }
 
     fn add_query_eth_client_layer(mut self) -> anyhow::Result<Self> {
-        let eth_client_config = EthConfig::from_env()?;
-        let query_eth_client_layer = QueryEthClientLayer::new(eth_client_config.web3_url);
+        let genesis = GenesisConfig::from_env()?;
+        let eth_config = L1Secrets::from_env()?;
+        let query_eth_client_layer =
+            QueryEthClientLayer::new(genesis.l1_chain_id, eth_config.l1_rpc_url);
         self.node.add_layer(query_eth_client_layer);
         Ok(self)
     }
@@ -137,28 +135,45 @@ impl MainNodeBuilder {
     fn add_metadata_calculator_layer(mut self) -> anyhow::Result<Self> {
         let merkle_tree_env_config = DBConfig::from_env()?.merkle_tree;
         let operations_manager_env_config = OperationsManagerConfig::from_env()?;
+        let state_keeper_env_config = StateKeeperConfig::from_env()?;
         let metadata_calculator_config = MetadataCalculatorConfig::for_main_node(
             &merkle_tree_env_config,
             &operations_manager_env_config,
+            &state_keeper_env_config,
         );
         self.node
-            .add_layer(MetadataCalculatorLayer(metadata_calculator_config));
+            .add_layer(MetadataCalculatorLayer::new(metadata_calculator_config));
         Ok(self)
     }
 
     fn add_state_keeper_layer(mut self) -> anyhow::Result<Self> {
         let wallets = Wallets::from_env()?;
+        let contracts_config = ContractsConfig::from_env()?;
+        let sk_config = StateKeeperConfig::from_env()?;
+        let persisence_layer = OutputHandlerLayer::new(
+            contracts_config.l2_shared_bridge_addr.unwrap(),
+            sk_config.l2_block_seal_queue_capacity,
+        );
         let mempool_io_layer = MempoolIOLayer::new(
-            NetworkConfig::from_env()?,
-            ContractsConfig::from_env()?,
-            StateKeeperConfig::from_env()?,
+            NetworkConfig::from_env()?.zksync_network_id,
+            sk_config,
             MempoolConfig::from_env()?,
             wallets.state_keeper.context("State keeper wallets")?,
         );
         let main_node_batch_executor_builder_layer =
-            MainBatchExecutorLayer::new(DBConfig::from_env()?, StateKeeperConfig::from_env()?);
-        let state_keeper_layer = StateKeeperLayer;
+            MainBatchExecutorLayer::new(StateKeeperConfig::from_env()?.save_call_traces, true);
+        let db_config = DBConfig::from_env()?;
+
+        let rocksdb_options = RocksdbStorageOptions {
+            block_cache_capacity: db_config
+                .experimental
+                .state_keeper_db_block_cache_capacity(),
+            max_open_files: db_config.experimental.state_keeper_db_max_open_files,
+        };
+        let state_keeper_layer =
+            StateKeeperLayer::new(db_config.state_keeper_db_path, rocksdb_options);
         self.node
+            .add_layer(persisence_layer)
             .add_layer(mempool_io_layer)
             .add_layer(main_node_batch_executor_builder_layer)
             .add_layer(state_keeper_layer);
@@ -174,8 +189,10 @@ impl MainNodeBuilder {
     }
 
     fn add_proof_data_handler_layer(mut self) -> anyhow::Result<Self> {
+        let genesis_config = GenesisConfig::from_env()?;
         self.node.add_layer(ProofDataHandlerLayer::new(
             ProofDataHandlerConfig::from_env()?,
+            genesis_config.l1_batch_commit_data_generator_mode,
         ));
         Ok(self)
     }
@@ -212,7 +229,7 @@ impl MainNodeBuilder {
             ),
             postgres_storage_caches_config,
             rpc_config.vm_concurrency_limit(),
-            ApiContracts::load_from_disk(), // TODO (BFT-138): Allow to dynamically reload API contracts
+            ApiContracts::load_from_disk_blocking(), // TODO (BFT-138): Allow to dynamically reload API contracts
         ));
         Ok(self)
     }
@@ -287,6 +304,8 @@ impl MainNodeBuilder {
                 rpc_config.websocket_requests_per_minute_limit(),
             ),
             replication_lag_limit: circuit_breaker_config.replication_lag_limit(),
+            with_extended_tracing: rpc_config.extended_api_tracing,
+            ..Default::default()
         };
         self.node.add_layer(Web3ServerLayer::ws(
             rpc_config.ws_port,
@@ -302,12 +321,14 @@ impl MainNodeBuilder {
         let network_config = NetworkConfig::from_env()?;
         let genesis_config = GenesisConfig::from_env()?;
 
-        self.node.add_layer(EthSenderLayer::new(
-            eth_sender_config,
+        self.node.add_layer(EthTxAggregatorLayer::new(
+            eth_sender_config.clone(),
             contracts_config,
-            network_config,
+            network_config.zksync_network_id,
             genesis_config.l1_batch_commit_data_generator_mode,
         ));
+        self.node
+            .add_layer(EthTxManagerLayer::new(eth_sender_config));
 
         Ok(self)
     }
@@ -353,47 +374,6 @@ impl MainNodeBuilder {
         Ok(self)
     }
 
-    fn add_consensus_layer(mut self) -> anyhow::Result<Self> {
-        // Copy-pasted from the zksync_server codebase.
-
-        fn read_consensus_secrets() -> anyhow::Result<Option<ConsensusSecrets>> {
-            // Read public config.
-            let Ok(path) = std::env::var("CONSENSUS_SECRETS_PATH") else {
-                return Ok(None);
-            };
-            let secrets = std::fs::read_to_string(&path).context(path)?;
-            Ok(Some(
-                decode_yaml_repr::<proto::consensus::Secrets>(&secrets)
-                    .context("failed decoding YAML")?,
-            ))
-        }
-
-        fn read_consensus_config() -> anyhow::Result<Option<ConsensusConfig>> {
-            // Read public config.
-            let Ok(path) = std::env::var("CONSENSUS_CONFIG_PATH") else {
-                return Ok(None);
-            };
-            let cfg = std::fs::read_to_string(&path).context(path)?;
-            Ok(Some(
-                decode_yaml_repr::<proto::consensus::Config>(&cfg)
-                    .context("failed decoding YAML")?,
-            ))
-        }
-
-        let genesis = GenesisConfig::from_env()?;
-        let config = read_consensus_config().context("read_consensus_config()")?;
-        let secrets = read_consensus_secrets().context("read_consensus_secrets()")?;
-
-        self.node.add_layer(ConsensusLayer {
-            mode: ConsensusMode::Main,
-            config,
-            secrets,
-            chain_id: genesis.l2_chain_id,
-        });
-
-        Ok(self)
-    }
-
     fn build(mut self) -> Result<ZkStackService, ZkStackServiceError> {
         self.node.build()
     }
@@ -402,11 +382,11 @@ impl MainNodeBuilder {
 fn main() -> anyhow::Result<()> {
     let observability_config =
         ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
-    let _guard = vlog::ObservabilityBuilder::new()
+    let _guard = zksync_vlog::ObservabilityBuilder::new()
         .with_log_format(log_format)
         .build();
 
@@ -432,7 +412,6 @@ fn main() -> anyhow::Result<()> {
         .add_house_keeper_layer()?
         .add_commitment_generator_layer()?
         .add_contract_verification_api_layer()?
-        .add_consensus_layer()?
         .build()?
         .run()?;
 
diff --git a/core/node/node_framework/examples/showcase.rs b/core/node/node_framework/examples/showcase.rs
index 0a1552f33501..5684e53162a9 100644
--- a/core/node/node_framework/examples/showcase.rs
+++ b/core/node/node_framework/examples/showcase.rs
@@ -10,7 +10,7 @@ use std::{
 use zksync_node_framework::{
     resource::Resource,
     service::{ServiceContext, StopReceiver, ZkStackServiceBuilder},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
@@ -31,7 +31,7 @@ struct MemoryDatabase {
 /// but in real envs we use GCP. Alternatively, we have different resource implementations for
 /// main node and EN, like `MempoolIO` and `ExternalIO`.
 ///
-/// Whether it makes sense to hdie the actual resource behind a trait often depends on the resource
+/// Whether it makes sense to hide the actual resource behind a trait often depends on the resource
 /// itself. For example, our DAL is massive and cannot realistically be changed easily, so it's OK
 /// for it to be a concrete resource. But for anything that may realistically have two different
 /// implementations, it's often a good idea to hide it behind a trait.
@@ -51,7 +51,7 @@ impl Database for MemoryDatabase {
 }
 
 /// An idiomatic way to create a resource is to prepare a wrapper for it.
-/// This way we separate the logic of framework (which is primarily about glueing things together)
+/// This way we separate the logic of the framework (which is primarily about glueing things together)
 /// from an actual logic of the resource.
 #[derive(Clone)]
 struct DatabaseResource(pub Arc<dyn Database>);
@@ -63,8 +63,6 @@ struct DatabaseResource(pub Arc<dyn Database>);
 ///
 /// For the latter requirement, there exists an `Unique` wrapper that can be used to store non-`Clone`
 /// resources. It's not used in this example, but it's a useful thing to know about.
-///
-/// Finally, there are other wrappers for resources as well, like `ResourceCollection` and `LazyResource`.
 impl Resource for DatabaseResource {
     fn name() -> String {
         // The convention for resource names is `<scope>/<name>`. In this case, the scope is `common`, but
@@ -96,14 +94,14 @@ impl PutTask {
 
 #[async_trait::async_trait]
 impl Task for PutTask {
-    fn name(&self) -> &'static str {
+    fn id(&self) -> TaskId {
         // Task names simply have to be unique. They are used for logging and debugging.
-        "put_task"
+        "put_task".into()
     }
 
     /// This method will be invoked by the framework when the task is started.
     async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        tracing::info!("Starting the task {}", self.name());
+        tracing::info!("Starting the task {}", self.id());
 
         // We have to respect the stop receiver and should exit as soon as we receive
         // a stop signal.
@@ -138,12 +136,12 @@ impl CheckTask {
 
 #[async_trait::async_trait]
 impl Task for CheckTask {
-    fn name(&self) -> &'static str {
-        "check_task"
+    fn id(&self) -> TaskId {
+        "check_task".into()
     }
 
     async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        tracing::info!("Starting the task {}", self.name());
+        tracing::info!("Starting the task {}", self.id());
 
         tokio::select! {
             _ = self.run_inner() => {},
@@ -194,12 +192,12 @@ impl WiringLayer for TasksLayer {
         // We fetch the database resource from the context.
         // Note that we don't really care where it comes from or what's the actual implementation is.
         // We only care whether it's available and bail out if not.
-        let db = context.get_resource::<DatabaseResource>().await?.0;
+        let db = context.get_resource::<DatabaseResource>()?.0;
         let put_task = PutTask { db: db.clone() };
         let check_task = CheckTask { db };
         // These tasks will be launched by the service once the wiring process is complete.
-        context.add_task(Box::new(put_task));
-        context.add_task(Box::new(check_task));
+        context.add_task(put_task);
+        context.add_task(check_task);
         Ok(())
     }
 }
diff --git a/core/node/node_framework/src/implementations/layers/base_token_ratio_persister.rs b/core/node/node_framework/src/implementations/layers/base_token_ratio_persister.rs
new file mode 100644
index 000000000000..c9a6ef8d8b66
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/base_token_ratio_persister.rs
@@ -0,0 +1,62 @@
+use zksync_base_token_adjuster::BaseTokenRatioPersister;
+use zksync_config::configs::base_token_adjuster::BaseTokenAdjusterConfig;
+
+use crate::{
+    implementations::resources::pools::{MasterPool, PoolResource},
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for `BaseTokenRatioPersister`
+///
+/// Responsible for orchestrating communications with external API feeds to get ETH<->BaseToken
+/// conversion ratios and persisting them both in the DB and in the L1.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<ReplicaPool>`
+///
+/// ## Adds tasks
+///
+/// - `BaseTokenRatioPersister`
+#[derive(Debug)]
+pub struct BaseTokenRatioPersisterLayer {
+    config: BaseTokenAdjusterConfig,
+}
+
+impl BaseTokenRatioPersisterLayer {
+    pub fn new(config: BaseTokenAdjusterConfig) -> Self {
+        Self { config }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for BaseTokenRatioPersisterLayer {
+    fn layer_name(&self) -> &'static str {
+        "base_token_ratio_persister"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let master_pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
+        let master_pool = master_pool_resource.get().await?;
+
+        let persister = BaseTokenRatioPersister::new(master_pool, self.config);
+
+        context.add_task(persister);
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for BaseTokenRatioPersister {
+    fn id(&self) -> TaskId {
+        "base_token_ratio_persister".into()
+    }
+
+    async fn run(mut self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run(stop_receiver.0).await?;
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/base_token_ratio_provider.rs b/core/node/node_framework/src/implementations/layers/base_token_ratio_provider.rs
new file mode 100644
index 000000000000..d213ac68c79b
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/base_token_ratio_provider.rs
@@ -0,0 +1,65 @@
+use std::sync::Arc;
+
+use zksync_base_token_adjuster::DBBaseTokenRatioProvider;
+
+use crate::{
+    implementations::resources::{
+        base_token_ratio_provider::BaseTokenRatioProviderResource,
+        pools::{PoolResource, ReplicaPool},
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for `BaseTokenRatioProvider`
+///
+/// Responsible for serving the latest ETH<->BaseToken conversion ratio. This layer is only wired if
+/// the base token is not ETH. If wired, this layer inserts the BaseTokenRatioProviderResource and kicks
+/// off a task to poll the DB for the latest ratio and cache it.
+///
+/// If the base token is ETH, a default, no-op impl of the BaseTokenRatioProviderResource is used by other
+/// layers to always return a conversion ratio of 1.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<ReplicaPool>`
+///
+/// ## Adds tasks
+///
+/// - `BaseTokenRatioProvider`
+#[derive(Debug)]
+pub struct BaseTokenRatioProviderLayer;
+
+#[async_trait::async_trait]
+impl WiringLayer for BaseTokenRatioProviderLayer {
+    fn layer_name(&self) -> &'static str {
+        "base_token_ratio_provider"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let replica_pool_resource = context.get_resource::<PoolResource<ReplicaPool>>()?;
+        let replica_pool = replica_pool_resource.get().await.unwrap();
+
+        let ratio_provider = DBBaseTokenRatioProvider::new(replica_pool).await?;
+
+        context.insert_resource(BaseTokenRatioProviderResource(Arc::new(
+            ratio_provider.clone(),
+        )))?;
+        context.add_task(ratio_provider);
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for DBBaseTokenRatioProvider {
+    fn id(&self) -> TaskId {
+        "base_token_ratio_provider".into()
+    }
+
+    async fn run(mut self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run(stop_receiver.0).await?;
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/batch_status_updater.rs b/core/node/node_framework/src/implementations/layers/batch_status_updater.rs
new file mode 100644
index 000000000000..d2b522ad026c
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/batch_status_updater.rs
@@ -0,0 +1,84 @@
+use zksync_node_sync::batch_status_updater::BatchStatusUpdater;
+
+use crate::{
+    implementations::resources::{
+        healthcheck::AppHealthCheckResource,
+        main_node_client::MainNodeClientResource,
+        pools::{MasterPool, PoolResource},
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+    FromContext, IntoContext,
+};
+
+#[derive(Debug, FromContext)]
+#[context(crate = crate)]
+struct LayerInput {
+    pool: PoolResource<MasterPool>,
+    client: MainNodeClientResource,
+    #[context(default)]
+    app_health: AppHealthCheckResource,
+}
+
+#[derive(Debug, IntoContext)]
+#[context(crate = crate)]
+struct LayerOutput {
+    #[context(task)]
+    updater: BatchStatusUpdater,
+}
+
+/// Wiring layer for `BatchStatusUpdater`, part of the external node.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `MainNodeClientResource`
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds tasks
+///
+/// - `BatchStatusUpdater`
+#[derive(Debug)]
+pub struct BatchStatusUpdaterLayer;
+
+#[async_trait::async_trait]
+impl WiringLayer for BatchStatusUpdaterLayer {
+    fn layer_name(&self) -> &'static str {
+        "batch_status_updater_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let LayerInput {
+            pool,
+            client,
+            app_health,
+        } = LayerInput::from_context(&mut context)?;
+
+        let updater = BatchStatusUpdater::new(client.0, pool.get().await?);
+
+        // Insert healthcheck
+        app_health
+            .0
+            .insert_component(updater.health_check())
+            .map_err(WiringError::internal)?;
+
+        // Insert task
+        let layer_output = LayerOutput { updater };
+        layer_output.into_context(&mut context)?;
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for BatchStatusUpdater {
+    fn id(&self) -> TaskId {
+        "batch_status_updater".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run(stop_receiver.0).await?;
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/circuit_breaker_checker.rs b/core/node/node_framework/src/implementations/layers/circuit_breaker_checker.rs
index f493d8081ef9..14ac5591840c 100644
--- a/core/node/node_framework/src/implementations/layers/circuit_breaker_checker.rs
+++ b/core/node/node_framework/src/implementations/layers/circuit_breaker_checker.rs
@@ -4,10 +4,23 @@ use zksync_config::configs::chain::CircuitBreakerConfig;
 use crate::{
     implementations::resources::circuit_breakers::CircuitBreakersResource,
     service::{ServiceContext, StopReceiver},
-    task::UnconstrainedTask,
+    task::{Task, TaskId, TaskKind},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for circuit breaker checker
+///
+/// Expects other layers to insert different components' circuit breakers into
+/// [`zksync_circuit_breaker::CircuitBreakers`] collection using [`CircuitBreakersResource`].
+/// The added task periodically runs checks for all inserted circuit breakers.
+///
+/// ## Requests resources
+///
+/// - `CircuitBreakersResource`
+///
+/// ## Adds tasks
+///
+/// - `CircuitBreakerCheckerTask`
 #[derive(Debug)]
 pub struct CircuitBreakerCheckerLayer(pub CircuitBreakerConfig);
 
@@ -19,9 +32,7 @@ impl WiringLayer for CircuitBreakerCheckerLayer {
 
     async fn wire(self: Box<Self>, mut node: ServiceContext<'_>) -> Result<(), WiringError> {
         // Get resources.
-        let circuit_breaker_resource = node
-            .get_resource_or_default::<CircuitBreakersResource>()
-            .await;
+        let circuit_breaker_resource = node.get_resource_or_default::<CircuitBreakersResource>();
 
         let circuit_breaker_checker =
             CircuitBreakerChecker::new(circuit_breaker_resource.breakers, self.0.sync_interval());
@@ -31,7 +42,7 @@ impl WiringLayer for CircuitBreakerCheckerLayer {
             circuit_breaker_checker,
         };
 
-        node.add_unconstrained_task(Box::new(task));
+        node.add_task(task);
         Ok(())
     }
 }
@@ -42,15 +53,16 @@ struct CircuitBreakerCheckerTask {
 }
 
 #[async_trait::async_trait]
-impl UnconstrainedTask for CircuitBreakerCheckerTask {
-    fn name(&self) -> &'static str {
-        "circuit_breaker_checker"
+impl Task for CircuitBreakerCheckerTask {
+    fn kind(&self) -> TaskKind {
+        TaskKind::UnconstrainedTask
     }
 
-    async fn run_unconstrained(
-        mut self: Box<Self>,
-        stop_receiver: StopReceiver,
-    ) -> anyhow::Result<()> {
+    fn id(&self) -> TaskId {
+        "circuit_breaker_checker".into()
+    }
+
+    async fn run(mut self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
         self.circuit_breaker_checker.run(stop_receiver.0).await
     }
 }
diff --git a/core/node/node_framework/src/implementations/layers/commitment_generator.rs b/core/node/node_framework/src/implementations/layers/commitment_generator.rs
index 319e486dc6ad..b2f8cd2d30c2 100644
--- a/core/node/node_framework/src/implementations/layers/commitment_generator.rs
+++ b/core/node/node_framework/src/implementations/layers/commitment_generator.rs
@@ -1,8 +1,7 @@
-use zksync_commitment_generator::{
-    input_generation::{InputGenerator, RollupInputGenerator, ValidiumInputGenerator},
-    CommitmentGenerator,
-};
-use zksync_config::configs::chain::L1BatchCommitDataGeneratorMode;
+use std::num::NonZero;
+
+use zksync_commitment_generator::CommitmentGenerator;
+use zksync_types::commitment::L1BatchCommitmentMode;
 
 use crate::{
     implementations::resources::{
@@ -10,24 +9,39 @@ use crate::{
         pools::{MasterPool, PoolResource},
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for l1 batches commitment generation
+///
+/// Responsible for initialization and running [`CommitmentGenerator`].
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds tasks
+///
+/// - `CommitmentGeneratorTask`
+#[derive(Debug)]
 pub struct CommitmentGeneratorLayer {
-    input_generator: Box<dyn InputGenerator>,
+    mode: L1BatchCommitmentMode,
+    max_parallelism: Option<NonZero<u32>>,
 }
 
 impl CommitmentGeneratorLayer {
-    pub fn new(commit_data_generator_mode: L1BatchCommitDataGeneratorMode) -> Self {
-        let input_generator: Box<dyn InputGenerator> =
-            if commit_data_generator_mode == L1BatchCommitDataGeneratorMode::Validium {
-                Box::new(ValidiumInputGenerator)
-            } else {
-                Box::new(RollupInputGenerator)
-            };
+    pub fn new(mode: L1BatchCommitmentMode) -> Self {
+        Self {
+            mode,
+            max_parallelism: None,
+        }
+    }
 
-        Self { input_generator }
+    pub fn with_max_parallelism(mut self, max_parallelism: Option<NonZero<u32>>) -> Self {
+        self.max_parallelism = max_parallelism;
+        self
     }
 }
 
@@ -38,19 +52,27 @@ impl WiringLayer for CommitmentGeneratorLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let pool_resource = context.get_resource::<PoolResource<MasterPool>>().await?;
-        let main_pool = pool_resource.get().await.unwrap();
+        let pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
+
+        let pool_size = self
+            .max_parallelism
+            .unwrap_or(CommitmentGenerator::default_parallelism())
+            .get();
+        let main_pool = pool_resource.get_custom(pool_size).await?;
 
-        let commitment_generator = CommitmentGenerator::new(main_pool, self.input_generator);
+        let mut commitment_generator = CommitmentGenerator::new(main_pool, self.mode);
+        if let Some(max_parallelism) = self.max_parallelism {
+            commitment_generator.set_max_parallelism(max_parallelism);
+        }
 
-        let AppHealthCheckResource(app_health) = context.get_resource_or_default().await;
+        let AppHealthCheckResource(app_health) = context.get_resource_or_default();
         app_health
             .insert_component(commitment_generator.health_check())
             .map_err(WiringError::internal)?;
 
-        context.add_task(Box::new(CommitmentGeneratorTask {
+        context.add_task(CommitmentGeneratorTask {
             commitment_generator,
-        }));
+        });
 
         Ok(())
     }
@@ -63,8 +85,8 @@ struct CommitmentGeneratorTask {
 
 #[async_trait::async_trait]
 impl Task for CommitmentGeneratorTask {
-    fn name(&self) -> &'static str {
-        "commitment_generator"
+    fn id(&self) -> TaskId {
+        "commitment_generator".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
diff --git a/core/node/node_framework/src/implementations/layers/consensus.rs b/core/node/node_framework/src/implementations/layers/consensus.rs
index 9a45da43e121..d1d7fa3b7de1 100644
--- a/core/node/node_framework/src/implementations/layers/consensus.rs
+++ b/core/node/node_framework/src/implementations/layers/consensus.rs
@@ -1,13 +1,10 @@
 use anyhow::Context as _;
 use zksync_concurrency::{ctx, scope};
 use zksync_config::configs::consensus::{ConsensusConfig, ConsensusSecrets};
-use zksync_core::{
-    consensus::{self, MainNodeConfig},
-    sync_layer::{ActionQueueSender, SyncState},
-};
 use zksync_dal::{ConnectionPool, Core};
-use zksync_types::L2ChainId;
-use zksync_web3_decl::client::BoxedL2Client;
+use zksync_node_consensus as consensus;
+use zksync_node_sync::{ActionQueueSender, SyncState};
+use zksync_web3_decl::client::{DynClient, L2};
 
 use crate::{
     implementations::resources::{
@@ -17,7 +14,7 @@ use crate::{
         sync_state::SyncStateResource,
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
@@ -27,12 +24,25 @@ pub enum Mode {
     External,
 }
 
+/// Wiring layer for consensus component.
+/// Can work in either "main" or "external" mode.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `MainNodeClientResource` (if `Mode::External`)
+/// - `SyncStateResource` (if `Mode::External`)
+/// - `ActionQueueSenderResource` (if `Mode::External`)
+///
+/// ## Adds tasks
+///
+/// - `MainNodeConsensusTask` (if `Mode::Main`)
+/// - `ExternalNodeTask` (if `Mode::External`)
 #[derive(Debug)]
 pub struct ConsensusLayer {
     pub mode: Mode,
     pub config: Option<ConsensusConfig>,
     pub secrets: Option<ConsensusSecrets>,
-    pub chain_id: L2ChainId,
 }
 
 #[async_trait::async_trait]
@@ -43,8 +53,7 @@ impl WiringLayer for ConsensusLayer {
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
         let pool = context
-            .get_resource::<PoolResource<MasterPool>>()
-            .await?
+            .get_resource::<PoolResource<MasterPool>>()?
             .get()
             .await?;
 
@@ -56,22 +65,18 @@ impl WiringLayer for ConsensusLayer {
                 let secrets = self.secrets.ok_or_else(|| {
                     WiringError::Configuration("Missing private consensus config".to_string())
                 })?;
-
-                let main_node_config =
-                    consensus::config::main_node(&config, &secrets, self.chain_id)?;
-
                 let task = MainNodeConsensusTask {
-                    config: main_node_config,
+                    config,
+                    secrets,
                     pool,
                 };
-                context.add_task(Box::new(task));
+                context.add_task(task);
             }
             Mode::External => {
-                let main_node_client = context.get_resource::<MainNodeClientResource>().await?.0;
-                let sync_state = context.get_resource::<SyncStateResource>().await?.0;
+                let main_node_client = context.get_resource::<MainNodeClientResource>()?.0;
+                let sync_state = context.get_resource::<SyncStateResource>()?.0;
                 let action_queue_sender = context
-                    .get_resource::<ActionQueueSenderResource>()
-                    .await?
+                    .get_resource::<ActionQueueSenderResource>()?
                     .0
                     .take()
                     .ok_or_else(|| {
@@ -94,14 +99,14 @@ impl WiringLayer for ConsensusLayer {
                     }
                 };
 
-                let task = FetcherTask {
+                let task = ExternalNodeTask {
                     config,
                     pool,
                     main_node_client,
                     sync_state,
                     action_queue_sender,
                 };
-                context.add_task(Box::new(task));
+                context.add_task(task);
             }
         }
         Ok(())
@@ -110,26 +115,32 @@ impl WiringLayer for ConsensusLayer {
 
 #[derive(Debug)]
 pub struct MainNodeConsensusTask {
-    config: MainNodeConfig,
+    config: ConsensusConfig,
+    secrets: ConsensusSecrets,
     pool: ConnectionPool<Core>,
 }
 
 #[async_trait::async_trait]
 impl Task for MainNodeConsensusTask {
-    fn name(&self) -> &'static str {
-        "consensus"
+    fn id(&self) -> TaskId {
+        "consensus".into()
     }
 
     async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
         // We instantiate the root context here, since the consensus task is the only user of the
-        // structured concurrency framework (`MainNodeConsensusTask` and `FetcherTask` are considered mutually
+        // structured concurrency framework (`MainNodeConsensusTask` and `ExternalNodeTask` are considered mutually
         // exclusive).
         // Note, however, that awaiting for the `stop_receiver` is related to the root context behavior,
         // not the consensus task itself. There may have been any number of tasks running in the root context,
         // but we only need to wait for stop signal once, and it will be propagated to all child contexts.
         let root_ctx = ctx::root();
         scope::run!(&root_ctx, |ctx, s| async move {
-            s.spawn_bg(consensus::era::run_main_node(ctx, self.config, self.pool));
+            s.spawn_bg(consensus::era::run_main_node(
+                ctx,
+                self.config,
+                self.secrets,
+                self.pool,
+            ));
             let _ = stop_receiver.0.wait_for(|stop| *stop).await?;
             Ok(())
         })
@@ -138,38 +149,38 @@ impl Task for MainNodeConsensusTask {
 }
 
 #[derive(Debug)]
-pub struct FetcherTask {
+pub struct ExternalNodeTask {
     config: Option<(ConsensusConfig, ConsensusSecrets)>,
     pool: ConnectionPool<Core>,
-    main_node_client: BoxedL2Client,
+    main_node_client: Box<DynClient<L2>>,
     sync_state: SyncState,
     action_queue_sender: ActionQueueSender,
 }
 
 #[async_trait::async_trait]
-impl Task for FetcherTask {
-    fn name(&self) -> &'static str {
-        "consensus_fetcher"
+impl Task for ExternalNodeTask {
+    fn id(&self) -> TaskId {
+        "consensus_fetcher".into()
     }
 
     async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
         // We instantiate the root context here, since the consensus task is the only user of the
-        // structured concurrency framework (`MainNodeConsensusTask` and `FetcherTask` are considered mutually
+        // structured concurrency framework (`MainNodeConsensusTask` and `ExternalNodeTask` are considered mutually
         // exclusive).
         // Note, however, that awaiting for the `stop_receiver` is related to the root context behavior,
         // not the consensus task itself. There may have been any number of tasks running in the root context,
         // but we only need to wait for stop signal once, and it will be propagated to all child contexts.
         let root_ctx = ctx::root();
         scope::run!(&root_ctx, |ctx, s| async {
-            s.spawn_bg(zksync_core::consensus::era::run_fetcher(
-                &root_ctx,
+            s.spawn_bg(consensus::era::run_external_node(
+                ctx,
                 self.config,
                 self.pool,
                 self.sync_state,
                 self.main_node_client,
                 self.action_queue_sender,
             ));
-            ctx.wait(stop_receiver.0.wait_for(|stop| *stop)).await??;
+            let _ = stop_receiver.0.wait_for(|stop| *stop).await?;
             Ok(())
         })
         .await
diff --git a/core/node/node_framework/src/implementations/layers/consistency_checker.rs b/core/node/node_framework/src/implementations/layers/consistency_checker.rs
index 43afeaca47bd..d9b5582f76b7 100644
--- a/core/node/node_framework/src/implementations/layers/consistency_checker.rs
+++ b/core/node/node_framework/src/implementations/layers/consistency_checker.rs
@@ -1,32 +1,45 @@
-use zksync_core::consistency_checker::ConsistencyChecker;
-use zksync_types::Address;
+use zksync_consistency_checker::ConsistencyChecker;
+use zksync_types::{commitment::L1BatchCommitmentMode, Address};
 
 use crate::{
     implementations::resources::{
         eth_interface::EthInterfaceResource,
         healthcheck::AppHealthCheckResource,
-        l1_batch_commit_data_generator::L1BatchCommitDataGeneratorResource,
         pools::{MasterPool, PoolResource},
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for the `ConsistencyChecker` (used by the external node).
+///
+/// ## Requests resources
+///
+/// - `EthInterfaceResource`
+/// - `PoolResource<MasterPool>`
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds tasks
+///
+/// - `ConsistencyChecker`
 #[derive(Debug)]
 pub struct ConsistencyCheckerLayer {
     diamond_proxy_addr: Address,
     max_batches_to_recheck: u32,
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 impl ConsistencyCheckerLayer {
     pub fn new(
         diamond_proxy_addr: Address,
         max_batches_to_recheck: u32,
+        commitment_mode: L1BatchCommitmentMode,
     ) -> ConsistencyCheckerLayer {
         Self {
             diamond_proxy_addr,
             max_batches_to_recheck,
+            commitment_mode,
         }
     }
 }
@@ -39,50 +52,39 @@ impl WiringLayer for ConsistencyCheckerLayer {
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
         // Get resources.
-        let l1_client = context.get_resource::<EthInterfaceResource>().await?.0;
+        let l1_client = context.get_resource::<EthInterfaceResource>()?.0;
 
-        let pool_resource = context.get_resource::<PoolResource<MasterPool>>().await?;
+        let pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
         let singleton_pool = pool_resource.get_singleton().await?;
 
-        let l1_batch_commit_data_generator = context
-            .get_resource::<L1BatchCommitDataGeneratorResource>()
-            .await?
-            .0;
-
         let consistency_checker = ConsistencyChecker::new(
             l1_client,
             self.max_batches_to_recheck,
             singleton_pool,
-            l1_batch_commit_data_generator,
+            self.commitment_mode,
         )
         .map_err(WiringError::Internal)?
         .with_diamond_proxy_addr(self.diamond_proxy_addr);
 
-        let AppHealthCheckResource(app_health) = context.get_resource_or_default().await;
+        let AppHealthCheckResource(app_health) = context.get_resource_or_default();
         app_health
             .insert_component(consistency_checker.health_check().clone())
             .map_err(WiringError::internal)?;
 
         // Create and add tasks.
-        context.add_task(Box::new(ConsistencyCheckerTask {
-            consistency_checker,
-        }));
+        context.add_task(consistency_checker);
 
         Ok(())
     }
 }
 
-pub struct ConsistencyCheckerTask {
-    consistency_checker: ConsistencyChecker,
-}
-
 #[async_trait::async_trait]
-impl Task for ConsistencyCheckerTask {
-    fn name(&self) -> &'static str {
-        "consistency_checker"
+impl Task for ConsistencyChecker {
+    fn id(&self) -> TaskId {
+        "consistency_checker".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        self.consistency_checker.run(stop_receiver.0).await
+        (*self).run(stop_receiver.0).await
     }
 }
diff --git a/core/node/node_framework/src/implementations/layers/contract_verification_api.rs b/core/node/node_framework/src/implementations/layers/contract_verification_api.rs
index 879cb7d616a5..94264fc27411 100644
--- a/core/node/node_framework/src/implementations/layers/contract_verification_api.rs
+++ b/core/node/node_framework/src/implementations/layers/contract_verification_api.rs
@@ -4,10 +4,22 @@ use zksync_dal::{ConnectionPool, Core};
 use crate::{
     implementations::resources::pools::{MasterPool, PoolResource, ReplicaPool},
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for contract verification
+///
+/// Responsible for initialization of the contract verification server.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `PoolResource<ReplicaPool>`
+///
+/// ## Adds tasks
+///
+/// - `ContractVerificationApiTask`
 #[derive(Debug)]
 pub struct ContractVerificationApiLayer(pub ContractVerifierConfig);
 
@@ -19,20 +31,18 @@ impl WiringLayer for ContractVerificationApiLayer {
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
         let master_pool = context
-            .get_resource::<PoolResource<MasterPool>>()
-            .await?
+            .get_resource::<PoolResource<MasterPool>>()?
             .get()
             .await?;
         let replica_pool = context
-            .get_resource::<PoolResource<ReplicaPool>>()
-            .await?
+            .get_resource::<PoolResource<ReplicaPool>>()?
             .get()
             .await?;
-        context.add_task(Box::new(ContractVerificationApiTask {
+        context.add_task(ContractVerificationApiTask {
             master_pool,
             replica_pool,
             config: self.0,
-        }));
+        });
         Ok(())
     }
 }
@@ -46,12 +56,12 @@ pub struct ContractVerificationApiTask {
 
 #[async_trait::async_trait]
 impl Task for ContractVerificationApiTask {
-    fn name(&self) -> &'static str {
-        "contract_verification_api"
+    fn id(&self) -> TaskId {
+        "contract_verification_api".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        zksync_core::api_server::contract_verification::start_server(
+        zksync_contract_verification_server::start_server(
             self.master_pool,
             self.replica_pool,
             self.config,
diff --git a/core/node/node_framework/src/implementations/layers/da_dispatcher.rs b/core/node/node_framework/src/implementations/layers/da_dispatcher.rs
new file mode 100644
index 000000000000..d1ba66b6ddd3
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/da_dispatcher.rs
@@ -0,0 +1,70 @@
+use zksync_config::configs::{chain::StateKeeperConfig, da_dispatcher::DADispatcherConfig};
+use zksync_da_dispatcher::DataAvailabilityDispatcher;
+
+use crate::{
+    implementations::resources::{
+        da_client::DAClientResource,
+        pools::{MasterPool, PoolResource},
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// A layer that wires the data availability dispatcher task.
+#[derive(Debug)]
+pub struct DataAvailabilityDispatcherLayer {
+    state_keeper_config: StateKeeperConfig,
+    da_config: DADispatcherConfig,
+}
+
+impl DataAvailabilityDispatcherLayer {
+    pub fn new(state_keeper_config: StateKeeperConfig, da_config: DADispatcherConfig) -> Self {
+        Self {
+            state_keeper_config,
+            da_config,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for DataAvailabilityDispatcherLayer {
+    fn layer_name(&self) -> &'static str {
+        "da_dispatcher_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let master_pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
+        // A pool with size 2 is used here because there are 2 functions within a task that execute in parallel
+        let master_pool = master_pool_resource.get_custom(2).await?;
+        let da_client = context.get_resource::<DAClientResource>()?.0;
+
+        if let Some(limit) = da_client.blob_size_limit() {
+            if self.state_keeper_config.max_pubdata_per_batch > limit as u64 {
+                return Err(WiringError::Configuration(format!(
+                    "Max pubdata per batch is greater than the blob size limit: {} > {}",
+                    self.state_keeper_config.max_pubdata_per_batch, limit
+                )));
+            }
+        }
+
+        context.add_task(DataAvailabilityDispatcher::new(
+            master_pool,
+            self.da_config,
+            da_client,
+        ));
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for DataAvailabilityDispatcher {
+    fn id(&self) -> TaskId {
+        "da_dispatcher".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run(stop_receiver.0).await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/eth_sender.rs b/core/node/node_framework/src/implementations/layers/eth_sender.rs
index a7d2cdf272ac..6a9c0894b432 100644
--- a/core/node/node_framework/src/implementations/layers/eth_sender.rs
+++ b/core/node/node_framework/src/implementations/layers/eth_sender.rs
@@ -1,20 +1,9 @@
-use std::sync::Arc;
-
 use anyhow::Context;
 use zksync_circuit_breaker::l1_txs::FailedL1TransactionChecker;
-use zksync_config::configs::{
-    chain::{L1BatchCommitDataGeneratorMode, NetworkConfig},
-    eth_sender::EthConfig,
-    ContractsConfig,
-};
+use zksync_config::configs::{eth_sender::EthConfig, ContractsConfig};
 use zksync_eth_client::BoundEthInterface;
-use zksync_eth_sender::{
-    l1_batch_commit_data_generator::{
-        L1BatchCommitDataGenerator, RollupModeL1BatchCommitDataGenerator,
-        ValidiumModeL1BatchCommitDataGenerator,
-    },
-    Aggregator, EthTxAggregator, EthTxManager,
-};
+use zksync_eth_sender::{Aggregator, EthTxAggregator, EthTxManager};
+use zksync_types::{commitment::L1BatchCommitmentMode, L2ChainId};
 
 use crate::{
     implementations::resources::{
@@ -25,79 +14,156 @@ use crate::{
         pools::{MasterPool, PoolResource, ReplicaPool},
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for `eth_txs` managing
+///
+/// Responsible for initialization and running [`EthTxManager`] component, that manages sending
+/// of `eth_txs`(such as `CommitBlocks`, `PublishProofBlocksOnchain` or `ExecuteBlock` ) to L1.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `PoolResource<ReplicaPool>`
+/// - `BoundEthInterfaceResource`
+/// - `BoundEthInterfaceForBlobsResource` (optional)
+/// - `L1TxParamsResource`
+/// - `CircuitBreakersResource` (adds a circuit breaker)
+///
+/// ## Adds tasks
+///
+/// - `EthTxManager`
 #[derive(Debug)]
-pub struct EthSenderLayer {
+pub struct EthTxManagerLayer {
+    eth_sender_config: EthConfig,
+}
+
+impl EthTxManagerLayer {
+    pub fn new(eth_sender_config: EthConfig) -> Self {
+        Self { eth_sender_config }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for EthTxManagerLayer {
+    fn layer_name(&self) -> &'static str {
+        "eth_tx_manager_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        // Get resources.
+        let master_pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
+        let master_pool = master_pool_resource.get().await.unwrap();
+        let replica_pool_resource = context.get_resource::<PoolResource<ReplicaPool>>()?;
+        let replica_pool = replica_pool_resource.get().await.unwrap();
+
+        let eth_client = context.get_resource::<BoundEthInterfaceResource>()?.0;
+        let eth_client_blobs = match context.get_resource::<BoundEthInterfaceForBlobsResource>() {
+            Ok(BoundEthInterfaceForBlobsResource(client)) => Some(client),
+            Err(WiringError::ResourceLacking { .. }) => None,
+            Err(err) => return Err(err),
+        };
+
+        let config = self.eth_sender_config.sender.context("sender")?;
+
+        let gas_adjuster = context.get_resource::<L1TxParamsResource>()?.0;
+
+        let eth_tx_manager_actor = EthTxManager::new(
+            master_pool,
+            config,
+            gas_adjuster,
+            eth_client,
+            eth_client_blobs,
+        );
+
+        context.add_task(eth_tx_manager_actor);
+
+        // Insert circuit breaker.
+        let CircuitBreakersResource { breakers } = context.get_resource_or_default();
+        breakers
+            .insert(Box::new(FailedL1TransactionChecker { pool: replica_pool }))
+            .await;
+
+        Ok(())
+    }
+}
+
+/// Wiring layer for aggregating l1 batches into `eth_txs`
+///
+/// Responsible for initialization and running of [`EthTxAggregator`], that aggregates L1 batches
+/// into `eth_txs`(such as `CommitBlocks`, `PublishProofBlocksOnchain` or `ExecuteBlock`).
+/// These `eth_txs` will be used as a queue for generating signed txs and will be sent later on L1.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `PoolResource<ReplicaPool>`
+/// - `BoundEthInterfaceResource`
+/// - `BoundEthInterfaceForBlobsResource` (optional)
+/// - `ObjectStoreResource`
+/// - `CircuitBreakersResource` (adds a circuit breaker)
+///
+/// ## Adds tasks
+///
+/// - `EthTxAggregator`
+#[derive(Debug)]
+pub struct EthTxAggregatorLayer {
     eth_sender_config: EthConfig,
     contracts_config: ContractsConfig,
-    network_config: NetworkConfig,
-    l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+    zksync_network_id: L2ChainId,
+    l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
 }
 
-impl EthSenderLayer {
+impl EthTxAggregatorLayer {
     pub fn new(
         eth_sender_config: EthConfig,
         contracts_config: ContractsConfig,
-        network_config: NetworkConfig,
-        l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+        zksync_network_id: L2ChainId,
+        l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
     ) -> Self {
         Self {
             eth_sender_config,
             contracts_config,
-            network_config,
+            zksync_network_id,
             l1_batch_commit_data_generator_mode,
         }
     }
 }
 
 #[async_trait::async_trait]
-impl WiringLayer for EthSenderLayer {
+impl WiringLayer for EthTxAggregatorLayer {
     fn layer_name(&self) -> &'static str {
-        "eth_sender_layer"
+        "eth_tx_aggregator_layer"
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
         // Get resources.
-        let master_pool_resource = context.get_resource::<PoolResource<MasterPool>>().await?;
+        let master_pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
         let master_pool = master_pool_resource.get().await.unwrap();
-        let replica_pool_resource = context.get_resource::<PoolResource<ReplicaPool>>().await?;
+        let replica_pool_resource = context.get_resource::<PoolResource<ReplicaPool>>()?;
         let replica_pool = replica_pool_resource.get().await.unwrap();
 
-        let eth_client = context.get_resource::<BoundEthInterfaceResource>().await?.0;
-        let eth_client_blobs = match context
-            .get_resource::<BoundEthInterfaceForBlobsResource>()
-            .await
-        {
+        let eth_client = context.get_resource::<BoundEthInterfaceResource>()?.0;
+        let eth_client_blobs = match context.get_resource::<BoundEthInterfaceForBlobsResource>() {
             Ok(BoundEthInterfaceForBlobsResource(client)) => Some(client),
             Err(WiringError::ResourceLacking { .. }) => None,
             Err(err) => return Err(err),
         };
-        let object_store = context.get_resource::<ObjectStoreResource>().await?.0;
+        let object_store = context.get_resource::<ObjectStoreResource>()?.0;
 
         // Create and add tasks.
         let eth_client_blobs_addr = eth_client_blobs
             .as_deref()
             .map(BoundEthInterface::sender_account);
 
-        let l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator> =
-            match self.l1_batch_commit_data_generator_mode {
-                L1BatchCommitDataGeneratorMode::Rollup => {
-                    Arc::new(RollupModeL1BatchCommitDataGenerator {})
-                }
-                L1BatchCommitDataGeneratorMode::Validium => {
-                    Arc::new(ValidiumModeL1BatchCommitDataGenerator {})
-                }
-            };
-
         let config = self.eth_sender_config.sender.context("sender")?;
         let aggregator = Aggregator::new(
             config.clone(),
             object_store,
             eth_client_blobs_addr.is_some(),
-            l1_batch_commit_data_generator.clone(),
+            self.l1_batch_commit_data_generator_mode,
         );
 
         let eth_tx_aggregator_actor = EthTxAggregator::new(
@@ -108,32 +174,15 @@ impl WiringLayer for EthSenderLayer {
             self.contracts_config.validator_timelock_addr,
             self.contracts_config.l1_multicall3_addr,
             self.contracts_config.diamond_proxy_addr,
-            self.network_config.zksync_network_id,
+            self.zksync_network_id,
             eth_client_blobs_addr,
-            l1_batch_commit_data_generator,
         )
         .await;
 
-        context.add_task(Box::new(EthTxAggregatorTask {
-            eth_tx_aggregator_actor,
-        }));
-
-        let gas_adjuster = context.get_resource::<L1TxParamsResource>().await?.0;
-
-        let eth_tx_manager_actor = EthTxManager::new(
-            master_pool,
-            config,
-            gas_adjuster,
-            eth_client,
-            eth_client_blobs,
-        );
-
-        context.add_task(Box::new(EthTxManagerTask {
-            eth_tx_manager_actor,
-        }));
+        context.add_task(eth_tx_aggregator_actor);
 
         // Insert circuit breaker.
-        let CircuitBreakersResource { breakers } = context.get_resource_or_default().await;
+        let CircuitBreakersResource { breakers } = context.get_resource_or_default();
         breakers
             .insert(Box::new(FailedL1TransactionChecker { pool: replica_pool }))
             .await;
@@ -142,34 +191,24 @@ impl WiringLayer for EthSenderLayer {
     }
 }
 
-#[derive(Debug)]
-struct EthTxAggregatorTask {
-    eth_tx_aggregator_actor: EthTxAggregator,
-}
-
 #[async_trait::async_trait]
-impl Task for EthTxAggregatorTask {
-    fn name(&self) -> &'static str {
-        "eth_tx_aggregator"
+impl Task for EthTxAggregator {
+    fn id(&self) -> TaskId {
+        "eth_tx_aggregator".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        self.eth_tx_aggregator_actor.run(stop_receiver.0).await
+        (*self).run(stop_receiver.0).await
     }
 }
 
-#[derive(Debug)]
-struct EthTxManagerTask {
-    eth_tx_manager_actor: EthTxManager,
-}
-
 #[async_trait::async_trait]
-impl Task for EthTxManagerTask {
-    fn name(&self) -> &'static str {
-        "eth_tx_manager"
+impl Task for EthTxManager {
+    fn id(&self) -> TaskId {
+        "eth_tx_manager".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        self.eth_tx_manager_actor.run(stop_receiver.0).await
+        (*self).run(stop_receiver.0).await
     }
 }
diff --git a/core/node/node_framework/src/implementations/layers/eth_watch.rs b/core/node/node_framework/src/implementations/layers/eth_watch.rs
index 167e59a48691..8c7fe4269586 100644
--- a/core/node/node_framework/src/implementations/layers/eth_watch.rs
+++ b/core/node/node_framework/src/implementations/layers/eth_watch.rs
@@ -12,10 +12,23 @@ use crate::{
         pools::{MasterPool, PoolResource},
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for ethereum watcher
+///
+/// Responsible for initializing and running of [`EthWatch`] component, that polls the Ethereum node for the relevant events,
+/// such as priority operations (aka L1 transactions), protocol upgrades etc.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `EthInterfaceResource`
+///
+/// ## Adds tasks
+///
+/// - `EthWatchTask`
 #[derive(Debug)]
 pub struct EthWatchLayer {
     eth_watch_config: EthWatchConfig,
@@ -38,16 +51,10 @@ impl WiringLayer for EthWatchLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let pool_resource = context.get_resource::<PoolResource<MasterPool>>().await?;
+        let pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
         let main_pool = pool_resource.get().await.unwrap();
 
-        let client = context.get_resource::<EthInterfaceResource>().await?.0;
-
-        let state_transition_manager_address = self
-            .contracts_config
-            .ecosystem_contracts
-            .as_ref()
-            .map(|a| a.state_transition_proxy_addr);
+        let client = context.get_resource::<EthInterfaceResource>()?.0;
 
         let eth_client = EthHttpQueryClient::new(
             client,
@@ -58,14 +65,13 @@ impl WiringLayer for EthWatchLayer {
             self.contracts_config.governance_addr,
             self.eth_watch_config.confirmations_for_eth_event,
         );
-        context.add_task(Box::new(EthWatchTask {
+        context.add_task(EthWatchTask {
             main_pool,
             client: eth_client,
             governance_contract: governance_contract(),
-            state_transition_manager_address,
             diamond_proxy_address: self.contracts_config.diamond_proxy_addr,
             poll_interval: self.eth_watch_config.poll_interval(),
-        }));
+        });
 
         Ok(())
     }
@@ -76,21 +82,19 @@ struct EthWatchTask {
     main_pool: ConnectionPool<Core>,
     client: EthHttpQueryClient,
     governance_contract: Contract,
-    state_transition_manager_address: Option<Address>,
     diamond_proxy_address: Address,
     poll_interval: Duration,
 }
 
 #[async_trait::async_trait]
 impl Task for EthWatchTask {
-    fn name(&self) -> &'static str {
-        "eth_watch"
+    fn id(&self) -> TaskId {
+        "eth_watch".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
         let eth_watch = EthWatch::new(
             self.diamond_proxy_address,
-            self.state_transition_manager_address,
             &self.governance_contract,
             Box::new(self.client),
             self.main_pool,
diff --git a/core/node/node_framework/src/implementations/layers/healtcheck_server.rs b/core/node/node_framework/src/implementations/layers/healtcheck_server.rs
index 0c6a9b38dfa6..126b7c0a2d4d 100644
--- a/core/node/node_framework/src/implementations/layers/healtcheck_server.rs
+++ b/core/node/node_framework/src/implementations/layers/healtcheck_server.rs
@@ -1,27 +1,29 @@
 use std::sync::Arc;
 
 use zksync_config::configs::api::HealthCheckConfig;
-use zksync_core::api_server::healthcheck::HealthCheckHandle;
 use zksync_health_check::AppHealthCheck;
+use zksync_node_api_server::healthcheck::HealthCheckHandle;
 
 use crate::{
     implementations::resources::healthcheck::AppHealthCheckResource,
     service::{ServiceContext, StopReceiver},
-    task::UnconstrainedTask,
+    task::{Task, TaskId, TaskKind},
     wiring_layer::{WiringError, WiringLayer},
 };
 
-/// Builder for a health check server.
+/// Wiring layer for health check server
 ///
-/// Spawned task collects all the health checks added by different tasks to the
-/// corresponding resource collection and spawns an HTTP server exposing them.
+/// Expects other layers to insert different components' health checks
+/// into [`AppHealthCheck`] aggregating heath using [`AppHealthCheckResource`].
+/// The added task spawns a health check server that only exposes the state provided by other tasks.
 ///
-/// This layer expects other tasks to add health checks to the `ResourceCollection<HealthCheckResource>`.
+/// ## Requests resources
 ///
-/// ## Effects
+/// - `AppHealthCheckResource`
 ///
-/// - Resolves `ResourceCollection<HealthCheckResource>`.
-/// - Adds `healthcheck_server` to the node.
+/// ## Adds tasks
+///
+/// - `HealthCheckTask`
 #[derive(Debug)]
 pub struct HealthCheckLayer(pub HealthCheckConfig);
 
@@ -32,15 +34,14 @@ impl WiringLayer for HealthCheckLayer {
     }
 
     async fn wire(self: Box<Self>, mut node: ServiceContext<'_>) -> Result<(), WiringError> {
-        let AppHealthCheckResource(app_health_check) = node.get_resource_or_default().await;
+        let AppHealthCheckResource(app_health_check) = node.get_resource_or_default();
 
         let task = HealthCheckTask {
             config: self.0,
             app_health_check,
         };
 
-        // Healthcheck server only exposes the state provided by other tasks, and also it has to start as soon as possible.
-        node.add_unconstrained_task(Box::new(task));
+        node.add_task(task);
         Ok(())
     }
 }
@@ -52,15 +53,16 @@ struct HealthCheckTask {
 }
 
 #[async_trait::async_trait]
-impl UnconstrainedTask for HealthCheckTask {
-    fn name(&self) -> &'static str {
-        "healthcheck_server"
+impl Task for HealthCheckTask {
+    fn kind(&self) -> TaskKind {
+        TaskKind::UnconstrainedTask
+    }
+
+    fn id(&self) -> TaskId {
+        "healthcheck_server".into()
     }
 
-    async fn run_unconstrained(
-        mut self: Box<Self>,
-        mut stop_receiver: StopReceiver,
-    ) -> anyhow::Result<()> {
+    async fn run(mut self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
         let handle =
             HealthCheckHandle::spawn_server(self.config.bind_addr(), self.app_health_check.clone());
         stop_receiver.0.changed().await?;
diff --git a/core/node/node_framework/src/implementations/layers/house_keeper.rs b/core/node/node_framework/src/implementations/layers/house_keeper.rs
index cf0e4954b320..f14a01587f71 100644
--- a/core/node/node_framework/src/implementations/layers/house_keeper.rs
+++ b/core/node/node_framework/src/implementations/layers/house_keeper.rs
@@ -1,32 +1,45 @@
-use std::time::Duration;
-
 use zksync_config::configs::{
     fri_prover_group::FriProverGroupConfig, house_keeper::HouseKeeperConfig,
     FriProofCompressorConfig, FriProverConfig, FriWitnessGeneratorConfig,
 };
-use zksync_dal::{metrics::PostgresMetrics, ConnectionPool, Core};
 use zksync_house_keeper::{
-    blocks_state_reporter::L1BatchMetricsReporter, fri_gpu_prover_archiver::FriGpuProverArchiver,
-    fri_proof_compressor_job_retry_manager::FriProofCompressorJobRetryManager,
-    fri_proof_compressor_queue_monitor::FriProofCompressorStatsReporter,
-    fri_prover_job_retry_manager::FriProverJobRetryManager,
-    fri_prover_jobs_archiver::FriProverJobArchiver,
-    fri_prover_queue_monitor::FriProverStatsReporter,
-    fri_witness_generator_jobs_retry_manager::FriWitnessGeneratorJobRetryManager,
-    fri_witness_generator_queue_monitor::FriWitnessGeneratorStatsReporter,
+    blocks_state_reporter::L1BatchMetricsReporter,
     periodic_job::PeriodicJob,
-    waiting_to_queued_fri_witness_job_mover::WaitingToQueuedFriWitnessJobMover,
+    prover::{
+        FriGpuProverArchiver, FriProofCompressorJobRetryManager, FriProofCompressorQueueReporter,
+        FriProverJobRetryManager, FriProverJobsArchiver, FriProverQueueReporter,
+        FriWitnessGeneratorJobRetryManager, FriWitnessGeneratorQueueReporter,
+        WaitingToQueuedFriWitnessJobMover,
+    },
 };
 
 use crate::{
     implementations::resources::pools::{PoolResource, ProverPool, ReplicaPool},
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
-const SCRAPE_INTERVAL: Duration = Duration::from_secs(60);
-
+/// Wiring layer for `HouseKeeper` - a component responsible for managing prover jobs
+/// and auxiliary server activities.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<ReplicaPool>`
+/// - `PoolResource<ProverPool>`
+///
+/// ## Adds tasks
+///
+/// - `L1BatchMetricsReporterTask`
+/// - `FriProverJobRetryManagerTask`
+/// - `FriWitnessGeneratorJobRetryManagerTask`
+/// - `WaitingToQueuedFriWitnessJobMoverTask`
+/// - `FriProverJobArchiverTask`
+/// - `FriProverGpuArchiverTask`
+/// - `FriWitnessGeneratorStatsReporterTask`
+/// - `FriProverStatsReporterTask`
+/// - `FriProofCompressorStatsReporterTask`
+/// - `FriProofCompressorJobRetryManagerTask`
 #[derive(Debug)]
 pub struct HouseKeeperLayer {
     house_keeper_config: HouseKeeperConfig,
@@ -61,25 +74,22 @@ impl WiringLayer for HouseKeeperLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        // initialize resources
-        let replica_pool_resource = context.get_resource::<PoolResource<ReplicaPool>>().await?;
+        // Initialize resources
+        let replica_pool_resource = context.get_resource::<PoolResource<ReplicaPool>>()?;
         let replica_pool = replica_pool_resource.get().await?;
 
-        let prover_pool_resource = context.get_resource::<PoolResource<ProverPool>>().await?;
+        let prover_pool_resource = context.get_resource::<PoolResource<ProverPool>>()?;
         let prover_pool = prover_pool_resource.get().await?;
 
-        // initialize and add tasks
-        let pool_for_metrics = replica_pool_resource.get_singleton().await?;
-        context.add_task(Box::new(PostgresMetricsScrapingTask { pool_for_metrics }));
-
+        // Initialize and add tasks
         let l1_batch_metrics_reporter = L1BatchMetricsReporter::new(
             self.house_keeper_config
                 .l1_batch_metrics_reporting_interval_ms,
             replica_pool.clone(),
         );
-        context.add_task(Box::new(L1BatchMetricsReporterTask {
+        context.add_task(L1BatchMetricsReporterTask {
             l1_batch_metrics_reporter,
-        }));
+        });
 
         let fri_prover_job_retry_manager = FriProverJobRetryManager::new(
             self.fri_prover_config.max_attempts,
@@ -87,9 +97,9 @@ impl WiringLayer for HouseKeeperLayer {
             self.house_keeper_config.prover_job_retrying_interval_ms,
             prover_pool.clone(),
         );
-        context.add_task(Box::new(FriProverJobRetryManagerTask {
+        context.add_task(FriProverJobRetryManagerTask {
             fri_prover_job_retry_manager,
-        }));
+        });
 
         let fri_witness_gen_job_retry_manager = FriWitnessGeneratorJobRetryManager::new(
             self.fri_witness_generator_config.max_attempts,
@@ -99,26 +109,26 @@ impl WiringLayer for HouseKeeperLayer {
                 .witness_generator_job_retrying_interval_ms,
             prover_pool.clone(),
         );
-        context.add_task(Box::new(FriWitnessGeneratorJobRetryManagerTask {
+        context.add_task(FriWitnessGeneratorJobRetryManagerTask {
             fri_witness_gen_job_retry_manager,
-        }));
+        });
 
         let waiting_to_queued_fri_witness_job_mover = WaitingToQueuedFriWitnessJobMover::new(
             self.house_keeper_config.witness_job_moving_interval_ms,
             prover_pool.clone(),
         );
-        context.add_task(Box::new(WaitingToQueuedFriWitnessJobMoverTask {
+        context.add_task(WaitingToQueuedFriWitnessJobMoverTask {
             waiting_to_queued_fri_witness_job_mover,
-        }));
+        });
 
         if let Some((archiving_interval, archive_after)) =
             self.house_keeper_config.prover_job_archiver_params()
         {
             let fri_prover_job_archiver =
-                FriProverJobArchiver::new(prover_pool.clone(), archiving_interval, archive_after);
-            context.add_task(Box::new(FriProverJobArchiverTask {
+                FriProverJobsArchiver::new(prover_pool.clone(), archiving_interval, archive_after);
+            context.add_task(FriProverJobArchiverTask {
                 fri_prover_job_archiver,
-            }));
+            });
         }
 
         if let Some((archiving_interval, archive_after)) =
@@ -126,38 +136,38 @@ impl WiringLayer for HouseKeeperLayer {
         {
             let fri_prover_gpu_archiver =
                 FriGpuProverArchiver::new(prover_pool.clone(), archiving_interval, archive_after);
-            context.add_task(Box::new(FriProverGpuArchiverTask {
+            context.add_task(FriProverGpuArchiverTask {
                 fri_prover_gpu_archiver,
-            }));
+            });
         }
 
-        let fri_witness_generator_stats_reporter = FriWitnessGeneratorStatsReporter::new(
+        let fri_witness_generator_stats_reporter = FriWitnessGeneratorQueueReporter::new(
             prover_pool.clone(),
             self.house_keeper_config
                 .witness_generator_stats_reporting_interval_ms,
         );
-        context.add_task(Box::new(FriWitnessGeneratorStatsReporterTask {
+        context.add_task(FriWitnessGeneratorStatsReporterTask {
             fri_witness_generator_stats_reporter,
-        }));
+        });
 
-        let fri_prover_stats_reporter = FriProverStatsReporter::new(
+        let fri_prover_stats_reporter = FriProverQueueReporter::new(
             self.house_keeper_config.prover_stats_reporting_interval_ms,
             prover_pool.clone(),
             replica_pool.clone(),
             self.fri_prover_group_config,
         );
-        context.add_task(Box::new(FriProverStatsReporterTask {
+        context.add_task(FriProverStatsReporterTask {
             fri_prover_stats_reporter,
-        }));
+        });
 
-        let fri_proof_compressor_stats_reporter = FriProofCompressorStatsReporter::new(
+        let fri_proof_compressor_stats_reporter = FriProofCompressorQueueReporter::new(
             self.house_keeper_config
                 .proof_compressor_stats_reporting_interval_ms,
             prover_pool.clone(),
         );
-        context.add_task(Box::new(FriProofCompressorStatsReporterTask {
+        context.add_task(FriProofCompressorStatsReporterTask {
             fri_proof_compressor_stats_reporter,
-        }));
+        });
 
         let fri_proof_compressor_retry_manager = FriProofCompressorJobRetryManager::new(
             self.fri_proof_compressor_config.max_attempts,
@@ -166,34 +176,10 @@ impl WiringLayer for HouseKeeperLayer {
                 .proof_compressor_job_retrying_interval_ms,
             prover_pool.clone(),
         );
-        context.add_task(Box::new(FriProofCompressorJobRetryManagerTask {
+        context.add_task(FriProofCompressorJobRetryManagerTask {
             fri_proof_compressor_retry_manager,
-        }));
-
-        Ok(())
-    }
-}
+        });
 
-#[derive(Debug)]
-struct PostgresMetricsScrapingTask {
-    pool_for_metrics: ConnectionPool<Core>,
-}
-
-#[async_trait::async_trait]
-impl Task for PostgresMetricsScrapingTask {
-    fn name(&self) -> &'static str {
-        "postgres_metrics_scraping"
-    }
-
-    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        tokio::select! {
-            () = PostgresMetrics::run_scraping(self.pool_for_metrics, SCRAPE_INTERVAL) => {
-                tracing::warn!("Postgres metrics scraping unexpectedly stopped");
-            }
-            _ = stop_receiver.0.changed() => {
-                tracing::info!("Stop signal received, Postgres metrics scraping is shutting down");
-            }
-        }
         Ok(())
     }
 }
@@ -205,8 +191,8 @@ struct L1BatchMetricsReporterTask {
 
 #[async_trait::async_trait]
 impl Task for L1BatchMetricsReporterTask {
-    fn name(&self) -> &'static str {
-        "l1_batch_metrics_reporter"
+    fn id(&self) -> TaskId {
+        "l1_batch_metrics_reporter".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -221,8 +207,8 @@ struct FriProverJobRetryManagerTask {
 
 #[async_trait::async_trait]
 impl Task for FriProverJobRetryManagerTask {
-    fn name(&self) -> &'static str {
-        "fri_prover_job_retry_manager"
+    fn id(&self) -> TaskId {
+        "fri_prover_job_retry_manager".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -237,8 +223,8 @@ struct FriWitnessGeneratorJobRetryManagerTask {
 
 #[async_trait::async_trait]
 impl Task for FriWitnessGeneratorJobRetryManagerTask {
-    fn name(&self) -> &'static str {
-        "fri_witness_generator_job_retry_manager"
+    fn id(&self) -> TaskId {
+        "fri_witness_generator_job_retry_manager".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -255,8 +241,8 @@ struct WaitingToQueuedFriWitnessJobMoverTask {
 
 #[async_trait::async_trait]
 impl Task for WaitingToQueuedFriWitnessJobMoverTask {
-    fn name(&self) -> &'static str {
-        "waiting_to_queued_fri_witness_job_mover"
+    fn id(&self) -> TaskId {
+        "waiting_to_queued_fri_witness_job_mover".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -268,13 +254,13 @@ impl Task for WaitingToQueuedFriWitnessJobMoverTask {
 
 #[derive(Debug)]
 struct FriWitnessGeneratorStatsReporterTask {
-    fri_witness_generator_stats_reporter: FriWitnessGeneratorStatsReporter,
+    fri_witness_generator_stats_reporter: FriWitnessGeneratorQueueReporter,
 }
 
 #[async_trait::async_trait]
 impl Task for FriWitnessGeneratorStatsReporterTask {
-    fn name(&self) -> &'static str {
-        "fri_witness_generator_stats_reporter"
+    fn id(&self) -> TaskId {
+        "fri_witness_generator_stats_reporter".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -286,13 +272,13 @@ impl Task for FriWitnessGeneratorStatsReporterTask {
 
 #[derive(Debug)]
 struct FriProverStatsReporterTask {
-    fri_prover_stats_reporter: FriProverStatsReporter,
+    fri_prover_stats_reporter: FriProverQueueReporter,
 }
 
 #[async_trait::async_trait]
 impl Task for FriProverStatsReporterTask {
-    fn name(&self) -> &'static str {
-        "fri_prover_stats_reporter"
+    fn id(&self) -> TaskId {
+        "fri_prover_stats_reporter".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -302,13 +288,13 @@ impl Task for FriProverStatsReporterTask {
 
 #[derive(Debug)]
 struct FriProofCompressorStatsReporterTask {
-    fri_proof_compressor_stats_reporter: FriProofCompressorStatsReporter,
+    fri_proof_compressor_stats_reporter: FriProofCompressorQueueReporter,
 }
 
 #[async_trait::async_trait]
 impl Task for FriProofCompressorStatsReporterTask {
-    fn name(&self) -> &'static str {
-        "fri_proof_compressor_stats_reporter"
+    fn id(&self) -> TaskId {
+        "fri_proof_compressor_stats_reporter".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -325,8 +311,8 @@ struct FriProofCompressorJobRetryManagerTask {
 
 #[async_trait::async_trait]
 impl Task for FriProofCompressorJobRetryManagerTask {
-    fn name(&self) -> &'static str {
-        "fri_proof_compressor_job_retry_manager"
+    fn id(&self) -> TaskId {
+        "fri_proof_compressor_job_retry_manager".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -338,13 +324,13 @@ impl Task for FriProofCompressorJobRetryManagerTask {
 
 #[derive(Debug)]
 struct FriProverJobArchiverTask {
-    fri_prover_job_archiver: FriProverJobArchiver,
+    fri_prover_job_archiver: FriProverJobsArchiver,
 }
 
 #[async_trait::async_trait]
 impl Task for FriProverJobArchiverTask {
-    fn name(&self) -> &'static str {
-        "fri_prover_job_archiver"
+    fn id(&self) -> TaskId {
+        "fri_prover_job_archiver".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -358,8 +344,8 @@ struct FriProverGpuArchiverTask {
 
 #[async_trait::async_trait]
 impl Task for FriProverGpuArchiverTask {
-    fn name(&self) -> &'static str {
-        "fri_prover_gpu_archiver"
+    fn id(&self) -> TaskId {
+        "fri_prover_gpu_archiver".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
diff --git a/core/node/node_framework/src/implementations/layers/l1_batch_commit_data_generator.rs b/core/node/node_framework/src/implementations/layers/l1_batch_commit_data_generator.rs
deleted file mode 100644
index 82762613a5a1..000000000000
--- a/core/node/node_framework/src/implementations/layers/l1_batch_commit_data_generator.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use std::sync::Arc;
-
-use zksync_config::configs::chain::L1BatchCommitDataGeneratorMode;
-use zksync_eth_sender::l1_batch_commit_data_generator::{
-    L1BatchCommitDataGenerator, RollupModeL1BatchCommitDataGenerator,
-    ValidiumModeL1BatchCommitDataGenerator,
-};
-
-use crate::{
-    implementations::resources::l1_batch_commit_data_generator::L1BatchCommitDataGeneratorResource,
-    service::ServiceContext,
-    wiring_layer::{WiringError, WiringLayer},
-};
-
-#[derive(Debug)]
-pub struct L1BatchCommitDataGeneratorLayer {
-    mode: L1BatchCommitDataGeneratorMode,
-}
-
-impl L1BatchCommitDataGeneratorLayer {
-    pub fn new(mode: L1BatchCommitDataGeneratorMode) -> Self {
-        Self { mode }
-    }
-}
-
-#[async_trait::async_trait]
-impl WiringLayer for L1BatchCommitDataGeneratorLayer {
-    fn layer_name(&self) -> &'static str {
-        "l1_batch_commit_data_generator"
-    }
-
-    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let l1_batch_commit_data_generator: Arc<dyn L1BatchCommitDataGenerator> = match self.mode {
-            L1BatchCommitDataGeneratorMode::Rollup => {
-                Arc::new(RollupModeL1BatchCommitDataGenerator {})
-            }
-            L1BatchCommitDataGeneratorMode::Validium => {
-                Arc::new(ValidiumModeL1BatchCommitDataGenerator {})
-            }
-        };
-        context.insert_resource(L1BatchCommitDataGeneratorResource(
-            l1_batch_commit_data_generator,
-        ))?;
-        Ok(())
-    }
-}
diff --git a/core/node/node_framework/src/implementations/layers/l1_batch_commitment_mode_validation.rs b/core/node/node_framework/src/implementations/layers/l1_batch_commitment_mode_validation.rs
new file mode 100644
index 000000000000..893c8d361164
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/l1_batch_commitment_mode_validation.rs
@@ -0,0 +1,72 @@
+use zksync_commitment_generator::validation_task::L1BatchCommitmentModeValidationTask;
+use zksync_types::{commitment::L1BatchCommitmentMode, Address};
+
+use crate::{
+    implementations::resources::eth_interface::EthInterfaceResource,
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId, TaskKind},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for a prerequisite that checks if the L1 batch commitment mode is valid
+/// against L1.
+///
+/// ## Requests resources
+///
+/// - `EthInterfaceResource`
+///
+/// ## Adds preconditions
+///
+/// - `L1BatchCommitmentModeValidationTask`
+#[derive(Debug)]
+pub struct L1BatchCommitmentModeValidationLayer {
+    diamond_proxy_addr: Address,
+    l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
+}
+
+impl L1BatchCommitmentModeValidationLayer {
+    pub fn new(
+        diamond_proxy_addr: Address,
+        l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
+    ) -> Self {
+        Self {
+            diamond_proxy_addr,
+            l1_batch_commit_data_generator_mode,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for L1BatchCommitmentModeValidationLayer {
+    fn layer_name(&self) -> &'static str {
+        "l1_batch_commitment_mode_validation_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let EthInterfaceResource(query_client) = context.get_resource()?;
+        let task = L1BatchCommitmentModeValidationTask::new(
+            self.diamond_proxy_addr,
+            self.l1_batch_commit_data_generator_mode,
+            query_client,
+        );
+
+        context.add_task(task);
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for L1BatchCommitmentModeValidationTask {
+    fn kind(&self) -> TaskKind {
+        TaskKind::Precondition
+    }
+
+    fn id(&self) -> TaskId {
+        "l1_batch_commitment_mode_validation".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).exit_on_success().run(stop_receiver.0).await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/l1_gas.rs b/core/node/node_framework/src/implementations/layers/l1_gas.rs
index c200217570a7..2276e73e857f 100644
--- a/core/node/node_framework/src/implementations/layers/l1_gas.rs
+++ b/core/node/node_framework/src/implementations/layers/l1_gas.rs
@@ -2,28 +2,38 @@ use std::sync::Arc;
 
 use anyhow::Context;
 use zksync_config::{
-    configs::{
-        chain::{L1BatchCommitDataGeneratorMode, StateKeeperConfig},
-        eth_sender::PubdataSendingMode,
-    },
+    configs::{chain::StateKeeperConfig, eth_sender::PubdataSendingMode},
     GasAdjusterConfig, GenesisConfig,
 };
-use zksync_node_fee_model::{
-    l1_gas_price::{GasAdjuster, PubdataPricing, RollupPubdataPricing, ValidiumPubdataPricing},
-    MainNodeFeeInputProvider,
-};
+use zksync_node_fee_model::{l1_gas_price::GasAdjuster, MainNodeFeeInputProvider};
 use zksync_types::fee_model::FeeModelConfig;
 
 use crate::{
     implementations::resources::{
+        base_token_ratio_provider::BaseTokenRatioProviderResource,
         eth_interface::EthInterfaceResource, fee_input::FeeInputResource,
         l1_tx_params::L1TxParamsResource,
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for sequencer L1 gas interfaces.
+/// Adds several resources that depend on L1 gas price.
+///
+/// ## Requests resources
+///
+/// - `EthInterfaceResource`
+///
+/// ## Adds resources
+///
+/// - `FeeInputResource`
+/// - `L1TxParamsResource`
+///
+/// ## Adds tasks
+///
+/// - `GasAdjusterTask` (only runs if someone uses the resourced listed above).
 #[derive(Debug)]
 pub struct SequencerL1GasLayer {
     gas_adjuster_config: GasAdjusterConfig,
@@ -55,31 +65,29 @@ impl WiringLayer for SequencerL1GasLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let pubdata_pricing: Arc<dyn PubdataPricing> =
-            match self.genesis_config.l1_batch_commit_data_generator_mode {
-                L1BatchCommitDataGeneratorMode::Rollup => Arc::new(RollupPubdataPricing {}),
-                L1BatchCommitDataGeneratorMode::Validium => Arc::new(ValidiumPubdataPricing {}),
-            };
-        let client = context.get_resource::<EthInterfaceResource>().await?.0;
+        let client = context.get_resource::<EthInterfaceResource>()?.0;
         let adjuster = GasAdjuster::new(
             client,
             self.gas_adjuster_config,
             self.pubdata_sending_mode,
-            pubdata_pricing,
+            self.genesis_config.l1_batch_commit_data_generator_mode,
         )
         .await
         .context("GasAdjuster::new()")?;
         let gas_adjuster = Arc::new(adjuster);
 
+        let ratio_provider = context.get_resource_or_default::<BaseTokenRatioProviderResource>();
+
         let batch_fee_input_provider = Arc::new(MainNodeFeeInputProvider::new(
             gas_adjuster.clone(),
+            ratio_provider.0.clone(),
             FeeModelConfig::from_state_keeper_config(&self.state_keeper_config),
         ));
         context.insert_resource(FeeInputResource(batch_fee_input_provider))?;
 
         context.insert_resource(L1TxParamsResource(gas_adjuster.clone()))?;
 
-        context.add_task(Box::new(GasAdjusterTask { gas_adjuster }));
+        context.add_task(GasAdjusterTask { gas_adjuster });
         Ok(())
     }
 }
@@ -91,11 +99,21 @@ struct GasAdjusterTask {
 
 #[async_trait::async_trait]
 impl Task for GasAdjusterTask {
-    fn name(&self) -> &'static str {
-        "gas_adjuster"
+    fn id(&self) -> TaskId {
+        "gas_adjuster".into()
     }
 
-    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        // Gas adjuster layer is added to provide a resource for anyone to use, but it comes with
+        // a support task. If nobody has used the resource, we don't need to run the support task.
+        if Arc::strong_count(&self.gas_adjuster) == 1 {
+            tracing::info!(
+                "Gas adjuster is not used by any other task, not running the support task"
+            );
+            stop_receiver.0.changed().await?;
+            return Ok(());
+        }
+
         self.gas_adjuster.run(stop_receiver.0).await
     }
 }
diff --git a/core/node/node_framework/src/implementations/layers/main_node_client.rs b/core/node/node_framework/src/implementations/layers/main_node_client.rs
new file mode 100644
index 000000000000..d875a2bc07f8
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/main_node_client.rs
@@ -0,0 +1,66 @@
+use std::{num::NonZeroUsize, sync::Arc};
+
+use anyhow::Context;
+use zksync_node_sync::MainNodeHealthCheck;
+use zksync_types::{url::SensitiveUrl, L2ChainId};
+use zksync_web3_decl::client::{Client, DynClient, L2};
+
+use crate::{
+    implementations::resources::{
+        healthcheck::AppHealthCheckResource, main_node_client::MainNodeClientResource,
+    },
+    service::ServiceContext,
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for main node client.
+///
+/// ## Requests resources
+///
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds resources
+///
+/// - `MainNodeClientResource`
+#[derive(Debug)]
+pub struct MainNodeClientLayer {
+    url: SensitiveUrl,
+    rate_limit_rps: NonZeroUsize,
+    l2_chain_id: L2ChainId,
+}
+
+impl MainNodeClientLayer {
+    pub fn new(url: SensitiveUrl, rate_limit_rps: NonZeroUsize, l2_chain_id: L2ChainId) -> Self {
+        Self {
+            url,
+            rate_limit_rps,
+            l2_chain_id,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for MainNodeClientLayer {
+    fn layer_name(&self) -> &'static str {
+        "main_node_client_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let main_node_client = Client::http(self.url)
+            .context("failed creating JSON-RPC client for main node")?
+            .for_network(self.l2_chain_id.into())
+            .with_allowed_requests_per_second(self.rate_limit_rps)
+            .build();
+
+        let client = Box::new(main_node_client) as Box<DynClient<L2>>;
+        context.insert_resource(MainNodeClientResource(client.clone()))?;
+
+        // Insert healthcheck
+        let AppHealthCheckResource(app_health) = context.get_resource_or_default();
+        app_health
+            .insert_custom_component(Arc::new(MainNodeHealthCheck::from(client)))
+            .map_err(WiringError::internal)?;
+
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/main_node_fee_params_fetcher.rs b/core/node/node_framework/src/implementations/layers/main_node_fee_params_fetcher.rs
new file mode 100644
index 000000000000..06db8e69f194
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/main_node_fee_params_fetcher.rs
@@ -0,0 +1,60 @@
+use std::sync::Arc;
+
+use zksync_node_fee_model::l1_gas_price::MainNodeFeeParamsFetcher;
+
+use crate::{
+    implementations::resources::{
+        fee_input::FeeInputResource, main_node_client::MainNodeClientResource,
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for main node fee params fetcher -- a fee input resource used on
+/// the external node.
+///
+/// ## Requests resources
+///
+/// - `MainNodeClientResource`
+///
+/// ## Adds resources
+///
+/// - `FeeInputResource`
+///
+/// ## Adds tasks
+///
+/// - `MainNodeFeeParamsFetcherTask`
+#[derive(Debug)]
+pub struct MainNodeFeeParamsFetcherLayer;
+
+#[async_trait::async_trait]
+impl WiringLayer for MainNodeFeeParamsFetcherLayer {
+    fn layer_name(&self) -> &'static str {
+        "main_node_fee_params_fetcher_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let MainNodeClientResource(main_node_client) = context.get_resource()?;
+        let fetcher = Arc::new(MainNodeFeeParamsFetcher::new(main_node_client));
+        context.insert_resource(FeeInputResource(fetcher.clone()))?;
+        context.add_task(MainNodeFeeParamsFetcherTask { fetcher });
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+struct MainNodeFeeParamsFetcherTask {
+    fetcher: Arc<MainNodeFeeParamsFetcher>,
+}
+
+#[async_trait::async_trait]
+impl Task for MainNodeFeeParamsFetcherTask {
+    fn id(&self) -> TaskId {
+        "main_node_fee_params_fetcher".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        self.fetcher.run(stop_receiver.0).await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/metadata_calculator.rs b/core/node/node_framework/src/implementations/layers/metadata_calculator.rs
index a54f8acbfde3..41e7561b70f3 100644
--- a/core/node/node_framework/src/implementations/layers/metadata_calculator.rs
+++ b/core/node/node_framework/src/implementations/layers/metadata_calculator.rs
@@ -1,7 +1,14 @@
-use std::sync::Arc;
+use std::{
+    net::{Ipv4Addr, SocketAddr},
+    sync::Arc,
+    time::Duration,
+};
 
 use anyhow::Context as _;
-use zksync_core::metadata_calculator::{MetadataCalculator, MetadataCalculatorConfig};
+use zksync_config::configs::{api::MerkleTreeApiConfig, database::MerkleTreeMode};
+use zksync_metadata_calculator::{
+    LazyAsyncTreeReader, MerkleTreePruningTask, MetadataCalculator, MetadataCalculatorConfig,
+};
 use zksync_storage::RocksDB;
 
 use crate::{
@@ -9,27 +16,55 @@ use crate::{
         healthcheck::AppHealthCheckResource,
         object_store::ObjectStoreResource,
         pools::{MasterPool, PoolResource, ReplicaPool},
+        web3_api::TreeApiClientResource,
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
-/// Builder for a metadata calculator.
+/// Wiring layer for <insert description here>
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `PoolResource<ReplicaPool>`
+/// - `ObjectStoreResource` (only for `MerkleTreeMode::Full`)
+/// - `AppHealthCheckResource` (adds several health checks)
+///
+/// ## Adds resources
 ///
-/// ## Effects
+/// - `TreeApiClientResource`
 ///
-/// - Resolves `PoolResource<MasterPool>`.
-/// - Resolves `PoolResource<ReplicaPool>`.
-/// - Resolves `ObjectStoreResource` (optional).
-/// - Adds `tree_health_check` to the `ResourceCollection<HealthCheckResource>`.
-/// - Adds `metadata_calculator` to the node.
+/// ## Adds tasks
+///
+/// - `MetadataCalculatorTask`
+/// - `TreeApiTask` (if requested)
 #[derive(Debug)]
-pub struct MetadataCalculatorLayer(pub MetadataCalculatorConfig);
+pub struct MetadataCalculatorLayer {
+    config: MetadataCalculatorConfig,
+    tree_api_config: Option<MerkleTreeApiConfig>,
+    pruning_config: Option<Duration>,
+}
 
-#[derive(Debug)]
-pub struct MetadataCalculatorTask {
-    metadata_calculator: MetadataCalculator,
+impl MetadataCalculatorLayer {
+    pub fn new(config: MetadataCalculatorConfig) -> Self {
+        Self {
+            config,
+            tree_api_config: None,
+            pruning_config: None,
+        }
+    }
+
+    pub fn with_tree_api_config(mut self, tree_api_config: MerkleTreeApiConfig) -> Self {
+        self.tree_api_config = Some(tree_api_config);
+        self
+    }
+
+    pub fn with_pruning_config(mut self, pruning_config: Duration) -> Self {
+        self.pruning_config = Some(pruning_config);
+        self
+    }
 }
 
 #[async_trait::async_trait]
@@ -39,57 +74,113 @@ impl WiringLayer for MetadataCalculatorLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let pool = context.get_resource::<PoolResource<MasterPool>>().await?;
+        let pool = context.get_resource::<PoolResource<MasterPool>>()?;
         let main_pool = pool.get().await?;
         // The number of connections in a recovery pool is based on the mainnet recovery runs. It doesn't need
         // to be particularly accurate at this point, since the main node isn't expected to recover from a snapshot.
         let recovery_pool = context
-            .get_resource::<PoolResource<ReplicaPool>>()
-            .await?
+            .get_resource::<PoolResource<ReplicaPool>>()?
             .get_custom(10)
             .await?;
 
-        let object_store = context.get_resource::<ObjectStoreResource>().await.ok(); // OK to be None.
-        if object_store.is_none() {
-            tracing::info!(
-                "Object store is not provided, metadata calculator will run without it."
-            );
-        }
+        let object_store = match self.config.mode {
+            MerkleTreeMode::Lightweight => None,
+            MerkleTreeMode::Full => {
+                let store = context.get_resource::<ObjectStoreResource>()?;
+                Some(store)
+            }
+        };
 
-        let metadata_calculator = MetadataCalculator::new(
-            self.0,
+        let mut metadata_calculator = MetadataCalculator::new(
+            self.config,
             object_store.map(|store_resource| store_resource.0),
             main_pool,
         )
         .await?
         .with_recovery_pool(recovery_pool);
 
-        let AppHealthCheckResource(app_health) = context.get_resource_or_default().await;
+        let AppHealthCheckResource(app_health) = context.get_resource_or_default();
         app_health
             .insert_custom_component(Arc::new(metadata_calculator.tree_health_check()))
             .map_err(WiringError::internal)?;
 
-        let task = Box::new(MetadataCalculatorTask {
-            metadata_calculator,
+        if let Some(tree_api_config) = self.tree_api_config {
+            let bind_addr = (Ipv4Addr::UNSPECIFIED, tree_api_config.port).into();
+            let tree_reader = metadata_calculator.tree_reader();
+            context.add_task(TreeApiTask {
+                bind_addr,
+                tree_reader,
+            });
+        }
+
+        if let Some(pruning_removal_delay) = self.pruning_config {
+            let pruning_task = metadata_calculator.pruning_task(pruning_removal_delay);
+            app_health
+                .insert_component(pruning_task.health_check())
+                .map_err(|err| WiringError::Internal(err.into()))?;
+            context.add_task(pruning_task);
+        }
+
+        context.insert_resource(TreeApiClientResource(Arc::new(
+            metadata_calculator.tree_reader(),
+        )))?;
+
+        context.add_task(metadata_calculator);
+
+        context.add_shutdown_hook("rocksdb_terminaton", async {
+            // Wait for all the instances of RocksDB to be destroyed.
+            tokio::task::spawn_blocking(RocksDB::await_rocksdb_termination)
+                .await
+                .context("failed terminating RocksDB instances")
         });
-        context.add_task(task);
+
         Ok(())
     }
 }
 
 #[async_trait::async_trait]
-impl Task for MetadataCalculatorTask {
-    fn name(&self) -> &'static str {
-        "metadata_calculator"
+impl Task for MetadataCalculator {
+    fn id(&self) -> TaskId {
+        "metadata_calculator".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        let result = self.metadata_calculator.run(stop_receiver.0).await;
+        (*self).run(stop_receiver.0).await
+    }
+}
 
-        // Wait for all the instances of RocksDB to be destroyed.
-        tokio::task::spawn_blocking(RocksDB::await_rocksdb_termination)
-            .await
-            .context("failed terminating RocksDB instances")?;
-        result
+#[derive(Debug)]
+pub struct TreeApiTask {
+    bind_addr: SocketAddr,
+    tree_reader: LazyAsyncTreeReader,
+}
+
+#[async_trait::async_trait]
+impl Task for TreeApiTask {
+    fn id(&self) -> TaskId {
+        "tree_api".into()
+    }
+
+    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        if let Some(reader) = self.tree_reader.wait().await {
+            reader.run_api_server(self.bind_addr, stop_receiver.0).await
+        } else {
+            // Tree is dropped before initialized, e.g. because the node is getting shut down.
+            // We don't want to treat this as an error since it could mask the real shutdown cause in logs etc.
+            tracing::warn!("Tree is dropped before initialized, not starting the tree API server");
+            stop_receiver.0.changed().await?;
+            Ok(())
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for MerkleTreePruningTask {
+    fn id(&self) -> TaskId {
+        "merkle_tree_pruning_task".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run(stop_receiver.0).await
     }
 }
diff --git a/core/node/node_framework/src/implementations/layers/mod.rs b/core/node/node_framework/src/implementations/layers/mod.rs
index 9a55cf18d24d..f9d2b94bad22 100644
--- a/core/node/node_framework/src/implementations/layers/mod.rs
+++ b/core/node/node_framework/src/implementations/layers/mod.rs
@@ -1,21 +1,36 @@
+pub mod base_token_ratio_persister;
+pub mod base_token_ratio_provider;
+pub mod batch_status_updater;
 pub mod circuit_breaker_checker;
 pub mod commitment_generator;
 pub mod consensus;
 pub mod consistency_checker;
 pub mod contract_verification_api;
+pub mod da_dispatcher;
 pub mod eth_sender;
 pub mod eth_watch;
 pub mod healtcheck_server;
 pub mod house_keeper;
-pub mod l1_batch_commit_data_generator;
+pub mod l1_batch_commitment_mode_validation;
 pub mod l1_gas;
+pub mod main_node_client;
+pub mod main_node_fee_params_fetcher;
 pub mod metadata_calculator;
 pub mod object_store;
 pub mod pk_signing_eth_client;
 pub mod pools_layer;
+pub mod postgres_metrics;
 pub mod prometheus_exporter;
 pub mod proof_data_handler;
+pub mod pruning;
 pub mod query_eth_client;
+pub mod reorg_detector_checker;
+pub mod reorg_detector_runner;
 pub mod sigint;
 pub mod state_keeper;
+pub mod sync_state_updater;
+pub mod tee_verifier_input_producer;
+pub mod tree_data_fetcher;
+pub mod validate_chain_ids;
+pub mod vm_runner;
 pub mod web3_api;
diff --git a/core/node/node_framework/src/implementations/layers/object_store.rs b/core/node/node_framework/src/implementations/layers/object_store.rs
index c886758f97e2..6803ccfb55b7 100644
--- a/core/node/node_framework/src/implementations/layers/object_store.rs
+++ b/core/node/node_framework/src/implementations/layers/object_store.rs
@@ -7,6 +7,11 @@ use crate::{
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for object store.
+///
+/// ## Adds resources
+///
+/// - `ObjectStoreResource`
 #[derive(Debug)]
 pub struct ObjectStoreLayer {
     config: ObjectStoreConfig,
@@ -25,7 +30,7 @@ impl WiringLayer for ObjectStoreLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let object_store = ObjectStoreFactory::new(self.config).create_store().await;
+        let object_store = ObjectStoreFactory::new(self.config).create_store().await?;
         context.insert_resource(ObjectStoreResource(object_store))?;
         Ok(())
     }
diff --git a/core/node/node_framework/src/implementations/layers/pk_signing_eth_client.rs b/core/node/node_framework/src/implementations/layers/pk_signing_eth_client.rs
index cc93498e0f2b..74eb5e3bae35 100644
--- a/core/node/node_framework/src/implementations/layers/pk_signing_eth_client.rs
+++ b/core/node/node_framework/src/implementations/layers/pk_signing_eth_client.rs
@@ -14,6 +14,16 @@ use crate::{
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for [`PKSigningClient`].
+///
+/// ## Requests resources
+///
+/// - `EthInterfaceResource`
+///
+/// ## Adds resources
+///
+/// - `BoundEthInterfaceResource`
+/// - `BoundEthInterfaceForBlobsResource` (if key for blob operator is provided)
 #[derive(Debug)]
 pub struct PKSigningEthClientLayer {
     eth_sender_config: EthConfig,
@@ -51,7 +61,7 @@ impl WiringLayer for PKSigningEthClientLayer {
             .gas_adjuster
             .as_ref()
             .context("gas_adjuster config is missing")?;
-        let EthInterfaceResource(query_client) = context.get_resource().await?;
+        let EthInterfaceResource(query_client) = context.get_resource()?;
 
         let signing_client = PKSigningClient::new_raw(
             private_key.clone(),
diff --git a/core/node/node_framework/src/implementations/layers/pools_layer.rs b/core/node/node_framework/src/implementations/layers/pools_layer.rs
index 9f362b34d907..880b793115b7 100644
--- a/core/node/node_framework/src/implementations/layers/pools_layer.rs
+++ b/core/node/node_framework/src/implementations/layers/pools_layer.rs
@@ -1,47 +1,64 @@
-use zksync_config::configs::PostgresConfig;
+use std::sync::Arc;
+
+use zksync_config::configs::{DatabaseSecrets, PostgresConfig};
+use zksync_dal::{ConnectionPool, Core};
+use zksync_db_connection::healthcheck::ConnectionPoolHealthCheck;
 
 use crate::{
-    implementations::resources::pools::{MasterPool, PoolResource, ProverPool, ReplicaPool},
+    implementations::resources::{
+        healthcheck::AppHealthCheckResource,
+        pools::{MasterPool, PoolResource, ProverPool, ReplicaPool},
+    },
     service::ServiceContext,
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Builder for the [`PoolsLayer`].
 #[derive(Debug)]
 pub struct PoolsLayerBuilder {
     config: PostgresConfig,
     with_master: bool,
     with_replica: bool,
     with_prover: bool,
+    secrets: DatabaseSecrets,
 }
 
 impl PoolsLayerBuilder {
-    pub fn empty(config: PostgresConfig) -> Self {
+    /// Creates a new builder with the provided configuration and secrets.
+    /// By default, no pulls are enabled.
+    pub fn empty(config: PostgresConfig, database_secrets: DatabaseSecrets) -> Self {
         Self {
             config,
             with_master: false,
             with_replica: false,
             with_prover: false,
+            secrets: database_secrets,
         }
     }
 
+    /// Allows to enable the master pool.
     pub fn with_master(mut self, with_master: bool) -> Self {
         self.with_master = with_master;
         self
     }
 
+    /// Allows to enable the replica pool.
     pub fn with_replica(mut self, with_replica: bool) -> Self {
         self.with_replica = with_replica;
         self
     }
 
+    /// Allows to enable the prover pool.
     pub fn with_prover(mut self, with_prover: bool) -> Self {
         self.with_prover = with_prover;
         self
     }
 
+    /// Builds the [`PoolsLayer`] with the provided configuration.
     pub fn build(self) -> PoolsLayer {
         PoolsLayer {
             config: self.config,
+            secrets: self.secrets,
             with_master: self.with_master,
             with_replica: self.with_replica,
             with_prover: self.with_prover,
@@ -49,9 +66,22 @@ impl PoolsLayerBuilder {
     }
 }
 
+/// Wiring layer for connection pools.
+/// During wiring, also prepares the global configuration for the connection pools.
+///
+/// ## Requests resources
+///
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds resources
+///
+/// - `PoolResource::<MasterPool>` (if master pool is enabled)
+/// - `PoolResource::<ReplicaPool>` (if replica pool is enabled)
+/// - `PoolResource::<ProverPool>` (if prover pool is enabled)
 #[derive(Debug)]
 pub struct PoolsLayer {
     config: PostgresConfig,
+    secrets: DatabaseSecrets,
     with_master: bool,
     with_replica: bool,
     with_prover: bool,
@@ -70,30 +100,65 @@ impl WiringLayer for PoolsLayer {
             ));
         }
 
+        if self.with_master || self.with_replica {
+            if let Some(threshold) = self.config.slow_query_threshold() {
+                ConnectionPool::<Core>::global_config().set_slow_query_threshold(threshold)?;
+            }
+            if let Some(threshold) = self.config.long_connection_threshold() {
+                ConnectionPool::<Core>::global_config().set_long_connection_threshold(threshold)?;
+            }
+        }
+
         if self.with_master {
+            let pool_size = self.config.max_connections()?;
+            let pool_size_master = self.config.max_connections_master().unwrap_or(pool_size);
+
             context.insert_resource(PoolResource::<MasterPool>::new(
-                self.config.master_url()?,
-                self.config.max_connections()?,
-                self.config.statement_timeout(),
+                self.secrets.master_url()?,
+                pool_size_master,
+                None,
+                None,
             ))?;
         }
 
         if self.with_replica {
+            // We're most interested in setting acquire / statement timeouts for the API server, which puts the most load
+            // on Postgres.
             context.insert_resource(PoolResource::<ReplicaPool>::new(
-                self.config.replica_url()?,
+                self.secrets.replica_url()?,
                 self.config.max_connections()?,
                 self.config.statement_timeout(),
+                self.config.acquire_timeout(),
             ))?;
         }
 
         if self.with_prover {
             context.insert_resource(PoolResource::<ProverPool>::new(
-                self.config.prover_url()?,
+                self.secrets.prover_url()?,
                 self.config.max_connections()?,
-                self.config.statement_timeout(),
+                None,
+                None,
             ))?;
         }
 
+        // Insert health checks for the core pool.
+        let connection_pool = if self.with_replica {
+            context
+                .get_resource::<PoolResource<ReplicaPool>>()?
+                .get()
+                .await?
+        } else {
+            context
+                .get_resource::<PoolResource<MasterPool>>()?
+                .get()
+                .await?
+        };
+        let db_health_check = ConnectionPoolHealthCheck::new(connection_pool);
+        let AppHealthCheckResource(app_health) = context.get_resource_or_default();
+        app_health
+            .insert_custom_component(Arc::new(db_health_check))
+            .map_err(WiringError::internal)?;
+
         Ok(())
     }
 }
diff --git a/core/node/node_framework/src/implementations/layers/postgres_metrics.rs b/core/node/node_framework/src/implementations/layers/postgres_metrics.rs
new file mode 100644
index 000000000000..9b290b76cad0
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/postgres_metrics.rs
@@ -0,0 +1,67 @@
+use std::time::Duration;
+
+use zksync_dal::{metrics::PostgresMetrics, ConnectionPool, Core};
+
+use crate::{
+    implementations::resources::pools::{PoolResource, ReplicaPool},
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId, TaskKind},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+const SCRAPE_INTERVAL: Duration = Duration::from_secs(60);
+
+/// Wiring layer for the Postgres metrics exporter.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<ReplicaPool>`
+///
+/// ## Adds tasks
+///
+/// - `PostgresMetricsScrapingTask`
+#[derive(Debug)]
+pub struct PostgresMetricsLayer;
+
+#[async_trait::async_trait]
+impl WiringLayer for PostgresMetricsLayer {
+    fn layer_name(&self) -> &'static str {
+        "postgres_metrics_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let replica_pool_resource = context.get_resource::<PoolResource<ReplicaPool>>()?;
+        let pool_for_metrics = replica_pool_resource.get_singleton().await?;
+        context.add_task(PostgresMetricsScrapingTask { pool_for_metrics });
+
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+struct PostgresMetricsScrapingTask {
+    pool_for_metrics: ConnectionPool<Core>,
+}
+
+#[async_trait::async_trait]
+impl Task for PostgresMetricsScrapingTask {
+    fn kind(&self) -> TaskKind {
+        TaskKind::UnconstrainedTask
+    }
+
+    fn id(&self) -> TaskId {
+        "postgres_metrics_scraping".into()
+    }
+
+    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        tokio::select! {
+            () = PostgresMetrics::run_scraping(self.pool_for_metrics, SCRAPE_INTERVAL) => {
+                tracing::warn!("Postgres metrics scraping unexpectedly stopped");
+            }
+            _ = stop_receiver.0.changed() => {
+                tracing::info!("Stop signal received, Postgres metrics scraping is shutting down");
+            }
+        }
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/prometheus_exporter.rs b/core/node/node_framework/src/implementations/layers/prometheus_exporter.rs
index 95477291e432..3a5b0f2dd93b 100644
--- a/core/node/node_framework/src/implementations/layers/prometheus_exporter.rs
+++ b/core/node/node_framework/src/implementations/layers/prometheus_exporter.rs
@@ -1,19 +1,22 @@
-use prometheus_exporter::PrometheusExporterConfig;
 use zksync_health_check::{HealthStatus, HealthUpdater, ReactiveHealthCheck};
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 use crate::{
     implementations::resources::healthcheck::AppHealthCheckResource,
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId, TaskKind},
     wiring_layer::{WiringError, WiringLayer},
 };
 
-/// Builder for a prometheus exporter.
+/// Wiring layer for Prometheus exporter server.
 ///
-/// ## Effects
+/// ## Requests resources
 ///
-/// - Adds prometheus health check to the `ResourceCollection<HealthCheckResource>`.
-/// - Adds `prometheus_exporter` to the node.
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds tasks
+///
+/// - `PrometheusExporterTask`
 #[derive(Debug)]
 pub struct PrometheusExporterLayer(pub PrometheusExporterConfig);
 
@@ -33,15 +36,15 @@ impl WiringLayer for PrometheusExporterLayer {
         let (prometheus_health_check, prometheus_health_updater) =
             ReactiveHealthCheck::new("prometheus_exporter");
 
-        let AppHealthCheckResource(app_health) = node.get_resource_or_default().await;
+        let AppHealthCheckResource(app_health) = node.get_resource_or_default();
         app_health
             .insert_component(prometheus_health_check)
             .map_err(WiringError::internal)?;
 
-        let task = Box::new(PrometheusExporterTask {
+        let task = PrometheusExporterTask {
             config: self.0,
             prometheus_health_updater,
-        });
+        };
 
         node.add_task(task);
         Ok(())
@@ -50,8 +53,12 @@ impl WiringLayer for PrometheusExporterLayer {
 
 #[async_trait::async_trait]
 impl Task for PrometheusExporterTask {
-    fn name(&self) -> &'static str {
-        "prometheus_exporter"
+    fn kind(&self) -> TaskKind {
+        TaskKind::UnconstrainedTask
+    }
+
+    fn id(&self) -> TaskId {
+        "prometheus_exporter".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
diff --git a/core/node/node_framework/src/implementations/layers/proof_data_handler.rs b/core/node/node_framework/src/implementations/layers/proof_data_handler.rs
index b9ea91179dde..b7c543f3d4ab 100644
--- a/core/node/node_framework/src/implementations/layers/proof_data_handler.rs
+++ b/core/node/node_framework/src/implementations/layers/proof_data_handler.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
 use zksync_config::configs::ProofDataHandlerConfig;
 use zksync_dal::{ConnectionPool, Core};
 use zksync_object_store::ObjectStore;
+use zksync_types::commitment::L1BatchCommitmentMode;
 
 use crate::{
     implementations::resources::{
@@ -10,26 +11,34 @@ use crate::{
         pools::{MasterPool, PoolResource},
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
-/// Builder for a proof data handler.
+/// Wiring layer for proof data handler server.
 ///
-/// ## Effects
+/// ## Requests resources
 ///
-/// - Resolves `PoolResource<MasterPool>`.
-/// - Resolves `ObjectStoreResource`.
-/// - Adds `proof_data_handler` to the node.
+/// - `PoolResource<MasterPool>`
+/// - `ObjectStoreResource`
+///
+/// ## Adds tasks
+///
+/// - `ProofDataHandlerTask`
 #[derive(Debug)]
 pub struct ProofDataHandlerLayer {
     proof_data_handler_config: ProofDataHandlerConfig,
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 impl ProofDataHandlerLayer {
-    pub fn new(proof_data_handler_config: ProofDataHandlerConfig) -> Self {
+    pub fn new(
+        proof_data_handler_config: ProofDataHandlerConfig,
+        commitment_mode: L1BatchCommitmentMode,
+    ) -> Self {
         Self {
             proof_data_handler_config,
+            commitment_mode,
         }
     }
 }
@@ -41,16 +50,17 @@ impl WiringLayer for ProofDataHandlerLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let pool_resource = context.get_resource::<PoolResource<MasterPool>>().await?;
+        let pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
         let main_pool = pool_resource.get().await.unwrap();
 
-        let object_store = context.get_resource::<ObjectStoreResource>().await?;
+        let object_store = context.get_resource::<ObjectStoreResource>()?;
 
-        context.add_task(Box::new(ProofDataHandlerTask {
+        context.add_task(ProofDataHandlerTask {
             proof_data_handler_config: self.proof_data_handler_config,
             blob_store: object_store.0,
             main_pool,
-        }));
+            commitment_mode: self.commitment_mode,
+        });
 
         Ok(())
     }
@@ -61,12 +71,13 @@ struct ProofDataHandlerTask {
     proof_data_handler_config: ProofDataHandlerConfig,
     blob_store: Arc<dyn ObjectStore>,
     main_pool: ConnectionPool<Core>,
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 #[async_trait::async_trait]
 impl Task for ProofDataHandlerTask {
-    fn name(&self) -> &'static str {
-        "proof_data_handler"
+    fn id(&self) -> TaskId {
+        "proof_data_handler".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -74,6 +85,7 @@ impl Task for ProofDataHandlerTask {
             self.proof_data_handler_config,
             self.blob_store,
             self.main_pool,
+            self.commitment_mode,
             stop_receiver.0,
         )
         .await
diff --git a/core/node/node_framework/src/implementations/layers/pruning.rs b/core/node/node_framework/src/implementations/layers/pruning.rs
new file mode 100644
index 000000000000..c5acefcbebdd
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/pruning.rs
@@ -0,0 +1,85 @@
+use std::time::Duration;
+
+use zksync_node_db_pruner::{DbPruner, DbPrunerConfig};
+
+use crate::{
+    implementations::resources::{
+        healthcheck::AppHealthCheckResource,
+        pools::{MasterPool, PoolResource},
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for node pruning layer.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds tasks
+///
+/// - `DbPruner`
+#[derive(Debug)]
+pub struct PruningLayer {
+    pruning_removal_delay: Duration,
+    pruning_chunk_size: u32,
+    minimum_l1_batch_age: Duration,
+}
+
+impl PruningLayer {
+    pub fn new(
+        pruning_removal_delay: Duration,
+        pruning_chunk_size: u32,
+        minimum_l1_batch_age: Duration,
+    ) -> Self {
+        Self {
+            pruning_removal_delay,
+            pruning_chunk_size,
+            minimum_l1_batch_age,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for PruningLayer {
+    fn layer_name(&self) -> &'static str {
+        "pruning_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
+        let main_pool = pool_resource.get().await?;
+
+        let db_pruner = DbPruner::new(
+            DbPrunerConfig {
+                removal_delay: self.pruning_removal_delay,
+                pruned_batch_chunk_size: self.pruning_chunk_size,
+                minimum_l1_batch_age: self.minimum_l1_batch_age,
+            },
+            main_pool,
+        );
+
+        let AppHealthCheckResource(app_health) = context.get_resource_or_default();
+        app_health
+            .insert_component(db_pruner.health_check())
+            .map_err(WiringError::internal)?;
+
+        context.add_task(db_pruner);
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for DbPruner {
+    fn id(&self) -> TaskId {
+        "db_pruner".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run(stop_receiver.0).await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/query_eth_client.rs b/core/node/node_framework/src/implementations/layers/query_eth_client.rs
index f7b3164695e5..36f0c8176609 100644
--- a/core/node/node_framework/src/implementations/layers/query_eth_client.rs
+++ b/core/node/node_framework/src/implementations/layers/query_eth_client.rs
@@ -1,6 +1,6 @@
 use anyhow::Context;
-use zksync_eth_client::clients::QueryClient;
-use zksync_types::url::SensitiveUrl;
+use zksync_types::{url::SensitiveUrl, L1ChainId};
+use zksync_web3_decl::client::Client;
 
 use crate::{
     implementations::resources::eth_interface::EthInterfaceResource,
@@ -8,14 +8,20 @@ use crate::{
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for Ethereum client.
+///
+/// ## Adds resources
+///
+/// - `EthInterfaceResource`
 #[derive(Debug)]
 pub struct QueryEthClientLayer {
+    chain_id: L1ChainId,
     web3_url: SensitiveUrl,
 }
 
 impl QueryEthClientLayer {
-    pub fn new(web3_url: SensitiveUrl) -> Self {
-        Self { web3_url }
+    pub fn new(chain_id: L1ChainId, web3_url: SensitiveUrl) -> Self {
+        Self { chain_id, web3_url }
     }
 }
 
@@ -26,7 +32,10 @@ impl WiringLayer for QueryEthClientLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let query_client = QueryClient::new(self.web3_url.clone()).context("QueryClient::new()")?;
+        let query_client = Client::http(self.web3_url.clone())
+            .context("Client::new()")?
+            .for_network(self.chain_id.into())
+            .build();
         context.insert_resource(EthInterfaceResource(Box::new(query_client)))?;
         Ok(())
     }
diff --git a/core/node/node_framework/src/implementations/layers/reorg_detector_checker.rs b/core/node/node_framework/src/implementations/layers/reorg_detector_checker.rs
new file mode 100644
index 000000000000..0d846501a568
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/reorg_detector_checker.rs
@@ -0,0 +1,100 @@
+use std::time::Duration;
+
+use anyhow::Context;
+use zksync_dal::{ConnectionPool, Core};
+use zksync_reorg_detector::{self, ReorgDetector};
+
+use crate::{
+    implementations::resources::{
+        main_node_client::MainNodeClientResource,
+        pools::{MasterPool, PoolResource},
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId, TaskKind},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+const REORG_DETECTED_SLEEP_INTERVAL: Duration = Duration::from_secs(1);
+
+/// Wiring layer for [`ReorgDetector`] checker.
+/// This layer is responsible for detecting reorgs and preventing the node from starting if it occurs.
+///
+/// ## Requests resources
+///
+/// - `MainNodeClientResource`
+/// - `PoolResource<MasterPool>`
+///
+/// ## Adds preconditions
+///
+/// - `CheckerPrecondition`
+#[derive(Debug)]
+pub struct ReorgDetectorCheckerLayer;
+
+#[async_trait::async_trait]
+impl WiringLayer for ReorgDetectorCheckerLayer {
+    fn layer_name(&self) -> &'static str {
+        "reorg_detector_checker_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        // Get resources.
+        let main_node_client = context.get_resource::<MainNodeClientResource>()?.0;
+
+        let pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
+        let pool = pool_resource.get().await?;
+
+        // Create and insert precondition.
+        context.add_task(CheckerPrecondition {
+            pool: pool.clone(),
+            reorg_detector: ReorgDetector::new(main_node_client, pool),
+        });
+
+        Ok(())
+    }
+}
+
+pub struct CheckerPrecondition {
+    pool: ConnectionPool<Core>,
+    reorg_detector: ReorgDetector,
+}
+
+#[async_trait::async_trait]
+impl Task for CheckerPrecondition {
+    fn kind(&self) -> TaskKind {
+        TaskKind::Precondition
+    }
+
+    fn id(&self) -> TaskId {
+        "reorg_detector_checker".into()
+    }
+
+    async fn run(mut self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        // Given that this is a precondition -- i.e. something that starts before some invariants are met,
+        // we need to first ensure that there is at least one batch in the database (there may be none if
+        // either genesis or snapshot recovery has not been performed yet).
+        let earliest_batch = zksync_dal::helpers::wait_for_l1_batch(
+            &self.pool,
+            REORG_DETECTED_SLEEP_INTERVAL,
+            &mut stop_receiver.0,
+        )
+        .await?;
+        if earliest_batch.is_none() {
+            // Stop signal received.
+            return Ok(());
+        }
+
+        loop {
+            match self.reorg_detector.run_once(stop_receiver.0.clone()).await {
+                Ok(()) => return Ok(()),
+                Err(zksync_reorg_detector::Error::ReorgDetected(last_correct_l1_batch)) => {
+                    tracing::warn!(
+                        "Reorg detected, last correct L1 batch #{}. Waiting till it will be resolved. Sleep for {} seconds and retry",
+                        last_correct_l1_batch, REORG_DETECTED_SLEEP_INTERVAL.as_secs()
+                    );
+                    tokio::time::sleep(REORG_DETECTED_SLEEP_INTERVAL).await;
+                }
+                Err(err) => return Err(err).context("reorg_detector.check_consistency()"),
+            }
+        }
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/reorg_detector_runner.rs b/core/node/node_framework/src/implementations/layers/reorg_detector_runner.rs
new file mode 100644
index 000000000000..04ebb9ec3c14
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/reorg_detector_runner.rs
@@ -0,0 +1,85 @@
+use std::sync::Arc;
+
+use anyhow::Context;
+use zksync_block_reverter::BlockReverter;
+use zksync_reorg_detector::{self, ReorgDetector};
+
+use crate::{
+    implementations::resources::{
+        main_node_client::MainNodeClientResource,
+        pools::{MasterPool, PoolResource},
+        reverter::BlockReverterResource,
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId, TaskKind},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for [`ReorgDetector`] runner.
+/// Layer responsible for detecting reorg and reverting blocks in case it was found.
+///
+/// ## Requests resources
+///
+/// - `MainNodeClientResource`
+/// - `PoolResource<MasterPool>`
+/// - `BlockReverterResource`
+///
+/// ## Adds oneshot tasks
+///
+/// - `RunnerUnconstrainedOneshotTask`
+#[derive(Debug)]
+pub struct ReorgDetectorRunnerLayer;
+
+#[async_trait::async_trait]
+impl WiringLayer for ReorgDetectorRunnerLayer {
+    fn layer_name(&self) -> &'static str {
+        "reorg_detector_runner_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        // Get resources.
+        let main_node_client = context.get_resource::<MainNodeClientResource>()?.0;
+
+        let pool_resource = context.get_resource::<PoolResource<MasterPool>>()?;
+        let pool = pool_resource.get().await?;
+
+        let reverter = context.get_resource::<BlockReverterResource>()?.0;
+
+        // Create and insert task.
+        context.add_task(RunnerUnconstrainedOneshotTask {
+            reorg_detector: ReorgDetector::new(main_node_client, pool),
+            reverter,
+        });
+
+        Ok(())
+    }
+}
+
+pub struct RunnerUnconstrainedOneshotTask {
+    reorg_detector: ReorgDetector,
+    reverter: Arc<BlockReverter>,
+}
+
+#[async_trait::async_trait]
+impl Task for RunnerUnconstrainedOneshotTask {
+    fn kind(&self) -> TaskKind {
+        TaskKind::UnconstrainedOneshotTask
+    }
+
+    fn id(&self) -> TaskId {
+        "reorg_detector_runner".into()
+    }
+
+    async fn run(mut self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        match self.reorg_detector.run_once(stop_receiver.0.clone()).await {
+            Ok(()) => {}
+            Err(zksync_reorg_detector::Error::ReorgDetected(last_correct_l1_batch)) => {
+                tracing::info!("Reverting to l1 batch number {last_correct_l1_batch}");
+                self.reverter.roll_back(last_correct_l1_batch).await?;
+                tracing::info!("Revert successfully completed");
+            }
+            Err(err) => return Err(err).context("reorg_detector.check_consistency()"),
+        }
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/sigint.rs b/core/node/node_framework/src/implementations/layers/sigint.rs
index a028be97995d..9df13285b3a1 100644
--- a/core/node/node_framework/src/implementations/layers/sigint.rs
+++ b/core/node/node_framework/src/implementations/layers/sigint.rs
@@ -2,12 +2,16 @@ use tokio::sync::oneshot;
 
 use crate::{
     service::{ServiceContext, StopReceiver},
-    task::UnconstrainedTask,
+    task::{Task, TaskId, TaskKind},
     wiring_layer::{WiringError, WiringLayer},
 };
 
-/// Layer that changes the handling of SIGINT signal, preventing an immediate shutdown.
+/// Wiring layer that changes the handling of SIGINT signal, preventing an immediate shutdown.
 /// Instead, it would propagate the signal to the rest of the node, allowing it to shut down gracefully.
+///
+/// ## Adds tasks
+///
+/// - `SigintHandlerTask`
 #[derive(Debug)]
 pub struct SigintHandlerLayer;
 
@@ -19,7 +23,7 @@ impl WiringLayer for SigintHandlerLayer {
 
     async fn wire(self: Box<Self>, mut node: ServiceContext<'_>) -> Result<(), WiringError> {
         // SIGINT may happen at any time, so we must handle it as soon as it happens.
-        node.add_unconstrained_task(Box::new(SigintHandlerTask));
+        node.add_task(SigintHandlerTask);
         Ok(())
     }
 }
@@ -28,15 +32,16 @@ impl WiringLayer for SigintHandlerLayer {
 struct SigintHandlerTask;
 
 #[async_trait::async_trait]
-impl UnconstrainedTask for SigintHandlerTask {
-    fn name(&self) -> &'static str {
-        "sigint_handler"
+impl Task for SigintHandlerTask {
+    fn kind(&self) -> TaskKind {
+        TaskKind::UnconstrainedTask
     }
 
-    async fn run_unconstrained(
-        self: Box<Self>,
-        mut stop_receiver: StopReceiver,
-    ) -> anyhow::Result<()> {
+    fn id(&self) -> TaskId {
+        "sigint_handler".into()
+    }
+
+    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
         let (sigint_sender, sigint_receiver) = oneshot::channel();
         let mut sigint_sender = Some(sigint_sender); // Has to be done this way since `set_handler` requires `FnMut`.
         ctrlc::set_handler(move || {
@@ -51,7 +56,9 @@ impl UnconstrainedTask for SigintHandlerTask {
 
         // Wait for either SIGINT or stop signal.
         tokio::select! {
-            _ = sigint_receiver => {},
+            _ = sigint_receiver => {
+                tracing::info!("Received SIGINT signal");
+            },
             _ = stop_receiver.0.changed() => {},
         };
 
diff --git a/core/node/node_framework/src/implementations/layers/state_keeper/external_io.rs b/core/node/node_framework/src/implementations/layers/state_keeper/external_io.rs
new file mode 100644
index 000000000000..e923bc9f567a
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/state_keeper/external_io.rs
@@ -0,0 +1,81 @@
+use std::sync::Arc;
+
+use anyhow::Context as _;
+use zksync_node_sync::{ActionQueue, ExternalIO, SyncState};
+use zksync_state_keeper::seal_criteria::NoopSealer;
+use zksync_types::L2ChainId;
+
+use crate::{
+    implementations::resources::{
+        action_queue::ActionQueueSenderResource,
+        main_node_client::MainNodeClientResource,
+        pools::{MasterPool, PoolResource},
+        state_keeper::{ConditionalSealerResource, StateKeeperIOResource},
+        sync_state::SyncStateResource,
+    },
+    resource::Unique,
+    service::ServiceContext,
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for `ExternalIO`, an IO part of state keeper used by the external node.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `MainNodeClientResource`
+///
+/// ## Adds resources
+///
+/// - `SyncStateResource`
+/// - `ActionQueueSenderResource`
+/// - `StateKeeperIOResource`
+/// - `ConditionalSealerResource`
+#[derive(Debug)]
+pub struct ExternalIOLayer {
+    chain_id: L2ChainId,
+}
+
+impl ExternalIOLayer {
+    pub fn new(chain_id: L2ChainId) -> Self {
+        Self { chain_id }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for ExternalIOLayer {
+    fn layer_name(&self) -> &'static str {
+        "external_io_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        // Fetch required resources.
+        let master_pool = context.get_resource::<PoolResource<MasterPool>>()?;
+        let MainNodeClientResource(main_node_client) = context.get_resource()?;
+
+        // Create `SyncState` resource.
+        let sync_state = SyncState::default();
+        context.insert_resource(SyncStateResource(sync_state))?;
+
+        // Create `ActionQueueSender` resource.
+        let (action_queue_sender, action_queue) = ActionQueue::new();
+        context.insert_resource(ActionQueueSenderResource(Unique::new(action_queue_sender)))?;
+
+        // Create external IO resource.
+        let io_pool = master_pool.get().await.context("Get master pool")?;
+        let io = ExternalIO::new(
+            io_pool,
+            action_queue,
+            Box::new(main_node_client.for_component("external_io")),
+            self.chain_id,
+        )
+        .await
+        .context("Failed initializing I/O for external node state keeper")?;
+        context.insert_resource(StateKeeperIOResource(Unique::new(Box::new(io))))?;
+
+        // Create sealer.
+        context.insert_resource(ConditionalSealerResource(Arc::new(NoopSealer)))?;
+
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/state_keeper/main_batch_executor.rs b/core/node/node_framework/src/implementations/layers/state_keeper/main_batch_executor.rs
index d460b0725277..796b147d1c60 100644
--- a/core/node/node_framework/src/implementations/layers/state_keeper/main_batch_executor.rs
+++ b/core/node/node_framework/src/implementations/layers/state_keeper/main_batch_executor.rs
@@ -1,31 +1,28 @@
-use std::sync::Arc;
-
-use zksync_config::{configs::chain::StateKeeperConfig, DBConfig};
-use zksync_core::state_keeper::{AsyncRocksdbCache, MainBatchExecutor};
-use zksync_state::{AsyncCatchupTask, RocksdbStorageOptions};
+use zksync_state_keeper::MainBatchExecutor;
 
 use crate::{
-    implementations::resources::{
-        pools::{MasterPool, PoolResource},
-        state_keeper::BatchExecutorResource,
-    },
+    implementations::resources::state_keeper::BatchExecutorResource,
     resource::Unique,
-    service::{ServiceContext, StopReceiver},
-    task::Task,
+    service::ServiceContext,
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for `MainBatchExecutor`, part of the state keeper responsible for running the VM.
+///
+/// ## Adds resources
+///
+/// - `MainBatchExecutor`
 #[derive(Debug)]
 pub struct MainBatchExecutorLayer {
-    db_config: DBConfig,
-    state_keeper_config: StateKeeperConfig,
+    save_call_traces: bool,
+    optional_bytecode_compression: bool,
 }
 
 impl MainBatchExecutorLayer {
-    pub fn new(db_config: DBConfig, state_keeper_config: StateKeeperConfig) -> Self {
+    pub fn new(save_call_traces: bool, optional_bytecode_compression: bool) -> Self {
         Self {
-            db_config,
-            state_keeper_config,
+            save_call_traces,
+            optional_bytecode_compression,
         }
     }
 }
@@ -37,44 +34,10 @@ impl WiringLayer for MainBatchExecutorLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let master_pool = context.get_resource::<PoolResource<MasterPool>>().await?;
-
-        let cache_options = RocksdbStorageOptions {
-            block_cache_capacity: self
-                .db_config
-                .experimental
-                .state_keeper_db_block_cache_capacity(),
-            max_open_files: self.db_config.experimental.state_keeper_db_max_open_files,
-        };
-        let (storage_factory, task) = AsyncRocksdbCache::new(
-            master_pool.get_singleton().await?,
-            self.db_config.state_keeper_db_path,
-            cache_options,
-        );
-        let builder = MainBatchExecutor::new(
-            Arc::new(storage_factory),
-            self.state_keeper_config.save_call_traces,
-            false,
-        );
+        let builder =
+            MainBatchExecutor::new(self.save_call_traces, self.optional_bytecode_compression);
 
         context.insert_resource(BatchExecutorResource(Unique::new(Box::new(builder))))?;
-        context.add_task(Box::new(RocksdbCatchupTask(task)));
-        Ok(())
-    }
-}
-
-#[derive(Debug)]
-struct RocksdbCatchupTask(AsyncCatchupTask);
-
-#[async_trait::async_trait]
-impl Task for RocksdbCatchupTask {
-    fn name(&self) -> &'static str {
-        "state_keeper/rocksdb_catchup_task"
-    }
-
-    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        self.0.run(stop_receiver.0.clone()).await?;
-        stop_receiver.0.changed().await?;
         Ok(())
     }
 }
diff --git a/core/node/node_framework/src/implementations/layers/state_keeper/mempool_io.rs b/core/node/node_framework/src/implementations/layers/state_keeper/mempool_io.rs
index 0346ef2c72cc..05eff33303a5 100644
--- a/core/node/node_framework/src/implementations/layers/state_keeper/mempool_io.rs
+++ b/core/node/node_framework/src/implementations/layers/state_keeper/mempool_io.rs
@@ -1,34 +1,43 @@
 use std::sync::Arc;
 
 use anyhow::Context as _;
-use zksync_config::{
-    configs::{
-        chain::{MempoolConfig, NetworkConfig, StateKeeperConfig},
-        wallets,
-    },
-    ContractsConfig,
-};
-use zksync_core::state_keeper::{
-    self, MempoolFetcher, MempoolGuard, MempoolIO, OutputHandler, SequencerSealer,
-    StateKeeperPersistence,
+use zksync_config::configs::{
+    chain::{MempoolConfig, StateKeeperConfig},
+    wallets,
 };
+use zksync_state_keeper::{MempoolFetcher, MempoolGuard, MempoolIO, SequencerSealer};
+use zksync_types::L2ChainId;
 
 use crate::{
     implementations::resources::{
         fee_input::FeeInputResource,
         pools::{MasterPool, PoolResource},
-        state_keeper::{ConditionalSealerResource, OutputHandlerResource, StateKeeperIOResource},
+        state_keeper::{ConditionalSealerResource, StateKeeperIOResource},
     },
     resource::Unique,
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for `MempoolIO`, an IO part of state keeper used by the main node.
+///
+/// ## Requests resources
+///
+/// - `FeeInputResource`
+/// - `PoolResource<MasterPool>`
+///
+/// ## Adds resources
+///
+/// - `StateKeeperIOResource`
+/// - `ConditionalSealerResource`
+///
+/// ## Adds tasks
+///
+/// - `MempoolFetcherTask`
 #[derive(Debug)]
 pub struct MempoolIOLayer {
-    network_config: NetworkConfig,
-    contracts_config: ContractsConfig,
+    zksync_network_id: L2ChainId,
     state_keeper_config: StateKeeperConfig,
     mempool_config: MempoolConfig,
     wallets: wallets::StateKeeper,
@@ -36,15 +45,13 @@ pub struct MempoolIOLayer {
 
 impl MempoolIOLayer {
     pub fn new(
-        network_config: NetworkConfig,
-        contracts_config: ContractsConfig,
+        zksync_network_id: L2ChainId,
         state_keeper_config: StateKeeperConfig,
         mempool_config: MempoolConfig,
         wallets: wallets::StateKeeper,
     ) -> Self {
         Self {
-            network_config,
-            contracts_config,
+            zksync_network_id,
             state_keeper_config,
             mempool_config,
             wallets,
@@ -77,21 +84,8 @@ impl WiringLayer for MempoolIOLayer {
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
         // Fetch required resources.
-        let batch_fee_input_provider = context.get_resource::<FeeInputResource>().await?.0;
-        let master_pool = context.get_resource::<PoolResource<MasterPool>>().await?;
-
-        // Create miniblock sealer task.
-        let (persistence, l2_block_sealer) = StateKeeperPersistence::new(
-            master_pool
-                .get_singleton()
-                .await
-                .context("Get master pool")?,
-            self.contracts_config.l2_shared_bridge_addr.unwrap(),
-            self.state_keeper_config.l2_block_seal_queue_capacity,
-        );
-        let output_handler = OutputHandler::new(Box::new(persistence));
-        context.insert_resource(OutputHandlerResource(Unique::new(output_handler)))?;
-        context.add_task(Box::new(L2BlockSealerTask(l2_block_sealer)));
+        let batch_fee_input_provider = context.get_resource::<FeeInputResource>()?.0;
+        let master_pool = context.get_resource::<PoolResource<MasterPool>>()?;
 
         // Create mempool fetcher task.
         let mempool_guard = self.build_mempool_guard(&master_pool).await?;
@@ -105,7 +99,7 @@ impl WiringLayer for MempoolIOLayer {
             &self.mempool_config,
             mempool_fetcher_pool,
         );
-        context.add_task(Box::new(MempoolFetcherTask(mempool_fetcher)));
+        context.add_task(MempoolFetcherTask(mempool_fetcher));
 
         // Create mempool IO resource.
         let mempool_db_pool = master_pool
@@ -119,7 +113,7 @@ impl WiringLayer for MempoolIOLayer {
             &self.state_keeper_config,
             self.wallets.fee_account.address(),
             self.mempool_config.delay_interval(),
-            self.network_config.zksync_network_id,
+            self.zksync_network_id,
         )
         .await?;
         context.insert_resource(StateKeeperIOResource(Unique::new(Box::new(io))))?;
@@ -132,28 +126,13 @@ impl WiringLayer for MempoolIOLayer {
     }
 }
 
-#[derive(Debug)]
-struct L2BlockSealerTask(state_keeper::L2BlockSealerTask);
-
-#[async_trait::async_trait]
-impl Task for L2BlockSealerTask {
-    fn name(&self) -> &'static str {
-        "state_keeper/l2_block_sealer"
-    }
-
-    async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
-        // Miniblock sealer will exit itself once sender is dropped.
-        self.0.run().await
-    }
-}
-
 #[derive(Debug)]
 struct MempoolFetcherTask(MempoolFetcher);
 
 #[async_trait::async_trait]
 impl Task for MempoolFetcherTask {
-    fn name(&self) -> &'static str {
-        "state_keeper/mempool_fetcher"
+    fn id(&self) -> TaskId {
+        "state_keeper/mempool_fetcher".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
diff --git a/core/node/node_framework/src/implementations/layers/state_keeper/mod.rs b/core/node/node_framework/src/implementations/layers/state_keeper/mod.rs
index ebdd96ac540f..15237a5b3bd5 100644
--- a/core/node/node_framework/src/implementations/layers/state_keeper/mod.rs
+++ b/core/node/node_framework/src/implementations/layers/state_keeper/mod.rs
@@ -1,32 +1,62 @@
 use std::sync::Arc;
 
 use anyhow::Context;
-use zksync_core::state_keeper::{
-    seal_criteria::ConditionalSealer, BatchExecutor, OutputHandler, StateKeeperIO,
-    ZkSyncStateKeeper,
+use zksync_state::{AsyncCatchupTask, ReadStorageFactory};
+use zksync_state_keeper::{
+    seal_criteria::ConditionalSealer, AsyncRocksdbCache, BatchExecutor, OutputHandler,
+    StateKeeperIO, ZkSyncStateKeeper,
 };
 use zksync_storage::RocksDB;
 
+pub mod external_io;
 pub mod main_batch_executor;
 pub mod mempool_io;
+pub mod output_handler;
+
+// Public re-export to not require the user to directly depend on `zksync_state`.
+pub use zksync_state::RocksdbStorageOptions;
 
 use crate::{
-    implementations::resources::state_keeper::{
-        BatchExecutorResource, ConditionalSealerResource, OutputHandlerResource,
-        StateKeeperIOResource,
+    implementations::resources::{
+        pools::{MasterPool, PoolResource},
+        state_keeper::{
+            BatchExecutorResource, ConditionalSealerResource, OutputHandlerResource,
+            StateKeeperIOResource,
+        },
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
-/// Requests:
+/// Wiring layer for the state keeper.
+///
+/// ## Requests resources
+///
 /// - `StateKeeperIOResource`
 /// - `BatchExecutorResource`
+/// - `OutputHandlerResource`
 /// - `ConditionalSealerResource`
+/// - `PoolResource<MasterPool>`
 ///
+/// ## Adds tasks
+///
+/// - `RocksdbCatchupTask`
+/// - `StateKeeperTask`
 #[derive(Debug)]
-pub struct StateKeeperLayer;
+pub struct StateKeeperLayer {
+    state_keeper_db_path: String,
+    rocksdb_options: RocksdbStorageOptions,
+}
+
+impl StateKeeperLayer {
+    pub fn new(state_keeper_db_path: String, rocksdb_options: RocksdbStorageOptions) -> Self {
+        Self {
+            state_keeper_db_path,
+            rocksdb_options,
+        }
+    }
+}
 
 #[async_trait::async_trait]
 impl WiringLayer for StateKeeperLayer {
@@ -36,31 +66,44 @@ impl WiringLayer for StateKeeperLayer {
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
         let io = context
-            .get_resource::<StateKeeperIOResource>()
-            .await?
+            .get_resource::<StateKeeperIOResource>()?
             .0
             .take()
             .context("StateKeeperIO was provided but taken by some other task")?;
         let batch_executor_base = context
-            .get_resource::<BatchExecutorResource>()
-            .await?
+            .get_resource::<BatchExecutorResource>()?
             .0
             .take()
             .context("L1BatchExecutorBuilder was provided but taken by some other task")?;
         let output_handler = context
-            .get_resource::<OutputHandlerResource>()
-            .await?
+            .get_resource::<OutputHandlerResource>()?
             .0
             .take()
             .context("HandleStateKeeperOutput was provided but taken by another task")?;
-        let sealer = context.get_resource::<ConditionalSealerResource>().await?.0;
+        let sealer = context.get_resource::<ConditionalSealerResource>()?.0;
+        let master_pool = context.get_resource::<PoolResource<MasterPool>>()?;
+
+        let (storage_factory, task) = AsyncRocksdbCache::new(
+            master_pool.get_custom(2).await?,
+            self.state_keeper_db_path,
+            self.rocksdb_options,
+        );
+        context.add_task(RocksdbCatchupTask(task));
 
-        context.add_task(Box::new(StateKeeperTask {
+        context.add_task(StateKeeperTask {
             io,
             batch_executor_base,
             output_handler,
             sealer,
-        }));
+            storage_factory: Arc::new(storage_factory),
+        });
+
+        context.add_shutdown_hook("rocksdb_terminaton", async {
+            // Wait for all the instances of RocksDB to be destroyed.
+            tokio::task::spawn_blocking(RocksDB::await_rocksdb_termination)
+                .await
+                .context("failed terminating RocksDB instances")
+        });
         Ok(())
     }
 }
@@ -71,12 +114,13 @@ struct StateKeeperTask {
     batch_executor_base: Box<dyn BatchExecutor>,
     output_handler: OutputHandler,
     sealer: Arc<dyn ConditionalSealer>,
+    storage_factory: Arc<dyn ReadStorageFactory>,
 }
 
 #[async_trait::async_trait]
 impl Task for StateKeeperTask {
-    fn name(&self) -> &'static str {
-        "state_keeper"
+    fn id(&self) -> TaskId {
+        "state_keeper".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -86,14 +130,24 @@ impl Task for StateKeeperTask {
             self.batch_executor_base,
             self.output_handler,
             self.sealer,
+            self.storage_factory,
         );
-        let result = state_keeper.run().await;
+        state_keeper.run().await
+    }
+}
 
-        // Wait for all the instances of RocksDB to be destroyed.
-        tokio::task::spawn_blocking(RocksDB::await_rocksdb_termination)
-            .await
-            .unwrap();
+#[derive(Debug)]
+struct RocksdbCatchupTask(AsyncCatchupTask);
 
-        result
+#[async_trait::async_trait]
+impl Task for RocksdbCatchupTask {
+    fn id(&self) -> TaskId {
+        "state_keeper/rocksdb_catchup_task".into()
+    }
+
+    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        self.0.run(stop_receiver.0.clone()).await?;
+        stop_receiver.0.changed().await?;
+        Ok(())
     }
 }
diff --git a/core/node/node_framework/src/implementations/layers/state_keeper/output_handler.rs b/core/node/node_framework/src/implementations/layers/state_keeper/output_handler.rs
new file mode 100644
index 000000000000..d79ce9a5846f
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/state_keeper/output_handler.rs
@@ -0,0 +1,136 @@
+use anyhow::Context as _;
+use zksync_state_keeper::{
+    io::seal_logic::l2_block_seal_subtasks::L2BlockSealProcess, OutputHandler,
+    StateKeeperPersistence, TreeWritesPersistence,
+};
+use zksync_types::Address;
+
+use crate::{
+    implementations::resources::{
+        pools::{MasterPool, PoolResource},
+        state_keeper::OutputHandlerResource,
+        sync_state::SyncStateResource,
+    },
+    resource::Unique,
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for the state keeper output handler.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `SyncStateResource` (optional)
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds resources
+///
+/// - `OutputHandlerResource`
+///
+/// ## Adds tasks
+///
+/// - `L2BlockSealerTask`
+#[derive(Debug)]
+pub struct OutputHandlerLayer {
+    l2_shared_bridge_addr: Address,
+    l2_block_seal_queue_capacity: usize,
+    /// Whether transactions should be pre-inserted to DB.
+    /// Should be set to `true` for EN's IO as EN doesn't store transactions in DB
+    /// before they are included into L2 blocks.
+    pre_insert_txs: bool,
+    /// Whether protective reads persistence is enabled.
+    /// Must be `true` for any node that maintains a full Merkle Tree (e.g. any instance of main node).
+    /// May be set to `false` for nodes that do not participate in the sequencing process (e.g. external nodes).
+    protective_reads_persistence_enabled: bool,
+}
+
+impl OutputHandlerLayer {
+    pub fn new(l2_shared_bridge_addr: Address, l2_block_seal_queue_capacity: usize) -> Self {
+        Self {
+            l2_shared_bridge_addr,
+            l2_block_seal_queue_capacity,
+            pre_insert_txs: false,
+            protective_reads_persistence_enabled: true,
+        }
+    }
+
+    pub fn with_pre_insert_txs(mut self, pre_insert_txs: bool) -> Self {
+        self.pre_insert_txs = pre_insert_txs;
+        self
+    }
+
+    pub fn with_protective_reads_persistence_enabled(
+        mut self,
+        protective_reads_persistence_enabled: bool,
+    ) -> Self {
+        self.protective_reads_persistence_enabled = protective_reads_persistence_enabled;
+        self
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for OutputHandlerLayer {
+    fn layer_name(&self) -> &'static str {
+        "state_keeper_output_handler_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        // Fetch required resources.
+        let master_pool = context.get_resource::<PoolResource<MasterPool>>()?;
+        // Use `SyncState` if provided.
+        let sync_state = match context.get_resource::<SyncStateResource>() {
+            Ok(sync_state) => Some(sync_state.0),
+            Err(WiringError::ResourceLacking { .. }) => None,
+            Err(err) => return Err(err),
+        };
+
+        // Create L2 block sealer task and output handler.
+        // L2 Block sealing process is parallelized, so we have to provide enough pooled connections.
+        let persistence_pool = master_pool
+            .get_custom(L2BlockSealProcess::subtasks_len())
+            .await
+            .context("Get master pool")?;
+        let (mut persistence, l2_block_sealer) = StateKeeperPersistence::new(
+            persistence_pool.clone(),
+            self.l2_shared_bridge_addr,
+            self.l2_block_seal_queue_capacity,
+        );
+        if self.pre_insert_txs {
+            persistence = persistence.with_tx_insertion();
+        }
+        if !self.protective_reads_persistence_enabled {
+            // **Important:** Disabling protective reads persistence is only sound if the node will never
+            // run a full Merkle tree OR an accompanying protective-reads-writer is being run.
+            tracing::warn!("Disabling persisting protective reads; this should be safe, but is considered an experimental option at the moment");
+            persistence = persistence.without_protective_reads();
+        }
+
+        let tree_writes_persistence = TreeWritesPersistence::new(persistence_pool);
+        let mut output_handler = OutputHandler::new(Box::new(persistence))
+            .with_handler(Box::new(tree_writes_persistence));
+        if let Some(sync_state) = sync_state {
+            output_handler = output_handler.with_handler(Box::new(sync_state));
+        }
+        context.insert_resource(OutputHandlerResource(Unique::new(output_handler)))?;
+        context.add_task(L2BlockSealerTask(l2_block_sealer));
+
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+struct L2BlockSealerTask(zksync_state_keeper::L2BlockSealerTask);
+
+#[async_trait::async_trait]
+impl Task for L2BlockSealerTask {
+    fn id(&self) -> TaskId {
+        "state_keeper/l2_block_sealer".into()
+    }
+
+    async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        // Miniblock sealer will exit itself once sender is dropped.
+        self.0.run().await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/sync_state_updater.rs b/core/node/node_framework/src/implementations/layers/sync_state_updater.rs
new file mode 100644
index 000000000000..cca96f9ee079
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/sync_state_updater.rs
@@ -0,0 +1,88 @@
+use zksync_dal::{ConnectionPool, Core};
+use zksync_node_sync::SyncState;
+use zksync_web3_decl::client::{DynClient, L2};
+
+use crate::{
+    implementations::resources::{
+        main_node_client::MainNodeClientResource,
+        pools::{MasterPool, PoolResource},
+        sync_state::SyncStateResource,
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for [`SyncState`] maintenance.
+/// If [`SyncStateResource`] is already provided by another layer, this layer does nothing.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `MainNodeClientResource`
+///
+/// ## Adds resources
+///
+/// - `SyncStateResource`
+///
+/// ## Adds tasks
+///
+/// - `SyncStateUpdater`
+#[derive(Debug)]
+pub struct SyncStateUpdaterLayer;
+
+#[async_trait::async_trait]
+impl WiringLayer for SyncStateUpdaterLayer {
+    fn layer_name(&self) -> &'static str {
+        "sync_state_updater_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        if context.get_resource::<SyncStateResource>().is_ok() {
+            // `SyncState` was provided by some other layer -- we assume that the layer that added this resource
+            // will be responsible for its maintenance.
+            tracing::info!(
+                "SyncState was provided by another layer, skipping SyncStateUpdaterLayer"
+            );
+            return Ok(());
+        }
+
+        let pool = context.get_resource::<PoolResource<MasterPool>>()?;
+        let MainNodeClientResource(main_node_client) = context.get_resource()?;
+
+        let sync_state = SyncState::default();
+
+        // Insert resource.
+        context.insert_resource(SyncStateResource(sync_state.clone()))?;
+
+        // Insert task
+        context.add_task(SyncStateUpdater {
+            sync_state,
+            connection_pool: pool.get().await?,
+            main_node_client,
+        });
+
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+struct SyncStateUpdater {
+    sync_state: SyncState,
+    connection_pool: ConnectionPool<Core>,
+    main_node_client: Box<DynClient<L2>>,
+}
+
+#[async_trait::async_trait]
+impl Task for SyncStateUpdater {
+    fn id(&self) -> TaskId {
+        "sync_state_updater".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        self.sync_state
+            .run_updater(self.connection_pool, self.main_node_client, stop_receiver.0)
+            .await?;
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/tee_verifier_input_producer.rs b/core/node/node_framework/src/implementations/layers/tee_verifier_input_producer.rs
new file mode 100644
index 000000000000..dc03a0563709
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/tee_verifier_input_producer.rs
@@ -0,0 +1,66 @@
+use zksync_queued_job_processor::JobProcessor;
+use zksync_tee_verifier_input_producer::TeeVerifierInputProducer;
+use zksync_types::L2ChainId;
+
+use crate::{
+    implementations::resources::{
+        object_store::ObjectStoreResource,
+        pools::{MasterPool, PoolResource},
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for [`TeeVerifierInputProducer`].
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+///
+/// ## Adds tasks
+///
+/// - `TeeVerifierInputProducer`
+#[derive(Debug)]
+pub struct TeeVerifierInputProducerLayer {
+    l2_chain_id: L2ChainId,
+}
+
+impl TeeVerifierInputProducerLayer {
+    pub fn new(l2_chain_id: L2ChainId) -> Self {
+        Self { l2_chain_id }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for TeeVerifierInputProducerLayer {
+    fn layer_name(&self) -> &'static str {
+        "tee_verifier_input_producer_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        // Get resources.
+        let pool_resource = context
+            .get_resource::<PoolResource<MasterPool>>()?
+            .get()
+            .await?;
+        let object_store = context.get_resource::<ObjectStoreResource>()?;
+        let tee =
+            TeeVerifierInputProducer::new(pool_resource, object_store.0, self.l2_chain_id).await?;
+
+        context.add_task(tee);
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for TeeVerifierInputProducer {
+    fn id(&self) -> TaskId {
+        "tee_verifier_input_producer".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run(stop_receiver.0, None).await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/tree_data_fetcher.rs b/core/node/node_framework/src/implementations/layers/tree_data_fetcher.rs
new file mode 100644
index 000000000000..76db94f1ac20
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/tree_data_fetcher.rs
@@ -0,0 +1,79 @@
+use zksync_node_sync::tree_data_fetcher::TreeDataFetcher;
+use zksync_types::Address;
+
+use crate::{
+    implementations::resources::{
+        eth_interface::EthInterfaceResource,
+        healthcheck::AppHealthCheckResource,
+        main_node_client::MainNodeClientResource,
+        pools::{MasterPool, PoolResource},
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for [`TreeDataFetcher`].
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+/// - `MainNodeClientResource`
+/// - `EthInterfaceResource`
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds tasks
+///
+/// - `TreeDataFetcher`
+#[derive(Debug)]
+pub struct TreeDataFetcherLayer {
+    diamond_proxy_addr: Address,
+}
+
+impl TreeDataFetcherLayer {
+    pub fn new(diamond_proxy_addr: Address) -> Self {
+        Self { diamond_proxy_addr }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for TreeDataFetcherLayer {
+    fn layer_name(&self) -> &'static str {
+        "tree_data_fetcher_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let pool = context.get_resource::<PoolResource<MasterPool>>()?;
+        let MainNodeClientResource(client) = context.get_resource()?;
+        let EthInterfaceResource(eth_client) = context.get_resource()?;
+
+        tracing::warn!(
+            "Running tree data fetcher (allows a node to operate w/o a Merkle tree or w/o waiting the tree to catch up). \
+             This is an experimental feature; do not use unless you know what you're doing"
+        );
+        let fetcher = TreeDataFetcher::new(client, pool.get().await?)
+            .with_l1_data(eth_client, self.diamond_proxy_addr)?;
+
+        // Insert healthcheck
+        let AppHealthCheckResource(app_health) = context.get_resource_or_default();
+        app_health
+            .insert_component(fetcher.health_check())
+            .map_err(WiringError::internal)?;
+
+        // Insert task
+        context.add_task(fetcher);
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for TreeDataFetcher {
+    fn id(&self) -> TaskId {
+        "tree_data_fetcher".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run(stop_receiver.0).await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/validate_chain_ids.rs b/core/node/node_framework/src/implementations/layers/validate_chain_ids.rs
new file mode 100644
index 000000000000..e3323a01b778
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/validate_chain_ids.rs
@@ -0,0 +1,75 @@
+use zksync_node_sync::validate_chain_ids_task::ValidateChainIdsTask;
+use zksync_types::{L1ChainId, L2ChainId};
+
+use crate::{
+    implementations::resources::{
+        eth_interface::EthInterfaceResource, main_node_client::MainNodeClientResource,
+    },
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId, TaskKind},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for chain ID validation precondition for external node.
+/// Ensures that chain IDs are consistent locally, on main node, and on L1.
+///
+/// ## Requests resources
+///
+/// - `EthInterfaceResource`
+/// - `MainNodeClientResource
+///
+/// ## Adds preconditions
+///
+/// - `ValidateChainIdsTask`
+#[derive(Debug)]
+pub struct ValidateChainIdsLayer {
+    l1_chain_id: L1ChainId,
+    l2_chain_id: L2ChainId,
+}
+
+impl ValidateChainIdsLayer {
+    pub fn new(l1_chain_id: L1ChainId, l2_chain_id: L2ChainId) -> Self {
+        Self {
+            l1_chain_id,
+            l2_chain_id,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for ValidateChainIdsLayer {
+    fn layer_name(&self) -> &'static str {
+        "validate_chain_ids_layer"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let EthInterfaceResource(query_client) = context.get_resource()?;
+        let MainNodeClientResource(main_node_client) = context.get_resource()?;
+
+        let task = ValidateChainIdsTask::new(
+            self.l1_chain_id,
+            self.l2_chain_id,
+            query_client,
+            main_node_client,
+        );
+
+        context.add_task(task);
+
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl Task for ValidateChainIdsTask {
+    fn kind(&self) -> TaskKind {
+        TaskKind::Precondition
+    }
+
+    fn id(&self) -> TaskId {
+        "validate_chain_ids".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run_once(stop_receiver.0).await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/vm_runner/mod.rs b/core/node/node_framework/src/implementations/layers/vm_runner/mod.rs
new file mode 100644
index 000000000000..a105ad81ee60
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/vm_runner/mod.rs
@@ -0,0 +1,34 @@
+use zksync_vm_runner::{ConcurrentOutputHandlerFactoryTask, StorageSyncTask, VmRunnerIo};
+
+use crate::{
+    service::StopReceiver,
+    task::{Task, TaskId},
+};
+
+pub mod protective_reads;
+
+#[async_trait::async_trait]
+impl<Io: VmRunnerIo> Task for StorageSyncTask<Io> {
+    fn id(&self) -> TaskId {
+        format!("vm_runner/{}/storage_sync", self.io().name()).into()
+    }
+
+    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        StorageSyncTask::run(*self, stop_receiver.0.clone()).await?;
+        stop_receiver.0.changed().await?;
+        Ok(())
+    }
+}
+
+#[async_trait::async_trait]
+impl<Io: VmRunnerIo> Task for ConcurrentOutputHandlerFactoryTask<Io> {
+    fn id(&self) -> TaskId {
+        format!("vm_runner/{}/output_handler", self.io().name()).into()
+    }
+
+    async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        ConcurrentOutputHandlerFactoryTask::run(*self, stop_receiver.0.clone()).await?;
+        stop_receiver.0.changed().await?;
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/vm_runner/protective_reads.rs b/core/node/node_framework/src/implementations/layers/vm_runner/protective_reads.rs
new file mode 100644
index 000000000000..6e33cca538fd
--- /dev/null
+++ b/core/node/node_framework/src/implementations/layers/vm_runner/protective_reads.rs
@@ -0,0 +1,93 @@
+use zksync_config::configs::vm_runner::ProtectiveReadsWriterConfig;
+use zksync_types::L2ChainId;
+use zksync_vm_runner::ProtectiveReadsWriter;
+
+use crate::{
+    implementations::resources::pools::{MasterPool, PoolResource},
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
+
+/// Wiring layer for protective reads writer.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+///
+/// ## Adds tasks
+///
+/// - `StorageSyncTask<ProtectiveReadsIo>`
+/// - `ConcurrentOutputHandlerFactoryTask<ProtectiveReadsIo>`
+/// - `ProtectiveReadsWriterTask`
+#[derive(Debug)]
+pub struct ProtectiveReadsWriterLayer {
+    protective_reads_writer_config: ProtectiveReadsWriterConfig,
+    zksync_network_id: L2ChainId,
+}
+
+impl ProtectiveReadsWriterLayer {
+    pub fn new(
+        protective_reads_writer_config: ProtectiveReadsWriterConfig,
+        zksync_network_id: L2ChainId,
+    ) -> Self {
+        Self {
+            protective_reads_writer_config,
+            zksync_network_id,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl WiringLayer for ProtectiveReadsWriterLayer {
+    fn layer_name(&self) -> &'static str {
+        "vm_runner_protective_reads"
+    }
+
+    async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
+        let master_pool = context.get_resource::<PoolResource<MasterPool>>()?;
+
+        let (protective_reads_writer, tasks) = ProtectiveReadsWriter::new(
+            // One for `StorageSyncTask` which can hold a long-term connection in case it needs to
+            // catch up cache.
+            //
+            // One for `ConcurrentOutputHandlerFactoryTask`/`VmRunner` as they need occasional access
+            // to DB for querying last processed batch and last ready to be loaded batch.
+            //
+            // `window_size` connections for `ProtectiveReadsOutputHandlerFactory`
+            // as there can be multiple output handlers holding multi-second connections to write
+            // large amount of protective reads.
+            master_pool
+                .get_custom(self.protective_reads_writer_config.window_size + 2)
+                .await?,
+            self.protective_reads_writer_config.db_path,
+            self.zksync_network_id,
+            self.protective_reads_writer_config.first_processed_batch,
+            self.protective_reads_writer_config.window_size,
+        )
+        .await?;
+
+        context.add_task(tasks.loader_task);
+        context.add_task(tasks.output_handler_factory_task);
+        context.add_task(ProtectiveReadsWriterTask {
+            protective_reads_writer,
+        });
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+struct ProtectiveReadsWriterTask {
+    protective_reads_writer: ProtectiveReadsWriter,
+}
+
+#[async_trait::async_trait]
+impl Task for ProtectiveReadsWriterTask {
+    fn id(&self) -> TaskId {
+        "vm_runner/protective_reads_writer".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        self.protective_reads_writer.run(&stop_receiver.0).await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/web3_api/caches.rs b/core/node/node_framework/src/implementations/layers/web3_api/caches.rs
index 812d898c2005..805e7c91eaeb 100644
--- a/core/node/node_framework/src/implementations/layers/web3_api/caches.rs
+++ b/core/node/node_framework/src/implementations/layers/web3_api/caches.rs
@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use zksync_core::api_server::web3::mempool_cache::{self, MempoolCache};
+use zksync_node_api_server::web3::mempool_cache::{self, MempoolCache};
 
 use crate::{
     implementations::resources::{
@@ -8,10 +8,23 @@ use crate::{
         web3_api::MempoolCacheResource,
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for API mempool cache.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<ReplicaPool>`
+///
+/// ## Adds resources
+///
+/// - `MempoolCacheResource`
+///
+/// ## Adds tasks
+///
+/// - `MempoolCacheUpdateTask`
 #[derive(Debug)]
 pub struct MempoolCacheLayer {
     capacity: usize,
@@ -34,11 +47,11 @@ impl WiringLayer for MempoolCacheLayer {
     }
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
-        let pool_resource = context.get_resource::<PoolResource<ReplicaPool>>().await?;
+        let pool_resource = context.get_resource::<PoolResource<ReplicaPool>>()?;
         let replica_pool = pool_resource.get().await?;
         let mempool_cache = MempoolCache::new(self.capacity);
         let update_task = mempool_cache.update_task(replica_pool, self.update_interval);
-        context.add_task(Box::new(MempoolCacheUpdateTask(update_task)));
+        context.add_task(MempoolCacheUpdateTask(update_task));
         context.insert_resource(MempoolCacheResource(mempool_cache))?;
         Ok(())
     }
@@ -49,8 +62,8 @@ pub struct MempoolCacheUpdateTask(mempool_cache::MempoolCacheUpdateTask);
 
 #[async_trait::async_trait]
 impl Task for MempoolCacheUpdateTask {
-    fn name(&self) -> &'static str {
-        "mempool_cache_update_task"
+    fn id(&self) -> TaskId {
+        "mempool_cache_update_task".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
diff --git a/core/node/node_framework/src/implementations/layers/web3_api/server.rs b/core/node/node_framework/src/implementations/layers/web3_api/server.rs
index 6c29dca5837a..365f49c1122c 100644
--- a/core/node/node_framework/src/implementations/layers/web3_api/server.rs
+++ b/core/node/node_framework/src/implementations/layers/web3_api/server.rs
@@ -3,7 +3,7 @@ use std::{num::NonZeroU32, time::Duration};
 use tokio::{sync::oneshot, task::JoinHandle};
 use zksync_circuit_breaker::replication_lag::ReplicationLagChecker;
 use zksync_config::configs::api::MaxResponseSize;
-use zksync_core::api_server::web3::{state::InternalApiConfig, ApiBuilder, ApiServer, Namespace};
+use zksync_node_api_server::web3::{state::InternalApiConfig, ApiBuilder, ApiServer, Namespace};
 
 use crate::{
     implementations::resources::{
@@ -14,7 +14,7 @@ use crate::{
         web3_api::{MempoolCacheResource, TreeApiClientResource, TxSenderResource},
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
@@ -27,8 +27,11 @@ pub struct Web3ServerOptionalConfig {
     pub batch_request_size_limit: Option<usize>,
     pub response_body_size_limit: Option<MaxResponseSize>,
     pub websocket_requests_per_minute_limit: Option<NonZeroU32>,
-    // used by circuit breaker.
+    pub with_extended_tracing: bool,
+    // Used by circuit breaker.
     pub replication_lag_limit: Option<Duration>,
+    // Used by the external node.
+    pub pruning_info_refresh_interval: Option<Duration>,
 }
 
 impl Web3ServerOptionalConfig {
@@ -53,6 +56,7 @@ impl Web3ServerOptionalConfig {
             api_builder = api_builder
                 .with_websocket_requests_per_minute_limit(websocket_requests_per_minute_limit);
         }
+        api_builder = api_builder.with_extended_tracing(self.with_extended_tracing);
         api_builder
     }
 }
@@ -64,6 +68,22 @@ enum Transport {
     Ws,
 }
 
+/// Wiring layer for Web3 JSON RPC server.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<ReplicaPool>`
+/// - `TxSenderResource`
+/// - `SyncStateResource` (optional)
+/// - `TreeApiClientResource` (optional)
+/// - `MempoolCacheResource`
+/// - `CircuitBreakersResource` (adds a circuit breaker)
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds tasks
+///
+/// - `Web3ApiTask` -- wrapper for all the tasks spawned by the API.
+/// - `ApiTaskGarbageCollector` -- maintenance task that manages API tasks.
 #[derive(Debug)]
 pub struct Web3ServerLayer {
     transport: Transport,
@@ -111,28 +131,29 @@ impl WiringLayer for Web3ServerLayer {
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
         // Get required resources.
-        let replica_resource_pool = context.get_resource::<PoolResource<ReplicaPool>>().await?;
+        let replica_resource_pool = context.get_resource::<PoolResource<ReplicaPool>>()?;
         let updaters_pool = replica_resource_pool.get_custom(2).await?;
         let replica_pool = replica_resource_pool.get().await?;
-        let tx_sender = context.get_resource::<TxSenderResource>().await?.0;
-        let sync_state = match context.get_resource::<SyncStateResource>().await {
+        let tx_sender = context.get_resource::<TxSenderResource>()?.0;
+        let sync_state = match context.get_resource::<SyncStateResource>() {
             Ok(sync_state) => Some(sync_state.0),
             Err(WiringError::ResourceLacking { .. }) => None,
             Err(err) => return Err(err),
         };
-        let tree_api_client = match context.get_resource::<TreeApiClientResource>().await {
+        let tree_api_client = match context.get_resource::<TreeApiClientResource>() {
             Ok(client) => Some(client.0),
             Err(WiringError::ResourceLacking { .. }) => None,
             Err(err) => return Err(err),
         };
-        let MempoolCacheResource(mempool_cache) = context.get_resource().await?;
+        let MempoolCacheResource(mempool_cache) = context.get_resource()?;
 
         // Build server.
         let mut api_builder =
             ApiBuilder::jsonrpsee_backend(self.internal_api_config, replica_pool.clone())
                 .with_updaters_pool(updaters_pool)
                 .with_tx_sender(tx_sender)
-                .with_mempool_cache(mempool_cache);
+                .with_mempool_cache(mempool_cache)
+                .with_extended_tracing(self.optional_config.with_extended_tracing);
         if let Some(client) = tree_api_client {
             api_builder = api_builder.with_tree_api(client);
         }
@@ -147,21 +168,25 @@ impl WiringLayer for Web3ServerLayer {
         if let Some(sync_state) = sync_state {
             api_builder = api_builder.with_sync_state(sync_state);
         }
+        if let Some(pruning_info_refresh_interval) =
+            self.optional_config.pruning_info_refresh_interval
+        {
+            api_builder =
+                api_builder.with_pruning_info_refresh_interval(pruning_info_refresh_interval);
+        }
         let replication_lag_limit = self.optional_config.replication_lag_limit;
         api_builder = self.optional_config.apply(api_builder);
         let server = api_builder.build()?;
 
         // Insert healthcheck.
         let api_health_check = server.health_check();
-        let AppHealthCheckResource(app_health) = context.get_resource_or_default().await;
+        let AppHealthCheckResource(app_health) = context.get_resource_or_default();
         app_health
             .insert_component(api_health_check)
             .map_err(WiringError::internal)?;
 
         // Insert circuit breaker.
-        let circuit_breaker_resource = context
-            .get_resource_or_default::<CircuitBreakersResource>()
-            .await;
+        let circuit_breaker_resource = context.get_resource_or_default::<CircuitBreakersResource>();
         circuit_breaker_resource
             .breakers
             .insert(Box::new(ReplicationLagChecker {
@@ -178,8 +203,8 @@ impl WiringLayer for Web3ServerLayer {
             task_sender,
         };
         let garbage_collector_task = ApiTaskGarbageCollector { task_receiver };
-        context.add_task(Box::new(web3_api_task));
-        context.add_task(Box::new(garbage_collector_task));
+        context.add_task(web3_api_task);
+        context.add_task(garbage_collector_task);
 
         Ok(())
     }
@@ -206,10 +231,10 @@ type ApiJoinHandle = JoinHandle<anyhow::Result<()>>;
 
 #[async_trait::async_trait]
 impl Task for Web3ApiTask {
-    fn name(&self) -> &'static str {
+    fn id(&self) -> TaskId {
         match self.transport {
-            Transport::Http => "web3_http_server",
-            Transport::Ws => "web3_ws_server",
+            Transport::Http => "web3_http_server".into(),
+            Transport::Ws => "web3_ws_server".into(),
         }
     }
 
@@ -232,15 +257,18 @@ struct ApiTaskGarbageCollector {
 
 #[async_trait::async_trait]
 impl Task for ApiTaskGarbageCollector {
-    fn name(&self) -> &'static str {
-        "api_task_garbage_collector"
+    fn id(&self) -> TaskId {
+        "api_task_garbage_collector".into()
     }
 
     async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
         // We can ignore the stop signal here, since we're tied to the main API task through the channel:
         // it'll either get dropped if API cannot be built or will send something through the channel.
         // The tasks it sends are aware of the stop receiver themselves.
-        let tasks = self.task_receiver.await?;
+        let Ok(tasks) = self.task_receiver.await else {
+            // API cannot be built, so there are no tasks to wait for.
+            return Ok(());
+        };
         let _ = futures::future::join_all(tasks).await;
         Ok(())
     }
diff --git a/core/node/node_framework/src/implementations/layers/web3_api/tree_api_client.rs b/core/node/node_framework/src/implementations/layers/web3_api/tree_api_client.rs
index 6380e0bb445a..b481e1ea25d7 100644
--- a/core/node/node_framework/src/implementations/layers/web3_api/tree_api_client.rs
+++ b/core/node/node_framework/src/implementations/layers/web3_api/tree_api_client.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use zksync_core::api_server::tree::TreeApiHttpClient;
+use zksync_metadata_calculator::api_server::TreeApiHttpClient;
 
 use crate::{
     implementations::resources::{
@@ -10,6 +10,18 @@ use crate::{
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer that provides the `TreeApiHttpClient` into the `ServiceContext` resources, if there is no
+/// other client already inserted.
+///
+/// In case a client is already provided in the context, this layer does nothing.
+///
+/// ## Requests resources
+///
+/// - `AppHealthCheckResource` (adds a health check)
+///
+/// ## Adds resources
+///
+/// - `TreeApiClientResource` (if no such resource already exists)
 #[derive(Debug)]
 pub struct TreeApiClientLayer {
     url: Option<String>,
@@ -30,11 +42,25 @@ impl WiringLayer for TreeApiClientLayer {
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
         if let Some(url) = &self.url {
             let client = Arc::new(TreeApiHttpClient::new(url));
-            let AppHealthCheckResource(app_health) = context.get_resource_or_default().await;
+            match context.insert_resource(TreeApiClientResource(client.clone())) {
+                Ok(()) => {
+                    // There was no client added before, we added one.
+                }
+                Err(WiringError::ResourceAlreadyProvided { .. }) => {
+                    // Some other client was already added. We don't want to replace it.
+                    return Ok(());
+                }
+                err @ Err(_) => {
+                    // Propagate any other error.
+                    return err;
+                }
+            }
+
+            // Only provide the health check if necessary.
+            let AppHealthCheckResource(app_health) = context.get_resource_or_default();
             app_health
-                .insert_custom_component(client.clone())
+                .insert_custom_component(client)
                 .map_err(WiringError::internal)?;
-            context.insert_resource(TreeApiClientResource(client))?;
         }
         Ok(())
     }
diff --git a/core/node/node_framework/src/implementations/layers/web3_api/tx_sender.rs b/core/node/node_framework/src/implementations/layers/web3_api/tx_sender.rs
index 35e7aee08403..0b45b3279680 100644
--- a/core/node/node_framework/src/implementations/layers/web3_api/tx_sender.rs
+++ b/core/node/node_framework/src/implementations/layers/web3_api/tx_sender.rs
@@ -1,20 +1,28 @@
-use std::{fmt, sync::Arc};
+use std::{fmt, sync::Arc, time::Duration};
 
-use zksync_core::api_server::{
+use tokio::sync::RwLock;
+use zksync_node_api_server::{
     execution_sandbox::{VmConcurrencyBarrier, VmConcurrencyLimiter},
     tx_sender::{ApiContracts, TxSenderBuilder, TxSenderConfig},
 };
 use zksync_state::PostgresStorageCaches;
+use zksync_types::Address;
+use zksync_web3_decl::{
+    client::{DynClient, L2},
+    jsonrpsee,
+    namespaces::EnNamespaceClient as _,
+};
 
 use crate::{
     implementations::resources::{
         fee_input::FeeInputResource,
+        main_node_client::MainNodeClientResource,
         pools::{PoolResource, ReplicaPool},
         state_keeper::ConditionalSealerResource,
         web3_api::{TxSenderResource, TxSinkResource},
     },
     service::{ServiceContext, StopReceiver},
-    task::Task,
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
@@ -25,12 +33,32 @@ pub struct PostgresStorageCachesConfig {
     pub latest_values_cache_size: u64,
 }
 
+/// Wiring layer for the `TxSender`.
+/// Prepares the `TxSender` itself, as well as the tasks required for its maintenance.
+///
+/// ## Requests resources
+///
+/// - `TxSinkResource`
+/// - `PoolResource<ReplicaPool>`
+/// - `ConditionalSealerResource` (optional)
+/// - `FeeInputResource`
+///
+/// ## Adds resources
+///
+/// - `TxSenderResource`
+///
+/// ## Adds tasks
+///
+/// - `PostgresStorageCachesTask`
+/// - `VmConcurrencyBarrierTask`
+/// - `WhitelistedTokensForAaUpdateTask` (optional)
 #[derive(Debug)]
 pub struct TxSenderLayer {
     tx_sender_config: TxSenderConfig,
     postgres_storage_caches_config: PostgresStorageCachesConfig,
     max_vm_concurrency: usize,
     api_contracts: ApiContracts,
+    whitelisted_tokens_for_aa_cache: bool,
 }
 
 impl TxSenderLayer {
@@ -45,8 +73,18 @@ impl TxSenderLayer {
             postgres_storage_caches_config,
             max_vm_concurrency,
             api_contracts,
+            whitelisted_tokens_for_aa_cache: false,
         }
     }
+
+    /// Enables the task for fetching the whitelisted tokens for the AA cache from the main node.
+    /// Disabled by default.
+    ///
+    /// Requires `MainNodeClientResource` to be present.
+    pub fn with_whitelisted_tokens_for_aa_cache(mut self, value: bool) -> Self {
+        self.whitelisted_tokens_for_aa_cache = value;
+        self
+    }
 }
 
 #[async_trait::async_trait]
@@ -57,15 +95,15 @@ impl WiringLayer for TxSenderLayer {
 
     async fn wire(self: Box<Self>, mut context: ServiceContext<'_>) -> Result<(), WiringError> {
         // Get required resources.
-        let tx_sink = context.get_resource::<TxSinkResource>().await?.0;
-        let pool_resource = context.get_resource::<PoolResource<ReplicaPool>>().await?;
+        let tx_sink = context.get_resource::<TxSinkResource>()?.0;
+        let pool_resource = context.get_resource::<PoolResource<ReplicaPool>>()?;
         let replica_pool = pool_resource.get().await?;
-        let sealer = match context.get_resource::<ConditionalSealerResource>().await {
+        let sealer = match context.get_resource::<ConditionalSealerResource>() {
             Ok(sealer) => Some(sealer.0),
             Err(WiringError::ResourceLacking { .. }) => None,
             Err(other) => return Err(other),
         };
-        let fee_input = context.get_resource::<FeeInputResource>().await?.0;
+        let fee_input = context.get_resource::<FeeInputResource>()?.0;
 
         // Initialize Postgres caches.
         let factory_deps_capacity = self.postgres_storage_caches_config.factory_deps_cache_size;
@@ -79,31 +117,41 @@ impl WiringLayer for TxSenderLayer {
         if values_capacity > 0 {
             let values_cache_task = storage_caches
                 .configure_storage_values_cache(values_capacity, replica_pool.clone());
-            context.add_task(Box::new(PostgresStorageCachesTask {
+            context.add_task(PostgresStorageCachesTask {
                 task: values_cache_task,
-            }));
+            });
         }
 
         // Initialize `VmConcurrencyLimiter`.
         let (vm_concurrency_limiter, vm_concurrency_barrier) =
             VmConcurrencyLimiter::new(self.max_vm_concurrency);
-        context.add_task(Box::new(VmConcurrencyBarrierTask {
+        context.add_task(VmConcurrencyBarrierTask {
             barrier: vm_concurrency_barrier,
-        }));
+        });
 
         // Build `TxSender`.
         let mut tx_sender = TxSenderBuilder::new(self.tx_sender_config, replica_pool, tx_sink);
         if let Some(sealer) = sealer {
             tx_sender = tx_sender.with_sealer(sealer);
         }
-        let tx_sender = tx_sender
-            .build(
-                fee_input,
-                Arc::new(vm_concurrency_limiter),
-                self.api_contracts,
-                storage_caches,
-            )
-            .await;
+
+        // Add the task for updating the whitelisted tokens for the AA cache.
+        if self.whitelisted_tokens_for_aa_cache {
+            let MainNodeClientResource(main_node_client) = context.get_resource()?;
+            let whitelisted_tokens = Arc::new(RwLock::new(Default::default()));
+            context.add_task(WhitelistedTokensForAaUpdateTask {
+                whitelisted_tokens: whitelisted_tokens.clone(),
+                main_node_client,
+            });
+            tx_sender = tx_sender.with_whitelisted_tokens_for_aa(whitelisted_tokens);
+        }
+
+        let tx_sender = tx_sender.build(
+            fee_input,
+            Arc::new(vm_concurrency_limiter),
+            self.api_contracts,
+            storage_caches,
+        );
         context.insert_resource(TxSenderResource(tx_sender))?;
 
         Ok(())
@@ -123,8 +171,8 @@ impl fmt::Debug for PostgresStorageCachesTask {
 
 #[async_trait::async_trait]
 impl Task for PostgresStorageCachesTask {
-    fn name(&self) -> &'static str {
-        "postgres_storage_caches"
+    fn id(&self) -> TaskId {
+        "postgres_storage_caches".into()
     }
 
     async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -138,8 +186,8 @@ struct VmConcurrencyBarrierTask {
 
 #[async_trait::async_trait]
 impl Task for VmConcurrencyBarrierTask {
-    fn name(&self) -> &'static str {
-        "vm_concurrency_barrier_task"
+    fn id(&self) -> TaskId {
+        "vm_concurrency_barrier_task".into()
     }
 
     async fn run(mut self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
@@ -155,3 +203,40 @@ impl Task for VmConcurrencyBarrierTask {
         Ok(())
     }
 }
+
+#[derive(Debug)]
+struct WhitelistedTokensForAaUpdateTask {
+    whitelisted_tokens: Arc<RwLock<Vec<Address>>>,
+    main_node_client: Box<DynClient<L2>>,
+}
+
+#[async_trait::async_trait]
+impl Task for WhitelistedTokensForAaUpdateTask {
+    fn id(&self) -> TaskId {
+        "whitelisted_tokens_for_aa_update_task".into()
+    }
+
+    async fn run(mut self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        while !*stop_receiver.0.borrow_and_update() {
+            match self.main_node_client.whitelisted_tokens_for_aa().await {
+                Ok(tokens) => {
+                    *self.whitelisted_tokens.write().await = tokens;
+                }
+                Err(jsonrpsee::core::client::Error::Call(error))
+                    if error.code() == jsonrpsee::types::error::METHOD_NOT_FOUND_CODE =>
+                {
+                    // Method is not supported by the main node, do nothing.
+                }
+                Err(err) => {
+                    tracing::error!("Failed to query `whitelisted_tokens_for_aa`, error: {err:?}");
+                }
+            }
+
+            // Error here corresponds to a timeout w/o `stop_receiver` changed; we're OK with this.
+            tokio::time::timeout(Duration::from_secs(30), stop_receiver.0.changed())
+                .await
+                .ok();
+        }
+        Ok(())
+    }
+}
diff --git a/core/node/node_framework/src/implementations/layers/web3_api/tx_sink.rs b/core/node/node_framework/src/implementations/layers/web3_api/tx_sink.rs
index bbac8599ab59..f7530f835765 100644
--- a/core/node/node_framework/src/implementations/layers/web3_api/tx_sink.rs
+++ b/core/node/node_framework/src/implementations/layers/web3_api/tx_sink.rs
@@ -1,6 +1,9 @@
 use std::sync::Arc;
 
-use zksync_core::api_server::tx_sender::{master_pool_sink::MasterPoolSink, proxy::TxProxy};
+use zksync_node_api_server::tx_sender::{
+    master_pool_sink::MasterPoolSink,
+    proxy::{AccountNonceSweeperTask, TxProxy},
+};
 
 use crate::{
     implementations::resources::{
@@ -8,10 +11,24 @@ use crate::{
         pools::{MasterPool, PoolResource},
         web3_api::TxSinkResource,
     },
-    service::ServiceContext,
+    service::{ServiceContext, StopReceiver},
+    task::{Task, TaskId},
     wiring_layer::{WiringError, WiringLayer},
 };
 
+/// Wiring layer for `TxSink` -- an abstraction that handles outputs from `TxSender`.
+///
+/// ## Requests resources
+///
+/// - `PoolResource<MasterPool>`
+///
+/// ## Adds resources
+///
+/// - `TxSinkResource`
+///
+/// ## Adds tasks
+///
+/// - `AccountNonceSweeperTask` (only for `ProxySink`)
 #[derive(Debug)]
 #[non_exhaustive]
 pub enum TxSinkLayer {
@@ -29,18 +46,37 @@ impl WiringLayer for TxSinkLayer {
         let tx_sink = match self.as_ref() {
             TxSinkLayer::MasterPoolSink => {
                 let pool = context
-                    .get_resource::<PoolResource<MasterPool>>()
-                    .await?
+                    .get_resource::<PoolResource<MasterPool>>()?
                     .get()
                     .await?;
                 TxSinkResource(Arc::new(MasterPoolSink::new(pool)))
             }
             TxSinkLayer::ProxySink => {
-                let MainNodeClientResource(client) = context.get_resource().await?;
-                TxSinkResource(Arc::new(TxProxy::new(client)))
+                let MainNodeClientResource(client) = context.get_resource()?;
+                let proxy = TxProxy::new(client);
+
+                let pool = context
+                    .get_resource::<PoolResource<MasterPool>>()?
+                    .get_singleton()
+                    .await?;
+                let task = proxy.account_nonce_sweeper_task(pool);
+                context.add_task(task);
+
+                TxSinkResource(Arc::new(proxy))
             }
         };
         context.insert_resource(tx_sink)?;
         Ok(())
     }
 }
+
+#[async_trait::async_trait]
+impl Task for AccountNonceSweeperTask {
+    fn id(&self) -> TaskId {
+        "account_nonce_sweeper_task".into()
+    }
+
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        (*self).run(stop_receiver.0).await
+    }
+}
diff --git a/core/node/node_framework/src/implementations/resources/action_queue.rs b/core/node/node_framework/src/implementations/resources/action_queue.rs
index 18d995688830..b0f70828018b 100644
--- a/core/node/node_framework/src/implementations/resources/action_queue.rs
+++ b/core/node/node_framework/src/implementations/resources/action_queue.rs
@@ -1,7 +1,9 @@
-use zksync_core::sync_layer::ActionQueueSender;
+use zksync_node_sync::ActionQueueSender;
 
 use crate::resource::{Resource, Unique};
 
+/// A resource that provides [`ActionQueueSender`] to the service.
+/// This resource is unique, e.g. it's expected to be consumed by a single service.
 #[derive(Debug, Clone)]
 pub struct ActionQueueSenderResource(pub Unique<ActionQueueSender>);
 
diff --git a/core/node/node_framework/src/implementations/resources/base_token_ratio_provider.rs b/core/node/node_framework/src/implementations/resources/base_token_ratio_provider.rs
new file mode 100644
index 000000000000..9cb43870f76c
--- /dev/null
+++ b/core/node/node_framework/src/implementations/resources/base_token_ratio_provider.rs
@@ -0,0 +1,21 @@
+use std::sync::Arc;
+
+use zksync_base_token_adjuster::{BaseTokenRatioProvider, NoOpRatioProvider};
+
+use crate::resource::Resource;
+
+/// A resource that provides [`BaseTokenRatioProvider`] implementation to the service.
+#[derive(Clone)]
+pub struct BaseTokenRatioProviderResource(pub Arc<dyn BaseTokenRatioProvider>);
+
+impl Default for BaseTokenRatioProviderResource {
+    fn default() -> Self {
+        Self(Arc::new(NoOpRatioProvider::default()))
+    }
+}
+
+impl Resource for BaseTokenRatioProviderResource {
+    fn name() -> String {
+        "common/base_token_ratio_provider".into()
+    }
+}
diff --git a/core/node/node_framework/src/implementations/resources/circuit_breakers.rs b/core/node/node_framework/src/implementations/resources/circuit_breakers.rs
index 6b9eebb7b96e..038d03a31eb0 100644
--- a/core/node/node_framework/src/implementations/resources/circuit_breakers.rs
+++ b/core/node/node_framework/src/implementations/resources/circuit_breakers.rs
@@ -4,6 +4,7 @@ use zksync_circuit_breaker::CircuitBreakers;
 
 use crate::resource::Resource;
 
+/// A resource that provides [`CircuitBreakers`] to the service.
 #[derive(Debug, Clone, Default)]
 pub struct CircuitBreakersResource {
     pub breakers: Arc<CircuitBreakers>,
diff --git a/core/node/node_framework/src/implementations/resources/da_client.rs b/core/node/node_framework/src/implementations/resources/da_client.rs
new file mode 100644
index 000000000000..525164cb9b10
--- /dev/null
+++ b/core/node/node_framework/src/implementations/resources/da_client.rs
@@ -0,0 +1,13 @@
+use zksync_da_client::DataAvailabilityClient;
+
+use crate::resource::Resource;
+
+/// Represents a client of a certain DA solution.
+#[derive(Clone)]
+pub struct DAClientResource(pub Box<dyn DataAvailabilityClient>);
+
+impl Resource for DAClientResource {
+    fn name() -> String {
+        "common/da_client".into()
+    }
+}
diff --git a/core/node/node_framework/src/implementations/resources/eth_interface.rs b/core/node/node_framework/src/implementations/resources/eth_interface.rs
index 215b7cf030de..cf470c0379da 100644
--- a/core/node/node_framework/src/implementations/resources/eth_interface.rs
+++ b/core/node/node_framework/src/implementations/resources/eth_interface.rs
@@ -1,9 +1,11 @@
-use zksync_eth_client::{BoundEthInterface, EthInterface};
+use zksync_eth_client::BoundEthInterface;
+use zksync_web3_decl::client::{DynClient, L1};
 
 use crate::resource::Resource;
 
+/// A resource that provides L1 interface object to the service.
 #[derive(Debug, Clone)]
-pub struct EthInterfaceResource(pub Box<dyn EthInterface>);
+pub struct EthInterfaceResource(pub Box<DynClient<L1>>);
 
 impl Resource for EthInterfaceResource {
     fn name() -> String {
@@ -11,6 +13,7 @@ impl Resource for EthInterfaceResource {
     }
 }
 
+/// A resource that provides L1 interface with signing capabilities to the service.
 #[derive(Debug, Clone)]
 pub struct BoundEthInterfaceResource(pub Box<dyn BoundEthInterface>);
 
@@ -20,6 +23,7 @@ impl Resource for BoundEthInterfaceResource {
     }
 }
 
+/// Same as `BoundEthInterfaceResource`, but for managing EIP-4844 blobs.
 #[derive(Debug, Clone)]
 pub struct BoundEthInterfaceForBlobsResource(pub Box<dyn BoundEthInterface>);
 
diff --git a/core/node/node_framework/src/implementations/resources/fee_input.rs b/core/node/node_framework/src/implementations/resources/fee_input.rs
index fbbf6be3db8c..e3204510c58e 100644
--- a/core/node/node_framework/src/implementations/resources/fee_input.rs
+++ b/core/node/node_framework/src/implementations/resources/fee_input.rs
@@ -4,7 +4,7 @@ use zksync_node_fee_model::BatchFeeModelInputProvider;
 
 use crate::resource::Resource;
 
-/// Wrapper for the batch fee model input provider.
+/// A resource that provides [`BatchFeeModelInputProvider`] implementation to the service.
 #[derive(Debug, Clone)]
 pub struct FeeInputResource(pub Arc<dyn BatchFeeModelInputProvider>);
 
diff --git a/core/node/node_framework/src/implementations/resources/healthcheck.rs b/core/node/node_framework/src/implementations/resources/healthcheck.rs
index e1df3ada8f30..b4810eba46be 100644
--- a/core/node/node_framework/src/implementations/resources/healthcheck.rs
+++ b/core/node/node_framework/src/implementations/resources/healthcheck.rs
@@ -6,6 +6,7 @@ pub use zksync_health_check::{CheckHealth, ReactiveHealthCheck};
 
 use crate::resource::Resource;
 
+/// A resource that provides [`AppHealthCheck`] to the service.
 #[derive(Debug, Clone, Default)]
 pub struct AppHealthCheckResource(pub Arc<AppHealthCheck>);
 
diff --git a/core/node/node_framework/src/implementations/resources/l1_batch_commit_data_generator.rs b/core/node/node_framework/src/implementations/resources/l1_batch_commit_data_generator.rs
deleted file mode 100644
index 90d321257eaf..000000000000
--- a/core/node/node_framework/src/implementations/resources/l1_batch_commit_data_generator.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use std::sync::Arc;
-
-use zksync_eth_sender::l1_batch_commit_data_generator::L1BatchCommitDataGenerator;
-
-use crate::resource::Resource;
-
-#[derive(Debug, Clone)]
-pub struct L1BatchCommitDataGeneratorResource(pub Arc<dyn L1BatchCommitDataGenerator>);
-
-impl Resource for L1BatchCommitDataGeneratorResource {
-    fn name() -> String {
-        "common/l1_batch_commit_data_generator".into()
-    }
-}
diff --git a/core/node/node_framework/src/implementations/resources/l1_tx_params.rs b/core/node/node_framework/src/implementations/resources/l1_tx_params.rs
index 57ba1f4af165..8fd962480b9d 100644
--- a/core/node/node_framework/src/implementations/resources/l1_tx_params.rs
+++ b/core/node/node_framework/src/implementations/resources/l1_tx_params.rs
@@ -4,7 +4,7 @@ use zksync_node_fee_model::l1_gas_price::L1TxParamsProvider;
 
 use crate::resource::Resource;
 
-/// Wrapper for the l1 tx params provider.
+/// A resource that provides [`L1TxParamsProvider`] implementation to the service.
 #[derive(Debug, Clone)]
 pub struct L1TxParamsResource(pub Arc<dyn L1TxParamsProvider>);
 
diff --git a/core/node/node_framework/src/implementations/resources/main_node_client.rs b/core/node/node_framework/src/implementations/resources/main_node_client.rs
index 50a3a9be276c..64a0ac85bef6 100644
--- a/core/node/node_framework/src/implementations/resources/main_node_client.rs
+++ b/core/node/node_framework/src/implementations/resources/main_node_client.rs
@@ -1,9 +1,10 @@
-use zksync_web3_decl::client::BoxedL2Client;
+use zksync_web3_decl::client::{DynClient, L2};
 
 use crate::resource::Resource;
 
+/// A resource that provides L2 interface object to the service.
 #[derive(Debug, Clone)]
-pub struct MainNodeClientResource(pub BoxedL2Client);
+pub struct MainNodeClientResource(pub Box<DynClient<L2>>);
 
 impl Resource for MainNodeClientResource {
     fn name() -> String {
diff --git a/core/node/node_framework/src/implementations/resources/mod.rs b/core/node/node_framework/src/implementations/resources/mod.rs
index 2225fcd2f4c9..cbe08fadb8e9 100644
--- a/core/node/node_framework/src/implementations/resources/mod.rs
+++ b/core/node/node_framework/src/implementations/resources/mod.rs
@@ -1,13 +1,15 @@
 pub mod action_queue;
+pub mod base_token_ratio_provider;
 pub mod circuit_breakers;
+pub mod da_client;
 pub mod eth_interface;
 pub mod fee_input;
 pub mod healthcheck;
-pub mod l1_batch_commit_data_generator;
 pub mod l1_tx_params;
 pub mod main_node_client;
 pub mod object_store;
 pub mod pools;
+pub mod reverter;
 pub mod state_keeper;
 pub mod sync_state;
 pub mod web3_api;
diff --git a/core/node/node_framework/src/implementations/resources/object_store.rs b/core/node/node_framework/src/implementations/resources/object_store.rs
index d53c7540c793..fbfc20d93180 100644
--- a/core/node/node_framework/src/implementations/resources/object_store.rs
+++ b/core/node/node_framework/src/implementations/resources/object_store.rs
@@ -4,7 +4,7 @@ use zksync_object_store::ObjectStore;
 
 use crate::resource::Resource;
 
-/// Wrapper for the object store.
+/// A resource that provides [`ObjectStore`] to the service.
 #[derive(Debug, Clone)]
 pub struct ObjectStoreResource(pub Arc<dyn ObjectStore>);
 
diff --git a/core/node/node_framework/src/implementations/resources/pools.rs b/core/node/node_framework/src/implementations/resources/pools.rs
index 01536a34b907..8355bb1bdd62 100644
--- a/core/node/node_framework/src/implementations/resources/pools.rs
+++ b/core/node/node_framework/src/implementations/resources/pools.rs
@@ -1,5 +1,4 @@
 use std::{
-    fmt,
     sync::{
         atomic::{AtomicU32, Ordering},
         Arc,
@@ -7,37 +6,26 @@ use std::{
     time::Duration,
 };
 
-use prover_dal::Prover;
 use tokio::sync::Mutex;
 use zksync_dal::{ConnectionPool, Core};
 use zksync_db_connection::connection_pool::ConnectionPoolBuilder;
+use zksync_prover_dal::Prover;
 use zksync_types::url::SensitiveUrl;
 
 use crate::resource::Resource;
 
 /// Represents a connection pool to a certain kind of database.
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct PoolResource<P: PoolKind> {
     connections_count: Arc<AtomicU32>,
     url: SensitiveUrl,
     max_connections: u32,
     statement_timeout: Option<Duration>,
+    acquire_timeout: Option<Duration>,
     unbound_pool: Arc<Mutex<Option<ConnectionPool<P::DbMarker>>>>,
     _kind: std::marker::PhantomData<P>,
 }
 
-impl<P: PoolKind> fmt::Debug for PoolResource<P> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("PoolResource")
-            .field("connections_count", &self.connections_count)
-            .field("url", &self.url)
-            .field("max_connections", &self.max_connections)
-            .field("statement_timeout", &self.statement_timeout)
-            .field("unbound_pool", &self.unbound_pool)
-            .finish_non_exhaustive()
-    }
-}
-
 impl<P: PoolKind> Resource for PoolResource<P> {
     fn name() -> String {
         format!("common/{}_pool", P::kind_str())
@@ -49,12 +37,14 @@ impl<P: PoolKind> PoolResource<P> {
         url: SensitiveUrl,
         max_connections: u32,
         statement_timeout: Option<Duration>,
+        acquire_timeout: Option<Duration>,
     ) -> Self {
         Self {
             connections_count: Arc::new(AtomicU32::new(0)),
             url,
             max_connections,
             statement_timeout,
+            acquire_timeout,
             unbound_pool: Arc::new(Mutex::new(None)),
             _kind: std::marker::PhantomData,
         }
@@ -63,6 +53,7 @@ impl<P: PoolKind> PoolResource<P> {
     fn builder(&self) -> ConnectionPoolBuilder<P::DbMarker> {
         let mut builder = ConnectionPool::builder(self.url.clone(), self.max_connections);
         builder.set_statement_timeout(self.statement_timeout);
+        builder.set_acquire_timeout(self.acquire_timeout);
         builder
     }
 
diff --git a/core/node/node_framework/src/implementations/resources/reverter.rs b/core/node/node_framework/src/implementations/resources/reverter.rs
new file mode 100644
index 000000000000..2d24f8fbbaf7
--- /dev/null
+++ b/core/node/node_framework/src/implementations/resources/reverter.rs
@@ -0,0 +1,15 @@
+use std::sync::Arc;
+
+use zksync_block_reverter::BlockReverter;
+
+use crate::resource::Resource;
+
+/// A resource that provides [`BlockReverter`] to the service.
+#[derive(Debug, Clone)]
+pub struct BlockReverterResource(pub Arc<BlockReverter>);
+
+impl Resource for BlockReverterResource {
+    fn name() -> String {
+        "common/block_reverter".into()
+    }
+}
diff --git a/core/node/node_framework/src/implementations/resources/state_keeper.rs b/core/node/node_framework/src/implementations/resources/state_keeper.rs
index 16643c81b5fa..860332f26293 100644
--- a/core/node/node_framework/src/implementations/resources/state_keeper.rs
+++ b/core/node/node_framework/src/implementations/resources/state_keeper.rs
@@ -1,11 +1,13 @@
 use std::sync::Arc;
 
-use zksync_core::state_keeper::{
+use zksync_state_keeper::{
     seal_criteria::ConditionalSealer, BatchExecutor, OutputHandler, StateKeeperIO,
 };
 
 use crate::resource::{Resource, Unique};
 
+/// A resource that provides [`StateKeeperIO`] implementation to the service.
+/// This resource is unique, e.g. it's expected to be consumed by a single service.
 #[derive(Debug, Clone)]
 pub struct StateKeeperIOResource(pub Unique<Box<dyn StateKeeperIO>>);
 
@@ -15,6 +17,8 @@ impl Resource for StateKeeperIOResource {
     }
 }
 
+/// A resource that provides [`BatchExecutor`] implementation to the service.
+/// This resource is unique, e.g. it's expected to be consumed by a single service.
 #[derive(Debug, Clone)]
 pub struct BatchExecutorResource(pub Unique<Box<dyn BatchExecutor>>);
 
@@ -24,6 +28,8 @@ impl Resource for BatchExecutorResource {
     }
 }
 
+/// A resource that provides [`OutputHandler`] implementation to the service.
+/// This resource is unique, e.g. it's expected to be consumed by a single service.
 #[derive(Debug, Clone)]
 pub struct OutputHandlerResource(pub Unique<OutputHandler>);
 
@@ -33,6 +39,7 @@ impl Resource for OutputHandlerResource {
     }
 }
 
+/// A resource that provides [`ConditionalSealer`] implementation to the service.
 #[derive(Debug, Clone)]
 pub struct ConditionalSealerResource(pub Arc<dyn ConditionalSealer>);
 
diff --git a/core/node/node_framework/src/implementations/resources/sync_state.rs b/core/node/node_framework/src/implementations/resources/sync_state.rs
index e5c54cf1bfe9..a65342dd38d6 100644
--- a/core/node/node_framework/src/implementations/resources/sync_state.rs
+++ b/core/node/node_framework/src/implementations/resources/sync_state.rs
@@ -1,12 +1,13 @@
-use zksync_core::sync_layer::SyncState;
+use zksync_node_sync::SyncState;
 
 use crate::resource::Resource;
 
+/// A resource that provides [`SyncState`] to the service.
 #[derive(Debug, Clone)]
 pub struct SyncStateResource(pub SyncState);
 
 impl Resource for SyncStateResource {
     fn name() -> String {
-        "sync_state".into()
+        "common/sync_state".into()
     }
 }
diff --git a/core/node/node_framework/src/implementations/resources/web3_api.rs b/core/node/node_framework/src/implementations/resources/web3_api.rs
index 68d343b9b0ca..9b3716721261 100644
--- a/core/node/node_framework/src/implementations/resources/web3_api.rs
+++ b/core/node/node_framework/src/implementations/resources/web3_api.rs
@@ -1,13 +1,14 @@
 use std::sync::Arc;
 
-use zksync_core::api_server::{
-    tree::TreeApiClient,
+use zksync_metadata_calculator::api_server::TreeApiClient;
+use zksync_node_api_server::{
     tx_sender::{tx_sink::TxSink, TxSender},
     web3::mempool_cache::MempoolCache,
 };
 
 use crate::resource::Resource;
 
+/// A resource that provides [`TxSender`] to the service.
 #[derive(Debug, Clone)]
 pub struct TxSenderResource(pub TxSender);
 
@@ -17,6 +18,7 @@ impl Resource for TxSenderResource {
     }
 }
 
+/// A resource that provides [`TxSink`] implementation to the service.
 #[derive(Debug, Clone)]
 pub struct TxSinkResource(pub Arc<dyn TxSink>);
 
@@ -26,6 +28,7 @@ impl Resource for TxSinkResource {
     }
 }
 
+/// A resource that provides [`TreeApiClient`] implementation to the service.
 #[derive(Debug, Clone)]
 pub struct TreeApiClientResource(pub Arc<dyn TreeApiClient>);
 
@@ -35,6 +38,7 @@ impl Resource for TreeApiClientResource {
     }
 }
 
+/// A resource that provides [`MempoolCache`] to the service.
 #[derive(Debug, Clone)]
 pub struct MempoolCacheResource(pub MempoolCache);
 
diff --git a/core/node/node_framework/src/lib.rs b/core/node/node_framework/src/lib.rs
index 4f688ab56adb..633086103fb4 100644
--- a/core/node/node_framework/src/lib.rs
+++ b/core/node/node_framework/src/lib.rs
@@ -1,26 +1,29 @@
 //! # ZK Stack node initialization framework.
 //!
-//! ## Introduction
-//!
 //! This crate provides core abstractions that allow one to compose a ZK Stack node.
 //! Main concepts used in this crate are:
 //! - [`WiringLayer`](wiring_layer::WiringLayer) - builder interface for tasks.
 //! - [`Task`](task::Task) - a unit of work that can be executed by the node.
 //! - [`Resource`](resource::Resource) - a piece of logic that can be shared between tasks. Most resources are
 //!   represented by generic interfaces and also serve as points of customization for tasks.
-//! - [`ResourceProvider`](resource::ResourceProvider) - a trait that allows one to provide resources to the node.
 //! - [`ZkStackService`](service::ZkStackService) - a container for tasks and resources that takes care of initialization, running
 //!   and shutting down.
-//!
-//! The general flow to compose a node is as follows:
-//! - Create a [`ResourceProvider`](resource::ResourceProvider) that can provide all the resources that the node needs.
-//! - Create a [`ZkStackService`](node::ZkStackService) with that [`ResourceProvider`](resource::ResourceProvider).
-//! - Add tasks to the node.
-//! - Run it.
+//! - [`ZkStackServiceBuilder`](service::ZkStackServiceBuilder) - a builder for the service.
 
 pub mod implementations;
-pub mod precondition;
 pub mod resource;
 pub mod service;
 pub mod task;
 pub mod wiring_layer;
+
+/// Derive macro for the `FromContext` trait.
+pub use zksync_node_framework_derive::FromContext;
+/// Derive macro for the `IntoContext` trait.
+pub use zksync_node_framework_derive::IntoContext;
+
+pub use self::{
+    resource::Resource,
+    service::{FromContext, IntoContext, StopReceiver},
+    task::{Task, TaskId},
+    wiring_layer::{WiringError, WiringLayer},
+};
diff --git a/core/node/node_framework/src/precondition.rs b/core/node/node_framework/src/precondition.rs
deleted file mode 100644
index 0e47da6a631e..000000000000
--- a/core/node/node_framework/src/precondition.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use std::sync::Arc;
-
-use tokio::sync::Barrier;
-
-use crate::service::StopReceiver;
-
-#[async_trait::async_trait]
-pub trait Precondition: 'static + Send + Sync {
-    /// Unique name of the precondition.
-    fn name(&self) -> &'static str;
-
-    async fn check(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()>;
-}
-
-impl dyn Precondition {
-    /// An internal helper method that runs a precondition check and lifts the barrier as soon
-    /// as the check is finished.
-    pub(super) async fn check_with_barrier(
-        self: Box<Self>,
-        mut stop_receiver: StopReceiver,
-        preconditions_barrier: Arc<Barrier>,
-    ) -> anyhow::Result<()> {
-        self.check(stop_receiver.clone()).await?;
-        tokio::select! {
-            _ = preconditions_barrier.wait() => {
-                Ok(())
-            }
-            _ = stop_receiver.0.changed() => {
-                Ok(())
-            }
-        }
-    }
-}
diff --git a/core/node/node_framework/src/resource/lazy_resource.rs b/core/node/node_framework/src/resource/lazy_resource.rs
deleted file mode 100644
index 3f70187627b8..000000000000
--- a/core/node/node_framework/src/resource/lazy_resource.rs
+++ /dev/null
@@ -1,194 +0,0 @@
-use std::sync::Arc;
-
-use thiserror::Error;
-use tokio::sync::watch;
-
-use super::Resource;
-use crate::service::StopReceiver;
-
-/// A lazy resource represents a resource that isn't available at the time when the tasks start.
-///
-/// Normally it's used to represent the resources that should be provided by one task to another one.
-/// Lazy resources are aware of the node lifecycle, so attempt to resolve the resource won't hang
-/// if the resource is never provided: the resolve future will fail once the stop signal is sent by the node.
-#[derive(Debug)]
-pub struct LazyResource<T: Resource> {
-    resolve_sender: Arc<watch::Sender<Option<T>>>,
-    stop_receiver: StopReceiver,
-}
-
-impl<T: Resource> Resource for LazyResource<T> {
-    fn name() -> String {
-        format!("lazy {}", T::name())
-    }
-}
-
-impl<T: Resource> Clone for LazyResource<T> {
-    fn clone(&self) -> Self {
-        Self {
-            resolve_sender: self.resolve_sender.clone(),
-            stop_receiver: self.stop_receiver.clone(),
-        }
-    }
-}
-
-impl<T: Resource + Clone> LazyResource<T> {
-    /// Creates a new lazy resource.
-    /// Provided stop receiver will be used to prevent resolving from hanging if the resource is never provided.
-    pub fn new(stop_receiver: StopReceiver) -> Self {
-        let (resolve_sender, _resolve_receiver) = watch::channel(None);
-
-        Self {
-            resolve_sender: Arc::new(resolve_sender),
-            stop_receiver,
-        }
-    }
-
-    /// Returns a future that resolves to the resource once it is provided.
-    /// If the resource is never provided, the method will return an error once the node is shutting down.
-    pub async fn resolve(mut self) -> Result<T, LazyResourceError> {
-        let mut resolve_receiver = self.resolve_sender.subscribe();
-        if let Some(resource) = resolve_receiver.borrow().as_ref() {
-            return Ok(resource.clone());
-        }
-
-        let result = tokio::select! {
-            _ = self.stop_receiver.0.changed() => {
-                Err(LazyResourceError::NodeShutdown)
-            }
-            _ = resolve_receiver.changed() => {
-                // ^ we can ignore the error on `changed`, since we hold a strong reference to the sender.
-                let resource = resolve_receiver.borrow().as_ref().expect("Can only change if provided").clone();
-                Ok(resource)
-            }
-        };
-
-        if result.is_ok() {
-            tracing::info!("Lazy resource {} has been resolved", T::name());
-        }
-
-        result
-    }
-
-    /// Provides the resource.
-    /// May be called at most once. Subsequent calls will return an error.
-    pub async fn provide(&mut self, resource: T) -> Result<(), LazyResourceError> {
-        let sent = self.resolve_sender.send_if_modified(|current| {
-            if current.is_some() {
-                return false;
-            }
-            *current = Some(resource.clone());
-            true
-        });
-
-        if !sent {
-            return Err(LazyResourceError::ResourceAlreadyProvided);
-        }
-
-        tracing::info!("Lazy resource {} has been provided", T::name());
-
-        Ok(())
-    }
-}
-
-#[derive(Debug, Error, PartialEq)]
-pub enum LazyResourceError {
-    #[error("Node is shutting down")]
-    NodeShutdown,
-    #[error("Resource is already provided")]
-    ResourceAlreadyProvided,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[derive(Debug, Clone, PartialEq)]
-    struct TestResource(Arc<u8>);
-
-    impl Resource for TestResource {
-        fn name() -> String {
-            "test_resource".into()
-        }
-    }
-
-    struct TestContext {
-        test_resource: TestResource,
-        lazy_resource: LazyResource<TestResource>,
-        stop_sender: watch::Sender<bool>,
-    }
-
-    impl TestContext {
-        fn new() -> Self {
-            let (stop_sender, stop_receiver) = watch::channel(false);
-            Self {
-                test_resource: TestResource(Arc::new(1)),
-                lazy_resource: LazyResource::<TestResource>::new(StopReceiver(stop_receiver)),
-                stop_sender,
-            }
-        }
-    }
-
-    #[tokio::test]
-    async fn test_already_provided_resource_case() {
-        let TestContext {
-            test_resource,
-            lazy_resource,
-            stop_sender: _,
-        } = TestContext::new();
-
-        lazy_resource
-            .clone()
-            .provide(test_resource.clone())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            lazy_resource.clone().provide(test_resource.clone()).await,
-            Err(LazyResourceError::ResourceAlreadyProvided),
-            "Incorrect result for providing same resource twice"
-        );
-    }
-
-    #[tokio::test]
-    async fn test_successful_resolve_case() {
-        let TestContext {
-            test_resource,
-            lazy_resource,
-            stop_sender: _,
-        } = TestContext::new();
-
-        lazy_resource
-            .clone()
-            .provide(test_resource.clone())
-            .await
-            .unwrap();
-
-        assert_eq!(
-            lazy_resource.clone().resolve().await,
-            Ok(test_resource.clone()),
-            "Incorrect result for resolving the resource before node shutdown"
-        );
-    }
-
-    #[tokio::test]
-    async fn test_node_shutdown_case() {
-        let TestContext {
-            test_resource: _,
-            lazy_resource,
-            stop_sender,
-        } = TestContext::new();
-
-        let resolve_task = tokio::spawn(async move { lazy_resource.resolve().await });
-
-        stop_sender.send(true).unwrap();
-
-        let result = resolve_task.await.unwrap();
-
-        assert_eq!(
-            result,
-            Err(LazyResourceError::NodeShutdown),
-            "Incorrect result for resolving the resource after the node shutdown"
-        );
-    }
-}
diff --git a/core/node/node_framework/src/resource/mod.rs b/core/node/node_framework/src/resource/mod.rs
index cf000acf8bb0..5ddc7ba2e45e 100644
--- a/core/node/node_framework/src/resource/mod.rs
+++ b/core/node/node_framework/src/resource/mod.rs
@@ -1,12 +1,7 @@
 use std::{any::TypeId, fmt};
 
-pub use self::{
-    lazy_resource::LazyResource, resource_collection::ResourceCollection, resource_id::ResourceId,
-    unique::Unique,
-};
+pub use self::{resource_id::ResourceId, unique::Unique};
 
-mod lazy_resource;
-mod resource_collection;
 mod resource_id;
 mod unique;
 
@@ -14,9 +9,39 @@ mod unique;
 /// Typically, the type that implements this trait also should implement `Clone`
 /// since the same resource may be requested by several tasks and thus it would be an additional
 /// bound on most methods that work with [`Resource`].
+///
+/// # Example
+///
+/// ```
+/// # use zksync_node_framework::resource::Resource;
+/// # use std::sync::Arc;
+///
+/// /// An abstract interface you want to share.
+/// /// Normally you want the interface to be thread-safe.
+/// trait MyInterface: 'static + Send + Sync {
+///     fn do_something(&self);
+/// }
+///
+/// /// Resource wrapper.
+/// #[derive(Clone)]
+/// struct MyResource(Arc<dyn MyInterface>);
+///
+/// impl Resource for MyResource {
+///     fn name() -> String {
+///         // It is a helpful practice to follow a structured naming pattern for resource names.
+///         // For example, you can use a certain prefix for all resources related to a some component, e.g. `api`.
+///         "common/my_resource".to_string()
+///     }
+/// }
+/// ```
 pub trait Resource: 'static + Send + Sync + std::any::Any {
+    /// Invoked after the wiring phase of the service is done.
+    /// Can be used to perform additional resource preparation, knowing that the resource
+    /// is guaranteed to be requested by all the tasks that need it.
     fn on_resource_wired(&mut self) {}
 
+    /// Returns the name of the resource.
+    /// Used for logging purposes.
     fn name() -> String;
 }
 
@@ -26,10 +51,10 @@ pub trait Resource: 'static + Send + Sync + std::any::Any {
 /// This trait is implemented for any type that implements [`Resource`], so there is no need to
 /// implement it manually.
 pub(crate) trait StoredResource: 'static + std::any::Any + Send + Sync {
-    /// An object-safe version of [`Resource::resource_id`].
+    /// An object-safe version of [`Resource::name`].
     fn stored_resource_id(&self) -> ResourceId;
 
-    /// An object-safe version of [`Resource::on_resoure_wired`].
+    /// An object-safe version of [`Resource::on_resource_wired`].
     fn stored_resource_wired(&mut self);
 }
 
diff --git a/core/node/node_framework/src/resource/resource_collection.rs b/core/node/node_framework/src/resource/resource_collection.rs
deleted file mode 100644
index 7f867f236d95..000000000000
--- a/core/node/node_framework/src/resource/resource_collection.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-use std::{
-    fmt,
-    sync::{Arc, Mutex},
-};
-
-use thiserror::Error;
-use tokio::sync::watch;
-
-use super::Resource;
-
-/// Collection of resources that can be extended during the initialization phase, and then resolved once
-/// the wiring is complete.
-///
-/// During component initialization, resource collections can be requested by the components in order to push new
-/// elements there. Once the initialization is complete, it is no longer possible to push new elements, and the
-/// collection can be resolved into a vector of resources.
-///
-/// Collections implement `Clone`, so they can be consumed by several tasks. Every task that resolves the collection
-/// is guaranteed to have the same set of resources.
-///
-/// The purpose of this container is to allow different tasks to register their resource in a single place for some
-/// other task to consume. For example, tasks may register their healthchecks, and then healthcheck task will observe
-/// all the provided healthchecks.
-pub struct ResourceCollection<T> {
-    /// Collection of the resources.
-    resources: Arc<Mutex<Vec<T>>>,
-    /// Sender indicating that the wiring is complete.
-    wiring_complete_sender: Arc<watch::Sender<bool>>,
-    /// Flag indicating that the collection has been resolved.
-    wired: watch::Receiver<bool>,
-}
-
-impl<T: Resource> Resource for ResourceCollection<T> {
-    fn on_resource_wired(&mut self) {
-        self.wiring_complete_sender.send(true).ok();
-    }
-
-    fn name() -> String {
-        format!("collection of {}", T::name())
-    }
-}
-
-impl<T: Resource + Clone> Default for ResourceCollection<T> {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl<T> Clone for ResourceCollection<T> {
-    fn clone(&self) -> Self {
-        Self {
-            resources: self.resources.clone(),
-            wiring_complete_sender: self.wiring_complete_sender.clone(),
-            wired: self.wired.clone(),
-        }
-    }
-}
-
-impl<T> fmt::Debug for ResourceCollection<T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("ResourceCollection")
-            .field("resources", &"{..}")
-            .finish_non_exhaustive()
-    }
-}
-
-#[derive(Debug, Error)]
-pub enum ResourceCollectionError {
-    #[error("Adding resources to the collection is not allowed after the wiring is complete")]
-    AlreadyWired,
-}
-
-impl<T: Resource + Clone> ResourceCollection<T> {
-    pub(crate) fn new() -> Self {
-        let (wiring_complete_sender, wired) = watch::channel(false);
-        Self {
-            resources: Arc::default(),
-            wiring_complete_sender: Arc::new(wiring_complete_sender),
-            wired,
-        }
-    }
-
-    /// Adds a new element to the resource collection.
-    /// Returns an error if the wiring is already complete.
-    pub fn push(&self, resource: T) -> Result<(), ResourceCollectionError> {
-        // This check is sufficient, since no task is guaranteed to be running when the value changes.
-        if *self.wired.borrow() {
-            return Err(ResourceCollectionError::AlreadyWired);
-        }
-
-        let mut handle = self.resources.lock().unwrap();
-        handle.push(resource);
-        tracing::info!(
-            "A new item has been added to the resource collection {}",
-            Self::name()
-        );
-        Ok(())
-    }
-
-    /// Waits until the wiring is complete, and resolves the collection into a vector of resources.
-    pub async fn resolve(mut self) -> Vec<T> {
-        // Guaranteed not to hang on server shutdown, since the node will invoke the `on_wiring_complete` before any task
-        // is actually spawned (per framework rules). For most cases, this check will resolve immediately, unless
-        // some tasks would spawn something from the `IntoZkSyncTask` impl.
-        self.wired.changed().await.expect("Sender can't be dropped");
-
-        tracing::info!("Resource collection {} has been resolved", Self::name());
-
-        let handle = self.resources.lock().unwrap();
-        (*handle).clone()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use assert_matches::assert_matches;
-    use futures::FutureExt;
-
-    use super::*;
-
-    #[derive(Debug, Clone, PartialEq)]
-    struct TestResource(Arc<u8>);
-
-    impl Resource for TestResource {
-        fn name() -> String {
-            "test_resource".into()
-        }
-    }
-
-    #[test]
-    fn test_push() {
-        let collection = ResourceCollection::<TestResource>::new();
-        let resource1 = TestResource(Arc::new(1));
-        collection.clone().push(resource1.clone()).unwrap();
-
-        let resource2 = TestResource(Arc::new(2));
-        collection.clone().push(resource2.clone()).unwrap();
-
-        assert_eq!(
-            *collection.resources.lock().unwrap(),
-            vec![resource1, resource2]
-        );
-    }
-
-    #[test]
-    fn test_already_wired() {
-        let mut collection = ResourceCollection::<TestResource>::new();
-        let resource = TestResource(Arc::new(1));
-
-        let rc_clone = collection.clone();
-
-        collection.on_resource_wired();
-
-        assert_matches!(
-            rc_clone.push(resource),
-            Err(ResourceCollectionError::AlreadyWired)
-        );
-    }
-
-    #[test]
-    fn test_resolve() {
-        let mut collection = ResourceCollection::<TestResource>::new();
-        let result = collection.clone().resolve().now_or_never();
-
-        assert!(result.is_none());
-
-        collection.on_resource_wired();
-
-        let resolved = collection.resolve().now_or_never();
-        assert_eq!(resolved.unwrap(), vec![]);
-    }
-}
diff --git a/core/node/node_framework/src/resource/unique.rs b/core/node/node_framework/src/resource/unique.rs
index 9a256d8f55f3..5c9bdcfe0e12 100644
--- a/core/node/node_framework/src/resource/unique.rs
+++ b/core/node/node_framework/src/resource/unique.rs
@@ -29,6 +29,7 @@ impl<T: 'static + Send> Unique<T> {
     }
 
     /// Takes the resource from the container.
+    /// Will return `None` if the resource was already taken.
     pub fn take(&self) -> Option<T> {
         let result = self.inner.lock().unwrap().take();
 
diff --git a/core/node/node_framework/src/service/context.rs b/core/node/node_framework/src/service/context.rs
index 4ec76ca1d2a3..0280bb1c8927 100644
--- a/core/node/node_framework/src/service/context.rs
+++ b/core/node/node_framework/src/service/context.rs
@@ -1,15 +1,18 @@
-use std::any::type_name;
+use std::{any::type_name, future::Future};
+
+use futures::FutureExt as _;
 
 use crate::{
-    precondition::Precondition,
     resource::{Resource, ResourceId, StoredResource},
-    service::ZkStackService,
-    task::{OneshotTask, Task, UnconstrainedOneshotTask, UnconstrainedTask},
+    service::{named_future::NamedFuture, ZkStackService},
+    task::Task,
     wiring_layer::WiringError,
 };
 
-/// An interface to the service's resources provided to the tasks during initialization.
-/// Provides the ability to fetch required resources, and also gives access to the Tokio runtime handle.
+/// An interface to the service provided to the tasks during initialization.
+/// This the main point of interaction between with the service.
+///
+/// The context provides access to the runtime, resources, and allows adding new tasks.
 #[derive(Debug)]
 pub struct ServiceContext<'a> {
     layer: &'a str,
@@ -17,16 +20,26 @@ pub struct ServiceContext<'a> {
 }
 
 impl<'a> ServiceContext<'a> {
+    /// Instantiates a new context.
+    /// The context keeps information about the layer that created it for reporting purposes.
     pub(super) fn new(layer: &'a str, service: &'a mut ZkStackService) -> Self {
         Self { layer, service }
     }
 
     /// Provides access to the runtime used by the service.
+    ///
     /// Can be used to spawn additional tasks within the same runtime.
-    /// If some tasks stores the handle to spawn additional tasks, it is expected to do all the required
+    /// If some task stores the handle to spawn additional tasks, it is expected to do all the required
     /// cleanup.
     ///
-    /// In most cases, however, it is recommended to use [`add_task`] method instead.
+    /// In most cases, however, it is recommended to use [`add_task`](ServiceContext::add_task) or its alternative
+    /// instead.
+    ///
+    /// ## Note
+    ///
+    /// While `tokio::spawn` and `tokio::spawn_blocking` will work as well, using the runtime handle
+    /// from the context is still a recommended way to get access to runtime, as it tracks the access
+    /// to the runtimes by layers.
     pub fn runtime_handle(&self) -> &tokio::runtime::Handle {
         tracing::info!(
             "Layer {} has requested access to the Tokio runtime",
@@ -36,73 +49,46 @@ impl<'a> ServiceContext<'a> {
     }
 
     /// Adds a task to the service.
+    ///
     /// Added tasks will be launched after the wiring process will be finished and all the preconditions
     /// are met.
-    pub fn add_task(&mut self, task: Box<dyn Task>) -> &mut Self {
-        tracing::info!("Layer {} has added a new task: {}", self.layer, task.name());
-        self.service.runnables.tasks.push(task);
-        self
-    }
-
-    /// Adds an unconstrained task to the service.
-    /// Unconstrained tasks will be launched immediately after the wiring process is finished.
-    pub fn add_unconstrained_task(&mut self, task: Box<dyn UnconstrainedTask>) -> &mut Self {
-        tracing::info!(
-            "Layer {} has added a new unconstrained task: {}",
-            self.layer,
-            task.name()
-        );
-        self.service.runnables.unconstrained_tasks.push(task);
-        self
-    }
-
-    /// Adds a precondition to the service.
-    pub fn add_precondition(&mut self, precondition: Box<dyn Precondition>) -> &mut Self {
-        tracing::info!(
-            "Layer {} has added a new precondition: {}",
-            self.layer,
-            precondition.name()
-        );
-        self.service.runnables.preconditions.push(precondition);
+    pub fn add_task<T: Task>(&mut self, task: T) -> &mut Self {
+        tracing::info!("Layer {} has added a new task: {}", self.layer, task.id());
+        self.service.runnables.tasks.push(Box::new(task));
         self
     }
 
-    /// Adds an oneshot task to the service.
-    pub fn add_oneshot_task(&mut self, task: Box<dyn OneshotTask>) -> &mut Self {
-        tracing::info!(
-            "Layer {} has added a new oneshot task: {}",
-            self.layer,
-            task.name()
-        );
-        self.service.runnables.oneshot_tasks.push(task);
-        self
-    }
-
-    /// Adds an unconstrained oneshot task to the service.
-    pub fn add_unconstrained_oneshot_task(
+    /// Adds a future to be invoked after node shutdown.
+    /// May be used to perform cleanup tasks.
+    ///
+    /// The future is guaranteed to only be polled after all the node tasks are stopped or timed out.
+    /// All the futures will be awaited sequentially.
+    pub fn add_shutdown_hook(
         &mut self,
-        task: Box<dyn UnconstrainedOneshotTask>,
+        name: &'static str,
+        hook: impl Future<Output = anyhow::Result<()>> + Send + 'static,
     ) -> &mut Self {
         tracing::info!(
-            "Layer {} has added a new unconstrained oneshot task: {}",
+            "Layer {} has added a new shutdown hook: {}",
             self.layer,
-            task.name()
+            name
         );
         self.service
             .runnables
-            .unconstrained_oneshot_tasks
-            .push(task);
+            .shutdown_hooks
+            .push(NamedFuture::new(hook.boxed(), name.into()));
         self
     }
 
-    /// Attempts to retrieve the resource with the specified name.
-    /// Internally the resources are stored as [`std::any::Any`], and this method does the downcasting
-    /// on behalf of the caller.
+    /// Attempts to retrieve the resource of the specified type.
     ///
     /// ## Panics
     ///
-    /// Panics if the resource with the specified name exists, but is not of the requested type.
-    pub async fn get_resource<T: Resource + Clone>(&mut self) -> Result<T, WiringError> {
+    /// Panics if the resource with the specified [`ResourceId`] exists, but is not of the requested type.
+    pub fn get_resource<T: Resource + Clone>(&mut self) -> Result<T, WiringError> {
+        // Implementation details:
+        // Internally the resources are stored as [`std::any::Any`], and this method does the downcasting
+        // on behalf of the caller.
         #[allow(clippy::borrowed_box)]
         let downcast_clone = |resource: &Box<dyn StoredResource>| {
             resource
@@ -143,13 +129,13 @@ impl<'a> ServiceContext<'a> {
         })
     }
 
-    /// Attempts to retrieve the resource with the specified name.
+    /// Attempts to retrieve the resource of the specified type.
     /// If the resource is not available, it is created using the provided closure.
-    pub async fn get_resource_or_insert_with<T: Resource + Clone, F: FnOnce() -> T>(
+    pub fn get_resource_or_insert_with<T: Resource + Clone, F: FnOnce() -> T>(
         &mut self,
         f: F,
     ) -> T {
-        if let Ok(resource) = self.get_resource::<T>().await {
+        if let Ok(resource) = self.get_resource::<T>() {
             return resource;
         }
 
@@ -166,18 +152,19 @@ impl<'a> ServiceContext<'a> {
         resource
     }
 
-    /// Attempts to retrieve the resource with the specified name.
+    /// Attempts to retrieve the resource of the specified type.
     /// If the resource is not available, it is created using `T::default()`.
-    pub async fn get_resource_or_default<T: Resource + Clone + Default>(&mut self) -> T {
-        self.get_resource_or_insert_with(T::default).await
+    pub fn get_resource_or_default<T: Resource + Clone + Default>(&mut self) -> T {
+        self.get_resource_or_insert_with(T::default)
     }
 
     /// Adds a resource to the service.
-    /// If the resource with the same name is already provided, the method will return an error.
+    ///
+    /// If the resource with the same type is already provided, the method will return an error.
     pub fn insert_resource<T: Resource>(&mut self, resource: T) -> Result<(), WiringError> {
         let id = ResourceId::of::<T>();
         if self.service.resources.contains_key(&id) {
-            tracing::warn!(
+            tracing::info!(
                 "Layer {} has attempted to provide resource {} of type {}, but it is already available",
                 self.layer,
                 T::name(),
diff --git a/core/node/node_framework/src/service/context_traits.rs b/core/node/node_framework/src/service/context_traits.rs
new file mode 100644
index 000000000000..129bbb1a00f0
--- /dev/null
+++ b/core/node/node_framework/src/service/context_traits.rs
@@ -0,0 +1,133 @@
+use crate::{resource::Resource, service::context::ServiceContext, wiring_layer::WiringError};
+
+/// Trait used as input for wiring layers, aiming to provide all the resources the layer needs for wiring.
+///
+/// For most cases, the most conevenient way to implement this trait is to use the `#[derive(FromContext)]`.
+/// Otherwise, the trait has several blanket implementations (including the implementation for `()` and `Option`).
+///
+/// # Example
+///
+/// ```
+/// use zksync_node_framework::FromContext;
+/// # #[derive(Clone)]
+/// # struct MandatoryResource;
+/// # impl zksync_node_framework::resource::Resource for MandatoryResource { fn name() -> String { "a".into() } }
+/// # #[derive(Clone)]
+/// # struct OptionalResource;
+/// # impl zksync_node_framework::resource::Resource for OptionalResource { fn name() -> String { "b".into() } }
+/// # #[derive(Default, Clone)]
+/// # struct ResourceWithDefault;
+/// # impl zksync_node_framework::resource::Resource for ResourceWithDefault { fn name() -> String { "c".into() } }
+/// #[derive(FromContext)]
+/// struct MyWiringLayerInput {
+///     // The following field _must_ be present in the context.
+///     mandatory_resource: MandatoryResource,
+///     // The following field is optional.
+///     // If will be `None` if there is no such resource in the context.
+///     optional_resource: Option<OptionalResource>,
+///     // The following field is guaranteed to fetch the value from the context.
+///     // In case the value is missing, a default value will be added to the context.
+///     #[context(default)]
+///     resource_with_default: ResourceWithDefault,
+/// }
+/// ```
+pub trait FromContext: Sized {
+    fn from_context(context: &mut ServiceContext<'_>) -> Result<Self, WiringError>;
+}
+
+impl<T: Resource + Clone> FromContext for T {
+    fn from_context(context: &mut ServiceContext<'_>) -> Result<Self, WiringError> {
+        context.get_resource::<T>()
+    }
+}
+
+impl FromContext for () {
+    fn from_context(_context: &mut ServiceContext<'_>) -> Result<Self, WiringError> {
+        Ok(())
+    }
+}
+
+impl<T: FromContext> FromContext for Option<T> {
+    fn from_context(context: &mut ServiceContext<'_>) -> Result<Self, WiringError> {
+        match T::from_context(context) {
+            Ok(inner) => Ok(Some(inner)),
+            Err(WiringError::ResourceLacking { .. }) => Ok(None),
+            Err(err) => Err(err),
+        }
+    }
+}
+
+/// Trait used as output for wiring layers, aiming to provide all the resources and tasks the layer creates.
+///
+/// For most cases, the most conevenient way to implement this trait is to use the `#[derive(IntoContext)]`.
+/// Otherwise, the trait has several blanket implementations (including the implementation for `()` and `Option`).
+/// Note, however, that due to the lack of specialization, the blanket implementation for `Option<T: Task>` is not
+/// provided. When used in the macro, tasks must be annotated with the `#[context(task)]` attribute.
+///
+/// Note: returning a resource that already exists in the context will result in a wiring error. If you need to provide
+/// a "substitute" resource, request `Option` of it in the `FromContext` implementation to check whether it's already
+/// provided.
+///
+///
+/// # Example
+///
+/// ```
+/// use zksync_node_framework::IntoContext;
+/// # struct MyTask;
+/// # #[async_trait::async_trait]
+/// # impl zksync_node_framework::task::Task for MyTask {
+/// #   fn id(&self) -> zksync_node_framework::TaskId { "a".into() }
+/// #   async fn run(self: Box<Self>, _: zksync_node_framework::StopReceiver) -> anyhow::Result<()> { Ok(()) }
+/// # }
+/// # struct MaybeTask;
+/// # #[async_trait::async_trait]
+/// # impl zksync_node_framework::task::Task for MaybeTask {
+/// #   fn id(&self) -> zksync_node_framework::TaskId { "b".into() }
+/// #   async fn run(self: Box<Self>, _: zksync_node_framework::StopReceiver) -> anyhow::Result<()> { Ok(()) }
+/// # }
+/// # struct MyResource;
+/// # impl zksync_node_framework::resource::Resource for MyResource { fn name() -> String { "a".into() } }
+/// # struct MaybeResource;
+/// # impl zksync_node_framework::resource::Resource for MaybeResource { fn name() -> String { "b".into() } }
+/// #[derive(IntoContext)]
+/// struct MyWiringLayerOutput {
+///     // This resource will be inserted unconditionally.
+///     // Will err if such resource is already present in the context.
+///     recource: MyResource,
+///     // Will only provide the resource if it's `Some`.
+///     maybe_resource: Option<MaybeResource>,
+///     // Will provide task unconditionally.
+///     #[context(task)]
+///     task: MyTask,
+///     // Will provide task only if it's `Some`.
+///     #[context(task)]
+///     maybe_task: Option<MaybeTask>,
+/// }
+/// ```
+pub trait IntoContext {
+    fn into_context(self, context: &mut ServiceContext<'_>) -> Result<(), WiringError>;
+}
+
+// Unfortunately, without specialization we cannot provide a blanket implementation for `T: Task`
+// as well. `Resource` is chosen because it also has a blanket implementation of `FromContext`.
+impl<T: Resource> IntoContext for T {
+    fn into_context(self, context: &mut ServiceContext<'_>) -> Result<(), WiringError> {
+        context.insert_resource(self)
+    }
+}
+
+impl IntoContext for () {
+    fn into_context(self, _context: &mut ServiceContext<'_>) -> Result<(), WiringError> {
+        Ok(())
+    }
+}
+
+impl<T: IntoContext> IntoContext for Option<T> {
+    fn into_context(self, context: &mut ServiceContext<'_>) -> Result<(), WiringError> {
+        if let Some(inner) = self {
+            inner.into_context(context)
+        } else {
+            Ok(())
+        }
+    }
+}
diff --git a/core/node/node_framework/src/service/error.rs b/core/node/node_framework/src/service/error.rs
index 173745e74c75..890cc6b7d4b6 100644
--- a/core/node/node_framework/src/service/error.rs
+++ b/core/node/node_framework/src/service/error.rs
@@ -1,5 +1,21 @@
-use crate::wiring_layer::WiringError;
+use crate::{task::TaskId, wiring_layer::WiringError};
 
+/// An error that can occur during the task lifecycle.
+#[derive(Debug, thiserror::Error)]
+pub enum TaskError {
+    #[error("Task {0} failed: {1}")]
+    TaskFailed(TaskId, anyhow::Error),
+    #[error("Task {0} panicked: {1}")]
+    TaskPanicked(TaskId, String),
+    #[error("Shutdown for task {0} timed out")]
+    TaskShutdownTimedOut(TaskId),
+    #[error("Shutdown hook {0} failed: {1}")]
+    ShutdownHookFailed(TaskId, anyhow::Error),
+    #[error("Shutdown hook {0} timed out")]
+    ShutdownHookTimedOut(TaskId),
+}
+
+/// An error that can occur during the service lifecycle.
 #[derive(Debug, thiserror::Error)]
 pub enum ZkStackServiceError {
     #[error("Detected a Tokio Runtime. ZkStackService manages its own runtime and does not support nested runtimes")]
@@ -8,6 +24,6 @@ pub enum ZkStackServiceError {
     NoTasks,
     #[error("One or more wiring layers failed to initialize: {0:?}")]
     Wiring(Vec<(String, WiringError)>),
-    #[error(transparent)]
-    Task(#[from] anyhow::Error),
+    #[error("One or more tasks failed: {0:?}")]
+    Task(Vec<TaskError>),
 }
diff --git a/core/node/node_framework/src/service/mod.rs b/core/node/node_framework/src/service/mod.rs
index 38902c254613..2744c08ceba6 100644
--- a/core/node/node_framework/src/service/mod.rs
+++ b/core/node/node_framework/src/service/mod.rs
@@ -1,20 +1,30 @@
 use std::{collections::HashMap, time::Duration};
 
-use anyhow::Context;
-use futures::{future::BoxFuture, FutureExt};
-use tokio::{runtime::Runtime, sync::watch};
+use error::TaskError;
+use futures::future::Fuse;
+use tokio::{runtime::Runtime, sync::watch, task::JoinHandle};
 use zksync_utils::panic_extractor::try_extract_panic_message;
 
-use self::runnables::Runnables;
-pub use self::{context::ServiceContext, error::ZkStackServiceError, stop_receiver::StopReceiver};
+pub use self::{
+    context::ServiceContext,
+    context_traits::{FromContext, IntoContext},
+    error::ZkStackServiceError,
+    stop_receiver::StopReceiver,
+};
 use crate::{
     resource::{ResourceId, StoredResource},
-    service::runnables::TaskReprs,
+    service::{
+        named_future::NamedFuture,
+        runnables::{NamedBoxFuture, Runnables, TaskReprs},
+    },
+    task::TaskId,
     wiring_layer::{WiringError, WiringLayer},
 };
 
 mod context;
+mod context_traits;
 mod error;
+mod named_future;
 mod runnables;
 mod stop_receiver;
 #[cfg(test)]
@@ -36,6 +46,7 @@ impl ZkStackServiceBuilder {
     }
 
     /// Adds a wiring layer.
+    ///
     /// During the [`run`](ZkStackService::run) call the service will invoke
     /// `wire` method of every layer in the order they were added.
     ///
@@ -54,6 +65,10 @@ impl ZkStackServiceBuilder {
         self
     }
 
+    /// Builds the service.
+    ///
+    /// In case of errors during wiring phase, will return the list of all the errors that happened, in the order
+    /// of their occurrence.
     pub fn build(&mut self) -> Result<ZkStackService, ZkStackServiceError> {
         if tokio::runtime::Handle::try_current().is_ok() {
             return Err(ZkStackServiceError::RuntimeDetected);
@@ -71,6 +86,7 @@ impl ZkStackServiceBuilder {
             runnables: Default::default(),
             stop_sender,
             runtime,
+            errors: Vec::new(),
         })
     }
 }
@@ -90,11 +106,38 @@ pub struct ZkStackService {
     stop_sender: watch::Sender<bool>,
     /// Tokio runtime used to spawn tasks.
     runtime: Runtime,
+
+    /// Collector for the task errors met during the service execution.
+    errors: Vec<TaskError>,
 }
 
+type TaskFuture = NamedFuture<Fuse<JoinHandle<anyhow::Result<()>>>>;
+
 impl ZkStackService {
     /// Runs the system.
     pub fn run(mut self) -> Result<(), ZkStackServiceError> {
+        self.wire()?;
+
+        let TaskReprs {
+            tasks,
+            shutdown_hooks,
+        } = self.prepare_tasks();
+
+        let remaining = self.run_tasks(tasks);
+        self.shutdown_tasks(remaining);
+        self.run_shutdown_hooks(shutdown_hooks);
+
+        tracing::info!("Exiting the service");
+        if self.errors.is_empty() {
+            Ok(())
+        } else {
+            Err(ZkStackServiceError::Task(self.errors))
+        }
+    }
+
+    /// Performs wiring of the service.
+    /// After invoking this method, the collected tasks will be collected in `self.runnables`.
+    fn wire(&mut self) -> Result<(), ZkStackServiceError> {
         // Initialize tasks.
         let wiring_layers = std::mem::take(&mut self.layers);
 
@@ -104,8 +147,7 @@ impl ZkStackService {
         for layer in wiring_layers {
             let name = layer.layer_name().to_string();
             // We must process wiring layers sequentially and in the same order as they were added.
-            let task_result =
-                runtime_handle.block_on(layer.wire(ServiceContext::new(&name, &mut self)));
+            let task_result = runtime_handle.block_on(layer.wire(ServiceContext::new(&name, self)));
             if let Err(err) = task_result {
                 // We don't want to bail on the first error, since it'll provide worse DevEx:
                 // People likely want to fix as much problems as they can in one go, rather than have
@@ -127,116 +169,130 @@ impl ZkStackService {
             return Err(ZkStackServiceError::NoTasks);
         }
 
-        let only_oneshot_tasks = self.runnables.is_oneshot_only();
+        // Wiring is now complete.
+        for resource in self.resources.values_mut() {
+            resource.stored_resource_wired();
+        }
+        self.resources = HashMap::default(); // Decrement reference counters for resources.
+        tracing::info!("Wiring complete");
+
+        Ok(())
+    }
 
+    /// Prepares collected tasks for running.
+    fn prepare_tasks(&mut self) -> TaskReprs {
         // Barrier that will only be lifted once all the preconditions are met.
         // It will be awaited by the tasks before they start running and by the preconditions once they are fulfilled.
         let task_barrier = self.runnables.task_barrier();
 
         // Collect long-running tasks.
         let stop_receiver = StopReceiver(self.stop_sender.subscribe());
-        let TaskReprs {
-            mut long_running_tasks,
-            oneshot_tasks,
-        } = self
-            .runnables
-            .prepare_tasks(task_barrier.clone(), stop_receiver.clone());
-
-        // Wiring is now complete.
-        for resource in self.resources.values_mut() {
-            resource.stored_resource_wired();
-        }
-        tracing::info!("Wiring complete");
-
-        // Create a system task that is cancellation-aware and will only exit on either oneshot task failure or
-        // stop signal.
-        let oneshot_runner_system_task =
-            oneshot_runner_task(oneshot_tasks, stop_receiver, only_oneshot_tasks);
-        long_running_tasks.push(oneshot_runner_system_task);
+        self.runnables
+            .prepare_tasks(task_barrier.clone(), stop_receiver.clone())
+    }
 
+    /// Spawn the provided tasks and runs them until at least one task exits, and returns the list
+    /// of remaining tasks.
+    /// Adds error, if any, to the `errors` vector.
+    fn run_tasks(&mut self, tasks: Vec<NamedBoxFuture<anyhow::Result<()>>>) -> Vec<TaskFuture> {
         // Prepare tasks for running.
         let rt_handle = self.runtime.handle().clone();
-        let join_handles: Vec<_> = long_running_tasks
+        let join_handles: Vec<_> = tasks
             .into_iter()
-            .map(|task| rt_handle.spawn(task).fuse())
+            .map(|task| task.spawn(&rt_handle).fuse())
             .collect();
 
+        // Collect names for remaining tasks for reporting purposes.
+        let mut tasks_names: Vec<_> = join_handles.iter().map(|task| task.id()).collect();
+
         // Run the tasks until one of them exits.
-        let (resolved, _, remaining) = self
+        let (resolved, resolved_idx, remaining) = self
             .runtime
             .block_on(futures::future::select_all(join_handles));
-        let result = match resolved {
-            Ok(Ok(())) => Ok(()),
-            Ok(Err(err)) => Err(err).context("Task failed"),
-            Err(panic_err) => {
-                let panic_msg = try_extract_panic_message(panic_err);
-                Err(anyhow::format_err!(
-                    "One of the tasks panicked: {panic_msg}"
-                ))
-            }
-        };
+        // Extract the result and report it to logs early, before waiting for any other task to shutdown.
+        // We will also collect the errors from the remaining tasks, hence a vector.
+        let task_name = tasks_names.swap_remove(resolved_idx);
+        self.handle_task_exit(resolved, task_name);
+        tracing::info!("One of the task has exited, shutting down the node");
+
+        remaining
+    }
 
+    /// Sends the stop signal and waits for the remaining tasks to finish.
+    fn shutdown_tasks(&mut self, remaining: Vec<TaskFuture>) {
+        // Send stop signal to remaining tasks and wait for them to finish.
+        self.stop_sender.send(true).ok();
+
+        // Collect names for remaining tasks for reporting purposes.
+        // We have to re-collect, becuase `select_all` does not guarantes the order of returned remaining futures.
+        let remaining_tasks_names: Vec<_> = remaining.iter().map(|task| task.id()).collect();
         let remaining_tasks_with_timeout: Vec<_> = remaining
             .into_iter()
             .map(|task| async { tokio::time::timeout(TASK_SHUTDOWN_TIMEOUT, task).await })
             .collect();
 
-        // Send stop signal to remaining tasks and wait for them to finish.
-        // Given that we are shutting down, we do not really care about returned values.
-        self.stop_sender.send(true).ok();
         let execution_results = self
             .runtime
             .block_on(futures::future::join_all(remaining_tasks_with_timeout));
-        let execution_timeouts_count = execution_results.iter().filter(|&r| r.is_err()).count();
-        if execution_timeouts_count > 0 {
-            tracing::warn!(
-                "{execution_timeouts_count} tasks didn't finish in {TASK_SHUTDOWN_TIMEOUT:?} and were dropped"
-            );
-        } else {
-            tracing::info!("Remaining tasks finished without reaching timeouts");
-        }
 
-        result?;
-        Ok(())
+        // Report the results of the remaining tasks.
+        for (name, result) in remaining_tasks_names.into_iter().zip(execution_results) {
+            match result {
+                Ok(resolved) => {
+                    self.handle_task_exit(resolved, name);
+                }
+                Err(_) => {
+                    tracing::error!("Task {name} timed out");
+                    self.errors.push(TaskError::TaskShutdownTimedOut(name));
+                }
+            }
+        }
     }
-}
 
-fn oneshot_runner_task(
-    oneshot_tasks: Vec<BoxFuture<'static, anyhow::Result<()>>>,
-    mut stop_receiver: StopReceiver,
-    only_oneshot_tasks: bool,
-) -> BoxFuture<'static, anyhow::Result<()>> {
-    Box::pin(async move {
-        let oneshot_tasks = oneshot_tasks.into_iter().map(|fut| async move {
-            // Spawn each oneshot task as a separate tokio task.
-            // This way we can handle the cases when such a task panics and propagate the message
-            // to the service.
-            let handle = tokio::runtime::Handle::current();
-            match handle.spawn(fut).await {
-                Ok(Ok(())) => Ok(()),
-                Ok(Err(err)) => Err(err),
-                Err(panic_err) => {
-                    let panic_msg = try_extract_panic_message(panic_err);
-                    Err(anyhow::format_err!("Oneshot task panicked: {panic_msg}"))
+    /// Runs the provided shutdown hooks.
+    fn run_shutdown_hooks(&mut self, shutdown_hooks: Vec<NamedBoxFuture<anyhow::Result<()>>>) {
+        // Run shutdown hooks sequentially.
+        for hook in shutdown_hooks {
+            let name = hook.id().clone();
+            // Limit each shutdown hook to the same timeout as the tasks.
+            let hook_with_timeout =
+                async move { tokio::time::timeout(TASK_SHUTDOWN_TIMEOUT, hook).await };
+            match self.runtime.block_on(hook_with_timeout) {
+                Ok(Ok(())) => {
+                    tracing::info!("Shutdown hook {name} completed");
+                }
+                Ok(Err(err)) => {
+                    tracing::error!("Shutdown hook {name} failed: {err}");
+                    self.errors.push(TaskError::ShutdownHookFailed(name, err));
+                }
+                Err(_) => {
+                    tracing::error!("Shutdown hook {name} timed out");
+                    self.errors.push(TaskError::ShutdownHookTimedOut(name));
                 }
             }
-        });
+        }
+    }
 
-        match futures::future::try_join_all(oneshot_tasks).await {
-            Err(err) => Err(err),
-            Ok(_) if only_oneshot_tasks => {
-                // We only run oneshot tasks in this service, so we can exit now.
-                Ok(())
+    /// Checks the result of the task execution, logs the result, and stores the error if any.
+    fn handle_task_exit(
+        &mut self,
+        task_result: Result<anyhow::Result<()>, tokio::task::JoinError>,
+        task_name: TaskId,
+    ) {
+        match task_result {
+            Ok(Ok(())) => {
+                tracing::info!("Task {task_name} finished");
             }
-            Ok(_) => {
-                // All oneshot tasks have exited and we have at least one long-running task.
-                // Simply wait for the stop signal.
-                stop_receiver.0.changed().await.ok();
-                Ok(())
+            Ok(Err(err)) => {
+                tracing::error!("Task {task_name} failed: {err}");
+                self.errors.push(TaskError::TaskFailed(task_name, err));
             }
-        }
-        // Note that we don't have to `select` on the stop signal explicitly:
-        // Each prerequisite is given a stop signal, and if everyone respects it, this future
-        // will still resolve once the stop signal is received.
-    })
+            Err(panic_err) => {
+                let panic_msg = try_extract_panic_message(panic_err);
+                tracing::error!("Task {task_name} panicked: {panic_msg}");
+                self.errors
+                    .push(TaskError::TaskPanicked(task_name, panic_msg));
+            }
+        };
+    }
 }
diff --git a/core/node/node_framework/src/service/named_future.rs b/core/node/node_framework/src/service/named_future.rs
new file mode 100644
index 000000000000..283fbbb327c9
--- /dev/null
+++ b/core/node/node_framework/src/service/named_future.rs
@@ -0,0 +1,69 @@
+use std::{fmt, future::Future, pin::Pin, task};
+
+use futures::future::{Fuse, FutureExt};
+use pin_project_lite::pin_project;
+use tokio::task::JoinHandle;
+
+use crate::task::TaskId;
+
+pin_project! {
+    /// Implements a future with the name tag attached.
+    pub struct NamedFuture<F> {
+        #[pin]
+        inner: F,
+        name: TaskId,
+    }
+}
+
+impl<F> NamedFuture<F>
+where
+    F: Future + Send + 'static,
+    F::Output: Send + 'static,
+{
+    /// Creates a new future with the name tag attached.
+    pub fn new(inner: F, name: TaskId) -> Self {
+        Self { inner, name }
+    }
+
+    /// Returns the ID of the task attached to the future.
+    pub fn id(&self) -> TaskId {
+        self.name.clone()
+    }
+
+    /// Fuses the wrapped future.
+    pub fn fuse(self) -> NamedFuture<Fuse<F>> {
+        NamedFuture {
+            name: self.name,
+            inner: self.inner.fuse(),
+        }
+    }
+
+    /// Spawns the wrapped future on the provided runtime handle.
+    /// Returns a named wrapper over the join handle.
+    pub fn spawn(self, handle: &tokio::runtime::Handle) -> NamedFuture<JoinHandle<F::Output>> {
+        NamedFuture {
+            name: self.name,
+            inner: handle.spawn(self.inner),
+        }
+    }
+}
+
+impl<F> Future for NamedFuture<F>
+where
+    F: Future,
+{
+    type Output = F::Output;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut task::Context<'_>) -> task::Poll<Self::Output> {
+        tracing::info_span!("NamedFuture", name = %self.name)
+            .in_scope(|| self.project().inner.poll(cx))
+    }
+}
+
+impl<F> fmt::Debug for NamedFuture<F> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("NamedFuture")
+            .field("name", &self.name)
+            .finish_non_exhaustive()
+    }
+}
diff --git a/core/node/node_framework/src/service/runnables.rs b/core/node/node_framework/src/service/runnables.rs
index 7b3e3f7f43b7..c3a7c21d2e80 100644
--- a/core/node/node_framework/src/service/runnables.rs
+++ b/core/node/node_framework/src/service/runnables.rs
@@ -1,64 +1,45 @@
 use std::{fmt, sync::Arc};
 
 use anyhow::Context as _;
-use futures::future::BoxFuture;
+use futures::{future::BoxFuture, FutureExt as _};
 use tokio::sync::Barrier;
+use zksync_utils::panic_extractor::try_extract_panic_message;
 
-use super::StopReceiver;
-use crate::{
-    precondition::Precondition,
-    task::{OneshotTask, Task, UnconstrainedOneshotTask, UnconstrainedTask},
-};
+use super::{named_future::NamedFuture, StopReceiver};
+use crate::task::{Task, TaskKind};
+
+/// Alias for futures with the name assigned.
+pub(crate) type NamedBoxFuture<T> = NamedFuture<BoxFuture<'static, T>>;
 
 /// A collection of different flavors of tasks.
 #[derive(Default)]
 pub(super) struct Runnables {
-    /// Preconditions added to the service.
-    pub(super) preconditions: Vec<Box<dyn Precondition>>,
     /// Tasks added to the service.
     pub(super) tasks: Vec<Box<dyn Task>>,
-    /// Oneshot tasks added to the service.
-    pub(super) oneshot_tasks: Vec<Box<dyn OneshotTask>>,
-    /// Unconstrained tasks added to the service.
-    pub(super) unconstrained_tasks: Vec<Box<dyn UnconstrainedTask>>,
-    /// Unconstrained oneshot tasks added to the service.
-    pub(super) unconstrained_oneshot_tasks: Vec<Box<dyn UnconstrainedOneshotTask>>,
+    /// List of hooks to be invoked after node shutdown.
+    pub(super) shutdown_hooks: Vec<NamedBoxFuture<anyhow::Result<()>>>,
 }
 
 impl fmt::Debug for Runnables {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // Macro that iterates over a `Vec`, invokes `.name()` method and collects the results into a `Vec<String>`.
-        // Returns a reference to created `Vec` to satisfy the `.field` method signature.
-        macro_rules! names {
-            ($vec:expr) => {
-                &$vec.iter().map(|x| x.name()).collect::<Vec<_>>()
-            };
-        }
-
         f.debug_struct("Runnables")
-            .field("preconditions", names!(self.preconditions))
-            .field("tasks", names!(self.tasks))
-            .field("oneshot_tasks", names!(self.oneshot_tasks))
-            .field("unconstrained_tasks", names!(self.unconstrained_tasks))
-            .field(
-                "unconstrained_oneshot_tasks",
-                names!(self.unconstrained_oneshot_tasks),
-            )
+            .field("tasks", &self.tasks)
+            .field("shutdown_hooks", &self.shutdown_hooks)
             .finish()
     }
 }
 
 /// A unified representation of tasks that can be run by the service.
 pub(super) struct TaskReprs {
-    pub(super) long_running_tasks: Vec<BoxFuture<'static, anyhow::Result<()>>>,
-    pub(super) oneshot_tasks: Vec<BoxFuture<'static, anyhow::Result<()>>>,
+    pub(super) tasks: Vec<NamedBoxFuture<anyhow::Result<()>>>,
+    pub(super) shutdown_hooks: Vec<NamedBoxFuture<anyhow::Result<()>>>,
 }
 
 impl fmt::Debug for TaskReprs {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("TaskReprs")
-            .field("long_running_tasks", &self.long_running_tasks.len())
-            .field("oneshot_tasks", &self.oneshot_tasks.len())
+            .field("long_running_tasks", &self.tasks.len())
+            .field("shutdown_hooks", &self.shutdown_hooks.len())
             .finish()
     }
 }
@@ -69,149 +50,104 @@ impl Runnables {
     pub(super) fn is_empty(&self) -> bool {
         // We don't consider preconditions to be tasks.
         self.tasks.is_empty()
-            && self.oneshot_tasks.is_empty()
-            && self.unconstrained_tasks.is_empty()
-            && self.unconstrained_oneshot_tasks.is_empty()
-    }
-
-    /// Returns `true` if there are no long-running tasks in the collection.
-    pub(super) fn is_oneshot_only(&self) -> bool {
-        self.tasks.is_empty() && self.unconstrained_tasks.is_empty()
     }
 
     /// Prepares a barrier that should be shared between tasks and preconditions.
     /// The barrier is configured to wait for all the participants to be ready.
     /// Barrier does not assume the existence of unconstrained tasks.
     pub(super) fn task_barrier(&self) -> Arc<Barrier> {
-        Arc::new(Barrier::new(
-            self.tasks.len() + self.preconditions.len() + self.oneshot_tasks.len(),
-        ))
+        let barrier_size = self
+            .tasks
+            .iter()
+            .filter(|t| {
+                matches!(
+                    t.kind(),
+                    TaskKind::Precondition | TaskKind::OneshotTask | TaskKind::Task
+                )
+            })
+            .count();
+        Arc::new(Barrier::new(barrier_size))
     }
 
     /// Transforms the collection of tasks into a set of universal futures.
     pub(super) fn prepare_tasks(
-        mut self,
+        &mut self,
         task_barrier: Arc<Barrier>,
         stop_receiver: StopReceiver,
     ) -> TaskReprs {
         let mut long_running_tasks = Vec::new();
-        self.collect_unconstrained_tasks(&mut long_running_tasks, stop_receiver.clone());
-        self.collect_tasks(
-            &mut long_running_tasks,
-            task_barrier.clone(),
-            stop_receiver.clone(),
-        );
-
         let mut oneshot_tasks = Vec::new();
-        self.collect_preconditions(
-            &mut oneshot_tasks,
-            task_barrier.clone(),
-            stop_receiver.clone(),
-        );
-        self.collect_oneshot_tasks(
-            &mut oneshot_tasks,
-            task_barrier.clone(),
-            stop_receiver.clone(),
-        );
-        self.collect_unconstrained_oneshot_tasks(&mut oneshot_tasks, stop_receiver.clone());
-
-        TaskReprs {
-            long_running_tasks,
-            oneshot_tasks,
-        }
-    }
-
-    fn collect_unconstrained_tasks(
-        &mut self,
-        tasks: &mut Vec<BoxFuture<'static, anyhow::Result<()>>>,
-        stop_receiver: StopReceiver,
-    ) {
-        for task in std::mem::take(&mut self.unconstrained_tasks) {
-            let name = task.name();
-            let stop_receiver = stop_receiver.clone();
-            let task_future = Box::pin(async move {
-                task.run_unconstrained(stop_receiver)
-                    .await
-                    .with_context(|| format!("Task {name} failed"))
-            });
-            tasks.push(task_future);
-        }
-    }
 
-    fn collect_tasks(
-        &mut self,
-        tasks: &mut Vec<BoxFuture<'static, anyhow::Result<()>>>,
-        task_barrier: Arc<Barrier>,
-        stop_receiver: StopReceiver,
-    ) {
         for task in std::mem::take(&mut self.tasks) {
-            let name = task.name();
+            let name = task.id();
+            let kind = task.kind();
             let stop_receiver = stop_receiver.clone();
             let task_barrier = task_barrier.clone();
-            let task_future = Box::pin(async move {
-                task.run_with_barrier(stop_receiver, task_barrier)
-                    .await
-                    .with_context(|| format!("Task {name} failed"))
-            });
-            tasks.push(task_future);
+            let task_future: BoxFuture<'static, _> =
+                Box::pin(task.run_internal(stop_receiver, task_barrier));
+            let named_future = NamedFuture::new(task_future, name);
+            if kind.is_oneshot() {
+                oneshot_tasks.push(named_future);
+            } else {
+                long_running_tasks.push(named_future);
+            }
         }
-    }
 
-    fn collect_preconditions(
-        &mut self,
-        oneshot_tasks: &mut Vec<BoxFuture<'static, anyhow::Result<()>>>,
-        task_barrier: Arc<Barrier>,
-        stop_receiver: StopReceiver,
-    ) {
-        for precondition in std::mem::take(&mut self.preconditions) {
-            let name = precondition.name();
-            let stop_receiver = stop_receiver.clone();
-            let task_barrier = task_barrier.clone();
-            let task_future = Box::pin(async move {
-                precondition
-                    .check_with_barrier(stop_receiver, task_barrier)
-                    .await
-                    .with_context(|| format!("Precondition {name} failed"))
-            });
-            oneshot_tasks.push(task_future);
-        }
-    }
+        let only_oneshot_tasks = long_running_tasks.is_empty();
+        // Create a system task that is cancellation-aware and will only exit on either oneshot task failure or
+        // stop signal.
+        let oneshot_runner_system_task =
+            oneshot_runner_task(oneshot_tasks, stop_receiver, only_oneshot_tasks);
+        long_running_tasks.push(oneshot_runner_system_task);
 
-    fn collect_oneshot_tasks(
-        &mut self,
-        oneshot_tasks: &mut Vec<BoxFuture<'static, anyhow::Result<()>>>,
-        task_barrier: Arc<Barrier>,
-        stop_receiver: StopReceiver,
-    ) {
-        for oneshot_task in std::mem::take(&mut self.oneshot_tasks) {
-            let name = oneshot_task.name();
-            let stop_receiver = stop_receiver.clone();
-            let task_barrier = task_barrier.clone();
-            let task_future = Box::pin(async move {
-                oneshot_task
-                    .run_oneshot_with_barrier(stop_receiver, task_barrier)
-                    .await
-                    .with_context(|| format!("Oneshot task {name} failed"))
-            });
-            oneshot_tasks.push(task_future);
+        TaskReprs {
+            tasks: long_running_tasks,
+            shutdown_hooks: std::mem::take(&mut self.shutdown_hooks),
         }
     }
+}
 
-    fn collect_unconstrained_oneshot_tasks(
-        &mut self,
-        oneshot_tasks: &mut Vec<BoxFuture<'static, anyhow::Result<()>>>,
-        stop_receiver: StopReceiver,
-    ) {
-        for unconstrained_oneshot_task in std::mem::take(&mut self.unconstrained_oneshot_tasks) {
-            let name = unconstrained_oneshot_task.name();
-            let stop_receiver = stop_receiver.clone();
-            let task_future = Box::pin(async move {
-                unconstrained_oneshot_task
-                    .run_unconstrained_oneshot(stop_receiver)
-                    .await
-                    .with_context(|| format!("Unconstrained oneshot task {name} failed"))
-            });
-            oneshot_tasks.push(task_future);
+fn oneshot_runner_task(
+    oneshot_tasks: Vec<NamedBoxFuture<anyhow::Result<()>>>,
+    mut stop_receiver: StopReceiver,
+    only_oneshot_tasks: bool,
+) -> NamedBoxFuture<anyhow::Result<()>> {
+    let future = async move {
+        let oneshot_tasks = oneshot_tasks.into_iter().map(|fut| async move {
+            // Spawn each oneshot task as a separate tokio task.
+            // This way we can handle the cases when such a task panics and propagate the message
+            // to the service.
+            let handle = tokio::runtime::Handle::current();
+            let name = fut.id().to_string();
+            match handle.spawn(fut).await {
+                Ok(Ok(())) => Ok(()),
+                Ok(Err(err)) => Err(err).with_context(|| format!("Oneshot task {name} failed")),
+                Err(panic_err) => {
+                    let panic_msg = try_extract_panic_message(panic_err);
+                    Err(anyhow::format_err!(
+                        "Oneshot task {name} panicked: {panic_msg}"
+                    ))
+                }
+            }
+        });
+
+        match futures::future::try_join_all(oneshot_tasks).await {
+            Err(err) => Err(err),
+            Ok(_) if only_oneshot_tasks => {
+                // We only run oneshot tasks in this service, so we can exit now.
+                Ok(())
+            }
+            Ok(_) => {
+                // All oneshot tasks have exited and we have at least one long-running task.
+                // Simply wait for the stop signal.
+                stop_receiver.0.changed().await.ok();
+                Ok(())
+            }
         }
-    }
+        // Note that we don't have to `select` on the stop signal explicitly:
+        // Each prerequisite is given a stop signal, and if everyone respects it, this future
+        // will still resolve once the stop signal is received.
+    };
+
+    NamedBoxFuture::new(future.boxed(), "oneshot_runner".into())
 }
diff --git a/core/node/node_framework/src/service/stop_receiver.rs b/core/node/node_framework/src/service/stop_receiver.rs
index 7a181b49a80d..e174cf62ba36 100644
--- a/core/node/node_framework/src/service/stop_receiver.rs
+++ b/core/node/node_framework/src/service/stop_receiver.rs
@@ -8,9 +8,3 @@ use tokio::sync::watch;
 /// and prevent tasks from hanging by accident.
 #[derive(Debug, Clone)]
 pub struct StopReceiver(pub watch::Receiver<bool>);
-
-impl StopReceiver {
-    pub fn new(receiver: watch::Receiver<bool>) -> Self {
-        Self(receiver)
-    }
-}
diff --git a/core/node/node_framework/src/service/tests.rs b/core/node/node_framework/src/service/tests.rs
index 81a7eaabdc6d..994e41ef21cc 100644
--- a/core/node/node_framework/src/service/tests.rs
+++ b/core/node/node_framework/src/service/tests.rs
@@ -9,7 +9,7 @@ use crate::{
         ServiceContext, StopReceiver, WiringError, WiringLayer, ZkStackServiceBuilder,
         ZkStackServiceError,
     },
-    task::Task,
+    task::{Task, TaskId},
 };
 
 // `ZkStack` Service's `new()` method has to have a check for nested runtime.
@@ -117,7 +117,7 @@ impl WiringLayer for TaskErrorLayer {
     }
 
     async fn wire(self: Box<Self>, mut node: ServiceContext<'_>) -> Result<(), WiringError> {
-        node.add_task(Box::new(ErrorTask));
+        node.add_task(ErrorTask);
         Ok(())
     }
 }
@@ -127,8 +127,8 @@ struct ErrorTask;
 
 #[async_trait::async_trait]
 impl Task for ErrorTask {
-    fn name(&self) -> &'static str {
-        "error_task"
+    fn id(&self) -> TaskId {
+        "error_task".into()
     }
     async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
         anyhow::bail!("error task")
@@ -160,14 +160,14 @@ impl WiringLayer for TasksLayer {
         // Barrier is needed to make sure that both tasks have started, otherwise the second task
         // may exit even before it starts.
         let barrier = Arc::new(Barrier::new(2));
-        node.add_task(Box::new(SuccessfulTask(
+        node.add_task(SuccessfulTask(
             barrier.clone(),
             self.successful_task_was_run.clone(),
-        )))
-        .add_task(Box::new(RemainingTask(
+        ))
+        .add_task(RemainingTask(
             barrier.clone(),
             self.remaining_task_was_run.clone(),
-        )));
+        ));
         Ok(())
     }
 }
@@ -178,8 +178,8 @@ struct SuccessfulTask(Arc<Barrier>, Arc<Mutex<bool>>);
 
 #[async_trait::async_trait]
 impl Task for SuccessfulTask {
-    fn name(&self) -> &'static str {
-        "successful_task"
+    fn id(&self) -> TaskId {
+        "successful_task".into()
     }
     async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
         self.0.wait().await;
@@ -196,8 +196,8 @@ struct RemainingTask(Arc<Barrier>, Arc<Mutex<bool>>);
 
 #[async_trait::async_trait]
 impl Task for RemainingTask {
-    fn name(&self) -> &'static str {
-        "remaining_task"
+    fn id(&self) -> TaskId {
+        "remaining_task".into()
     }
 
     async fn run(self: Box<Self>, mut stop_receiver: StopReceiver) -> anyhow::Result<()> {
diff --git a/core/node/node_framework/src/task.rs b/core/node/node_framework/src/task.rs
deleted file mode 100644
index f5ba08de193a..000000000000
--- a/core/node/node_framework/src/task.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-//! Tasks define the "runnable" concept of the service, e.g. a unit of work that can be executed by the service.
-//!
-//! ## Task kinds
-//!
-//! This module defines different flavors of tasks.
-//! The most basic one is [`Task`], which is only launched after all the preconditions are met (more on this later),
-//! and is expected to run until the node is shut down. This is the most common type of task, e.g. API server,
-//! state keeper, and metadata calculator are examples of such tasks.
-//!
-//! Then there exists an [`OneshotTask`], which has a clear exit condition that does not cause the node to shut down.
-//! This is useful for tasks that are expected to run once and then exit, e.g. a task that performs a programmatic
-//! migration.
-//!
-//! Finally, the task can be unconstrained by preconditions, which means that it will start immediately without
-//! waiting for any preconditions to be met. This kind of tasks is represent by [`UnconstrainedTask`] and
-//! [`UnconstrainedOneshotTask`].
-//!
-//! ## Tasks and preconditions
-//!
-//! Besides tasks, service also has a concept of preconditions(crate::precondition::Precondition). Precondition is a
-//! piece of logic that is expected to be met before the task can start. One can think of preconditions as a way to
-//! express invariants that the tasks may rely on.
-//!
-//! In this notion, the difference between a task and an unconstrained task is that the former has all the invariants
-//! checked already, and unrestricted task is responsible for *manually checking any invariants it may rely on*.
-//!
-//! The unrestricted tasks are rarely needed, but two common cases for them are:
-//! - A task that must be started as soon as possible, e.g. healthcheck server.
-//! - A task that may be a driving force for some precondition to be met.
-
-use std::sync::Arc;
-
-use tokio::sync::Barrier;
-
-use crate::service::StopReceiver;
-
-/// A task implementation.
-///
-/// Note: any `Task` added to the service will only start after all the [preconditions](crate::precondition::Precondition)
-/// are met. If a task should start immediately, one should use [`UnconstrainedTask`](crate::task::UnconstrainedTask).
-#[async_trait::async_trait]
-pub trait Task: 'static + Send {
-    /// Unique name of the task.
-    fn name(&self) -> &'static str;
-
-    /// Runs the task.
-    ///
-    /// Once any of the task returns, the node will shutdown.
-    /// If the task returns an error, the node will spawn an error-level log message and will return a non-zero
-    /// exit code.
-    ///
-    /// `stop_receiver` argument contains a channel receiver that will change its value once the node requests
-    /// a shutdown. Every task is expected to either await or periodically check the state of channel and stop
-    /// its execution once the channel is changed.
-    ///
-    /// Each task is expected to perform the required cleanup after receiving the stop signal.
-    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()>;
-}
-
-impl dyn Task {
-    /// An internal helper method that guards running the task with a tokio Barrier.
-    /// Used to make sure that the task is not started until all the preconditions are met.
-    pub(super) async fn run_with_barrier(
-        self: Box<Self>,
-        mut stop_receiver: StopReceiver,
-        preconditions_barrier: Arc<Barrier>,
-    ) -> anyhow::Result<()> {
-        // Wait either for barrier to be lifted or for the stop signal to be received.
-        tokio::select! {
-            _ = preconditions_barrier.wait() => {
-                self.run(stop_receiver).await
-            }
-            _ = stop_receiver.0.changed() => {
-                Ok(())
-            }
-        }
-    }
-}
-
-/// A oneshot task implementation.
-/// The difference from [`Task`] is that this kind of task may exit without causing the service to shutdown.
-///
-/// Note: any `Task` added to the service will only start after all the [preconditions](crate::precondition::Precondition)
-/// are met. If a task should start immediately, one should use [`UnconstrainedTask`](crate::task::UnconstrainedTask).
-#[async_trait::async_trait]
-pub trait OneshotTask: 'static + Send {
-    /// Unique name of the task.
-    fn name(&self) -> &'static str;
-
-    /// Runs the task.
-    ///
-    /// Unlike [`Task::run`], this method is expected to return once the task is finished, without causing the
-    /// node to shutdown.
-    ///
-    /// `stop_receiver` argument contains a channel receiver that will change its value once the node requests
-    /// a shutdown. Every task is expected to either await or periodically check the state of channel and stop
-    /// its execution once the channel is changed.
-    ///
-    /// Each task is expected to perform the required cleanup after receiving the stop signal.
-    async fn run_oneshot(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()>;
-}
-
-impl dyn OneshotTask {
-    /// An internal helper method that guards running the task with a tokio Barrier.
-    /// Used to make sure that the task is not started until all the preconditions are met.
-    pub(super) async fn run_oneshot_with_barrier(
-        self: Box<Self>,
-        mut stop_receiver: StopReceiver,
-        preconditions_barrier: Arc<Barrier>,
-    ) -> anyhow::Result<()> {
-        // Wait either for barrier to be lifted or for the stop signal to be received.
-        tokio::select! {
-            _ = preconditions_barrier.wait() => {
-                self.run_oneshot(stop_receiver).await
-            }
-            _ = stop_receiver.0.changed() => {
-                Ok(())
-            }
-        }
-    }
-}
-
-/// A task implementation that is not constrained by preconditions.
-///
-/// This trait is used to define tasks that should start immediately after the wiring phase, without waiting for
-/// any preconditions to be met.
-///
-/// *Warning*. An unconstrained task may not be aware of the state of the node and is expected to cautiously check
-/// any invariants it may rely on.
-#[async_trait::async_trait]
-pub trait UnconstrainedTask: 'static + Send {
-    /// Unique name of the task.
-    fn name(&self) -> &'static str;
-
-    /// Runs the task without waiting for any precondition to be met.
-    async fn run_unconstrained(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()>;
-}
-
-/// An unconstrained analog of [`OneshotTask`].
-/// See [`UnconstrainedTask`] and [`OneshotTask`] for more details.
-#[async_trait::async_trait]
-pub trait UnconstrainedOneshotTask: 'static + Send {
-    /// Unique name of the task.
-    fn name(&self) -> &'static str;
-
-    /// Runs the task without waiting for any precondition to be met.
-    async fn run_unconstrained_oneshot(
-        self: Box<Self>,
-        stop_receiver: StopReceiver,
-    ) -> anyhow::Result<()>;
-}
diff --git a/core/node/node_framework/src/task/mod.rs b/core/node/node_framework/src/task/mod.rs
new file mode 100644
index 000000000000..8113a751441a
--- /dev/null
+++ b/core/node/node_framework/src/task/mod.rs
@@ -0,0 +1,138 @@
+//! Tasks define the "runnable" concept of the service, e.g. a unit of work that can be executed by the service.
+
+use std::{
+    fmt::{self, Formatter},
+    sync::Arc,
+};
+
+use tokio::sync::Barrier;
+
+pub use self::types::{TaskId, TaskKind};
+use crate::service::StopReceiver;
+
+mod types;
+
+/// A task implementation.
+/// Task defines the "runnable" concept of the service, e.g. a unit of work that can be executed by the service.
+///
+/// Based on the task kind, the implemenation will be treated differently by the service.
+///
+/// ## Task kinds
+///
+/// There may be different kinds of tasks:
+///
+/// ### `Task`
+///
+/// A regular task. Returning from this task will cause the service to stop. [`Task::kind`] has a default
+/// implementation that returns `TaskKind::Task`.
+///
+/// Typically, the implementation of [`Task::run`] will be some form of loop that runs until either an
+/// irrecoverable error happens (then task should return an error), or stop signal is received (then task should
+/// return `Ok(())`).
+///
+/// ### `OneshotTask`
+///
+/// A task that can exit when completed without causing the service to terminate.
+/// In case of `OneshotTask`s, the service will only exit when all the `OneshotTask`s have exited and there are
+/// no more tasks running.
+///
+/// ### `Precondition`
+///
+/// A "barrier" task that is supposed to check invariants before the main tasks are started.
+/// An example of a precondition task could be a task that checks if the database has all the required data.
+/// Precondition tasks are often paired with some other kind of task that will make sure that the precondition
+/// can be satisfied. This is required for a distributed service setup, where the precondition task will be
+/// present on all the nodes, while a task that satisfies the precondition will be present only on one node.
+///
+/// ### `UnconstrainedTask`
+///
+/// A task that can run without waiting for preconditions.
+/// Tasks of this kind are expected to check all the invariants they rely on themselves.
+/// Usually, this kind of task is used either for tasks that must start as early as possible (e.g. healthcheck server),
+/// or for tasks that cannot rely on preconditions.
+///
+/// ### `UnconstrainedOneshotTask`
+///
+/// A task that can run without waiting for preconditions and can exit without stopping the service.
+/// Usually such tasks may be used for satisfying a precondition, for example, they can perform the database
+/// setup.
+#[async_trait::async_trait]
+pub trait Task: 'static + Send {
+    /// Returns the kind of the task.
+    /// The returned values is expected to be static, and it will be used by the service
+    /// to determine how to handle the task.
+    fn kind(&self) -> TaskKind {
+        TaskKind::Task
+    }
+
+    /// Unique name of the task.
+    fn id(&self) -> TaskId;
+
+    /// Runs the task.
+    async fn run(self: Box<Self>, stop_receiver: StopReceiver) -> anyhow::Result<()>;
+}
+
+impl dyn Task {
+    /// An internal helper method that guards running the task with a tokio Barrier.
+    /// Used to make sure that the task is not started until all the preconditions are met.
+    pub(super) async fn run_internal(
+        self: Box<Self>,
+        stop_receiver: StopReceiver,
+        preconditions_barrier: Arc<Barrier>,
+    ) -> anyhow::Result<()> {
+        match self.kind() {
+            TaskKind::Task | TaskKind::OneshotTask => {
+                self.run_with_barrier(stop_receiver, preconditions_barrier)
+                    .await
+            }
+            TaskKind::UnconstrainedTask | TaskKind::UnconstrainedOneshotTask => {
+                self.run(stop_receiver).await
+            }
+            TaskKind::Precondition => {
+                self.check_precondition(stop_receiver, preconditions_barrier)
+                    .await
+            }
+        }
+    }
+
+    async fn run_with_barrier(
+        self: Box<Self>,
+        mut stop_receiver: StopReceiver,
+        preconditions_barrier: Arc<Barrier>,
+    ) -> anyhow::Result<()> {
+        // Wait either for barrier to be lifted or for the stop signal to be received.
+        tokio::select! {
+            _ = preconditions_barrier.wait() => {
+                self.run(stop_receiver).await
+            }
+            _ = stop_receiver.0.changed() => {
+                Ok(())
+            }
+        }
+    }
+
+    async fn check_precondition(
+        self: Box<Self>,
+        mut stop_receiver: StopReceiver,
+        preconditions_barrier: Arc<Barrier>,
+    ) -> anyhow::Result<()> {
+        self.run(stop_receiver.clone()).await?;
+        tokio::select! {
+            _ = preconditions_barrier.wait() => {
+                Ok(())
+            }
+            _ = stop_receiver.0.changed() => {
+                Ok(())
+            }
+        }
+    }
+}
+
+impl fmt::Debug for dyn Task {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        f.debug_struct("Task")
+            .field("kind", &self.kind())
+            .field("name", &self.id())
+            .finish()
+    }
+}
diff --git a/core/node/node_framework/src/task/types.rs b/core/node/node_framework/src/task/types.rs
new file mode 100644
index 000000000000..e9b8b6e37f26
--- /dev/null
+++ b/core/node/node_framework/src/task/types.rs
@@ -0,0 +1,61 @@
+use std::{
+    fmt::{Display, Formatter},
+    ops::Deref,
+};
+
+/// Task kind.
+/// See [`Task`](super::Task) documentation for more details.
+#[derive(Debug, Clone, Copy)]
+#[non_exhaustive]
+pub enum TaskKind {
+    Task,
+    OneshotTask,
+    UnconstrainedTask,
+    UnconstrainedOneshotTask,
+    Precondition,
+}
+
+impl TaskKind {
+    pub(crate) fn is_oneshot(self) -> bool {
+        matches!(
+            self,
+            TaskKind::OneshotTask | TaskKind::UnconstrainedOneshotTask | TaskKind::Precondition
+        )
+    }
+}
+
+/// A unique human-readable identifier of a task.
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub struct TaskId(String);
+
+impl TaskId {
+    pub fn new(value: String) -> Self {
+        TaskId(value)
+    }
+}
+
+impl Display for TaskId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&self.0)
+    }
+}
+
+impl From<&str> for TaskId {
+    fn from(value: &str) -> Self {
+        TaskId(value.to_owned())
+    }
+}
+
+impl From<String> for TaskId {
+    fn from(value: String) -> Self {
+        TaskId(value)
+    }
+}
+
+impl Deref for TaskId {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
diff --git a/core/node/node_framework/tests/ui.rs b/core/node/node_framework/tests/ui.rs
new file mode 100644
index 000000000000..f2f9697b2c13
--- /dev/null
+++ b/core/node/node_framework/tests/ui.rs
@@ -0,0 +1,11 @@
+#[test]
+fn ui_pass() {
+    let t = trybuild::TestCases::new();
+    t.pass("tests/ui/correct/*.rs");
+}
+
+#[test]
+fn ui_fail() {
+    let t = trybuild::TestCases::new();
+    t.compile_fail("tests/ui/incorrect/*.rs");
+}
diff --git a/core/node/node_framework/tests/ui/correct/01_from_context.rs b/core/node/node_framework/tests/ui/correct/01_from_context.rs
new file mode 100644
index 000000000000..165c53fd0886
--- /dev/null
+++ b/core/node/node_framework/tests/ui/correct/01_from_context.rs
@@ -0,0 +1,41 @@
+#![allow(dead_code)]
+
+use zksync_node_framework::{FromContext, Resource};
+
+#[derive(Clone)]
+struct ResourceA;
+
+impl Resource for ResourceA {
+    fn name() -> String {
+        "a".to_string()
+    }
+}
+
+#[derive(Clone, Default)]
+struct ResourceB;
+
+impl Resource for ResourceB {
+    fn name() -> String {
+        "b".to_string()
+    }
+}
+
+#[derive(FromContext)]
+struct SimpleStruct {
+    _field: ResourceA,
+    _field_2: ResourceB,
+}
+
+#[derive(FromContext)]
+struct StructWithDefault {
+    _field: ResourceA,
+    #[context(default)]
+    _field_default: ResourceB,
+}
+
+#[derive(FromContext)]
+struct StructWithOption {
+    _field: Option<ResourceA>,
+}
+
+fn main() {}
diff --git a/core/node/node_framework/tests/ui/correct/02_into_context.rs b/core/node/node_framework/tests/ui/correct/02_into_context.rs
new file mode 100644
index 000000000000..33104aeea2be
--- /dev/null
+++ b/core/node/node_framework/tests/ui/correct/02_into_context.rs
@@ -0,0 +1,41 @@
+#![allow(dead_code)]
+
+use zksync_node_framework::{IntoContext, Resource, StopReceiver, Task, TaskId};
+
+#[derive(Clone)]
+struct ResourceA;
+
+impl Resource for ResourceA {
+    fn name() -> String {
+        "a".to_string()
+    }
+}
+
+struct TaskA;
+
+#[async_trait::async_trait]
+impl Task for TaskA {
+    fn id(&self) -> TaskId {
+        "batch_status_updater".into()
+    }
+
+    async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+#[derive(IntoContext)]
+struct SimpleStruct {
+    _field: ResourceA,
+    #[context(task)]
+    _field_2: TaskA,
+}
+
+#[derive(IntoContext)]
+struct Options {
+    _field: Option<ResourceA>,
+    #[context(task)]
+    _field_2: Option<TaskA>,
+}
+
+fn main() {}
diff --git a/core/node/node_framework/tests/ui/incorrect/01_from_context_task.rs b/core/node/node_framework/tests/ui/incorrect/01_from_context_task.rs
new file mode 100644
index 000000000000..b49347eef00b
--- /dev/null
+++ b/core/node/node_framework/tests/ui/incorrect/01_from_context_task.rs
@@ -0,0 +1,34 @@
+#![allow(dead_code)]
+
+use zksync_node_framework::{FromContext, Resource, StopReceiver, Task, TaskId};
+
+#[derive(Clone)]
+struct ResourceA;
+
+impl Resource for ResourceA {
+    fn name() -> String {
+        "a".to_string()
+    }
+}
+
+struct TaskA;
+
+#[async_trait::async_trait]
+impl Task for TaskA {
+    fn id(&self) -> TaskId {
+        "batch_status_updater".into()
+    }
+
+    async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+#[derive(FromContext)]
+struct SimpleStruct {
+    _field: ResourceA,
+    #[context(task)]
+    _field_2: TaskA,
+}
+
+fn main() {}
diff --git a/core/node/node_framework/tests/ui/incorrect/01_from_context_task.stderr b/core/node/node_framework/tests/ui/incorrect/01_from_context_task.stderr
new file mode 100644
index 000000000000..52acbc48be19
--- /dev/null
+++ b/core/node/node_framework/tests/ui/incorrect/01_from_context_task.stderr
@@ -0,0 +1,5 @@
+error: `task` attribute is not allowed in `FromContext` macro
+  --> tests/ui/incorrect/01_from_context_task.rs:31:5
+   |
+31 |     _field_2: TaskA,
+   |     ^^^^^^^^
diff --git a/core/node/node_framework/tests/ui/incorrect/02_into_context_default_task.rs b/core/node/node_framework/tests/ui/incorrect/02_into_context_default_task.rs
new file mode 100644
index 000000000000..755605b8151d
--- /dev/null
+++ b/core/node/node_framework/tests/ui/incorrect/02_into_context_default_task.rs
@@ -0,0 +1,35 @@
+#![allow(dead_code)]
+
+use zksync_node_framework::{IntoContext, Resource, StopReceiver, Task, TaskId};
+
+#[derive(Clone)]
+struct ResourceA;
+
+impl Resource for ResourceA {
+    fn name() -> String {
+        "a".to_string()
+    }
+}
+
+#[derive(Default)]
+struct TaskA;
+
+#[async_trait::async_trait]
+impl Task for TaskA {
+    fn id(&self) -> TaskId {
+        "batch_status_updater".into()
+    }
+
+    async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+#[derive(IntoContext)]
+struct SimpleStruct {
+    _field: ResourceA,
+    #[context(task, default)]
+    _field_2: TaskA,
+}
+
+fn main() {}
diff --git a/core/node/node_framework/tests/ui/incorrect/02_into_context_default_task.stderr b/core/node/node_framework/tests/ui/incorrect/02_into_context_default_task.stderr
new file mode 100644
index 000000000000..b1a751f45dbb
--- /dev/null
+++ b/core/node/node_framework/tests/ui/incorrect/02_into_context_default_task.stderr
@@ -0,0 +1,5 @@
+error: `default` attribute is not allowed in `IntoContext` macro
+  --> tests/ui/incorrect/02_into_context_default_task.rs:32:5
+   |
+32 |     _field_2: TaskA,
+   |     ^^^^^^^^
diff --git a/core/node/node_framework/tests/ui/incorrect/03_into_context_default_resource.rs b/core/node/node_framework/tests/ui/incorrect/03_into_context_default_resource.rs
new file mode 100644
index 000000000000..3f815b830eb5
--- /dev/null
+++ b/core/node/node_framework/tests/ui/incorrect/03_into_context_default_resource.rs
@@ -0,0 +1,35 @@
+#![allow(dead_code)]
+
+use zksync_node_framework::{IntoContext, Resource, StopReceiver, Task, TaskId};
+
+#[derive(Clone)]
+struct ResourceA;
+
+impl Resource for ResourceA {
+    fn name() -> String {
+        "a".to_string()
+    }
+}
+
+struct TaskA;
+
+#[async_trait::async_trait]
+impl Task for TaskA {
+    fn id(&self) -> TaskId {
+        "batch_status_updater".into()
+    }
+
+    async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+#[derive(IntoContext)]
+struct SimpleStruct {
+    #[context(default)]
+    _field: ResourceA,
+    #[context(task)]
+    _field_2: TaskA,
+}
+
+fn main() {}
diff --git a/core/node/node_framework/tests/ui/incorrect/03_into_context_default_resource.stderr b/core/node/node_framework/tests/ui/incorrect/03_into_context_default_resource.stderr
new file mode 100644
index 000000000000..e69da3ad9bba
--- /dev/null
+++ b/core/node/node_framework/tests/ui/incorrect/03_into_context_default_resource.stderr
@@ -0,0 +1,5 @@
+error: `default` attribute is not allowed in `IntoContext` macro
+  --> tests/ui/incorrect/03_into_context_default_resource.rs:30:5
+   |
+30 |     _field: ResourceA,
+   |     ^^^^^^
diff --git a/core/node/node_framework/tests/ui/incorrect/04_field_crate_attr.rs b/core/node/node_framework/tests/ui/incorrect/04_field_crate_attr.rs
new file mode 100644
index 000000000000..48c17222333f
--- /dev/null
+++ b/core/node/node_framework/tests/ui/incorrect/04_field_crate_attr.rs
@@ -0,0 +1,48 @@
+#![allow(dead_code)]
+
+use zksync_node_framework::{IntoContext, Resource, StopReceiver, Task, TaskId};
+
+#[derive(Clone)]
+struct ResourceA;
+
+impl Resource for ResourceA {
+    fn name() -> String {
+        "a".to_string()
+    }
+}
+
+struct TaskA;
+
+#[async_trait::async_trait]
+impl Task for TaskA {
+    fn id(&self) -> TaskId {
+        "batch_status_updater".into()
+    }
+
+    async fn run(self: Box<Self>, _stop_receiver: StopReceiver) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+#[derive(IntoContext)]
+struct SimpleStruct {
+    #[context(crate = a)]
+    _field: ResourceA,
+}
+
+#[derive(IntoContext)]
+struct SimpleStruct2 {
+    #[context(crate = b)]
+    _field: ResourceA,
+    #[context(task)]
+    _field_2: TaskA,
+}
+
+#[derive(IntoContext)]
+struct SimpleStruct3 {
+    _field: ResourceA,
+    #[context(task, crate = c)]
+    _field_2: TaskA,
+}
+
+fn main() {}
diff --git a/core/node/node_framework/tests/ui/incorrect/04_field_crate_attr.stderr b/core/node/node_framework/tests/ui/incorrect/04_field_crate_attr.stderr
new file mode 100644
index 000000000000..6346c4cb7e9e
--- /dev/null
+++ b/core/node/node_framework/tests/ui/incorrect/04_field_crate_attr.stderr
@@ -0,0 +1,17 @@
+error: `crate` attribute is not allowed for fields
+  --> tests/ui/incorrect/04_field_crate_attr.rs:30:5
+   |
+30 |     _field: ResourceA,
+   |     ^^^^^^
+
+error: `crate` attribute is not allowed for fields
+  --> tests/ui/incorrect/04_field_crate_attr.rs:36:5
+   |
+36 |     _field: ResourceA,
+   |     ^^^^^^
+
+error: `crate` attribute is not allowed for fields
+  --> tests/ui/incorrect/04_field_crate_attr.rs:45:5
+   |
+45 |     _field_2: TaskA,
+   |     ^^^^^^^^
diff --git a/core/node/node_sync/Cargo.toml b/core/node/node_sync/Cargo.toml
new file mode 100644
index 000000000000..7d97bdf053ac
--- /dev/null
+++ b/core/node/node_sync/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "zksync_node_sync"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_config.workspace = true
+zksync_contracts.workspace = true
+zksync_dal.workspace = true
+zksync_node_genesis.workspace = true
+zksync_system_constants.workspace = true
+zksync_types.workspace = true
+zksync_state_keeper.workspace = true
+zksync_shared_metrics.workspace = true
+zksync_web3_decl.workspace = true
+zksync_health_check.workspace = true
+zksync_utils.workspace = true
+zksync_eth_client.workspace = true
+zksync_concurrency.workspace = true
+vise.workspace = true
+zksync_vm_utils.workspace = true
+
+anyhow.workspace = true
+async-trait.workspace = true
+chrono.workspace = true
+futures.workspace = true
+tracing.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tokio = { workspace = true, features = ["time"] }
+thiserror.workspace = true
+
+[dev-dependencies]
+zksync_node_test_utils.workspace = true
+
+assert_matches.workspace = true
+once_cell.workspace = true
+test-casing.workspace = true
diff --git a/core/node/node_sync/README.md b/core/node/node_sync/README.md
new file mode 100644
index 000000000000..afbe1b378a3c
--- /dev/null
+++ b/core/node/node_sync/README.md
@@ -0,0 +1,3 @@
+# `zksync_node_sync`
+
+A set of primitives and components that enable synchronization of ZK Stack nodes replicas.
diff --git a/core/lib/zksync_core/src/sync_layer/batch_status_updater/mod.rs b/core/node/node_sync/src/batch_status_updater/mod.rs
similarity index 96%
rename from core/lib/zksync_core/src/sync_layer/batch_status_updater/mod.rs
rename to core/node/node_sync/src/batch_status_updater/mod.rs
index 34a970e41217..3f6bb9ff33f8 100644
--- a/core/lib/zksync_core/src/sync_layer/batch_status_updater/mod.rs
+++ b/core/node/node_sync/src/batch_status_updater/mod.rs
@@ -16,13 +16,12 @@ use zksync_types::{
     aggregated_operations::AggregatedActionType, api, L1BatchNumber, L2BlockNumber, H256,
 };
 use zksync_web3_decl::{
-    client::BoxedL2Client,
+    client::{DynClient, L2},
     error::{ClientRpcContext, EnrichedClientError, EnrichedClientResult},
     namespaces::ZksNamespaceClient,
 };
 
 use super::metrics::{FetchStage, FETCHER_METRICS};
-use crate::utils::projected_first_l1_batch;
 
 #[cfg(test)]
 mod tests;
@@ -87,7 +86,7 @@ trait MainNodeClient: fmt::Debug + Send + Sync {
 }
 
 #[async_trait]
-impl MainNodeClient for BoxedL2Client {
+impl MainNodeClient for Box<DynClient<L2>> {
     async fn resolve_l1_batch_to_l2_block(
         &self,
         number: L1BatchNumber,
@@ -255,7 +254,7 @@ pub struct BatchStatusUpdater {
 impl BatchStatusUpdater {
     const DEFAULT_SLEEP_INTERVAL: Duration = Duration::from_secs(5);
 
-    pub fn new(client: BoxedL2Client, pool: ConnectionPool<Core>) -> Self {
+    pub fn new(client: Box<DynClient<L2>>, pool: ConnectionPool<Core>) -> Self {
         Self::from_parts(
             Box::new(client.for_component("batch_status_updater")),
             pool,
@@ -485,3 +484,15 @@ impl BatchStatusUpdater {
         Ok(())
     }
 }
+
+/// Returns the projected number of the first locally available L1 batch. The L1 batch is **not**
+/// guaranteed to be present in the storage!
+async fn projected_first_l1_batch(
+    storage: &mut Connection<'_, Core>,
+) -> anyhow::Result<L1BatchNumber> {
+    let snapshot_recovery = storage
+        .snapshot_recovery_dal()
+        .get_applied_snapshot_status()
+        .await?;
+    Ok(snapshot_recovery.map_or(L1BatchNumber(0), |recovery| recovery.l1_batch_number + 1))
+}
diff --git a/core/lib/zksync_core/src/sync_layer/batch_status_updater/tests.rs b/core/node/node_sync/src/batch_status_updater/tests.rs
similarity index 98%
rename from core/lib/zksync_core/src/sync_layer/batch_status_updater/tests.rs
rename to core/node/node_sync/src/batch_status_updater/tests.rs
index be0df56dfbf3..28b89f86f6a7 100644
--- a/core/lib/zksync_core/src/sync_layer/batch_status_updater/tests.rs
+++ b/core/node/node_sync/src/batch_status_updater/tests.rs
@@ -11,7 +11,7 @@ use zksync_node_test_utils::{create_l1_batch, create_l2_block, prepare_recovery_
 use zksync_types::{Address, ProtocolVersionId};
 
 use super::*;
-use crate::sync_layer::metrics::L1BatchStage;
+use crate::metrics::L1BatchStage;
 
 async fn seal_l1_batch(storage: &mut Connection<'_, Core>, number: L1BatchNumber) {
     let mut storage = storage.start_transaction().await.unwrap();
@@ -64,9 +64,7 @@ impl L1BatchStagesMap {
     }
 
     fn get(&self, number: L1BatchNumber) -> Option<L1BatchStage> {
-        let Some(index) = number.0.checked_sub(self.first_batch_number.0) else {
-            return None;
-        };
+        let index = number.0.checked_sub(self.first_batch_number.0)?;
         self.stages.get(index as usize).copied()
     }
 
@@ -160,6 +158,7 @@ fn mock_block_details(number: u32, stage: L1BatchStage) -> api::BlockDetails {
                 .then(|| Utc.timestamp_opt(300, 0).unwrap()),
             l1_gas_price: 1,
             l2_fair_gas_price: 2,
+            fair_pubdata_price: None,
             base_system_contracts_hashes: BaseSystemContractsHashes::default(),
         },
         operator_address: Address::zero(),
diff --git a/core/lib/zksync_core/src/sync_layer/client.rs b/core/node/node_sync/src/client.rs
similarity index 82%
rename from core/lib/zksync_core/src/sync_layer/client.rs
rename to core/node/node_sync/src/client.rs
index c998b934cf13..3d71d86f163b 100644
--- a/core/lib/zksync_core/src/sync_layer/client.rs
+++ b/core/node/node_sync/src/client.rs
@@ -4,13 +4,14 @@ use std::fmt;
 
 use async_trait::async_trait;
 use zksync_config::GenesisConfig;
+use zksync_health_check::{CheckHealth, Health, HealthStatus};
 use zksync_system_constants::ACCOUNT_CODE_STORAGE_ADDRESS;
 use zksync_types::{
     api::{self, en},
     get_code_key, Address, L2BlockNumber, ProtocolVersionId, H256, U64,
 };
 use zksync_web3_decl::{
-    client::BoxedL2Client,
+    client::{DynClient, L2},
     error::{ClientRpcContext, EnrichedClientError, EnrichedClientResult},
     namespaces::{EnNamespaceClient, EthNamespaceClient, ZksNamespaceClient},
 };
@@ -47,7 +48,7 @@ pub trait MainNodeClient: 'static + Send + Sync + fmt::Debug {
 }
 
 #[async_trait]
-impl MainNodeClient for BoxedL2Client {
+impl MainNodeClient for Box<DynClient<L2>> {
     async fn fetch_system_contract_by_hash(
         &self,
         hash: H256,
@@ -136,3 +137,31 @@ impl MainNodeClient for BoxedL2Client {
             .await
     }
 }
+
+/// Main node health check.
+#[derive(Debug)]
+pub struct MainNodeHealthCheck(Box<DynClient<L2>>);
+
+impl From<Box<DynClient<L2>>> for MainNodeHealthCheck {
+    fn from(client: Box<DynClient<L2>>) -> Self {
+        Self(client.for_component("main_node_health_check"))
+    }
+}
+
+#[async_trait]
+impl CheckHealth for MainNodeHealthCheck {
+    fn name(&self) -> &'static str {
+        "main_node_http_rpc"
+    }
+
+    async fn check_health(&self) -> Health {
+        if let Err(err) = self.0.get_block_number().await {
+            tracing::warn!("Health-check call to main node HTTP RPC failed: {err}");
+            let details = serde_json::json!({
+                "error": err.to_string(),
+            });
+            return Health::from(HealthStatus::NotReady).with_details(details);
+        }
+        HealthStatus::Ready.into()
+    }
+}
diff --git a/core/lib/zksync_core/src/sync_layer/external_io.rs b/core/node/node_sync/src/external_io.rs
similarity index 87%
rename from core/lib/zksync_core/src/sync_layer/external_io.rs
rename to core/node/node_sync/src/external_io.rs
index 482c0fbe2de2..8ad143861450 100644
--- a/core/lib/zksync_core/src/sync_layer/external_io.rs
+++ b/core/node/node_sync/src/external_io.rs
@@ -2,28 +2,30 @@ use std::{collections::HashMap, time::Duration};
 
 use anyhow::Context as _;
 use async_trait::async_trait;
-use vm_utils::storage::L1BatchParamsProvider;
 use zksync_contracts::{BaseSystemContracts, BaseSystemContractsHashes, SystemContractCode};
 use zksync_dal::{ConnectionPool, Core, CoreDal};
+use zksync_state_keeper::{
+    io::{
+        common::{load_pending_batch, IoCursor},
+        seal_logic::l2_block_seal_subtasks::L2BlockSealProcess,
+        L1BatchParams, L2BlockParams, PendingBatchData, StateKeeperIO,
+    },
+    metrics::KEEPER_METRICS,
+    seal_criteria::{IoSealCriteria, UnexecutableReason},
+    updates::UpdatesManager,
+};
 use zksync_types::{
-    protocol_upgrade::ProtocolUpgradeTx, L1BatchNumber, L2BlockNumber, L2ChainId,
-    ProtocolVersionId, Transaction, H256,
+    protocol_upgrade::ProtocolUpgradeTx,
+    protocol_version::{ProtocolSemanticVersion, VersionPatch},
+    L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersionId, Transaction, H256,
 };
 use zksync_utils::bytes_to_be_words;
+use zksync_vm_utils::storage::L1BatchParamsProvider;
 
 use super::{
     client::MainNodeClient,
     sync_action::{ActionQueue, SyncAction},
 };
-use crate::state_keeper::{
-    io::{
-        common::{load_pending_batch, IoCursor},
-        L1BatchParams, L2BlockParams, PendingBatchData, StateKeeperIO,
-    },
-    metrics::KEEPER_METRICS,
-    seal_criteria::IoSealCriteria,
-    updates::UpdatesManager,
-};
 
 /// ExternalIO is the IO abstraction for the state keeper that is used in the external node.
 /// It receives a sequence of actions from the fetcher via the action queue and propagates it
@@ -72,7 +74,7 @@ impl ExternalIO {
             .connection_tagged("sync_layer")
             .await?
             .factory_deps_dal()
-            .get_factory_dep(hash)
+            .get_sealed_factory_dep(hash)
             .await?;
 
         Ok(match bytecode {
@@ -141,6 +143,7 @@ impl StateKeeperIO for ExternalIO {
             cursor.next_l2_block,
         );
 
+        L2BlockSealProcess::clear_pending_l2_block(&mut storage, cursor.next_l2_block - 1).await?;
         let pending_l2_block_header = self
             .l1_batch_params_provider
             .load_first_l2_block_in_batch(&mut storage, cursor.l1_batch)
@@ -301,16 +304,16 @@ impl StateKeeperIO for ExternalIO {
         anyhow::bail!("Rollback requested. Transaction hash: {:?}", tx.hash());
     }
 
-    async fn reject(&mut self, tx: &Transaction, error: &str) -> anyhow::Result<()> {
+    async fn reject(&mut self, tx: &Transaction, reason: UnexecutableReason) -> anyhow::Result<()> {
         // We are replaying the already executed transactions so no rejections are expected to occur.
         anyhow::bail!(
-            "Requested rejection of transaction {:?} because of the following error: {error}. \
+            "Requested rejection of transaction {:?} because of the following error: {reason}. \
              This is not supported on external node",
             tx.hash()
         );
     }
     async fn load_base_system_contracts(
-        &mut self,
+        &self,
         protocol_version: ProtocolVersionId,
         cursor: &IoCursor,
     ) -> anyhow::Result<BaseSystemContracts> {
@@ -334,32 +337,43 @@ impl StateKeeperIO for ExternalIO {
             .await
             .context("failed to fetch protocol version from the main node")?
             .context("protocol version is missing on the main node")?;
+        let minor = protocol_version
+            .minor_version()
+            .context("Missing minor protocol version")?;
+        let bootloader_code_hash = protocol_version
+            .bootloader_code_hash()
+            .context("Missing bootloader code hash")?;
+        let default_account_code_hash = protocol_version
+            .default_account_code_hash()
+            .context("Missing default account code hash")?;
+        let l2_system_upgrade_tx_hash = protocol_version.l2_system_upgrade_tx_hash();
         self.pool
             .connection_tagged("sync_layer")
             .await?
             .protocol_versions_dal()
             .save_protocol_version(
-                protocol_version
-                    .version_id
-                    .try_into()
-                    .context("cannot convert protocol version")?,
+                ProtocolSemanticVersion {
+                    minor: minor
+                        .try_into()
+                        .context("cannot convert protocol version")?,
+                    patch: VersionPatch(0),
+                },
                 protocol_version.timestamp,
-                protocol_version.verification_keys_hashes,
-                protocol_version.base_system_contracts,
-                protocol_version.l2_system_upgrade_tx_hash,
+                Default::default(), // verification keys are unused for EN
+                BaseSystemContractsHashes {
+                    bootloader: bootloader_code_hash,
+                    default_aa: default_account_code_hash,
+                },
+                l2_system_upgrade_tx_hash,
             )
             .await?;
 
-        let BaseSystemContractsHashes {
-            bootloader,
-            default_aa,
-        } = protocol_version.base_system_contracts;
         let bootloader = self
-            .get_base_system_contract(bootloader, cursor.next_l2_block)
+            .get_base_system_contract(bootloader_code_hash, cursor.next_l2_block)
             .await
             .with_context(|| format!("cannot fetch bootloader code for {protocol_version:?}"))?;
         let default_aa = self
-            .get_base_system_contract(default_aa, cursor.next_l2_block)
+            .get_base_system_contract(default_account_code_hash, cursor.next_l2_block)
             .await
             .with_context(|| format!("cannot fetch default AA code for {protocol_version:?}"))?;
         Ok(BaseSystemContracts {
@@ -369,7 +383,7 @@ impl StateKeeperIO for ExternalIO {
     }
 
     async fn load_batch_version_id(
-        &mut self,
+        &self,
         number: L1BatchNumber,
     ) -> anyhow::Result<ProtocolVersionId> {
         let mut storage = self.pool.connection_tagged("sync_layer").await?;
@@ -381,17 +395,14 @@ impl StateKeeperIO for ExternalIO {
     }
 
     async fn load_upgrade_tx(
-        &mut self,
+        &self,
         _version_id: ProtocolVersionId,
     ) -> anyhow::Result<Option<ProtocolUpgradeTx>> {
         // External node will fetch upgrade tx from the main node
         Ok(None)
     }
 
-    async fn load_batch_state_hash(
-        &mut self,
-        l1_batch_number: L1BatchNumber,
-    ) -> anyhow::Result<H256> {
+    async fn load_batch_state_hash(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<H256> {
         tracing::info!("Getting L1 batch hash for L1 batch #{l1_batch_number}");
         let mut storage = self.pool.connection_tagged("sync_layer").await?;
         let wait_latency = KEEPER_METRICS.wait_for_prev_hash_time.start();
diff --git a/core/lib/zksync_core/src/sync_layer/fetcher.rs b/core/node/node_sync/src/fetcher.rs
similarity index 90%
rename from core/lib/zksync_core/src/sync_layer/fetcher.rs
rename to core/node/node_sync/src/fetcher.rs
index 8f5922afa3af..51b9f7c7a060 100644
--- a/core/lib/zksync_core/src/sync_layer/fetcher.rs
+++ b/core/node/node_sync/src/fetcher.rs
@@ -1,5 +1,6 @@
 use zksync_dal::{Connection, Core, CoreDal};
 use zksync_shared_metrics::{TxStage, APP_METRICS};
+use zksync_state_keeper::io::{common::IoCursor, L1BatchParams, L2BlockParams};
 use zksync_types::{
     api::en::SyncBlock, block::L2BlockHasher, fee_model::BatchFeeInput, helpers::unix_timestamp_ms,
     Address, L1BatchNumber, L2BlockNumber, ProtocolVersionId, H256,
@@ -9,12 +10,11 @@ use super::{
     metrics::{L1BatchStage, FETCHER_METRICS},
     sync_action::SyncAction,
 };
-use crate::state_keeper::io::{common::IoCursor, L1BatchParams, L2BlockParams};
 
 /// Same as [`zksync_types::Transaction`], just with additional guarantees that the "received at" timestamp was set locally.
 /// We cannot transfer `Transaction`s without these timestamps, because this would break backward compatibility.
 #[derive(Debug, Clone)]
-pub(crate) struct FetchedTransaction(zksync_types::Transaction);
+pub struct FetchedTransaction(zksync_types::Transaction);
 
 impl FetchedTransaction {
     pub fn new(mut tx: zksync_types::Transaction) -> Self {
@@ -38,7 +38,7 @@ impl From<FetchedTransaction> for zksync_types::Transaction {
 
 /// Common denominator for blocks fetched by an external node.
 #[derive(Debug)]
-pub(crate) struct FetchedBlock {
+pub struct FetchedBlock {
     pub number: L2BlockNumber,
     pub l1_batch_number: L1BatchNumber,
     pub last_in_batch: bool,
@@ -97,9 +97,20 @@ impl TryFrom<SyncBlock> for FetchedBlock {
     }
 }
 
-impl IoCursor {
+/// Helper method for `IoCursor` for needs of sync layer.
+#[async_trait::async_trait]
+pub trait IoCursorExt: Sized {
     /// Loads this cursor from storage and modifies it to account for the pending L1 batch if necessary.
-    pub(crate) async fn for_fetcher(storage: &mut Connection<'_, Core>) -> anyhow::Result<Self> {
+    async fn for_fetcher(storage: &mut Connection<'_, Core>) -> anyhow::Result<Self>;
+
+    /// Advances the cursor according to the provided fetched block and returns a sequence of `SyncAction`
+    /// objects to process.
+    fn advance(&mut self, block: FetchedBlock) -> Vec<SyncAction>;
+}
+
+#[async_trait::async_trait]
+impl IoCursorExt for IoCursor {
+    async fn for_fetcher(storage: &mut Connection<'_, Core>) -> anyhow::Result<Self> {
         let mut this = Self::new(storage).await?;
         // It's important to know whether we have opened a new batch already or just sealed the previous one.
         // Depending on it, we must either insert `OpenBatch` item into the queue, or not.
@@ -110,7 +121,7 @@ impl IoCursor {
         Ok(this)
     }
 
-    pub(crate) fn advance(&mut self, block: FetchedBlock) -> Vec<SyncAction> {
+    fn advance(&mut self, block: FetchedBlock) -> Vec<SyncAction> {
         assert_eq!(block.number, self.next_l2_block);
         let local_block_hash = block.compute_hash(self.prev_l2_block_hash);
         if let Some(reference_hash) = block.reference_hash {
diff --git a/core/lib/zksync_core/src/sync_layer/genesis.rs b/core/node/node_sync/src/genesis.rs
similarity index 100%
rename from core/lib/zksync_core/src/sync_layer/genesis.rs
rename to core/node/node_sync/src/genesis.rs
diff --git a/core/lib/zksync_core/src/sync_layer/mod.rs b/core/node/node_sync/src/lib.rs
similarity index 84%
rename from core/lib/zksync_core/src/sync_layer/mod.rs
rename to core/node/node_sync/src/lib.rs
index a8e840c96099..304ef87270bd 100644
--- a/core/lib/zksync_core/src/sync_layer/mod.rs
+++ b/core/node/node_sync/src/lib.rs
@@ -4,13 +4,16 @@ pub mod external_io;
 pub mod fetcher;
 pub mod genesis;
 mod metrics;
-pub(crate) mod sync_action;
+pub mod sync_action;
 mod sync_state;
+pub mod testonly;
 #[cfg(test)]
 mod tests;
+pub mod tree_data_fetcher;
+pub mod validate_chain_ids_task;
 
 pub use self::{
-    client::MainNodeClient,
+    client::{MainNodeClient, MainNodeHealthCheck},
     external_io::ExternalIO,
     sync_action::{ActionQueue, ActionQueueSender},
     sync_state::SyncState,
diff --git a/core/lib/zksync_core/src/sync_layer/metrics.rs b/core/node/node_sync/src/metrics.rs
similarity index 100%
rename from core/lib/zksync_core/src/sync_layer/metrics.rs
rename to core/node/node_sync/src/metrics.rs
diff --git a/core/lib/zksync_core/src/sync_layer/sync_action.rs b/core/node/node_sync/src/sync_action.rs
similarity index 88%
rename from core/lib/zksync_core/src/sync_layer/sync_action.rs
rename to core/node/node_sync/src/sync_action.rs
index 820f045445d5..8cb90d24fe84 100644
--- a/core/lib/zksync_core/src/sync_layer/sync_action.rs
+++ b/core/node/node_sync/src/sync_action.rs
@@ -1,8 +1,8 @@
 use tokio::sync::mpsc;
+use zksync_state_keeper::io::{L1BatchParams, L2BlockParams};
 use zksync_types::{L1BatchNumber, L2BlockNumber};
 
 use super::{fetcher::FetchedTransaction, metrics::QUEUE_METRICS};
-use crate::state_keeper::io::{L1BatchParams, L2BlockParams};
 
 #[derive(Debug)]
 pub struct ActionQueueSender(mpsc::Sender<SyncAction>);
@@ -13,20 +13,30 @@ impl ActionQueueSender {
     /// Requires that the actions are in the correct order: starts with a new open L1 batch / L2 block,
     /// followed by 0 or more transactions, have mandatory `SealL2Block` and optional `SealBatch` at the end.
     /// Would panic if the order is incorrect.
-    pub(crate) async fn push_actions(&self, actions: Vec<SyncAction>) {
-        Self::check_action_sequence(&actions).unwrap();
+    ///
+    /// # Errors
+    ///
+    /// Errors correspond to incorrect action order, or to `ExternalIO` instance that the queue is connected to shutting down.
+    /// Hence, returned errors must be treated as unrecoverable by the caller; it is unsound to continue
+    /// operating a node if some of the `actions` may be lost.
+    pub async fn push_actions(&self, actions: Vec<SyncAction>) -> anyhow::Result<()> {
+        Self::check_action_sequence(&actions)?;
         for action in actions {
-            self.0.send(action).await.expect("EN sync logic panicked");
+            self.0
+                .send(action)
+                .await
+                .map_err(|_| anyhow::anyhow!("node action processor stopped"))?;
             QUEUE_METRICS
                 .action_queue_size
                 .set(self.0.max_capacity() - self.0.capacity());
         }
+        Ok(())
     }
 
     /// Checks whether the action sequence is valid.
     /// Returned error is meant to be used as a panic message, since an invalid sequence represents an unrecoverable
     /// error. This function itself does not panic for the ease of testing.
-    fn check_action_sequence(actions: &[SyncAction]) -> Result<(), String> {
+    fn check_action_sequence(actions: &[SyncAction]) -> anyhow::Result<()> {
         // Rules for the sequence:
         // 1. Must start with either `OpenBatch` or `L2Block`, both of which may be met only once.
         // 2. Followed by a sequence of `Tx` actions which consists of 0 or more elements.
@@ -38,27 +48,22 @@ impl ActionQueueSender {
         for action in actions {
             match action {
                 SyncAction::OpenBatch { .. } | SyncAction::L2Block { .. } => {
-                    if opened {
-                        return Err(format!("Unexpected OpenBatch / L2Block: {actions:?}"));
-                    }
+                    anyhow::ensure!(!opened, "Unexpected OpenBatch / L2Block: {actions:?}");
                     opened = true;
                 }
                 SyncAction::Tx(_) => {
-                    if !opened || l2_block_sealed {
-                        return Err(format!("Unexpected Tx: {actions:?}"));
-                    }
+                    anyhow::ensure!(opened && !l2_block_sealed, "Unexpected Tx: {actions:?}");
                 }
                 SyncAction::SealL2Block | SyncAction::SealBatch => {
-                    if !opened || l2_block_sealed {
-                        return Err(format!("Unexpected SealL2Block / SealBatch: {actions:?}"));
-                    }
+                    anyhow::ensure!(
+                        opened && !l2_block_sealed,
+                        "Unexpected SealL2Block / SealBatch: {actions:?}"
+                    );
                     l2_block_sealed = true;
                 }
             }
         }
-        if !l2_block_sealed {
-            return Err(format!("Incomplete sequence: {actions:?}"));
-        }
+        anyhow::ensure!(l2_block_sealed, "Incomplete sequence: {actions:?}");
         Ok(())
     }
 }
@@ -136,7 +141,7 @@ impl ActionQueue {
 
 /// An instruction for the ExternalIO to request a certain action from the state keeper.
 #[derive(Debug, Clone)]
-pub(crate) enum SyncAction {
+pub enum SyncAction {
     OpenBatch {
         params: L1BatchParams,
         // Additional parameters used only for sanity checks
@@ -287,7 +292,7 @@ mod tests {
                 panic!("Invalid sequence passed the test. Sequence #{idx}, expected error: {expected_err}");
             };
             assert!(
-                err.starts_with(expected_err),
+                err.to_string().contains(expected_err),
                 "Sequence #{idx} failed. Expected error: {expected_err}, got: {err}"
             );
         }
diff --git a/core/lib/zksync_core/src/sync_layer/sync_state.rs b/core/node/node_sync/src/sync_state.rs
similarity index 93%
rename from core/lib/zksync_core/src/sync_layer/sync_state.rs
rename to core/node/node_sync/src/sync_state.rs
index 68d5e4be51cd..e061ff7da012 100644
--- a/core/lib/zksync_core/src/sync_layer/sync_state.rs
+++ b/core/node/node_sync/src/sync_state.rs
@@ -7,10 +7,12 @@ use zksync_concurrency::{ctx, sync};
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_health_check::{CheckHealth, Health, HealthStatus};
 use zksync_shared_metrics::EN_METRICS;
+use zksync_state_keeper::{io::IoCursor, updates::UpdatesManager, StateKeeperOutputHandler};
 use zksync_types::L2BlockNumber;
-use zksync_web3_decl::{client::BoxedL2Client, namespaces::EthNamespaceClient};
-
-use crate::state_keeper::{io::IoCursor, updates::UpdatesManager, StateKeeperOutputHandler};
+use zksync_web3_decl::{
+    client::{DynClient, L2},
+    namespaces::EthNamespaceClient,
+};
 
 /// `SyncState` is a structure that holds the state of the syncing process.
 /// The intended use case is to signalize to Web3 API whether the node is fully synced.
@@ -32,16 +34,15 @@ impl Default for SyncState {
 const SYNC_L2_BLOCK_DELTA: u32 = 10;
 
 impl SyncState {
-    pub(crate) fn get_main_node_block(&self) -> L2BlockNumber {
+    pub fn get_main_node_block(&self) -> L2BlockNumber {
         self.0.borrow().main_node_block.unwrap_or_default()
     }
 
-    pub(crate) fn get_local_block(&self) -> L2BlockNumber {
+    pub fn get_local_block(&self) -> L2BlockNumber {
         self.0.borrow().local_block.unwrap_or_default()
     }
 
-    #[cfg(test)]
-    pub(crate) async fn wait_for_local_block(&self, want: L2BlockNumber) {
+    pub async fn wait_for_local_block(&self, want: L2BlockNumber) {
         self.0
             .subscribe()
             .wait_for(|inner| matches!(inner.local_block, Some(got) if got >= want))
@@ -49,7 +50,7 @@ impl SyncState {
             .unwrap();
     }
 
-    pub(crate) async fn wait_for_main_node_block(
+    pub async fn wait_for_main_node_block(
         &self,
         ctx: &ctx::Ctx,
         want: L2BlockNumber,
@@ -63,7 +64,7 @@ impl SyncState {
         Ok(())
     }
 
-    pub(crate) fn set_main_node_block(&self, block: L2BlockNumber) {
+    pub fn set_main_node_block(&self, block: L2BlockNumber) {
         self.0.send_modify(|inner| inner.set_main_node_block(block));
     }
 
@@ -71,14 +72,14 @@ impl SyncState {
         self.0.send_modify(|inner| inner.set_local_block(block));
     }
 
-    pub(crate) fn is_synced(&self) -> bool {
+    pub fn is_synced(&self) -> bool {
         self.0.borrow().is_synced().0
     }
 
     pub async fn run_updater(
         self,
         connection_pool: ConnectionPool<Core>,
-        main_node_client: BoxedL2Client,
+        main_node_client: Box<DynClient<L2>>,
         mut stop_receiver: watch::Receiver<bool>,
     ) -> anyhow::Result<()> {
         const UPDATE_INTERVAL: Duration = Duration::from_secs(10);
@@ -120,7 +121,10 @@ impl StateKeeperOutputHandler for SyncState {
         Ok(())
     }
 
-    async fn handle_l1_batch(&mut self, updates_manager: &UpdatesManager) -> anyhow::Result<()> {
+    async fn handle_l1_batch(
+        &mut self,
+        updates_manager: Arc<UpdatesManager>,
+    ) -> anyhow::Result<()> {
         let sealed_block_number = updates_manager.l2_block.number;
         self.set_local_block(sealed_block_number);
         Ok(())
diff --git a/core/node/node_sync/src/testonly.rs b/core/node/node_sync/src/testonly.rs
new file mode 100644
index 000000000000..502da17ffd98
--- /dev/null
+++ b/core/node/node_sync/src/testonly.rs
@@ -0,0 +1,83 @@
+use std::collections::HashMap;
+
+use zksync_config::GenesisConfig;
+use zksync_eth_client::EnrichedClientError;
+use zksync_node_genesis::mock_genesis_config;
+use zksync_types::{api, Address, L2BlockNumber, ProtocolVersionId, H256};
+use zksync_web3_decl::error::EnrichedClientResult;
+
+use super::MainNodeClient;
+
+#[derive(Debug, Default)]
+pub struct MockMainNodeClient {
+    pub l2_blocks: Vec<api::en::SyncBlock>,
+    pub block_number_offset: u32,
+    pub protocol_versions: HashMap<u16, api::ProtocolVersion>,
+    pub system_contracts: HashMap<H256, Vec<u8>>,
+}
+
+#[async_trait::async_trait]
+impl MainNodeClient for MockMainNodeClient {
+    async fn fetch_system_contract_by_hash(
+        &self,
+        hash: H256,
+    ) -> EnrichedClientResult<Option<Vec<u8>>> {
+        Ok(self.system_contracts.get(&hash).cloned())
+    }
+
+    async fn fetch_genesis_contract_bytecode(
+        &self,
+        _address: Address,
+    ) -> EnrichedClientResult<Option<Vec<u8>>> {
+        Err(EnrichedClientError::custom(
+            "not implemented",
+            "fetch_genesis_contract_bytecode",
+        ))
+    }
+
+    async fn fetch_protocol_version(
+        &self,
+        protocol_version: ProtocolVersionId,
+    ) -> EnrichedClientResult<Option<api::ProtocolVersion>> {
+        let protocol_version = protocol_version as u16;
+        Ok(self.protocol_versions.get(&protocol_version).cloned())
+    }
+
+    async fn fetch_l2_block_number(&self) -> EnrichedClientResult<L2BlockNumber> {
+        if let Some(number) = self.l2_blocks.len().checked_sub(1) {
+            Ok(L2BlockNumber(number as u32))
+        } else {
+            Err(EnrichedClientError::custom(
+                "not implemented",
+                "fetch_l2_block_number",
+            ))
+        }
+    }
+
+    async fn fetch_l2_block(
+        &self,
+        number: L2BlockNumber,
+        with_transactions: bool,
+    ) -> EnrichedClientResult<Option<api::en::SyncBlock>> {
+        let Some(block_index) = number.0.checked_sub(self.block_number_offset) else {
+            return Ok(None);
+        };
+        let Some(mut block) = self.l2_blocks.get(block_index as usize).cloned() else {
+            return Ok(None);
+        };
+        if !with_transactions {
+            block.transactions = None;
+        }
+        Ok(Some(block))
+    }
+
+    async fn fetch_consensus_genesis(
+        &self,
+    ) -> EnrichedClientResult<Option<api::en::ConsensusGenesis>> {
+        unimplemented!()
+    }
+
+    async fn fetch_genesis_config(&self) -> EnrichedClientResult<GenesisConfig> {
+        Ok(mock_genesis_config())
+    }
+}
diff --git a/core/lib/zksync_core/src/sync_layer/tests.rs b/core/node/node_sync/src/tests.rs
similarity index 85%
rename from core/lib/zksync_core/src/sync_layer/tests.rs
rename to core/node/node_sync/src/tests.rs
index c52ef05a02e6..7c57e04a3404 100644
--- a/core/lib/zksync_core/src/sync_layer/tests.rs
+++ b/core/node/node_sync/src/tests.rs
@@ -10,6 +10,12 @@ use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
 use zksync_node_test_utils::{
     create_l1_batch_metadata, create_l2_transaction, prepare_recovery_snapshot,
 };
+use zksync_state_keeper::{
+    io::{L1BatchParams, L2BlockParams},
+    seal_criteria::NoopSealer,
+    testonly::test_batch_executor::{MockReadStorageFactory, TestBatchExecutorBuilder},
+    OutputHandler, StateKeeperPersistence, TreeWritesPersistence, ZkSyncStateKeeper,
+};
 use zksync_types::{
     api,
     block::L2BlockHasher,
@@ -18,15 +24,8 @@ use zksync_types::{
     Address, L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersionId, Transaction, H256,
 };
 
-use super::{fetcher::FetchedTransaction, sync_action::SyncAction, *};
-use crate::{
-    consensus::testonly::MockMainNodeClient,
-    state_keeper::{
-        io::{L1BatchParams, L2BlockParams},
-        seal_criteria::NoopSealer,
-        tests::TestBatchExecutorBuilder,
-        OutputHandler, StateKeeperPersistence, ZkSyncStateKeeper,
-    },
+use super::{
+    fetcher::FetchedTransaction, sync_action::SyncAction, testonly::MockMainNodeClient, *,
 };
 
 const TEST_TIMEOUT: Duration = Duration::from_secs(10);
@@ -50,6 +49,42 @@ fn open_l1_batch(number: u32, timestamp: u64, first_l2_block_number: u32) -> Syn
     }
 }
 
+impl MockMainNodeClient {
+    pub(crate) fn for_snapshot_recovery(snapshot: &SnapshotRecoveryStatus) -> Self {
+        // This block may be requested during node initialization
+        let last_l2_block_in_snapshot_batch = api::en::SyncBlock {
+            number: snapshot.l2_block_number,
+            l1_batch_number: snapshot.l1_batch_number,
+            last_in_batch: true,
+            timestamp: snapshot.l2_block_timestamp,
+            l1_gas_price: 2,
+            l2_fair_gas_price: 3,
+            fair_pubdata_price: Some(24),
+            base_system_contracts_hashes: BaseSystemContractsHashes::default(),
+            operator_address: Address::repeat_byte(2),
+            transactions: Some(vec![]),
+            virtual_blocks: Some(0),
+            hash: Some(snapshot.l2_block_hash),
+            protocol_version: ProtocolVersionId::latest(),
+        };
+
+        Self {
+            l2_blocks: vec![last_l2_block_in_snapshot_batch],
+            block_number_offset: snapshot.l2_block_number.0,
+            ..Self::default()
+        }
+    }
+
+    pub fn insert_protocol_version(&mut self, version: api::ProtocolVersion) {
+        self.system_contracts
+            .insert(version.bootloader_code_hash.unwrap(), vec![]);
+        self.system_contracts
+            .insert(version.default_account_code_hash.unwrap(), vec![]);
+        self.protocol_versions
+            .insert(version.minor_version.unwrap(), version);
+    }
+}
+
 #[derive(Debug)]
 pub(super) struct StateKeeperHandles {
     pub stop_sender: watch::Sender<bool>,
@@ -71,7 +106,9 @@ impl StateKeeperHandles {
         let sync_state = SyncState::default();
         let (persistence, l2_block_sealer) =
             StateKeeperPersistence::new(pool.clone(), Address::repeat_byte(1), 5);
+        let tree_writes_persistence = TreeWritesPersistence::new(pool.clone());
         let output_handler = OutputHandler::new(Box::new(persistence.with_tx_insertion()))
+            .with_handler(Box::new(tree_writes_persistence))
             .with_handler(Box::new(sync_state.clone()));
 
         tokio::spawn(l2_block_sealer.run());
@@ -96,6 +133,7 @@ impl StateKeeperHandles {
             Box::new(batch_executor_base),
             output_handler,
             Arc::new(NoopSealer),
+            Arc::new(MockReadStorageFactory),
         );
 
         Self {
@@ -192,7 +230,7 @@ async fn external_io_basics(snapshot_recovery: bool) {
         &[&extract_tx_hashes(&actions)],
     )
     .await;
-    actions_sender.push_actions(actions).await;
+    actions_sender.push_actions(actions).await.unwrap();
     // Wait until the L2 block is sealed.
     state_keeper
         .wait_for_local_block(snapshot.l2_block_number + 1)
@@ -223,7 +261,7 @@ async fn external_io_basics(snapshot_recovery: bool) {
         .get_transaction_receipts(&[tx_hash])
         .await
         .unwrap()
-        .get(0)
+        .first()
         .cloned()
         .expect("Transaction not persisted");
     assert_eq!(
@@ -263,12 +301,10 @@ async fn external_io_works_without_local_protocol_version(snapshot_recovery: boo
     let (actions_sender, action_queue) = ActionQueue::new();
     let mut client = MockMainNodeClient::default();
     let next_protocol_version = api::ProtocolVersion {
-        version_id: ProtocolVersionId::next() as u16,
+        minor_version: Some(ProtocolVersionId::next() as u16),
         timestamp: snapshot.l2_block_timestamp + 1,
-        base_system_contracts: BaseSystemContractsHashes {
-            bootloader: H256::repeat_byte(1),
-            default_aa: H256::repeat_byte(2),
-        },
+        bootloader_code_hash: Some(H256::repeat_byte(1)),
+        default_account_code_hash: Some(H256::repeat_byte(1)),
         ..api::ProtocolVersion::default()
     };
     client.insert_protocol_version(next_protocol_version.clone());
@@ -280,7 +316,7 @@ async fn external_io_works_without_local_protocol_version(snapshot_recovery: boo
         &[&extract_tx_hashes(&actions)],
     )
     .await;
-    actions_sender.push_actions(actions).await;
+    actions_sender.push_actions(actions).await.unwrap();
     // Wait until the L2 block is sealed.
     state_keeper
         .wait_for_local_block(snapshot.l2_block_number + 1)
@@ -289,7 +325,7 @@ async fn external_io_works_without_local_protocol_version(snapshot_recovery: boo
     // Check that the L2 block and the protocol version for it are persisted.
     let persisted_protocol_version = storage
         .protocol_versions_dal()
-        .get_protocol_version(ProtocolVersionId::next())
+        .get_protocol_version_with_latest_patch(ProtocolVersionId::next())
         .await
         .unwrap()
         .expect("next protocol version not persisted");
@@ -298,8 +334,16 @@ async fn external_io_works_without_local_protocol_version(snapshot_recovery: boo
         next_protocol_version.timestamp
     );
     assert_eq!(
-        persisted_protocol_version.base_system_contracts_hashes,
-        next_protocol_version.base_system_contracts
+        persisted_protocol_version
+            .base_system_contracts_hashes
+            .bootloader,
+        next_protocol_version.bootloader_code_hash.unwrap()
+    );
+    assert_eq!(
+        persisted_protocol_version
+            .base_system_contracts_hashes
+            .default_aa,
+        next_protocol_version.default_account_code_hash.unwrap()
     );
 
     let l2_block = storage
@@ -363,8 +407,14 @@ pub(super) async fn run_state_keeper_with_multiple_l2_blocks(
     let (actions_sender, action_queue) = ActionQueue::new();
     let client = MockMainNodeClient::default();
     let state_keeper = StateKeeperHandles::new(pool, client, action_queue, &[&tx_hashes]).await;
-    actions_sender.push_actions(first_l2_block_actions).await;
-    actions_sender.push_actions(second_l2_block_actions).await;
+    actions_sender
+        .push_actions(first_l2_block_actions)
+        .await
+        .unwrap();
+    actions_sender
+        .push_actions(second_l2_block_actions)
+        .await
+        .unwrap();
     // Wait until both L2 blocks are sealed.
     state_keeper
         .wait_for_local_block(snapshot.l2_block_number + 2)
@@ -446,7 +496,7 @@ async fn test_external_io_recovery(
         number: snapshot.l2_block_number + 3,
     };
     let actions = vec![open_l2_block, new_tx.into(), SyncAction::SealL2Block];
-    actions_sender.push_actions(actions).await;
+    actions_sender.push_actions(actions).await.unwrap();
     state_keeper
         .wait_for_local_block(snapshot.l2_block_number + 3)
         .await;
@@ -536,9 +586,18 @@ pub(super) async fn run_state_keeper_with_multiple_l1_batches(
         &[&[first_tx_hash], &[second_tx_hash]],
     )
     .await;
-    actions_sender.push_actions(first_l1_batch_actions).await;
-    actions_sender.push_actions(fictive_l2_block_actions).await;
-    actions_sender.push_actions(second_l1_batch_actions).await;
+    actions_sender
+        .push_actions(first_l1_batch_actions)
+        .await
+        .unwrap();
+    actions_sender
+        .push_actions(fictive_l2_block_actions)
+        .await
+        .unwrap();
+    actions_sender
+        .push_actions(second_l1_batch_actions)
+        .await
+        .unwrap();
 
     let hash_task = tokio::spawn(mock_l1_batch_hash_computation(
         pool.clone(),
diff --git a/core/node/node_sync/src/tree_data_fetcher/metrics.rs b/core/node/node_sync/src/tree_data_fetcher/metrics.rs
new file mode 100644
index 000000000000..aad5f090e1fc
--- /dev/null
+++ b/core/node/node_sync/src/tree_data_fetcher/metrics.rs
@@ -0,0 +1,114 @@
+//! Metrics for Tree data fetcher.
+
+use std::time::Duration;
+
+use vise::{
+    Buckets, Counter, DurationAsSecs, EncodeLabelSet, EncodeLabelValue, Family, Gauge, Histogram,
+    Info, Metrics, Unit,
+};
+
+use super::{StepOutcome, TreeDataFetcher, TreeDataFetcherError};
+
+#[derive(Debug, EncodeLabelSet)]
+struct TreeDataFetcherInfo {
+    #[metrics(unit = Unit::Seconds)]
+    poll_interval: DurationAsSecs,
+    diamond_proxy_address: Option<String>,
+}
+
+impl From<&TreeDataFetcher> for TreeDataFetcherInfo {
+    fn from(fetcher: &TreeDataFetcher) -> Self {
+        Self {
+            poll_interval: fetcher.poll_interval.into(),
+            diamond_proxy_address: fetcher
+                .diamond_proxy_address
+                .map(|addr| format!("{addr:?}")),
+        }
+    }
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
+#[metrics(label = "stage", rename_all = "snake_case")]
+pub(super) enum ProcessingStage {
+    FetchL1CommitEvent,
+    FetchBatchDetailsRpc,
+    /// Total latency for all clients.
+    Fetch,
+    Persistence,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
+#[metrics(label = "kind", rename_all = "snake_case")]
+pub(super) enum StepOutcomeLabel {
+    UpdatedBatch,
+    NoProgress,
+    RemoteHashMissing,
+    PossibleReorg,
+    TransientError,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
+#[metrics(label = "source", rename_all = "snake_case")]
+pub(super) enum TreeDataProviderSource {
+    L1CommitEvent,
+    BatchDetailsRpc,
+}
+
+const BLOCK_DIFF_BUCKETS: Buckets = Buckets::values(&[
+    10.0, 20.0, 50.0, 100.0, 200.0, 500.0, 1_000.0, 2_000.0, 5_000.0, 10_000.0, 20_000.0, 50_000.0,
+]);
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "external_node_tree_data_fetcher")]
+pub(super) struct TreeDataFetcherMetrics {
+    /// Immutable information about the fetcher.
+    info: Info<TreeDataFetcherInfo>,
+    /// Number of times a fetcher step resulted in a certain outcome.
+    pub step_outcomes: Family<StepOutcomeLabel, Counter>,
+    /// Last L1 batch with tree data updated by the fetcher.
+    pub last_updated_batch_number: Gauge<u64>,
+    /// Latency of a particular stage of processing a single L1 batch.
+    #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
+    pub stage_latency: Family<ProcessingStage, Histogram<Duration>>,
+    /// Number of steps during binary search of the L1 commit block number.
+    #[metrics(buckets = Buckets::linear(0.0..=32.0, 2.0))]
+    pub l1_commit_block_number_binary_search_steps: Histogram<usize>,
+    /// Difference between the "from" block specified in the event filter and the L1 block number of the fetched event.
+    /// Large values here can signal that fetching data from L1 can break because the filter won't get necessary events.
+    #[metrics(buckets = BLOCK_DIFF_BUCKETS)]
+    pub l1_commit_block_number_from_diff: Histogram<u64>,
+    /// Number of root hashes fetched from a particular source.
+    pub root_hash_sources: Family<TreeDataProviderSource, Counter>,
+}
+
+impl TreeDataFetcherMetrics {
+    pub fn observe_info(&self, fetcher: &TreeDataFetcher) {
+        let info = TreeDataFetcherInfo::from(fetcher);
+        tracing::info!("Starting tree data fetcher with {info:?}");
+        if let Err(err) = self.info.set(info) {
+            tracing::warn!(
+                "Error setting configuration info {:?} for tree data fetcher; already set to {:?}",
+                err.into_inner(),
+                self.info.get()
+            );
+        }
+    }
+
+    pub fn observe_step_outcome(&self, outcome: Result<&StepOutcome, &TreeDataFetcherError>) {
+        let label = match outcome {
+            Ok(StepOutcome::UpdatedBatch(number)) => {
+                self.last_updated_batch_number.set(number.0.into());
+                StepOutcomeLabel::UpdatedBatch
+            }
+            Ok(StepOutcome::NoProgress) => StepOutcomeLabel::NoProgress,
+            Ok(StepOutcome::RemoteHashMissing) => StepOutcomeLabel::RemoteHashMissing,
+            Ok(StepOutcome::PossibleReorg) => StepOutcomeLabel::PossibleReorg,
+            Err(err) if err.is_transient() => StepOutcomeLabel::TransientError,
+            Err(_) => return, // fatal error; the node will exit soon anyway
+        };
+        self.step_outcomes[&label].inc();
+    }
+}
+
+#[vise::register]
+pub(super) static METRICS: vise::Global<TreeDataFetcherMetrics> = vise::Global::new();
diff --git a/core/node/node_sync/src/tree_data_fetcher/mod.rs b/core/node/node_sync/src/tree_data_fetcher/mod.rs
new file mode 100644
index 000000000000..c871ec16b9de
--- /dev/null
+++ b/core/node/node_sync/src/tree_data_fetcher/mod.rs
@@ -0,0 +1,334 @@
+//! Fetcher responsible for getting Merkle tree outputs from the main node.
+
+use std::time::Duration;
+
+use anyhow::Context as _;
+use serde::Serialize;
+#[cfg(test)]
+use tokio::sync::mpsc;
+use tokio::sync::watch;
+use zksync_dal::{Connection, ConnectionPool, Core, CoreDal, DalError};
+use zksync_health_check::{Health, HealthStatus, HealthUpdater, ReactiveHealthCheck};
+use zksync_types::{
+    block::{L1BatchTreeData, L2BlockHeader},
+    Address, L1BatchNumber,
+};
+use zksync_web3_decl::{
+    client::{DynClient, L1, L2},
+    error::EnrichedClientError,
+};
+
+use self::{
+    metrics::{ProcessingStage, TreeDataFetcherMetrics, METRICS},
+    provider::{L1DataProvider, MissingData, TreeDataProvider},
+};
+use crate::tree_data_fetcher::provider::CombinedDataProvider;
+
+mod metrics;
+mod provider;
+#[cfg(test)]
+mod tests;
+
+#[derive(Debug, thiserror::Error)]
+pub(crate) enum TreeDataFetcherError {
+    #[error("error fetching data")]
+    Rpc(#[from] EnrichedClientError),
+    #[error("internal error")]
+    Internal(#[from] anyhow::Error),
+}
+
+impl From<DalError> for TreeDataFetcherError {
+    fn from(err: DalError) -> Self {
+        Self::Internal(err.generalize())
+    }
+}
+
+impl TreeDataFetcherError {
+    fn is_transient(&self) -> bool {
+        match self {
+            Self::Rpc(err) => err.is_transient(),
+            Self::Internal(_) => false,
+        }
+    }
+}
+
+type TreeDataFetcherResult<T> = Result<T, TreeDataFetcherError>;
+
+#[derive(Debug, Serialize)]
+#[serde(untagged)]
+enum TreeDataFetcherHealth {
+    Ready {
+        #[serde(skip_serializing_if = "Option::is_none")]
+        last_updated_l1_batch: Option<L1BatchNumber>,
+    },
+    Affected {
+        error: String,
+    },
+}
+
+impl From<TreeDataFetcherHealth> for Health {
+    fn from(health: TreeDataFetcherHealth) -> Self {
+        let status = match health {
+            TreeDataFetcherHealth::Ready { .. } => HealthStatus::Ready,
+            TreeDataFetcherHealth::Affected { .. } => HealthStatus::Affected,
+        };
+        Self::from(status).with_details(health)
+    }
+}
+
+#[derive(Debug)]
+enum StepOutcome {
+    UpdatedBatch(L1BatchNumber),
+    NoProgress,
+    RemoteHashMissing,
+    PossibleReorg,
+}
+
+/// Component fetching tree data (i.e., state root hashes for L1 batches) from external sources, such as
+/// the main node, and persisting this data to Postgres.
+///
+/// # Overview
+///
+/// This component allows a node to operate w/o a Merkle tree or w/o waiting the tree to catch up.
+/// It can be operated together with Metadata calculator or instead of it. In the first case, Metadata calculator
+/// (which is generally expected to be slower) will check that data returned by the main node is correct
+/// (i.e., "trust but verify" trust model). Additionally, the persisted data will be checked against L1 commitment transactions
+/// by Consistency checker.
+#[derive(Debug)]
+pub struct TreeDataFetcher {
+    data_provider: CombinedDataProvider,
+    // Used in the Info metric
+    diamond_proxy_address: Option<Address>,
+    pool: ConnectionPool<Core>,
+    metrics: &'static TreeDataFetcherMetrics,
+    health_updater: HealthUpdater,
+    poll_interval: Duration,
+    #[cfg(test)]
+    updates_sender: mpsc::UnboundedSender<L1BatchNumber>,
+}
+
+impl TreeDataFetcher {
+    const DEFAULT_POLL_INTERVAL: Duration = Duration::from_millis(100);
+
+    /// Creates a new fetcher connected to the main node.
+    pub fn new(client: Box<DynClient<L2>>, pool: ConnectionPool<Core>) -> Self {
+        Self {
+            data_provider: CombinedDataProvider::new(client.for_component("tree_data_fetcher")),
+            diamond_proxy_address: None,
+            pool,
+            metrics: &METRICS,
+            health_updater: ReactiveHealthCheck::new("tree_data_fetcher").1,
+            poll_interval: Self::DEFAULT_POLL_INTERVAL,
+            #[cfg(test)]
+            updates_sender: mpsc::unbounded_channel().0,
+        }
+    }
+
+    /// Attempts to fetch root hashes from L1 (namely, `BlockCommit` events emitted by the diamond proxy) if possible.
+    /// The main node will still be used as a fallback in case communicating with L1 fails, or for newer batches,
+    /// which may not be committed on L1.
+    pub fn with_l1_data(
+        mut self,
+        eth_client: Box<DynClient<L1>>,
+        diamond_proxy_address: Address,
+    ) -> anyhow::Result<Self> {
+        anyhow::ensure!(
+            self.diamond_proxy_address.is_none(),
+            "L1 tree data provider is already set up"
+        );
+
+        let l1_provider = L1DataProvider::new(
+            eth_client.for_component("tree_data_fetcher"),
+            diamond_proxy_address,
+        )?;
+        self.data_provider.set_l1(l1_provider);
+        self.diamond_proxy_address = Some(diamond_proxy_address);
+        Ok(self)
+    }
+
+    /// Returns a health check for this fetcher.
+    pub fn health_check(&self) -> ReactiveHealthCheck {
+        self.health_updater.subscribe()
+    }
+
+    async fn get_batch_to_fetch(&self) -> anyhow::Result<Option<(L1BatchNumber, L2BlockHeader)>> {
+        let mut storage = self.pool.connection_tagged("tree_data_fetcher").await?;
+        // Fetch data in a readonly transaction to have a consistent view of the storage
+        let mut storage = storage.start_transaction().await?;
+
+        let last_l1_batch = storage.blocks_dal().get_sealed_l1_batch_number().await?;
+        let Some(last_l1_batch) = last_l1_batch else {
+            tracing::debug!("No L1 batches in the database yet; cannot progress");
+            return Ok(None);
+        };
+
+        let last_l1_batch_with_tree_data = storage
+            .blocks_dal()
+            .get_last_l1_batch_number_with_tree_data()
+            .await?;
+        let l1_batch_to_fetch = if let Some(batch) = last_l1_batch_with_tree_data {
+            batch + 1
+        } else {
+            let earliest_l1_batch = storage.blocks_dal().get_earliest_l1_batch_number().await?;
+            let earliest_l1_batch =
+                earliest_l1_batch.context("all L1 batches disappeared from Postgres")?;
+            tracing::debug!("No L1 batches with metadata present in the storage; will fetch the earliest batch #{earliest_l1_batch}");
+            earliest_l1_batch
+        };
+        Ok(if l1_batch_to_fetch <= last_l1_batch {
+            let last_l2_block = Self::get_last_l2_block(&mut storage, l1_batch_to_fetch).await?;
+            Some((l1_batch_to_fetch, last_l2_block))
+        } else {
+            None
+        })
+    }
+
+    async fn get_last_l2_block(
+        storage: &mut Connection<'_, Core>,
+        number: L1BatchNumber,
+    ) -> anyhow::Result<L2BlockHeader> {
+        let (_, last_l2_block_number) = storage
+            .blocks_dal()
+            .get_l2_block_range_of_l1_batch(number)
+            .await?
+            .with_context(|| format!("L1 batch #{number} disappeared from Postgres"))?;
+        storage
+            .blocks_dal()
+            .get_l2_block_header(last_l2_block_number)
+            .await?
+            .with_context(|| format!("L2 block #{last_l2_block_number} (last for L1 batch #{number}) disappeared from Postgres"))
+    }
+
+    async fn step(&mut self) -> Result<StepOutcome, TreeDataFetcherError> {
+        let Some((l1_batch_to_fetch, last_l2_block_header)) = self.get_batch_to_fetch().await?
+        else {
+            return Ok(StepOutcome::NoProgress);
+        };
+
+        tracing::debug!("Fetching tree data for L1 batch #{l1_batch_to_fetch}");
+        let stage_latency = self.metrics.stage_latency[&ProcessingStage::Fetch].start();
+        let root_hash_result = self
+            .data_provider
+            .batch_details(l1_batch_to_fetch, &last_l2_block_header)
+            .await?;
+        stage_latency.observe();
+        let root_hash = match root_hash_result {
+            Ok(root_hash) => {
+                tracing::debug!(
+                    "Received root hash for L1 batch #{l1_batch_to_fetch}: {root_hash:?}"
+                );
+                root_hash
+            }
+            Err(MissingData::Batch) => {
+                let err = anyhow::anyhow!(
+                    "L1 batch #{l1_batch_to_fetch} is sealed locally, but is not present externally, \
+                     which is assumed to store batch info indefinitely"
+                );
+                return Err(err.into());
+            }
+            Err(MissingData::RootHash) => {
+                tracing::debug!(
+                    "L1 batch #{l1_batch_to_fetch} does not have root hash computed externally"
+                );
+                return Ok(StepOutcome::RemoteHashMissing);
+            }
+            Err(MissingData::PossibleReorg) => {
+                tracing::debug!(
+                    "L1 batch #{l1_batch_to_fetch} potentially diverges from the external source"
+                );
+                return Ok(StepOutcome::PossibleReorg);
+            }
+        };
+
+        let stage_latency = self.metrics.stage_latency[&ProcessingStage::Persistence].start();
+        let mut storage = self.pool.connection_tagged("tree_data_fetcher").await?;
+        let rollup_last_leaf_index = storage
+            .storage_logs_dedup_dal()
+            .max_enumeration_index_by_l1_batch(l1_batch_to_fetch)
+            .await?
+            .unwrap_or(0)
+            + 1;
+        let tree_data = L1BatchTreeData {
+            hash: root_hash,
+            rollup_last_leaf_index,
+        };
+        storage
+            .blocks_dal()
+            .save_l1_batch_tree_data(l1_batch_to_fetch, &tree_data)
+            .await?;
+        stage_latency.observe();
+        tracing::debug!("Updated L1 batch #{l1_batch_to_fetch} with tree data: {tree_data:?}");
+        Ok(StepOutcome::UpdatedBatch(l1_batch_to_fetch))
+    }
+
+    fn update_health(&self, last_updated_l1_batch: Option<L1BatchNumber>) {
+        let health = TreeDataFetcherHealth::Ready {
+            last_updated_l1_batch,
+        };
+        self.health_updater.update(health.into());
+    }
+
+    /// Runs this component until a fatal error occurs or a stop signal is received. Transient errors
+    /// (e.g., no network connection) are handled gracefully by retrying after a delay.
+    pub async fn run(mut self, mut stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        self.metrics.observe_info(&self);
+        self.health_updater
+            .update(Health::from(HealthStatus::Ready));
+        let mut last_updated_l1_batch = None;
+
+        while !*stop_receiver.borrow_and_update() {
+            let step_outcome = self.step().await;
+            self.metrics.observe_step_outcome(step_outcome.as_ref());
+            let need_to_sleep = match step_outcome {
+                Ok(StepOutcome::UpdatedBatch(batch_number)) => {
+                    #[cfg(test)]
+                    self.updates_sender.send(batch_number).ok();
+
+                    last_updated_l1_batch = Some(batch_number);
+                    self.update_health(last_updated_l1_batch);
+                    false
+                }
+                Ok(StepOutcome::NoProgress | StepOutcome::RemoteHashMissing) => {
+                    // Update health status even if no progress was made to timely clear a previously set
+                    // "affected" health.
+                    self.update_health(last_updated_l1_batch);
+                    true
+                }
+                Ok(StepOutcome::PossibleReorg) => {
+                    tracing::info!("Potential chain reorg detected by tree data fetcher; not updating tree data");
+                    // Since we don't trust the reorg logic in the tree data fetcher, we let it continue working
+                    // so that, if there's a false positive, the whole node doesn't crash (or is in a crash loop in the worst-case scenario).
+                    let health = TreeDataFetcherHealth::Affected {
+                        error: "Potential chain reorg".to_string(),
+                    };
+                    self.health_updater.update(health.into());
+                    true
+                }
+                Err(err) if err.is_transient() => {
+                    tracing::warn!(
+                        "Transient error in tree data fetcher, will retry after a delay: {err:?}"
+                    );
+                    let health = TreeDataFetcherHealth::Affected {
+                        error: err.to_string(),
+                    };
+                    self.health_updater.update(health.into());
+                    true
+                }
+                Err(err) => {
+                    tracing::error!("Fatal error in tree data fetcher: {err:?}");
+                    return Err(err.into());
+                }
+            };
+
+            if need_to_sleep
+                && tokio::time::timeout(self.poll_interval, stop_receiver.changed())
+                    .await
+                    .is_ok()
+            {
+                break;
+            }
+        }
+        tracing::info!("Stop signal received; tree data fetcher is shutting down");
+        Ok(())
+    }
+}
diff --git a/core/node/node_sync/src/tree_data_fetcher/provider/mod.rs b/core/node/node_sync/src/tree_data_fetcher/provider/mod.rs
new file mode 100644
index 000000000000..867ea2427541
--- /dev/null
+++ b/core/node/node_sync/src/tree_data_fetcher/provider/mod.rs
@@ -0,0 +1,364 @@
+use std::fmt;
+
+use anyhow::Context;
+use async_trait::async_trait;
+use zksync_eth_client::EthInterface;
+use zksync_types::{block::L2BlockHeader, web3, Address, L1BatchNumber, H256, U256, U64};
+use zksync_web3_decl::{
+    client::{DynClient, L1, L2},
+    error::{ClientRpcContext, EnrichedClientError, EnrichedClientResult},
+    jsonrpsee::core::ClientError,
+    namespaces::ZksNamespaceClient,
+};
+
+use super::{
+    metrics::{ProcessingStage, TreeDataProviderSource, METRICS},
+    TreeDataFetcherResult,
+};
+
+#[cfg(test)]
+mod tests;
+
+#[derive(Debug, thiserror::Error)]
+pub(super) enum MissingData {
+    /// The provider lacks a requested L1 batch.
+    #[error("no requested L1 batch")]
+    Batch,
+    /// The provider lacks a root hash for a requested L1 batch; the batch itself is present on the provider.
+    #[error("no root hash for L1 batch")]
+    RootHash,
+    #[error("possible chain reorg detected")]
+    PossibleReorg,
+}
+
+pub(super) type TreeDataProviderResult = TreeDataFetcherResult<Result<H256, MissingData>>;
+
+/// External provider of tree data, such as main node (via JSON-RPC).
+#[async_trait]
+pub(super) trait TreeDataProvider: fmt::Debug + Send + Sync + 'static {
+    /// Fetches a state root hash for the L1 batch with the specified number.
+    /// The method receives a header of the last L2 block in the batch, which can be used to check L1 batch consistency etc.
+    ///
+    /// It is guaranteed that this method will be called with monotonically increasing `number`s (although not necessarily sequential ones).
+    async fn batch_details(
+        &mut self,
+        number: L1BatchNumber,
+        last_l2_block: &L2BlockHeader,
+    ) -> TreeDataProviderResult;
+}
+
+#[async_trait]
+impl TreeDataProvider for Box<DynClient<L2>> {
+    async fn batch_details(
+        &mut self,
+        number: L1BatchNumber,
+        last_l2_block: &L2BlockHeader,
+    ) -> TreeDataProviderResult {
+        let Some(batch_details) = self
+            .get_l1_batch_details(number)
+            .rpc_context("get_l1_batch_details")
+            .with_arg("number", &number)
+            .await?
+        else {
+            return Ok(Err(MissingData::Batch));
+        };
+
+        // Check the local data correspondence.
+        let remote_l2_block_hash = self
+            .get_block_details(last_l2_block.number)
+            .rpc_context("get_block_details")
+            .with_arg("number", &last_l2_block.number)
+            .await?
+            .and_then(|block| block.base.root_hash);
+        if remote_l2_block_hash != Some(last_l2_block.hash) {
+            let last_l2_block_number = last_l2_block.number;
+            let last_l2_block_hash = last_l2_block.hash;
+            tracing::info!(
+                "Fetched hash of the last L2 block #{last_l2_block_number} in L1 batch #{number} ({remote_l2_block_hash:?}) \
+                 does not match the local one ({last_l2_block_hash:?}); this can be caused by a chain reorg"
+            );
+            return Ok(Err(MissingData::PossibleReorg));
+        }
+
+        Ok(batch_details.base.root_hash.ok_or(MissingData::RootHash))
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+struct PastL1BatchInfo {
+    number: L1BatchNumber,
+    l1_commit_block_number: U64,
+    l1_commit_block_timestamp: U256,
+}
+
+/// Provider of tree data loading it from L1 `BlockCommit` events emitted by the diamond proxy contract.
+/// Should be used together with an L2 provider because L1 data can be missing for latest batches,
+/// and the provider implementation uses assumptions that can break in some corner cases.
+///
+/// # Implementation details
+///
+/// To limit the range of L1 blocks for `eth_getLogs` calls, the provider assumes that an L1 block with a `BlockCommit` event
+/// for a certain L1 batch is relatively close to L1 batch sealing. Thus, the provider finds an approximate L1 block number
+/// for the event using binary search, or uses an L1 block number of the `BlockCommit` event for the previously queried L1 batch
+/// (provided it's not too far behind the seal timestamp of the batch).
+#[derive(Debug)]
+pub(super) struct L1DataProvider {
+    eth_client: Box<DynClient<L1>>,
+    diamond_proxy_address: Address,
+    block_commit_signature: H256,
+    past_l1_batch: Option<PastL1BatchInfo>,
+}
+
+impl L1DataProvider {
+    /// Accuracy when guessing L1 block number by L1 batch timestamp.
+    const L1_BLOCK_ACCURACY: U64 = U64([1_000]);
+    /// Range of L1 blocks queried via `eth_getLogs`. Should be at least several times greater than
+    /// `L1_BLOCK_ACCURACY`, but not large enough to trigger request limiting on the L1 RPC provider.
+    const L1_BLOCK_RANGE: U64 = U64([20_000]);
+
+    pub fn new(
+        eth_client: Box<DynClient<L1>>,
+        diamond_proxy_address: Address,
+    ) -> anyhow::Result<Self> {
+        let block_commit_signature = zksync_contracts::hyperchain_contract()
+            .event("BlockCommit")
+            .context("missing `BlockCommit` event")?
+            .signature();
+        Ok(Self {
+            eth_client,
+            diamond_proxy_address,
+            block_commit_signature,
+            past_l1_batch: None,
+        })
+    }
+
+    /// Guesses the number of an L1 block with a `BlockCommit` event for the specified L1 batch.
+    /// The guess is based on the L1 batch seal timestamp.
+    async fn guess_l1_commit_block_number(
+        eth_client: &DynClient<L1>,
+        l1_batch_seal_timestamp: u64,
+    ) -> EnrichedClientResult<(U64, usize)> {
+        let l1_batch_seal_timestamp = U256::from(l1_batch_seal_timestamp);
+        let (latest_number, latest_timestamp) =
+            Self::get_block(eth_client, web3::BlockNumber::Latest).await?;
+        if latest_timestamp < l1_batch_seal_timestamp {
+            return Ok((latest_number, 0)); // No better estimate at this point
+        }
+        let (earliest_number, earliest_timestamp) =
+            Self::get_block(eth_client, web3::BlockNumber::Earliest).await?;
+        if earliest_timestamp > l1_batch_seal_timestamp {
+            return Ok((earliest_number, 0)); // No better estimate at this point
+        }
+
+        // At this point, we have `earliest_timestamp <= l1_batch_seal_timestamp <= latest_timestamp`.
+        // Binary-search the range until we're sort of accurate.
+        let mut steps = 0;
+        let mut left = earliest_number;
+        let mut right = latest_number;
+        while left + Self::L1_BLOCK_ACCURACY < right {
+            let middle = (left + right) / 2;
+            let (_, middle_timestamp) =
+                Self::get_block(eth_client, web3::BlockNumber::Number(middle)).await?;
+            if middle_timestamp <= l1_batch_seal_timestamp {
+                left = middle;
+            } else {
+                right = middle;
+            }
+            steps += 1;
+        }
+        Ok((left, steps))
+    }
+
+    /// Gets a block that should be present on L1.
+    async fn get_block(
+        eth_client: &DynClient<L1>,
+        number: web3::BlockNumber,
+    ) -> EnrichedClientResult<(U64, U256)> {
+        let block = eth_client.block(number.into()).await?.ok_or_else(|| {
+            let err = "block is missing on L1 RPC provider";
+            EnrichedClientError::new(ClientError::Custom(err.into()), "get_block")
+                .with_arg("number", &number)
+        })?;
+        let number = block.number.ok_or_else(|| {
+            let err = "block is missing a number";
+            EnrichedClientError::new(ClientError::Custom(err.into()), "get_block")
+                .with_arg("number", &number)
+        })?;
+        Ok((number, block.timestamp))
+    }
+}
+
+#[async_trait]
+impl TreeDataProvider for L1DataProvider {
+    async fn batch_details(
+        &mut self,
+        number: L1BatchNumber,
+        last_l2_block: &L2BlockHeader,
+    ) -> TreeDataProviderResult {
+        let l1_batch_seal_timestamp = last_l2_block.timestamp;
+        let from_block = self.past_l1_batch.and_then(|info| {
+            assert!(
+                info.number < number,
+                "`batch_details()` must be called with monotonically increasing numbers"
+            );
+            let threshold_timestamp = info.l1_commit_block_timestamp + Self::L1_BLOCK_RANGE.as_u64() / 2;
+            if U256::from(l1_batch_seal_timestamp) > threshold_timestamp {
+                tracing::debug!(
+                    number = number.0,
+                    "L1 batch #{number} seal timestamp ({l1_batch_seal_timestamp}) is too far ahead \
+                     of the previous processed L1 batch ({info:?}); not using L1 batch info"
+                );
+                None
+            } else {
+                // This is an exact lower boundary: L1 batches are committed in order
+                Some(info.l1_commit_block_number)
+            }
+        });
+
+        let from_block = match from_block {
+            Some(number) => number,
+            None => {
+                let (approximate_block, steps) = Self::guess_l1_commit_block_number(
+                    self.eth_client.as_ref(),
+                    l1_batch_seal_timestamp,
+                )
+                .await?;
+                tracing::debug!(
+                    number = number.0,
+                    "Guessed L1 block number for L1 batch #{number} commit in {steps} binary search steps: {approximate_block}"
+                );
+                METRICS
+                    .l1_commit_block_number_binary_search_steps
+                    .observe(steps);
+                // Subtract to account for imprecise L1 and L2 timestamps etc.
+                approximate_block.saturating_sub(Self::L1_BLOCK_ACCURACY)
+            }
+        };
+
+        let number_topic = H256::from_low_u64_be(number.0.into());
+        let filter = web3::FilterBuilder::default()
+            .address(vec![self.diamond_proxy_address])
+            .from_block(web3::BlockNumber::Number(from_block))
+            .to_block(web3::BlockNumber::Number(from_block + Self::L1_BLOCK_RANGE))
+            .topics(
+                Some(vec![self.block_commit_signature]),
+                Some(vec![number_topic]),
+                None,
+                None,
+            )
+            .build();
+        let mut logs = self.eth_client.logs(&filter).await?;
+        logs.retain(|log| !log.is_removed() && log.block_number.is_some());
+
+        match logs.as_slice() {
+            [] => Ok(Err(MissingData::Batch)),
+            [log] => {
+                let root_hash = log.topics.get(2).copied().ok_or_else(|| {
+                    let err = "Bogus `BlockCommit` event, does not have the root hash topic";
+                    EnrichedClientError::new(ClientError::Custom(err.into()), "batch_details")
+                        .with_arg("filter", &filter)
+                        .with_arg("log", &log)
+                })?;
+                // `unwrap()` is safe due to the filtering above
+                let l1_commit_block_number = log.block_number.unwrap();
+                let diff = l1_commit_block_number.saturating_sub(from_block).as_u64();
+                METRICS.l1_commit_block_number_from_diff.observe(diff);
+                tracing::debug!(
+                    "`BlockCommit` event for L1 batch #{number} is at block #{l1_commit_block_number}, \
+                     {diff} block(s) after the `from` block from the filter"
+                );
+
+                let l1_commit_block = self.eth_client.block(l1_commit_block_number.into()).await?;
+                let l1_commit_block = l1_commit_block.ok_or_else(|| {
+                    let err = "Block disappeared from L1 RPC provider";
+                    EnrichedClientError::new(ClientError::Custom(err.into()), "batch_details")
+                        .with_arg("number", &l1_commit_block_number)
+                })?;
+                self.past_l1_batch = Some(PastL1BatchInfo {
+                    number,
+                    l1_commit_block_number,
+                    l1_commit_block_timestamp: l1_commit_block.timestamp,
+                });
+                Ok(Ok(root_hash))
+            }
+            _ => {
+                tracing::warn!(
+                    "Non-unique `BlockCommit` event for L1 batch #{number} queried using {filter:?}, potentially as a result \
+                     of a chain reorg: {logs:?}"
+                );
+                Ok(Err(MissingData::PossibleReorg))
+            }
+        }
+    }
+}
+
+/// Data provider combining [`L1DataProvider`] with a fallback provider.
+#[derive(Debug)]
+pub(super) struct CombinedDataProvider {
+    l1: Option<L1DataProvider>,
+    // Generic to allow for tests.
+    rpc: Box<dyn TreeDataProvider>,
+}
+
+impl CombinedDataProvider {
+    pub fn new(fallback: impl TreeDataProvider) -> Self {
+        Self {
+            l1: None,
+            rpc: Box::new(fallback),
+        }
+    }
+
+    pub fn set_l1(&mut self, l1: L1DataProvider) {
+        self.l1 = Some(l1);
+    }
+}
+
+#[async_trait]
+impl TreeDataProvider for CombinedDataProvider {
+    #[tracing::instrument(skip(self, last_l2_block))]
+    async fn batch_details(
+        &mut self,
+        number: L1BatchNumber,
+        last_l2_block: &L2BlockHeader,
+    ) -> TreeDataProviderResult {
+        if let Some(l1) = &mut self.l1 {
+            let stage_latency = METRICS.stage_latency[&ProcessingStage::FetchL1CommitEvent].start();
+            let l1_result = l1.batch_details(number, last_l2_block).await;
+            stage_latency.observe();
+
+            match l1_result {
+                Err(err) => {
+                    if err.is_transient() {
+                        tracing::info!(
+                            "Transient error calling L1 data provider: {:#}",
+                            anyhow::Error::from(err)
+                        );
+                    } else {
+                        tracing::warn!(
+                            "Fatal error calling L1 data provider: {:#}",
+                            anyhow::Error::from(err)
+                        );
+                        self.l1 = None;
+                    }
+                }
+                Ok(Ok(root_hash)) => {
+                    METRICS.root_hash_sources[&TreeDataProviderSource::L1CommitEvent].inc();
+                    return Ok(Ok(root_hash));
+                }
+                Ok(Err(missing_data)) => {
+                    tracing::info!("L1 data provider misses batch data: {missing_data}");
+                    // No sense of calling the L1 provider in the future; the L2 provider will very likely get information
+                    // about batches significantly faster.
+                    self.l1 = None;
+                }
+            }
+        }
+        let stage_latency = METRICS.stage_latency[&ProcessingStage::FetchBatchDetailsRpc].start();
+        let rpc_result = self.rpc.batch_details(number, last_l2_block).await;
+        stage_latency.observe();
+        if matches!(rpc_result, Ok(Ok(_))) {
+            METRICS.root_hash_sources[&TreeDataProviderSource::BatchDetailsRpc].inc();
+        }
+        rpc_result
+    }
+}
diff --git a/core/node/node_sync/src/tree_data_fetcher/provider/tests.rs b/core/node/node_sync/src/tree_data_fetcher/provider/tests.rs
new file mode 100644
index 000000000000..09fa16f16077
--- /dev/null
+++ b/core/node/node_sync/src/tree_data_fetcher/provider/tests.rs
@@ -0,0 +1,381 @@
+//! Tests for tree data providers.
+
+use assert_matches::assert_matches;
+use once_cell::sync::Lazy;
+use test_casing::test_casing;
+use zksync_dal::{ConnectionPool, Core};
+use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
+use zksync_node_test_utils::create_l2_block;
+use zksync_types::{api, L2BlockNumber, ProtocolVersionId};
+use zksync_web3_decl::client::MockClient;
+
+use super::*;
+use crate::tree_data_fetcher::tests::{
+    get_last_l2_block, seal_l1_batch_with_timestamp, MockMainNodeClient,
+};
+
+const DIAMOND_PROXY_ADDRESS: Address = Address::repeat_byte(0x22);
+
+static BLOCK_COMMIT_SIGNATURE: Lazy<H256> = Lazy::new(|| {
+    zksync_contracts::hyperchain_contract()
+        .event("BlockCommit")
+        .expect("missing `BlockCommit` event")
+        .signature()
+});
+
+fn mock_block_details_base(number: u32, hash: Option<H256>) -> api::BlockDetailsBase {
+    api::BlockDetailsBase {
+        timestamp: number.into(),
+        root_hash: hash,
+        // The fields below are not read.
+        l1_tx_count: 0,
+        l2_tx_count: 1,
+        status: api::BlockStatus::Sealed,
+        commit_tx_hash: None,
+        committed_at: None,
+        prove_tx_hash: None,
+        proven_at: None,
+        execute_tx_hash: None,
+        executed_at: None,
+        l1_gas_price: 10,
+        l2_fair_gas_price: 100,
+        fair_pubdata_price: None,
+        base_system_contracts_hashes: Default::default(),
+    }
+}
+
+#[derive(Debug)]
+struct L2Parameters {
+    l2_block_hashes: Vec<H256>,
+    l1_batch_root_hashes: Vec<H256>,
+}
+
+impl L2Parameters {
+    fn mock_client(self) -> MockClient<L2> {
+        let block_number = U64::from(self.l2_block_hashes.len());
+
+        MockClient::builder(L2::default())
+            .method("eth_blockNumber", move || Ok(block_number))
+            .method("zks_getL1BatchDetails", move |number: L1BatchNumber| {
+                let root_hash = self.l1_batch_root_hashes.get(number.0 as usize);
+                Ok(root_hash.map(|&hash| api::L1BatchDetails {
+                    number,
+                    base: mock_block_details_base(number.0, Some(hash)),
+                }))
+            })
+            .method("zks_getBlockDetails", move |number: L2BlockNumber| {
+                let hash = self.l2_block_hashes.get(number.0 as usize);
+                Ok(hash.map(|&hash| api::BlockDetails {
+                    number,
+                    l1_batch_number: L1BatchNumber(number.0),
+                    operator_address: Address::zero(),
+                    protocol_version: Some(ProtocolVersionId::latest()),
+                    base: mock_block_details_base(number.0, Some(hash)),
+                }))
+            })
+            .build()
+    }
+}
+
+#[tokio::test]
+async fn rpc_data_provider_basics() {
+    let last_l2_block = create_l2_block(1);
+    let l2_parameters = L2Parameters {
+        l2_block_hashes: vec![H256::zero(), last_l2_block.hash],
+        l1_batch_root_hashes: vec![H256::zero(), H256::from_low_u64_be(1)],
+    };
+    let mut client: Box<DynClient<L2>> = Box::new(l2_parameters.mock_client());
+
+    let root_hash = client
+        .batch_details(L1BatchNumber(1), &last_l2_block)
+        .await
+        .unwrap()
+        .expect("missing block");
+    assert_eq!(root_hash, H256::from_low_u64_be(1));
+
+    // Query a future L1 batch.
+    let output = client
+        .batch_details(L1BatchNumber(2), &create_l2_block(2))
+        .await
+        .unwrap();
+    assert_matches!(output, Err(MissingData::Batch));
+}
+
+#[tokio::test]
+async fn rpc_data_provider_with_block_hash_divergence() {
+    let last_l2_block = create_l2_block(1);
+    let l2_parameters = L2Parameters {
+        l2_block_hashes: vec![H256::zero(), H256::repeat_byte(1)], // Hash for block #1 differs from the local one
+        l1_batch_root_hashes: vec![H256::zero(), H256::from_low_u64_be(1)],
+    };
+    let mut client: Box<DynClient<L2>> = Box::new(l2_parameters.mock_client());
+
+    let output = client
+        .batch_details(L1BatchNumber(1), &last_l2_block)
+        .await
+        .unwrap();
+    assert_matches!(output, Err(MissingData::PossibleReorg));
+}
+
+struct EthereumParameters {
+    block_number: U64,
+    // L1 block numbers in which L1 batches are committed starting from L1 batch #1
+    l1_blocks_for_commits: Vec<U64>,
+}
+
+impl EthereumParameters {
+    fn new(block_number: u64) -> Self {
+        Self {
+            block_number: block_number.into(),
+            l1_blocks_for_commits: vec![],
+        }
+    }
+
+    fn push_commit(&mut self, l1_block_number: u64) {
+        assert!(l1_block_number <= self.block_number.as_u64());
+
+        let l1_block_number = U64::from(l1_block_number);
+        let last_commit = self.l1_blocks_for_commits.last().copied();
+        let is_increasing = last_commit.map_or(true, |last_number| last_number <= l1_block_number);
+        assert!(is_increasing, "Invalid L1 block number for commit");
+
+        self.l1_blocks_for_commits.push(l1_block_number);
+    }
+
+    fn client(&self) -> MockClient<L1> {
+        let logs = self
+            .l1_blocks_for_commits
+            .iter()
+            .enumerate()
+            .map(|(i, &l1_block_number)| {
+                let l1_batch_number = H256::from_low_u64_be(i as u64 + 1);
+                let root_hash = H256::repeat_byte(i as u8 + 1);
+                web3::Log {
+                    address: DIAMOND_PROXY_ADDRESS,
+                    topics: vec![
+                        *BLOCK_COMMIT_SIGNATURE,
+                        l1_batch_number,
+                        root_hash,
+                        H256::zero(), // commitment hash; not used
+                    ],
+                    block_number: Some(l1_block_number),
+                    ..web3::Log::default()
+                }
+            });
+        let logs: Vec<_> = logs.collect();
+        mock_l1_client(self.block_number, logs)
+    }
+}
+
+fn filter_logs(logs: &[web3::Log], filter: web3::Filter) -> Vec<web3::Log> {
+    let Some(web3::BlockNumber::Number(filter_from)) = filter.from_block else {
+        panic!("Unexpected filter: {filter:?}");
+    };
+    let Some(web3::BlockNumber::Number(filter_to)) = filter.to_block else {
+        panic!("Unexpected filter: {filter:?}");
+    };
+    let filter_block_range = filter_from..=filter_to;
+
+    let filter_addresses = filter.address.unwrap().flatten();
+    let filter_topics = filter.topics.unwrap();
+    let filter_topics: Vec<_> = filter_topics
+        .into_iter()
+        .map(|topic| topic.map(web3::ValueOrArray::flatten))
+        .collect();
+
+    let filtered_logs = logs.iter().filter(|log| {
+        if !filter_addresses.contains(&log.address) {
+            return false;
+        }
+        if !filter_block_range.contains(&log.block_number.unwrap()) {
+            return false;
+        }
+        filter_topics
+            .iter()
+            .zip(&log.topics)
+            .all(|(filter_topics, actual_topic)| match filter_topics {
+                Some(topics) => topics.contains(actual_topic),
+                None => true,
+            })
+    });
+    filtered_logs.cloned().collect()
+}
+
+fn mock_l1_client(block_number: U64, logs: Vec<web3::Log>) -> MockClient<L1> {
+    MockClient::builder(L1::default())
+        .method("eth_blockNumber", move || Ok(block_number))
+        .method(
+            "eth_getBlockByNumber",
+            move |number: web3::BlockNumber, with_txs: bool| {
+                assert!(!with_txs);
+
+                let number = match number {
+                    web3::BlockNumber::Number(number) => number,
+                    web3::BlockNumber::Latest => block_number,
+                    web3::BlockNumber::Earliest => U64::zero(),
+                    _ => panic!("Unexpected number: {number:?}"),
+                };
+                if number > block_number {
+                    return Ok(None);
+                }
+                Ok(Some(web3::Block::<H256> {
+                    number: Some(number),
+                    timestamp: U256::from(number.as_u64()), // timestamp == number
+                    ..web3::Block::default()
+                }))
+            },
+        )
+        .method("eth_getLogs", move |filter: web3::Filter| {
+            Ok(filter_logs(&logs, filter))
+        })
+        .build()
+}
+
+#[tokio::test]
+async fn guessing_l1_commit_block_number() {
+    let eth_params = EthereumParameters::new(100_000);
+    let eth_client = eth_params.client();
+
+    for timestamp in [0, 100, 1_000, 5_000, 10_000, 100_000] {
+        let (guessed_block_number, step_count) =
+            L1DataProvider::guess_l1_commit_block_number(&eth_client, timestamp)
+                .await
+                .unwrap();
+
+        assert!(
+            guessed_block_number.abs_diff(timestamp.into()) <= L1DataProvider::L1_BLOCK_ACCURACY,
+            "timestamp={timestamp}, guessed={guessed_block_number}"
+        );
+        assert!(step_count > 0);
+        assert!(step_count < 100);
+    }
+}
+
+async fn test_using_l1_data_provider(l1_batch_timestamps: &[u64]) {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    let mut eth_params = EthereumParameters::new(1_000_000);
+    for (number, &ts) in l1_batch_timestamps.iter().enumerate() {
+        let number = L1BatchNumber(number as u32 + 1);
+        seal_l1_batch_with_timestamp(&mut storage, number, ts).await;
+        eth_params.push_commit(ts + 1_000); // have a reasonable small diff between batch generation and commitment
+    }
+
+    let mut provider =
+        L1DataProvider::new(Box::new(eth_params.client()), DIAMOND_PROXY_ADDRESS).unwrap();
+    for i in 0..l1_batch_timestamps.len() {
+        let number = L1BatchNumber(i as u32 + 1);
+        let root_hash = provider
+            .batch_details(number, &get_last_l2_block(&mut storage, number).await)
+            .await
+            .unwrap()
+            .expect("no root hash");
+        assert_eq!(root_hash, H256::repeat_byte(number.0 as u8));
+
+        let past_l1_batch = provider.past_l1_batch.unwrap();
+        assert_eq!(past_l1_batch.number, number);
+        let expected_l1_block_number = eth_params.l1_blocks_for_commits[i];
+        assert_eq!(
+            past_l1_batch.l1_commit_block_number,
+            expected_l1_block_number
+        );
+        assert_eq!(
+            past_l1_batch.l1_commit_block_timestamp,
+            expected_l1_block_number.as_u64().into()
+        );
+    }
+}
+
+#[test_casing(4, [500, 1_500, 10_000, 30_000])]
+#[tokio::test]
+async fn using_l1_data_provider(batch_spacing: u64) {
+    let l1_batch_timestamps: Vec<_> = (0..10).map(|i| 50_000 + batch_spacing * i).collect();
+    test_using_l1_data_provider(&l1_batch_timestamps).await;
+}
+
+#[tokio::test]
+async fn detecting_reorg_in_l1_data_provider() {
+    let l1_batch_number = H256::from_low_u64_be(1);
+    // Generate two logs for the same L1 batch #1
+    let logs = vec![
+        web3::Log {
+            address: DIAMOND_PROXY_ADDRESS,
+            topics: vec![
+                *BLOCK_COMMIT_SIGNATURE,
+                l1_batch_number,
+                H256::repeat_byte(1),
+                H256::zero(), // commitment hash; not used
+            ],
+            block_number: Some(1.into()),
+            ..web3::Log::default()
+        },
+        web3::Log {
+            address: DIAMOND_PROXY_ADDRESS,
+            topics: vec![
+                *BLOCK_COMMIT_SIGNATURE,
+                l1_batch_number,
+                H256::repeat_byte(2),
+                H256::zero(), // commitment hash; not used
+            ],
+            block_number: Some(100.into()),
+            ..web3::Log::default()
+        },
+    ];
+    let l1_client = mock_l1_client(200.into(), logs);
+
+    let mut provider = L1DataProvider::new(Box::new(l1_client), DIAMOND_PROXY_ADDRESS).unwrap();
+    let output = provider
+        .batch_details(L1BatchNumber(1), &create_l2_block(1))
+        .await
+        .unwrap();
+    assert_matches!(output, Err(MissingData::PossibleReorg));
+}
+
+#[tokio::test]
+async fn combined_data_provider_errors() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    let mut eth_params = EthereumParameters::new(1_000_000);
+    seal_l1_batch_with_timestamp(&mut storage, L1BatchNumber(1), 50_000).await;
+    eth_params.push_commit(51_000);
+    seal_l1_batch_with_timestamp(&mut storage, L1BatchNumber(2), 52_000).await;
+
+    let mut main_node_client = MockMainNodeClient::default();
+    main_node_client.insert_batch(L1BatchNumber(2), H256::repeat_byte(2));
+    let mut provider = CombinedDataProvider::new(main_node_client);
+    let l1_provider =
+        L1DataProvider::new(Box::new(eth_params.client()), DIAMOND_PROXY_ADDRESS).unwrap();
+    provider.set_l1(l1_provider);
+
+    // L1 batch #1 should be obtained from L1
+    let root_hash = provider
+        .batch_details(
+            L1BatchNumber(1),
+            &get_last_l2_block(&mut storage, L1BatchNumber(1)).await,
+        )
+        .await
+        .unwrap()
+        .expect("no root hash");
+    assert_eq!(root_hash, H256::repeat_byte(1));
+    assert!(provider.l1.is_some());
+
+    // L1 batch #2 should be obtained from L2
+    let root_hash = provider
+        .batch_details(
+            L1BatchNumber(2),
+            &get_last_l2_block(&mut storage, L1BatchNumber(2)).await,
+        )
+        .await
+        .unwrap()
+        .expect("no root hash");
+    assert_eq!(root_hash, H256::repeat_byte(2));
+    assert!(provider.l1.is_none());
+}
diff --git a/core/node/node_sync/src/tree_data_fetcher/tests.rs b/core/node/node_sync/src/tree_data_fetcher/tests.rs
new file mode 100644
index 000000000000..5cb8b9241b24
--- /dev/null
+++ b/core/node/node_sync/src/tree_data_fetcher/tests.rs
@@ -0,0 +1,384 @@
+use std::{
+    collections::HashMap,
+    ops,
+    sync::{
+        atomic::{AtomicBool, AtomicUsize, Ordering},
+        Arc,
+    },
+};
+
+use assert_matches::assert_matches;
+use async_trait::async_trait;
+use test_casing::test_casing;
+use zksync_dal::Connection;
+use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
+use zksync_node_test_utils::{create_l1_batch, create_l2_block, prepare_recovery_snapshot};
+use zksync_types::{AccountTreeId, Address, L2BlockNumber, StorageKey, StorageLog, H256};
+use zksync_web3_decl::jsonrpsee::core::ClientError;
+
+use super::{metrics::StepOutcomeLabel, provider::TreeDataProviderResult, *};
+
+#[derive(Debug, Default)]
+pub(super) struct MockMainNodeClient {
+    transient_error: Arc<AtomicBool>,
+    batch_details_responses: HashMap<L1BatchNumber, H256>,
+}
+
+impl MockMainNodeClient {
+    pub fn insert_batch(&mut self, number: L1BatchNumber, root_hash: H256) {
+        self.batch_details_responses.insert(number, root_hash);
+    }
+}
+
+#[async_trait]
+impl TreeDataProvider for MockMainNodeClient {
+    async fn batch_details(
+        &mut self,
+        number: L1BatchNumber,
+        _last_l2_block: &L2BlockHeader,
+    ) -> TreeDataProviderResult {
+        if self.transient_error.fetch_and(false, Ordering::Relaxed) {
+            let err = ClientError::RequestTimeout;
+            return Err(EnrichedClientError::new(err, "batch_details").into());
+        }
+        Ok(self
+            .batch_details_responses
+            .get(&number)
+            .copied()
+            .ok_or(MissingData::Batch))
+    }
+}
+
+async fn seal_l1_batch(storage: &mut Connection<'_, Core>, number: L1BatchNumber) {
+    seal_l1_batch_with_timestamp(storage, number, number.0.into()).await;
+}
+
+pub(super) async fn seal_l1_batch_with_timestamp(
+    storage: &mut Connection<'_, Core>,
+    number: L1BatchNumber,
+    timestamp: u64,
+) {
+    let mut transaction = storage.start_transaction().await.unwrap();
+    // Insert a single L2 block belonging to the batch.
+    let mut block_header = create_l2_block(number.0);
+    block_header.timestamp = timestamp;
+    transaction
+        .blocks_dal()
+        .insert_l2_block(&block_header)
+        .await
+        .unwrap();
+
+    let mut batch_header = create_l1_batch(number.0);
+    batch_header.timestamp = timestamp;
+    transaction
+        .blocks_dal()
+        .insert_mock_l1_batch(&batch_header)
+        .await
+        .unwrap();
+    transaction
+        .blocks_dal()
+        .mark_l2_blocks_as_executed_in_l1_batch(batch_header.number)
+        .await
+        .unwrap();
+
+    // One initial write per L1 batch
+    let initial_writes = [StorageKey::new(
+        AccountTreeId::new(Address::repeat_byte(1)),
+        H256::from_low_u64_be(number.0.into()),
+    )
+    .hashed_key()];
+    transaction
+        .storage_logs_dedup_dal()
+        .insert_initial_writes(number, &initial_writes)
+        .await
+        .unwrap();
+    transaction.commit().await.unwrap();
+}
+
+pub(super) async fn get_last_l2_block(
+    storage: &mut Connection<'_, Core>,
+    number: L1BatchNumber,
+) -> L2BlockHeader {
+    TreeDataFetcher::get_last_l2_block(storage, number)
+        .await
+        .unwrap()
+}
+
+#[derive(Debug)]
+struct FetcherHarness {
+    fetcher: TreeDataFetcher,
+    updates_receiver: mpsc::UnboundedReceiver<L1BatchNumber>,
+    metrics: &'static TreeDataFetcherMetrics,
+}
+
+impl FetcherHarness {
+    fn new(client: impl TreeDataProvider, pool: ConnectionPool<Core>) -> Self {
+        let (updates_sender, updates_receiver) = mpsc::unbounded_channel();
+        let metrics = &*Box::leak(Box::<TreeDataFetcherMetrics>::default());
+        let fetcher = TreeDataFetcher {
+            data_provider: CombinedDataProvider::new(client),
+            diamond_proxy_address: None,
+            pool: pool.clone(),
+            metrics,
+            health_updater: ReactiveHealthCheck::new("tree_data_fetcher").1,
+            poll_interval: Duration::from_millis(10),
+            updates_sender,
+        };
+        Self {
+            fetcher,
+            updates_receiver,
+            metrics,
+        }
+    }
+}
+
+#[tokio::test]
+async fn tree_data_fetcher_steps() {
+    let pool = ConnectionPool::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    let genesis = insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    let mut client = MockMainNodeClient::default();
+    for number in 1..=5 {
+        let number = L1BatchNumber(number);
+        client
+            .batch_details_responses
+            .insert(number, H256::from_low_u64_be(number.0.into()));
+        seal_l1_batch(&mut storage, number).await;
+    }
+
+    let mut fetcher = FetcherHarness::new(client, pool.clone()).fetcher;
+    for number in 1..=5 {
+        let step_outcome = fetcher.step().await.unwrap();
+        assert_matches!(
+            step_outcome,
+            StepOutcome::UpdatedBatch(updated_number) if updated_number == L1BatchNumber(number)
+        );
+    }
+    let step_outcome = fetcher.step().await.unwrap();
+    assert_matches!(step_outcome, StepOutcome::NoProgress);
+
+    // Check tree data in updated batches.
+    assert_batch_tree_data(&mut storage, 1..=5, genesis.rollup_last_leaf_index).await;
+}
+
+async fn assert_batch_tree_data(
+    storage: &mut Connection<'_, Core>,
+    batch_numbers: ops::RangeInclusive<u32>,
+    starting_rollup_last_leaf_index: u64,
+) {
+    for (i, number) in batch_numbers.enumerate() {
+        let tree_data = storage
+            .blocks_dal()
+            .get_l1_batch_tree_data(L1BatchNumber(number))
+            .await
+            .unwrap();
+        let tree_data = tree_data.unwrap_or_else(|| {
+            panic!("No tree data persisted for L1 batch #{number}");
+        });
+        assert_eq!(tree_data.hash, H256::from_low_u64_be(number.into()));
+        assert_eq!(
+            tree_data.rollup_last_leaf_index,
+            starting_rollup_last_leaf_index + i as u64 + 1 // expecting 1 initial write per batch
+        );
+    }
+}
+
+#[tokio::test]
+async fn tree_data_fetcher_steps_after_snapshot_recovery() {
+    let pool = ConnectionPool::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    let account = AccountTreeId::new(Address::zero());
+    let snapshot_storage_logs: Vec<_> = (0..20)
+        .map(|i| {
+            let key = StorageKey::new(account, H256::repeat_byte(i));
+            StorageLog::new_write_log(key, H256::repeat_byte(0xff))
+        })
+        .collect();
+    let snapshot = prepare_recovery_snapshot(
+        &mut storage,
+        L1BatchNumber(23),
+        L2BlockNumber(42),
+        &snapshot_storage_logs,
+    )
+    .await;
+
+    let mut client = MockMainNodeClient::default();
+    for i in 1..=5 {
+        let number = snapshot.l1_batch_number + i;
+        client
+            .batch_details_responses
+            .insert(number, H256::from_low_u64_be(number.0.into()));
+        seal_l1_batch(&mut storage, number).await;
+    }
+
+    let mut fetcher = FetcherHarness::new(client, pool.clone()).fetcher;
+    for i in 1..=5 {
+        let step_outcome = fetcher.step().await.unwrap();
+        assert_matches!(
+            step_outcome,
+            StepOutcome::UpdatedBatch(updated_number) if updated_number == snapshot.l1_batch_number + i
+        );
+    }
+    let step_outcome = fetcher.step().await.unwrap();
+    assert_matches!(step_outcome, StepOutcome::NoProgress);
+
+    let batch_numbers = (snapshot.l1_batch_number.0 + 1)..=(snapshot.l1_batch_number.0 + 5);
+    assert_batch_tree_data(&mut storage, batch_numbers, 21).await;
+}
+
+#[tokio::test]
+async fn tree_data_fetcher_recovers_from_transient_errors() {
+    let pool = ConnectionPool::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    let genesis = insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    let mut client = MockMainNodeClient::default();
+    for number in 1..=5 {
+        let number = L1BatchNumber(number);
+        client
+            .batch_details_responses
+            .insert(number, H256::from_low_u64_be(number.0.into()));
+    }
+    let transient_error = client.transient_error.clone();
+
+    let FetcherHarness {
+        fetcher,
+        mut updates_receiver,
+        metrics,
+    } = FetcherHarness::new(client, pool.clone());
+    let (stop_sender, stop_receiver) = watch::channel(false);
+    let fetcher_handle = tokio::spawn(fetcher.run(stop_receiver));
+
+    for number in 1..=5 {
+        transient_error.store(true, Ordering::Relaxed);
+        // Insert L1 batch into a local storage and wait for its tree data to be updated.
+        seal_l1_batch(&mut storage, L1BatchNumber(number)).await;
+        let updated_batch = updates_receiver.recv().await.unwrap();
+        assert_eq!(updated_batch, L1BatchNumber(number));
+
+        let tree_data = storage
+            .blocks_dal()
+            .get_l1_batch_tree_data(L1BatchNumber(number))
+            .await
+            .unwrap();
+        let tree_data = tree_data.unwrap_or_else(|| {
+            panic!("No tree data persisted for L1 batch #{number}");
+        });
+        assert_eq!(tree_data.hash, H256::from_low_u64_be(number.into()));
+        assert_eq!(
+            tree_data.rollup_last_leaf_index,
+            genesis.rollup_last_leaf_index + u64::from(number)
+        );
+    }
+
+    // Check metrics.
+    assert_eq!(metrics.last_updated_batch_number.get(), 5);
+    assert_eq!(
+        metrics.step_outcomes[&StepOutcomeLabel::TransientError].get(),
+        5
+    );
+    assert_eq!(
+        metrics.step_outcomes[&StepOutcomeLabel::UpdatedBatch].get(),
+        5
+    );
+
+    stop_sender.send_replace(true);
+    fetcher_handle.await.unwrap().unwrap();
+}
+
+#[derive(Debug)]
+struct SlowMainNode {
+    request_count: AtomicUsize,
+    compute_root_hash_after: usize,
+}
+
+impl SlowMainNode {
+    fn new(compute_root_hash_after: usize) -> Self {
+        Self {
+            request_count: AtomicUsize::new(0),
+            compute_root_hash_after,
+        }
+    }
+}
+
+#[async_trait]
+impl TreeDataProvider for SlowMainNode {
+    async fn batch_details(
+        &mut self,
+        number: L1BatchNumber,
+        _last_l2_block: &L2BlockHeader,
+    ) -> TreeDataProviderResult {
+        if number != L1BatchNumber(1) {
+            return Ok(Err(MissingData::Batch));
+        }
+        let request_count = self.request_count.fetch_add(1, Ordering::Relaxed);
+        Ok(if request_count >= self.compute_root_hash_after {
+            Ok(H256::repeat_byte(1))
+        } else {
+            Err(MissingData::RootHash)
+        })
+    }
+}
+
+#[test_casing(2, [false, true])]
+#[tokio::test]
+async fn tree_data_fetcher_with_missing_remote_hash(delayed_insertion: bool) {
+    let pool = ConnectionPool::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    let genesis = insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+    if !delayed_insertion {
+        seal_l1_batch(&mut storage, L1BatchNumber(1)).await;
+    }
+
+    let client = SlowMainNode::new(3);
+    let FetcherHarness {
+        fetcher,
+        mut updates_receiver,
+        metrics,
+    } = FetcherHarness::new(client, pool.clone());
+    let (stop_sender, stop_receiver) = watch::channel(false);
+    let fetcher_handle = tokio::spawn(fetcher.run(stop_receiver));
+
+    if delayed_insertion {
+        tokio::time::sleep(Duration::from_millis(10)).await;
+        seal_l1_batch(&mut storage, L1BatchNumber(1)).await;
+    }
+
+    // Wait until the L1 batch is updated by the fetcher.
+    let updated_batch = updates_receiver.recv().await.unwrap();
+    assert_eq!(updated_batch, L1BatchNumber(1));
+
+    let tree_data = storage
+        .blocks_dal()
+        .get_l1_batch_tree_data(L1BatchNumber(1))
+        .await
+        .unwrap();
+    let tree_data = tree_data.expect("no tree data for batch");
+    assert_eq!(tree_data.hash, H256::repeat_byte(1));
+    assert_eq!(
+        tree_data.rollup_last_leaf_index,
+        genesis.rollup_last_leaf_index + 1
+    );
+
+    // Check metrics.
+    assert_eq!(metrics.last_updated_batch_number.get(), 1);
+    assert_eq!(
+        metrics.step_outcomes[&StepOutcomeLabel::RemoteHashMissing].get(),
+        3
+    );
+    assert_eq!(
+        metrics.step_outcomes[&StepOutcomeLabel::UpdatedBatch].get(),
+        1
+    );
+
+    // Check that the fetcher can be stopped.
+    stop_sender.send_replace(true);
+    fetcher_handle.await.unwrap().unwrap();
+}
diff --git a/core/bin/external_node/src/helpers.rs b/core/node/node_sync/src/validate_chain_ids_task.rs
similarity index 66%
rename from core/bin/external_node/src/helpers.rs
rename to core/node/node_sync/src/validate_chain_ids_task.rs
index d7112816475a..1414b5ab6014 100644
--- a/core/bin/external_node/src/helpers.rs
+++ b/core/node/node_sync/src/validate_chain_ids_task.rs
@@ -4,79 +4,21 @@ use std::time::Duration;
 
 use futures::FutureExt;
 use tokio::sync::watch;
-use zksync_basic_types::{L1ChainId, L2ChainId};
 use zksync_eth_client::EthInterface;
-use zksync_health_check::{async_trait, CheckHealth, Health, HealthStatus};
+use zksync_types::{L1ChainId, L2ChainId};
 use zksync_web3_decl::{
-    client::BoxedL2Client,
+    client::{DynClient, L1, L2},
     error::ClientRpcContext,
     namespaces::{EthNamespaceClient, ZksNamespaceClient},
 };
 
-/// Main node health check.
-#[derive(Debug)]
-pub(crate) struct MainNodeHealthCheck(BoxedL2Client);
-
-impl From<BoxedL2Client> for MainNodeHealthCheck {
-    fn from(client: BoxedL2Client) -> Self {
-        Self(client.for_component("main_node_health_check"))
-    }
-}
-
-#[async_trait]
-impl CheckHealth for MainNodeHealthCheck {
-    fn name(&self) -> &'static str {
-        "main_node_http_rpc"
-    }
-
-    async fn check_health(&self) -> Health {
-        if let Err(err) = self.0.get_block_number().await {
-            tracing::warn!("Health-check call to main node HTTP RPC failed: {err}");
-            let details = serde_json::json!({
-                "error": err.to_string(),
-            });
-            return Health::from(HealthStatus::NotReady).with_details(details);
-        }
-        HealthStatus::Ready.into()
-    }
-}
-
-/// Ethereum client health check.
-#[derive(Debug)]
-pub(crate) struct EthClientHealthCheck(Box<dyn EthInterface>);
-
-impl From<Box<dyn EthInterface>> for EthClientHealthCheck {
-    fn from(client: Box<dyn EthInterface>) -> Self {
-        Self(client.for_component("ethereum_health_check"))
-    }
-}
-
-#[async_trait]
-impl CheckHealth for EthClientHealthCheck {
-    fn name(&self) -> &'static str {
-        "ethereum_http_rpc"
-    }
-
-    async fn check_health(&self) -> Health {
-        if let Err(err) = self.0.block_number().await {
-            tracing::warn!("Health-check call to Ethereum HTTP RPC failed: {err}");
-            let details = serde_json::json!({
-                "error": err.to_string(),
-            });
-            // Unlike main node client, losing connection to L1 is not fatal for the node
-            return Health::from(HealthStatus::Affected).with_details(details);
-        }
-        HealthStatus::Ready.into()
-    }
-}
-
 /// Task that validates chain IDs using main node and Ethereum clients.
 #[derive(Debug)]
-pub(crate) struct ValidateChainIdsTask {
+pub struct ValidateChainIdsTask {
     l1_chain_id: L1ChainId,
     l2_chain_id: L2ChainId,
-    eth_client: Box<dyn EthInterface>,
-    main_node_client: BoxedL2Client,
+    eth_client: Box<DynClient<L1>>,
+    main_node_client: Box<DynClient<L2>>,
 }
 
 impl ValidateChainIdsTask {
@@ -85,8 +27,8 @@ impl ValidateChainIdsTask {
     pub fn new(
         l1_chain_id: L1ChainId,
         l2_chain_id: L2ChainId,
-        eth_client: Box<dyn EthInterface>,
-        main_node_client: BoxedL2Client,
+        eth_client: Box<DynClient<L1>>,
+        main_node_client: Box<DynClient<L2>>,
     ) -> Self {
         Self {
             l1_chain_id,
@@ -97,7 +39,7 @@ impl ValidateChainIdsTask {
     }
 
     async fn check_eth_client(
-        eth_client: Box<dyn EthInterface>,
+        eth_client: Box<DynClient<L1>>,
         expected: L1ChainId,
     ) -> anyhow::Result<()> {
         loop {
@@ -123,7 +65,7 @@ impl ValidateChainIdsTask {
     }
 
     async fn check_l1_chain_using_main_node(
-        main_node_client: BoxedL2Client,
+        main_node_client: Box<DynClient<L2>>,
         expected: L1ChainId,
     ) -> anyhow::Result<()> {
         loop {
@@ -161,7 +103,7 @@ impl ValidateChainIdsTask {
     }
 
     async fn check_l2_chain_using_main_node(
-        main_node_client: BoxedL2Client,
+        main_node_client: Box<DynClient<L2>>,
         expected: L2ChainId,
     ) -> anyhow::Result<()> {
         loop {
@@ -196,6 +138,23 @@ impl ValidateChainIdsTask {
         }
     }
 
+    /// Runs the task once, exiting either when all the checks are performed or when the stop signal is received.
+    pub async fn run_once(self, mut stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        let eth_client_check = Self::check_eth_client(self.eth_client, self.l1_chain_id);
+        let main_node_l1_check =
+            Self::check_l1_chain_using_main_node(self.main_node_client.clone(), self.l1_chain_id);
+        let main_node_l2_check =
+            Self::check_l2_chain_using_main_node(self.main_node_client, self.l2_chain_id);
+        let joined_futures =
+            futures::future::try_join3(eth_client_check, main_node_l1_check, main_node_l2_check)
+                .fuse();
+        tokio::select! {
+            res = joined_futures => res.map(drop),
+            _ = stop_receiver.changed() =>  Ok(()),
+        }
+    }
+
+    /// Runs the task until the stop signal is received.
     pub async fn run(self, mut stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
         // Since check futures are fused, they are safe to poll after getting resolved; they will never resolve again,
         // so we'll just wait for another check or a stop signal.
@@ -205,38 +164,37 @@ impl ValidateChainIdsTask {
                 .fuse();
         let main_node_l2_check =
             Self::check_l2_chain_using_main_node(self.main_node_client, self.l2_chain_id).fuse();
-        loop {
-            tokio::select! {
-                Err(err) = eth_client_check => return Err(err),
-                Err(err) = main_node_l1_check => return Err(err),
-                Err(err) = main_node_l2_check => return Err(err),
-                _ = stop_receiver.changed() => return Ok(()),
-            }
+        tokio::select! {
+            Err(err) = eth_client_check =>  Err(err),
+            Err(err) = main_node_l1_check =>  Err(err),
+            Err(err) = main_node_l2_check =>  Err(err),
+            _ = stop_receiver.changed() =>  Ok(()),
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use zksync_eth_client::clients::MockEthereum;
     use zksync_types::U64;
-    use zksync_web3_decl::client::MockL2Client;
+    use zksync_web3_decl::client::{MockClient, L1};
 
     use super::*;
 
     #[tokio::test]
     async fn validating_chain_ids_errors() {
-        let main_node_client = MockL2Client::new(|method, _| match method {
-            "eth_chainId" => Ok(serde_json::json!(U64::from(270))),
-            "zks_L1ChainId" => Ok(serde_json::json!(U64::from(3))),
-            _ => panic!("unexpected L2 call: {method}"),
-        });
+        let eth_client = MockClient::builder(L1::default())
+            .method("eth_chainId", || Ok(U64::from(9)))
+            .build();
+        let main_node_client = MockClient::builder(L2::default())
+            .method("eth_chainId", || Ok(U64::from(270)))
+            .method("zks_L1ChainId", || Ok(U64::from(3)))
+            .build();
 
         let validation_task = ValidateChainIdsTask::new(
             L1ChainId(3), // << mismatch with the Ethereum client
             L2ChainId::default(),
-            Box::<MockEthereum>::default(),
-            BoxedL2Client::new(main_node_client.clone()),
+            Box::new(eth_client.clone()),
+            Box::new(main_node_client.clone()),
         );
         let (_stop_sender, stop_receiver) = watch::channel(false);
         let err = validation_task
@@ -252,8 +210,8 @@ mod tests {
         let validation_task = ValidateChainIdsTask::new(
             L1ChainId(9), // << mismatch with the main node client
             L2ChainId::from(270),
-            Box::<MockEthereum>::default(),
-            BoxedL2Client::new(main_node_client.clone()),
+            Box::new(eth_client.clone()),
+            Box::new(main_node_client),
         );
         let err = validation_task
             .run(stop_receiver.clone())
@@ -265,17 +223,16 @@ mod tests {
             "{err}"
         );
 
-        let main_node_client = MockL2Client::new(|method, _| match method {
-            "eth_chainId" => Ok(serde_json::json!(U64::from(270))),
-            "zks_L1ChainId" => Ok(serde_json::json!(U64::from(9))),
-            _ => panic!("unexpected L2 call: {method}"),
-        });
+        let main_node_client = MockClient::builder(L2::default())
+            .method("eth_chainId", || Ok(U64::from(270)))
+            .method("zks_L1ChainId", || Ok(U64::from(9)))
+            .build();
 
         let validation_task = ValidateChainIdsTask::new(
             L1ChainId(9),
             L2ChainId::from(271), // << mismatch with the main node client
-            Box::<MockEthereum>::default(),
-            BoxedL2Client::new(main_node_client.clone()),
+            Box::new(eth_client),
+            Box::new(main_node_client),
         );
         let err = validation_task
             .run(stop_receiver)
@@ -290,17 +247,19 @@ mod tests {
 
     #[tokio::test]
     async fn validating_chain_ids_success() {
-        let main_node_client = MockL2Client::new(|method, _| match method {
-            "eth_chainId" => Ok(serde_json::json!(U64::from(270))),
-            "zks_L1ChainId" => Ok(serde_json::json!(U64::from(9))),
-            _ => panic!("unexpected L2 call: {method}"),
-        });
+        let eth_client = MockClient::builder(L1::default())
+            .method("eth_chainId", || Ok(U64::from(9)))
+            .build();
+        let main_node_client = MockClient::builder(L2::default())
+            .method("eth_chainId", || Ok(U64::from(270)))
+            .method("zks_L1ChainId", || Ok(U64::from(9)))
+            .build();
 
         let validation_task = ValidateChainIdsTask::new(
             L1ChainId(9),
             L2ChainId::default(),
-            Box::<MockEthereum>::default(),
-            BoxedL2Client::new(main_node_client.clone()),
+            Box::new(eth_client),
+            Box::new(main_node_client),
         );
         let (stop_sender, stop_receiver) = watch::channel(false);
         let task = tokio::spawn(validation_task.run(stop_receiver));
diff --git a/core/node/proof_data_handler/Cargo.toml b/core/node/proof_data_handler/Cargo.toml
index 2e7141ea4d6b..0ab5d4bb1913 100644
--- a/core/node/proof_data_handler/Cargo.toml
+++ b/core/node/proof_data_handler/Cargo.toml
@@ -14,9 +14,18 @@ zksync_config.workspace = true
 zksync_dal.workspace = true
 zksync_object_store.workspace = true
 zksync_prover_interface.workspace = true
+zksync_tee_verifier.workspace = true
 zksync_types.workspace = true
-
-tracing.workspace = true
 anyhow.workspace = true
 axum.workspace = true
 tokio.workspace = true
+tracing.workspace = true
+
+[dev-dependencies]
+hyper.workspace = true
+chrono.workspace = true
+zksync_multivm.workspace = true
+serde_json.workspace = true
+tower.workspace = true
+zksync_basic_types.workspace = true
+zksync_contracts.workspace = true
diff --git a/core/node/proof_data_handler/README.md b/core/node/proof_data_handler/README.md
index 8c3392c5b1fe..8cc48fe0aa35 100644
--- a/core/node/proof_data_handler/README.md
+++ b/core/node/proof_data_handler/README.md
@@ -1,3 +1,3 @@
-# zkSync Era Proof data handler
+# ZKsync Era Proof data handler
 
 This crate contains functionality for sending proof-related info from `Server` to `Prover` and back.
diff --git a/core/node/proof_data_handler/src/errors.rs b/core/node/proof_data_handler/src/errors.rs
new file mode 100644
index 000000000000..f170b3b53e7c
--- /dev/null
+++ b/core/node/proof_data_handler/src/errors.rs
@@ -0,0 +1,38 @@
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+};
+use zksync_dal::DalError;
+use zksync_object_store::ObjectStoreError;
+
+pub(crate) enum RequestProcessorError {
+    ObjectStore(ObjectStoreError),
+    Dal(DalError),
+}
+
+impl IntoResponse for RequestProcessorError {
+    fn into_response(self) -> Response {
+        let (status_code, message) = match self {
+            RequestProcessorError::ObjectStore(err) => {
+                tracing::error!("GCS error: {:?}", err);
+                (
+                    StatusCode::BAD_GATEWAY,
+                    "Failed fetching/saving from GCS".to_owned(),
+                )
+            }
+            RequestProcessorError::Dal(err) => {
+                tracing::error!("Sqlx error: {:?}", err);
+                match err.inner() {
+                    zksync_dal::SqlxError::RowNotFound => {
+                        (StatusCode::NOT_FOUND, "Non existing L1 batch".to_owned())
+                    }
+                    _ => (
+                        StatusCode::BAD_GATEWAY,
+                        "Failed fetching/saving from db".to_owned(),
+                    ),
+                }
+            }
+        };
+        (status_code, message).into_response()
+    }
+}
diff --git a/core/node/proof_data_handler/src/lib.rs b/core/node/proof_data_handler/src/lib.rs
index 558b8fed5769..06b88b395139 100644
--- a/core/node/proof_data_handler/src/lib.rs
+++ b/core/node/proof_data_handler/src/lib.rs
@@ -2,27 +2,66 @@ use std::{net::SocketAddr, sync::Arc};
 
 use anyhow::Context as _;
 use axum::{extract::Path, routing::post, Json, Router};
+use request_processor::RequestProcessor;
+use tee_request_processor::TeeRequestProcessor;
 use tokio::sync::watch;
 use zksync_config::configs::ProofDataHandlerConfig;
 use zksync_dal::{ConnectionPool, Core};
 use zksync_object_store::ObjectStore;
-use zksync_prover_interface::api::{ProofGenerationDataRequest, SubmitProofRequest};
+use zksync_prover_interface::api::{
+    ProofGenerationDataRequest, RegisterTeeAttestationRequest, SubmitProofRequest,
+    SubmitTeeProofRequest, TeeProofGenerationDataRequest,
+};
+use zksync_types::commitment::L1BatchCommitmentMode;
 
-use crate::request_processor::RequestProcessor;
+#[cfg(test)]
+mod tests;
 
+mod errors;
 mod request_processor;
+mod tee_request_processor;
 
 pub async fn run_server(
     config: ProofDataHandlerConfig,
     blob_store: Arc<dyn ObjectStore>,
-    pool: ConnectionPool<Core>,
+    connection_pool: ConnectionPool<Core>,
+    commitment_mode: L1BatchCommitmentMode,
     mut stop_receiver: watch::Receiver<bool>,
 ) -> anyhow::Result<()> {
     let bind_address = SocketAddr::from(([0, 0, 0, 0], config.http_port));
     tracing::debug!("Starting proof data handler server on {bind_address}");
-    let get_proof_gen_processor = RequestProcessor::new(blob_store, pool, config);
+    let app = create_proof_processing_router(blob_store, connection_pool, config, commitment_mode);
+
+    let listener = tokio::net::TcpListener::bind(bind_address)
+        .await
+        .with_context(|| format!("Failed binding proof data handler server to {bind_address}"))?;
+    axum::serve(listener, app)
+        .with_graceful_shutdown(async move {
+            if stop_receiver.changed().await.is_err() {
+                tracing::warn!("Stop signal sender for proof data handler server was dropped without sending a signal");
+            }
+            tracing::info!("Stop signal received, proof data handler server is shutting down");
+        })
+        .await
+        .context("Proof data handler server failed")?;
+    tracing::info!("Proof data handler server shut down");
+    Ok(())
+}
+
+fn create_proof_processing_router(
+    blob_store: Arc<dyn ObjectStore>,
+    connection_pool: ConnectionPool<Core>,
+    config: ProofDataHandlerConfig,
+    commitment_mode: L1BatchCommitmentMode,
+) -> Router {
+    let get_proof_gen_processor = RequestProcessor::new(
+        blob_store.clone(),
+        connection_pool.clone(),
+        config.clone(),
+        commitment_mode,
+    );
     let submit_proof_processor = get_proof_gen_processor.clone();
-    let app = Router::new()
+    let mut router = Router::new()
         .route(
             "/proof_generation_data",
             post(
@@ -46,16 +85,43 @@ pub async fn run_server(
             ),
         );
 
-    axum::Server::bind(&bind_address)
-        .serve(app.into_make_service())
-        .with_graceful_shutdown(async move {
-            if stop_receiver.changed().await.is_err() {
-                tracing::warn!("Stop signal sender for proof data handler server was dropped without sending a signal");
-            }
-            tracing::info!("Stop signal received, proof data handler server is shutting down");
-        })
-        .await
-        .context("Proof data handler server failed")?;
-    tracing::info!("Proof data handler server shut down");
-    Ok(())
+    if config.tee_support {
+        let get_tee_proof_gen_processor =
+            TeeRequestProcessor::new(blob_store, connection_pool, config.clone());
+        let submit_tee_proof_processor = get_tee_proof_gen_processor.clone();
+        let register_tee_attestation_processor = get_tee_proof_gen_processor.clone();
+
+        router = router.route(
+            "/tee/proof_inputs",
+            post(
+                move |payload: Json<TeeProofGenerationDataRequest>| async move {
+                    get_tee_proof_gen_processor
+                        .get_proof_generation_data(payload)
+                        .await
+                },
+            ),
+        )
+        .route(
+            "/tee/submit_proofs/:l1_batch_number",
+            post(
+                move |l1_batch_number: Path<u32>, payload: Json<SubmitTeeProofRequest>| async move {
+                    submit_tee_proof_processor
+                        .submit_proof(l1_batch_number, payload)
+                        .await
+                },
+            ),
+        )
+        .route(
+            "/tee/register_attestation",
+            post(
+                move |payload: Json<RegisterTeeAttestationRequest>| async move {
+                    register_tee_attestation_processor
+                        .register_tee_attestation(payload)
+                        .await
+                },
+            ),
+        );
+    }
+
+    router
 }
diff --git a/core/node/proof_data_handler/src/request_processor.rs b/core/node/proof_data_handler/src/request_processor.rs
index 8b3d0de745d1..170b27bb971f 100644
--- a/core/node/proof_data_handler/src/request_processor.rs
+++ b/core/node/proof_data_handler/src/request_processor.rs
@@ -1,60 +1,28 @@
 use std::sync::Arc;
 
-use axum::{
-    extract::Path,
-    http::StatusCode,
-    response::{IntoResponse, Response},
-    Json,
-};
+use axum::{extract::Path, Json};
 use zksync_config::configs::ProofDataHandlerConfig;
-use zksync_dal::{ConnectionPool, Core, CoreDal, SqlxError};
-use zksync_object_store::{ObjectStore, ObjectStoreError};
+use zksync_dal::{ConnectionPool, Core, CoreDal};
+use zksync_object_store::ObjectStore;
 use zksync_prover_interface::api::{
     ProofGenerationData, ProofGenerationDataRequest, ProofGenerationDataResponse,
     SubmitProofRequest, SubmitProofResponse,
 };
 use zksync_types::{
-    basic_fri_types::Eip4844Blobs, commitment::serialize_commitments, web3::keccak256,
+    basic_fri_types::Eip4844Blobs,
+    commitment::{serialize_commitments, L1BatchCommitmentMode},
+    web3::keccak256,
     L1BatchNumber, H256,
 };
 
+use crate::errors::RequestProcessorError;
+
 #[derive(Clone)]
 pub(crate) struct RequestProcessor {
     blob_store: Arc<dyn ObjectStore>,
     pool: ConnectionPool<Core>,
     config: ProofDataHandlerConfig,
-}
-
-pub(crate) enum RequestProcessorError {
-    ObjectStore(ObjectStoreError),
-    Sqlx(SqlxError),
-}
-
-impl IntoResponse for RequestProcessorError {
-    fn into_response(self) -> Response {
-        let (status_code, message) = match self {
-            RequestProcessorError::ObjectStore(err) => {
-                tracing::error!("GCS error: {:?}", err);
-                (
-                    StatusCode::BAD_GATEWAY,
-                    "Failed fetching/saving from GCS".to_owned(),
-                )
-            }
-            RequestProcessorError::Sqlx(err) => {
-                tracing::error!("Sqlx error: {:?}", err);
-                match err {
-                    SqlxError::RowNotFound => {
-                        (StatusCode::NOT_FOUND, "Non existing L1 batch".to_owned())
-                    }
-                    _ => (
-                        StatusCode::BAD_GATEWAY,
-                        "Failed fetching/saving from db".to_owned(),
-                    ),
-                }
-            }
-        };
-        (status_code, message).into_response()
-    }
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 impl RequestProcessor {
@@ -62,11 +30,13 @@ impl RequestProcessor {
         blob_store: Arc<dyn ObjectStore>,
         pool: ConnectionPool<Core>,
         config: ProofDataHandlerConfig,
+        commitment_mode: L1BatchCommitmentMode,
     ) -> Self {
         Self {
             blob_store,
             pool,
             config,
+            commitment_mode,
         }
     }
 
@@ -83,7 +53,8 @@ impl RequestProcessor {
             .unwrap()
             .proof_generation_dal()
             .get_next_block_to_be_proven(self.config.proof_generation_timeout())
-            .await;
+            .await
+            .map_err(RequestProcessorError::Dal)?;
 
         let l1_batch_number = match l1_batch_number_result {
             Some(number) => number,
@@ -105,42 +76,50 @@ impl RequestProcessor {
             .get_l1_batch_header(l1_batch_number)
             .await
             .unwrap()
-            .expect(&format!("Missing header for {}", l1_batch_number));
+            .unwrap_or_else(|| panic!("Missing header for {}", l1_batch_number));
 
-        let protocol_version_id = header.protocol_version.unwrap();
-        let l1_verifier_config = self
+        let minor_version = header.protocol_version.unwrap();
+        let protocol_version = self
             .pool
             .connection()
             .await
             .unwrap()
             .protocol_versions_dal()
-            .l1_verifier_config_for_version(protocol_version_id)
+            .get_protocol_version_with_latest_patch(minor_version)
             .await
-            .expect(&format!(
-                "Missing l1 verifier info for protocol version {protocol_version_id:?}",
-            ));
+            .unwrap()
+            .unwrap_or_else(|| {
+                panic!("Missing l1 verifier info for protocol version {minor_version}")
+            });
 
-        let storage_batch = self
+        let batch_header = self
             .pool
             .connection()
             .await
             .unwrap()
             .blocks_dal()
-            .get_storage_l1_batch(l1_batch_number)
+            .get_l1_batch_header(l1_batch_number)
             .await
             .unwrap()
             .unwrap();
 
-        let eip_4844_blobs = Eip4844Blobs::decode(&storage_batch.pubdata_input.expect(&format!(
-            "expected pubdata, but it is not available for batch {l1_batch_number:?}"
-        )))
-        .expect("failed to decode EIP-4844 blobs");
+        let eip_4844_blobs = match self.commitment_mode {
+            L1BatchCommitmentMode::Validium => Eip4844Blobs::empty(),
+            L1BatchCommitmentMode::Rollup => {
+                let blobs = batch_header.pubdata_input.as_deref().unwrap_or_else(|| {
+                    panic!(
+                        "expected pubdata, but it is not available for batch {l1_batch_number:?}"
+                    )
+                });
+                Eip4844Blobs::decode(blobs).expect("failed to decode EIP-4844 blobs")
+            }
+        };
 
         let proof_gen_data = ProofGenerationData {
             l1_batch_number,
             data: blob,
-            protocol_version_id,
-            l1_verifier_config,
+            protocol_version: protocol_version.version,
+            l1_verifier_config: protocol_version.l1_verifier_config,
             eip_4844_blobs,
         };
         Ok(Json(ProofGenerationDataResponse::Success(Some(Box::new(
@@ -159,7 +138,7 @@ impl RequestProcessor {
             SubmitProofRequest::Proof(proof) => {
                 let blob_url = self
                     .blob_store
-                    .put(l1_batch_number, &*proof)
+                    .put((l1_batch_number, proof.protocol_version), &*proof)
                     .await
                     .map_err(RequestProcessorError::ObjectStore)?;
 
@@ -237,7 +216,7 @@ impl RequestProcessor {
                     .proof_generation_dal()
                     .save_proof_artifacts_metadata(l1_batch_number, &blob_url)
                     .await
-                    .map_err(RequestProcessorError::Sqlx)?;
+                    .map_err(RequestProcessorError::Dal)?;
             }
             SubmitProofRequest::SkippedProofGeneration => {
                 self.pool
@@ -247,7 +226,7 @@ impl RequestProcessor {
                     .proof_generation_dal()
                     .mark_proof_generation_job_as_skipped(l1_batch_number)
                     .await
-                    .map_err(RequestProcessorError::Sqlx)?;
+                    .map_err(RequestProcessorError::Dal)?;
             }
         }
 
diff --git a/core/node/proof_data_handler/src/tee_request_processor.rs b/core/node/proof_data_handler/src/tee_request_processor.rs
new file mode 100644
index 000000000000..243c9e06cfcc
--- /dev/null
+++ b/core/node/proof_data_handler/src/tee_request_processor.rs
@@ -0,0 +1,121 @@
+use std::sync::Arc;
+
+use axum::{extract::Path, Json};
+use zksync_config::configs::ProofDataHandlerConfig;
+use zksync_dal::{ConnectionPool, Core, CoreDal};
+use zksync_object_store::ObjectStore;
+use zksync_prover_interface::{
+    api::{
+        RegisterTeeAttestationRequest, RegisterTeeAttestationResponse, SubmitProofResponse,
+        SubmitTeeProofRequest, TeeProofGenerationDataRequest, TeeProofGenerationDataResponse,
+    },
+    inputs::TeeVerifierInput,
+};
+use zksync_types::L1BatchNumber;
+
+use crate::errors::RequestProcessorError;
+
+#[derive(Clone)]
+pub(crate) struct TeeRequestProcessor {
+    blob_store: Arc<dyn ObjectStore>,
+    pool: ConnectionPool<Core>,
+    config: ProofDataHandlerConfig,
+}
+
+impl TeeRequestProcessor {
+    pub(crate) fn new(
+        blob_store: Arc<dyn ObjectStore>,
+        pool: ConnectionPool<Core>,
+        config: ProofDataHandlerConfig,
+    ) -> Self {
+        Self {
+            blob_store,
+            pool,
+            config,
+        }
+    }
+
+    pub(crate) async fn get_proof_generation_data(
+        &self,
+        request: Json<TeeProofGenerationDataRequest>,
+    ) -> Result<Json<TeeProofGenerationDataResponse>, RequestProcessorError> {
+        tracing::info!("Received request for proof generation data: {:?}", request);
+
+        let mut connection = self
+            .pool
+            .connection()
+            .await
+            .map_err(RequestProcessorError::Dal)?;
+
+        let l1_batch_number_result = connection
+            .tee_proof_generation_dal()
+            .get_next_block_to_be_proven(self.config.proof_generation_timeout())
+            .await
+            .map_err(RequestProcessorError::Dal)?;
+        let l1_batch_number = match l1_batch_number_result {
+            Some(number) => number,
+            None => return Ok(Json(TeeProofGenerationDataResponse(None))),
+        };
+
+        let tee_verifier_input: TeeVerifierInput = self
+            .blob_store
+            .get(l1_batch_number)
+            .await
+            .map_err(RequestProcessorError::ObjectStore)?;
+
+        Ok(Json(TeeProofGenerationDataResponse(Some(Box::new(
+            tee_verifier_input,
+        )))))
+    }
+
+    pub(crate) async fn submit_proof(
+        &self,
+        Path(l1_batch_number): Path<u32>,
+        Json(proof): Json<SubmitTeeProofRequest>,
+    ) -> Result<Json<SubmitProofResponse>, RequestProcessorError> {
+        let l1_batch_number = L1BatchNumber(l1_batch_number);
+        let mut connection = self
+            .pool
+            .connection()
+            .await
+            .map_err(RequestProcessorError::Dal)?;
+        let mut dal = connection.tee_proof_generation_dal();
+
+        tracing::info!(
+            "Received proof {:?} for block number: {:?}",
+            proof,
+            l1_batch_number
+        );
+        dal.save_proof_artifacts_metadata(
+            l1_batch_number,
+            &proof.0.signature,
+            &proof.0.pubkey,
+            &proof.0.proof,
+            proof.0.tee_type,
+        )
+        .await
+        .map_err(RequestProcessorError::Dal)?;
+
+        Ok(Json(SubmitProofResponse::Success))
+    }
+
+    pub(crate) async fn register_tee_attestation(
+        &self,
+        Json(payload): Json<RegisterTeeAttestationRequest>,
+    ) -> Result<Json<RegisterTeeAttestationResponse>, RequestProcessorError> {
+        tracing::info!("Received attestation: {:?}", payload);
+
+        let mut connection = self
+            .pool
+            .connection()
+            .await
+            .map_err(RequestProcessorError::Dal)?;
+        let mut dal = connection.tee_proof_generation_dal();
+
+        dal.save_attestation(&payload.pubkey, &payload.attestation)
+            .await
+            .map_err(RequestProcessorError::Dal)?;
+
+        Ok(Json(RegisterTeeAttestationResponse::Success))
+    }
+}
diff --git a/core/node/proof_data_handler/src/tests.rs b/core/node/proof_data_handler/src/tests.rs
new file mode 100644
index 000000000000..a56bc9a59cb8
--- /dev/null
+++ b/core/node/proof_data_handler/src/tests.rs
@@ -0,0 +1,249 @@
+use std::time::Instant;
+
+use axum::{
+    body::Body,
+    http::{self, Method, Request, StatusCode},
+    response::Response,
+    Router,
+};
+use serde_json::json;
+use tower::ServiceExt;
+use zksync_basic_types::U256;
+use zksync_config::configs::ProofDataHandlerConfig;
+use zksync_contracts::{BaseSystemContracts, SystemContractCode};
+use zksync_dal::{ConnectionPool, CoreDal};
+use zksync_multivm::interface::{L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode};
+use zksync_object_store::MockObjectStore;
+use zksync_prover_interface::{
+    api::SubmitTeeProofRequest,
+    inputs::{PrepareBasicCircuitsJob, TeeVerifierInput, V1TeeVerifierInput},
+};
+use zksync_types::{commitment::L1BatchCommitmentMode, L1BatchNumber, H256};
+
+use crate::create_proof_processing_router;
+
+// Test the /tee/proof_inputs endpoint by:
+// 1. Mocking an object store with a single batch blob containing TEE verifier input
+// 2. Populating the SQL db with relevant information about the status of the TEE verifier input and
+//    TEE proof generation
+// 3. Sending a request to the /tee/proof_inputs endpoint and asserting that the response
+//    matches the file from the object store
+#[tokio::test]
+async fn request_tee_proof_inputs() {
+    // prepare a sample mocked TEE verifier input
+
+    let batch_number = L1BatchNumber::from(1);
+    let tvi = V1TeeVerifierInput::new(
+        PrepareBasicCircuitsJob::new(0),
+        vec![],
+        L1BatchEnv {
+            previous_batch_hash: Some(H256([1; 32])),
+            number: batch_number,
+            timestamp: 0,
+            fee_input: Default::default(),
+            fee_account: Default::default(),
+            enforced_base_fee: None,
+            first_l2_block: L2BlockEnv {
+                number: 0,
+                timestamp: 0,
+                prev_block_hash: H256([1; 32]),
+                max_virtual_blocks_to_create: 0,
+            },
+        },
+        SystemEnv {
+            zk_porter_available: false,
+            version: Default::default(),
+            base_system_smart_contracts: BaseSystemContracts {
+                bootloader: SystemContractCode {
+                    code: vec![U256([1; 4])],
+                    hash: H256([1; 32]),
+                },
+                default_aa: SystemContractCode {
+                    code: vec![U256([1; 4])],
+                    hash: H256([1; 32]),
+                },
+            },
+            bootloader_gas_limit: 0,
+            execution_mode: TxExecutionMode::VerifyExecute,
+            default_validation_computational_gas_limit: 0,
+            chain_id: Default::default(),
+        },
+        vec![(H256([1; 32]), vec![0, 1, 2, 3, 4])],
+    );
+    let tvi = TeeVerifierInput::V1(tvi);
+
+    // populate mocked object store with a single batch blob
+
+    let blob_store = MockObjectStore::arc();
+    let object_path = blob_store.put(batch_number, &tvi).await.unwrap();
+
+    // get connection to the SQL db and mock the status of the TEE proof generation
+
+    let db_conn_pool = ConnectionPool::test_pool().await;
+    mock_tee_batch_status(db_conn_pool.clone(), batch_number, &object_path).await;
+
+    // test the /tee/proof_inputs endpoint; it should return the batch from the object store
+
+    let app = create_proof_processing_router(
+        blob_store,
+        db_conn_pool,
+        ProofDataHandlerConfig {
+            http_port: 1337,
+            proof_generation_timeout_in_secs: 10,
+            tee_support: true,
+        },
+        L1BatchCommitmentMode::Rollup,
+    );
+    let req_body = Body::from(serde_json::to_vec(&json!({})).unwrap());
+    let response = app
+        .oneshot(
+            Request::builder()
+                .method(Method::POST)
+                .uri("/tee/proof_inputs")
+                .header(http::header::CONTENT_TYPE, "application/json")
+                .body(req_body)
+                .unwrap(),
+        )
+        .await
+        .unwrap();
+
+    assert_eq!(response.status(), StatusCode::OK);
+
+    let body = axum::body::to_bytes(response.into_body(), usize::MAX)
+        .await
+        .unwrap();
+    let json: serde_json::Value = serde_json::from_slice(&body).unwrap();
+    let deserialized: TeeVerifierInput = serde_json::from_value(json).unwrap();
+
+    assert_eq!(tvi, deserialized);
+}
+
+// Test /tee/submit_proofs endpoint using a mocked TEE proof and verify response and db state
+#[tokio::test]
+async fn submit_tee_proof() {
+    let blob_store = MockObjectStore::arc();
+    let db_conn_pool = ConnectionPool::test_pool().await;
+    let object_path = "mocked_object_path";
+    let batch_number = L1BatchNumber::from(1);
+
+    mock_tee_batch_status(db_conn_pool.clone(), batch_number, object_path).await;
+
+    // send a request to the /tee/submit_proofs endpoint, using a mocked TEE proof
+
+    let tee_proof_request_str = r#"{
+        "signature": [ 0, 1, 2, 3, 4 ],
+        "pubkey": [ 5, 6, 7, 8, 9 ],
+        "proof": [ 10, 11, 12, 13, 14 ],
+        "tee_type": "Sgx"
+    }"#;
+    let tee_proof_request =
+        serde_json::from_str::<SubmitTeeProofRequest>(tee_proof_request_str).unwrap();
+    let uri = format!("/tee/submit_proofs/{}", batch_number.0);
+    let app = create_proof_processing_router(
+        blob_store,
+        db_conn_pool.clone(),
+        ProofDataHandlerConfig {
+            http_port: 1337,
+            proof_generation_timeout_in_secs: 10,
+            tee_support: true,
+        },
+        L1BatchCommitmentMode::Rollup,
+    );
+
+    // this should fail because we haven't saved the attestation for the pubkey yet
+
+    let response = send_submit_tee_proof_request(&app, &uri, &tee_proof_request).await;
+    assert_eq!(response.status(), StatusCode::BAD_GATEWAY);
+
+    // save the attestation for the pubkey
+
+    let attestation = [15, 16, 17, 18, 19];
+    let mut proof_dal = db_conn_pool.connection().await.unwrap();
+    proof_dal
+        .tee_proof_generation_dal()
+        .save_attestation(&tee_proof_request.0.pubkey, &attestation)
+        .await
+        .expect("Failed to save attestation");
+
+    // resend the same request; this time, it should be successful.
+
+    let response = send_submit_tee_proof_request(&app, &uri, &tee_proof_request).await;
+    assert_eq!(response.status(), StatusCode::OK);
+
+    // there should not be any batches awaiting proof in the db anymore
+
+    let mut proof_db_conn = db_conn_pool.connection().await.unwrap();
+    let oldest_batch_number = proof_db_conn
+        .tee_proof_generation_dal()
+        .get_oldest_unpicked_batch()
+        .await
+        .unwrap();
+
+    assert!(oldest_batch_number.is_none());
+}
+
+// Mock SQL db with information about the status of the TEE proof generation
+async fn mock_tee_batch_status(
+    db_conn_pool: ConnectionPool<zksync_dal::Core>,
+    batch_number: L1BatchNumber,
+    object_path: &str,
+) {
+    let mut proof_db_conn = db_conn_pool.connection().await.unwrap();
+    let mut proof_dal = proof_db_conn.tee_proof_generation_dal();
+    let mut input_db_conn = db_conn_pool.connection().await.unwrap();
+    let mut input_producer_dal = input_db_conn.tee_verifier_input_producer_dal();
+
+    // there should not be any batches awaiting proof in the db yet
+
+    let oldest_batch_number = proof_dal.get_oldest_unpicked_batch().await.unwrap();
+    assert!(oldest_batch_number.is_none());
+
+    // mock SQL table with relevant information about the status of the TEE verifier input
+
+    input_producer_dal
+        .create_tee_verifier_input_producer_job(batch_number)
+        .await
+        .expect("Failed to create tee_verifier_input_producer_job");
+
+    // pretend that the TEE verifier input blob file was fetched successfully
+
+    input_producer_dal
+        .mark_job_as_successful(batch_number, Instant::now(), object_path)
+        .await
+        .expect("Failed to mark tee_verifier_input_producer_job job as successful");
+
+    // mock SQL table with relevant information about the status of TEE proof generation ('ready_to_be_proven')
+
+    proof_dal
+        .insert_tee_proof_generation_job(batch_number)
+        .await
+        .expect("Failed to insert tee_proof_generation_job");
+
+    // now, there should be one batch in the db awaiting proof
+
+    let oldest_batch_number = proof_dal
+        .get_oldest_unpicked_batch()
+        .await
+        .unwrap()
+        .unwrap();
+    assert_eq!(oldest_batch_number, batch_number);
+}
+
+async fn send_submit_tee_proof_request(
+    app: &Router,
+    uri: &str,
+    tee_proof_request: &SubmitTeeProofRequest,
+) -> Response {
+    let req_body = Body::from(serde_json::to_vec(tee_proof_request).unwrap());
+    app.clone()
+        .oneshot(
+            Request::builder()
+                .method(Method::POST)
+                .uri(uri)
+                .header(http::header::CONTENT_TYPE, "application/json")
+                .body(req_body)
+                .unwrap(),
+        )
+        .await
+        .unwrap()
+}
diff --git a/core/node/reorg_detector/Cargo.toml b/core/node/reorg_detector/Cargo.toml
new file mode 100644
index 000000000000..75e2eb3c0ece
--- /dev/null
+++ b/core/node/reorg_detector/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "zksync_reorg_detector"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_dal.workspace = true
+zksync_health_check.workspace = true
+zksync_shared_metrics.workspace = true
+zksync_types.workspace = true
+zksync_web3_decl.workspace = true
+
+anyhow.workspace = true
+async-trait.workspace = true
+tokio = { workspace = true, features = ["time"] }
+thiserror.workspace = true
+tracing.workspace = true
+serde_json.workspace = true
+
+[dev-dependencies]
+assert_matches.workspace = true
+test-casing.workspace = true
+
+zksync_node_genesis.workspace = true
+zksync_node_test_utils.workspace = true
diff --git a/core/node/reorg_detector/README.md b/core/node/reorg_detector/README.md
new file mode 100644
index 000000000000..9e8cadc7f5cb
--- /dev/null
+++ b/core/node/reorg_detector/README.md
@@ -0,0 +1,3 @@
+# `zksync_reorg_detector`
+
+A component to detect divergencies between local and remote instances of ZK Stack node.
diff --git a/core/lib/zksync_core/src/reorg_detector/mod.rs b/core/node/reorg_detector/src/lib.rs
similarity index 67%
rename from core/lib/zksync_core/src/reorg_detector/mod.rs
rename to core/node/reorg_detector/src/lib.rs
index 9561649c0c8c..5945b201c16c 100644
--- a/core/lib/zksync_core/src/reorg_detector/mod.rs
+++ b/core/node/reorg_detector/src/lib.rs
@@ -1,4 +1,4 @@
-use std::{fmt, time::Duration};
+use std::{fmt, future::Future, time::Duration};
 
 use anyhow::Context as _;
 use async_trait::async_trait;
@@ -8,26 +8,45 @@ use zksync_health_check::{Health, HealthStatus, HealthUpdater, ReactiveHealthChe
 use zksync_shared_metrics::{CheckerComponent, EN_METRICS};
 use zksync_types::{L1BatchNumber, L2BlockNumber, H256};
 use zksync_web3_decl::{
-    client::BoxedL2Client,
+    client::{DynClient, L2},
     error::{ClientRpcContext, EnrichedClientError, EnrichedClientResult},
     namespaces::{EthNamespaceClient, ZksNamespaceClient},
 };
 
-use crate::utils::binary_search_with;
-
 #[cfg(test)]
 mod tests;
 
+/// Data missing on the main node.
+#[derive(Debug, thiserror::Error)]
+#[cfg_attr(test, derive(Clone, Copy))] // deriving these traits for errors is usually a bad idea, so we scope derivation to tests
+pub enum MissingData {
+    /// The main node lacks a requested L2 block.
+    #[error("no requested L2 block")]
+    L2Block,
+    /// The main node lacks a requested L1 batch.
+    #[error("no requested L1 batch")]
+    Batch,
+    /// The main node lacks a root hash for a requested L1 batch; the batch itself is present on the node.
+    #[error("no root hash for L1 batch")]
+    RootHash,
+}
+
 #[derive(Debug, thiserror::Error)]
 pub enum HashMatchError {
     #[error("RPC error calling main node")]
     Rpc(#[from] EnrichedClientError),
-    #[error("remote hash is missing")]
-    RemoteHashMissing,
+    #[error("missing data on main node")]
+    MissingData(#[from] MissingData),
     #[error(transparent)]
     Internal(#[from] anyhow::Error),
 }
 
+impl From<DalError> for HashMatchError {
+    fn from(err: DalError) -> Self {
+        Self::Internal(err.generalize())
+    }
+}
+
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error(transparent)]
@@ -54,7 +73,7 @@ impl HashMatchError {
     pub fn is_transient(&self) -> bool {
         match self {
             Self::Rpc(err) => err.is_transient(),
-            Self::RemoteHashMissing => true,
+            Self::MissingData(_) => true,
             Self::Internal(_) => false,
         }
     }
@@ -72,6 +91,12 @@ impl From<anyhow::Error> for Error {
     }
 }
 
+impl From<DalError> for Error {
+    fn from(err: DalError) -> Self {
+        Self::HashMatch(HashMatchError::Internal(err.generalize()))
+    }
+}
+
 impl From<EnrichedClientError> for Error {
     fn from(err: EnrichedClientError) -> Self {
         Self::HashMatch(HashMatchError::Rpc(err))
@@ -86,12 +111,14 @@ trait MainNodeClient: fmt::Debug + Send + Sync {
 
     async fn l2_block_hash(&self, number: L2BlockNumber) -> EnrichedClientResult<Option<H256>>;
 
-    async fn l1_batch_root_hash(&self, number: L1BatchNumber)
-        -> EnrichedClientResult<Option<H256>>;
+    async fn l1_batch_root_hash(
+        &self,
+        number: L1BatchNumber,
+    ) -> EnrichedClientResult<Result<H256, MissingData>>;
 }
 
 #[async_trait]
-impl MainNodeClient for BoxedL2Client {
+impl MainNodeClient for Box<DynClient<L2>> {
     async fn sealed_l2_block_number(&self) -> EnrichedClientResult<L2BlockNumber> {
         let number = self
             .get_block_number()
@@ -126,13 +153,16 @@ impl MainNodeClient for BoxedL2Client {
     async fn l1_batch_root_hash(
         &self,
         number: L1BatchNumber,
-    ) -> EnrichedClientResult<Option<H256>> {
-        Ok(self
+    ) -> EnrichedClientResult<Result<H256, MissingData>> {
+        let Some(batch) = self
             .get_l1_batch_details(number)
             .rpc_context("l1_batch_root_hash")
             .with_arg("number", &number)
             .await?
-            .and_then(|batch| batch.base.root_hash))
+        else {
+            return Ok(Err(MissingData::Batch));
+        };
+        Ok(batch.base.root_hash.ok_or(MissingData::RootHash))
     }
 }
 
@@ -221,7 +251,7 @@ pub struct ReorgDetector {
 impl ReorgDetector {
     const DEFAULT_SLEEP_INTERVAL: Duration = Duration::from_secs(5);
 
-    pub fn new(client: BoxedL2Client, pool: ConnectionPool<Core>) -> Self {
+    pub fn new(client: Box<DynClient<L2>>, pool: ConnectionPool<Core>) -> Self {
         let (health_check, health_updater) = ReactiveHealthCheck::new("reorg_detector");
         Self {
             client: Box::new(client.for_component("reorg_detector")),
@@ -236,24 +266,16 @@ impl ReorgDetector {
         &self.health_check
     }
 
-    /// Returns `Ok(())` if no reorg was detected.
-    /// Returns `Err::ReorgDetected()` if a reorg was detected.
-    pub async fn check_consistency(&mut self) -> Result<(), Error> {
-        let mut storage = self.pool.connection().await.context("connection()")?;
+    async fn check_consistency(&mut self) -> Result<(), Error> {
+        let mut storage = self.pool.connection().await?;
         let Some(local_l1_batch) = storage
             .blocks_dal()
-            .get_last_l1_batch_number_with_metadata()
-            .await
-            .map_err(DalError::generalize)?
+            .get_last_l1_batch_number_with_tree_data()
+            .await?
         else {
             return Ok(());
         };
-        let Some(local_l2_block) = storage
-            .blocks_dal()
-            .get_sealed_l2_block_number()
-            .await
-            .map_err(DalError::generalize)?
-        else {
+        let Some(local_l2_block) = storage.blocks_dal().get_sealed_l2_block_number().await? else {
             return Ok(());
         };
         drop(storage);
@@ -283,18 +305,17 @@ impl ReorgDetector {
 
         // Check that the first L1 batch matches, to make sure that
         // we are actually tracking the same chain as the main node.
-        let mut storage = self.pool.connection().await.context("connection()")?;
+        let mut storage = self.pool.connection().await?;
         let first_l1_batch = storage
             .blocks_dal()
             .get_earliest_l1_batch_number_with_metadata()
-            .await
-            .map_err(DalError::generalize)?
+            .await?
             .context("all L1 batches disappeared")?;
         drop(storage);
         match self.root_hashes_match(first_l1_batch).await {
             Ok(true) => {}
             Ok(false) => return Err(Error::EarliestL1BatchMismatch(first_l1_batch)),
-            Err(HashMatchError::RemoteHashMissing) => {
+            Err(HashMatchError::MissingData(_)) => {
                 return Err(Error::EarliestL1BatchTruncated(first_l1_batch));
             }
             Err(err) => return Err(err.into()),
@@ -308,12 +329,11 @@ impl ReorgDetector {
 
     /// Compares hashes of the given local L2 block and the same L2 block from main node.
     async fn l2_block_hashes_match(&self, l2_block: L2BlockNumber) -> Result<bool, HashMatchError> {
-        let mut storage = self.pool.connection().await.context("connection()")?;
+        let mut storage = self.pool.connection().await?;
         let local_hash = storage
             .blocks_dal()
             .get_l2_block_header(l2_block)
-            .await
-            .map_err(DalError::generalize)?
+            .await?
             .with_context(|| format!("Header does not exist for local L2 block #{l2_block}"))?
             .hash;
         drop(storage);
@@ -323,7 +343,7 @@ impl ReorgDetector {
             // Lack of the hash on the main node is treated as a hash match,
             // We need to wait for our knowledge of main node to catch up.
             tracing::info!("Remote L2 block #{l2_block} is missing");
-            return Err(HashMatchError::RemoteHashMissing);
+            return Err(MissingData::L2Block.into());
         };
 
         if remote_hash != local_hash {
@@ -337,20 +357,15 @@ impl ReorgDetector {
 
     /// Compares root hashes of the latest local batch and of the same batch from the main node.
     async fn root_hashes_match(&self, l1_batch: L1BatchNumber) -> Result<bool, HashMatchError> {
-        let mut storage = self.pool.connection().await.context("connection()")?;
+        let mut storage = self.pool.connection().await?;
         let local_hash = storage
             .blocks_dal()
             .get_l1_batch_state_root(l1_batch)
-            .await
-            .map_err(DalError::generalize)?
+            .await?
             .with_context(|| format!("Root hash does not exist for local batch #{l1_batch}"))?;
         drop(storage);
 
-        let Some(remote_hash) = self.client.l1_batch_root_hash(l1_batch).await? else {
-            tracing::info!("Remote L1 batch #{l1_batch} is missing");
-            return Err(HashMatchError::RemoteHashMissing);
-        };
-
+        let remote_hash = self.client.l1_batch_root_hash(l1_batch).await??;
         if remote_hash != local_hash {
             tracing::warn!(
                 "Reorg detected: local root hash {local_hash:?} doesn't match the state hash from \
@@ -360,7 +375,34 @@ impl ReorgDetector {
         Ok(remote_hash == local_hash)
     }
 
-    /// Localizes a re-org: performs binary search to determine the last non-diverged block.
+    /// Because the node can fetch L1 batch root hash from an external source using the tree data fetcher, there's no strict guarantee
+    /// that L1 batch root hashes can necessarily be binary searched on their own (i.e., that there exists N such that root hashes of the first N batches match
+    /// on the main node and this node, and root hashes of L1 batches N + 1, N + 2, ... diverge). The tree data fetcher makes a reasonable attempt
+    /// to detect a reorg and to not persist root hashes for diverging L1 batches, but we don't trust this logic to work in all cases (yet?).
+    ///
+    /// Hence, we perform binary search both by L1 root hashes and the last L2 block hash in the batch; unlike L1 batches, L2 block hashes are *always* fully computed
+    /// based only on data locally processed by the node. Additionally, an L2 block hash of the last block in a batch encompasses a reasonably large part of L1 batch contents.
+    async fn root_hashes_and_contents_match(
+        &self,
+        l1_batch: L1BatchNumber,
+    ) -> Result<bool, HashMatchError> {
+        let root_hashes_match = self.root_hashes_match(l1_batch).await?;
+        if !root_hashes_match {
+            return Ok(false);
+        }
+
+        let mut storage = self.pool.connection().await?;
+        let (_, last_l2_block_in_batch) = storage
+            .blocks_dal()
+            .get_l2_block_range_of_l1_batch(l1_batch)
+            .await?
+            .with_context(|| format!("L1 batch #{l1_batch} does not have L2 blocks"))?;
+        drop(storage);
+
+        self.l2_block_hashes_match(last_l2_block_in_batch).await
+    }
+
+    /// Localizes a re-org: performs binary search to determine the last non-diverged L1 batch.
     async fn detect_reorg(
         &self,
         known_valid_l1_batch: L1BatchNumber,
@@ -372,8 +414,11 @@ impl ReorgDetector {
             known_valid_l1_batch.0,
             diverged_l1_batch.0,
             |number| async move {
-                match self.root_hashes_match(L1BatchNumber(number)).await {
-                    Err(HashMatchError::RemoteHashMissing) => Ok(true),
+                match self
+                    .root_hashes_and_contents_match(L1BatchNumber(number))
+                    .await
+                {
+                    Err(HashMatchError::MissingData(_)) => Ok(true),
                     res => res,
                 }
             },
@@ -382,19 +427,49 @@ impl ReorgDetector {
         .map(L1BatchNumber)
     }
 
-    pub async fn run(mut self, mut stop_receiver: watch::Receiver<bool>) -> Result<(), Error> {
+    /// Runs this detector *once* checking whether there is a reorg. This method will return:
+    ///
+    /// - `Ok(())` if there is no reorg, or if a stop signal is received.
+    /// - `Err(ReorgDetected(_))` if a reorg was detected.
+    /// - `Err(_)` for fatal errors.
+    ///
+    /// Transient errors are retried indefinitely accounting for a stop signal.
+    pub async fn run_once(&mut self, stop_receiver: watch::Receiver<bool>) -> Result<(), Error> {
+        self.run_inner(true, stop_receiver).await
+    }
+
+    /// Runs this detector continuously checking for a reorg until a fatal error occurs (including if a reorg is detected),
+    /// or a stop signal is received.
+    pub async fn run(mut self, stop_receiver: watch::Receiver<bool>) -> Result<(), Error> {
         self.event_handler.initialize();
+        self.run_inner(false, stop_receiver).await?;
+        self.event_handler.start_shutting_down();
+        tracing::info!("Shutting down reorg detector");
+        Ok(())
+    }
+
+    async fn run_inner(
+        &mut self,
+        stop_after_success: bool,
+        mut stop_receiver: watch::Receiver<bool>,
+    ) -> Result<(), Error> {
         while !*stop_receiver.borrow_and_update() {
-            match self.check_consistency().await {
+            let sleep_interval = match self.check_consistency().await {
+                Err(Error::HashMatch(HashMatchError::MissingData(MissingData::RootHash))) => {
+                    tracing::debug!("Last L1 batch on the main node doesn't have a state root hash; waiting until it is computed");
+                    self.sleep_interval / 10
+                }
                 Err(err) if err.is_transient() => {
                     tracing::warn!("Following transient error occurred: {err}");
                     tracing::info!("Trying again after a delay");
+                    self.sleep_interval
                 }
                 Err(err) => return Err(err),
-                Ok(()) => {}
-            }
+                Ok(()) if stop_after_success => return Ok(()),
+                Ok(()) => self.sleep_interval,
+            };
 
-            if tokio::time::timeout(self.sleep_interval, stop_receiver.changed())
+            if tokio::time::timeout(sleep_interval, stop_receiver.changed())
                 .await
                 .is_ok()
             {
@@ -403,8 +478,44 @@ impl ReorgDetector {
                 break;
             }
         }
-        self.event_handler.start_shutting_down();
-        tracing::info!("Shutting down reorg detector");
         Ok(())
     }
 }
+
+/// Fallible and async predicate for binary search.
+#[async_trait]
+trait BinarySearchPredicate: Send {
+    type Error;
+
+    async fn eval(&mut self, argument: u32) -> Result<bool, Self::Error>;
+}
+
+#[async_trait]
+impl<F, Fut, E> BinarySearchPredicate for F
+where
+    F: Send + FnMut(u32) -> Fut,
+    Fut: Send + Future<Output = Result<bool, E>>,
+{
+    type Error = E;
+
+    async fn eval(&mut self, argument: u32) -> Result<bool, Self::Error> {
+        self(argument).await
+    }
+}
+
+/// Finds the greatest `u32` value for which `f` returns `true`.
+async fn binary_search_with<P: BinarySearchPredicate>(
+    mut left: u32,
+    mut right: u32,
+    mut predicate: P,
+) -> Result<u32, P::Error> {
+    while left + 1 < right {
+        let middle = (left + right) / 2;
+        if predicate.eval(middle).await? {
+            left = middle;
+        } else {
+            right = middle;
+        }
+    }
+    Ok(left)
+}
diff --git a/core/lib/zksync_core/src/reorg_detector/tests.rs b/core/node/reorg_detector/src/tests.rs
similarity index 73%
rename from core/lib/zksync_core/src/reorg_detector/tests.rs
rename to core/node/reorg_detector/src/tests.rs
index 011ab62bcd99..c90a3a0592c7 100644
--- a/core/lib/zksync_core/src/reorg_detector/tests.rs
+++ b/core/node/reorg_detector/src/tests.rs
@@ -2,7 +2,10 @@
 
 use std::{
     collections::BTreeMap,
-    sync::{Arc, Mutex},
+    sync::{
+        atomic::{AtomicUsize, Ordering},
+        Arc, Mutex,
+    },
 };
 
 use assert_matches::assert_matches;
@@ -19,6 +22,15 @@ use zksync_web3_decl::jsonrpsee::core::ClientError as RpcError;
 
 use super::*;
 
+#[tokio::test]
+async fn test_binary_search() {
+    for divergence_point in [1, 50, 51, 100] {
+        let mut f = |x| async move { Ok::<_, ()>(x < divergence_point) };
+        let result = binary_search_with(0, 100, &mut f).await;
+        assert_eq!(result, Ok(divergence_point - 1));
+    }
+}
+
 async fn store_l2_block(storage: &mut Connection<'_, Core>, number: u32, hash: H256) {
     let header = L2BlockHeader {
         hash,
@@ -74,7 +86,7 @@ impl From<RpcErrorKind> for RpcError {
 #[derive(Debug, Default)]
 struct MockMainNodeClient {
     l2_block_hashes: BTreeMap<L2BlockNumber, H256>,
-    l1_batch_root_hashes: BTreeMap<L1BatchNumber, H256>,
+    l1_batch_root_hashes: BTreeMap<L1BatchNumber, Result<H256, MissingData>>,
     error_kind: Arc<Mutex<Option<RpcErrorKind>>>,
 }
 
@@ -116,10 +128,11 @@ impl MainNodeClient for MockMainNodeClient {
     async fn l1_batch_root_hash(
         &self,
         number: L1BatchNumber,
-    ) -> EnrichedClientResult<Option<H256>> {
+    ) -> EnrichedClientResult<Result<H256, MissingData>> {
         self.check_error("l1_batch_root_hash")
             .map_err(|err| err.with_arg("number", &number))?;
-        Ok(self.l1_batch_root_hashes.get(&number).copied())
+        let state_hash = self.l1_batch_root_hashes.get(&number).copied();
+        Ok(state_hash.unwrap_or(Err(MissingData::Batch)))
     }
 }
 
@@ -146,7 +159,10 @@ impl HandleReorgDetectorEvent for mpsc::UnboundedSender<(L2BlockNumber, L1BatchN
     }
 }
 
-fn create_mock_detector(client: MockMainNodeClient, pool: ConnectionPool<Core>) -> ReorgDetector {
+fn create_mock_detector(
+    client: impl MainNodeClient + 'static,
+    pool: ConnectionPool<Core>,
+) -> ReorgDetector {
     let (health_check, health_updater) = ReactiveHealthCheck::new("reorg_detector");
     ReorgDetector {
         client: Box::new(client),
@@ -179,7 +195,7 @@ async fn normal_reorg_function(snapshot_recovery: bool, with_transient_errors: b
         );
         client
             .l1_batch_root_hashes
-            .insert(L1BatchNumber(0), genesis_batch.root_hash);
+            .insert(L1BatchNumber(0), Ok(genesis_batch.root_hash));
     }
 
     let l1_batch_numbers = if snapshot_recovery {
@@ -198,7 +214,7 @@ async fn normal_reorg_function(snapshot_recovery: bool, with_transient_errors: b
             let l1_batch_hash = H256::repeat_byte(number as u8);
             client
                 .l1_batch_root_hashes
-                .insert(L1BatchNumber(number), l1_batch_hash);
+                .insert(L1BatchNumber(number), Ok(l1_batch_hash));
             (number, l2_block_hash, l1_batch_hash)
         })
         .collect();
@@ -273,7 +289,7 @@ async fn reorg_is_detected_on_batch_hash_mismatch() {
     );
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(0), genesis_batch.root_hash);
+        .insert(L1BatchNumber(0), Ok(genesis_batch.root_hash));
 
     let l2_block_hash = H256::from_low_u64_be(23);
     client
@@ -281,13 +297,13 @@ async fn reorg_is_detected_on_batch_hash_mismatch() {
         .insert(L2BlockNumber(1), l2_block_hash);
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(1), H256::repeat_byte(1));
+        .insert(L1BatchNumber(1), Ok(H256::repeat_byte(1)));
     client
         .l2_block_hashes
         .insert(L2BlockNumber(2), l2_block_hash);
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(2), H256::repeat_byte(2));
+        .insert(L1BatchNumber(2), Ok(H256::repeat_byte(2)));
 
     let mut detector = create_mock_detector(client, pool.clone());
 
@@ -318,7 +334,7 @@ async fn reorg_is_detected_on_l2_block_hash_mismatch() {
     );
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(0), genesis_batch.root_hash);
+        .insert(L1BatchNumber(0), Ok(genesis_batch.root_hash));
 
     let l2_block_hash = H256::from_low_u64_be(23);
     client
@@ -326,7 +342,7 @@ async fn reorg_is_detected_on_l2_block_hash_mismatch() {
         .insert(L2BlockNumber(1), l2_block_hash);
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(1), H256::repeat_byte(1));
+        .insert(L1BatchNumber(1), Ok(H256::repeat_byte(1)));
     client
         .l2_block_hashes
         .insert(L2BlockNumber(2), l2_block_hash);
@@ -394,7 +410,7 @@ async fn reorg_is_detected_on_historic_batch_hash_mismatch(
         .insert(L2BlockNumber(earliest_l1_batch_number), H256::zero());
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(earliest_l1_batch_number), H256::zero());
+        .insert(L1BatchNumber(earliest_l1_batch_number), Ok(H256::zero()));
 
     let l2_block_and_l1_batch_hashes = l1_batch_numbers.clone().map(|number| {
         let mut l2_block_hash = H256::from_low_u64_be(number.into());
@@ -404,7 +420,7 @@ async fn reorg_is_detected_on_historic_batch_hash_mismatch(
         let mut l1_batch_hash = H256::repeat_byte(number as u8);
         client
             .l1_batch_root_hashes
-            .insert(L1BatchNumber(number), l1_batch_hash);
+            .insert(L1BatchNumber(number), Ok(l1_batch_hash));
 
         if number > last_correct_batch {
             l2_block_hash = H256::zero();
@@ -480,7 +496,7 @@ async fn detector_errors_on_earliest_batch_hash_mismatch() {
     let mut client = MockMainNodeClient::default();
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(0), H256::zero());
+        .insert(L1BatchNumber(0), Ok(H256::zero()));
     client
         .l2_block_hashes
         .insert(L2BlockNumber(0), H256::zero());
@@ -498,7 +514,7 @@ async fn detector_errors_on_earliest_batch_hash_mismatch_with_snapshot_recovery(
     let mut client = MockMainNodeClient::default();
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(3), H256::zero());
+        .insert(L1BatchNumber(3), Ok(H256::zero()));
     client
         .l2_block_hashes
         .insert(L2BlockNumber(3), H256::zero());
@@ -539,21 +555,21 @@ async fn reorg_is_detected_without_waiting_for_main_node_to_catch_up() {
     let mut client = MockMainNodeClient::default();
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(0), genesis_batch.root_hash);
+        .insert(L1BatchNumber(0), Ok(genesis_batch.root_hash));
     for number in 1..3 {
         client
             .l2_block_hashes
             .insert(L2BlockNumber(number), H256::zero());
         client
             .l1_batch_root_hashes
-            .insert(L1BatchNumber(number), H256::zero());
+            .insert(L1BatchNumber(number), Ok(H256::zero()));
     }
     client
         .l2_block_hashes
         .insert(L2BlockNumber(3), H256::zero());
     client
         .l1_batch_root_hashes
-        .insert(L1BatchNumber(3), H256::repeat_byte(0xff));
+        .insert(L1BatchNumber(3), Ok(H256::repeat_byte(0xff)));
 
     let mut detector = create_mock_detector(client, pool);
     assert_matches!(
@@ -561,3 +577,143 @@ async fn reorg_is_detected_without_waiting_for_main_node_to_catch_up() {
         Err(Error::ReorgDetected(L1BatchNumber(2)))
     );
 }
+
+/// Tests the worst-case scenario w.r.t. L1 batch root hashes: *all* root hashes match locally and on the main node, only L2 block hashes diverge.
+#[test_casing(3, [2, 5, 8])]
+#[tokio::test]
+async fn reorg_is_detected_based_on_l2_block_hashes(last_correct_l1_batch: u32) {
+    const L1_BATCH_COUNT: u32 = 10;
+
+    assert!(last_correct_l1_batch < L1_BATCH_COUNT);
+
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    let genesis_batch = insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+
+    let mut client = MockMainNodeClient::default();
+    client
+        .l1_batch_root_hashes
+        .insert(L1BatchNumber(0), Ok(genesis_batch.root_hash));
+    for number in 1..L1_BATCH_COUNT {
+        let l2_block_hash = H256::from_low_u64_le(number.into());
+        store_l2_block(&mut storage, number, l2_block_hash).await;
+        let remote_l2_block_hash = if number <= last_correct_l1_batch {
+            l2_block_hash
+        } else {
+            H256::zero()
+        };
+        client
+            .l2_block_hashes
+            .insert(L2BlockNumber(number), remote_l2_block_hash);
+
+        let l1_batch_root_hash = H256::from_low_u64_be(number.into());
+        seal_l1_batch(&mut storage, number, l1_batch_root_hash).await;
+        client
+            .l1_batch_root_hashes
+            .insert(L1BatchNumber(number), Ok(l1_batch_root_hash));
+    }
+    drop(storage);
+
+    let mut detector = create_mock_detector(client, pool);
+    assert_matches!(
+        detector.check_consistency().await,
+        Err(Error::ReorgDetected(L1BatchNumber(num))) if num == last_correct_l1_batch
+    );
+}
+
+#[derive(Debug)]
+struct SlowMainNode {
+    l1_batch_root_hash_call_count: Arc<AtomicUsize>,
+    delay_call_count: usize,
+    genesis_root_hash: H256,
+}
+
+impl SlowMainNode {
+    fn new(genesis_root_hash: H256, delay_call_count: usize) -> Self {
+        Self {
+            l1_batch_root_hash_call_count: Arc::default(),
+            delay_call_count,
+            genesis_root_hash,
+        }
+    }
+}
+
+#[async_trait]
+impl MainNodeClient for SlowMainNode {
+    async fn sealed_l2_block_number(&self) -> EnrichedClientResult<L2BlockNumber> {
+        Ok(L2BlockNumber(0))
+    }
+
+    async fn sealed_l1_batch_number(&self) -> EnrichedClientResult<L1BatchNumber> {
+        Ok(L1BatchNumber(0))
+    }
+
+    async fn l2_block_hash(&self, number: L2BlockNumber) -> EnrichedClientResult<Option<H256>> {
+        Ok(if number == L2BlockNumber(0) {
+            Some(L2BlockHasher::legacy_hash(L2BlockNumber(0)))
+        } else {
+            None
+        })
+    }
+
+    async fn l1_batch_root_hash(
+        &self,
+        number: L1BatchNumber,
+    ) -> EnrichedClientResult<Result<H256, MissingData>> {
+        if number > L1BatchNumber(0) {
+            return Ok(Err(MissingData::Batch));
+        }
+        let count = self
+            .l1_batch_root_hash_call_count
+            .fetch_add(1, Ordering::Relaxed);
+        Ok(if count >= self.delay_call_count {
+            Ok(self.genesis_root_hash)
+        } else {
+            Err(MissingData::RootHash)
+        })
+    }
+}
+
+#[tokio::test]
+async fn detector_waits_for_state_hash_on_main_node() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    let genesis_batch = insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+    drop(storage);
+
+    let client = SlowMainNode::new(genesis_batch.root_hash, 5);
+    let l1_batch_root_hash_call_count = client.l1_batch_root_hash_call_count.clone();
+    let mut detector = create_mock_detector(client, pool);
+    let (_stop_sender, stop_receiver) = watch::channel(false);
+    detector.run_once(stop_receiver).await.unwrap();
+
+    let call_count = l1_batch_root_hash_call_count.load(Ordering::Relaxed);
+    assert!(call_count >= 5, "{call_count}");
+}
+
+#[tokio::test]
+async fn detector_does_not_deadlock_if_main_node_is_not_available() {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let mut storage = pool.connection().await.unwrap();
+    insert_genesis_batch(&mut storage, &GenesisParams::mock())
+        .await
+        .unwrap();
+    drop(storage);
+
+    // `client` will always return transient errors making the detector to retry its checks indefinitely
+    let client = MockMainNodeClient::default();
+    *client.error_kind.lock().unwrap() = Some(RpcErrorKind::Transient);
+    let mut detector = create_mock_detector(client, pool);
+    let (stop_sender, stop_receiver) = watch::channel(false);
+
+    let detector_handle = tokio::spawn(async move { detector.run_once(stop_receiver).await });
+    tokio::time::sleep(Duration::from_millis(20)).await;
+    assert!(!detector_handle.is_finished());
+
+    stop_sender.send_replace(true);
+    detector_handle.await.unwrap().unwrap();
+}
diff --git a/core/node/shared_metrics/Cargo.toml b/core/node/shared_metrics/Cargo.toml
index 5ba0ebfbfca1..5fbbf16a2ec7 100644
--- a/core/node/shared_metrics/Cargo.toml
+++ b/core/node/shared_metrics/Cargo.toml
@@ -9,8 +9,11 @@ license.workspace = true
 keywords.workspace = true
 categories.workspace = true
 
-
 [dependencies]
 vise.workspace = true
+tracing.workspace = true
 zksync_types.workspace = true
 zksync_dal.workspace = true
+
+[build-dependencies]
+rustc_version.workspace = true
diff --git a/core/node/shared_metrics/README.md b/core/node/shared_metrics/README.md
index 45aa229f808a..e60cf9176369 100644
--- a/core/node/shared_metrics/README.md
+++ b/core/node/shared_metrics/README.md
@@ -1,3 +1,3 @@
-# zkSync Era shared metrics
+# ZKsync Era shared metrics
 
-This crate contains the definitions of various metrics that are shared among different zkSync Era components.
+This crate contains the definitions of various metrics that are shared among different ZKsync Era components.
diff --git a/core/bin/external_node/build.rs b/core/node/shared_metrics/build.rs
similarity index 100%
rename from core/bin/external_node/build.rs
rename to core/node/shared_metrics/build.rs
diff --git a/core/node/shared_metrics/src/lib.rs b/core/node/shared_metrics/src/lib.rs
index 7673b3c0bba1..e0a7fa74ef42 100644
--- a/core/node/shared_metrics/src/lib.rs
+++ b/core/node/shared_metrics/src/lib.rs
@@ -8,6 +8,8 @@ use vise::{
 use zksync_dal::transactions_dal::L2TxSubmissionResult;
 use zksync_types::aggregated_operations::AggregatedActionType;
 
+pub mod rustc;
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
 #[metrics(label = "stage", rename_all = "snake_case")]
 pub enum SnapshotRecoveryStage {
@@ -27,7 +29,9 @@ pub enum InitStage {
     EthTxAggregator,
     EthTxManager,
     Tree,
+    TeeVerifierInputProducer,
     Consensus,
+    DADispatcher,
 }
 
 impl fmt::Display for InitStage {
@@ -41,7 +45,9 @@ impl fmt::Display for InitStage {
             Self::EthTxAggregator => formatter.write_str("eth_tx_aggregator"),
             Self::EthTxManager => formatter.write_str("eth_tx_manager"),
             Self::Tree => formatter.write_str("tree"),
+            Self::TeeVerifierInputProducer => formatter.write_str("tee_verifier_input_producer"),
             Self::Consensus => formatter.write_str("consensus"),
+            Self::DADispatcher => formatter.write_str("da_dispatcher"),
         }
     }
 }
diff --git a/core/node/shared_metrics/src/rustc.rs b/core/node/shared_metrics/src/rustc.rs
new file mode 100644
index 000000000000..11165dbf51b0
--- /dev/null
+++ b/core/node/shared_metrics/src/rustc.rs
@@ -0,0 +1,36 @@
+use vise::{EncodeLabelSet, Info, Metrics};
+
+mod values {
+    use super::RustcMetadata;
+    include!(concat!(env!("OUT_DIR"), "/metadata_values.rs"));
+}
+
+use values::RUSTC_METADATA;
+
+/// Metadata of Rust compiler used to compile the crate.
+#[derive(Debug, EncodeLabelSet)]
+pub struct RustcMetadata {
+    pub version: &'static str,
+    pub commit_hash: Option<&'static str>,
+    pub commit_date: Option<&'static str>,
+    pub channel: &'static str,
+    pub host: &'static str,
+    pub llvm: Option<&'static str>,
+}
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "rust")]
+pub struct RustMetrics {
+    /// General information about the Rust compiler.
+    info: Info<RustcMetadata>,
+}
+
+impl RustMetrics {
+    pub fn initialize(&self) {
+        tracing::info!("Metadata for rustc that this binary was compiled with: {RUSTC_METADATA:?}");
+        self.info.set(RUSTC_METADATA).ok();
+    }
+}
+
+#[vise::register]
+pub static RUST_METRICS: vise::Global<RustMetrics> = vise::Global::new();
diff --git a/core/node/state_keeper/Cargo.toml b/core/node/state_keeper/Cargo.toml
new file mode 100644
index 000000000000..9a662affb945
--- /dev/null
+++ b/core/node/state_keeper/Cargo.toml
@@ -0,0 +1,50 @@
+[package]
+name = "zksync_state_keeper"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+
+[dependencies]
+vise.workspace = true
+zksync_multivm.workspace = true
+zksync_types.workspace = true
+zksync_dal.workspace = true
+zksync_state.workspace = true
+zksync_storage.workspace = true
+zksync_mempool.workspace = true
+zksync_shared_metrics.workspace = true
+zksync_config.workspace = true
+zksync_node_fee_model.workspace = true
+zksync_utils.workspace = true
+zksync_contracts.workspace = true
+zksync_protobuf.workspace = true
+zksync_test_account.workspace = true
+zksync_node_genesis.workspace = true
+zksync_node_test_utils.workspace = true
+zksync_vm_utils.workspace = true
+zksync_base_token_adjuster.workspace = true
+
+anyhow.workspace = true
+async-trait.workspace = true
+tokio = { workspace = true, features = ["time"] }
+thiserror.workspace = true
+tracing.workspace = true
+futures.workspace = true
+once_cell.workspace = true
+itertools.workspace = true
+hex.workspace = true
+
+[dev-dependencies]
+assert_matches.workspace = true
+test-casing.workspace = true
+futures.workspace = true
+tempfile.workspace = true
+
+zksync_eth_client.workspace = true
+zksync_system_constants.workspace = true
diff --git a/core/node/state_keeper/README.md b/core/node/state_keeper/README.md
new file mode 100644
index 000000000000..db6f87a76cc2
--- /dev/null
+++ b/core/node/state_keeper/README.md
@@ -0,0 +1,5 @@
+# `zksync_state_keeper`
+
+State keeper is the main component of the sequencer implementation. Its main responsibility is to extract transactions
+from a certain source (like mempool), form them into a set of L2 blocks and L1 batches, and pass for persisting and
+further processing.
diff --git a/core/lib/zksync_core/src/state_keeper/batch_executor/main_executor.rs b/core/node/state_keeper/src/batch_executor/main_executor.rs
similarity index 88%
rename from core/lib/zksync_core/src/state_keeper/batch_executor/main_executor.rs
rename to core/node/state_keeper/src/batch_executor/main_executor.rs
index 1d0c3b203b1f..5bbd9f7c3a52 100644
--- a/core/lib/zksync_core/src/state_keeper/batch_executor/main_executor.rs
+++ b/core/node/state_keeper/src/batch_executor/main_executor.rs
@@ -1,7 +1,13 @@
 use std::sync::Arc;
 
+use anyhow::Context as _;
 use async_trait::async_trait;
-use multivm::{
+use once_cell::sync::OnceCell;
+use tokio::{
+    runtime::Handle,
+    sync::{mpsc, watch},
+};
+use zksync_multivm::{
     interface::{
         ExecutionResult, FinishedL1Batch, Halt, L1BatchEnv, L2BlockEnv, SystemEnv,
         VmExecutionResultAndLogs, VmInterface, VmInterfaceHistoryEnabled,
@@ -10,18 +16,13 @@ use multivm::{
     vm_latest::HistoryEnabled,
     MultiVMTracer, VmInstance,
 };
-use once_cell::sync::OnceCell;
-use tokio::{
-    runtime::Handle,
-    sync::{mpsc, watch},
-};
 use zksync_shared_metrics::{InteractionType, TxStage, APP_METRICS};
 use zksync_state::{ReadStorage, ReadStorageFactory, StorageView, WriteStorage};
 use zksync_types::{vm_trace::Call, Transaction};
 use zksync_utils::bytecode::CompressedBytecodeInfo;
 
 use super::{BatchExecutor, BatchExecutorHandle, Command, TxExecutionResult};
-use crate::state_keeper::{
+use crate::{
     metrics::{TxExecutionStage, BATCH_TIP_METRICS, EXECUTOR_METRICS, KEEPER_METRICS},
     types::ExecutionMetricsForCriteria,
 };
@@ -30,19 +31,19 @@ use crate::state_keeper::{
 /// Creates a "real" batch executor which maintains the VM (as opposed to the test builder which doesn't use the VM).
 #[derive(Debug, Clone)]
 pub struct MainBatchExecutor {
-    storage_factory: Arc<dyn ReadStorageFactory>,
     save_call_traces: bool,
+    /// Whether batch executor would allow transactions with bytecode that cannot be compressed.
+    /// For new blocks, bytecode compression is mandatory -- if bytecode compression is not supported,
+    /// the transaction will be rejected.
+    /// Note that this flag, if set to `true`, is strictly more permissive than if set to `false`. It means
+    /// that in cases where the node is expected to process any transactions processed by the sequencer
+    /// regardless of its configuration, this flag should be set to `true`.
     optional_bytecode_compression: bool,
 }
 
 impl MainBatchExecutor {
-    pub fn new(
-        storage_factory: Arc<dyn ReadStorageFactory>,
-        save_call_traces: bool,
-        optional_bytecode_compression: bool,
-    ) -> Self {
+    pub fn new(save_call_traces: bool, optional_bytecode_compression: bool) -> Self {
         Self {
-            storage_factory,
             save_call_traces,
             optional_bytecode_compression,
         }
@@ -53,6 +54,7 @@ impl MainBatchExecutor {
 impl BatchExecutor for MainBatchExecutor {
     async fn init_batch(
         &mut self,
+        storage_factory: Arc<dyn ReadStorageFactory>,
         l1_batch_params: L1BatchEnv,
         system_env: SystemEnv,
         stop_receiver: &watch::Receiver<bool>,
@@ -66,24 +68,21 @@ impl BatchExecutor for MainBatchExecutor {
             commands: commands_receiver,
         };
 
-        let storage_factory = self.storage_factory.clone();
         let stop_receiver = stop_receiver.clone();
         let handle = tokio::task::spawn_blocking(move || {
             if let Some(storage) = Handle::current()
                 .block_on(
                     storage_factory.access_storage(&stop_receiver, l1_batch_params.number - 1),
                 )
-                .expect("failed getting access to state keeper storage")
+                .context("failed accessing state keeper storage")?
             {
                 executor.run(storage, l1_batch_params, system_env);
             } else {
                 tracing::info!("Interrupted while trying to access state keeper storage");
             }
+            anyhow::Ok(())
         });
-        Some(BatchExecutorHandle {
-            handle,
-            commands: commands_sender,
-        })
+        Some(BatchExecutorHandle::from_raw(handle, commands_sender))
     }
 }
 
@@ -117,19 +116,27 @@ impl CommandReceiver {
             match cmd {
                 Command::ExecuteTx(tx, resp) => {
                     let result = self.execute_tx(&tx, &mut vm);
-                    resp.send(result).unwrap();
+                    if resp.send(result).is_err() {
+                        break;
+                    }
                 }
                 Command::RollbackLastTx(resp) => {
                     self.rollback_last_tx(&mut vm);
-                    resp.send(()).unwrap();
+                    if resp.send(()).is_err() {
+                        break;
+                    }
                 }
                 Command::StartNextL2Block(l2_block_env, resp) => {
                     self.start_next_l2_block(l2_block_env, &mut vm);
-                    resp.send(()).unwrap();
+                    if resp.send(()).is_err() {
+                        break;
+                    }
                 }
                 Command::FinishBatch(resp) => {
                     let vm_block_result = self.finish_batch(&mut vm);
-                    resp.send(vm_block_result).unwrap();
+                    if resp.send(vm_block_result).is_err() {
+                        break;
+                    }
 
                     // `storage_view` cannot be accessed while borrowed by the VM,
                     // so this is the only point at which storage metrics can be obtained
@@ -217,6 +224,8 @@ impl CommandReceiver {
         result
     }
 
+    /// Attempts to execute transaction with or without bytecode compression.
+    /// If compression fails, the transaction will be re-executed without compression.
     fn execute_tx_in_vm_with_optional_compression<S: WriteStorage>(
         &self,
         tx: &Transaction,
@@ -282,10 +291,8 @@ impl CommandReceiver {
         (result.1, compressed_bytecodes, trace)
     }
 
-    // Err when transaction is rejected.
-    // `Ok(TxExecutionStatus::Success)` when the transaction succeeded
-    // `Ok(TxExecutionStatus::Failure)` when the transaction failed.
-    // Note that failed transactions are considered properly processed and are included in blocks
+    /// Attempts to execute transaction with mandatory bytecode compression.
+    /// If bytecode compression fails, the transaction will be rejected.
     fn execute_tx_in_vm<S: WriteStorage>(
         &self,
         tx: &Transaction,
diff --git a/core/lib/zksync_core/src/state_keeper/batch_executor/mod.rs b/core/node/state_keeper/src/batch_executor/mod.rs
similarity index 60%
rename from core/lib/zksync_core/src/state_keeper/batch_executor/mod.rs
rename to core/node/state_keeper/src/batch_executor/mod.rs
index 0164af10e2b7..bb3effedbbab 100644
--- a/core/lib/zksync_core/src/state_keeper/batch_executor/mod.rs
+++ b/core/node/state_keeper/src/batch_executor/mod.rs
@@ -1,29 +1,30 @@
-use std::fmt;
+use std::{error::Error as StdError, fmt, sync::Arc};
 
+use anyhow::Context as _;
 use async_trait::async_trait;
-use multivm::interface::{
-    FinishedL1Batch, Halt, L1BatchEnv, L2BlockEnv, SystemEnv, VmExecutionResultAndLogs,
-};
 use tokio::{
     sync::{mpsc, oneshot, watch},
     task::JoinHandle,
 };
+use zksync_multivm::interface::{
+    FinishedL1Batch, Halt, L1BatchEnv, L2BlockEnv, SystemEnv, VmExecutionResultAndLogs,
+};
+use zksync_state::ReadStorageFactory;
 use zksync_types::{vm_trace::Call, Transaction};
 use zksync_utils::bytecode::CompressedBytecodeInfo;
 
-use crate::state_keeper::{
+use crate::{
     metrics::{ExecutorCommand, EXECUTOR_METRICS},
     types::ExecutionMetricsForCriteria,
 };
 
+pub mod main_executor;
 #[cfg(test)]
 mod tests;
 
-pub mod main_executor;
-
 /// Representation of a transaction executed in the virtual machine.
 #[derive(Debug, Clone)]
-pub(crate) enum TxExecutionResult {
+pub enum TxExecutionResult {
     /// Successful execution of the tx and the block tip dry run.
     Success {
         tx_result: Box<VmExecutionResultAndLogs>,
@@ -58,42 +59,89 @@ impl TxExecutionResult {
 pub trait BatchExecutor: 'static + Send + Sync + fmt::Debug {
     async fn init_batch(
         &mut self,
+        storage_factory: Arc<dyn ReadStorageFactory>,
         l1_batch_params: L1BatchEnv,
         system_env: SystemEnv,
         stop_receiver: &watch::Receiver<bool>,
     ) -> Option<BatchExecutorHandle>;
 }
 
+#[derive(Debug)]
+enum HandleOrError {
+    Handle(JoinHandle<anyhow::Result<()>>),
+    Err(Arc<dyn StdError + Send + Sync>),
+}
+
+impl HandleOrError {
+    async fn wait_for_error(&mut self) -> anyhow::Error {
+        let err_arc = match self {
+            Self::Handle(handle) => {
+                let err = match handle.await {
+                    Ok(Ok(())) => anyhow::anyhow!("batch executor unexpectedly stopped"),
+                    Ok(Err(err)) => err,
+                    Err(err) => anyhow::Error::new(err).context("batch executor panicked"),
+                };
+                let err: Box<dyn StdError + Send + Sync> = err.into();
+                let err: Arc<dyn StdError + Send + Sync> = err.into();
+                *self = Self::Err(err.clone());
+                err
+            }
+            Self::Err(err) => err.clone(),
+        };
+        anyhow::Error::new(err_arc)
+    }
+
+    async fn wait(self) -> anyhow::Result<()> {
+        match self {
+            Self::Handle(handle) => handle.await.context("batch executor panicked")?,
+            Self::Err(err_arc) => Err(anyhow::Error::new(err_arc)),
+        }
+    }
+}
+
 /// A public interface for interaction with the `BatchExecutor`.
 /// `BatchExecutorHandle` is stored in the state keeper and is used to invoke or rollback transactions, and also seal
 /// the batches.
 #[derive(Debug)]
 pub struct BatchExecutorHandle {
-    handle: JoinHandle<()>,
+    handle: HandleOrError,
     commands: mpsc::Sender<Command>,
 }
 
 impl BatchExecutorHandle {
     /// Creates a batch executor handle from the provided sender and thread join handle.
     /// Can be used to inject an alternative batch executor implementation.
-    #[cfg(test)]
-    pub(super) fn from_raw(handle: JoinHandle<()>, commands: mpsc::Sender<Command>) -> Self {
-        Self { handle, commands }
+    #[doc(hidden)]
+    pub(super) fn from_raw(
+        handle: JoinHandle<anyhow::Result<()>>,
+        commands: mpsc::Sender<Command>,
+    ) -> Self {
+        Self {
+            handle: HandleOrError::Handle(handle),
+            commands,
+        }
     }
 
-    pub(super) async fn execute_tx(&self, tx: Transaction) -> TxExecutionResult {
+    pub async fn execute_tx(&mut self, tx: Transaction) -> anyhow::Result<TxExecutionResult> {
         let tx_gas_limit = tx.gas_limit().as_u64();
 
         let (response_sender, response_receiver) = oneshot::channel();
-        self.commands
+        let send_failed = self
+            .commands
             .send(Command::ExecuteTx(Box::new(tx), response_sender))
             .await
-            .unwrap();
+            .is_err();
+        if send_failed {
+            return Err(self.handle.wait_for_error().await);
+        }
 
         let latency = EXECUTOR_METRICS.batch_executor_command_response_time
             [&ExecutorCommand::ExecuteTx]
             .start();
-        let res = response_receiver.await.unwrap();
+        let res = match response_receiver.await {
+            Ok(res) => res,
+            Err(_) => return Err(self.handle.wait_for_error().await),
+        };
         let elapsed = latency.observe();
 
         if let TxExecutionResult::Success { tx_metrics, .. } = &res {
@@ -110,52 +158,76 @@ impl BatchExecutorHandle {
                 .failed_tx_gas_limit_per_nanosecond
                 .observe(tx_gas_limit as f64 / elapsed.as_nanos() as f64);
         }
-        res
+        Ok(res)
     }
 
-    pub(super) async fn start_next_l2_block(&self, env: L2BlockEnv) {
+    pub async fn start_next_l2_block(&mut self, env: L2BlockEnv) -> anyhow::Result<()> {
         // While we don't get anything from the channel, it's useful to have it as a confirmation that the operation
         // indeed has been processed.
         let (response_sender, response_receiver) = oneshot::channel();
-        self.commands
+        let send_failed = self
+            .commands
             .send(Command::StartNextL2Block(env, response_sender))
             .await
-            .unwrap();
+            .is_err();
+        if send_failed {
+            return Err(self.handle.wait_for_error().await);
+        }
+
         let latency = EXECUTOR_METRICS.batch_executor_command_response_time
             [&ExecutorCommand::StartNextL2Block]
             .start();
-        response_receiver.await.unwrap();
+        if response_receiver.await.is_err() {
+            return Err(self.handle.wait_for_error().await);
+        }
         latency.observe();
+        Ok(())
     }
 
-    pub(super) async fn rollback_last_tx(&self) {
+    pub async fn rollback_last_tx(&mut self) -> anyhow::Result<()> {
         // While we don't get anything from the channel, it's useful to have it as a confirmation that the operation
         // indeed has been processed.
         let (response_sender, response_receiver) = oneshot::channel();
-        self.commands
+        let send_failed = self
+            .commands
             .send(Command::RollbackLastTx(response_sender))
             .await
-            .unwrap();
+            .is_err();
+        if send_failed {
+            return Err(self.handle.wait_for_error().await);
+        }
+
         let latency = EXECUTOR_METRICS.batch_executor_command_response_time
             [&ExecutorCommand::RollbackLastTx]
             .start();
-        response_receiver.await.unwrap();
+        if response_receiver.await.is_err() {
+            return Err(self.handle.wait_for_error().await);
+        }
         latency.observe();
+        Ok(())
     }
 
-    pub(super) async fn finish_batch(self) -> FinishedL1Batch {
+    pub async fn finish_batch(mut self) -> anyhow::Result<FinishedL1Batch> {
         let (response_sender, response_receiver) = oneshot::channel();
-        self.commands
+        let send_failed = self
+            .commands
             .send(Command::FinishBatch(response_sender))
             .await
-            .unwrap();
+            .is_err();
+        if send_failed {
+            return Err(self.handle.wait_for_error().await);
+        }
+
         let latency = EXECUTOR_METRICS.batch_executor_command_response_time
             [&ExecutorCommand::FinishBatch]
             .start();
-        let finished_batch = response_receiver.await.unwrap();
-        self.handle.await.unwrap();
+        let finished_batch = match response_receiver.await {
+            Ok(batch) => batch,
+            Err(_) => return Err(self.handle.wait_for_error().await),
+        };
+        self.handle.wait().await?;
         latency.observe();
-        finished_batch
+        Ok(finished_batch)
     }
 }
 
diff --git a/core/lib/zksync_core/src/state_keeper/batch_executor/tests/mod.rs b/core/node/state_keeper/src/batch_executor/tests/mod.rs
similarity index 77%
rename from core/lib/zksync_core/src/state_keeper/batch_executor/tests/mod.rs
rename to core/node/state_keeper/src/batch_executor/tests/mod.rs
index 829e2d66f8f2..4b36965895fd 100644
--- a/core/lib/zksync_core/src/state_keeper/batch_executor/tests/mod.rs
+++ b/core/node/state_keeper/src/batch_executor/tests/mod.rs
@@ -50,11 +50,11 @@ async fn execute_l2_tx(storage_type: StorageType) {
     let mut tester = Tester::new(connection_pool);
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester.create_batch_executor(storage_type).await;
+    let mut executor = tester.create_batch_executor(storage_type).await;
 
-    let res = executor.execute_tx(alice.execute()).await;
+    let res = executor.execute_tx(alice.execute()).await.unwrap();
     assert_executed(&res);
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -69,12 +69,12 @@ impl SnapshotRecoveryMutation {
     fn mutate_snapshot(self, storage_snapshot: &mut StorageSnapshot, alice: &Account) {
         match self {
             Self::RemoveNonce => {
-                let nonce_key = get_nonce_key(&alice.address());
+                let nonce_key = get_nonce_key(&alice.address()).hashed_key();
                 let nonce_value = storage_snapshot.storage_logs.remove(&nonce_key);
                 assert!(nonce_value.is_some());
             }
             Self::RemoveBalance => {
-                let balance_key = storage_key_for_eth_balance(&alice.address());
+                let balance_key = storage_key_for_eth_balance(&alice.address()).hashed_key();
                 let balance_value = storage_snapshot.storage_logs.remove(&balance_key);
                 assert!(balance_value.is_some());
             }
@@ -82,8 +82,8 @@ impl SnapshotRecoveryMutation {
     }
 }
 
-const EXECUTE_L2_TX_AFTER_SNAPSHOT_RECOVERY_CASES: test_casing::Product<(
-    [std::option::Option<SnapshotRecoveryMutation>; 3],
+const EXECUTE_L2_TX_AFTER_SNAPSHOT_RECOVERY_CASES: Product<(
+    [Option<SnapshotRecoveryMutation>; 3],
     [StorageType; 3],
 )> = Product((SnapshotRecoveryMutation::ALL, StorageType::ALL));
 
@@ -107,13 +107,13 @@ async fn execute_l2_tx_after_snapshot_recovery(
     let snapshot = storage_snapshot.recover(&connection_pool).await;
 
     let mut tester = Tester::new(connection_pool);
-    let executor = tester
+    let mut executor = tester
         .recover_batch_executor_custom(&storage_type, &snapshot)
         .await;
-    let res = executor.execute_tx(alice.execute()).await;
+    let res = executor.execute_tx(alice.execute()).await.unwrap();
     if mutation.is_none() {
         assert_executed(&res);
-        executor.finish_batch().await;
+        executor.finish_batch().await.unwrap();
     } else {
         assert_rejected(&res);
     }
@@ -129,13 +129,16 @@ async fn execute_l1_tx() {
 
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
-    let res = executor.execute_tx(alice.l1_execute(PriorityOpId(1))).await;
+    let res = executor
+        .execute_tx(alice.l1_execute(PriorityOpId(1)))
+        .await
+        .unwrap();
     assert_executed(&res);
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
 }
 
 /// Checks that we can successfully execute a single L2 tx and a single L1 tx in batch executor.
@@ -147,17 +150,20 @@ async fn execute_l2_and_l1_txs() {
     let mut tester = Tester::new(connection_pool);
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
-    let res = executor.execute_tx(alice.execute()).await;
+    let res = executor.execute_tx(alice.execute()).await.unwrap();
     assert_executed(&res);
 
-    let res = executor.execute_tx(alice.l1_execute(PriorityOpId(1))).await;
+    let res = executor
+        .execute_tx(alice.l1_execute(PriorityOpId(1)))
+        .await
+        .unwrap();
     assert_executed(&res);
 
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
 }
 
 /// Checks that we can successfully rollback the transaction and execute it once again.
@@ -170,18 +176,18 @@ async fn rollback() {
 
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
     let tx = alice.execute();
-    let res_old = executor.execute_tx(tx.clone()).await;
+    let res_old = executor.execute_tx(tx.clone()).await.unwrap();
     assert_executed(&res_old);
 
-    executor.rollback_last_tx().await;
+    executor.rollback_last_tx().await.unwrap();
 
     // Execute the same transaction, it must succeed.
-    let res_new = executor.execute_tx(tx).await;
+    let res_new = executor.execute_tx(tx).await.unwrap();
     assert_executed(&res_new);
 
     let (
@@ -203,7 +209,7 @@ async fn rollback() {
         "Execution results must be the same"
     );
 
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
 }
 
 /// Checks that incorrect transactions are marked as rejected.
@@ -215,12 +221,12 @@ async fn reject_tx() {
     let mut tester = Tester::new(connection_pool);
 
     tester.genesis().await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
     // Wallet is not funded, it can't pay for fees.
-    let res = executor.execute_tx(alice.execute()).await;
+    let res = executor.execute_tx(alice.execute()).await.unwrap();
     assert_rejected(&res);
 }
 
@@ -234,15 +240,15 @@ async fn too_big_gas_limit() {
     let mut tester = Tester::new(connection_pool);
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
     let big_gas_limit_tx = alice.execute_with_gas_limit(u32::MAX);
 
-    let res = executor.execute_tx(big_gas_limit_tx).await;
+    let res = executor.execute_tx(big_gas_limit_tx).await.unwrap();
     assert_executed(&res);
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
 }
 
 /// Checks that we can't execute the same transaction twice.
@@ -254,16 +260,16 @@ async fn tx_cant_be_reexecuted() {
     let mut tester = Tester::new(connection_pool);
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
     let tx = alice.execute();
-    let res1 = executor.execute_tx(tx.clone()).await;
+    let res1 = executor.execute_tx(tx.clone()).await.unwrap();
     assert_executed(&res1);
 
     // Nonce is used for the second tx.
-    let res2 = executor.execute_tx(tx).await;
+    let res2 = executor.execute_tx(tx).await.unwrap();
     assert_rejected(&res2);
 }
 
@@ -276,23 +282,25 @@ async fn deploy_and_call_loadtest() {
     let mut tester = Tester::new(connection_pool);
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
     let tx = alice.deploy_loadnext_tx();
-    assert_executed(&executor.execute_tx(tx.tx).await);
+    assert_executed(&executor.execute_tx(tx.tx).await.unwrap());
     assert_executed(
         &executor
             .execute_tx(alice.loadnext_custom_gas_call(tx.address, 10, 10_000_000))
-            .await,
+            .await
+            .unwrap(),
     );
     assert_executed(
         &executor
             .execute_tx(alice.loadnext_custom_writes_call(tx.address, 1, 500_000_000))
-            .await,
+            .await
+            .unwrap(),
     );
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
 }
 
 /// Checks that a tx that is reverted by the VM still can be included into a batch.
@@ -305,12 +313,12 @@ async fn execute_reverted_tx() {
 
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
     let tx = alice.deploy_loadnext_tx();
-    assert_executed(&executor.execute_tx(tx.tx).await);
+    assert_executed(&executor.execute_tx(tx.tx).await.unwrap());
 
     assert_reverted(
         &executor
@@ -318,9 +326,10 @@ async fn execute_reverted_tx() {
                 tx.address, 1,
                 1_000_000, // We provide enough gas for tx to be executed, but not enough for the call to be successful.
             ))
-            .await,
+            .await
+            .unwrap(),
     );
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
 }
 
 /// Runs the batch executor through a semi-realistic basic scenario:
@@ -336,44 +345,53 @@ async fn execute_realistic_scenario() {
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
     tester.fund(&[bob.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
     // A good tx should be executed successfully.
-    let res = executor.execute_tx(alice.execute()).await;
+    let res = executor.execute_tx(alice.execute()).await.unwrap();
     assert_executed(&res);
 
     // Execute a good tx successfully, roll if back, and execute it again.
     let tx_to_be_rolled_back = alice.execute();
-    let res = executor.execute_tx(tx_to_be_rolled_back.clone()).await;
+    let res = executor
+        .execute_tx(tx_to_be_rolled_back.clone())
+        .await
+        .unwrap();
     assert_executed(&res);
 
-    executor.rollback_last_tx().await;
+    executor.rollback_last_tx().await.unwrap();
 
-    let res = executor.execute_tx(tx_to_be_rolled_back.clone()).await;
+    let res = executor
+        .execute_tx(tx_to_be_rolled_back.clone())
+        .await
+        .unwrap();
     assert_executed(&res);
 
     // A good tx from a different account should be executed successfully.
-    let res = executor.execute_tx(bob.execute()).await;
+    let res = executor.execute_tx(bob.execute()).await.unwrap();
     assert_executed(&res);
 
     // If we try to execute an already executed again it should be rejected.
-    let res = executor.execute_tx(tx_to_be_rolled_back).await;
+    let res = executor.execute_tx(tx_to_be_rolled_back).await.unwrap();
     assert_rejected(&res);
 
     // An unrelated good tx should be executed successfully.
-    executor.rollback_last_tx().await; // Roll back the vm to the pre-rejected-tx state.
+    executor.rollback_last_tx().await.unwrap(); // Roll back the vm to the pre-rejected-tx state.
 
     // No need to reset the nonce because a tx with the current nonce was indeed executed.
-    let res = executor.execute_tx(alice.execute()).await;
+    let res = executor.execute_tx(alice.execute()).await.unwrap();
     assert_executed(&res);
 
     // A good L1 tx should also be executed successfully.
-    let res = executor.execute_tx(alice.l1_execute(PriorityOpId(1))).await;
+    let res = executor
+        .execute_tx(alice.l1_execute(PriorityOpId(1)))
+        .await
+        .unwrap();
     assert_executed(&res);
 
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
 }
 
 /// Checks that we handle the bootloader out of gas error on execution phase.
@@ -393,11 +411,11 @@ async fn bootloader_out_of_gas_for_any_tx() {
 
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
-    let res = executor.execute_tx(alice.execute()).await;
+    let res = executor.execute_tx(alice.execute()).await.unwrap();
     assert_matches!(res, TxExecutionResult::BootloaderOutOfGasForTx);
 }
 
@@ -412,14 +430,14 @@ async fn bootloader_tip_out_of_gas() {
 
     tester.genesis().await;
     tester.fund(&[alice.address()]).await;
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
-    let res = executor.execute_tx(alice.execute()).await;
+    let res = executor.execute_tx(alice.execute()).await.unwrap();
     assert_executed(&res);
 
-    let finished_batch = executor.finish_batch().await;
+    let finished_batch = executor.finish_batch().await.unwrap();
 
     // Just a bit below the gas used for the previous batch execution should be fine to execute the tx
     // but not enough to execute the block tip.
@@ -435,11 +453,11 @@ async fn bootloader_tip_out_of_gas() {
         validation_computational_gas_limit: u32::MAX,
     });
 
-    let second_executor = tester
+    let mut second_executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
 
-    let res = second_executor.execute_tx(alice.execute()).await;
+    let res = second_executor.execute_tx(alice.execute()).await.unwrap();
     assert_matches!(res, TxExecutionResult::BootloaderOutOfGasForTx);
 }
 
@@ -455,34 +473,34 @@ async fn catchup_rocksdb_cache() {
     tester.fund(&[alice.address(), bob.address()]).await;
 
     // Execute a bunch of transactions to populate Postgres-based storage (note that RocksDB stays empty)
-    let executor = tester.create_batch_executor(StorageType::Postgres).await;
+    let mut executor = tester.create_batch_executor(StorageType::Postgres).await;
     for _ in 0..10 {
-        let res = executor.execute_tx(alice.execute()).await;
+        let res = executor.execute_tx(alice.execute()).await.unwrap();
         assert_executed(&res);
     }
 
     // Execute one more tx on PG
     let tx = alice.execute();
-    let res = executor.execute_tx(tx.clone()).await;
+    let res = executor.execute_tx(tx.clone()).await.unwrap();
     assert_executed(&res);
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
 
     // Async RocksDB cache should be aware of the tx and should reject it
-    let executor = tester
+    let mut executor = tester
         .create_batch_executor(StorageType::AsyncRocksdbCache)
         .await;
-    let res = executor.execute_tx(tx.clone()).await;
+    let res = executor.execute_tx(tx.clone()).await.unwrap();
     assert_rejected(&res);
     // Execute one tx just so we can finish the batch
-    executor.rollback_last_tx().await; // Roll back the vm to the pre-rejected-tx state.
-    let res = executor.execute_tx(bob.execute()).await;
+    executor.rollback_last_tx().await.unwrap(); // Roll back the vm to the pre-rejected-tx state.
+    let res = executor.execute_tx(bob.execute()).await.unwrap();
     assert_executed(&res);
-    executor.finish_batch().await;
+    executor.finish_batch().await.unwrap();
     // Wait for all background tasks to exit, otherwise we might still be holding a RocksDB lock
     tester.wait_for_tasks().await;
 
     // Sync RocksDB storage should be aware of the tx and should reject it
-    let executor = tester.create_batch_executor(StorageType::Rocksdb).await;
-    let res = executor.execute_tx(tx).await;
+    let mut executor = tester.create_batch_executor(StorageType::Rocksdb).await;
+    let res = executor.execute_tx(tx).await.unwrap();
     assert_rejected(&res);
 }
diff --git a/core/lib/zksync_core/src/state_keeper/batch_executor/tests/read_storage_factory.rs b/core/node/state_keeper/src/batch_executor/tests/read_storage_factory.rs
similarity index 100%
rename from core/lib/zksync_core/src/state_keeper/batch_executor/tests/read_storage_factory.rs
rename to core/node/state_keeper/src/batch_executor/tests/read_storage_factory.rs
diff --git a/core/lib/zksync_core/src/state_keeper/batch_executor/tests/tester.rs b/core/node/state_keeper/src/batch_executor/tests/tester.rs
similarity index 87%
rename from core/lib/zksync_core/src/state_keeper/batch_executor/tests/tester.rs
rename to core/node/state_keeper/src/batch_executor/tests/tester.rs
index 68ee85683d14..579f3bee4819 100644
--- a/core/lib/zksync_core/src/state_keeper/batch_executor/tests/tester.rs
+++ b/core/node/state_keeper/src/batch_executor/tests/tester.rs
@@ -3,26 +3,29 @@
 
 use std::{collections::HashMap, fmt::Debug, sync::Arc};
 
-use multivm::{
-    interface::{L1BatchEnv, L2BlockEnv, SystemEnv},
-    vm_latest::constants::INITIAL_STORAGE_WRITE_PUBDATA_BYTES,
-};
 use tempfile::TempDir;
 use tokio::{sync::watch, task::JoinHandle};
 use zksync_config::configs::chain::StateKeeperConfig;
 use zksync_contracts::{get_loadnext_contract, test_contracts::LoadnextContractExecutionParams};
 use zksync_dal::{ConnectionPool, Core, CoreDal};
-use zksync_node_genesis::create_genesis_l1_batch;
-use zksync_node_test_utils::prepare_recovery_snapshot;
+use zksync_multivm::{
+    interface::{L1BatchEnv, L2BlockEnv, SystemEnv},
+    vm_latest::constants::INITIAL_STORAGE_WRITE_PUBDATA_BYTES,
+};
+use zksync_node_genesis::{create_genesis_l1_batch, GenesisParams};
+use zksync_node_test_utils::{recover, Snapshot};
 use zksync_state::{ReadStorageFactory, RocksdbStorageOptions};
 use zksync_test_account::{Account, DeployContractsTx, TxType};
 use zksync_types::{
-    block::L2BlockHasher, ethabi::Token, fee::Fee, snapshots::SnapshotRecoveryStatus,
+    block::L2BlockHasher,
+    ethabi::Token,
+    protocol_version::ProtocolSemanticVersion,
+    snapshots::{SnapshotRecoveryStatus, SnapshotStorageLog},
     storage_writes_deduplicator::StorageWritesDeduplicator,
-    system_contracts::get_system_smart_contracts, utils::storage_key_for_standard_token_balance,
+    system_contracts::get_system_smart_contracts,
+    utils::storage_key_for_standard_token_balance,
     AccountTreeId, Address, Execute, L1BatchNumber, L2BlockNumber, PriorityOpId, ProtocolVersionId,
-    StorageKey, StorageLog, Transaction, H256, L2_BASE_TOKEN_ADDRESS,
-    SYSTEM_CONTEXT_MINIMAL_BASE_FEE, U256,
+    StorageLog, Transaction, H256, L2_BASE_TOKEN_ADDRESS, U256,
 };
 use zksync_utils::u256_to_h256;
 
@@ -30,14 +33,14 @@ use super::{
     read_storage_factory::{PostgresFactory, RocksdbFactory},
     StorageType,
 };
-use crate::state_keeper::{
+use crate::{
     batch_executor::{BatchExecutorHandle, TxExecutionResult},
-    tests::{default_l1_batch_env, default_system_env, BASE_SYSTEM_CONTRACTS},
+    testonly,
+    testonly::BASE_SYSTEM_CONTRACTS,
+    tests::{default_l1_batch_env, default_system_env},
     AsyncRocksdbCache, BatchExecutor, MainBatchExecutor,
 };
 
-const DEFAULT_GAS_PER_PUBDATA: u32 = 10000;
-
 /// Representation of configuration parameters used by the state keeper.
 /// Has sensible defaults for most tests, each of which can be overridden.
 #[derive(Debug)]
@@ -144,11 +147,10 @@ impl Tester {
         l1_batch_env: L1BatchEnv,
         system_env: SystemEnv,
     ) -> BatchExecutorHandle {
-        let mut batch_executor =
-            MainBatchExecutor::new(storage_factory, self.config.save_call_traces, false);
+        let mut batch_executor = MainBatchExecutor::new(self.config.save_call_traces, false);
         let (_stop_sender, stop_receiver) = watch::channel(false);
         batch_executor
-            .init_batch(l1_batch_env, system_env, &stop_receiver)
+            .init_batch(storage_factory, l1_batch_env, system_env, &stop_receiver)
             .await
             .expect("Batch executor was interrupted")
     }
@@ -244,7 +246,10 @@ impl Tester {
         if storage.blocks_dal().is_genesis_needed().await.unwrap() {
             create_genesis_l1_batch(
                 &mut storage,
-                ProtocolVersionId::latest(),
+                ProtocolSemanticVersion {
+                    minor: ProtocolVersionId::latest(),
+                    patch: 0.into(),
+                },
                 &BASE_SYSTEM_CONTRACTS,
                 &get_system_smart_contracts(),
                 Default::default(),
@@ -271,7 +276,7 @@ impl Tester {
 
             storage
                 .storage_logs_dal()
-                .append_storage_logs(L2BlockNumber(0), &[(H256::zero(), vec![storage_log])])
+                .append_storage_logs(L2BlockNumber(0), &[storage_log])
                 .await
                 .unwrap();
             if storage
@@ -283,7 +288,7 @@ impl Tester {
             {
                 storage
                     .storage_logs_dedup_dal()
-                    .insert_initial_writes(L1BatchNumber(0), &[storage_log.key])
+                    .insert_initial_writes(L1BatchNumber(0), &[storage_log.key.hashed_key()])
                     .await
                     .unwrap();
             }
@@ -343,15 +348,7 @@ impl AccountLoadNextExecutable for Account {
         )
     }
     fn l1_execute(&mut self, serial_id: PriorityOpId) -> Transaction {
-        self.get_l1_tx(
-            Execute {
-                contract_address: Address::random(),
-                value: Default::default(),
-                calldata: vec![],
-                factory_deps: None,
-            },
-            serial_id.0,
-        )
+        testonly::l1_transaction(self, serial_id)
     }
 
     /// Returns a valid `execute` transaction.
@@ -370,10 +367,12 @@ impl AccountLoadNextExecutable for Account {
     ) -> Transaction {
         // For each iteration of the expensive contract, there are two slots that are updated:
         // the length of the vector and the new slot with the element itself.
-        let minimal_fee =
-            2 * DEFAULT_GAS_PER_PUBDATA * writes * INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32;
+        let minimal_fee = 2
+            * testonly::DEFAULT_GAS_PER_PUBDATA
+            * writes
+            * INITIAL_STORAGE_WRITE_PUBDATA_BYTES as u32;
 
-        let fee = fee(minimal_fee + gas_limit);
+        let fee = testonly::fee(minimal_fee + gas_limit);
 
         self.get_l2_tx_for_execute(
             Execute {
@@ -388,7 +387,7 @@ impl AccountLoadNextExecutable for Account {
                 }
                 .to_bytes(),
                 value: Default::default(),
-                factory_deps: None,
+                factory_deps: vec![],
             },
             Some(fee),
         )
@@ -397,16 +396,7 @@ impl AccountLoadNextExecutable for Account {
     /// Returns a valid `execute` transaction.
     /// Automatically increments nonce of the account.
     fn execute_with_gas_limit(&mut self, gas_limit: u32) -> Transaction {
-        let fee = fee(gas_limit);
-        self.get_l2_tx_for_execute(
-            Execute {
-                contract_address: Address::random(),
-                calldata: vec![],
-                value: Default::default(),
-                factory_deps: None,
-            },
-            Some(fee),
-        )
+        testonly::l2_transaction(self, gas_limit)
     }
 
     /// Returns a transaction to the loadnext contract with custom gas limit and expected burned gas amount.
@@ -417,7 +407,7 @@ impl AccountLoadNextExecutable for Account {
         gas_to_burn: u32,
         gas_limit: u32,
     ) -> Transaction {
-        let fee = fee(gas_limit);
+        let fee = testonly::fee(gas_limit);
         let calldata = mock_loadnext_gas_burn_calldata(gas_to_burn);
 
         self.get_l2_tx_for_execute(
@@ -425,22 +415,13 @@ impl AccountLoadNextExecutable for Account {
                 contract_address: address,
                 calldata,
                 value: Default::default(),
-                factory_deps: None,
+                factory_deps: vec![],
             },
             Some(fee),
         )
     }
 }
 
-fn fee(gas_limit: u32) -> Fee {
-    Fee {
-        gas_limit: U256::from(gas_limit),
-        max_fee_per_gas: SYSTEM_CONTEXT_MINIMAL_BASE_FEE.into(),
-        max_priority_fee_per_gas: U256::zero(),
-        gas_per_pubdata_limit: U256::from(DEFAULT_GAS_PER_PUBDATA),
-    }
-}
-
 pub fn mock_loadnext_gas_burn_calldata(gas: u32) -> Vec<u8> {
     let loadnext_contract = get_loadnext_contract();
     let contract_function = loadnext_contract.contract.function("burnGas").unwrap();
@@ -456,7 +437,7 @@ pub(super) struct StorageSnapshot {
     pub l2_block_number: L2BlockNumber,
     pub l2_block_hash: H256,
     pub l2_block_timestamp: u64,
-    pub storage_logs: HashMap<StorageKey, H256>,
+    pub storage_logs: HashMap<H256, H256>,
     pub factory_deps: HashMap<H256, Vec<u8>>,
 }
 
@@ -492,7 +473,7 @@ impl StorageSnapshot {
             .collect();
         drop(storage);
 
-        let executor = tester
+        let mut executor = tester
             .create_batch_executor(StorageType::AsyncRocksdbCache)
             .await;
         let mut l2_block_env = L2BlockEnv {
@@ -506,11 +487,11 @@ impl StorageSnapshot {
         for _ in 0..transaction_count {
             let tx = alice.execute();
             let tx_hash = tx.hash(); // probably incorrect
-            let res = executor.execute_tx(tx).await;
+            let res = executor.execute_tx(tx).await.unwrap();
             if let TxExecutionResult::Success { tx_result, .. } = res {
                 let storage_logs = &tx_result.logs.storage_logs;
                 storage_writes_deduplicator
-                    .apply(storage_logs.iter().filter(|log| log.log_query.rw_flag));
+                    .apply(storage_logs.iter().filter(|log| log.log.is_write()));
             } else {
                 panic!("Unexpected tx execution result: {res:?}");
             };
@@ -525,17 +506,17 @@ impl StorageSnapshot {
             l2_block_env.number += 1;
             l2_block_env.timestamp += 1;
             l2_block_env.prev_block_hash = hasher.finalize(ProtocolVersionId::latest());
-            executor.start_next_l2_block(l2_block_env).await;
+            executor.start_next_l2_block(l2_block_env).await.unwrap();
         }
 
-        let finished_batch = executor.finish_batch().await;
+        let finished_batch = executor.finish_batch().await.unwrap();
         let storage_logs = &finished_batch.block_tip_execution_result.logs.storage_logs;
-        storage_writes_deduplicator.apply(storage_logs.iter().filter(|log| log.log_query.rw_flag));
+        storage_writes_deduplicator.apply(storage_logs.iter().filter(|log| log.log.is_write()));
         let modified_entries = storage_writes_deduplicator.into_modified_key_values();
         all_logs.extend(
             modified_entries
                 .into_iter()
-                .map(|(key, slot)| (key, u256_to_h256(slot.value))),
+                .map(|(key, slot)| (key.hashed_key(), slot.value)),
         );
 
         // Compute the hash of the last (fictive) L2 block in the batch.
@@ -562,17 +543,23 @@ impl StorageSnapshot {
         let snapshot_logs: Vec<_> = self
             .storage_logs
             .into_iter()
-            .map(|(key, value)| StorageLog::new_write_log(key, value))
+            .enumerate()
+            .map(|(i, (key, value))| SnapshotStorageLog {
+                key,
+                value,
+                l1_batch_number_of_initial_write: L1BatchNumber(1),
+                enumeration_index: i as u64 + 1,
+            })
             .collect();
         let mut storage = connection_pool.connection().await.unwrap();
-        let mut snapshot = prepare_recovery_snapshot(
-            &mut storage,
+
+        let snapshot = Snapshot::new(
             L1BatchNumber(1),
             self.l2_block_number,
-            &snapshot_logs,
-        )
-        .await;
-
+            snapshot_logs,
+            GenesisParams::mock(),
+        );
+        let mut snapshot = recover(&mut storage, snapshot).await;
         snapshot.l2_block_hash = self.l2_block_hash;
         snapshot.l2_block_timestamp = self.l2_block_timestamp;
 
diff --git a/core/lib/zksync_core/src/state_keeper/io/common/mod.rs b/core/node/state_keeper/src/io/common/mod.rs
similarity index 97%
rename from core/lib/zksync_core/src/state_keeper/io/common/mod.rs
rename to core/node/state_keeper/src/io/common/mod.rs
index 72b4808251ef..6bd881414a20 100644
--- a/core/lib/zksync_core/src/state_keeper/io/common/mod.rs
+++ b/core/node/state_keeper/src/io/common/mod.rs
@@ -1,8 +1,8 @@
 use std::time::Duration;
 
 use anyhow::Context;
-use multivm::interface::{L1BatchEnv, SystemEnv};
 use zksync_dal::{Connection, Core, CoreDal};
+use zksync_multivm::interface::{L1BatchEnv, SystemEnv};
 use zksync_types::{L1BatchNumber, L2BlockNumber, H256};
 
 use super::PendingBatchData;
@@ -81,7 +81,7 @@ impl IoCursor {
 /// # Errors
 ///
 /// Propagates DB errors. Also returns an error if environment doesn't correspond to a pending L1 batch.
-pub(crate) async fn load_pending_batch(
+pub async fn load_pending_batch(
     storage: &mut Connection<'_, Core>,
     system_env: SystemEnv,
     l1_batch_env: L1BatchEnv,
diff --git a/core/lib/zksync_core/src/state_keeper/io/common/tests.rs b/core/node/state_keeper/src/io/common/tests.rs
similarity index 95%
rename from core/lib/zksync_core/src/state_keeper/io/common/tests.rs
rename to core/node/state_keeper/src/io/common/tests.rs
index 0382dd99007c..7e6fbdc795ab 100644
--- a/core/lib/zksync_core/src/state_keeper/io/common/tests.rs
+++ b/core/node/state_keeper/src/io/common/tests.rs
@@ -6,7 +6,6 @@
 use std::{collections::HashMap, ops};
 
 use futures::FutureExt;
-use vm_utils::storage::L1BatchParamsProvider;
 use zksync_config::GenesisConfig;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{ConnectionPool, Core};
@@ -16,9 +15,10 @@ use zksync_node_test_utils::{
     prepare_recovery_snapshot,
 };
 use zksync_types::{
-    block::L2BlockHasher, fee::TransactionExecutionMetrics, L2ChainId, ProtocolVersion,
-    ProtocolVersionId,
+    block::L2BlockHasher, fee::TransactionExecutionMetrics,
+    protocol_version::ProtocolSemanticVersion, L2ChainId, ProtocolVersion, ProtocolVersionId,
 };
+use zksync_vm_utils::storage::L1BatchParamsProvider;
 
 use super::*;
 
@@ -370,7 +370,13 @@ async fn store_pending_l2_blocks(
         let tx_result = execute_l2_transaction(tx);
         storage
             .transactions_dal()
-            .mark_txs_as_executed_in_l2_block(new_l2_block.number, &[tx_result], 1.into())
+            .mark_txs_as_executed_in_l2_block(
+                new_l2_block.number,
+                &[tx_result],
+                1.into(),
+                ProtocolVersionId::latest(),
+                false,
+            )
             .await
             .unwrap();
     }
@@ -441,7 +447,10 @@ async fn getting_batch_version_with_genesis() {
     let pool = ConnectionPool::<Core>::test_pool().await;
     let mut storage = pool.connection().await.unwrap();
     let genesis_params = GenesisParams::load_genesis_params(GenesisConfig {
-        protocol_version: Some(ProtocolVersionId::Version5 as u16),
+        protocol_version: Some(ProtocolSemanticVersion {
+            minor: ProtocolVersionId::Version5,
+            patch: 0.into(),
+        }),
         ..mock_genesis_config()
     })
     .unwrap();
@@ -455,7 +464,7 @@ async fn getting_batch_version_with_genesis() {
         .load_l1_batch_protocol_version(&mut storage, L1BatchNumber(0))
         .await
         .unwrap();
-    assert_eq!(version, Some(genesis_params.protocol_version()));
+    assert_eq!(version, Some(genesis_params.minor_protocol_version()));
 
     assert!(provider
         .load_l1_batch_protocol_version(&mut storage, L1BatchNumber(1))
@@ -509,7 +518,10 @@ async fn getting_batch_version_after_snapshot_recovery() {
     storage
         .protocol_versions_dal()
         .save_protocol_version_with_tx(&ProtocolVersion {
-            id: ProtocolVersionId::next(),
+            version: ProtocolSemanticVersion {
+                minor: ProtocolVersionId::next(),
+                patch: 0.into(),
+            },
             ..ProtocolVersion::default()
         })
         .await
diff --git a/core/lib/zksync_core/src/state_keeper/io/mempool.rs b/core/node/state_keeper/src/io/mempool.rs
similarity index 92%
rename from core/lib/zksync_core/src/state_keeper/io/mempool.rs
rename to core/node/state_keeper/src/io/mempool.rs
index d017716f82e7..a35b8e031e2b 100644
--- a/core/lib/zksync_core/src/state_keeper/io/mempool.rs
+++ b/core/node/state_keeper/src/io/mempool.rs
@@ -7,12 +7,11 @@ use std::{
 
 use anyhow::Context as _;
 use async_trait::async_trait;
-use multivm::{interface::Halt, utils::derive_base_fee_and_gas_per_pubdata};
-use vm_utils::storage::L1BatchParamsProvider;
 use zksync_config::configs::chain::StateKeeperConfig;
 use zksync_contracts::BaseSystemContracts;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_mempool::L2TxFilter;
+use zksync_multivm::{interface::Halt, utils::derive_base_fee_and_gas_per_pubdata};
 use zksync_node_fee_model::BatchFeeModelInputProvider;
 use zksync_types::{
     protocol_upgrade::ProtocolUpgradeTx, utils::display_timestamp, Address, L1BatchNumber,
@@ -20,15 +19,19 @@ use zksync_types::{
 };
 // TODO (SMA-1206): use seconds instead of milliseconds.
 use zksync_utils::time::millis_since_epoch;
+use zksync_vm_utils::storage::L1BatchParamsProvider;
 
-use crate::state_keeper::{
+use crate::{
     io::{
         common::{load_pending_batch, poll_iters, IoCursor},
+        seal_logic::l2_block_seal_subtasks::L2BlockSealProcess,
         L1BatchParams, L2BlockParams, PendingBatchData, StateKeeperIO,
     },
     mempool_actor::l2_tx_filter,
-    metrics::KEEPER_METRICS,
-    seal_criteria::{IoSealCriteria, L2BlockMaxPayloadSizeSealer, TimeoutSealer},
+    metrics::{L2BlockSealReason, AGGREGATION_METRICS, KEEPER_METRICS},
+    seal_criteria::{
+        IoSealCriteria, L2BlockMaxPayloadSizeSealer, TimeoutSealer, UnexecutableReason,
+    },
     updates::UpdatesManager,
     MempoolGuard,
 };
@@ -62,10 +65,19 @@ impl IoSealCriteria for MempoolIO {
 
     fn should_seal_l2_block(&mut self, manager: &UpdatesManager) -> bool {
         if self.timeout_sealer.should_seal_l2_block(manager) {
+            AGGREGATION_METRICS.l2_block_reason_inc(&L2BlockSealReason::Timeout);
             return true;
         }
-        self.l2_block_max_payload_size_sealer
+
+        if self
+            .l2_block_max_payload_size_sealer
             .should_seal_l2_block(manager)
+        {
+            AGGREGATION_METRICS.l2_block_reason_inc(&L2BlockSealReason::PayloadSize);
+            return true;
+        }
+
+        false
     }
 }
 
@@ -79,6 +91,8 @@ impl StateKeeperIO for MempoolIO {
         let mut storage = self.pool.connection_tagged("state_keeper").await?;
         let cursor = IoCursor::new(&mut storage).await?;
 
+        L2BlockSealProcess::clear_pending_l2_block(&mut storage, cursor.next_l2_block - 1).await?;
+
         let pending_l2_block_header = self
             .l1_batch_params_provider
             .load_first_l2_block_in_batch(&mut storage, cursor.l1_batch)
@@ -242,7 +256,8 @@ impl StateKeeperIO for MempoolIO {
                         tx.hash(),
                         tx.gas_limit()
                     );
-                    self.reject(&tx, &Halt::TooBigGasLimit.to_string()).await?;
+                    self.reject(&tx, UnexecutableReason::Halt(Halt::TooBigGasLimit))
+                        .await?;
                     continue;
                 }
                 return Ok(Some(tx));
@@ -262,10 +277,14 @@ impl StateKeeperIO for MempoolIO {
         Ok(())
     }
 
-    async fn reject(&mut self, rejected: &Transaction, error: &str) -> anyhow::Result<()> {
+    async fn reject(
+        &mut self,
+        rejected: &Transaction,
+        reason: UnexecutableReason,
+    ) -> anyhow::Result<()> {
         anyhow::ensure!(
             !rejected.is_l1(),
-            "L1 transactions should not be rejected: {error}"
+            "L1 transactions should not be rejected: {reason}"
         );
 
         // Reset the nonces in the mempool, but don't insert the transaction back.
@@ -273,20 +292,22 @@ impl StateKeeperIO for MempoolIO {
 
         // Mark tx as rejected in the storage.
         let mut storage = self.pool.connection_tagged("state_keeper").await?;
-        KEEPER_METRICS.rejected_transactions.inc();
+
+        KEEPER_METRICS.inc_rejected_txs(reason.as_metric_label());
+
         tracing::warn!(
-            "Transaction {} is rejected with error: {error}",
+            "Transaction {} is rejected with error: {reason}",
             rejected.hash()
         );
         storage
             .transactions_dal()
-            .mark_tx_as_rejected(rejected.hash(), &format!("rejected: {error}"))
+            .mark_tx_as_rejected(rejected.hash(), &format!("rejected: {reason}"))
             .await?;
         Ok(())
     }
 
     async fn load_base_system_contracts(
-        &mut self,
+        &self,
         protocol_version: ProtocolVersionId,
         _cursor: &IoCursor,
     ) -> anyhow::Result<BaseSystemContracts> {
@@ -305,7 +326,7 @@ impl StateKeeperIO for MempoolIO {
     }
 
     async fn load_batch_version_id(
-        &mut self,
+        &self,
         number: L1BatchNumber,
     ) -> anyhow::Result<ProtocolVersionId> {
         let mut storage = self.pool.connection_tagged("state_keeper").await?;
@@ -317,7 +338,7 @@ impl StateKeeperIO for MempoolIO {
     }
 
     async fn load_upgrade_tx(
-        &mut self,
+        &self,
         version_id: ProtocolVersionId,
     ) -> anyhow::Result<Option<ProtocolUpgradeTx>> {
         let mut storage = self.pool.connection_tagged("state_keeper").await?;
@@ -328,10 +349,7 @@ impl StateKeeperIO for MempoolIO {
             .map_err(Into::into)
     }
 
-    async fn load_batch_state_hash(
-        &mut self,
-        l1_batch_number: L1BatchNumber,
-    ) -> anyhow::Result<H256> {
+    async fn load_batch_state_hash(&self, l1_batch_number: L1BatchNumber) -> anyhow::Result<H256> {
         tracing::trace!("Getting L1 batch hash for L1 batch #{l1_batch_number}");
         let wait_latency = KEEPER_METRICS.wait_for_prev_hash_time.start();
 
diff --git a/core/lib/zksync_core/src/state_keeper/io/mod.rs b/core/node/state_keeper/src/io/mod.rs
similarity index 75%
rename from core/lib/zksync_core/src/state_keeper/io/mod.rs
rename to core/node/state_keeper/src/io/mod.rs
index 0b1f5fcbe95c..384b0f45b0f6 100644
--- a/core/lib/zksync_core/src/state_keeper/io/mod.rs
+++ b/core/node/state_keeper/src/io/mod.rs
@@ -1,27 +1,26 @@
 use std::{fmt, time::Duration};
 
-use anyhow::Context as _;
 use async_trait::async_trait;
-use multivm::interface::{L1BatchEnv, SystemEnv};
-use vm_utils::storage::l1_batch_params;
 use zksync_contracts::BaseSystemContracts;
+use zksync_multivm::interface::{L1BatchEnv, SystemEnv};
 use zksync_types::{
     block::L2BlockExecutionData, fee_model::BatchFeeInput, protocol_upgrade::ProtocolUpgradeTx,
     Address, L1BatchNumber, L2ChainId, ProtocolVersionId, Transaction, H256,
 };
+use zksync_vm_utils::storage::l1_batch_params;
 
 pub use self::{
     common::IoCursor,
     output_handler::{OutputHandler, StateKeeperOutputHandler},
-    persistence::{L2BlockSealerTask, StateKeeperPersistence},
+    persistence::{L2BlockSealerTask, StateKeeperPersistence, TreeWritesPersistence},
 };
-use super::seal_criteria::IoSealCriteria;
+use super::seal_criteria::{IoSealCriteria, UnexecutableReason};
 
-pub(crate) mod common;
+pub mod common;
 pub(crate) mod mempool;
 mod output_handler;
 mod persistence;
-pub(crate) mod seal_logic;
+pub mod seal_logic;
 #[cfg(test)]
 mod tests;
 
@@ -46,7 +45,7 @@ pub struct PendingBatchData {
 #[derive(Debug, Copy, Clone, Default)]
 pub struct L2BlockParams {
     /// The timestamp of the L2 block.
-    pub(crate) timestamp: u64,
+    pub timestamp: u64,
     /// The maximal number of virtual blocks that can be created within this L2 block.
     /// During the migration from displaying users `batch.number` to L2 block number in Q3 2023
     /// in order to make the process smoother for users, we temporarily display the virtual blocks for users.
@@ -55,22 +54,22 @@ pub struct L2BlockParams {
     /// Note that it is the *maximal* number of virtual blocks that can be created within this L2 block since
     /// once the virtual blocks' number reaches the L2 block number, they will never be allowed to exceed those, i.e.
     /// any "excess" created blocks will be ignored.
-    pub(crate) virtual_blocks: u32,
+    pub virtual_blocks: u32,
 }
 
 /// Parameters for a new L1 batch returned by [`StateKeeperIO::wait_for_new_batch_params()`].
 #[derive(Debug, Clone)]
 pub struct L1BatchParams {
     /// Protocol version for the new L1 batch.
-    pub(crate) protocol_version: ProtocolVersionId,
+    pub protocol_version: ProtocolVersionId,
     /// Computational gas limit for the new L1 batch.
-    pub(crate) validation_computational_gas_limit: u32,
+    pub validation_computational_gas_limit: u32,
     /// Operator address (aka fee address) for the new L1 batch.
-    pub(crate) operator_address: Address,
+    pub operator_address: Address,
     /// Fee parameters to be used in the new L1 batch.
-    pub(crate) fee_input: BatchFeeInput,
+    pub fee_input: BatchFeeInput,
     /// Parameters of the first L2 block in the batch.
-    pub(crate) first_l2_block: L2BlockParams,
+    pub first_l2_block: L2BlockParams,
 }
 
 impl L1BatchParams {
@@ -102,9 +101,12 @@ impl L1BatchParams {
 /// it's used to receive volatile parameters (such as batch parameters) and sequence transactions
 /// providing L2 block and L1 batch boundaries for them.
 ///
+/// Methods with `&self` receiver must be cancel-safe; i.e., they should not use interior mutability
+/// to change the I/O state. Methods with `&mut self` receiver don't need to be cancel-safe.
+///
 /// All errors returned from this method are treated as unrecoverable.
 #[async_trait]
-pub trait StateKeeperIO: 'static + Send + fmt::Debug + IoSealCriteria {
+pub trait StateKeeperIO: 'static + Send + Sync + fmt::Debug + IoSealCriteria {
     /// Returns the ID of the L2 chain. This ID is supposed to be static.
     fn chain_id(&self) -> L2ChainId;
 
@@ -134,56 +136,25 @@ pub trait StateKeeperIO: 'static + Send + fmt::Debug + IoSealCriteria {
     /// Marks the transaction as "not executed", so it can be retrieved from the IO again.
     async fn rollback(&mut self, tx: Transaction) -> anyhow::Result<()>;
     /// Marks the transaction as "rejected", e.g. one that is not correct and can't be executed.
-    async fn reject(&mut self, tx: &Transaction, error: &str) -> anyhow::Result<()>;
+    async fn reject(&mut self, tx: &Transaction, reason: UnexecutableReason) -> anyhow::Result<()>;
 
     /// Loads base system contracts with the specified version.
     async fn load_base_system_contracts(
-        &mut self,
+        &self,
         protocol_version: ProtocolVersionId,
         cursor: &IoCursor,
     ) -> anyhow::Result<BaseSystemContracts>;
     /// Loads protocol version of the specified L1 batch, which is guaranteed to exist in the storage.
     async fn load_batch_version_id(
-        &mut self,
+        &self,
         number: L1BatchNumber,
     ) -> anyhow::Result<ProtocolVersionId>;
     /// Loads protocol upgrade tx for given version.
     async fn load_upgrade_tx(
-        &mut self,
+        &self,
         version_id: ProtocolVersionId,
     ) -> anyhow::Result<Option<ProtocolUpgradeTx>>;
     /// Loads state hash for the L1 batch with the specified number. The batch is guaranteed to be present
     /// in the storage.
-    async fn load_batch_state_hash(&mut self, number: L1BatchNumber) -> anyhow::Result<H256>;
-}
-
-impl dyn StateKeeperIO {
-    pub(super) async fn wait_for_new_batch_env(
-        &mut self,
-        cursor: &IoCursor,
-        max_wait: Duration,
-    ) -> anyhow::Result<Option<(SystemEnv, L1BatchEnv)>> {
-        let Some(params) = self.wait_for_new_batch_params(cursor, max_wait).await? else {
-            return Ok(None);
-        };
-        let contracts = self
-            .load_base_system_contracts(params.protocol_version, cursor)
-            .await
-            .with_context(|| {
-                format!(
-                    "failed loading system contracts for protocol version {:?}",
-                    params.protocol_version
-                )
-            })?;
-        let previous_batch_hash = self
-            .load_batch_state_hash(cursor.l1_batch - 1)
-            .await
-            .context("cannot load state hash for previous L1 batch")?;
-        Ok(Some(params.into_env(
-            self.chain_id(),
-            contracts,
-            cursor,
-            previous_batch_hash,
-        )))
-    }
+    async fn load_batch_state_hash(&self, number: L1BatchNumber) -> anyhow::Result<H256>;
 }
diff --git a/core/lib/zksync_core/src/state_keeper/io/output_handler.rs b/core/node/state_keeper/src/io/output_handler.rs
similarity index 91%
rename from core/lib/zksync_core/src/state_keeper/io/output_handler.rs
rename to core/node/state_keeper/src/io/output_handler.rs
index d9a6797c0e93..ec254eaec669 100644
--- a/core/lib/zksync_core/src/state_keeper/io/output_handler.rs
+++ b/core/node/state_keeper/src/io/output_handler.rs
@@ -1,11 +1,11 @@
 //! Handling outputs produced by the state keeper.
 
-use std::fmt;
+use std::{fmt, sync::Arc};
 
 use anyhow::Context as _;
 use async_trait::async_trait;
 
-use crate::state_keeper::{io::IoCursor, updates::UpdatesManager};
+use crate::{io::IoCursor, updates::UpdatesManager};
 
 /// Handler for state keeper outputs (L2 blocks and L1 batches).
 #[async_trait]
@@ -20,7 +20,10 @@ pub trait StateKeeperOutputHandler: 'static + Send + fmt::Debug {
     async fn handle_l2_block(&mut self, updates_manager: &UpdatesManager) -> anyhow::Result<()>;
 
     /// Handles an L1 batch produced by the state keeper.
-    async fn handle_l1_batch(&mut self, _updates_manager: &UpdatesManager) -> anyhow::Result<()> {
+    async fn handle_l1_batch(
+        &mut self,
+        _updates_manager: Arc<UpdatesManager>,
+    ) -> anyhow::Result<()> {
         Ok(())
     }
 }
@@ -81,11 +84,11 @@ impl OutputHandler {
 
     pub(crate) async fn handle_l1_batch(
         &mut self,
-        updates_manager: &UpdatesManager,
+        updates_manager: Arc<UpdatesManager>,
     ) -> anyhow::Result<()> {
         for handler in &mut self.inner {
             handler
-                .handle_l1_batch(updates_manager)
+                .handle_l1_batch(updates_manager.clone())
                 .await
                 .with_context(|| {
                     format!(
diff --git a/core/lib/zksync_core/src/state_keeper/io/persistence.rs b/core/node/state_keeper/src/io/persistence.rs
similarity index 73%
rename from core/lib/zksync_core/src/state_keeper/io/persistence.rs
rename to core/node/state_keeper/src/io/persistence.rs
index 7e206514bec8..de9ac22e1777 100644
--- a/core/lib/zksync_core/src/state_keeper/io/persistence.rs
+++ b/core/node/state_keeper/src/io/persistence.rs
@@ -1,16 +1,19 @@
 //! State keeper persistence logic.
 
-use std::time::Instant;
+use std::{sync::Arc, time::Instant};
 
 use anyhow::Context as _;
 use async_trait::async_trait;
 use tokio::sync::{mpsc, oneshot};
-use zksync_dal::{ConnectionPool, Core};
+use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_shared_metrics::{BlockStage, APP_METRICS};
-use zksync_types::Address;
+use zksync_types::{writes::TreeWrite, Address};
+use zksync_utils::u256_to_h256;
 
-use crate::state_keeper::{
-    io::StateKeeperOutputHandler,
+use crate::{
+    io::{
+        seal_logic::l2_block_seal_subtasks::L2BlockSealProcess, IoCursor, StateKeeperOutputHandler,
+    },
     metrics::{L2BlockQueueStage, L2_BLOCK_METRICS},
     updates::{L2BlockSealCommand, UpdatesManager},
 };
@@ -148,6 +151,11 @@ impl StateKeeperPersistence {
 
 #[async_trait]
 impl StateKeeperOutputHandler for StateKeeperPersistence {
+    async fn initialize(&mut self, cursor: &IoCursor) -> anyhow::Result<()> {
+        let mut connection = self.pool.connection_tagged("state_keeper").await?;
+        L2BlockSealProcess::clear_pending_l2_block(&mut connection, cursor.next_l2_block - 1).await
+    }
+
     async fn handle_l2_block(&mut self, updates_manager: &UpdatesManager) -> anyhow::Result<()> {
         let command =
             updates_manager.seal_l2_block_command(self.l2_shared_bridge_addr, self.pre_insert_txs);
@@ -155,16 +163,17 @@ impl StateKeeperOutputHandler for StateKeeperPersistence {
         Ok(())
     }
 
-    async fn handle_l1_batch(&mut self, updates_manager: &UpdatesManager) -> anyhow::Result<()> {
+    async fn handle_l1_batch(
+        &mut self,
+        updates_manager: Arc<UpdatesManager>,
+    ) -> anyhow::Result<()> {
         // We cannot start sealing an L1 batch until we've sealed all L2 blocks included in it.
         self.wait_for_all_commands().await;
 
-        let pool = self.pool.clone();
-        let mut storage = pool.connection_tagged("state_keeper").await?;
         let batch_number = updates_manager.l1_batch.number;
         updates_manager
             .seal_l1_batch(
-                &mut storage,
+                self.pool.clone(),
                 self.l2_shared_bridge_addr,
                 self.insert_protective_reads,
             )
@@ -204,8 +213,7 @@ impl L2BlockSealerTask {
         // Commands must be processed sequentially: a later L2 block cannot be saved before
         // an earlier one.
         while let Some(completable) = self.next_command().await {
-            let mut storage = self.pool.connection_tagged("state_keeper").await?;
-            completable.command.seal(&mut storage).await?;
+            completable.command.seal(self.pool.clone()).await?;
             if let Some(delta) = l2_block_seal_delta {
                 L2_BLOCK_METRICS.seal_delta.observe(delta.elapsed());
             }
@@ -240,28 +248,127 @@ impl L2BlockSealerTask {
     }
 }
 
+/// Stores tree writes for L1 batches to Postgres.
+/// It is expected to be run after `StateKeeperPersistence` as it appends data to `l1_batches` table.
+#[derive(Debug)]
+pub struct TreeWritesPersistence {
+    pool: ConnectionPool<Core>,
+}
+
+impl TreeWritesPersistence {
+    pub fn new(pool: ConnectionPool<Core>) -> Self {
+        Self { pool }
+    }
+}
+
+#[async_trait]
+impl StateKeeperOutputHandler for TreeWritesPersistence {
+    async fn handle_l2_block(&mut self, _updates_manager: &UpdatesManager) -> anyhow::Result<()> {
+        Ok(())
+    }
+
+    async fn handle_l1_batch(
+        &mut self,
+        updates_manager: Arc<UpdatesManager>,
+    ) -> anyhow::Result<()> {
+        let mut connection = self.pool.connection_tagged("state_keeper").await?;
+        let finished_batch = updates_manager
+            .l1_batch
+            .finished
+            .as_ref()
+            .context("L1 batch is not actually finished")?;
+
+        let mut next_index = connection
+            .storage_logs_dedup_dal()
+            .max_enumeration_index_by_l1_batch(updates_manager.l1_batch.number - 1)
+            .await?
+            .unwrap_or(0)
+            + 1;
+        let tree_input: Vec<_> = if let Some(state_diffs) = &finished_batch.state_diffs {
+            state_diffs
+                .iter()
+                .map(|diff| {
+                    let leaf_index = if diff.is_write_initial() {
+                        next_index += 1;
+                        next_index - 1
+                    } else {
+                        diff.enumeration_index
+                    };
+                    TreeWrite {
+                        address: diff.address,
+                        key: u256_to_h256(diff.key),
+                        value: u256_to_h256(diff.final_value),
+                        leaf_index,
+                    }
+                })
+                .collect()
+        } else {
+            let deduplicated_writes = finished_batch
+                .final_execution_state
+                .deduplicated_storage_logs
+                .iter()
+                .filter(|log_query| log_query.is_write());
+            let deduplicated_writes_hashed_keys: Vec<_> = deduplicated_writes
+                .clone()
+                .map(|log| log.key.hashed_key())
+                .collect();
+            let non_initial_writes = connection
+                .storage_logs_dal()
+                .get_l1_batches_and_indices_for_initial_writes(&deduplicated_writes_hashed_keys)
+                .await?;
+            deduplicated_writes
+                .map(|log| {
+                    let leaf_index = if let Some((_, leaf_index)) =
+                        non_initial_writes.get(&log.key.hashed_key())
+                    {
+                        *leaf_index
+                    } else {
+                        next_index += 1;
+                        next_index - 1
+                    };
+                    TreeWrite {
+                        address: *log.key.address(),
+                        key: *log.key.key(),
+                        value: log.value,
+                        leaf_index,
+                    }
+                })
+                .collect()
+        };
+
+        connection
+            .blocks_dal()
+            .set_tree_writes(updates_manager.l1_batch.number, tree_input)
+            .await?;
+
+        Ok(())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::collections::HashSet;
 
     use assert_matches::assert_matches;
     use futures::FutureExt;
-    use multivm::zk_evm_latest::ethereum_types::{H256, U256};
     use zksync_dal::CoreDal;
+    use zksync_multivm::zk_evm_latest::ethereum_types::{H256, U256};
     use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
     use zksync_types::{
-        api::TransactionStatus, block::BlockGasCount, tx::ExecutionMetrics, AccountTreeId,
-        L1BatchNumber, L2BlockNumber, StorageKey, StorageLogQueryType,
+        api::TransactionStatus, block::BlockGasCount, tx::ExecutionMetrics,
+        writes::StateDiffRecord, L1BatchNumber, L2BlockNumber, StorageLogKind,
     };
-    use zksync_utils::u256_to_h256;
+    use zksync_utils::h256_to_u256;
 
     use super::*;
-    use crate::state_keeper::{
+    use crate::{
         io::L2BlockParams,
+        testonly::default_vm_batch_result,
         tests::{
             create_execution_result, create_transaction, create_updates_manager,
-            default_l1_batch_env, default_system_env, default_vm_batch_result, Query,
+            default_l1_batch_env, default_system_env, Query,
         },
+        OutputHandler,
     };
 
     async fn test_l2_block_and_l1_batch_processing(
@@ -272,6 +379,12 @@ mod tests {
         insert_genesis_batch(&mut storage, &GenesisParams::mock())
             .await
             .unwrap();
+        let initial_writes_in_genesis_batch = storage
+            .storage_logs_dedup_dal()
+            .max_enumeration_index_by_l1_batch(L1BatchNumber(0))
+            .await
+            .unwrap()
+            .unwrap();
         // Save metadata for the genesis L1 batch so that we don't hang in `seal_l1_batch`.
         storage
             .blocks_dal()
@@ -280,10 +393,12 @@ mod tests {
             .unwrap();
         drop(storage);
 
-        let (mut persistence, l2_block_sealer) =
+        let (persistence, l2_block_sealer) =
             StateKeeperPersistence::new(pool.clone(), Address::default(), l2_block_sealer_capacity);
+        let mut output_handler = OutputHandler::new(Box::new(persistence))
+            .with_handler(Box::new(TreeWritesPersistence::new(pool.clone())));
         tokio::spawn(l2_block_sealer.run());
-        execute_mock_batch(&mut persistence).await;
+        execute_mock_batch(&mut output_handler).await;
 
         // Check that L2 block #1 and L1 batch #1 are persisted.
         let mut storage = pool.connection().await.unwrap();
@@ -319,9 +434,20 @@ mod tests {
             .await
             .unwrap();
         assert_eq!(protective_reads.len(), 1, "{protective_reads:?}");
+        let tree_writes = storage
+            .blocks_dal()
+            .get_tree_writes(L1BatchNumber(1))
+            .await
+            .unwrap()
+            .unwrap();
+        assert_eq!(tree_writes.len(), 1, "{tree_writes:?}");
+        // This write is initial and should have the next index.
+        let actual_index = tree_writes[0].leaf_index;
+        let expected_index = initial_writes_in_genesis_batch + 1;
+        assert_eq!(actual_index, expected_index);
     }
 
-    async fn execute_mock_batch(persistence: &mut StateKeeperPersistence) -> H256 {
+    async fn execute_mock_batch(output_handler: &mut OutputHandler) -> H256 {
         let l1_batch_env = default_l1_batch_env(1, 1, Address::random());
         let mut updates = UpdatesManager::new(&l1_batch_env, &default_system_env());
 
@@ -331,7 +457,7 @@ mod tests {
             (U256::from(1), Query::Read(U256::from(0))),
             (U256::from(2), Query::InitialWrite(U256::from(1))),
         ];
-        let tx_result = create_execution_result(0, storage_logs);
+        let tx_result = create_execution_result(storage_logs);
         let storage_logs = tx_result.logs.storage_logs.clone();
         updates.extend_from_executed_transaction(
             tx,
@@ -341,33 +467,35 @@ mod tests {
             ExecutionMetrics::default(),
             vec![],
         );
-        persistence.handle_l2_block(&updates).await.unwrap();
+        output_handler.handle_l2_block(&updates).await.unwrap();
         updates.push_l2_block(L2BlockParams {
             timestamp: 1,
             virtual_blocks: 1,
         });
 
         let mut batch_result = default_vm_batch_result();
-        batch_result
-            .final_execution_state
-            .deduplicated_storage_log_queries =
-            storage_logs.iter().map(|query| query.log_query).collect();
-        batch_result.initially_written_slots = Some(
+        batch_result.final_execution_state.deduplicated_storage_logs =
+            storage_logs.iter().map(|log| log.log).collect();
+        batch_result.state_diffs = Some(
             storage_logs
                 .into_iter()
-                .filter(|&log| log.log_type == StorageLogQueryType::InitialWrite)
-                .map(|log| {
-                    let key = StorageKey::new(
-                        AccountTreeId::new(log.log_query.address),
-                        u256_to_h256(log.log_query.key),
-                    );
-                    key.hashed_key()
+                .filter(|&log| log.log.kind == StorageLogKind::InitialWrite)
+                .map(|log| StateDiffRecord {
+                    address: *log.log.key.address(),
+                    key: h256_to_u256(*log.log.key.key()),
+                    derived_key: log.log.key.hashed_key().0,
+                    enumeration_index: 0,
+                    initial_value: h256_to_u256(log.previous_value),
+                    final_value: h256_to_u256(log.log.value),
                 })
                 .collect(),
         );
 
         updates.finish_batch(batch_result);
-        persistence.handle_l1_batch(&updates).await.unwrap();
+        output_handler
+            .handle_l1_batch(Arc::new(updates))
+            .await
+            .unwrap();
 
         tx_hash
     }
@@ -402,9 +530,10 @@ mod tests {
         let (mut persistence, l2_block_sealer) =
             StateKeeperPersistence::new(pool.clone(), Address::default(), 1);
         persistence = persistence.with_tx_insertion().without_protective_reads();
+        let mut output_handler = OutputHandler::new(Box::new(persistence));
         tokio::spawn(l2_block_sealer.run());
 
-        let tx_hash = execute_mock_batch(&mut persistence).await;
+        let tx_hash = execute_mock_batch(&mut output_handler).await;
 
         // Check that the transaction is persisted.
         let mut storage = pool.connection().await.unwrap();
diff --git a/core/node/state_keeper/src/io/seal_logic/l2_block_seal_subtasks.rs b/core/node/state_keeper/src/io/seal_logic/l2_block_seal_subtasks.rs
new file mode 100644
index 000000000000..03495c0d98b4
--- /dev/null
+++ b/core/node/state_keeper/src/io/seal_logic/l2_block_seal_subtasks.rs
@@ -0,0 +1,552 @@
+use anyhow::Context;
+use async_trait::async_trait;
+use zksync_dal::{Connection, Core, CoreDal};
+use zksync_types::{event::extract_added_tokens, L2BlockNumber};
+
+use crate::{
+    io::seal_logic::SealStrategy,
+    metrics::{L2BlockSealStage, L2_BLOCK_METRICS},
+    updates::L2BlockSealCommand,
+};
+
+/// Helper struct that encapsulates parallel l2 block sealing logic.
+#[derive(Debug)]
+pub struct L2BlockSealProcess;
+
+impl L2BlockSealProcess {
+    pub fn all_subtasks() -> Vec<Box<dyn L2BlockSealSubtask>> {
+        vec![
+            Box::new(MarkTransactionsInL2BlockSubtask),
+            Box::new(InsertStorageLogsSubtask),
+            Box::new(InsertFactoryDepsSubtask),
+            Box::new(InsertTokensSubtask),
+            Box::new(InsertEventsSubtask),
+            Box::new(InsertL2ToL1LogsSubtask),
+        ]
+    }
+
+    pub fn subtasks_len() -> u32 {
+        Self::all_subtasks().len() as u32
+    }
+
+    pub async fn run_subtasks(
+        command: &L2BlockSealCommand,
+        strategy: &mut SealStrategy<'_>,
+    ) -> anyhow::Result<()> {
+        let subtasks = Self::all_subtasks();
+        match strategy {
+            SealStrategy::Sequential(connection) => {
+                for subtask in subtasks {
+                    let subtask_name = subtask.name();
+                    subtask
+                        .run(command, connection)
+                        .await
+                        .context(subtask_name)?;
+                }
+            }
+            SealStrategy::Parallel(pool) => {
+                let pool = &*pool;
+                let handles = subtasks.into_iter().map(|subtask| {
+                    let subtask_name = subtask.name();
+                    async move {
+                        let mut connection = pool.connection_tagged("state_keeper").await?;
+                        subtask
+                            .run(command, &mut connection)
+                            .await
+                            .context(subtask_name)
+                    }
+                });
+                futures::future::try_join_all(handles).await?;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Clears pending l2 block data from the database.
+    pub async fn clear_pending_l2_block(
+        connection: &mut Connection<'_, Core>,
+        last_sealed_l2_block: L2BlockNumber,
+    ) -> anyhow::Result<()> {
+        let seal_subtasks = L2BlockSealProcess::all_subtasks();
+        for subtask in seal_subtasks {
+            subtask.rollback(connection, last_sealed_l2_block).await?;
+        }
+
+        Ok(())
+    }
+}
+
+/// An abstraction that represents l2 block seal sub-task that can be run in parallel with other sub-tasks.
+#[async_trait::async_trait]
+pub trait L2BlockSealSubtask: Send + Sync + 'static {
+    /// Returns sub-task name.
+    fn name(&self) -> &'static str;
+
+    /// Runs seal process.
+    async fn run(
+        self: Box<Self>,
+        command: &L2BlockSealCommand,
+        connection: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<()>;
+
+    /// Rollbacks data that was saved to database for the pending L2 block.
+    async fn rollback(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        last_sealed_l2_block: L2BlockNumber,
+    ) -> anyhow::Result<()>;
+}
+
+#[derive(Debug)]
+pub(super) struct MarkTransactionsInL2BlockSubtask;
+
+#[async_trait]
+impl L2BlockSealSubtask for MarkTransactionsInL2BlockSubtask {
+    fn name(&self) -> &'static str {
+        "mark_transactions_in_l2_block"
+    }
+
+    async fn run(
+        self: Box<Self>,
+        command: &L2BlockSealCommand,
+        connection: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<()> {
+        let progress = L2_BLOCK_METRICS.start(
+            L2BlockSealStage::MarkTransactionsInL2Block,
+            command.is_l2_block_fictive(),
+        );
+
+        connection
+            .transactions_dal()
+            .mark_txs_as_executed_in_l2_block(
+                command.l2_block.number,
+                &command.l2_block.executed_transactions,
+                command.base_fee_per_gas.into(),
+                command.l2_block.protocol_version,
+                command.pre_insert_txs,
+            )
+            .await?;
+
+        progress.observe(command.l2_block.executed_transactions.len());
+        Ok(())
+    }
+
+    async fn rollback(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        last_sealed_l2_block: L2BlockNumber,
+    ) -> anyhow::Result<()> {
+        storage
+            .transactions_dal()
+            .reset_transactions_state(last_sealed_l2_block)
+            .await?;
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+pub(super) struct InsertStorageLogsSubtask;
+
+#[async_trait]
+impl L2BlockSealSubtask for InsertStorageLogsSubtask {
+    fn name(&self) -> &'static str {
+        "insert_storage_logs"
+    }
+
+    async fn run(
+        self: Box<Self>,
+        command: &L2BlockSealCommand,
+        connection: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<()> {
+        let is_fictive = command.is_l2_block_fictive();
+        let write_logs = command.extract_deduplicated_write_logs();
+
+        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertStorageLogs, is_fictive);
+
+        connection
+            .storage_logs_dal()
+            .insert_storage_logs(command.l2_block.number, &write_logs)
+            .await?;
+
+        progress.observe(write_logs.len());
+        Ok(())
+    }
+
+    async fn rollback(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        last_sealed_l2_block: L2BlockNumber,
+    ) -> anyhow::Result<()> {
+        storage
+            .storage_logs_dal()
+            .roll_back_storage_logs(last_sealed_l2_block)
+            .await?;
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+pub(super) struct InsertFactoryDepsSubtask;
+
+#[async_trait]
+impl L2BlockSealSubtask for InsertFactoryDepsSubtask {
+    fn name(&self) -> &'static str {
+        "insert_factory_deps"
+    }
+
+    async fn run(
+        self: Box<Self>,
+        command: &L2BlockSealCommand,
+        connection: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<()> {
+        let progress = L2_BLOCK_METRICS.start(
+            L2BlockSealStage::InsertFactoryDeps,
+            command.is_l2_block_fictive(),
+        );
+
+        if !command.l2_block.new_factory_deps.is_empty() {
+            connection
+                .factory_deps_dal()
+                .insert_factory_deps(command.l2_block.number, &command.l2_block.new_factory_deps)
+                .await?;
+        }
+        progress.observe(command.l2_block.new_factory_deps.len());
+
+        Ok(())
+    }
+
+    async fn rollback(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        last_sealed_l2_block: L2BlockNumber,
+    ) -> anyhow::Result<()> {
+        storage
+            .factory_deps_dal()
+            .roll_back_factory_deps(last_sealed_l2_block)
+            .await?;
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+pub(super) struct InsertTokensSubtask;
+
+#[async_trait]
+impl L2BlockSealSubtask for InsertTokensSubtask {
+    fn name(&self) -> &'static str {
+        "insert_tokens"
+    }
+
+    async fn run(
+        self: Box<Self>,
+        command: &L2BlockSealCommand,
+        connection: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<()> {
+        let is_fictive = command.is_l2_block_fictive();
+        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::ExtractAddedTokens, is_fictive);
+        let added_tokens =
+            extract_added_tokens(command.l2_shared_bridge_addr, &command.l2_block.events);
+        progress.observe(added_tokens.len());
+
+        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertTokens, is_fictive);
+        if !added_tokens.is_empty() {
+            connection.tokens_dal().add_tokens(&added_tokens).await?;
+        }
+        progress.observe(added_tokens.len());
+
+        Ok(())
+    }
+
+    async fn rollback(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        last_sealed_l2_block: L2BlockNumber,
+    ) -> anyhow::Result<()> {
+        storage
+            .tokens_dal()
+            .roll_back_tokens(last_sealed_l2_block)
+            .await?;
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+pub(super) struct InsertEventsSubtask;
+
+#[async_trait]
+impl L2BlockSealSubtask for InsertEventsSubtask {
+    fn name(&self) -> &'static str {
+        "insert_events"
+    }
+
+    async fn run(
+        self: Box<Self>,
+        command: &L2BlockSealCommand,
+        connection: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<()> {
+        let is_fictive = command.is_l2_block_fictive();
+        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::ExtractEvents, is_fictive);
+        let l2_block_events = command.extract_events(is_fictive);
+        let l2_block_event_count: usize =
+            l2_block_events.iter().map(|(_, events)| events.len()).sum();
+        progress.observe(l2_block_event_count);
+
+        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertEvents, is_fictive);
+        connection
+            .events_dal()
+            .save_events(command.l2_block.number, &l2_block_events)
+            .await?;
+        progress.observe(l2_block_event_count);
+        Ok(())
+    }
+
+    async fn rollback(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        last_sealed_l2_block: L2BlockNumber,
+    ) -> anyhow::Result<()> {
+        storage
+            .events_dal()
+            .roll_back_events(last_sealed_l2_block)
+            .await?;
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+pub(super) struct InsertL2ToL1LogsSubtask;
+
+#[async_trait]
+impl L2BlockSealSubtask for InsertL2ToL1LogsSubtask {
+    fn name(&self) -> &'static str {
+        "insert_l2_to_l1_logs"
+    }
+
+    async fn run(
+        self: Box<Self>,
+        command: &L2BlockSealCommand,
+        connection: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<()> {
+        let is_fictive = command.is_l2_block_fictive();
+        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::ExtractL2ToL1Logs, is_fictive);
+
+        let user_l2_to_l1_logs = command.extract_user_l2_to_l1_logs(is_fictive);
+        let user_l2_to_l1_log_count: usize = user_l2_to_l1_logs
+            .iter()
+            .map(|(_, l2_to_l1_logs)| l2_to_l1_logs.len())
+            .sum();
+
+        progress.observe(user_l2_to_l1_log_count);
+
+        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertL2ToL1Logs, is_fictive);
+        if !user_l2_to_l1_logs.is_empty() {
+            connection
+                .events_dal()
+                .save_user_l2_to_l1_logs(command.l2_block.number, &user_l2_to_l1_logs)
+                .await?;
+        }
+        progress.observe(user_l2_to_l1_log_count);
+        Ok(())
+    }
+
+    async fn rollback(
+        &self,
+        storage: &mut Connection<'_, Core>,
+        last_sealed_l2_block: L2BlockNumber,
+    ) -> anyhow::Result<()> {
+        storage
+            .events_dal()
+            .roll_back_l2_to_l1_logs(last_sealed_l2_block)
+            .await?;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use zksync_dal::{ConnectionPool, Core};
+    use zksync_multivm::{
+        utils::{get_max_batch_gas_limit, get_max_gas_per_pubdata_byte},
+        zk_evm_latest::ethereum_types::H256,
+        VmVersion,
+    };
+    use zksync_node_test_utils::create_l2_transaction;
+    use zksync_types::{
+        block::L2BlockHeader,
+        l2_to_l1_log::{L2ToL1Log, UserL2ToL1Log},
+        tx::{tx_execution_info::TxExecutionStatus, TransactionExecutionResult},
+        AccountTreeId, Address, L1BatchNumber, ProtocolVersionId, StorageKey, StorageLog,
+        StorageLogKind, StorageLogWithPreviousValue, VmEvent,
+    };
+    use zksync_utils::h256_to_u256;
+
+    use super::*;
+    use crate::updates::L2BlockUpdates;
+
+    #[tokio::test]
+    async fn rollback_pending_l2_block() {
+        let pool =
+            ConnectionPool::<Core>::constrained_test_pool(L2BlockSealProcess::subtasks_len()).await;
+
+        // Prepare data.
+        let tx = create_l2_transaction(1, 1);
+        pool.connection()
+            .await
+            .unwrap()
+            .transactions_dal()
+            .insert_transaction_l2(&tx, Default::default())
+            .await
+            .unwrap();
+        let tx_hash = tx.hash();
+        let executed_transactions = vec![TransactionExecutionResult {
+            transaction: tx.into(),
+            hash: tx_hash,
+            execution_info: Default::default(),
+            execution_status: TxExecutionStatus::Success,
+            refunded_gas: 0,
+            operator_suggested_refund: 0,
+            compressed_bytecodes: Vec::new(),
+            call_traces: Vec::new(),
+            revert_reason: None,
+        }];
+        let events = vec![VmEvent {
+            location: (L1BatchNumber(1), 0),
+            address: Address::zero(),
+            indexed_topics: Vec::new(),
+            value: Vec::new(),
+        }];
+        let storage_key = StorageKey::new(AccountTreeId::new(Address::zero()), H256::zero());
+        let storage_value = H256::from_low_u64_be(1);
+        let storage_logs = vec![StorageLogWithPreviousValue {
+            log: StorageLog {
+                key: storage_key,
+                value: storage_value,
+                kind: StorageLogKind::InitialWrite,
+            },
+            previous_value: H256::zero(),
+        }];
+        let user_l2_to_l1_logs = vec![UserL2ToL1Log(L2ToL1Log {
+            shard_id: 0,
+            is_service: false,
+            tx_number_in_block: 0,
+            sender: Address::zero(),
+            key: H256::zero(),
+            value: H256::zero(),
+        })];
+
+        let bytecode_hash = H256::repeat_byte(0x12);
+        let bytecode = vec![0u8; 32];
+        let new_factory_deps = vec![(bytecode_hash, bytecode)].into_iter().collect();
+        let l2_block_seal_command = L2BlockSealCommand {
+            l1_batch_number: L1BatchNumber(1),
+            l2_block: L2BlockUpdates {
+                executed_transactions,
+                events,
+                storage_logs,
+                user_l2_to_l1_logs,
+                system_l2_to_l1_logs: Default::default(),
+                new_factory_deps,
+                l1_gas_count: Default::default(),
+                block_execution_metrics: Default::default(),
+                txs_encoding_size: Default::default(),
+                payload_encoding_size: Default::default(),
+                timestamp: 1,
+                number: L2BlockNumber(1),
+                prev_block_hash: Default::default(),
+                virtual_blocks: Default::default(),
+                protocol_version: ProtocolVersionId::latest(),
+            },
+            first_tx_index: 0,
+            fee_account_address: Default::default(),
+            fee_input: Default::default(),
+            base_fee_per_gas: Default::default(),
+            base_system_contracts_hashes: Default::default(),
+            protocol_version: Some(ProtocolVersionId::latest()),
+            l2_shared_bridge_addr: Default::default(),
+            pre_insert_txs: false,
+        };
+
+        // Run.
+        let mut strategy = SealStrategy::Parallel(&pool);
+        L2BlockSealProcess::run_subtasks(&l2_block_seal_command, &mut strategy)
+            .await
+            .unwrap();
+
+        // Check factory dependency is saved.
+        let mut connection = pool.connection().await.unwrap();
+        let factory_deps = connection
+            .factory_deps_dal()
+            .get_factory_deps(&vec![bytecode_hash].into_iter().collect())
+            .await;
+        assert!(factory_deps.contains_key(&h256_to_u256(bytecode_hash)));
+
+        // Rollback.
+        L2BlockSealProcess::clear_pending_l2_block(&mut connection, L2BlockNumber(0))
+            .await
+            .unwrap();
+
+        // Check factory dependency was removed.
+        let factory_deps = connection
+            .factory_deps_dal()
+            .get_factory_deps(&vec![bytecode_hash].into_iter().collect())
+            .await;
+        assert!(factory_deps.is_empty());
+        drop(connection);
+
+        // Run again.
+        let mut strategy = SealStrategy::Parallel(&pool);
+        L2BlockSealProcess::run_subtasks(&l2_block_seal_command, &mut strategy)
+            .await
+            .unwrap();
+
+        // Check DAL doesn't return tx receipt before block header is saved.
+        let mut connection = pool.connection().await.unwrap();
+        let tx_receipt = connection
+            .transactions_web3_dal()
+            .get_transaction_receipts(&[tx_hash])
+            .await
+            .unwrap()
+            .first()
+            .cloned();
+        assert!(tx_receipt.is_none());
+
+        // Insert block header.
+        let l2_block_header = L2BlockHeader {
+            number: l2_block_seal_command.l2_block.number,
+            timestamp: l2_block_seal_command.l2_block.timestamp,
+            hash: l2_block_seal_command.l2_block.get_l2_block_hash(),
+            l1_tx_count: 0,
+            l2_tx_count: 1,
+            fee_account_address: l2_block_seal_command.fee_account_address,
+            base_fee_per_gas: l2_block_seal_command.base_fee_per_gas,
+            batch_fee_input: l2_block_seal_command.fee_input,
+            base_system_contracts_hashes: l2_block_seal_command.base_system_contracts_hashes,
+            protocol_version: l2_block_seal_command.protocol_version,
+            gas_per_pubdata_limit: get_max_gas_per_pubdata_byte(VmVersion::latest()),
+            virtual_blocks: l2_block_seal_command.l2_block.virtual_blocks,
+            gas_limit: get_max_batch_gas_limit(VmVersion::latest()),
+        };
+        connection
+            .protocol_versions_dal()
+            .save_protocol_version_with_tx(&Default::default())
+            .await
+            .unwrap();
+        connection
+            .blocks_dal()
+            .insert_l2_block(&l2_block_header)
+            .await
+            .unwrap();
+
+        // Check tx receipt.
+        let tx_receipt = connection
+            .transactions_web3_dal()
+            .get_transaction_receipts(&[tx_hash])
+            .await
+            .unwrap()
+            .remove(0);
+        assert_eq!(tx_receipt.block_number.as_u32(), 1);
+        assert_eq!(tx_receipt.logs.len(), 1);
+        assert_eq!(tx_receipt.l2_to_l1_logs.len(), 1);
+    }
+}
diff --git a/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs b/core/node/state_keeper/src/io/seal_logic/mod.rs
similarity index 61%
rename from core/lib/zksync_core/src/state_keeper/io/seal_logic.rs
rename to core/node/state_keeper/src/io/seal_logic/mod.rs
index d04f17b2c22f..92630015f2a2 100644
--- a/core/lib/zksync_core/src/state_keeper/io/seal_logic.rs
+++ b/core/node/state_keeper/src/io/seal_logic/mod.rs
@@ -1,34 +1,34 @@
 //! This module is a source-of-truth on what is expected to be done when sealing a block.
 //! It contains the logic of the block sealing, which is used by both the mempool-based and external node IO.
 
-use std::time::{Duration, Instant};
+use std::{
+    ops,
+    time::{Duration, Instant},
+};
 
 use anyhow::Context as _;
 use itertools::Itertools;
-use multivm::utils::{get_max_batch_gas_limit, get_max_gas_per_pubdata_byte};
-use zksync_dal::{Connection, Core, CoreDal};
+use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
+use zksync_multivm::utils::{get_max_batch_gas_limit, get_max_gas_per_pubdata_byte};
 use zksync_shared_metrics::{BlockStage, L2BlockStage, APP_METRICS};
 use zksync_types::{
     block::{L1BatchHeader, L2BlockHeader},
-    event::{extract_added_tokens, extract_long_l2_to_l1_messages},
+    event::extract_long_l2_to_l1_messages,
     helpers::unix_timestamp_ms,
-    l1::L1Tx,
-    l2::L2Tx,
-    l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
-    protocol_upgrade::ProtocolUpgradeTx,
+    l2_to_l1_log::UserL2ToL1Log,
     storage_writes_deduplicator::{ModifiedSlot, StorageWritesDeduplicator},
     tx::{
         tx_execution_info::DeduplicatedWritesMetrics, IncludedTxLocation,
         TransactionExecutionResult,
     },
     utils::display_timestamp,
-    zk_evm_types::LogQuery,
-    AccountTreeId, Address, ExecuteTransactionCommon, L1BlockNumber, ProtocolVersionId, StorageKey,
-    StorageLog, Transaction, VmEvent, H256,
+    Address, ExecuteTransactionCommon, ProtocolVersionId, StorageKey, StorageLog, Transaction,
+    VmEvent, H256,
 };
 use zksync_utils::u256_to_h256;
 
-use crate::state_keeper::{
+use crate::{
+    io::seal_logic::l2_block_seal_subtasks::L2BlockSealProcess,
     metrics::{
         L1BatchSealStage, L2BlockSealStage, TxExecutionType, KEEPER_METRICS, L1_BATCH_METRICS,
         L2_BLOCK_METRICS,
@@ -36,13 +36,15 @@ use crate::state_keeper::{
     updates::{L2BlockSealCommand, UpdatesManager},
 };
 
+pub mod l2_block_seal_subtasks;
+
 impl UpdatesManager {
     /// Persists an L1 batch in the storage.
     /// This action includes a creation of an empty "fictive" L2 block that contains
     /// the events generated during the bootloader "tip phase". Returns updates for this fictive L2 block.
     pub(super) async fn seal_l1_batch(
         &self,
-        storage: &mut Connection<'_, Core>,
+        pool: ConnectionPool<Core>,
         l2_shared_bridge_addr: Address,
         insert_protective_reads: bool,
     ) -> anyhow::Result<()> {
@@ -52,7 +54,6 @@ impl UpdatesManager {
             .finished
             .as_ref()
             .context("L1 batch is not actually finished")?;
-        let mut transaction = storage.start_transaction().await?;
 
         let progress = L1_BATCH_METRICS.start(L1BatchSealStage::FictiveL2Block);
         // Seal fictive L2 block with last events and storage logs.
@@ -60,10 +61,19 @@ impl UpdatesManager {
             l2_shared_bridge_addr,
             false, // fictive L2 blocks don't have txs, so it's fine to pass `false` here.
         );
+
+        let mut connection = pool.connection_tagged("state_keeper").await?;
+        let transaction = connection.start_transaction().await?;
+
+        // We rely on the fact that fictive L2 block and L1 batch data is saved in the same transaction.
+        let mut strategy = SealStrategy::Sequential(transaction);
         l2_block_command
-            .seal_inner(&mut transaction, true)
+            .seal_inner(&mut strategy, true)
             .await
             .context("failed persisting fictive L2 block")?;
+        let SealStrategy::Sequential(mut transaction) = strategy else {
+            panic!("Sealing L2 block should not mutate type of strategy");
+        };
         progress.observe(None);
 
         let progress = L1_BATCH_METRICS.start(L1BatchSealStage::LogDeduplication);
@@ -71,7 +81,7 @@ impl UpdatesManager {
         progress.observe(
             finished_batch
                 .final_execution_state
-                .deduplicated_storage_log_queries
+                .deduplicated_storage_logs
                 .len(),
         );
 
@@ -79,7 +89,7 @@ impl UpdatesManager {
         let (dedup_writes_count, dedup_reads_count) = log_query_write_read_counts(
             finished_batch
                 .final_execution_state
-                .deduplicated_storage_log_queries
+                .deduplicated_storage_logs
                 .iter(),
         );
 
@@ -127,6 +137,7 @@ impl UpdatesManager {
             .final_bootloader_memory
             .clone()
             .unwrap_or_default();
+
         transaction
             .blocks_dal()
             .insert_l1_batch(
@@ -157,13 +168,15 @@ impl UpdatesManager {
             .await?;
         progress.observe(None);
 
-        let (deduplicated_writes, protective_reads): (Vec<_>, Vec<_>) = finished_batch
-            .final_execution_state
-            .deduplicated_storage_log_queries
-            .iter()
-            .partition(|log_query| log_query.rw_flag);
         if insert_protective_reads {
             let progress = L1_BATCH_METRICS.start(L1BatchSealStage::InsertProtectiveReads);
+            let protective_reads: Vec<_> = finished_batch
+                .final_execution_state
+                .deduplicated_storage_logs
+                .iter()
+                .filter(|log_query| !log_query.is_write())
+                .copied()
+                .collect();
             transaction
                 .storage_logs_dedup_dal()
                 .insert_protective_reads(self.l1_batch.number, &protective_reads)
@@ -172,50 +185,54 @@ impl UpdatesManager {
         }
 
         let progress = L1_BATCH_METRICS.start(L1BatchSealStage::FilterWrittenSlots);
-        let written_storage_keys: Vec<_> =
-            if let Some(initially_written_slots) = &finished_batch.initially_written_slots {
-                deduplicated_writes
-                    .iter()
-                    .filter_map(|log| {
-                        let key =
-                            StorageKey::new(AccountTreeId::new(log.address), u256_to_h256(log.key));
-                        initially_written_slots
-                            .contains(&key.hashed_key())
-                            .then_some(key)
-                    })
-                    .collect()
+        let (initial_writes, all_writes_len): (Vec<_>, usize) =
+            if let Some(state_diffs) = &finished_batch.state_diffs {
+                let all_writes_len = state_diffs.len();
+
+                (
+                    state_diffs
+                        .iter()
+                        .filter(|diff| diff.is_write_initial())
+                        .map(|diff| {
+                            H256(StorageKey::raw_hashed_key(
+                                &diff.address,
+                                &u256_to_h256(diff.key),
+                            ))
+                        })
+                        .collect(),
+                    all_writes_len,
+                )
             } else {
-                let deduplicated_writes_hashed_keys: Vec<_> = deduplicated_writes
+                let deduplicated_writes_hashed_keys_iter = finished_batch
+                    .final_execution_state
+                    .deduplicated_storage_logs
                     .iter()
-                    .map(|log| {
-                        H256(StorageKey::raw_hashed_key(
-                            &log.address,
-                            &u256_to_h256(log.key),
-                        ))
-                    })
-                    .collect();
+                    .filter(|log| log.is_write())
+                    .map(|log| log.key.hashed_key());
+
+                let deduplicated_writes_hashed_keys: Vec<_> =
+                    deduplicated_writes_hashed_keys_iter.clone().collect();
+                let all_writes_len = deduplicated_writes_hashed_keys.len();
                 let non_initial_writes = transaction
                     .storage_logs_dedup_dal()
                     .filter_written_slots(&deduplicated_writes_hashed_keys)
                     .await?;
 
-                deduplicated_writes
-                    .iter()
-                    .filter_map(|log| {
-                        let key =
-                            StorageKey::new(AccountTreeId::new(log.address), u256_to_h256(log.key));
-                        (!non_initial_writes.contains(&key.hashed_key())).then_some(key)
-                    })
-                    .collect()
+                (
+                    deduplicated_writes_hashed_keys_iter
+                        .filter(|hashed_key| !non_initial_writes.contains(hashed_key))
+                        .collect(),
+                    all_writes_len,
+                )
             };
-        progress.observe(deduplicated_writes.len());
+        progress.observe(all_writes_len);
 
         let progress = L1_BATCH_METRICS.start(L1BatchSealStage::InsertInitialWrites);
         transaction
             .storage_logs_dedup_dal()
-            .insert_initial_writes(self.l1_batch.number, &written_storage_keys)
+            .insert_initial_writes(self.l1_batch.number, &initial_writes)
             .await?;
-        progress.observe(written_storage_keys.len());
+        progress.observe(initial_writes.len());
 
         let progress = L1_BATCH_METRICS.start(L1BatchSealStage::CommitL1Batch);
         transaction.commit().await?;
@@ -224,7 +241,7 @@ impl UpdatesManager {
         let writes_metrics = self.storage_writes_deduplicator.metrics();
         // Sanity check metrics.
         anyhow::ensure!(
-            deduplicated_writes.len()
+            all_writes_len
                 == writes_metrics.initial_storage_writes + writes_metrics.repeated_storage_writes,
             "Results of in-flight and common deduplications are mismatched"
         );
@@ -260,56 +277,53 @@ impl UpdatesManager {
     }
 }
 
-impl L2BlockSealCommand {
-    pub(super) async fn seal(&self, storage: &mut Connection<'_, Core>) -> anyhow::Result<()> {
-        self.seal_inner(storage, false)
-            .await
-            .with_context(|| format!("failed sealing L2 block #{}", self.l2_block.number))
+#[derive(Debug)]
+pub enum SealStrategy<'pool> {
+    Sequential(Connection<'pool, Core>),
+    Parallel(&'pool ConnectionPool<Core>),
+}
+
+// As opposed to `Cow` from `std`; a union of an owned type and a mutable ref to it
+enum Goat<'a, T> {
+    Owned(T),
+    Borrowed(&'a mut T),
+}
+
+impl<T> ops::Deref for Goat<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        match self {
+            Self::Owned(value) => value,
+            Self::Borrowed(value) => value,
+        }
     }
+}
 
-    async fn insert_transactions(
-        &self,
-        transaction: &mut Connection<'_, Core>,
-    ) -> anyhow::Result<()> {
-        for tx_result in &self.l2_block.executed_transactions {
-            let tx = tx_result.transaction.clone();
-            let tx_hash = tx.hash();
-
-            match &tx.common_data {
-                ExecuteTransactionCommon::L1(_) => {
-                    // `unwrap` is safe due to the check above
-                    let l1_tx = L1Tx::try_from(tx).unwrap();
-                    let l1_block_number = L1BlockNumber(l1_tx.common_data.eth_block as u32);
-                    transaction
-                        .transactions_dal()
-                        .insert_transaction_l1(&l1_tx, l1_block_number)
-                        .await
-                        .with_context(|| format!("failed persisting L1 transaction {tx_hash:?}"))?;
-                }
-                ExecuteTransactionCommon::L2(_) => {
-                    // `unwrap` is safe due to the check above
-                    let l2_tx = L2Tx::try_from(tx).unwrap();
-                    // Using `Default` for execution metrics should be OK here, since this data is not used on the EN.
-                    transaction
-                        .transactions_dal()
-                        .insert_transaction_l2(&l2_tx, Default::default())
-                        .await
-                        .with_context(|| format!("failed persisting L2 transaction {tx_hash:?}"))?;
-                }
-                ExecuteTransactionCommon::ProtocolUpgrade(_) => {
-                    // `unwrap` is safe due to the check above
-                    let protocol_system_upgrade_tx = ProtocolUpgradeTx::try_from(tx).unwrap();
-                    transaction
-                        .transactions_dal()
-                        .insert_system_transaction(&protocol_system_upgrade_tx)
-                        .await
-                        .with_context(|| {
-                            format!("failed persisting protocol upgrade transaction {tx_hash:?}")
-                        })?;
-                }
-            }
+impl<T> ops::DerefMut for Goat<'_, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        match self {
+            Self::Owned(value) => value,
+            Self::Borrowed(value) => value,
         }
-        Ok(())
+    }
+}
+
+impl<'pool> SealStrategy<'pool> {
+    async fn connection(&mut self) -> anyhow::Result<Goat<'_, Connection<'pool, Core>>> {
+        Ok(match self {
+            Self::Parallel(pool) => Goat::Owned(pool.connection_tagged("state_keeper").await?),
+            Self::Sequential(conn) => Goat::Borrowed(conn),
+        })
+    }
+}
+
+impl L2BlockSealCommand {
+    pub(super) async fn seal(&self, pool: ConnectionPool<Core>) -> anyhow::Result<()> {
+        let l2_block_number = self.l2_block.number;
+        self.seal_inner(&mut SealStrategy::Parallel(&pool), false)
+            .await
+            .with_context(|| format!("failed sealing L2 block #{l2_block_number}"))
     }
 
     /// Seals an L2 block with the given number.
@@ -323,42 +337,36 @@ impl L2BlockSealCommand {
     /// `l2_shared_bridge_addr` is required to extract the information on newly added tokens.
     async fn seal_inner(
         &self,
-        storage: &mut Connection<'_, Core>,
+        strategy: &mut SealStrategy<'_>,
         is_fictive: bool,
     ) -> anyhow::Result<()> {
+        let started_at = Instant::now();
         self.ensure_valid_l2_block(is_fictive)
             .context("L2 block is invalid")?;
 
-        let mut transaction = storage.start_transaction().await?;
-        if self.pre_insert_txs {
-            let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::PreInsertTxs, is_fictive);
-            self.insert_transactions(&mut transaction)
-                .await
-                .context("failed persisting transactions in L2 block")?;
-            progress.observe(Some(self.l2_block.executed_transactions.len()));
-        }
-
-        let l1_batch_number = self.l1_batch_number;
-        let l2_block_number = self.l2_block.number;
-        let started_at = Instant::now();
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertL2BlockHeader, is_fictive);
-
         let (l1_tx_count, l2_tx_count) = l1_l2_tx_count(&self.l2_block.executed_transactions);
         tracing::info!(
             "Sealing L2 block {l2_block_number} with timestamp {ts} (L1 batch {l1_batch_number}) \
              with {total_tx_count} ({l2_tx_count} L2 + {l1_tx_count} L1) txs, {event_count} events",
+            l2_block_number = self.l2_block.number,
+            l1_batch_number = self.l1_batch_number,
             ts = display_timestamp(self.l2_block.timestamp),
             total_tx_count = l1_tx_count + l2_tx_count,
             event_count = self.l2_block.events.len()
         );
 
+        // Run sub-tasks in parallel.
+        L2BlockSealProcess::run_subtasks(self, strategy).await?;
+
+        // Seal block header at the last step.
+        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertL2BlockHeader, is_fictive);
         let definite_vm_version = self
             .protocol_version
             .unwrap_or_else(ProtocolVersionId::last_potentially_undefined)
             .into();
 
         let l2_block_header = L2BlockHeader {
-            number: l2_block_number,
+            number: self.l2_block.number,
             timestamp: self.l2_block.timestamp,
             hash: self.l2_block.get_l2_block_hash(),
             l1_tx_count: l1_tx_count as u16,
@@ -373,94 +381,14 @@ impl L2BlockSealCommand {
             gas_limit: get_max_batch_gas_limit(definite_vm_version),
         };
 
-        transaction
+        let mut connection = strategy.connection().await?;
+        connection
             .blocks_dal()
             .insert_l2_block(&l2_block_header)
             .await?;
         progress.observe(None);
 
-        let progress =
-            L2_BLOCK_METRICS.start(L2BlockSealStage::MarkTransactionsInL2Block, is_fictive);
-        transaction
-            .transactions_dal()
-            .mark_txs_as_executed_in_l2_block(
-                l2_block_number,
-                &self.l2_block.executed_transactions,
-                self.base_fee_per_gas.into(),
-            )
-            .await?;
-        progress.observe(self.l2_block.executed_transactions.len());
-
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertStorageLogs, is_fictive);
-        let write_logs = self.extract_deduplicated_write_logs(is_fictive);
-        let write_log_count: usize = write_logs.iter().map(|(_, logs)| logs.len()).sum();
-        transaction
-            .storage_logs_dal()
-            .insert_storage_logs(l2_block_number, &write_logs)
-            .await?;
-        progress.observe(write_log_count);
-
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertFactoryDeps, is_fictive);
-        let new_factory_deps = &self.l2_block.new_factory_deps;
-        let new_factory_deps_count = new_factory_deps.len();
-        if !new_factory_deps.is_empty() {
-            transaction
-                .factory_deps_dal()
-                .insert_factory_deps(l2_block_number, new_factory_deps)
-                .await?;
-        }
-        progress.observe(new_factory_deps_count);
-
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::ExtractAddedTokens, is_fictive);
-        let added_tokens = extract_added_tokens(self.l2_shared_bridge_addr, &self.l2_block.events);
-        progress.observe(added_tokens.len());
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertTokens, is_fictive);
-        let added_tokens_len = added_tokens.len();
-        if !added_tokens.is_empty() {
-            transaction.tokens_dal().add_tokens(&added_tokens).await?;
-        }
-        progress.observe(added_tokens_len);
-
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::ExtractEvents, is_fictive);
-        let l2_block_events = self.extract_events(is_fictive);
-        let l2_block_event_count: usize =
-            l2_block_events.iter().map(|(_, events)| events.len()).sum();
-        progress.observe(l2_block_event_count);
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertEvents, is_fictive);
-        transaction
-            .events_dal()
-            .save_events(l2_block_number, &l2_block_events)
-            .await?;
-        progress.observe(l2_block_event_count);
-
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::ExtractL2ToL1Logs, is_fictive);
-
-        let system_l2_to_l1_logs = self.extract_system_l2_to_l1_logs(is_fictive);
-        let user_l2_to_l1_logs = self.extract_user_l2_to_l1_logs(is_fictive);
-
-        let system_l2_to_l1_log_count: usize = system_l2_to_l1_logs
-            .iter()
-            .map(|(_, l2_to_l1_logs)| l2_to_l1_logs.len())
-            .sum();
-        let user_l2_to_l1_log_count: usize = user_l2_to_l1_logs
-            .iter()
-            .map(|(_, l2_to_l1_logs)| l2_to_l1_logs.len())
-            .sum();
-
-        progress.observe(system_l2_to_l1_log_count + user_l2_to_l1_log_count);
-
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::InsertL2ToL1Logs, is_fictive);
-        transaction
-            .events_dal()
-            .save_user_l2_to_l1_logs(l2_block_number, &user_l2_to_l1_logs)
-            .await?;
-        progress.observe(user_l2_to_l1_log_count);
-
-        let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::CommitL2Block, is_fictive);
-
-        transaction.commit().await?;
-        progress.observe(None);
-
+        // Report metrics.
         let progress = L2_BLOCK_METRICS.start(L2BlockSealStage::ReportTxMetrics, is_fictive);
         self.report_transaction_metrics();
         progress.observe(Some(self.l2_block.executed_transactions.len()));
@@ -498,55 +426,22 @@ impl L2BlockSealCommand {
                 "event transaction index {tx_index} is outside of the expected range {tx_index_range:?}"
             );
         }
-        for storage_log in &self.l2_block.storage_logs {
-            let tx_index = storage_log.log_query.tx_number_in_block as usize;
-            anyhow::ensure!(
-                tx_index_range.contains(&tx_index),
-                "log transaction index {tx_index} is outside of the expected range {tx_index_range:?}"
-            );
-        }
         Ok(())
     }
 
-    fn extract_deduplicated_write_logs(&self, is_fictive: bool) -> Vec<(H256, Vec<StorageLog>)> {
+    fn extract_deduplicated_write_logs(&self) -> Vec<StorageLog> {
         let mut storage_writes_deduplicator = StorageWritesDeduplicator::new();
         storage_writes_deduplicator.apply(
             self.l2_block
                 .storage_logs
                 .iter()
-                .filter(|log| log.log_query.rw_flag),
+                .filter(|log| log.log.is_write()),
         );
         let deduplicated_logs = storage_writes_deduplicator.into_modified_key_values();
 
         deduplicated_logs
             .into_iter()
-            .map(
-                |(
-                    key,
-                    ModifiedSlot {
-                        value, tx_index, ..
-                    },
-                )| (tx_index, (key, value)),
-            )
-            .sorted_by_key(|(tx_index, _)| *tx_index)
-            .group_by(|(tx_index, _)| *tx_index)
-            .into_iter()
-            .map(|(tx_index, logs)| {
-                let tx_hash = if is_fictive {
-                    assert_eq!(tx_index as usize, self.first_tx_index);
-                    H256::zero()
-                } else {
-                    self.transaction(tx_index as usize).hash()
-                };
-                (
-                    tx_hash,
-                    logs.into_iter()
-                        .map(|(_, (key, value))| {
-                            StorageLog::new_write_log(key, u256_to_h256(value))
-                        })
-                        .collect(),
-                )
-            })
+            .map(|(key, ModifiedSlot { value, .. })| StorageLog::new_write_log(key, value))
             .collect()
     }
 
@@ -585,15 +480,6 @@ impl L2BlockSealCommand {
         grouped_entries.collect()
     }
 
-    fn extract_system_l2_to_l1_logs(
-        &self,
-        is_fictive: bool,
-    ) -> Vec<(IncludedTxLocation, Vec<&SystemL2ToL1Log>)> {
-        self.group_by_tx_location(&self.l2_block.system_l2_to_l1_logs, is_fictive, |log| {
-            u32::from(log.0.tx_number_in_block)
-        })
-    }
-
     fn extract_user_l2_to_l1_logs(
         &self,
         is_fictive: bool,
@@ -653,6 +539,10 @@ impl L2BlockSealCommand {
             started_at.elapsed()
         );
     }
+
+    fn is_l2_block_fictive(&self) -> bool {
+        self.l2_block.executed_transactions.is_empty()
+    }
 }
 
 fn l1_l2_tx_count(executed_transactions: &[TransactionExecutionResult]) -> (usize, usize) {
@@ -669,12 +559,12 @@ fn l1_l2_tx_count(executed_transactions: &[TransactionExecutionResult]) -> (usiz
     (l1_tx_count, l2_tx_count)
 }
 
-fn log_query_write_read_counts<'a>(logs: impl Iterator<Item = &'a LogQuery>) -> (usize, usize) {
+fn log_query_write_read_counts<'a>(logs: impl Iterator<Item = &'a StorageLog>) -> (usize, usize) {
     let mut reads_count = 0;
     let mut writes_count = 0;
 
     for log in logs {
-        if log.rw_flag {
+        if log.is_write() {
             writes_count += 1;
         } else {
             reads_count += 1;
diff --git a/core/lib/zksync_core/src/state_keeper/io/tests/mod.rs b/core/node/state_keeper/src/io/tests/mod.rs
similarity index 85%
rename from core/lib/zksync_core/src/state_keeper/io/tests/mod.rs
rename to core/node/state_keeper/src/io/tests/mod.rs
index 4814e5ebd9bc..7c70607c763b 100644
--- a/core/lib/zksync_core/src/state_keeper/io/tests/mod.rs
+++ b/core/node/state_keeper/src/io/tests/mod.rs
@@ -1,13 +1,14 @@
 use std::time::Duration;
 
-use multivm::utils::derive_base_fee_and_gas_per_pubdata;
 use test_casing::test_casing;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_mempool::L2TxFilter;
-use zksync_node_test_utils::{prepare_recovery_snapshot, DeploymentMode};
+use zksync_multivm::utils::derive_base_fee_and_gas_per_pubdata;
+use zksync_node_test_utils::prepare_recovery_snapshot;
 use zksync_types::{
     block::{BlockGasCount, L2BlockHasher},
+    commitment::L1BatchCommitmentMode,
     fee::TransactionExecutionMetrics,
     fee_model::{BatchFeeInput, PubdataIndependentBatchFeeModelInput},
     tx::ExecutionMetrics,
@@ -17,22 +18,28 @@ use zksync_types::{
 use zksync_utils::time::seconds_since_epoch;
 
 use self::tester::Tester;
-use crate::state_keeper::{
-    io::StateKeeperIO,
+use crate::{
+    io::{seal_logic::l2_block_seal_subtasks::L2BlockSealProcess, StateKeeperIO},
     mempool_actor::l2_tx_filter,
-    tests::{create_execution_result, create_transaction, Query, BASE_SYSTEM_CONTRACTS},
+    testonly::BASE_SYSTEM_CONTRACTS,
+    tests::{create_execution_result, create_transaction, Query},
     updates::{L2BlockSealCommand, L2BlockUpdates, UpdatesManager},
     StateKeeperOutputHandler, StateKeeperPersistence,
 };
 
 mod tester;
 
+const COMMITMENT_MODES: [L1BatchCommitmentMode; 2] = [
+    L1BatchCommitmentMode::Rollup,
+    L1BatchCommitmentMode::Validium,
+];
+
 /// Ensure that MempoolIO.filter is correctly initialized right after mempool initialization.
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn test_filter_initialization(deployment_mode: DeploymentMode) {
+async fn test_filter_initialization(commitment_mode: L1BatchCommitmentMode) {
     let connection_pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
-    let tester = Tester::new(&deployment_mode);
+    let tester = Tester::new(commitment_mode);
     // Genesis is needed for proper mempool initialization.
     tester.genesis(&connection_pool).await;
     let (mempool, _) = tester.create_test_mempool_io(connection_pool).await;
@@ -42,11 +49,11 @@ async fn test_filter_initialization(deployment_mode: DeploymentMode) {
 }
 
 /// Ensure that MempoolIO.filter is modified correctly if there is a pending batch upon mempool initialization.
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn test_filter_with_pending_batch(deployment_mode: DeploymentMode) {
+async fn test_filter_with_pending_batch(commitment_mode: L1BatchCommitmentMode) {
     let connection_pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
-    let mut tester = Tester::new(&deployment_mode);
+    let mut tester = Tester::new(commitment_mode);
     tester.genesis(&connection_pool).await;
 
     // Insert a sealed batch so there will be a `prev_l1_batch_state_root`.
@@ -88,11 +95,11 @@ async fn test_filter_with_pending_batch(deployment_mode: DeploymentMode) {
 }
 
 /// Ensure that `MempoolIO.filter` is modified correctly if there is no pending batch.
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn test_filter_with_no_pending_batch(deployment_mode: DeploymentMode) {
+async fn test_filter_with_no_pending_batch(commitment_mode: L1BatchCommitmentMode) {
     let connection_pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
-    let tester = Tester::new(&deployment_mode);
+    let tester = Tester::new(commitment_mode);
     tester.genesis(&connection_pool).await;
 
     // Insert a sealed batch so there will be a `prev_l1_batch_state_root`.
@@ -171,47 +178,48 @@ async fn test_timestamps_are_distinct(
     assert!(l1_batch_params.first_l2_block.timestamp > prev_l2_block_timestamp);
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn l1_batch_timestamp_basics(deployment_mode: DeploymentMode) {
+async fn l1_batch_timestamp_basics(commitment_mode: L1BatchCommitmentMode) {
     let connection_pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
-    let tester = Tester::new(&deployment_mode);
+    let tester = Tester::new(commitment_mode);
     let current_timestamp = seconds_since_epoch();
     test_timestamps_are_distinct(connection_pool, current_timestamp, false, tester).await;
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn l1_batch_timestamp_with_clock_skew(deployment_mode: DeploymentMode) {
+async fn l1_batch_timestamp_with_clock_skew(commitment_mode: L1BatchCommitmentMode) {
     let connection_pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
-    let tester = Tester::new(&deployment_mode);
+    let tester = Tester::new(commitment_mode);
     let current_timestamp = seconds_since_epoch();
     test_timestamps_are_distinct(connection_pool, current_timestamp + 2, false, tester).await;
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn l1_batch_timestamp_respects_prev_l2_block(deployment_mode: DeploymentMode) {
+async fn l1_batch_timestamp_respects_prev_l2_block(commitment_mode: L1BatchCommitmentMode) {
     let connection_pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
-    let tester = Tester::new(&deployment_mode);
+    let tester = Tester::new(commitment_mode);
     let current_timestamp = seconds_since_epoch();
     test_timestamps_are_distinct(connection_pool, current_timestamp, true, tester).await;
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
 async fn l1_batch_timestamp_respects_prev_l2_block_with_clock_skew(
-    deployment_mode: DeploymentMode,
+    commitment_mode: L1BatchCommitmentMode,
 ) {
     let connection_pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
-    let tester = Tester::new(&deployment_mode);
+    let tester = Tester::new(commitment_mode);
     let current_timestamp = seconds_since_epoch();
     test_timestamps_are_distinct(connection_pool, current_timestamp + 2, true, tester).await;
 }
 
 #[tokio::test]
 async fn processing_storage_logs_when_sealing_l2_block() {
-    let connection_pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
+    let connection_pool =
+        ConnectionPool::<Core>::constrained_test_pool(L2BlockSealProcess::subtasks_len()).await;
     let mut l2_block = L2BlockUpdates::new(
         0,
         L2BlockNumber(3),
@@ -233,7 +241,7 @@ async fn processing_storage_logs_when_sealing_l2_block() {
             Query::RepeatedWrite(U256::from(1), U256::from(4)),
         ),
     ];
-    let execution_result = create_execution_result(0, storage_logs);
+    let execution_result = create_execution_result(storage_logs);
     l2_block.extend_from_executed_transaction(
         tx,
         execution_result,
@@ -251,7 +259,7 @@ async fn processing_storage_logs_when_sealing_l2_block() {
             Query::RepeatedWrite(U256::from(3), U256::from(6)),
         ),
     ];
-    let execution_result = create_execution_result(1, storage_logs);
+    let execution_result = create_execution_result(storage_logs);
     l2_block.extend_from_executed_transaction(
         tx,
         execution_result,
@@ -278,12 +286,16 @@ async fn processing_storage_logs_when_sealing_l2_block() {
         l2_shared_bridge_addr: Address::default(),
         pre_insert_txs: false,
     };
-    let mut conn = connection_pool.connection().await.unwrap();
-    conn.protocol_versions_dal()
+    connection_pool
+        .connection()
+        .await
+        .unwrap()
+        .protocol_versions_dal()
         .save_protocol_version_with_tx(&ProtocolVersion::default())
         .await
         .unwrap();
-    seal_command.seal(&mut conn).await.unwrap();
+    seal_command.seal(connection_pool.clone()).await.unwrap();
+    let mut conn = connection_pool.connection().await.unwrap();
 
     // Manually mark the L2 block as executed so that getting touched slots from it works
     conn.blocks_dal()
@@ -299,7 +311,7 @@ async fn processing_storage_logs_when_sealing_l2_block() {
     // Keys that are only read must not be written to `storage_logs`.
     let account = AccountTreeId::default();
     let read_key = StorageKey::new(account, H256::from_low_u64_be(1));
-    assert!(!touched_slots.contains_key(&read_key));
+    assert!(!touched_slots.contains_key(&read_key.hashed_key()));
 
     // The storage logs must be inserted and read in the correct order, so that
     // `touched_slots` contain the most recent values in the L1 batch.
@@ -308,17 +320,19 @@ async fn processing_storage_logs_when_sealing_l2_block() {
     for (key, value) in written_kvs {
         let key = StorageKey::new(account, H256::from_low_u64_be(key));
         let expected_value = H256::from_low_u64_be(value);
-        assert_eq!(touched_slots[&key], expected_value);
+        assert_eq!(touched_slots[&key.hashed_key()], expected_value);
     }
 }
 
 #[tokio::test]
 async fn processing_events_when_sealing_l2_block() {
-    let pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
+    let pool =
+        ConnectionPool::<Core>::constrained_test_pool(L2BlockSealProcess::subtasks_len()).await;
     let l1_batch_number = L1BatchNumber(2);
+    let l2_block_number = L2BlockNumber(3);
     let mut l2_block = L2BlockUpdates::new(
         0,
-        L2BlockNumber(3),
+        l2_block_number,
         H256::zero(),
         1,
         ProtocolVersionId::latest(),
@@ -331,9 +345,9 @@ async fn processing_events_when_sealing_l2_block() {
     });
     let events: Vec<_> = events.collect();
 
-    for (i, events_chunk) in events.chunks(4).enumerate() {
+    for events_chunk in events.chunks(4) {
         let tx = create_transaction(10, 100);
-        let mut execution_result = create_execution_result(i as u16, []);
+        let mut execution_result = create_execution_result([]);
         execution_result.logs.events = events_chunk.to_vec();
         l2_block.extend_from_executed_transaction(
             tx,
@@ -361,16 +375,19 @@ async fn processing_events_when_sealing_l2_block() {
         l2_shared_bridge_addr: Address::default(),
         pre_insert_txs: false,
     };
-    let mut conn = pool.connection().await.unwrap();
-    conn.protocol_versions_dal()
+    pool.connection()
+        .await
+        .unwrap()
+        .protocol_versions_dal()
         .save_protocol_version_with_tx(&ProtocolVersion::default())
         .await
         .unwrap();
-    seal_command.seal(&mut conn).await.unwrap();
+    seal_command.seal(pool.clone()).await.unwrap();
+    let mut conn = pool.connection().await.unwrap();
 
     let logs = conn
         .events_web3_dal()
-        .get_all_logs(seal_command.l2_block.number - 1)
+        .get_all_logs(l2_block_number - 1)
         .await
         .unwrap();
 
@@ -381,11 +398,11 @@ async fn processing_events_when_sealing_l2_block() {
     }
 }
 
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn l2_block_processing_after_snapshot_recovery(deployment_mode: DeploymentMode) {
+async fn l2_block_processing_after_snapshot_recovery(commitment_mode: L1BatchCommitmentMode) {
     let connection_pool = ConnectionPool::<Core>::test_pool().await;
-    let tester = Tester::new(&deployment_mode);
+    let tester = Tester::new(commitment_mode);
     let mut storage = connection_pool.connection().await.unwrap();
     let snapshot_recovery =
         prepare_recovery_snapshot(&mut storage, L1BatchNumber(23), L2BlockNumber(42), &[]).await;
@@ -437,7 +454,7 @@ async fn l2_block_processing_after_snapshot_recovery(deployment_mode: Deployment
     let tx_hash = tx.hash();
     updates.extend_from_executed_transaction(
         tx.into(),
-        create_execution_result(0, []),
+        create_execution_result([]),
         vec![],
         BlockGasCount::default(),
         ExecutionMetrics::default(),
@@ -514,11 +531,11 @@ async fn l2_block_processing_after_snapshot_recovery(deployment_mode: Deployment
 }
 
 /// Ensure that subsequent L2 blocks that belong to the same L1 batch have different timestamps
-#[test_casing(2, [DeploymentMode::Rollup, DeploymentMode::Validium])]
+#[test_casing(2, COMMITMENT_MODES)]
 #[tokio::test]
-async fn different_timestamp_for_l2_blocks_in_same_batch(deployment_mode: DeploymentMode) {
+async fn different_timestamp_for_l2_blocks_in_same_batch(commitment_mode: L1BatchCommitmentMode) {
     let connection_pool = ConnectionPool::<Core>::constrained_test_pool(1).await;
-    let tester = Tester::new(&deployment_mode);
+    let tester = Tester::new(commitment_mode);
 
     // Genesis is needed for proper mempool initialization.
     tester.genesis(&connection_pool).await;
diff --git a/core/lib/zksync_core/src/state_keeper/io/tests/tester.rs b/core/node/state_keeper/src/io/tests/tester.rs
similarity index 83%
rename from core/lib/zksync_core/src/state_keeper/io/tests/tester.rs
rename to core/node/state_keeper/src/io/tests/tester.rs
index 433dba9e72ed..c056191736f2 100644
--- a/core/lib/zksync_core/src/state_keeper/io/tests/tester.rs
+++ b/core/node/state_keeper/src/io/tests/tester.rs
@@ -2,61 +2,61 @@
 
 use std::{slice, sync::Arc, time::Duration};
 
-use multivm::vm_latest::constants::BATCH_COMPUTATIONAL_GAS_LIMIT;
+use zksync_base_token_adjuster::NoOpRatioProvider;
 use zksync_config::{
     configs::{chain::StateKeeperConfig, eth_sender::PubdataSendingMode, wallets::Wallets},
     GasAdjusterConfig,
 };
 use zksync_contracts::BaseSystemContracts;
 use zksync_dal::{ConnectionPool, Core, CoreDal};
-use zksync_eth_client::clients::MockEthereum;
-use zksync_node_fee_model::{
-    l1_gas_price::{GasAdjuster, PubdataPricing, RollupPubdataPricing, ValidiumPubdataPricing},
-    MainNodeFeeInputProvider,
-};
+use zksync_eth_client::{clients::MockEthereum, BaseFees};
+use zksync_multivm::vm_latest::constants::BATCH_COMPUTATIONAL_GAS_LIMIT;
+use zksync_node_fee_model::{l1_gas_price::GasAdjuster, MainNodeFeeInputProvider};
 use zksync_node_genesis::create_genesis_l1_batch;
 use zksync_node_test_utils::{
-    create_l1_batch, create_l2_block, create_l2_transaction, execute_l2_transaction, DeploymentMode,
+    create_l1_batch, create_l2_block, create_l2_transaction, execute_l2_transaction,
 };
 use zksync_types::{
     block::L2BlockHeader,
+    commitment::L1BatchCommitmentMode,
     fee::TransactionExecutionMetrics,
     fee_model::{BatchFeeInput, FeeModelConfig, FeeModelConfigV1},
     l2::L2Tx,
-    protocol_version::L1VerifierConfig,
+    protocol_version::{L1VerifierConfig, ProtocolSemanticVersion},
     system_contracts::get_system_smart_contracts,
     tx::TransactionExecutionResult,
     L2BlockNumber, L2ChainId, PriorityOpId, ProtocolVersionId, H256,
 };
 
-use crate::state_keeper::{MempoolGuard, MempoolIO};
+use crate::{MempoolGuard, MempoolIO};
 
 #[derive(Debug)]
 pub struct Tester {
     base_system_contracts: BaseSystemContracts,
     current_timestamp: u64,
-    pubdata_pricing: Arc<dyn PubdataPricing>,
+    commitment_mode: L1BatchCommitmentMode,
 }
 
 impl Tester {
-    pub(super) fn new(deployment_mode: &DeploymentMode) -> Self {
+    pub(super) fn new(commitment_mode: L1BatchCommitmentMode) -> Self {
         let base_system_contracts = BaseSystemContracts::load_from_disk();
-
-        let pubdata_pricing: Arc<dyn PubdataPricing> = match deployment_mode {
-            DeploymentMode::Validium => Arc::new(ValidiumPubdataPricing {}),
-            DeploymentMode::Rollup => Arc::new(RollupPubdataPricing {}),
-        };
-
         Self {
             base_system_contracts,
             current_timestamp: 0,
-            pubdata_pricing,
+            commitment_mode,
         }
     }
 
     async fn create_gas_adjuster(&self) -> GasAdjuster {
-        let eth_client =
-            MockEthereum::default().with_fee_history(vec![0, 4, 6, 8, 7, 5, 5, 8, 10, 9]);
+        let block_fees = vec![0, 4, 6, 8, 7, 5, 5, 8, 10, 9];
+        let base_fees = block_fees
+            .into_iter()
+            .map(|base_fee_per_gas| BaseFees {
+                base_fee_per_gas,
+                base_fee_per_blob_gas: 1.into(), // Not relevant for the test
+            })
+            .collect();
+        let eth_client = MockEthereum::builder().with_fee_history(base_fees).build();
 
         let gas_adjuster_config = GasAdjusterConfig {
             default_priority_fee_per_gas: 10,
@@ -74,10 +74,10 @@ impl Tester {
         };
 
         GasAdjuster::new(
-            Box::new(eth_client),
+            Box::new(eth_client.into_client()),
             gas_adjuster_config,
             PubdataSendingMode::Calldata,
-            self.pubdata_pricing.clone(),
+            self.commitment_mode,
         )
         .await
         .unwrap()
@@ -85,8 +85,10 @@ impl Tester {
 
     pub(super) async fn create_batch_fee_input_provider(&self) -> MainNodeFeeInputProvider {
         let gas_adjuster = Arc::new(self.create_gas_adjuster().await);
+
         MainNodeFeeInputProvider::new(
             gas_adjuster,
+            Arc::new(NoOpRatioProvider::default()),
             FeeModelConfig::V1(FeeModelConfigV1 {
                 minimal_l2_gas_price: self.minimal_l2_gas_price(),
             }),
@@ -105,6 +107,7 @@ impl Tester {
         let gas_adjuster = Arc::new(self.create_gas_adjuster().await);
         let batch_fee_input_provider = MainNodeFeeInputProvider::new(
             gas_adjuster,
+            Arc::new(NoOpRatioProvider::default()),
             FeeModelConfig::V1(FeeModelConfigV1 {
                 minimal_l2_gas_price: self.minimal_l2_gas_price(),
             }),
@@ -141,7 +144,10 @@ impl Tester {
         if storage.blocks_dal().is_genesis_needed().await.unwrap() {
             create_genesis_l1_batch(
                 &mut storage,
-                ProtocolVersionId::latest(),
+                ProtocolSemanticVersion {
+                    minor: ProtocolVersionId::latest(),
+                    patch: 0.into(),
+                },
                 &self.base_system_contracts,
                 &get_system_smart_contracts(),
                 L1VerifierConfig::default(),
@@ -183,6 +189,8 @@ impl Tester {
                 L2BlockNumber(number),
                 slice::from_ref(&tx_result),
                 1.into(),
+                ProtocolVersionId::latest(),
+                false,
             )
             .await
             .unwrap();
diff --git a/core/lib/zksync_core/src/state_keeper/keeper.rs b/core/node/state_keeper/src/keeper.rs
similarity index 83%
rename from core/lib/zksync_core/src/state_keeper/keeper.rs
rename to core/node/state_keeper/src/keeper.rs
index 2e2dac11bdf8..6c1718232a09 100644
--- a/core/lib/zksync_core/src/state_keeper/keeper.rs
+++ b/core/node/state_keeper/src/keeper.rs
@@ -5,8 +5,9 @@ use std::{
 };
 
 use anyhow::Context as _;
-use multivm::interface::{Halt, L1BatchEnv, SystemEnv};
 use tokio::sync::watch;
+use zksync_multivm::interface::{Halt, L1BatchEnv, SystemEnv};
+use zksync_state::ReadStorageFactory;
 use zksync_types::{
     block::L2BlockExecutionData, l2::TransactionType, protocol_upgrade::ProtocolUpgradeTx,
     protocol_version::ProtocolVersionId, storage_writes_deduplicator::StorageWritesDeduplicator,
@@ -15,13 +16,14 @@ use zksync_types::{
 
 use super::{
     batch_executor::{BatchExecutor, BatchExecutorHandle, TxExecutionResult},
-    io::{IoCursor, L2BlockParams, OutputHandler, PendingBatchData, StateKeeperIO},
+    io::{IoCursor, L1BatchParams, L2BlockParams, OutputHandler, PendingBatchData, StateKeeperIO},
     metrics::{AGGREGATION_METRICS, KEEPER_METRICS, L1_BATCH_METRICS},
     seal_criteria::{ConditionalSealer, SealData, SealResolution},
     types::ExecutionMetricsForCriteria,
     updates::UpdatesManager,
     utils::gas_count_from_writes,
 };
+use crate::seal_criteria::UnexecutableReason;
 
 /// Amount of time to block on waiting for some resource. The exact value is not really important,
 /// we only need it to not block on waiting indefinitely and be able to process cancellation requests.
@@ -61,6 +63,7 @@ pub struct ZkSyncStateKeeper {
     output_handler: OutputHandler,
     batch_executor_base: Box<dyn BatchExecutor>,
     sealer: Arc<dyn ConditionalSealer>,
+    storage_factory: Arc<dyn ReadStorageFactory>,
 }
 
 impl ZkSyncStateKeeper {
@@ -70,6 +73,7 @@ impl ZkSyncStateKeeper {
         batch_executor_base: Box<dyn BatchExecutor>,
         output_handler: OutputHandler,
         sealer: Arc<dyn ConditionalSealer>,
+        storage_factory: Arc<dyn ReadStorageFactory>,
     ) -> Self {
         Self {
             stop_receiver,
@@ -77,6 +81,7 @@ impl ZkSyncStateKeeper {
             batch_executor_base,
             output_handler,
             sealer,
+            storage_factory,
         }
     }
 
@@ -142,6 +147,7 @@ impl ZkSyncStateKeeper {
         let mut batch_executor = self
             .batch_executor_base
             .init_batch(
+                self.storage_factory.clone(),
                 l1_batch_env.clone(),
                 system_env.clone(),
                 &self.stop_receiver,
@@ -149,14 +155,18 @@ impl ZkSyncStateKeeper {
             .await
             .ok_or(Error::Canceled)?;
 
-        self.restore_state(&batch_executor, &mut updates_manager, pending_l2_blocks)
+        self.restore_state(&mut batch_executor, &mut updates_manager, pending_l2_blocks)
             .await?;
 
         let mut l1_batch_seal_delta: Option<Instant> = None;
         while !self.is_canceled() {
             // This function will run until the batch can be sealed.
-            self.process_l1_batch(&batch_executor, &mut updates_manager, protocol_upgrade_tx)
-                .await?;
+            self.process_l1_batch(
+                &mut batch_executor,
+                &mut updates_manager,
+                protocol_upgrade_tx,
+            )
+            .await?;
 
             // Finish current batch.
             if !updates_manager.l2_block.executed_transactions.is_empty() {
@@ -168,16 +178,17 @@ impl ZkSyncStateKeeper {
                 Self::start_next_l2_block(
                     new_l2_block_params,
                     &mut updates_manager,
-                    &batch_executor,
+                    &mut batch_executor,
                 )
-                .await;
+                .await?;
             }
 
-            let finished_batch = batch_executor.finish_batch().await;
+            let finished_batch = batch_executor.finish_batch().await?;
             let sealed_batch_protocol_version = updates_manager.protocol_version();
             updates_manager.finish_batch(finished_batch);
+            let mut next_cursor = updates_manager.io_cursor();
             self.output_handler
-                .handle_l1_batch(&updates_manager)
+                .handle_l1_batch(Arc::new(updates_manager))
                 .await
                 .with_context(|| format!("failed sealing L1 batch {l1_batch_env:?}"))?;
 
@@ -187,13 +198,13 @@ impl ZkSyncStateKeeper {
             l1_batch_seal_delta = Some(Instant::now());
 
             // Start the new batch.
-            let mut next_cursor = updates_manager.io_cursor();
             next_cursor.l1_batch += 1;
             (system_env, l1_batch_env) = self.wait_for_new_batch_env(&next_cursor).await?;
             updates_manager = UpdatesManager::new(&l1_batch_env, &system_env);
             batch_executor = self
                 .batch_executor_base
                 .init_batch(
+                    self.storage_factory.clone(),
                     l1_batch_env.clone(),
                     system_env.clone(),
                     &self.stop_receiver,
@@ -274,27 +285,55 @@ impl ZkSyncStateKeeper {
             .with_context(|| format!("failed loading upgrade transaction for {protocol_version:?}"))
     }
 
-    async fn wait_for_new_batch_env(
+    async fn wait_for_new_batch_params(
         &mut self,
         cursor: &IoCursor,
-    ) -> Result<(SystemEnv, L1BatchEnv), Error> {
+    ) -> Result<L1BatchParams, Error> {
         while !self.is_canceled() {
-            if let Some(envs) = self
+            if let Some(params) = self
                 .io
-                .wait_for_new_batch_env(cursor, POLL_WAIT_DURATION)
-                .await
-                .context("error waiting for new L1 batch environment")?
+                .wait_for_new_batch_params(cursor, POLL_WAIT_DURATION)
+                .await?
             {
-                return Ok(envs);
+                return Ok(params);
             }
         }
         Err(Error::Canceled)
     }
 
+    async fn wait_for_new_batch_env(
+        &mut self,
+        cursor: &IoCursor,
+    ) -> Result<(SystemEnv, L1BatchEnv), Error> {
+        // `io.wait_for_new_batch_params(..)` is not cancel-safe; once we get new batch params, we must hold onto them
+        // until we get the rest of parameters from I/O or receive a stop signal.
+        let params = self.wait_for_new_batch_params(cursor).await?;
+        let contracts = self
+            .io
+            .load_base_system_contracts(params.protocol_version, cursor)
+            .await
+            .with_context(|| {
+                format!(
+                    "failed loading system contracts for protocol version {:?}",
+                    params.protocol_version
+                )
+            })?;
+
+        // `select!` is safe to use here; `io.load_batch_state_hash(..)` is cancel-safe by contract
+        tokio::select! {
+            hash_result = self.io.load_batch_state_hash(cursor.l1_batch - 1) => {
+                let previous_batch_hash = hash_result.context("cannot load state hash for previous L1 batch")?;
+                Ok(params.into_env(self.io.chain_id(), contracts, cursor, previous_batch_hash))
+            }
+            _ = self.stop_receiver.changed() => Err(Error::Canceled),
+        }
+    }
+
     async fn wait_for_new_l2_block_params(
         &mut self,
         updates: &UpdatesManager,
     ) -> Result<L2BlockParams, Error> {
+        let latency = KEEPER_METRICS.wait_for_l2_block_params.start();
         let cursor = updates.io_cursor();
         while !self.is_canceled() {
             if let Some(params) = self
@@ -303,6 +342,7 @@ impl ZkSyncStateKeeper {
                 .await
                 .context("error waiting for new L2 block params")?
             {
+                latency.observe();
                 return Ok(params);
             }
         }
@@ -312,12 +352,16 @@ impl ZkSyncStateKeeper {
     async fn start_next_l2_block(
         params: L2BlockParams,
         updates_manager: &mut UpdatesManager,
-        batch_executor: &BatchExecutorHandle,
-    ) {
+        batch_executor: &mut BatchExecutorHandle,
+    ) -> anyhow::Result<()> {
         updates_manager.push_l2_block(params);
+        let block_env = updates_manager.l2_block.get_env();
         batch_executor
-            .start_next_l2_block(updates_manager.l2_block.get_env())
-            .await;
+            .start_next_l2_block(block_env)
+            .await
+            .with_context(|| {
+                format!("failed starting L2 block with {block_env:?} in batch executor")
+            })
     }
 
     async fn seal_l2_block(&mut self, updates_manager: &UpdatesManager) -> anyhow::Result<()> {
@@ -339,7 +383,7 @@ impl ZkSyncStateKeeper {
     /// Additionally, it initialized the next L2 block timestamp.
     async fn restore_state(
         &mut self,
-        batch_executor: &BatchExecutorHandle,
+        batch_executor: &mut BatchExecutorHandle,
         updates_manager: &mut UpdatesManager,
         l2_blocks_to_reexecute: Vec<L2BlockExecutionData>,
     ) -> Result<(), Error> {
@@ -358,7 +402,7 @@ impl ZkSyncStateKeeper {
                     updates_manager,
                     batch_executor,
                 )
-                .await;
+                .await?;
             }
 
             let l2_block_number = l2_block.number;
@@ -366,7 +410,10 @@ impl ZkSyncStateKeeper {
                 "Starting to reexecute transactions from sealed L2 block #{l2_block_number}"
             );
             for tx in l2_block.txs {
-                let result = batch_executor.execute_tx(tx.clone()).await;
+                let result = batch_executor
+                    .execute_tx(tx.clone())
+                    .await
+                    .with_context(|| format!("failed re-executing transaction {:?}", tx.hash()))?;
 
                 let TxExecutionResult::Success {
                     tx_result,
@@ -429,23 +476,25 @@ impl ZkSyncStateKeeper {
             .wait_for_new_l2_block_params(updates_manager)
             .await
             .map_err(|e| e.context("wait_for_new_l2_block_params"))?;
-        Self::start_next_l2_block(new_l2_block_params, updates_manager, batch_executor).await;
+        Self::start_next_l2_block(new_l2_block_params, updates_manager, batch_executor).await?;
 
         Ok(())
     }
 
     async fn process_l1_batch(
         &mut self,
-        batch_executor: &BatchExecutorHandle,
+        batch_executor: &mut BatchExecutorHandle,
         updates_manager: &mut UpdatesManager,
         protocol_upgrade_tx: Option<ProtocolUpgradeTx>,
     ) -> Result<(), Error> {
         if let Some(protocol_upgrade_tx) = protocol_upgrade_tx {
             self.process_upgrade_tx(batch_executor, updates_manager, protocol_upgrade_tx)
-                .await;
+                .await?;
         }
 
         while !self.is_canceled() {
+            let full_latency = KEEPER_METRICS.process_l1_batch_loop_iteration.start();
+
             if self
                 .io
                 .should_seal_l1_batch_unconditionally(updates_manager)
@@ -471,12 +520,12 @@ impl ZkSyncStateKeeper {
                     .map_err(|e| e.context("wait_for_new_l2_block_params"))?;
                 tracing::debug!(
                     "Initialized new L2 block #{} (L1 batch #{}) with timestamp {}",
-                    updates_manager.l2_block.number,
+                    updates_manager.l2_block.number + 1,
                     updates_manager.l1_batch.number,
                     display_timestamp(new_l2_block_params.timestamp)
                 );
                 Self::start_next_l2_block(new_l2_block_params, updates_manager, batch_executor)
-                    .await;
+                    .await?;
             }
 
             let waiting_latency = KEEPER_METRICS.waiting_for_tx.start();
@@ -495,8 +544,9 @@ impl ZkSyncStateKeeper {
             let tx_hash = tx.hash();
             let (seal_resolution, exec_result) = self
                 .process_one_tx(batch_executor, updates_manager, tx.clone())
-                .await;
+                .await?;
 
+            let latency = KEEPER_METRICS.match_seal_resolution.start();
             match &seal_resolution {
                 SealResolution::NoSeal | SealResolution::IncludeAndSeal => {
                     let TxExecutionResult::Success {
@@ -525,20 +575,24 @@ impl ZkSyncStateKeeper {
                     );
                 }
                 SealResolution::ExcludeAndSeal => {
-                    batch_executor.rollback_last_tx().await;
-                    self.io
-                        .rollback(tx)
-                        .await
-                        .context("failed rolling back transaction")?;
+                    batch_executor.rollback_last_tx().await.with_context(|| {
+                        format!("failed rolling back transaction {tx_hash:?} in batch executor")
+                    })?;
+                    self.io.rollback(tx).await.with_context(|| {
+                        format!("failed rolling back transaction {tx_hash:?} in I/O")
+                    })?;
                 }
                 SealResolution::Unexecutable(reason) => {
-                    batch_executor.rollback_last_tx().await;
+                    batch_executor.rollback_last_tx().await.with_context(|| {
+                        format!("failed rolling back transaction {tx_hash:?} in batch executor")
+                    })?;
                     self.io
-                        .reject(&tx, reason)
+                        .reject(&tx, reason.clone())
                         .await
                         .with_context(|| format!("cannot reject transaction {tx_hash:?}"))?;
                 }
             };
+            latency.observe();
 
             if seal_resolution.should_seal() {
                 tracing::debug!(
@@ -546,25 +600,27 @@ impl ZkSyncStateKeeper {
                      transaction {tx_hash}",
                     updates_manager.l1_batch.number
                 );
+                full_latency.observe();
                 return Ok(());
             }
+            full_latency.observe();
         }
         Err(Error::Canceled)
     }
 
     async fn process_upgrade_tx(
         &mut self,
-        batch_executor: &BatchExecutorHandle,
+        batch_executor: &mut BatchExecutorHandle,
         updates_manager: &mut UpdatesManager,
         protocol_upgrade_tx: ProtocolUpgradeTx,
-    ) {
+    ) -> anyhow::Result<()> {
         // Sanity check: protocol upgrade tx must be the first one in the batch.
         assert_eq!(updates_manager.pending_executed_transactions_len(), 0);
 
         let tx: Transaction = protocol_upgrade_tx.into();
         let (seal_resolution, exec_result) = self
             .process_one_tx(batch_executor, updates_manager, tx.clone())
-            .await;
+            .await?;
 
         match &seal_resolution {
             SealResolution::NoSeal | SealResolution::IncludeAndSeal => {
@@ -575,15 +631,13 @@ impl ZkSyncStateKeeper {
                     ..
                 } = exec_result
                 else {
-                    panic!(
-                        "Tx inclusion seal resolution must be a result of a successful tx execution",
-                    );
+                    anyhow::bail!("Tx inclusion seal resolution must be a result of a successful tx execution");
                 };
 
                 // Despite success of upgrade transaction is not enforced by protocol,
                 // we panic here because failed upgrade tx is not intended in any case.
                 if tx_result.result.is_failed() {
-                    panic!("Failed upgrade tx {:?}", tx.hash());
+                    anyhow::bail!("Failed upgrade tx {:?}", tx.hash());
                 }
 
                 let ExecutionMetricsForCriteria {
@@ -599,18 +653,18 @@ impl ZkSyncStateKeeper {
                     tx_execution_metrics,
                     vec![],
                 );
+                Ok(())
             }
             SealResolution::ExcludeAndSeal => {
-                unreachable!("First tx in batch cannot result into `ExcludeAndSeal`");
+                anyhow::bail!("first tx in batch cannot result into `ExcludeAndSeal`");
             }
             SealResolution::Unexecutable(reason) => {
-                panic!(
-                    "Upgrade transaction {:?} is unexecutable: {}",
-                    tx.hash(),
-                    reason
+                anyhow::bail!(
+                    "Upgrade transaction {:?} is unexecutable: {reason}",
+                    tx.hash()
                 );
             }
-        };
+        }
     }
 
     /// Executes one transaction in the batch executor, and then decides whether the batch should be sealed.
@@ -622,11 +676,18 @@ impl ZkSyncStateKeeper {
     /// because we use `apply_and_rollback` method of `updates_manager.storage_writes_deduplicator`.
     async fn process_one_tx(
         &mut self,
-        batch_executor: &BatchExecutorHandle,
+        batch_executor: &mut BatchExecutorHandle,
         updates_manager: &mut UpdatesManager,
         tx: Transaction,
-    ) -> (SealResolution, TxExecutionResult) {
-        let exec_result = batch_executor.execute_tx(tx.clone()).await;
+    ) -> anyhow::Result<(SealResolution, TxExecutionResult)> {
+        let latency = KEEPER_METRICS.execute_tx_outer_time.start();
+        let exec_result = batch_executor
+            .execute_tx(tx.clone())
+            .await
+            .with_context(|| format!("failed executing transaction {:?}", tx.hash()))?;
+        latency.observe();
+
+        let latency = KEEPER_METRICS.determine_seal_resolution.start();
         // All of `TxExecutionResult::BootloaderOutOfGasForTx`,
         // `Halt::NotEnoughGasProvided` correspond to out-of-gas errors but of different nature.
         // - `BootloaderOutOfGasForTx`: it is returned when bootloader stack frame run out of gas before tx execution finished.
@@ -642,23 +703,29 @@ impl ZkSyncStateKeeper {
             | TxExecutionResult::RejectedByVm {
                 reason: Halt::NotEnoughGasProvided,
             } => {
-                let error_message = match &exec_result {
-                    TxExecutionResult::BootloaderOutOfGasForTx => "bootloader_tx_out_of_gas",
+                let (reason, criterion) = match &exec_result {
+                    TxExecutionResult::BootloaderOutOfGasForTx => (
+                        UnexecutableReason::BootloaderOutOfGas,
+                        "bootloader_tx_out_of_gas",
+                    ),
                     TxExecutionResult::RejectedByVm {
                         reason: Halt::NotEnoughGasProvided,
-                    } => "not_enough_gas_provided_to_start_tx",
+                    } => (
+                        UnexecutableReason::NotEnoughGasProvided,
+                        "not_enough_gas_provided_to_start_tx",
+                    ),
                     _ => unreachable!(),
                 };
                 let resolution = if is_first_tx {
-                    SealResolution::Unexecutable(error_message.to_string())
+                    SealResolution::Unexecutable(reason)
                 } else {
                     SealResolution::ExcludeAndSeal
                 };
-                AGGREGATION_METRICS.inc(error_message, &resolution);
+                AGGREGATION_METRICS.l1_batch_reason_inc(criterion, &resolution);
                 resolution
             }
             TxExecutionResult::RejectedByVm { reason } => {
-                SealResolution::Unexecutable(reason.to_string())
+                UnexecutableReason::Halt(reason.clone()).into()
             }
             TxExecutionResult::Success {
                 tx_result,
@@ -737,6 +804,7 @@ impl ZkSyncStateKeeper {
                 )
             }
         };
-        (resolution, exec_result)
+        latency.observe();
+        Ok((resolution, exec_result))
     }
 }
diff --git a/core/lib/zksync_core/src/state_keeper/mod.rs b/core/node/state_keeper/src/lib.rs
similarity index 73%
rename from core/lib/zksync_core/src/state_keeper/mod.rs
rename to core/node/state_keeper/src/lib.rs
index 9d2603a872ad..4920e2514b0a 100644
--- a/core/lib/zksync_core/src/state_keeper/mod.rs
+++ b/core/node/state_keeper/src/lib.rs
@@ -10,33 +10,37 @@ use zksync_node_fee_model::BatchFeeModelInputProvider;
 use zksync_types::L2ChainId;
 
 pub use self::{
-    batch_executor::{main_executor::MainBatchExecutor, BatchExecutor},
+    batch_executor::{
+        main_executor::MainBatchExecutor, BatchExecutor, BatchExecutorHandle, TxExecutionResult,
+    },
     io::{
-        mempool::MempoolIO, L2BlockSealerTask, OutputHandler, StateKeeperIO,
-        StateKeeperOutputHandler, StateKeeperPersistence,
+        mempool::MempoolIO, L2BlockParams, L2BlockSealerTask, OutputHandler, StateKeeperIO,
+        StateKeeperOutputHandler, StateKeeperPersistence, TreeWritesPersistence,
     },
     keeper::ZkSyncStateKeeper,
     mempool_actor::MempoolFetcher,
     seal_criteria::SequencerSealer,
     state_keeper_storage::AsyncRocksdbCache,
-    types::MempoolGuard,
+    types::{ExecutionMetricsForCriteria, MempoolGuard},
+    updates::UpdatesManager,
 };
 
 mod batch_executor;
-pub(crate) mod io;
+pub mod io;
 mod keeper;
 mod mempool_actor;
-pub(crate) mod metrics;
+pub mod metrics;
 pub mod seal_criteria;
 mod state_keeper_storage;
+pub mod testonly;
 #[cfg(test)]
 pub(crate) mod tests;
 pub(crate) mod types;
-pub(crate) mod updates;
+pub mod updates;
 pub(crate) mod utils;
 
 #[allow(clippy::too_many_arguments)]
-pub(crate) async fn create_state_keeper(
+pub async fn create_state_keeper(
     state_keeper_config: StateKeeperConfig,
     wallets: wallets::StateKeeper,
     async_cache: AsyncRocksdbCache,
@@ -48,11 +52,7 @@ pub(crate) async fn create_state_keeper(
     output_handler: OutputHandler,
     stop_receiver: watch::Receiver<bool>,
 ) -> ZkSyncStateKeeper {
-    let batch_executor_base = MainBatchExecutor::new(
-        Arc::new(async_cache),
-        state_keeper_config.save_call_traces,
-        false,
-    );
+    let batch_executor_base = MainBatchExecutor::new(state_keeper_config.save_call_traces, false);
 
     let io = MempoolIO::new(
         mempool,
@@ -74,5 +74,6 @@ pub(crate) async fn create_state_keeper(
         Box::new(batch_executor_base),
         output_handler,
         Arc::new(sealer),
+        Arc::new(async_cache),
     )
 }
diff --git a/core/lib/zksync_core/src/state_keeper/mempool_actor.rs b/core/node/state_keeper/src/mempool_actor.rs
similarity index 97%
rename from core/lib/zksync_core/src/state_keeper/mempool_actor.rs
rename to core/node/state_keeper/src/mempool_actor.rs
index 8bc2498f94a7..d79d9ebb34a8 100644
--- a/core/lib/zksync_core/src/state_keeper/mempool_actor.rs
+++ b/core/node/state_keeper/src/mempool_actor.rs
@@ -1,20 +1,19 @@
 use std::{collections::HashMap, sync::Arc, time::Duration};
 
 use anyhow::Context as _;
-use multivm::utils::derive_base_fee_and_gas_per_pubdata;
 #[cfg(test)]
 use tokio::sync::mpsc;
 use tokio::sync::watch;
 use zksync_config::configs::chain::MempoolConfig;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
 use zksync_mempool::L2TxFilter;
+use zksync_multivm::utils::derive_base_fee_and_gas_per_pubdata;
 use zksync_node_fee_model::BatchFeeModelInputProvider;
 #[cfg(test)]
 use zksync_types::H256;
 use zksync_types::{get_nonce_key, Address, Nonce, Transaction, VmVersion};
 
 use super::{metrics::KEEPER_METRICS, types::MempoolGuard};
-use crate::utils::pending_protocol_version;
 
 /// Creates a mempool filter for L2 transactions based on the current L1 gas price.
 /// The filter is used to filter out transactions from the mempool that do not cover expenses
@@ -84,7 +83,9 @@ impl MempoolFetcher {
             let latency = KEEPER_METRICS.mempool_sync.start();
             let mut storage = self.pool.connection_tagged("state_keeper").await?;
             let mempool_info = self.mempool.get_mempool_info();
-            let protocol_version = pending_protocol_version(&mut storage)
+            let protocol_version = storage
+                .blocks_dal()
+                .pending_protocol_version()
                 .await
                 .context("failed getting pending protocol version")?;
 
@@ -181,6 +182,9 @@ mod tests {
     async fn getting_transaction_nonces() {
         let pool = ConnectionPool::<Core>::test_pool().await;
         let mut storage = pool.connection().await.unwrap();
+        insert_genesis_batch(&mut storage, &GenesisParams::mock())
+            .await
+            .unwrap();
 
         let transaction = create_l2_transaction(10, 100);
         let transaction_initiator = transaction.initiator_account();
@@ -188,7 +192,7 @@ mod tests {
         let nonce_log = StorageLog::new_write_log(nonce_key, u256_to_h256(42.into()));
         storage
             .storage_logs_dal()
-            .insert_storage_logs(L2BlockNumber(0), &[(H256::zero(), vec![nonce_log])])
+            .insert_storage_logs(L2BlockNumber(0), &[nonce_log])
             .await
             .unwrap();
 
@@ -348,7 +352,7 @@ mod tests {
         let mut storage = pool.connection().await.unwrap();
         storage
             .storage_logs_dal()
-            .append_storage_logs(L2BlockNumber(0), &[(H256::zero(), vec![nonce_log])])
+            .append_storage_logs(L2BlockNumber(0), &[nonce_log])
             .await
             .unwrap();
         storage
diff --git a/core/lib/zksync_core/src/state_keeper/metrics.rs b/core/node/state_keeper/src/metrics.rs
similarity index 81%
rename from core/lib/zksync_core/src/state_keeper/metrics.rs
rename to core/node/state_keeper/src/metrics.rs
index df8d83606915..429f4f859c5c 100644
--- a/core/lib/zksync_core/src/state_keeper/metrics.rs
+++ b/core/node/state_keeper/src/metrics.rs
@@ -5,12 +5,12 @@ use std::{
     time::Duration,
 };
 
-use multivm::interface::VmExecutionResultAndLogs;
 use vise::{
     Buckets, Counter, EncodeLabelSet, EncodeLabelValue, Family, Gauge, Histogram, LatencyObserver,
     Metrics,
 };
 use zksync_mempool::MempoolStore;
+use zksync_multivm::interface::{VmExecutionResultAndLogs, VmRevertReason};
 use zksync_shared_metrics::InteractionType;
 use zksync_types::{tx::tx_execution_info::DeduplicatedWritesMetrics, ProtocolVersionId};
 
@@ -18,18 +18,32 @@ use super::seal_criteria::SealResolution;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
 #[metrics(label = "stage", rename_all = "snake_case")]
-pub(crate) enum TxExecutionStage {
+pub enum TxExecutionStage {
     Execution,
     TxRollback,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue, EncodeLabelSet)]
 #[metrics(label = "tx_execution_type", rename_all = "snake_case")]
-pub(crate) enum TxExecutionType {
+pub enum TxExecutionType {
     L1,
     L2,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue)]
+#[metrics(rename_all = "snake_case")]
+pub enum TxExecutionStatus {
+    Success,
+    Rejected,
+    Reverted,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, EncodeLabelSet)]
+pub struct TxExecutionResult {
+    status: TxExecutionStatus,
+    reason: Option<&'static str>,
+}
+
 impl TxExecutionType {
     pub fn from_is_l1(is_l1: bool) -> TxExecutionType {
         match is_l1 {
@@ -47,7 +61,7 @@ const INCLUSION_DELAY_BUCKETS: Buckets = Buckets::values(&[
 /// General-purpose state keeper metrics.
 #[derive(Debug, Metrics)]
 #[metrics(prefix = "server_state_keeper")]
-pub(crate) struct StateKeeperMetrics {
+pub struct StateKeeperMetrics {
     /// Latency to synchronize the mempool with Postgres.
     #[metrics(buckets = Buckets::LATENCIES)]
     pub mempool_sync: Histogram<Duration>,
@@ -57,8 +71,8 @@ pub(crate) struct StateKeeperMetrics {
     /// Latency of the state keeper getting a transaction from the mempool.
     #[metrics(buckets = Buckets::LATENCIES)]
     pub get_tx_from_mempool: Histogram<Duration>,
-    /// Number of transactions rejected by the state keeper.
-    pub rejected_transactions: Counter,
+    /// Number of transactions completed with a specific result.
+    pub tx_execution_result: Family<TxExecutionResult, Counter>,
     /// Time spent waiting for the hash of a previous L1 batch.
     #[metrics(buckets = Buckets::LATENCIES)]
     pub wait_for_prev_hash_time: Histogram<Duration>,
@@ -75,10 +89,63 @@ pub(crate) struct StateKeeperMetrics {
     pub gas_price_too_high: Counter,
     /// Number of times blob base fee was reported as too high.
     pub blob_base_fee_too_high: Counter,
+    /// The time it takes to match seal resolution for each tx.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub match_seal_resolution: Histogram<Duration>,
+    /// The time it takes to determine seal resolution for each tx.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub determine_seal_resolution: Histogram<Duration>,
+    /// The time it takes for state keeper to wait for tx execution result from batch executor.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub execute_tx_outer_time: Histogram<Duration>,
+    /// The time it takes for one iteration of the main loop in `process_l1_batch`.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub process_l1_batch_loop_iteration: Histogram<Duration>,
+    /// The time it takes to wait for new L2 block parameters
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub wait_for_l2_block_params: Histogram<Duration>,
+}
+
+fn vm_revert_reason_as_metric_label(reason: &VmRevertReason) -> &'static str {
+    match reason {
+        VmRevertReason::General { .. } => "General",
+        VmRevertReason::InnerTxError => "InnerTxError",
+        VmRevertReason::VmError => "VmError",
+        VmRevertReason::Unknown { .. } => "Unknown",
+    }
+}
+
+impl StateKeeperMetrics {
+    pub fn inc_rejected_txs(&self, reason: &'static str) {
+        let result = TxExecutionResult {
+            status: TxExecutionStatus::Rejected,
+            reason: Some(reason),
+        };
+
+        self.tx_execution_result[&result].inc();
+    }
+
+    pub fn inc_succeeded_txs(&self) {
+        let result = TxExecutionResult {
+            status: TxExecutionStatus::Success,
+            reason: None,
+        };
+
+        self.tx_execution_result[&result].inc();
+    }
+
+    pub fn inc_reverted_txs(&self, reason: &VmRevertReason) {
+        let result = TxExecutionResult {
+            status: TxExecutionStatus::Reverted,
+            reason: Some(vm_revert_reason_as_metric_label(reason)),
+        };
+
+        self.tx_execution_result[&result].inc();
+    }
 }
 
 #[vise::register]
-pub(crate) static KEEPER_METRICS: vise::Global<StateKeeperMetrics> = vise::Global::new();
+pub static KEEPER_METRICS: vise::Global<StateKeeperMetrics> = vise::Global::new();
 
 /// State keeper-related gauges exposed via a collector.
 #[derive(Debug, Metrics)]
@@ -139,6 +206,13 @@ impl From<&SealResolution> for SealResolutionLabel {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelSet, EncodeLabelValue)]
+#[metrics(label = "reason", rename_all = "snake_case")]
+pub(super) enum L2BlockSealReason {
+    Timeout,
+    PayloadSize,
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelSet)]
 struct TxAggregationLabels {
     criterion: &'static str,
@@ -149,10 +223,11 @@ struct TxAggregationLabels {
 #[metrics(prefix = "server_tx_aggregation")]
 pub(super) struct TxAggregationMetrics {
     reason: Family<TxAggregationLabels, Counter>,
+    l2_block_reason: Family<L2BlockSealReason, Counter>,
 }
 
 impl TxAggregationMetrics {
-    pub fn inc(&self, criterion: &'static str, resolution: &SealResolution) {
+    pub fn l1_batch_reason_inc(&self, criterion: &'static str, resolution: &SealResolution) {
         let labels = TxAggregationLabels {
             criterion,
             seal_resolution: Some(resolution.into()),
@@ -160,13 +235,17 @@ impl TxAggregationMetrics {
         self.reason[&labels].inc();
     }
 
-    pub fn inc_criterion(&self, criterion: &'static str) {
+    pub fn l1_batch_reason_inc_criterion(&self, criterion: &'static str) {
         let labels = TxAggregationLabels {
             criterion,
             seal_resolution: None,
         };
         self.reason[&labels].inc();
     }
+
+    pub fn l2_block_reason_inc(&self, reason: &L2BlockSealReason) {
+        self.l2_block_reason[reason].inc();
+    }
 }
 
 #[vise::register]
@@ -254,7 +333,6 @@ pub(super) enum L2BlockQueueStage {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, EncodeLabelValue)]
 #[metrics(rename_all = "snake_case")]
 pub(super) enum L2BlockSealStage {
-    PreInsertTxs,
     #[metrics(name = "insert_miniblock_header")]
     InsertL2BlockHeader,
     #[metrics(name = "mark_transactions_in_miniblock")]
@@ -267,8 +345,6 @@ pub(super) enum L2BlockSealStage {
     InsertEvents,
     ExtractL2ToL1Logs,
     InsertL2ToL1Logs,
-    #[metrics(name = "commit_miniblock")]
-    CommitL2Block,
     ReportTxMetrics,
 }
 
@@ -444,3 +520,16 @@ impl BatchTipMetrics {
 
 #[vise::register]
 pub(crate) static BATCH_TIP_METRICS: vise::Global<BatchTipMetrics> = vise::Global::new();
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "server_state_keeper_updates_manager")]
+pub struct UpdatesManagerMetrics {
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub finish_batch: Histogram<Duration>,
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub extend_from_executed_transaction: Histogram<Duration>,
+}
+
+#[vise::register]
+pub(crate) static UPDATES_MANAGER_METRICS: vise::Global<UpdatesManagerMetrics> =
+    vise::Global::new();
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs b/core/node/state_keeper/src/seal_criteria/conditional_sealer.rs
similarity index 97%
rename from core/lib/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs
rename to core/node/state_keeper/src/seal_criteria/conditional_sealer.rs
index cc383ae16cb6..cd00d4f89360 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/conditional_sealer.rs
+++ b/core/node/state_keeper/src/seal_criteria/conditional_sealer.rs
@@ -103,7 +103,8 @@ impl ConditionalSealer for SequencerSealer {
                         "L1 batch #{l1_batch_number} processed by `{name}` with resolution {seal_resolution:?}",
                         name = sealer.prom_criterion_name()
                     );
-                    AGGREGATION_METRICS.inc(sealer.prom_criterion_name(), &seal_resolution);
+                    AGGREGATION_METRICS
+                        .l1_batch_reason_inc(sealer.prom_criterion_name(), &seal_resolution);
                 }
                 SealResolution::NoSeal => { /* Don't do anything */ }
             }
@@ -121,7 +122,7 @@ impl SequencerSealer {
     }
 
     #[cfg(test)]
-    pub(in crate::state_keeper) fn with_sealers(
+    pub(crate) fn with_sealers(
         config: StateKeeperConfig,
         sealers: Vec<Box<dyn SealCriterion>>,
     ) -> Self {
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas.rs b/core/node/state_keeper/src/seal_criteria/criteria/gas.rs
similarity index 95%
rename from core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas.rs
rename to core/node/state_keeper/src/seal_criteria/criteria/gas.rs
index b96d23a891b6..a97ac6ede353 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas.rs
+++ b/core/node/state_keeper/src/seal_criteria/criteria/gas.rs
@@ -1,7 +1,9 @@
 use zksync_types::ProtocolVersionId;
 
-use crate::state_keeper::{
-    seal_criteria::{SealCriterion, SealData, SealResolution, StateKeeperConfig},
+use crate::{
+    seal_criteria::{
+        SealCriterion, SealData, SealResolution, StateKeeperConfig, UnexecutableReason,
+    },
     utils::new_block_gas_count,
 };
 
@@ -30,7 +32,7 @@ impl SealCriterion for GasCriterion {
             (config.max_single_tx_gas as f64 * config.close_block_at_gas_percentage).round() as u32;
 
         if (tx_data.gas_count + new_block_gas_count()).any_field_greater_than(tx_bound) {
-            SealResolution::Unexecutable("Transaction requires too much gas".into())
+            UnexecutableReason::TooMuchGas.into()
         } else if block_data
             .gas_count
             .any_field_greater_than(config.max_single_tx_gas)
@@ -103,7 +105,7 @@ mod tests {
         );
         assert_eq!(
             huge_transaction_resolution,
-            SealResolution::Unexecutable("Transaction requires too much gas".into())
+            UnexecutableReason::TooMuchGas.into()
         );
 
         // Check criterion workflow
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas_for_batch_tip.rs b/core/node/state_keeper/src/seal_criteria/criteria/gas_for_batch_tip.rs
similarity index 91%
rename from core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas_for_batch_tip.rs
rename to core/node/state_keeper/src/seal_criteria/criteria/gas_for_batch_tip.rs
index a0a3d7ca6640..69214406bea5 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/gas_for_batch_tip.rs
+++ b/core/node/state_keeper/src/seal_criteria/criteria/gas_for_batch_tip.rs
@@ -1,8 +1,8 @@
-use multivm::utils::gas_bootloader_batch_tip_overhead;
+use zksync_multivm::utils::gas_bootloader_batch_tip_overhead;
 use zksync_types::ProtocolVersionId;
 
-use crate::state_keeper::seal_criteria::{
-    SealCriterion, SealData, SealResolution, StateKeeperConfig,
+use crate::seal_criteria::{
+    SealCriterion, SealData, SealResolution, StateKeeperConfig, UnexecutableReason,
 };
 
 /// Checks whether we should exclude the transaction because we don't have enough gas for batch tip.
@@ -24,7 +24,7 @@ impl SealCriterion for GasForBatchTipCriterion {
 
         if tx_data.gas_remaining < batch_tip_overhead {
             if is_tx_first {
-                SealResolution::Unexecutable("not_enough_gas_for_batch_tip".to_string())
+                UnexecutableReason::OutOfGasForBatchTip.into()
             } else {
                 SealResolution::ExcludeAndSeal
             }
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs b/core/node/state_keeper/src/seal_criteria/criteria/geometry_seal_criteria.rs
similarity index 95%
rename from core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs
rename to core/node/state_keeper/src/seal_criteria/criteria/geometry_seal_criteria.rs
index c7166de9102d..264618f5d136 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/geometry_seal_criteria.rs
+++ b/core/node/state_keeper/src/seal_criteria/criteria/geometry_seal_criteria.rs
@@ -1,11 +1,11 @@
-use multivm::utils::{
+use zksync_config::configs::chain::StateKeeperConfig;
+use zksync_multivm::utils::{
     circuit_statistics_bootloader_batch_tip_overhead, get_max_batch_base_layer_circuits,
 };
-use zksync_config::configs::chain::StateKeeperConfig;
 use zksync_types::ProtocolVersionId;
 
 // Local uses
-use crate::state_keeper::seal_criteria::{SealCriterion, SealData, SealResolution};
+use crate::seal_criteria::{SealCriterion, SealData, SealResolution, UnexecutableReason};
 
 // Collected vm execution metrics should fit into geometry limits.
 // Otherwise witness generation will fail and proof won't be generated.
@@ -52,7 +52,7 @@ impl SealCriterion for CircuitsCriterion {
         let used_circuits_batch = block_data.execution_metrics.circuit_statistic.total();
 
         if used_circuits_tx + batch_tip_circuit_overhead >= reject_bound {
-            SealResolution::Unexecutable("ZK proof cannot be generated for a transaction".into())
+            UnexecutableReason::ProofWillFail.into()
         } else if used_circuits_batch + batch_tip_circuit_overhead >= config.max_circuits_per_batch
         {
             SealResolution::ExcludeAndSeal
@@ -162,10 +162,7 @@ mod tests {
             protocol_version,
         );
 
-        assert_eq!(
-            block_resolution,
-            SealResolution::Unexecutable("ZK proof cannot be generated for a transaction".into())
-        );
+        assert_eq!(block_resolution, UnexecutableReason::ProofWillFail.into());
     }
 
     #[test]
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/mod.rs b/core/node/state_keeper/src/seal_criteria/criteria/mod.rs
similarity index 89%
rename from core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/mod.rs
rename to core/node/state_keeper/src/seal_criteria/criteria/mod.rs
index 4772de5c2650..6732a8cd2717 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/mod.rs
+++ b/core/node/state_keeper/src/seal_criteria/criteria/mod.rs
@@ -5,7 +5,7 @@ mod pubdata_bytes;
 mod slots;
 mod tx_encoding_size;
 
-pub(in crate::state_keeper) use self::{
+pub(crate) use self::{
     gas::GasCriterion, gas_for_batch_tip::GasForBatchTipCriterion,
     geometry_seal_criteria::CircuitsCriterion, pubdata_bytes::PubDataBytesCriterion,
     slots::SlotsCriterion, tx_encoding_size::TxEncodingSizeCriterion,
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/pubdata_bytes.rs b/core/node/state_keeper/src/seal_criteria/criteria/pubdata_bytes.rs
similarity index 94%
rename from core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/pubdata_bytes.rs
rename to core/node/state_keeper/src/seal_criteria/criteria/pubdata_bytes.rs
index b6d6b3b94d2e..f575a905891c 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/pubdata_bytes.rs
+++ b/core/node/state_keeper/src/seal_criteria/criteria/pubdata_bytes.rs
@@ -1,8 +1,8 @@
-use multivm::utils::execution_metrics_bootloader_batch_tip_overhead;
+use zksync_multivm::utils::execution_metrics_bootloader_batch_tip_overhead;
 use zksync_types::ProtocolVersionId;
 
-use crate::state_keeper::seal_criteria::{
-    SealCriterion, SealData, SealResolution, StateKeeperConfig,
+use crate::seal_criteria::{
+    SealCriterion, SealData, SealResolution, StateKeeperConfig, UnexecutableReason,
 };
 
 #[derive(Debug)]
@@ -43,8 +43,7 @@ impl SealCriterion for PubDataBytesCriterion {
         if tx_size + execution_metrics_bootloader_batch_tip_overhead(protocol_version.into())
             > reject_bound as usize
         {
-            let message = "Transaction cannot be sent to L1 due to pubdata limits";
-            SealResolution::Unexecutable(message.into())
+            UnexecutableReason::PubdataLimit.into()
         } else if block_size
             + execution_metrics_bootloader_batch_tip_overhead(protocol_version.into())
             > max_pubdata_per_l1_batch
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/slots.rs b/core/node/state_keeper/src/seal_criteria/criteria/slots.rs
similarity index 93%
rename from core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/slots.rs
rename to core/node/state_keeper/src/seal_criteria/criteria/slots.rs
index 41d99b8274b7..81b3a0933801 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/slots.rs
+++ b/core/node/state_keeper/src/seal_criteria/criteria/slots.rs
@@ -1,9 +1,7 @@
-use multivm::utils::get_bootloader_max_txs_in_batch;
+use zksync_multivm::utils::get_bootloader_max_txs_in_batch;
 use zksync_types::ProtocolVersionId;
 
-use crate::state_keeper::seal_criteria::{
-    SealCriterion, SealData, SealResolution, StateKeeperConfig,
-};
+use crate::seal_criteria::{SealCriterion, SealData, SealResolution, StateKeeperConfig};
 
 /// Checks whether we should seal the block because we've run out of transaction slots.
 #[derive(Debug)]
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs b/core/node/state_keeper/src/seal_criteria/criteria/tx_encoding_size.rs
similarity index 89%
rename from core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs
rename to core/node/state_keeper/src/seal_criteria/criteria/tx_encoding_size.rs
index 02683e501d9b..409673d6cac8 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/criteria/tx_encoding_size.rs
+++ b/core/node/state_keeper/src/seal_criteria/criteria/tx_encoding_size.rs
@@ -1,8 +1,8 @@
-use multivm::utils::get_bootloader_encoding_space;
+use zksync_multivm::utils::get_bootloader_encoding_space;
 use zksync_types::ProtocolVersionId;
 
-use crate::state_keeper::seal_criteria::{
-    SealCriterion, SealData, SealResolution, StateKeeperConfig,
+use crate::seal_criteria::{
+    SealCriterion, SealData, SealResolution, StateKeeperConfig, UnexecutableReason,
 };
 
 #[derive(Debug)]
@@ -28,8 +28,7 @@ impl SealCriterion for TxEncodingSizeCriterion {
             .round();
 
         if tx_data.cumulative_size > reject_bound as usize {
-            let message = "Transaction cannot be included due to large encoding size";
-            SealResolution::Unexecutable(message.into())
+            UnexecutableReason::LargeEncodingSize.into()
         } else if block_data.cumulative_size > bootloader_tx_encoding_space as usize {
             SealResolution::ExcludeAndSeal
         } else if block_data.cumulative_size > include_and_seal_bound as usize {
@@ -85,9 +84,7 @@ mod tests {
         );
         assert_eq!(
             unexecutable_resolution,
-            SealResolution::Unexecutable(
-                "Transaction cannot be included due to large encoding size".into()
-            )
+            UnexecutableReason::LargeEncodingSize.into()
         );
 
         let exclude_and_seal_resolution = criterion.should_seal(
diff --git a/core/lib/zksync_core/src/state_keeper/seal_criteria/mod.rs b/core/node/state_keeper/src/seal_criteria/mod.rs
similarity index 71%
rename from core/lib/zksync_core/src/state_keeper/seal_criteria/mod.rs
rename to core/node/state_keeper/src/seal_criteria/mod.rs
index da2f22e8998a..01be129dde6f 100644
--- a/core/lib/zksync_core/src/state_keeper/seal_criteria/mod.rs
+++ b/core/node/state_keeper/src/seal_criteria/mod.rs
@@ -12,8 +12,8 @@
 
 use std::fmt;
 
-use multivm::vm_latest::TransactionVmExt;
 use zksync_config::configs::chain::StateKeeperConfig;
+use zksync_multivm::{interface::Halt, vm_latest::TransactionVmExt};
 use zksync_types::{
     block::BlockGasCount,
     fee::TransactionExecutionMetrics,
@@ -33,6 +33,84 @@ use super::{
     utils::{gas_count_from_tx_and_metrics, gas_count_from_writes},
 };
 
+fn halt_as_metric_label(halt: &Halt) -> &'static str {
+    match halt {
+        Halt::ValidationFailed(_) => "ValidationFailed",
+        Halt::PaymasterValidationFailed(_) => "PaymasterValidationFailed",
+        Halt::PrePaymasterPreparationFailed(_) => "PrePaymasterPreparationFailed",
+        Halt::PayForTxFailed(_) => "PayForTxFailed",
+        Halt::FailedToMarkFactoryDependencies(_) => "FailedToMarkFactoryDependencies",
+        Halt::FailedToChargeFee(_) => "FailedToChargeFee",
+        Halt::FromIsNotAnAccount => "FromIsNotAnAccount",
+        Halt::InnerTxError => "InnerTxError",
+        Halt::Unknown(_) => "Unknown",
+        Halt::UnexpectedVMBehavior(_) => "UnexpectedVMBehavior",
+        Halt::BootloaderOutOfGas => "BootloaderOutOfGas",
+        Halt::ValidationOutOfGas => "ValidationOutOfGas",
+        Halt::TooBigGasLimit => "TooBigGasLimit",
+        Halt::NotEnoughGasProvided => "NotEnoughGasProvided",
+        Halt::MissingInvocationLimitReached => "MissingInvocationLimitReached",
+        Halt::FailedToSetL2Block(_) => "FailedToSetL2Block",
+        Halt::FailedToAppendTransactionToL2Block(_) => "FailedToAppendTransactionToL2Block",
+        Halt::VMPanic => "VMPanic",
+        Halt::TracerCustom(_) => "TracerCustom",
+        Halt::FailedToPublishCompressedBytecodes => "FailedToPublishCompressedBytecodes",
+    }
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum UnexecutableReason {
+    Halt(Halt),
+    TxEncodingSize,
+    LargeEncodingSize,
+    PubdataLimit,
+    ProofWillFail,
+    TooMuchGas,
+    OutOfGasForBatchTip,
+    BootloaderOutOfGas,
+    NotEnoughGasProvided,
+}
+
+impl UnexecutableReason {
+    pub fn as_metric_label(&self) -> &'static str {
+        match self {
+            UnexecutableReason::Halt(halt) => halt_as_metric_label(halt),
+            UnexecutableReason::TxEncodingSize => "TxEncodingSize",
+            UnexecutableReason::LargeEncodingSize => "LargeEncodingSize",
+            UnexecutableReason::PubdataLimit => "PubdataLimit",
+            UnexecutableReason::ProofWillFail => "ProofWillFail",
+            UnexecutableReason::TooMuchGas => "TooMuchGas",
+            UnexecutableReason::OutOfGasForBatchTip => "OutOfGasForBatchTip",
+            UnexecutableReason::BootloaderOutOfGas => "BootloaderOutOfGas",
+            UnexecutableReason::NotEnoughGasProvided => "NotEnoughGasProvided",
+        }
+    }
+}
+
+impl From<UnexecutableReason> for SealResolution {
+    fn from(reason: UnexecutableReason) -> Self {
+        SealResolution::Unexecutable(reason)
+    }
+}
+
+impl fmt::Display for UnexecutableReason {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            UnexecutableReason::Halt(halt) => write!(f, "{}", halt),
+            UnexecutableReason::TxEncodingSize => write!(f, "Transaction encoding size is too big"),
+            UnexecutableReason::LargeEncodingSize => {
+                write!(f, "Transaction encoding size is too big")
+            }
+            UnexecutableReason::PubdataLimit => write!(f, "Pubdata limit reached"),
+            UnexecutableReason::ProofWillFail => write!(f, "Proof will fail"),
+            UnexecutableReason::TooMuchGas => write!(f, "Too much gas"),
+            UnexecutableReason::OutOfGasForBatchTip => write!(f, "Out of gas for batch tip"),
+            UnexecutableReason::BootloaderOutOfGas => write!(f, "Bootloader out of gas"),
+            UnexecutableReason::NotEnoughGasProvided => write!(f, "Not enough gas provided"),
+        }
+    }
+}
+
 /// Reported decision regarding block sealing.
 #[derive(Debug, Clone, PartialEq)]
 pub enum SealResolution {
@@ -44,7 +122,7 @@ pub enum SealResolution {
     /// tx in the next block.
     /// While it may be kinda counter-intuitive that we first execute transaction and just then
     /// decided whether we should include it into the block or not, it is required by the architecture of
-    /// zkSync Era. We may not know, for example, how much gas block will consume, because 1) smart contract
+    /// ZKsync Era. We may not know, for example, how much gas block will consume, because 1) smart contract
     /// execution is hard to predict and 2) we may have writes to the same storage slots, which will save us
     /// gas.
     ExcludeAndSeal,
@@ -52,7 +130,7 @@ pub enum SealResolution {
     /// if the block will consist of it solely. Such a transaction must be rejected.
     ///
     /// Contains a reason for why transaction was considered unexecutable.
-    Unexecutable(String),
+    Unexecutable(UnexecutableReason),
 }
 
 impl SealResolution {
@@ -91,7 +169,7 @@ pub struct SealData {
 impl SealData {
     /// Creates sealing data based on the execution of a `transaction`. Assumes that all writes
     /// performed by the transaction are initial.
-    pub(crate) fn for_transaction(
+    pub fn for_transaction(
         transaction: &Transaction,
         tx_metrics: &TransactionExecutionMetrics,
         protocol_version: ProtocolVersionId,
@@ -165,7 +243,7 @@ impl IoSealCriteria for TimeoutSealer {
             millis_since(manager.batch_timestamp()) > block_commit_deadline_ms;
 
         if should_seal_timeout {
-            AGGREGATION_METRICS.inc_criterion(RULE_NAME);
+            AGGREGATION_METRICS.l1_batch_reason_inc_criterion(RULE_NAME);
             tracing::debug!(
                 "Decided to seal L1 batch using rule `{RULE_NAME}`; batch timestamp: {}, \
                  commit deadline: {block_commit_deadline_ms}ms",
@@ -203,14 +281,12 @@ mod tests {
     use zksync_utils::time::seconds_since_epoch;
 
     use super::*;
-    use crate::state_keeper::tests::{
-        create_execution_result, create_transaction, create_updates_manager,
-    };
+    use crate::tests::{create_execution_result, create_transaction, create_updates_manager};
 
     fn apply_tx_to_manager(tx: Transaction, manager: &mut UpdatesManager) {
         manager.extend_from_executed_transaction(
             tx,
-            create_execution_result(0, []),
+            create_execution_result([]),
             vec![],
             BlockGasCount::default(),
             ExecutionMetrics::default(),
diff --git a/core/lib/zksync_core/src/state_keeper/state_keeper_storage.rs b/core/node/state_keeper/src/state_keeper_storage.rs
similarity index 59%
rename from core/lib/zksync_core/src/state_keeper/state_keeper_storage.rs
rename to core/node/state_keeper/src/state_keeper_storage.rs
index e0d7d20bf3fa..13cedc3a58a8 100644
--- a/core/lib/zksync_core/src/state_keeper/state_keeper_storage.rs
+++ b/core/node/state_keeper/src/state_keeper_storage.rs
@@ -1,15 +1,12 @@
-use std::{fmt::Debug, sync::Arc};
+use std::fmt::Debug;
 
 use anyhow::Context;
 use async_trait::async_trait;
-use once_cell::sync::OnceCell;
 use tokio::sync::watch;
 use zksync_dal::{ConnectionPool, Core};
 use zksync_state::{
-    AsyncCatchupTask, PgOrRocksdbStorage, ReadStorageFactory, RocksdbStorageOptions,
-    StateKeeperColumnFamily,
+    AsyncCatchupTask, PgOrRocksdbStorage, ReadStorageFactory, RocksdbCell, RocksdbStorageOptions,
 };
-use zksync_storage::RocksDB;
 use zksync_types::L1BatchNumber;
 
 /// A [`ReadStorageFactory`] implementation that can produce short-lived [`ReadStorage`] handles
@@ -17,19 +14,50 @@ use zksync_types::L1BatchNumber;
 /// variant and is then mutated into `Rocksdb` once RocksDB cache is caught up. After which it
 /// can never revert back to `Postgres` as we assume RocksDB cannot fall behind under normal state
 /// keeper operation.
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct AsyncRocksdbCache {
     pool: ConnectionPool<Core>,
-    rocksdb_cell: Arc<OnceCell<RocksDB<StateKeeperColumnFamily>>>,
+    rocksdb_cell: RocksdbCell,
 }
 
 impl AsyncRocksdbCache {
-    async fn access_storage_inner(
+    pub fn new(
+        pool: ConnectionPool<Core>,
+        state_keeper_db_path: String,
+        state_keeper_db_options: RocksdbStorageOptions,
+    ) -> (Self, AsyncCatchupTask) {
+        let (task, rocksdb_cell) = AsyncCatchupTask::new(pool.clone(), state_keeper_db_path);
+        (
+            Self { pool, rocksdb_cell },
+            task.with_db_options(state_keeper_db_options),
+        )
+    }
+}
+
+#[async_trait]
+impl ReadStorageFactory for AsyncRocksdbCache {
+    #[tracing::instrument(skip(self, stop_receiver))]
+    async fn access_storage(
         &self,
         stop_receiver: &watch::Receiver<bool>,
         l1_batch_number: L1BatchNumber,
     ) -> anyhow::Result<Option<PgOrRocksdbStorage<'_>>> {
-        if let Some(rocksdb) = self.rocksdb_cell.get() {
+        let initial_state = self.rocksdb_cell.ensure_initialized().await?;
+        let rocksdb = if initial_state.l1_batch_number >= Some(l1_batch_number) {
+            tracing::info!(
+                "RocksDB cache (initial state: {initial_state:?}) doesn't need to catch up to L1 batch #{l1_batch_number}, \
+                 waiting for it to become available"
+            );
+            // Opening the cache RocksDB can take a couple of seconds, so if we don't wait here, we unnecessarily miss an opportunity
+            // to use the cache for an entire batch.
+            Some(self.rocksdb_cell.wait().await?)
+        } else {
+            // This clause includes several cases: if the cache needs catching up or recovery, or if `l1_batch_number`
+            // is not the first processed L1 batch.
+            self.rocksdb_cell.get()
+        };
+
+        if let Some(rocksdb) = rocksdb {
             let mut connection = self
                 .pool
                 .connection_tagged("state_keeper")
@@ -37,7 +65,7 @@ impl AsyncRocksdbCache {
                 .context("Failed getting a Postgres connection")?;
             PgOrRocksdbStorage::access_storage_rocksdb(
                 &mut connection,
-                rocksdb.clone(),
+                rocksdb,
                 stop_receiver,
                 l1_batch_number,
             )
@@ -51,32 +79,4 @@ impl AsyncRocksdbCache {
             ))
         }
     }
-
-    pub fn new(
-        pool: ConnectionPool<Core>,
-        state_keeper_db_path: String,
-        state_keeper_db_options: RocksdbStorageOptions,
-    ) -> (Self, AsyncCatchupTask) {
-        let rocksdb_cell = Arc::new(OnceCell::new());
-        let task = AsyncCatchupTask::new(
-            pool.clone(),
-            state_keeper_db_path,
-            state_keeper_db_options,
-            rocksdb_cell.clone(),
-            None,
-        );
-        (Self { pool, rocksdb_cell }, task)
-    }
-}
-
-#[async_trait]
-impl ReadStorageFactory for AsyncRocksdbCache {
-    async fn access_storage(
-        &self,
-        stop_receiver: &watch::Receiver<bool>,
-        l1_batch_number: L1BatchNumber,
-    ) -> anyhow::Result<Option<PgOrRocksdbStorage<'_>>> {
-        self.access_storage_inner(stop_receiver, l1_batch_number)
-            .await
-    }
 }
diff --git a/core/node/state_keeper/src/testonly/mod.rs b/core/node/state_keeper/src/testonly/mod.rs
new file mode 100644
index 000000000000..940e4c19c4be
--- /dev/null
+++ b/core/node/state_keeper/src/testonly/mod.rs
@@ -0,0 +1,187 @@
+//! Test utilities that can be used for testing sequencer that may
+//! be useful outside of this crate.
+
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use once_cell::sync::Lazy;
+use tokio::sync::{mpsc, watch};
+use zksync_contracts::BaseSystemContracts;
+use zksync_dal::{ConnectionPool, Core, CoreDal as _};
+use zksync_multivm::{
+    interface::{
+        CurrentExecutionState, ExecutionResult, FinishedL1Batch, L1BatchEnv, Refunds, SystemEnv,
+        VmExecutionResultAndLogs, VmExecutionStatistics,
+    },
+    vm_latest::VmExecutionLogs,
+};
+use zksync_state::ReadStorageFactory;
+use zksync_test_account::Account;
+use zksync_types::{
+    fee::Fee, utils::storage_key_for_standard_token_balance, AccountTreeId, Address, Execute,
+    L1BatchNumber, L2BlockNumber, PriorityOpId, StorageLog, Transaction, L2_BASE_TOKEN_ADDRESS,
+    SYSTEM_CONTEXT_MINIMAL_BASE_FEE, U256,
+};
+use zksync_utils::u256_to_h256;
+
+use crate::{
+    batch_executor::{BatchExecutor, BatchExecutorHandle, Command, TxExecutionResult},
+    types::ExecutionMetricsForCriteria,
+};
+
+pub mod test_batch_executor;
+
+pub(super) static BASE_SYSTEM_CONTRACTS: Lazy<BaseSystemContracts> =
+    Lazy::new(BaseSystemContracts::load_from_disk);
+
+pub(super) fn default_vm_batch_result() -> FinishedL1Batch {
+    FinishedL1Batch {
+        block_tip_execution_result: VmExecutionResultAndLogs {
+            result: ExecutionResult::Success { output: vec![] },
+            logs: VmExecutionLogs::default(),
+            statistics: VmExecutionStatistics::default(),
+            refunds: Refunds::default(),
+        },
+        final_execution_state: CurrentExecutionState {
+            events: vec![],
+            deduplicated_storage_logs: vec![],
+            used_contract_hashes: vec![],
+            user_l2_to_l1_logs: vec![],
+            system_logs: vec![],
+            total_log_queries: 0,
+            cycles_used: 0,
+            deduplicated_events_logs: vec![],
+            storage_refunds: Vec::new(),
+            pubdata_costs: Vec::new(),
+        },
+        final_bootloader_memory: Some(vec![]),
+        pubdata_input: Some(vec![]),
+        state_diffs: Some(vec![]),
+    }
+}
+
+/// Creates a `TxExecutionResult` object denoting a successful tx execution.
+pub(crate) fn successful_exec() -> TxExecutionResult {
+    TxExecutionResult::Success {
+        tx_result: Box::new(VmExecutionResultAndLogs {
+            result: ExecutionResult::Success { output: vec![] },
+            logs: Default::default(),
+            statistics: Default::default(),
+            refunds: Default::default(),
+        }),
+        tx_metrics: Box::new(ExecutionMetricsForCriteria {
+            l1_gas: Default::default(),
+            execution_metrics: Default::default(),
+        }),
+        compressed_bytecodes: vec![],
+        call_tracer_result: vec![],
+        gas_remaining: Default::default(),
+    }
+}
+
+/// `BatchExecutor` which doesn't check anything at all. Accepts all transactions.
+#[derive(Debug)]
+pub struct MockBatchExecutor;
+
+#[async_trait]
+impl BatchExecutor for MockBatchExecutor {
+    async fn init_batch(
+        &mut self,
+        _storage_factory: Arc<dyn ReadStorageFactory>,
+        _l1batch_params: L1BatchEnv,
+        _system_env: SystemEnv,
+        _stop_receiver: &watch::Receiver<bool>,
+    ) -> Option<BatchExecutorHandle> {
+        let (send, recv) = mpsc::channel(1);
+        let handle = tokio::task::spawn(async {
+            let mut recv = recv;
+            while let Some(cmd) = recv.recv().await {
+                match cmd {
+                    Command::ExecuteTx(_, resp) => resp.send(successful_exec()).unwrap(),
+                    Command::StartNextL2Block(_, resp) => resp.send(()).unwrap(),
+                    Command::RollbackLastTx(_) => panic!("unexpected rollback"),
+                    Command::FinishBatch(resp) => {
+                        // Blanket result, it doesn't really matter.
+                        resp.send(default_vm_batch_result()).unwrap();
+                        break;
+                    }
+                }
+            }
+            anyhow::Ok(())
+        });
+        Some(BatchExecutorHandle::from_raw(handle, send))
+    }
+}
+
+/// Adds funds for specified account list.
+/// Expects genesis to be performed (i.e. `setup_storage` called beforehand).
+pub async fn fund(pool: &ConnectionPool<Core>, addresses: &[Address]) {
+    let mut storage = pool.connection().await.unwrap();
+
+    let eth_amount = U256::from(10u32).pow(U256::from(32)); //10^32 wei
+
+    for address in addresses {
+        let key = storage_key_for_standard_token_balance(
+            AccountTreeId::new(L2_BASE_TOKEN_ADDRESS),
+            address,
+        );
+        let value = u256_to_h256(eth_amount);
+        let storage_log = StorageLog::new_write_log(key, value);
+
+        storage
+            .storage_logs_dal()
+            .append_storage_logs(L2BlockNumber(0), &[storage_log])
+            .await
+            .unwrap();
+        if storage
+            .storage_logs_dedup_dal()
+            .filter_written_slots(&[storage_log.key.hashed_key()])
+            .await
+            .unwrap()
+            .is_empty()
+        {
+            storage
+                .storage_logs_dedup_dal()
+                .insert_initial_writes(L1BatchNumber(0), &[storage_log.key.hashed_key()])
+                .await
+                .unwrap();
+        }
+    }
+}
+
+pub(crate) const DEFAULT_GAS_PER_PUBDATA: u32 = 10000;
+
+pub(crate) fn fee(gas_limit: u32) -> Fee {
+    Fee {
+        gas_limit: U256::from(gas_limit),
+        max_fee_per_gas: SYSTEM_CONTEXT_MINIMAL_BASE_FEE.into(),
+        max_priority_fee_per_gas: U256::zero(),
+        gas_per_pubdata_limit: U256::from(DEFAULT_GAS_PER_PUBDATA),
+    }
+}
+
+/// Returns a valid L2 transaction.
+/// Automatically increments nonce of the account.
+pub fn l2_transaction(account: &mut Account, gas_limit: u32) -> Transaction {
+    account.get_l2_tx_for_execute(
+        Execute {
+            contract_address: Address::random(),
+            calldata: vec![],
+            value: Default::default(),
+            factory_deps: vec![],
+        },
+        Some(fee(gas_limit)),
+    )
+}
+
+pub fn l1_transaction(account: &mut Account, serial_id: PriorityOpId) -> Transaction {
+    account.get_l1_tx(
+        Execute {
+            contract_address: Address::random(),
+            value: Default::default(),
+            calldata: vec![],
+            factory_deps: vec![],
+        },
+        serial_id.0,
+    )
+}
diff --git a/core/lib/zksync_core/src/state_keeper/tests/tester.rs b/core/node/state_keeper/src/testonly/test_batch_executor.rs
similarity index 89%
rename from core/lib/zksync_core/src/state_keeper/tests/tester.rs
rename to core/node/state_keeper/src/testonly/test_batch_executor.rs
index ef936a956f5b..9cb701797483 100644
--- a/core/lib/zksync_core/src/state_keeper/tests/tester.rs
+++ b/core/node/state_keeper/src/testonly/test_batch_executor.rs
@@ -1,3 +1,9 @@
+// TODO(QIT-33): Some of the interfaces are public, and some are only used in tests within this crate.
+// This causes crate-local interfaces to spawn a warning without `cfg(test)`. The interfaces here must
+// be revisited and properly split into "truly public" (e.g. useful for other crates to test, say, different
+// IO or `BatchExecutor` implementations) and "local-test-only" (e.g. used only in tests within this crate).
+#![allow(dead_code)]
+
 use std::{
     collections::{HashMap, HashSet, VecDeque},
     convert::TryInto,
@@ -7,31 +13,30 @@ use std::{
 };
 
 use async_trait::async_trait;
-use multivm::{
-    interface::{
-        ExecutionResult, L1BatchEnv, SystemEnv, TxExecutionMode, VmExecutionResultAndLogs,
-    },
+use tokio::sync::{mpsc, watch, watch::Receiver};
+use zksync_contracts::BaseSystemContracts;
+use zksync_multivm::{
+    interface::{ExecutionResult, L1BatchEnv, SystemEnv, VmExecutionResultAndLogs},
     vm_latest::constants::BATCH_COMPUTATIONAL_GAS_LIMIT,
 };
-use tokio::sync::{mpsc, watch};
-use zksync_contracts::BaseSystemContracts;
 use zksync_node_test_utils::create_l2_transaction;
+use zksync_state::{PgOrRocksdbStorage, ReadStorageFactory};
 use zksync_types::{
-    block::L2BlockExecutionData, fee_model::BatchFeeInput, protocol_upgrade::ProtocolUpgradeTx,
-    Address, L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersionId, Transaction, H256,
+    fee_model::BatchFeeInput, protocol_upgrade::ProtocolUpgradeTx, Address, L1BatchNumber,
+    L2BlockNumber, L2ChainId, ProtocolVersionId, Transaction, H256,
 };
 
-use crate::state_keeper::{
+use crate::{
     batch_executor::{BatchExecutor, BatchExecutorHandle, Command, TxExecutionResult},
     io::{IoCursor, L1BatchParams, L2BlockParams, PendingBatchData, StateKeeperIO},
-    seal_criteria::{IoSealCriteria, SequencerSealer},
-    tests::{default_l1_batch_env, default_vm_batch_result, BASE_SYSTEM_CONTRACTS},
+    seal_criteria::{IoSealCriteria, SequencerSealer, UnexecutableReason},
+    testonly::{default_vm_batch_result, successful_exec, BASE_SYSTEM_CONTRACTS},
     types::ExecutionMetricsForCriteria,
     updates::UpdatesManager,
     OutputHandler, StateKeeperOutputHandler, ZkSyncStateKeeper,
 };
 
-const FEE_ACCOUNT: Address = Address::repeat_byte(0x11);
+pub const FEE_ACCOUNT: Address = Address::repeat_byte(0x11);
 
 /// Main entry for writing tests for the state keeper.
 /// Represents a planned sequence of actions that would happen with the state keeper.
@@ -52,7 +57,7 @@ pub(crate) struct TestScenario {
     l2_block_seal_fn: Box<SealFn>,
 }
 
-type SealFn = dyn FnMut(&UpdatesManager) -> bool + Send;
+type SealFn = dyn FnMut(&UpdatesManager) -> bool + Send + Sync;
 
 impl fmt::Debug for TestScenario {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -124,7 +129,7 @@ impl TestScenario {
         mut self,
         description: &'static str,
         tx: Transaction,
-        err: Option<String>,
+        err: UnexecutableReason,
     ) -> Self {
         self.actions
             .push_back(ScenarioItem::Reject(description, tx, err));
@@ -172,7 +177,7 @@ impl TestScenario {
 
     pub(crate) fn seal_l1_batch_when<F>(mut self, seal_fn: F) -> Self
     where
-        F: FnMut(&UpdatesManager) -> bool + Send + 'static,
+        F: FnMut(&UpdatesManager) -> bool + Send + Sync + 'static,
     {
         self.l1_batch_seal_fn = Box::new(seal_fn);
         self
@@ -180,7 +185,7 @@ impl TestScenario {
 
     pub(crate) fn seal_l2_block_when<F>(mut self, seal_fn: F) -> Self
     where
-        F: FnMut(&UpdatesManager) -> bool + Send + 'static,
+        F: FnMut(&UpdatesManager) -> bool + Send + Sync + 'static,
     {
         self.l2_block_seal_fn = Box::new(seal_fn);
         self
@@ -200,6 +205,7 @@ impl TestScenario {
             Box::new(batch_executor_base),
             output_handler,
             Arc::new(sealer),
+            Arc::new(MockReadStorageFactory),
         );
         let sk_thread = tokio::spawn(state_keeper.run());
 
@@ -244,25 +250,6 @@ pub(crate) fn random_upgrade_tx(tx_number: u64) -> ProtocolUpgradeTx {
     tx
 }
 
-/// Creates a `TxExecutionResult` object denoting a successful tx execution.
-pub(crate) fn successful_exec() -> TxExecutionResult {
-    TxExecutionResult::Success {
-        tx_result: Box::new(VmExecutionResultAndLogs {
-            result: ExecutionResult::Success { output: vec![] },
-            logs: Default::default(),
-            statistics: Default::default(),
-            refunds: Default::default(),
-        }),
-        tx_metrics: Box::new(ExecutionMetricsForCriteria {
-            l1_gas: Default::default(),
-            execution_metrics: Default::default(),
-        }),
-        compressed_bytecodes: vec![],
-        call_tracer_result: vec![],
-        gas_remaining: Default::default(),
-    }
-}
-
 /// Creates a `TxExecutionResult` object denoting a successful tx execution with the given execution metrics.
 pub(crate) fn successful_exec_with_metrics(
     tx_metrics: ExecutionMetricsForCriteria,
@@ -284,24 +271,7 @@ pub(crate) fn successful_exec_with_metrics(
 /// Creates a `TxExecutionResult` object denoting a tx that was rejected.
 pub(crate) fn rejected_exec() -> TxExecutionResult {
     TxExecutionResult::RejectedByVm {
-        reason: multivm::interface::Halt::InnerTxError,
-    }
-}
-
-/// Creates a mock `PendingBatchData` object containing the provided sequence of L2 blocks.
-pub(crate) fn pending_batch_data(pending_l2_blocks: Vec<L2BlockExecutionData>) -> PendingBatchData {
-    PendingBatchData {
-        l1_batch_env: default_l1_batch_env(1, 1, FEE_ACCOUNT),
-        system_env: SystemEnv {
-            zk_porter_available: false,
-            version: ProtocolVersionId::latest(),
-            base_system_smart_contracts: BASE_SYSTEM_CONTRACTS.clone(),
-            bootloader_gas_limit: BATCH_COMPUTATIONAL_GAS_LIMIT,
-            execution_mode: TxExecutionMode::VerifyExecute,
-            default_validation_computational_gas_limit: BATCH_COMPUTATIONAL_GAS_LIMIT,
-            chain_id: L2ChainId::from(270),
-        },
-        pending_l2_blocks,
+        reason: zksync_multivm::interface::Halt::InnerTxError,
     }
 }
 
@@ -313,7 +283,7 @@ enum ScenarioItem {
     IncrementProtocolVersion(&'static str),
     Tx(&'static str, Transaction, TxExecutionResult),
     Rollback(&'static str, Transaction),
-    Reject(&'static str, Transaction, Option<String>),
+    Reject(&'static str, Transaction, UnexecutableReason),
     L2BlockSeal(
         &'static str,
         Option<Box<dyn FnOnce(&UpdatesManager) + Send>>,
@@ -363,7 +333,7 @@ impl fmt::Debug for ScenarioItem {
 type ExpectedTransactions = VecDeque<HashMap<H256, VecDeque<TxExecutionResult>>>;
 
 #[derive(Debug, Default)]
-pub(crate) struct TestBatchExecutorBuilder {
+pub struct TestBatchExecutorBuilder {
     /// Sequence of known transaction execution results per batch.
     /// We need to store txs for each batch separately, since the same transaction
     /// can be executed in several batches (e.g. after an `ExcludeAndSeal` rollback).
@@ -374,7 +344,7 @@ pub(crate) struct TestBatchExecutorBuilder {
 }
 
 impl TestBatchExecutorBuilder {
-    pub(super) fn new(scenario: &TestScenario) -> Self {
+    pub(crate) fn new(scenario: &TestScenario) -> Self {
         let mut txs = VecDeque::new();
         let mut batch_txs = HashMap::new();
         let mut rollback_set = HashSet::new();
@@ -429,7 +399,7 @@ impl TestBatchExecutorBuilder {
     }
 
     /// Adds successful transactions to be executed in a single L1 batch.
-    pub(crate) fn push_successful_transactions(&mut self, tx_hashes: &[H256]) {
+    pub fn push_successful_transactions(&mut self, tx_hashes: &[H256]) {
         let txs = tx_hashes
             .iter()
             .copied()
@@ -442,6 +412,7 @@ impl TestBatchExecutorBuilder {
 impl BatchExecutor for TestBatchExecutorBuilder {
     async fn init_batch(
         &mut self,
+        _storage_factory: Arc<dyn ReadStorageFactory>,
         _l1batch_params: L1BatchEnv,
         _system_env: SystemEnv,
         _stop_receiver: &watch::Receiver<bool>,
@@ -453,8 +424,10 @@ impl BatchExecutor for TestBatchExecutorBuilder {
             self.txs.pop_front().unwrap(),
             self.rollback_set.clone(),
         );
-        let handle = tokio::task::spawn_blocking(move || executor.run());
-
+        let handle = tokio::task::spawn_blocking(move || {
+            executor.run();
+            Ok(())
+        });
         Some(BatchExecutorHandle::from_raw(handle, commands_sender))
     }
 }
@@ -564,19 +537,22 @@ impl StateKeeperOutputHandler for TestPersistence {
         Ok(())
     }
 
-    async fn handle_l1_batch(&mut self, updates_manager: &UpdatesManager) -> anyhow::Result<()> {
+    async fn handle_l1_batch(
+        &mut self,
+        updates_manager: Arc<UpdatesManager>,
+    ) -> anyhow::Result<()> {
         let action = self.pop_next_item("seal_l1_batch");
         let ScenarioItem::BatchSeal(_, check_fn) = action else {
             anyhow::bail!("Unexpected action: {:?}", action);
         };
         if let Some(check_fn) = check_fn {
-            check_fn(updates_manager);
+            check_fn(&updates_manager);
         }
         Ok(())
     }
 }
 
-pub(super) struct TestIO {
+pub(crate) struct TestIO {
     stop_sender: Arc<watch::Sender<bool>>,
     batch_number: L1BatchNumber,
     timestamp: u64,
@@ -602,7 +578,7 @@ impl fmt::Debug for TestIO {
 }
 
 impl TestIO {
-    pub(super) fn new(
+    pub(crate) fn new(
         stop_sender: watch::Sender<bool>,
         scenario: TestScenario,
     ) -> (Self, OutputHandler) {
@@ -644,7 +620,7 @@ impl TestIO {
         (this, OutputHandler::new(Box::new(persistence)))
     }
 
-    pub(super) fn add_upgrade_tx(&mut self, version: ProtocolVersionId, tx: ProtocolUpgradeTx) {
+    pub fn add_upgrade_tx(&mut self, version: ProtocolVersionId, tx: ProtocolUpgradeTx) {
         self.protocol_upgrade_txs.insert(version, tx);
     }
 
@@ -704,6 +680,9 @@ impl StateKeeperIO for TestIO {
             l1_batch: self.batch_number,
         };
         let pending_batch = self.pending_batch.take();
+        if pending_batch.is_some() {
+            self.batch_number += 1;
+        }
         Ok((cursor, pending_batch))
     }
 
@@ -782,26 +761,20 @@ impl StateKeeperIO for TestIO {
         Ok(())
     }
 
-    async fn reject(&mut self, tx: &Transaction, error: &str) -> anyhow::Result<()> {
+    async fn reject(&mut self, tx: &Transaction, reason: UnexecutableReason) -> anyhow::Result<()> {
         let action = self.pop_next_item("reject");
         let ScenarioItem::Reject(_, expected_tx, expected_err) = action else {
             panic!("Unexpected action: {:?}", action);
         };
         assert_eq!(tx, &expected_tx, "Incorrect transaction has been rejected");
-        if let Some(expected_err) = expected_err {
-            assert!(
-                error.contains(&expected_err),
-                "Transaction was rejected with an unexpected error. Expected part was {}, but the actual error was {}",
-                expected_err,
-                error
-            );
-        }
+        assert_eq!(reason, expected_err);
+
         self.skipping_txs = false;
         Ok(())
     }
 
     async fn load_base_system_contracts(
-        &mut self,
+        &self,
         _protocol_version: ProtocolVersionId,
         _cursor: &IoCursor,
     ) -> anyhow::Result<BaseSystemContracts> {
@@ -809,23 +782,20 @@ impl StateKeeperIO for TestIO {
     }
 
     async fn load_batch_version_id(
-        &mut self,
+        &self,
         _number: L1BatchNumber,
     ) -> anyhow::Result<ProtocolVersionId> {
         Ok(self.previous_batch_protocol_version)
     }
 
     async fn load_upgrade_tx(
-        &mut self,
+        &self,
         version_id: ProtocolVersionId,
     ) -> anyhow::Result<Option<ProtocolUpgradeTx>> {
         Ok(self.protocol_upgrade_txs.get(&version_id).cloned())
     }
 
-    async fn load_batch_state_hash(
-        &mut self,
-        _l1_batch_number: L1BatchNumber,
-    ) -> anyhow::Result<H256> {
+    async fn load_batch_state_hash(&self, _l1_batch_number: L1BatchNumber) -> anyhow::Result<H256> {
         Ok(H256::zero())
     }
 }
@@ -839,6 +809,7 @@ pub(crate) struct MockBatchExecutor;
 impl BatchExecutor for MockBatchExecutor {
     async fn init_batch(
         &mut self,
+        _storage_factory: Arc<dyn ReadStorageFactory>,
         _l1batch_params: L1BatchEnv,
         _system_env: SystemEnv,
         _stop_receiver: &watch::Receiver<bool>,
@@ -854,11 +825,27 @@ impl BatchExecutor for MockBatchExecutor {
                     Command::FinishBatch(resp) => {
                         // Blanket result, it doesn't really matter.
                         resp.send(default_vm_batch_result()).unwrap();
-                        return;
+                        break;
                     }
                 }
             }
+            anyhow::Ok(())
         });
         Some(BatchExecutorHandle::from_raw(handle, send))
     }
 }
+
+#[derive(Debug)]
+pub struct MockReadStorageFactory;
+
+#[async_trait]
+impl ReadStorageFactory for MockReadStorageFactory {
+    async fn access_storage(
+        &self,
+        _stop_receiver: &Receiver<bool>,
+        _l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<Option<PgOrRocksdbStorage<'_>>> {
+        // Presume that the storage is never accessed in mocked environment
+        unimplemented!()
+    }
+}
diff --git a/core/lib/zksync_core/src/state_keeper/tests/mod.rs b/core/node/state_keeper/src/tests/mod.rs
similarity index 87%
rename from core/lib/zksync_core/src/state_keeper/tests/mod.rs
rename to core/node/state_keeper/src/tests/mod.rs
index 3c4f71260708..8bfc53c8f7b1 100644
--- a/core/lib/zksync_core/src/state_keeper/tests/mod.rs
+++ b/core/node/state_keeper/src/tests/mod.rs
@@ -6,42 +6,42 @@ use std::{
     time::Instant,
 };
 
-use multivm::{
+use tokio::sync::watch;
+use zksync_config::configs::chain::StateKeeperConfig;
+use zksync_multivm::{
     interface::{
-        CurrentExecutionState, ExecutionResult, FinishedL1Batch, L1BatchEnv, L2BlockEnv, Refunds,
-        SystemEnv, TxExecutionMode, VmExecutionResultAndLogs, VmExecutionStatistics,
+        ExecutionResult, Halt, L1BatchEnv, L2BlockEnv, Refunds, SystemEnv, TxExecutionMode,
+        VmExecutionResultAndLogs, VmExecutionStatistics,
     },
     vm_latest::{constants::BATCH_COMPUTATIONAL_GAS_LIMIT, VmExecutionLogs},
 };
-use once_cell::sync::Lazy;
-use tokio::sync::watch;
-use zksync_config::configs::chain::StateKeeperConfig;
-use zksync_contracts::BaseSystemContracts;
 use zksync_node_test_utils::create_l2_transaction;
-use zksync_system_constants::ZKPORTER_IS_AVAILABLE;
 use zksync_types::{
     aggregated_operations::AggregatedActionType,
     block::{BlockGasCount, L2BlockExecutionData, L2BlockHasher},
     fee_model::{BatchFeeInput, PubdataIndependentBatchFeeModelInput},
     tx::tx_execution_info::ExecutionMetrics,
-    zk_evm_types::{LogQuery, Timestamp},
-    Address, L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersionId, StorageLogQuery,
-    StorageLogQueryType, Transaction, H256, U256,
+    AccountTreeId, Address, L1BatchNumber, L2BlockNumber, L2ChainId, ProtocolVersionId, StorageKey,
+    StorageLog, StorageLogKind, StorageLogWithPreviousValue, Transaction, H256, U256,
+    ZKPORTER_IS_AVAILABLE,
 };
+use zksync_utils::u256_to_h256;
 
-mod tester;
-
-use self::tester::{
-    pending_batch_data, random_tx, random_upgrade_tx, rejected_exec, successful_exec,
-    successful_exec_with_metrics, TestIO, TestScenario,
-};
-pub(crate) use self::tester::{MockBatchExecutor, TestBatchExecutorBuilder};
-use crate::state_keeper::{
+use crate::{
     batch_executor::TxExecutionResult,
+    io::PendingBatchData,
     keeper::POLL_WAIT_DURATION,
     seal_criteria::{
         criteria::{GasCriterion, SlotsCriterion},
-        SequencerSealer,
+        SequencerSealer, UnexecutableReason,
+    },
+    testonly::{
+        successful_exec,
+        test_batch_executor::{
+            random_tx, random_upgrade_tx, rejected_exec, successful_exec_with_metrics,
+            MockReadStorageFactory, TestBatchExecutorBuilder, TestIO, TestScenario, FEE_ACCOUNT,
+        },
+        BASE_SYSTEM_CONTRACTS,
     },
     types::ExecutionMetricsForCriteria,
     updates::UpdatesManager,
@@ -49,8 +49,22 @@ use crate::state_keeper::{
     ZkSyncStateKeeper,
 };
 
-pub(super) static BASE_SYSTEM_CONTRACTS: Lazy<BaseSystemContracts> =
-    Lazy::new(BaseSystemContracts::load_from_disk);
+/// Creates a mock `PendingBatchData` object containing the provided sequence of L2 blocks.
+pub(crate) fn pending_batch_data(pending_l2_blocks: Vec<L2BlockExecutionData>) -> PendingBatchData {
+    PendingBatchData {
+        l1_batch_env: default_l1_batch_env(1, 1, FEE_ACCOUNT),
+        system_env: SystemEnv {
+            zk_porter_available: false,
+            version: ProtocolVersionId::latest(),
+            base_system_smart_contracts: BASE_SYSTEM_CONTRACTS.clone(),
+            bootloader_gas_limit: BATCH_COMPUTATIONAL_GAS_LIMIT,
+            execution_mode: TxExecutionMode::VerifyExecute,
+            default_validation_computational_gas_limit: BATCH_COMPUTATIONAL_GAS_LIMIT,
+            chain_id: L2ChainId::from(270),
+        },
+        pending_l2_blocks,
+    }
+}
 
 pub(super) fn default_system_env() -> SystemEnv {
     SystemEnv {
@@ -89,32 +103,6 @@ pub(super) fn default_l1_batch_env(
     }
 }
 
-pub(super) fn default_vm_batch_result() -> FinishedL1Batch {
-    FinishedL1Batch {
-        block_tip_execution_result: VmExecutionResultAndLogs {
-            result: ExecutionResult::Success { output: vec![] },
-            logs: VmExecutionLogs::default(),
-            statistics: VmExecutionStatistics::default(),
-            refunds: Refunds::default(),
-        },
-        final_execution_state: CurrentExecutionState {
-            events: vec![],
-            deduplicated_storage_log_queries: vec![],
-            used_contract_hashes: vec![],
-            user_l2_to_l1_logs: vec![],
-            system_logs: vec![],
-            total_log_queries: 0,
-            cycles_used: 0,
-            deduplicated_events_logs: vec![],
-            storage_refunds: Vec::new(),
-            pubdata_costs: Vec::new(),
-        },
-        final_bootloader_memory: Some(vec![]),
-        pubdata_input: Some(vec![]),
-        initially_written_slots: Some(vec![]),
-    }
-}
-
 pub(super) fn create_updates_manager() -> UpdatesManager {
     let l1_batch_env = default_l1_batch_env(1, 1, Address::default());
     UpdatesManager::new(&l1_batch_env, &default_system_env())
@@ -125,12 +113,11 @@ pub(super) fn create_transaction(fee_per_gas: u64, gas_per_pubdata: u64) -> Tran
 }
 
 pub(super) fn create_execution_result(
-    tx_number_in_block: u16,
     storage_logs: impl IntoIterator<Item = (U256, Query)>,
 ) -> VmExecutionResultAndLogs {
     let storage_logs: Vec<_> = storage_logs
         .into_iter()
-        .map(|(key, query)| query.into_log(key, tx_number_in_block))
+        .map(|(key, query)| query.into_log(key))
         .collect();
 
     let total_log_queries = storage_logs.len() + 2;
@@ -165,34 +152,24 @@ pub(super) enum Query {
 }
 
 impl Query {
-    fn into_log(self, key: U256, tx_number_in_block: u16) -> StorageLogQuery {
-        let log_type = match self {
-            Self::Read(_) => StorageLogQueryType::Read,
-            Self::InitialWrite(_) => StorageLogQueryType::InitialWrite,
-            Self::RepeatedWrite(_, _) => StorageLogQueryType::RepeatedWrite,
-        };
-
-        StorageLogQuery {
-            log_query: LogQuery {
-                timestamp: Timestamp(0),
-                tx_number_in_block,
-                aux_byte: 0,
-                shard_id: 0,
-                address: Address::default(),
-                key,
-                read_value: match self {
-                    Self::Read(prev) | Self::RepeatedWrite(prev, _) => prev,
-                    Self::InitialWrite(_) => U256::zero(),
+    fn into_log(self, key: U256) -> StorageLogWithPreviousValue {
+        StorageLogWithPreviousValue {
+            log: StorageLog {
+                kind: match self {
+                    Self::Read(_) => StorageLogKind::Read,
+                    Self::InitialWrite(_) => StorageLogKind::InitialWrite,
+                    Self::RepeatedWrite(_, _) => StorageLogKind::RepeatedWrite,
                 },
-                written_value: match self {
-                    Self::Read(_) => U256::zero(),
-                    Self::InitialWrite(value) | Self::RepeatedWrite(_, value) => value,
-                },
-                rw_flag: !matches!(self, Self::Read(_)),
-                rollback: false,
-                is_service: false,
+                key: StorageKey::new(AccountTreeId::new(Address::default()), u256_to_h256(key)),
+                value: u256_to_h256(match self {
+                    Query::Read(_) => U256::zero(),
+                    Query::InitialWrite(value) | Query::RepeatedWrite(_, value) => value,
+                }),
             },
-            log_type,
+            previous_value: u256_to_h256(match self {
+                Query::Read(value) | Query::RepeatedWrite(value, _) => value,
+                Query::InitialWrite(_) => U256::zero(),
+            }),
         }
     }
 }
@@ -341,7 +318,11 @@ async fn rejected_tx() {
     TestScenario::new()
         .seal_l2_block_when(|updates| updates.l2_block.executed_transactions.len() == 1)
         .next_tx("Rejected tx", rejected_tx.clone(), rejected_exec())
-        .tx_rejected("Tx got rejected", rejected_tx, None)
+        .tx_rejected(
+            "Tx got rejected",
+            rejected_tx,
+            UnexecutableReason::Halt(Halt::InnerTxError),
+        )
         .next_tx("Successful tx", random_tx(2), successful_exec())
         .l2_block_sealed("L2 block with successful tx")
         .next_tx("Second successful tx", random_tx(3), successful_exec())
@@ -457,6 +438,7 @@ async fn load_upgrade_tx() {
         Box::new(batch_executor_base),
         output_handler,
         Arc::new(sealer),
+        Arc::new(MockReadStorageFactory),
     );
 
     // Since the version hasn't changed, and we are not using shared bridge, we should not load any
diff --git a/core/lib/zksync_core/src/state_keeper/types.rs b/core/node/state_keeper/src/types.rs
similarity index 98%
rename from core/lib/zksync_core/src/state_keeper/types.rs
rename to core/node/state_keeper/src/types.rs
index 61548483dfd2..2606e7d5c7b7 100644
--- a/core/lib/zksync_core/src/state_keeper/types.rs
+++ b/core/node/state_keeper/src/types.rs
@@ -3,9 +3,9 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use multivm::interface::VmExecutionResultAndLogs;
 use zksync_dal::{Connection, Core, CoreDal};
 use zksync_mempool::{L2TxFilter, MempoolInfo, MempoolStore};
+use zksync_multivm::interface::VmExecutionResultAndLogs;
 use zksync_types::{
     block::BlockGasCount, tx::ExecutionMetrics, Address, Nonce, PriorityOpId, Transaction,
 };
diff --git a/core/lib/zksync_core/src/state_keeper/updates/l1_batch_updates.rs b/core/node/state_keeper/src/updates/l1_batch_updates.rs
similarity index 92%
rename from core/lib/zksync_core/src/state_keeper/updates/l1_batch_updates.rs
rename to core/node/state_keeper/src/updates/l1_batch_updates.rs
index 4f8c0cc4b0e7..7bc2095ff9b1 100644
--- a/core/lib/zksync_core/src/state_keeper/updates/l1_batch_updates.rs
+++ b/core/node/state_keeper/src/updates/l1_batch_updates.rs
@@ -1,4 +1,4 @@
-use multivm::interface::FinishedL1Batch;
+use zksync_multivm::interface::FinishedL1Batch;
 use zksync_types::{
     block::BlockGasCount,
     priority_op_onchain_data::PriorityOpOnchainData,
@@ -6,7 +6,7 @@ use zksync_types::{
     ExecuteTransactionCommon, L1BatchNumber,
 };
 
-use crate::state_keeper::{updates::l2_block_updates::L2BlockUpdates, utils::new_block_gas_count};
+use crate::{updates::l2_block_updates::L2BlockUpdates, utils::new_block_gas_count};
 
 #[derive(Debug)]
 pub struct L1BatchUpdates {
@@ -51,11 +51,11 @@ impl L1BatchUpdates {
 
 #[cfg(test)]
 mod tests {
-    use multivm::vm_latest::TransactionVmExt;
+    use zksync_multivm::vm_latest::TransactionVmExt;
     use zksync_types::{L2BlockNumber, ProtocolVersionId, H256};
 
     use super::*;
-    use crate::state_keeper::{
+    use crate::{
         tests::{create_execution_result, create_transaction},
         utils::new_block_gas_count,
     };
@@ -74,7 +74,7 @@ mod tests {
 
         l2_block_accumulator.extend_from_executed_transaction(
             tx,
-            create_execution_result(0, []),
+            create_execution_result([]),
             BlockGasCount::default(),
             ExecutionMetrics::default(),
             vec![],
diff --git a/core/lib/zksync_core/src/state_keeper/updates/l2_block_updates.rs b/core/node/state_keeper/src/updates/l2_block_updates.rs
similarity index 89%
rename from core/lib/zksync_core/src/state_keeper/updates/l2_block_updates.rs
rename to core/node/state_keeper/src/updates/l2_block_updates.rs
index 5c1ee62bba3f..8b3060babad1 100644
--- a/core/lib/zksync_core/src/state_keeper/updates/l2_block_updates.rs
+++ b/core/node/state_keeper/src/updates/l2_block_updates.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use multivm::{
+use zksync_multivm::{
     interface::{ExecutionResult, L2BlockEnv, VmExecutionResultAndLogs},
     vm_latest::TransactionVmExt,
 };
@@ -10,15 +10,17 @@ use zksync_types::{
     l2_to_l1_log::{SystemL2ToL1Log, UserL2ToL1Log},
     tx::{tx_execution_info::TxExecutionStatus, ExecutionMetrics, TransactionExecutionResult},
     vm_trace::Call,
-    L2BlockNumber, ProtocolVersionId, StorageLogQuery, Transaction, VmEvent, H256,
+    L2BlockNumber, ProtocolVersionId, StorageLogWithPreviousValue, Transaction, VmEvent, H256,
 };
 use zksync_utils::bytecode::{hash_bytecode, CompressedBytecodeInfo};
 
+use crate::metrics::KEEPER_METRICS;
+
 #[derive(Debug, Clone, PartialEq)]
 pub struct L2BlockUpdates {
     pub executed_transactions: Vec<TransactionExecutionResult>,
     pub events: Vec<VmEvent>,
-    pub storage_logs: Vec<StorageLogQuery>,
+    pub storage_logs: Vec<StorageLogWithPreviousValue>,
     pub user_l2_to_l1_logs: Vec<UserL2ToL1Log>,
     pub system_l2_to_l1_logs: Vec<SystemL2ToL1Log>,
     pub new_factory_deps: HashMap<H256, Vec<u8>>,
@@ -104,13 +106,21 @@ impl L2BlockUpdates {
         };
 
         let revert_reason = match &tx_execution_result.result {
-            ExecutionResult::Success { .. } => None,
-            ExecutionResult::Revert { output } => Some(output.to_string()),
-            ExecutionResult::Halt { reason } => Some(reason.to_string()),
+            ExecutionResult::Success { .. } => {
+                KEEPER_METRICS.inc_succeeded_txs();
+                None
+            }
+            ExecutionResult::Revert { output } => {
+                KEEPER_METRICS.inc_reverted_txs(output);
+                Some(output.to_string())
+            }
+            ExecutionResult::Halt { .. } => {
+                unreachable!("Tx that is added to `UpdatesManager` must not have Halted status")
+            }
         };
 
         // Get transaction factory deps
-        let factory_deps = tx.execute.factory_deps.as_deref().unwrap_or_default();
+        let factory_deps = &tx.execute.factory_deps;
         let tx_factory_deps: HashMap<_, _> = factory_deps
             .iter()
             .map(|bytecode| (hash_bytecode(bytecode), bytecode))
@@ -171,10 +181,10 @@ impl L2BlockUpdates {
 
 #[cfg(test)]
 mod tests {
-    use multivm::vm_latest::TransactionVmExt;
+    use zksync_multivm::vm_latest::TransactionVmExt;
 
     use super::*;
-    use crate::state_keeper::tests::{create_execution_result, create_transaction};
+    use crate::tests::{create_execution_result, create_transaction};
 
     #[test]
     fn apply_empty_l2_tx() {
@@ -192,7 +202,7 @@ mod tests {
 
         accumulator.extend_from_executed_transaction(
             tx,
-            create_execution_result(0, []),
+            create_execution_result([]),
             BlockGasCount::default(),
             ExecutionMetrics::default(),
             vec![],
diff --git a/core/lib/zksync_core/src/state_keeper/updates/mod.rs b/core/node/state_keeper/src/updates/mod.rs
similarity index 92%
rename from core/lib/zksync_core/src/state_keeper/updates/mod.rs
rename to core/node/state_keeper/src/updates/mod.rs
index bb28b262f4be..1121af8d72e2 100644
--- a/core/lib/zksync_core/src/state_keeper/updates/mod.rs
+++ b/core/node/state_keeper/src/updates/mod.rs
@@ -1,8 +1,8 @@
-use multivm::{
+use zksync_contracts::BaseSystemContractsHashes;
+use zksync_multivm::{
     interface::{FinishedL1Batch, L1BatchEnv, SystemEnv, VmExecutionResultAndLogs},
     utils::get_batch_base_fee,
 };
-use zksync_contracts::BaseSystemContractsHashes;
 use zksync_types::{
     block::BlockGasCount, fee_model::BatchFeeInput,
     storage_writes_deduplicator::StorageWritesDeduplicator,
@@ -14,9 +14,9 @@ use zksync_utils::bytecode::CompressedBytecodeInfo;
 pub(crate) use self::{l1_batch_updates::L1BatchUpdates, l2_block_updates::L2BlockUpdates};
 use super::{
     io::{IoCursor, L2BlockParams},
-    metrics::BATCH_TIP_METRICS,
+    metrics::{BATCH_TIP_METRICS, UPDATES_MANAGER_METRICS},
 };
-use crate::state_keeper::types::ExecutionMetricsForCriteria;
+use crate::types::ExecutionMetricsForCriteria;
 
 pub mod l1_batch_updates;
 pub mod l2_block_updates;
@@ -41,7 +41,7 @@ pub struct UpdatesManager {
 }
 
 impl UpdatesManager {
-    pub(crate) fn new(l1_batch_env: &L1BatchEnv, system_env: &SystemEnv) -> Self {
+    pub fn new(l1_batch_env: &L1BatchEnv, system_env: &SystemEnv) -> Self {
         let protocol_version = system_env.version;
         Self {
             batch_timestamp: l1_batch_env.timestamp,
@@ -102,7 +102,7 @@ impl UpdatesManager {
         self.protocol_version
     }
 
-    pub(crate) fn extend_from_executed_transaction(
+    pub fn extend_from_executed_transaction(
         &mut self,
         tx: Transaction,
         tx_execution_result: VmExecutionResultAndLogs,
@@ -111,6 +111,9 @@ impl UpdatesManager {
         execution_metrics: ExecutionMetrics,
         call_traces: Vec<Call>,
     ) {
+        let latency = UPDATES_MANAGER_METRICS
+            .extend_from_executed_transaction
+            .start();
         self.storage_writes_deduplicator
             .apply(&tx_execution_result.logs.storage_logs);
         self.l2_block.extend_from_executed_transaction(
@@ -121,9 +124,11 @@ impl UpdatesManager {
             compressed_bytecodes,
             call_traces,
         );
+        latency.observe();
     }
 
-    pub(crate) fn finish_batch(&mut self, finished_batch: FinishedL1Batch) {
+    pub fn finish_batch(&mut self, finished_batch: FinishedL1Batch) {
+        let latency = UPDATES_MANAGER_METRICS.finish_batch.start();
         assert!(
             self.l1_batch.finished.is_none(),
             "Cannot finish already finished batch"
@@ -144,11 +149,13 @@ impl UpdatesManager {
             batch_tip_metrics.execution_metrics,
         );
         self.l1_batch.finished = Some(finished_batch);
+
+        latency.observe();
     }
 
     /// Pushes a new L2 block with the specified timestamp into this manager. The previously
     /// held L2 block is considered sealed and is used to extend the L1 batch data.
-    pub(crate) fn push_l2_block(&mut self, l2_block_params: L2BlockParams) {
+    pub fn push_l2_block(&mut self, l2_block_params: L2BlockParams) {
         let new_l2_block_updates = L2BlockUpdates::new(
             l2_block_params.timestamp,
             self.l2_block.number + 1,
@@ -180,7 +187,7 @@ impl UpdatesManager {
 
 /// Command to seal an L2 block containing all necessary data for it.
 #[derive(Debug)]
-pub(crate) struct L2BlockSealCommand {
+pub struct L2BlockSealCommand {
     pub l1_batch_number: L1BatchNumber,
     pub l2_block: L2BlockUpdates,
     pub first_tx_index: usize,
@@ -199,7 +206,7 @@ pub(crate) struct L2BlockSealCommand {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::state_keeper::{
+    use crate::{
         tests::{create_execution_result, create_transaction, create_updates_manager},
         utils::new_block_gas_count,
     };
@@ -214,7 +221,7 @@ mod tests {
         let tx = create_transaction(10, 100);
         updates_manager.extend_from_executed_transaction(
             tx,
-            create_execution_result(0, []),
+            create_execution_result([]),
             vec![],
             new_block_gas_count(),
             ExecutionMetrics::default(),
diff --git a/core/lib/zksync_core/src/state_keeper/utils.rs b/core/node/state_keeper/src/utils.rs
similarity index 100%
rename from core/lib/zksync_core/src/state_keeper/utils.rs
rename to core/node/state_keeper/src/utils.rs
diff --git a/core/node/tee_verifier_input_producer/Cargo.toml b/core/node/tee_verifier_input_producer/Cargo.toml
new file mode 100644
index 000000000000..1cad743c41b1
--- /dev/null
+++ b/core/node/tee_verifier_input_producer/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "zksync_tee_verifier_input_producer"
+version = "0.1.0"
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_dal.workspace = true
+zksync_object_store.workspace = true
+zksync_prover_interface.workspace = true
+zksync_queued_job_processor.workspace = true
+zksync_tee_verifier.workspace = true
+zksync_types.workspace = true
+zksync_utils.workspace = true
+zksync_vm_utils.workspace = true
+vise.workspace = true
+
+anyhow.workspace = true
+async-trait.workspace = true
+tracing.workspace = true
+tokio = { workspace = true, features = ["time"] }
diff --git a/core/node/tee_verifier_input_producer/README.md b/core/node/tee_verifier_input_producer/README.md
new file mode 100644
index 000000000000..75a2029985cc
--- /dev/null
+++ b/core/node/tee_verifier_input_producer/README.md
@@ -0,0 +1,3 @@
+# `zksync_tee_verifier_input_producer`
+
+Component responsible for producing inputs for verification of execution in TEE.
diff --git a/core/node/tee_verifier_input_producer/src/lib.rs b/core/node/tee_verifier_input_producer/src/lib.rs
new file mode 100644
index 000000000000..c45af4cf31b0
--- /dev/null
+++ b/core/node/tee_verifier_input_producer/src/lib.rs
@@ -0,0 +1,271 @@
+//! Produces input for a TEE Verifier
+//!
+//! Extract all data needed to re-execute and verify an L1Batch without accessing
+//! the DB and/or the object store.
+//!
+//! For testing purposes, the L1 batch is re-executed immediately for now.
+//! Eventually, this component will only extract the inputs and send them to another
+//! machine over a "to be defined" channel, e.g., save them to an object store.
+
+use std::{sync::Arc, time::Instant};
+
+use anyhow::Context;
+use async_trait::async_trait;
+use tokio::task::JoinHandle;
+use zksync_dal::{tee_verifier_input_producer_dal::JOB_MAX_ATTEMPT, ConnectionPool, Core, CoreDal};
+use zksync_object_store::ObjectStore;
+use zksync_prover_interface::inputs::{
+    PrepareBasicCircuitsJob, TeeVerifierInput, V1TeeVerifierInput,
+};
+use zksync_queued_job_processor::JobProcessor;
+use zksync_tee_verifier::Verify;
+use zksync_types::{L1BatchNumber, L2ChainId};
+use zksync_utils::u256_to_h256;
+use zksync_vm_utils::storage::L1BatchParamsProvider;
+
+use self::metrics::METRICS;
+
+mod metrics;
+
+/// Component that extracts all data (from DB) necessary to run a TEE Verifier.
+#[derive(Debug)]
+pub struct TeeVerifierInputProducer {
+    connection_pool: ConnectionPool<Core>,
+    l2_chain_id: L2ChainId,
+    object_store: Arc<dyn ObjectStore>,
+}
+
+impl TeeVerifierInputProducer {
+    pub async fn new(
+        connection_pool: ConnectionPool<Core>,
+        object_store: Arc<dyn ObjectStore>,
+        l2_chain_id: L2ChainId,
+    ) -> anyhow::Result<Self> {
+        Ok(TeeVerifierInputProducer {
+            connection_pool,
+            object_store,
+            l2_chain_id,
+        })
+    }
+
+    async fn process_job_impl(
+        l1_batch_number: L1BatchNumber,
+        started_at: Instant,
+        connection_pool: ConnectionPool<Core>,
+        object_store: Arc<dyn ObjectStore>,
+        l2_chain_id: L2ChainId,
+    ) -> anyhow::Result<TeeVerifierInput> {
+        let prepare_basic_circuits_job: PrepareBasicCircuitsJob = object_store
+            .get(l1_batch_number)
+            .await
+            .context("failed to get PrepareBasicCircuitsJob from object store")?;
+
+        let mut connection = connection_pool
+            .connection()
+            .await
+            .context("failed to get connection for TeeVerifierInputProducer")?;
+
+        let l2_blocks_execution_data = connection
+            .transactions_dal()
+            .get_l2_blocks_to_execute_for_l1_batch(l1_batch_number)
+            .await?;
+
+        let l1_batch_header = connection
+            .blocks_dal()
+            .get_l1_batch_header(l1_batch_number)
+            .await
+            .with_context(|| format!("header is missing for L1 batch #{l1_batch_number}"))?
+            .unwrap();
+
+        let l1_batch_params_provider = L1BatchParamsProvider::new(&mut connection)
+            .await
+            .context("failed initializing L1 batch params provider")?;
+
+        let first_miniblock_in_batch = l1_batch_params_provider
+            .load_first_l2_block_in_batch(&mut connection, l1_batch_number)
+            .await
+            .with_context(|| {
+                format!("failed loading first miniblock in L1 batch #{l1_batch_number}")
+            })?
+            .with_context(|| format!("no miniblocks persisted for L1 batch #{l1_batch_number}"))?;
+
+        // In the state keeper, this value is used to reject execution.
+        // All batches have already been executed by State Keeper.
+        // This means we don't want to reject any execution, therefore we're using MAX as an allow all.
+        let validation_computational_gas_limit = u32::MAX;
+
+        let (system_env, l1_batch_env) = l1_batch_params_provider
+            .load_l1_batch_params(
+                &mut connection,
+                &first_miniblock_in_batch,
+                validation_computational_gas_limit,
+                l2_chain_id,
+            )
+            .await
+            .context("expected miniblock to be executed and sealed")?;
+
+        let used_contract_hashes = l1_batch_header
+            .used_contract_hashes
+            .into_iter()
+            .map(u256_to_h256)
+            .collect();
+
+        // `get_factory_deps()` returns the bytecode in chunks of `Vec<[u8; 32]>`,
+        // but `fn store_factory_dep(&mut self, hash: H256, bytecode: Vec<u8>)` in `InMemoryStorage` wants flat byte vecs.
+        pub fn into_flattened<T: Clone, const N: usize>(data: Vec<[T; N]>) -> Vec<T> {
+            let mut new = Vec::new();
+            for slice in data.iter() {
+                new.extend_from_slice(slice);
+            }
+            new
+        }
+
+        let used_contracts = connection
+            .factory_deps_dal()
+            .get_factory_deps(&used_contract_hashes)
+            .await
+            .into_iter()
+            .map(|(hash, bytes)| (u256_to_h256(hash), into_flattened(bytes)))
+            .collect();
+
+        tracing::info!("Started execution of l1_batch: {l1_batch_number:?}");
+
+        let tee_verifier_input = V1TeeVerifierInput::new(
+            prepare_basic_circuits_job,
+            l2_blocks_execution_data,
+            l1_batch_env,
+            system_env,
+            used_contracts,
+        );
+
+        // TODO (SEC-263): remove these 2 lines after successful testnet runs
+        tee_verifier_input.clone().verify()?;
+        tracing::info!("Looks like we verified {l1_batch_number} correctly");
+
+        tracing::info!("Finished execution of l1_batch: {l1_batch_number:?}");
+
+        METRICS.process_batch_time.observe(started_at.elapsed());
+        tracing::debug!(
+            "TeeVerifierInputProducer took {:?} for L1BatchNumber {}",
+            started_at.elapsed(),
+            l1_batch_number.0
+        );
+
+        Ok(TeeVerifierInput::new(tee_verifier_input))
+    }
+}
+
+#[async_trait]
+impl JobProcessor for TeeVerifierInputProducer {
+    type Job = L1BatchNumber;
+    type JobId = L1BatchNumber;
+    type JobArtifacts = TeeVerifierInput;
+    const SERVICE_NAME: &'static str = "tee_verifier_input_producer";
+
+    async fn get_next_job(&self) -> anyhow::Result<Option<(Self::JobId, Self::Job)>> {
+        let mut connection = self.connection_pool.connection().await?;
+        let l1_batch_to_process = connection
+            .tee_verifier_input_producer_dal()
+            .get_next_tee_verifier_input_producer_job()
+            .await
+            .context("failed to get next basic witness input producer job")?;
+        Ok(l1_batch_to_process.map(|number| (number, number)))
+    }
+
+    async fn save_failure(&self, job_id: Self::JobId, started_at: Instant, error: String) {
+        let attempts = self
+            .connection_pool
+            .connection()
+            .await
+            .unwrap()
+            .tee_verifier_input_producer_dal()
+            .mark_job_as_failed(job_id, started_at, error)
+            .await
+            .expect("errored whilst marking job as failed");
+        if let Some(tries) = attempts {
+            tracing::warn!("Failed to process job: {job_id:?}, after {tries} tries.");
+        } else {
+            tracing::warn!("L1 Batch {job_id:?} was processed successfully by another worker.");
+        }
+    }
+
+    async fn process_job(
+        &self,
+        _job_id: &Self::JobId,
+        job: Self::Job,
+        started_at: Instant,
+    ) -> JoinHandle<anyhow::Result<Self::JobArtifacts>> {
+        let l2_chain_id = self.l2_chain_id;
+        let connection_pool = self.connection_pool.clone();
+        let object_store = self.object_store.clone();
+        tokio::task::spawn(async move {
+            Self::process_job_impl(
+                job,
+                started_at,
+                connection_pool.clone(),
+                object_store,
+                l2_chain_id,
+            )
+            .await
+        })
+    }
+
+    async fn save_result(
+        &self,
+        job_id: Self::JobId,
+        started_at: Instant,
+        artifacts: Self::JobArtifacts,
+    ) -> anyhow::Result<()> {
+        let upload_started_at = Instant::now();
+        let object_path = self
+            .object_store
+            .put(job_id, &artifacts)
+            .await
+            .context("failed to upload artifacts for TeeVerifierInputProducer")?;
+        METRICS
+            .upload_input_time
+            .observe(upload_started_at.elapsed());
+        let mut connection = self
+            .connection_pool
+            .connection()
+            .await
+            .context("failed to acquire DB connection for TeeVerifierInputProducer")?;
+        let mut transaction = connection
+            .start_transaction()
+            .await
+            .context("failed to acquire DB transaction for TeeVerifierInputProducer")?;
+        transaction
+            .tee_verifier_input_producer_dal()
+            .mark_job_as_successful(job_id, started_at, &object_path)
+            .await
+            .context("failed to mark job as successful for TeeVerifierInputProducer")?;
+        transaction
+            .tee_proof_generation_dal()
+            .insert_tee_proof_generation_job(job_id)
+            .await?;
+        transaction
+            .commit()
+            .await
+            .context("failed to commit DB transaction for TeeVerifierInputProducer")?;
+        METRICS.block_number_processed.set(job_id.0 as i64);
+        Ok(())
+    }
+
+    fn max_attempts(&self) -> u32 {
+        JOB_MAX_ATTEMPT as u32
+    }
+
+    async fn get_job_attempts(&self, job_id: &L1BatchNumber) -> anyhow::Result<u32> {
+        let mut connection = self
+            .connection_pool
+            .connection()
+            .await
+            .context("failed to acquire DB connection for TeeVerifierInputProducer")?;
+        connection
+            .tee_verifier_input_producer_dal()
+            .get_tee_verifier_input_producer_job_attempts(*job_id)
+            .await
+            .map(|attempts| attempts.unwrap_or(0))
+            .context("failed to get job attempts for TeeVerifierInputProducer")
+    }
+}
diff --git a/core/node/tee_verifier_input_producer/src/metrics.rs b/core/node/tee_verifier_input_producer/src/metrics.rs
new file mode 100644
index 000000000000..51daa20baadb
--- /dev/null
+++ b/core/node/tee_verifier_input_producer/src/metrics.rs
@@ -0,0 +1,18 @@
+//! Metrics
+
+use std::time::Duration;
+
+use vise::{Buckets, Gauge, Histogram, Metrics, Unit};
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "tee_verifier_input_producer")]
+pub(crate) struct TeeVerifierInputProducerMetrics {
+    #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
+    pub process_batch_time: Histogram<Duration>,
+    #[metrics(buckets = Buckets::LATENCIES, unit = Unit::Seconds)]
+    pub upload_input_time: Histogram<Duration>,
+    pub block_number_processed: Gauge,
+}
+
+#[vise::register]
+pub(super) static METRICS: vise::Global<TeeVerifierInputProducerMetrics> = vise::Global::new();
diff --git a/core/node/test_utils/Cargo.toml b/core/node/test_utils/Cargo.toml
index da23ac917571..78205337c549 100644
--- a/core/node/test_utils/Cargo.toml
+++ b/core/node/test_utils/Cargo.toml
@@ -10,7 +10,7 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-multivm.workspace = true
+zksync_multivm.workspace = true
 zksync_types.workspace = true
 zksync_dal.workspace = true
 zksync_contracts.workspace = true
diff --git a/core/node/test_utils/src/lib.rs b/core/node/test_utils/src/lib.rs
index 19a6337e9eef..ee3503322aea 100644
--- a/core/node/test_utils/src/lib.rs
+++ b/core/node/test_utils/src/lib.rs
@@ -1,10 +1,11 @@
 //! Test utils.
+
 use std::collections::HashMap;
 
-use multivm::utils::get_max_gas_per_pubdata_byte;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{Connection, Core, CoreDal};
 use zksync_merkle_tree::{domain::ZkSyncTree, TreeInstruction};
+use zksync_multivm::utils::get_max_gas_per_pubdata_byte;
 use zksync_node_genesis::GenesisParams;
 use zksync_system_constants::{get_intrinsic_constants, ZKPORTER_IS_AVAILABLE};
 use zksync_types::{
@@ -16,7 +17,8 @@ use zksync_types::{
     fee::Fee,
     fee_model::BatchFeeInput,
     l2::L2Tx,
-    snapshots::SnapshotRecoveryStatus,
+    protocol_version::ProtocolSemanticVersion,
+    snapshots::{SnapshotRecoveryStatus, SnapshotStorageLog},
     transaction_request::PaymasterParams,
     tx::{tx_execution_info::TxExecutionStatus, ExecutionMetrics, TransactionExecutionResult},
     Address, K256PrivateKey, L1BatchNumber, L2BlockNumber, L2ChainId, Nonce, ProtocolVersion,
@@ -65,7 +67,7 @@ pub fn create_l1_batch_metadata(number: u32) -> L1BatchMetadata {
             zkporter_is_available: ZKPORTER_IS_AVAILABLE,
             bootloader_code_hash: BaseSystemContractsHashes::default().bootloader,
             default_aa_code_hash: BaseSystemContractsHashes::default().default_aa,
-            protocol_version: ProtocolVersionId::latest(),
+            protocol_version: Some(ProtocolVersionId::latest()),
         },
         aux_data_hash: H256::zero(),
         meta_parameters_hash: H256::zero(),
@@ -122,7 +124,7 @@ pub fn create_l2_transaction(fee_per_gas: u64, gas_per_pubdata: u64) -> L2Tx {
         U256::zero(),
         L2ChainId::from(271),
         &K256PrivateKey::random(),
-        None,
+        vec![],
         PaymasterParams::default(),
     )
     .unwrap();
@@ -152,24 +154,24 @@ pub fn execute_l2_transaction(transaction: L2Tx) -> TransactionExecutionResult {
 pub struct Snapshot {
     pub l1_batch: L1BatchHeader,
     pub l2_block: L2BlockHeader,
-    pub storage_logs: Vec<StorageLog>,
+    pub storage_logs: Vec<SnapshotStorageLog>,
     pub factory_deps: HashMap<H256, Vec<u8>>,
 }
 
 impl Snapshot {
     // Constructs a dummy Snapshot based on the provided values.
-    pub fn make(
+    pub fn new(
         l1_batch: L1BatchNumber,
         l2_block: L2BlockNumber,
-        storage_logs: &[StorageLog],
+        storage_logs: Vec<SnapshotStorageLog>,
+        genesis_params: GenesisParams,
     ) -> Self {
-        let genesis_params = GenesisParams::mock();
         let contracts = genesis_params.base_system_contracts();
         let l1_batch = L1BatchHeader::new(
             l1_batch,
             l1_batch.0.into(),
             contracts.hashes(),
-            genesis_params.protocol_version(),
+            genesis_params.minor_protocol_version(),
         );
         let l2_block = L2BlockHeader {
             number: l2_block,
@@ -181,10 +183,10 @@ impl Snapshot {
             batch_fee_input: BatchFeeInput::l1_pegged(100, 100),
             fee_account_address: Address::zero(),
             gas_per_pubdata_limit: get_max_gas_per_pubdata_byte(
-                genesis_params.protocol_version().into(),
+                genesis_params.minor_protocol_version().into(),
             ),
             base_system_contracts_hashes: contracts.hashes(),
-            protocol_version: Some(genesis_params.protocol_version()),
+            protocol_version: Some(genesis_params.minor_protocol_version()),
             virtual_blocks: 1,
             gas_limit: 0,
         };
@@ -195,7 +197,7 @@ impl Snapshot {
                 .into_iter()
                 .map(|c| (c.hash, zksync_utils::be_words_to_bytes(&c.code)))
                 .collect(),
-            storage_logs: storage_logs.to_vec(),
+            storage_logs,
         }
     }
 }
@@ -207,7 +209,18 @@ pub async fn prepare_recovery_snapshot(
     l2_block: L2BlockNumber,
     storage_logs: &[StorageLog],
 ) -> SnapshotRecoveryStatus {
-    recover(storage, Snapshot::make(l1_batch, l2_block, storage_logs)).await
+    let storage_logs = storage_logs
+        .iter()
+        .enumerate()
+        .map(|(i, log)| SnapshotStorageLog {
+            key: log.key.hashed_key(),
+            value: log.value,
+            l1_batch_number_of_initial_write: l1_batch,
+            enumeration_index: i as u64 + 1,
+        })
+        .collect();
+    let snapshot = Snapshot::new(l1_batch, l2_block, storage_logs, GenesisParams::mock());
+    recover(storage, snapshot).await
 }
 
 /// Takes a storage snapshot at the last sealed L1 batch.
@@ -242,10 +255,7 @@ pub async fn snapshot(storage: &mut Connection<'_, Core>) -> Snapshot {
             .snapshots_creator_dal()
             .get_storage_logs_chunk(l2_block, l1_batch.number, all_hashes)
             .await
-            .unwrap()
-            .into_iter()
-            .map(|l| StorageLog::new_write_log(l.key, l.value))
-            .collect(),
+            .unwrap(),
         factory_deps: storage
             .snapshots_creator_dal()
             .get_all_factory_deps(l2_block)
@@ -268,14 +278,16 @@ pub async fn recover(
     let tree_instructions: Vec<_> = snapshot
         .storage_logs
         .iter()
-        .enumerate()
-        .map(|(i, log)| TreeInstruction::write(log.key, i as u64 + 1, log.value))
+        .map(|log| {
+            let tree_key = U256::from_little_endian(log.key.as_bytes());
+            TreeInstruction::write(tree_key, log.enumeration_index, log.value)
+        })
         .collect();
     let l1_batch_root_hash = ZkSyncTree::process_genesis_batch(&tree_instructions).root_hash;
 
     let protocol_version = storage
         .protocol_versions_dal()
-        .get_protocol_version(snapshot.l1_batch.protocol_version.unwrap())
+        .get_protocol_version_with_latest_patch(snapshot.l1_batch.protocol_version.unwrap())
         .await
         .unwrap();
     if let Some(protocol_version) = protocol_version {
@@ -289,6 +301,10 @@ pub async fn recover(
             .protocol_versions_dal()
             .save_protocol_version_with_tx(&ProtocolVersion {
                 base_system_contracts_hashes: snapshot.l1_batch.base_system_contracts_hashes,
+                version: ProtocolSemanticVersion {
+                    minor: snapshot.l1_batch.protocol_version.unwrap(),
+                    patch: 0.into(),
+                },
                 ..ProtocolVersion::default()
             })
             .await
@@ -307,10 +323,7 @@ pub async fn recover(
         .unwrap();
     storage
         .storage_logs_dal()
-        .insert_storage_logs(
-            snapshot.l2_block.number,
-            &[(H256::zero(), snapshot.storage_logs)],
-        )
+        .insert_storage_logs_from_snapshot(snapshot.l2_block.number, &snapshot.storage_logs)
         .await
         .unwrap();
 
@@ -345,9 +358,3 @@ pub async fn recover(
     storage.commit().await.unwrap();
     snapshot_recovery
 }
-
-#[derive(Debug, Clone)]
-pub enum DeploymentMode {
-    Validium,
-    Rollup,
-}
diff --git a/core/node/vm_runner/Cargo.toml b/core/node/vm_runner/Cargo.toml
index 9a1f771b6a10..a68cd27f8cb5 100644
--- a/core/node/vm_runner/Cargo.toml
+++ b/core/node/vm_runner/Cargo.toml
@@ -10,23 +10,29 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
-multivm.workspace = true
+zksync_multivm.workspace = true
 zksync_types.workspace = true
 zksync_dal.workspace = true
 zksync_contracts.workspace = true
 zksync_state.workspace = true
 zksync_storage.workspace = true
-vm_utils.workspace = true
+zksync_state_keeper.workspace = true
+zksync_utils.workspace = true
+zksync_vm_utils.workspace = true
 
 tokio = { workspace = true, features = ["time"] }
 anyhow.workspace = true
 async-trait.workspace = true
 once_cell.workspace = true
 tracing.workspace = true
+dashmap.workspace = true
+vise.workspace = true
 
 [dev-dependencies]
 zksync_node_test_utils.workspace = true
 zksync_node_genesis.workspace = true
+zksync_test_account.workspace = true
 backon.workspace = true
+futures = { workspace = true, features = ["compat"] }
 rand.workspace = true
 tempfile.workspace = true
diff --git a/core/node/vm_runner/src/impls/mod.rs b/core/node/vm_runner/src/impls/mod.rs
new file mode 100644
index 000000000000..70d01f6932ef
--- /dev/null
+++ b/core/node/vm_runner/src/impls/mod.rs
@@ -0,0 +1,3 @@
+mod protective_reads;
+
+pub use protective_reads::{ProtectiveReadsWriter, ProtectiveReadsWriterTasks};
diff --git a/core/node/vm_runner/src/impls/protective_reads.rs b/core/node/vm_runner/src/impls/protective_reads.rs
new file mode 100644
index 000000000000..f6bac1491806
--- /dev/null
+++ b/core/node/vm_runner/src/impls/protective_reads.rs
@@ -0,0 +1,216 @@
+use std::sync::Arc;
+
+use anyhow::Context;
+use async_trait::async_trait;
+use tokio::sync::watch;
+use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
+use zksync_state_keeper::{MainBatchExecutor, StateKeeperOutputHandler, UpdatesManager};
+use zksync_types::{L1BatchNumber, L2ChainId, StorageLog};
+
+use crate::{
+    storage::StorageSyncTask, ConcurrentOutputHandlerFactory, ConcurrentOutputHandlerFactoryTask,
+    OutputHandlerFactory, VmRunner, VmRunnerIo, VmRunnerStorage,
+};
+
+/// A standalone component that writes protective reads asynchronously to state keeper.
+#[derive(Debug)]
+pub struct ProtectiveReadsWriter {
+    vm_runner: VmRunner,
+}
+
+impl ProtectiveReadsWriter {
+    /// Create a new protective reads writer from the provided DB parameters and window size which
+    /// regulates how many batches this component can handle at the same time.
+    pub async fn new(
+        pool: ConnectionPool<Core>,
+        rocksdb_path: String,
+        chain_id: L2ChainId,
+        first_processed_batch: L1BatchNumber,
+        window_size: u32,
+    ) -> anyhow::Result<(Self, ProtectiveReadsWriterTasks)> {
+        let io = ProtectiveReadsIo {
+            first_processed_batch,
+            window_size,
+        };
+        let (loader, loader_task) =
+            VmRunnerStorage::new(pool.clone(), rocksdb_path, io.clone(), chain_id).await?;
+        let output_handler_factory = ProtectiveReadsOutputHandlerFactory { pool: pool.clone() };
+        let (output_handler_factory, output_handler_factory_task) =
+            ConcurrentOutputHandlerFactory::new(pool.clone(), io.clone(), output_handler_factory);
+        let batch_processor = MainBatchExecutor::new(false, false);
+        let vm_runner = VmRunner::new(
+            pool,
+            Box::new(io),
+            Arc::new(loader),
+            Box::new(output_handler_factory),
+            Box::new(batch_processor),
+        );
+        Ok((
+            Self { vm_runner },
+            ProtectiveReadsWriterTasks {
+                loader_task,
+                output_handler_factory_task,
+            },
+        ))
+    }
+
+    /// Continuously loads new available batches and writes the corresponding protective reads
+    /// produced by that batch.
+    ///
+    /// # Errors
+    ///
+    /// Propagates RocksDB and Postgres errors.
+    pub async fn run(self, stop_receiver: &watch::Receiver<bool>) -> anyhow::Result<()> {
+        self.vm_runner.run(stop_receiver).await
+    }
+}
+
+/// A collections of tasks that need to be run in order for protective reads writer to work as
+/// intended.
+#[derive(Debug)]
+pub struct ProtectiveReadsWriterTasks {
+    /// Task that synchronizes storage with new available batches.
+    pub loader_task: StorageSyncTask<ProtectiveReadsIo>,
+    /// Task that handles output from processed batches.
+    pub output_handler_factory_task: ConcurrentOutputHandlerFactoryTask<ProtectiveReadsIo>,
+}
+
+#[derive(Debug, Clone)]
+pub struct ProtectiveReadsIo {
+    first_processed_batch: L1BatchNumber,
+    window_size: u32,
+}
+
+#[async_trait]
+impl VmRunnerIo for ProtectiveReadsIo {
+    fn name(&self) -> &'static str {
+        "protective_reads_writer"
+    }
+
+    async fn latest_processed_batch(
+        &self,
+        conn: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<L1BatchNumber> {
+        Ok(conn
+            .vm_runner_dal()
+            .get_protective_reads_latest_processed_batch()
+            .await?
+            .unwrap_or(self.first_processed_batch))
+    }
+
+    async fn last_ready_to_be_loaded_batch(
+        &self,
+        conn: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<L1BatchNumber> {
+        Ok(conn
+            .vm_runner_dal()
+            .get_protective_reads_last_ready_batch(self.first_processed_batch, self.window_size)
+            .await?)
+    }
+
+    async fn mark_l1_batch_as_completed(
+        &self,
+        conn: &mut Connection<'_, Core>,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<()> {
+        Ok(conn
+            .vm_runner_dal()
+            .mark_protective_reads_batch_as_completed(l1_batch_number)
+            .await?)
+    }
+}
+
+#[derive(Debug)]
+struct ProtectiveReadsOutputHandler {
+    pool: ConnectionPool<Core>,
+}
+
+#[async_trait]
+impl StateKeeperOutputHandler for ProtectiveReadsOutputHandler {
+    async fn handle_l2_block(&mut self, _updates_manager: &UpdatesManager) -> anyhow::Result<()> {
+        Ok(())
+    }
+
+    async fn handle_l1_batch(
+        &mut self,
+        updates_manager: Arc<UpdatesManager>,
+    ) -> anyhow::Result<()> {
+        let finished_batch = updates_manager
+            .l1_batch
+            .finished
+            .as_ref()
+            .context("L1 batch is not actually finished")?;
+        let (_, computed_protective_reads): (Vec<StorageLog>, Vec<StorageLog>) = finished_batch
+            .final_execution_state
+            .deduplicated_storage_logs
+            .iter()
+            .partition(|log_query| log_query.is_write());
+
+        let mut connection = self
+            .pool
+            .connection_tagged("protective_reads_writer")
+            .await?;
+        let mut written_protective_reads = connection
+            .storage_logs_dedup_dal()
+            .get_protective_reads_for_l1_batch(updates_manager.l1_batch.number)
+            .await?;
+
+        if !written_protective_reads.is_empty() {
+            tracing::debug!(
+                l1_batch_number = %updates_manager.l1_batch.number,
+                "Protective reads have already been written, validating"
+            );
+            for protective_read in computed_protective_reads {
+                let address = protective_read.key.address();
+                let key = protective_read.key.key();
+                if !written_protective_reads.remove(&protective_read.key) {
+                    tracing::error!(
+                        l1_batch_number = %updates_manager.l1_batch.number,
+                        address = %address,
+                        key = %key,
+                        "VM runner produced a protective read that did not happen in state keeper"
+                    );
+                }
+            }
+            for remaining_read in written_protective_reads {
+                tracing::error!(
+                    l1_batch_number = %updates_manager.l1_batch.number,
+                    address = %remaining_read.address(),
+                    key = %remaining_read.key(),
+                    "State keeper produced a protective read that did not happen in VM runner"
+                );
+            }
+        } else {
+            tracing::debug!(
+                l1_batch_number = %updates_manager.l1_batch.number,
+                "Protective reads have not been written, writing"
+            );
+            connection
+                .storage_logs_dedup_dal()
+                .insert_protective_reads(
+                    updates_manager.l1_batch.number,
+                    &computed_protective_reads,
+                )
+                .await?;
+        }
+
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+struct ProtectiveReadsOutputHandlerFactory {
+    pool: ConnectionPool<Core>,
+}
+
+#[async_trait]
+impl OutputHandlerFactory for ProtectiveReadsOutputHandlerFactory {
+    async fn create_handler(
+        &mut self,
+        _l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<Box<dyn StateKeeperOutputHandler>> {
+        Ok(Box::new(ProtectiveReadsOutputHandler {
+            pool: self.pool.clone(),
+        }))
+    }
+}
diff --git a/core/node/vm_runner/src/io.rs b/core/node/vm_runner/src/io.rs
new file mode 100644
index 000000000000..e67da0e8235c
--- /dev/null
+++ b/core/node/vm_runner/src/io.rs
@@ -0,0 +1,45 @@
+use std::fmt::Debug;
+
+use async_trait::async_trait;
+use zksync_dal::{Connection, Core};
+use zksync_types::L1BatchNumber;
+
+/// Functionality to fetch/save data about processed/unprocessed batches for a particular VM runner
+/// instance.
+#[async_trait]
+pub trait VmRunnerIo: Debug + Send + Sync + 'static {
+    /// Unique name of the VM runner instance.
+    fn name(&self) -> &'static str;
+
+    /// Returns the last L1 batch number that has been processed by this VM runner instance.
+    ///
+    /// # Errors
+    ///
+    /// Propagates DB errors.
+    async fn latest_processed_batch(
+        &self,
+        conn: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<L1BatchNumber>;
+
+    /// Returns the last L1 batch number that is ready to be loaded by this VM runner instance.
+    ///
+    /// # Errors
+    ///
+    /// Propagates DB errors.
+    async fn last_ready_to_be_loaded_batch(
+        &self,
+        conn: &mut Connection<'_, Core>,
+    ) -> anyhow::Result<L1BatchNumber>;
+
+    /// Marks the specified batch as the latest completed batch. All earlier batches are considered
+    /// to be completed too. No guarantees about later batches.
+    ///
+    /// # Errors
+    ///
+    /// Propagates DB errors.
+    async fn mark_l1_batch_as_completed(
+        &self,
+        conn: &mut Connection<'_, Core>,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<()>;
+}
diff --git a/core/node/vm_runner/src/lib.rs b/core/node/vm_runner/src/lib.rs
index 01eb3541fca8..50cf2a4433c1 100644
--- a/core/node/vm_runner/src/lib.rs
+++ b/core/node/vm_runner/src/lib.rs
@@ -1,6 +1,22 @@
+//! VM Runner is a framework to build batch processor components, i.e. components that would re-run
+//! batches in VM independently from state keeper and handle some output as a result.
+
+#![warn(missing_debug_implementations, missing_docs)]
+
+mod impls;
+mod io;
+mod output_handler;
+mod process;
 mod storage;
 
+mod metrics;
 #[cfg(test)]
 mod tests;
 
-pub use storage::{BatchExecuteData, VmRunnerStorage, VmRunnerStorageLoader};
+pub use impls::{ProtectiveReadsWriter, ProtectiveReadsWriterTasks};
+pub use io::VmRunnerIo;
+pub use output_handler::{
+    ConcurrentOutputHandlerFactory, ConcurrentOutputHandlerFactoryTask, OutputHandlerFactory,
+};
+pub use process::VmRunner;
+pub use storage::{BatchExecuteData, StorageSyncTask, VmRunnerStorage};
diff --git a/core/node/vm_runner/src/metrics.rs b/core/node/vm_runner/src/metrics.rs
new file mode 100644
index 000000000000..4252ad5f0d4f
--- /dev/null
+++ b/core/node/vm_runner/src/metrics.rs
@@ -0,0 +1,28 @@
+//! Metrics for `VmRunner`.
+
+use std::time::Duration;
+
+use vise::{Buckets, Gauge, Histogram, Metrics};
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "vm_runner")]
+pub(super) struct VmRunnerMetrics {
+    /// Last batch that has been marked as processed.
+    pub last_processed_batch: Gauge<u64>,
+    /// Last batch that is ready to be processed.
+    pub last_ready_batch: Gauge<u64>,
+    /// Current amount of batches that are being processed.
+    pub in_progress_l1_batches: Gauge<u64>,
+    /// Total latency of loading an L1 batch (RocksDB mode only).
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub storage_load_time: Histogram<Duration>,
+    /// Total latency of running VM on an L1 batch.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub run_vm_time: Histogram<Duration>,
+    /// Total latency of handling output of an L1 batch.
+    #[metrics(buckets = Buckets::LATENCIES)]
+    pub output_handle_time: Histogram<Duration>,
+}
+
+#[vise::register]
+pub(super) static METRICS: vise::Global<VmRunnerMetrics> = vise::Global::new();
diff --git a/core/node/vm_runner/src/output_handler.rs b/core/node/vm_runner/src/output_handler.rs
new file mode 100644
index 000000000000..4052c245a44f
--- /dev/null
+++ b/core/node/vm_runner/src/output_handler.rs
@@ -0,0 +1,261 @@
+use std::{
+    fmt::{Debug, Formatter},
+    mem,
+    sync::Arc,
+    time::Duration,
+};
+
+use anyhow::Context;
+use async_trait::async_trait;
+use dashmap::DashMap;
+use tokio::{
+    sync::{oneshot, watch},
+    task::JoinHandle,
+};
+use zksync_dal::{ConnectionPool, Core};
+use zksync_state_keeper::{StateKeeperOutputHandler, UpdatesManager};
+use zksync_types::L1BatchNumber;
+
+use crate::{metrics::METRICS, VmRunnerIo};
+
+type BatchReceiver = oneshot::Receiver<JoinHandle<anyhow::Result<()>>>;
+
+/// Functionality to produce a [`StateKeeperOutputHandler`] implementation for a specific L1 batch.
+///
+/// The idea behind this trait is that often handling output data is independent of the order of the
+/// batch that data belongs to. In other words, one could be handling output of batch #100 and #1000
+/// simultaneously. Implementing this trait signifies that this property is held for the data the
+/// implementation is responsible for.
+#[async_trait]
+pub trait OutputHandlerFactory: Debug + Send {
+    /// Creates a [`StateKeeperOutputHandler`] implementation for the provided L1 batch. Only
+    /// supposed to be used for the L1 batch data it was created against. Using it for anything else
+    /// will lead to errors.
+    ///
+    /// # Errors
+    ///
+    /// Propagates DB errors.
+    async fn create_handler(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<Box<dyn StateKeeperOutputHandler>>;
+}
+
+/// A delegator factory that requires an underlying factory `F` that does the actual work, however
+/// this struct is orchestrated such that any output handler it produces has a non-blocking
+/// `handle_l1_batch` implementation (where the heaviest work is expected to happen).
+///
+/// Once the asynchronous work done in `handle_l1_batch` finishes it is also guaranteed to mark the
+/// batch is processed by `Io`. It is guaranteed, however, that for any processed batch all batches
+/// preceding it are also processed. No guarantees about subsequent batches. For example, if
+/// batches #1, #2, #3, #5, #9, #100 are processed then only batches #{1-3} will be marked as
+/// processed and #3 would be the latest processed batch as defined in [`VmRunnerIo`].
+pub struct ConcurrentOutputHandlerFactory<Io: VmRunnerIo, F: OutputHandlerFactory> {
+    pool: ConnectionPool<Core>,
+    state: Arc<DashMap<L1BatchNumber, BatchReceiver>>,
+    io: Io,
+    factory: F,
+}
+
+impl<Io: VmRunnerIo, F: OutputHandlerFactory> Debug for ConcurrentOutputHandlerFactory<Io, F> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ConcurrentOutputHandlerFactory")
+            .field("pool", &self.pool)
+            .field("io", &self.io)
+            .field("factory", &self.factory)
+            .finish()
+    }
+}
+
+impl<Io: VmRunnerIo + Clone, F: OutputHandlerFactory> ConcurrentOutputHandlerFactory<Io, F> {
+    /// Creates a new concurrent delegator factory using provided Postgres pool, VM runner IO
+    /// and underlying output handler factory.
+    ///
+    /// Returns a [`ConcurrentOutputHandlerFactoryTask`] which is supposed to be run by the caller.
+    pub fn new(
+        pool: ConnectionPool<Core>,
+        io: Io,
+        factory: F,
+    ) -> (Self, ConcurrentOutputHandlerFactoryTask<Io>) {
+        let state = Arc::new(DashMap::new());
+        let task = ConcurrentOutputHandlerFactoryTask {
+            pool: pool.clone(),
+            io: io.clone(),
+            state: state.clone(),
+        };
+        (
+            Self {
+                pool,
+                state,
+                io,
+                factory,
+            },
+            task,
+        )
+    }
+}
+
+#[async_trait]
+impl<Io: VmRunnerIo, F: OutputHandlerFactory> OutputHandlerFactory
+    for ConcurrentOutputHandlerFactory<Io, F>
+{
+    async fn create_handler(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<Box<dyn StateKeeperOutputHandler>> {
+        let mut conn = self.pool.connection_tagged(self.io.name()).await?;
+        let latest_processed_batch = self.io.latest_processed_batch(&mut conn).await?;
+        let last_processable_batch = self.io.last_ready_to_be_loaded_batch(&mut conn).await?;
+        drop(conn);
+        anyhow::ensure!(
+            l1_batch_number > latest_processed_batch,
+            "Cannot handle an already processed batch #{} (latest is #{})",
+            l1_batch_number,
+            latest_processed_batch
+        );
+        anyhow::ensure!(
+            l1_batch_number <= last_processable_batch,
+            "Cannot handle batch #{} as it is too far away from latest batch #{} (last processable batch is #{})",
+            l1_batch_number,
+            latest_processed_batch,
+            last_processable_batch
+        );
+
+        let handler = self.factory.create_handler(l1_batch_number).await?;
+        let (sender, receiver) = oneshot::channel();
+        self.state.insert(l1_batch_number, receiver);
+        Ok(Box::new(AsyncOutputHandler::Running { handler, sender }))
+    }
+}
+
+enum AsyncOutputHandler {
+    Running {
+        handler: Box<dyn StateKeeperOutputHandler>,
+        sender: oneshot::Sender<JoinHandle<anyhow::Result<()>>>,
+    },
+    Finished,
+}
+
+impl Debug for AsyncOutputHandler {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            AsyncOutputHandler::Running { handler, .. } => f
+                .debug_struct("AsyncOutputHandler::Running")
+                .field("handler", handler)
+                .finish(),
+            AsyncOutputHandler::Finished => f.debug_struct("AsyncOutputHandler::Finished").finish(),
+        }
+    }
+}
+
+#[async_trait]
+impl StateKeeperOutputHandler for AsyncOutputHandler {
+    async fn handle_l2_block(&mut self, updates_manager: &UpdatesManager) -> anyhow::Result<()> {
+        match self {
+            AsyncOutputHandler::Running { handler, .. } => {
+                handler.handle_l2_block(updates_manager).await
+            }
+            AsyncOutputHandler::Finished => {
+                Err(anyhow::anyhow!("Cannot handle any more L2 blocks"))
+            }
+        }
+    }
+
+    async fn handle_l1_batch(
+        &mut self,
+        updates_manager: Arc<UpdatesManager>,
+    ) -> anyhow::Result<()> {
+        let state = mem::replace(self, AsyncOutputHandler::Finished);
+        match state {
+            AsyncOutputHandler::Running {
+                mut handler,
+                sender,
+            } => {
+                sender
+                    .send(tokio::task::spawn(async move {
+                        let latency = METRICS.output_handle_time.start();
+                        let result = handler.handle_l1_batch(updates_manager).await;
+                        latency.observe();
+                        result
+                    }))
+                    .ok();
+                Ok(())
+            }
+            AsyncOutputHandler::Finished => {
+                Err(anyhow::anyhow!("Cannot handle any more L1 batches"))
+            }
+        }
+    }
+}
+
+/// A runnable task that continually awaits for the very next unprocessed batch to be processed and
+/// marks it as so using `Io`.
+pub struct ConcurrentOutputHandlerFactoryTask<Io: VmRunnerIo> {
+    pool: ConnectionPool<Core>,
+    io: Io,
+    state: Arc<DashMap<L1BatchNumber, BatchReceiver>>,
+}
+
+impl<Io: VmRunnerIo> Debug for ConcurrentOutputHandlerFactoryTask<Io> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ConcurrentOutputHandlerFactoryTask")
+            .field("pool", &self.pool)
+            .field("io", &self.io)
+            .finish()
+    }
+}
+
+impl<Io: VmRunnerIo> ConcurrentOutputHandlerFactoryTask<Io> {
+    /// Access the underlying [`VmRunnerIo`].
+    pub fn io(&self) -> &Io {
+        &self.io
+    }
+
+    /// Starts running the task which is supposed to last until the end of the node's lifetime.
+    ///
+    /// # Errors
+    ///
+    /// Propagates DB errors.
+    pub async fn run(self, stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        const SLEEP_INTERVAL: Duration = Duration::from_millis(50);
+
+        let mut conn = self.pool.connection_tagged(self.io.name()).await?;
+        let mut latest_processed_batch = self.io.latest_processed_batch(&mut conn).await?;
+        drop(conn);
+        loop {
+            if *stop_receiver.borrow() {
+                tracing::info!("`ConcurrentOutputHandlerFactoryTask` was interrupted");
+                return Ok(());
+            }
+            match self.state.remove(&(latest_processed_batch + 1)) {
+                None => {
+                    tracing::debug!(
+                        "Output handler for batch #{} has not been created yet",
+                        latest_processed_batch + 1
+                    );
+                    tokio::time::sleep(SLEEP_INTERVAL).await;
+                }
+                Some((_, receiver)) => {
+                    // Wait until the `JoinHandle` is sent through the receiver, happens when
+                    // `handle_l1_batch` is called on the corresponding output handler
+                    let handle = receiver
+                        .await
+                        .context("handler was dropped before the batch was fully processed")?;
+                    // Wait until the handle is resolved, meaning that the `handle_l1_batch`
+                    // computation has finished, and we can consider this batch to be completed
+                    handle
+                        .await
+                        .context("failed to await for batch to be processed")??;
+                    latest_processed_batch += 1;
+                    let mut conn = self.pool.connection_tagged(self.io.name()).await?;
+                    self.io
+                        .mark_l1_batch_as_completed(&mut conn, latest_processed_batch)
+                        .await?;
+                    METRICS
+                        .last_processed_batch
+                        .set(latest_processed_batch.0.into());
+                }
+            }
+        }
+    }
+}
diff --git a/core/node/vm_runner/src/process.rs b/core/node/vm_runner/src/process.rs
new file mode 100644
index 000000000000..8a9ebb4e3dc9
--- /dev/null
+++ b/core/node/vm_runner/src/process.rs
@@ -0,0 +1,210 @@
+use std::{sync::Arc, time::Duration};
+
+use anyhow::Context;
+use tokio::{sync::watch, task::JoinHandle};
+use zksync_dal::{ConnectionPool, Core};
+use zksync_multivm::interface::L2BlockEnv;
+use zksync_state_keeper::{
+    BatchExecutor, BatchExecutorHandle, ExecutionMetricsForCriteria, L2BlockParams,
+    StateKeeperOutputHandler, TxExecutionResult, UpdatesManager,
+};
+use zksync_types::{block::L2BlockExecutionData, L1BatchNumber};
+
+use crate::{metrics::METRICS, storage::StorageLoader, OutputHandlerFactory, VmRunnerIo};
+
+/// VM runner represents a logic layer of L1 batch / L2 block processing flow akin to that of state
+/// keeper. The difference is that VM runner is designed to be run on batches/blocks that have
+/// already been processed by state keeper but still require some extra handling as regulated by
+/// [`OutputHandlerFactory`].
+///
+/// It's responsible for taking unprocessed data from the [`VmRunnerIo`], feeding it into
+/// [`BatchExecutor`] and calling [`OutputHandlerFactory`] on the result of the execution (batch
+/// execution state in the [`UpdatesManager`]).
+///
+/// You can think of VM runner as a concurrent processor of a continuous stream of newly committed
+/// batches/blocks.
+#[derive(Debug)]
+pub struct VmRunner {
+    pool: ConnectionPool<Core>,
+    io: Box<dyn VmRunnerIo>,
+    loader: Arc<dyn StorageLoader>,
+    output_handler_factory: Box<dyn OutputHandlerFactory>,
+    batch_processor: Box<dyn BatchExecutor>,
+}
+
+impl VmRunner {
+    /// Initializes VM runner with its constituents. In order to make VM runner concurrent each
+    /// parameter here needs to support concurrent execution mode. See
+    /// [`ConcurrentOutputHandlerFactory`], [`VmRunnerStorage`].
+    ///
+    /// Caller is expected to provide a component-specific implementation of [`VmRunnerIo`] and
+    /// an underlying implementation of [`OutputHandlerFactory`].
+    pub fn new(
+        pool: ConnectionPool<Core>,
+        io: Box<dyn VmRunnerIo>,
+        loader: Arc<dyn StorageLoader>,
+        output_handler_factory: Box<dyn OutputHandlerFactory>,
+        batch_processor: Box<dyn BatchExecutor>,
+    ) -> Self {
+        Self {
+            pool,
+            io,
+            loader,
+            output_handler_factory,
+            batch_processor,
+        }
+    }
+
+    async fn process_batch(
+        mut batch_executor: BatchExecutorHandle,
+        l2_blocks: Vec<L2BlockExecutionData>,
+        mut updates_manager: UpdatesManager,
+        mut output_handler: Box<dyn StateKeeperOutputHandler>,
+    ) -> anyhow::Result<()> {
+        let latency = METRICS.run_vm_time.start();
+        for (i, l2_block) in l2_blocks.into_iter().enumerate() {
+            if i > 0 {
+                // First L2 block in every batch is already preloaded
+                updates_manager.push_l2_block(L2BlockParams {
+                    timestamp: l2_block.timestamp,
+                    virtual_blocks: l2_block.virtual_blocks,
+                });
+                let block_env = L2BlockEnv::from_l2_block_data(&l2_block);
+                batch_executor
+                    .start_next_l2_block(block_env)
+                    .await
+                    .with_context(|| {
+                        format!("failed starting L2 block with {block_env:?} in batch executor")
+                    })?;
+            }
+            for tx in l2_block.txs {
+                let exec_result = batch_executor
+                    .execute_tx(tx.clone())
+                    .await
+                    .with_context(|| format!("failed executing transaction {:?}", tx.hash()))?;
+                let TxExecutionResult::Success {
+                    tx_result,
+                    tx_metrics,
+                    call_tracer_result,
+                    compressed_bytecodes,
+                    ..
+                } = exec_result
+                else {
+                    anyhow::bail!("Unexpected non-successful transaction");
+                };
+                let ExecutionMetricsForCriteria {
+                    l1_gas: tx_l1_gas_this_tx,
+                    execution_metrics: tx_execution_metrics,
+                } = *tx_metrics;
+                updates_manager.extend_from_executed_transaction(
+                    tx,
+                    *tx_result,
+                    compressed_bytecodes,
+                    tx_l1_gas_this_tx,
+                    tx_execution_metrics,
+                    call_tracer_result,
+                );
+            }
+            output_handler
+                .handle_l2_block(&updates_manager)
+                .await
+                .context("VM runner failed to handle L2 block")?;
+        }
+        let finished_batch = batch_executor
+            .finish_batch()
+            .await
+            .context("failed finishing L1 batch in executor")?;
+        updates_manager.finish_batch(finished_batch);
+        latency.observe();
+        output_handler
+            .handle_l1_batch(Arc::new(updates_manager))
+            .await
+            .context("VM runner failed to handle L1 batch")?;
+        Ok(())
+    }
+
+    /// Consumes VM runner to execute a loop that continuously pulls data from [`VmRunnerIo`] and
+    /// processes it.
+    pub async fn run(mut self, stop_receiver: &watch::Receiver<bool>) -> anyhow::Result<()> {
+        const SLEEP_INTERVAL: Duration = Duration::from_millis(50);
+
+        // Join handles for asynchronous tasks that are being run in the background
+        let mut task_handles: Vec<(L1BatchNumber, JoinHandle<anyhow::Result<()>>)> = Vec::new();
+        let mut next_batch = self
+            .io
+            .latest_processed_batch(&mut self.pool.connection().await?)
+            .await?
+            + 1;
+        loop {
+            if *stop_receiver.borrow() {
+                tracing::info!("VM runner was interrupted");
+                return Ok(());
+            }
+
+            // Traverse all handles and filter out tasks that have been finished. Also propagates
+            // any panic/error that might have happened during the task's execution.
+            let mut retained_handles = Vec::new();
+            for (l1_batch_number, handle) in task_handles {
+                if handle.is_finished() {
+                    handle
+                        .await
+                        .with_context(|| format!("Processing batch #{} panicked", l1_batch_number))?
+                        .with_context(|| format!("Failed to process batch #{}", l1_batch_number))?;
+                } else {
+                    retained_handles.push((l1_batch_number, handle));
+                }
+            }
+            task_handles = retained_handles;
+            METRICS
+                .in_progress_l1_batches
+                .set(task_handles.len() as u64);
+
+            let last_ready_batch = self
+                .io
+                .last_ready_to_be_loaded_batch(&mut self.pool.connection().await?)
+                .await?;
+            METRICS.last_ready_batch.set(last_ready_batch.0.into());
+            if next_batch > last_ready_batch {
+                // Next batch is not ready to be processed yet
+                tokio::time::sleep(SLEEP_INTERVAL).await;
+                continue;
+            }
+            let Some(batch_data) = self.loader.load_batch(next_batch).await? else {
+                // Next batch has not been loaded yet
+                tokio::time::sleep(SLEEP_INTERVAL).await;
+                continue;
+            };
+            let updates_manager =
+                UpdatesManager::new(&batch_data.l1_batch_env, &batch_data.system_env);
+            let Some(batch_executor) = self
+                .batch_processor
+                .init_batch(
+                    self.loader.clone().upcast(),
+                    batch_data.l1_batch_env,
+                    batch_data.system_env,
+                    stop_receiver,
+                )
+                .await
+            else {
+                tracing::info!("VM runner was interrupted");
+                break;
+            };
+            let output_handler = self
+                .output_handler_factory
+                .create_handler(next_batch)
+                .await?;
+
+            let handle = tokio::task::spawn(Self::process_batch(
+                batch_executor,
+                batch_data.l2_blocks,
+                updates_manager,
+                output_handler,
+            ));
+            task_handles.push((next_batch, handle));
+
+            next_batch += 1;
+        }
+
+        Ok(())
+    }
+}
diff --git a/core/node/vm_runner/src/storage.rs b/core/node/vm_runner/src/storage.rs
index d2524d7f0032..a7a4c6c18a6d 100644
--- a/core/node/vm_runner/src/storage.rs
+++ b/core/node/vm_runner/src/storage.rs
@@ -1,24 +1,47 @@
 use std::{
     collections::{BTreeMap, HashMap},
     fmt::Debug,
-    marker::PhantomData,
     sync::Arc,
     time::Duration,
 };
 
 use anyhow::Context as _;
 use async_trait::async_trait;
-use multivm::{interface::L1BatchEnv, vm_1_4_2::SystemEnv};
-use once_cell::sync::OnceCell;
 use tokio::sync::{watch, RwLock};
-use vm_utils::storage::L1BatchParamsProvider;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
+use zksync_multivm::{interface::L1BatchEnv, vm_1_4_2::SystemEnv};
 use zksync_state::{
-    AsyncCatchupTask, BatchDiff, PgOrRocksdbStorage, ReadStorageFactory, RocksdbStorage,
-    RocksdbStorageBuilder, RocksdbStorageOptions, RocksdbWithMemory, StateKeeperColumnFamily,
+    AsyncCatchupTask, BatchDiff, PgOrRocksdbStorage, ReadStorageFactory, RocksdbCell,
+    RocksdbStorage, RocksdbStorageBuilder, RocksdbWithMemory,
 };
-use zksync_storage::RocksDB;
 use zksync_types::{block::L2BlockExecutionData, L1BatchNumber, L2ChainId};
+use zksync_vm_utils::storage::L1BatchParamsProvider;
+
+use crate::{metrics::METRICS, VmRunnerIo};
+
+#[async_trait]
+pub trait StorageLoader: ReadStorageFactory {
+    /// Loads next unprocessed L1 batch along with all transactions that VM runner needs to
+    /// re-execute. These are the transactions that are included in a sealed L2 block belonging
+    /// to a sealed L1 batch (with state keeper being the source of truth). The order of the
+    /// transactions is the same as it was when state keeper executed them.
+    ///
+    /// Can return `None` if the requested batch is not available yet.
+    ///
+    /// # Errors
+    ///
+    /// Propagates DB errors.
+    async fn load_batch(
+        &self,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<Option<BatchExecuteData>>;
+
+    /// A workaround for Rust's limitations on upcasting coercion. See
+    /// https://github.com/rust-lang/rust/issues/65991.
+    ///
+    /// Should always be implementable as [`StorageLoader`] requires [`ReadStorageFactory`].
+    fn upcast(self: Arc<Self>) -> Arc<dyn ReadStorageFactory>;
+}
 
 /// Data needed to execute an L1 batch.
 #[derive(Debug, Clone)]
@@ -37,34 +60,6 @@ struct BatchData {
     diff: BatchDiff,
 }
 
-/// Functionality to fetch data about processed/unprocessed batches for a particular VM runner
-/// instance.
-#[async_trait]
-pub trait VmRunnerStorageLoader: Debug + Send + Sync + 'static {
-    /// Unique name of the VM runner instance.
-    fn name() -> &'static str;
-
-    /// Returns the last L1 batch number that has been processed by this VM runner instance.
-    ///
-    /// # Errors
-    ///
-    /// Propagates DB errors.
-    async fn latest_processed_batch(
-        &self,
-        conn: &mut Connection<'_, Core>,
-    ) -> anyhow::Result<L1BatchNumber>;
-
-    /// Returns the last L1 batch number that is ready to be loaded by this VM runner instance.
-    ///
-    /// # Errors
-    ///
-    /// Propagates DB errors.
-    async fn last_ready_to_be_loaded_batch(
-        &self,
-        conn: &mut Connection<'_, Core>,
-    ) -> anyhow::Result<L1BatchNumber>;
-}
-
 /// Abstraction for VM runner's storage layer that provides two main features:
 ///
 /// 1. A [`ReadStorageFactory`] implementation backed by either Postgres or RocksDB (if it's
@@ -75,12 +70,12 @@ pub trait VmRunnerStorageLoader: Debug + Send + Sync + 'static {
 /// Users of `VmRunnerStorage` are not supposed to retain storage access to batches that are less
 /// than `L::latest_processed_batch`. Holding one is considered to be an undefined behavior.
 #[derive(Debug)]
-pub struct VmRunnerStorage<L: VmRunnerStorageLoader> {
+pub struct VmRunnerStorage<Io: VmRunnerIo> {
     pool: ConnectionPool<Core>,
     l1_batch_params_provider: L1BatchParamsProvider,
     chain_id: L2ChainId,
     state: Arc<RwLock<State>>,
-    _marker: PhantomData<L>,
+    io: Io,
 }
 
 #[derive(Debug)]
@@ -97,15 +92,15 @@ impl State {
     }
 }
 
-impl<L: VmRunnerStorageLoader> VmRunnerStorage<L> {
+impl<Io: VmRunnerIo + Clone> VmRunnerStorage<Io> {
     /// Creates a new VM runner storage using provided Postgres pool and RocksDB path.
     pub async fn new(
         pool: ConnectionPool<Core>,
         rocksdb_path: String,
-        loader: L,
+        io: Io,
         chain_id: L2ChainId,
-    ) -> anyhow::Result<(Self, StorageSyncTask<L>)> {
-        let mut conn = pool.connection_tagged(L::name()).await?;
+    ) -> anyhow::Result<(Self, StorageSyncTask<Io>)> {
+        let mut conn = pool.connection_tagged(io.name()).await?;
         let l1_batch_params_provider = L1BatchParamsProvider::new(&mut conn)
             .await
             .context("Failed initializing L1 batch params provider")?;
@@ -115,21 +110,28 @@ impl<L: VmRunnerStorageLoader> VmRunnerStorage<L> {
             l1_batch_number: L1BatchNumber(0),
             storage: BTreeMap::new(),
         }));
-        let task =
-            StorageSyncTask::new(pool.clone(), chain_id, rocksdb_path, loader, state.clone())
-                .await?;
+        let task = StorageSyncTask::new(
+            pool.clone(),
+            chain_id,
+            rocksdb_path,
+            io.clone(),
+            state.clone(),
+        )
+        .await?;
         Ok((
             Self {
                 pool,
                 l1_batch_params_provider,
                 chain_id,
                 state,
-                _marker: PhantomData,
+                io,
             },
             task,
         ))
     }
+}
 
+impl<Io: VmRunnerIo> VmRunnerStorage<Io> {
     async fn access_storage_inner(
         &self,
         _stop_receiver: &watch::Receiver<bool>,
@@ -170,25 +172,18 @@ impl<L: VmRunnerStorageLoader> VmRunnerStorage<L> {
             },
         )))
     }
+}
 
-    /// Loads next unprocessed L1 batch along with all transactions that VM runner needs to
-    /// re-execute. These are the transactions that are included in a sealed L2 block belonging
-    /// to a sealed L1 batch (with state keeper being the source of truth). The order of the
-    /// transactions is the same as it was when state keeper executed them.
-    ///
-    /// Can return `None` if there are no batches to be processed.
-    ///
-    /// # Errors
-    ///
-    /// Propagates DB errors.
-    pub async fn load_batch(
+#[async_trait]
+impl<Io: VmRunnerIo> StorageLoader for VmRunnerStorage<Io> {
+    async fn load_batch(
         &self,
         l1_batch_number: L1BatchNumber,
     ) -> anyhow::Result<Option<BatchExecuteData>> {
         let state = self.state.read().await;
         if state.rocksdb.is_none() {
-            let mut conn = self.pool.connection_tagged(L::name()).await?;
-            return StorageSyncTask::<L>::load_batch_execute_data(
+            let mut conn = self.pool.connection_tagged(self.io.name()).await?;
+            return StorageSyncTask::<Io>::load_batch_execute_data(
                 &mut conn,
                 l1_batch_number,
                 &self.l1_batch_params_provider,
@@ -209,10 +204,14 @@ impl<L: VmRunnerStorageLoader> VmRunnerStorage<L> {
             Some(batch_data) => Ok(Some(batch_data.execute_data.clone())),
         }
     }
+
+    fn upcast(self: Arc<Self>) -> Arc<dyn ReadStorageFactory> {
+        self
+    }
 }
 
 #[async_trait]
-impl<L: VmRunnerStorageLoader> ReadStorageFactory for VmRunnerStorage<L> {
+impl<Io: VmRunnerIo> ReadStorageFactory for VmRunnerStorage<Io> {
     async fn access_storage(
         &self,
         stop_receiver: &watch::Receiver<bool>,
@@ -228,73 +227,79 @@ impl<L: VmRunnerStorageLoader> ReadStorageFactory for VmRunnerStorage<L> {
 /// In the meanwhile, `StorageSyncTask` also loads the next `max_batches_to_load` batches in memory
 /// so that they are immediately accessible by [`VmRunnerStorage`].
 #[derive(Debug)]
-pub struct StorageSyncTask<L: VmRunnerStorageLoader> {
+pub struct StorageSyncTask<Io: VmRunnerIo> {
     pool: ConnectionPool<Core>,
     l1_batch_params_provider: L1BatchParamsProvider,
     chain_id: L2ChainId,
-    rocksdb_cell: Arc<OnceCell<RocksDB<StateKeeperColumnFamily>>>,
-    loader: L,
+    rocksdb_cell: RocksdbCell,
+    io: Io,
     state: Arc<RwLock<State>>,
     catchup_task: AsyncCatchupTask,
 }
 
-impl<L: VmRunnerStorageLoader> StorageSyncTask<L> {
+impl<Io: VmRunnerIo> StorageSyncTask<Io> {
     async fn new(
         pool: ConnectionPool<Core>,
         chain_id: L2ChainId,
         rocksdb_path: String,
-        loader: L,
+        io: Io,
         state: Arc<RwLock<State>>,
     ) -> anyhow::Result<Self> {
-        let mut conn = pool.connection_tagged(L::name()).await?;
+        let mut conn = pool.connection_tagged(io.name()).await?;
         let l1_batch_params_provider = L1BatchParamsProvider::new(&mut conn)
             .await
             .context("Failed initializing L1 batch params provider")?;
-        let rocksdb_cell = Arc::new(OnceCell::new());
-        let catchup_task = AsyncCatchupTask::new(
-            pool.clone(),
-            rocksdb_path,
-            RocksdbStorageOptions::default(),
-            rocksdb_cell.clone(),
-            Some(loader.latest_processed_batch(&mut conn).await?),
-        );
+        let target_l1_batch_number = io.latest_processed_batch(&mut conn).await?;
         drop(conn);
+
+        let (catchup_task, rocksdb_cell) = AsyncCatchupTask::new(pool.clone(), rocksdb_path);
         Ok(Self {
             pool,
             l1_batch_params_provider,
             chain_id,
             rocksdb_cell,
-            loader,
+            io,
             state,
-            catchup_task,
+            catchup_task: catchup_task.with_target_l1_batch_number(target_l1_batch_number),
         })
     }
 
+    /// Access the underlying [`VmRunnerIo`].
+    pub fn io(&self) -> &Io {
+        &self.io
+    }
+
+    /// Block until RocksDB cache instance is caught up with Postgres and then continuously makes
+    /// sure that the new ready batches are loaded into the cache.
+    ///
+    /// # Errors
+    ///
+    /// Propagates RocksDB and Postgres errors.
     pub async fn run(self, stop_receiver: watch::Receiver<bool>) -> anyhow::Result<()> {
+        const SLEEP_INTERVAL: Duration = Duration::from_millis(50);
+
         self.catchup_task.run(stop_receiver.clone()).await?;
-        let rocksdb = self.rocksdb_cell.get().ok_or_else(|| {
-            anyhow::anyhow!("Expected RocksDB to be initialized by `AsyncCatchupTask`")
-        })?;
+        let rocksdb = self.rocksdb_cell.wait().await?;
         loop {
             if *stop_receiver.borrow() {
                 tracing::info!("`StorageSyncTask` was interrupted");
                 return Ok(());
             }
-            let mut conn = self.pool.connection_tagged(L::name()).await?;
-            let latest_processed_batch = self.loader.latest_processed_batch(&mut conn).await?;
+            let mut conn = self.pool.connection_tagged(self.io.name()).await?;
+            let latest_processed_batch = self.io.latest_processed_batch(&mut conn).await?;
             let rocksdb_builder = RocksdbStorageBuilder::from_rocksdb(rocksdb.clone());
             if rocksdb_builder.l1_batch_number().await == Some(latest_processed_batch + 1) {
                 // RocksDB is already caught up, we might not need to do anything.
                 // Just need to check that the memory diff is up-to-date in case this is a fresh start.
+                let last_ready_batch = self.io.last_ready_to_be_loaded_batch(&mut conn).await?;
                 let state = self.state.read().await;
-                if state
-                    .storage
-                    .contains_key(&self.loader.last_ready_to_be_loaded_batch(&mut conn).await?)
+                if last_ready_batch == latest_processed_batch
+                    || state.storage.contains_key(&last_ready_batch)
                 {
                     // No need to do anything, killing time until last processed batch is updated.
                     drop(conn);
                     drop(state);
-                    tokio::time::sleep(Duration::from_millis(100)).await;
+                    tokio::time::sleep(SLEEP_INTERVAL).await;
                     continue;
                 }
             }
@@ -322,8 +327,9 @@ impl<L: VmRunnerStorageLoader> StorageSyncTask<L> {
                 .map(|e| *e.key())
                 .unwrap_or(latest_processed_batch);
             drop(state);
-            let max_desired = self.loader.last_ready_to_be_loaded_batch(&mut conn).await?;
+            let max_desired = self.io.last_ready_to_be_loaded_batch(&mut conn).await?;
             for l1_batch_number in max_present.0 + 1..=max_desired.0 {
+                let latency = METRICS.storage_load_time.start();
                 let l1_batch_number = L1BatchNumber(l1_batch_number);
                 let Some(execute_data) = Self::load_batch_execute_data(
                     &mut conn,
@@ -360,6 +366,7 @@ impl<L: VmRunnerStorageLoader> StorageSyncTask<L> {
                     .storage
                     .insert(l1_batch_number, BatchData { execute_data, diff });
                 drop(state);
+                latency.observe();
             }
             drop(conn);
         }
diff --git a/core/node/vm_runner/src/tests/mod.rs b/core/node/vm_runner/src/tests/mod.rs
index 292aa7d8d4d5..c592122b1e09 100644
--- a/core/node/vm_runner/src/tests/mod.rs
+++ b/core/node/vm_runner/src/tests/mod.rs
@@ -1,41 +1,43 @@
 use std::{collections::HashMap, ops, sync::Arc, time::Duration};
 
 use async_trait::async_trait;
-use backon::{ConstantBuilder, ExponentialBuilder, Retryable};
-use rand::Rng;
-use tempfile::TempDir;
-use tokio::{
-    runtime::Handle,
-    sync::{watch, RwLock},
-    task::JoinHandle,
-};
+use rand::{prelude::SliceRandom, Rng};
+use tokio::sync::RwLock;
 use zksync_contracts::BaseSystemContractsHashes;
 use zksync_dal::{Connection, ConnectionPool, Core, CoreDal};
-use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
 use zksync_node_test_utils::{
-    create_l1_batch_metadata, create_l2_block, create_l2_transaction, execute_l2_transaction,
+    create_l1_batch_metadata, create_l2_block, execute_l2_transaction,
     l1_batch_metadata_to_commitment_artifacts,
 };
-use zksync_state::{PgOrRocksdbStorage, PostgresStorage, ReadStorage, ReadStorageFactory};
+use zksync_state_keeper::{StateKeeperOutputHandler, UpdatesManager};
+use zksync_test_account::Account;
 use zksync_types::{
-    block::{BlockGasCount, L1BatchHeader},
-    fee::TransactionExecutionMetrics,
-    AccountTreeId, L1BatchNumber, L2ChainId, ProtocolVersionId, StorageKey, StorageLog,
-    StorageLogKind, StorageValue, H160, H256,
+    block::{BlockGasCount, L1BatchHeader, L2BlockHasher},
+    fee::{Fee, TransactionExecutionMetrics},
+    get_intrinsic_constants,
+    l2::L2Tx,
+    utils::storage_key_for_standard_token_balance,
+    AccountTreeId, Address, Execute, L1BatchNumber, L2BlockNumber, ProtocolVersionId, StorageKey,
+    StorageLog, StorageLogKind, StorageValue, H160, H256, L2_BASE_TOKEN_ADDRESS, U256,
 };
+use zksync_utils::u256_to_h256;
+
+use super::{OutputHandlerFactory, VmRunnerIo};
 
-use super::{BatchExecuteData, VmRunnerStorage, VmRunnerStorageLoader};
+mod output_handler;
+mod process;
+mod storage;
 
 #[derive(Debug, Default)]
-struct LoaderMock {
+struct IoMock {
     current: L1BatchNumber,
-    max: L1BatchNumber,
+    max: u32,
 }
 
 #[async_trait]
-impl VmRunnerStorageLoader for Arc<RwLock<LoaderMock>> {
-    fn name() -> &'static str {
-        "loader_mock"
+impl VmRunnerIo for Arc<RwLock<IoMock>> {
+    fn name(&self) -> &'static str {
+        "io_mock"
     }
 
     async fn latest_processed_batch(
@@ -49,108 +51,156 @@ impl VmRunnerStorageLoader for Arc<RwLock<LoaderMock>> {
         &self,
         _conn: &mut Connection<'_, Core>,
     ) -> anyhow::Result<L1BatchNumber> {
-        Ok(self.read().await.max)
-    }
-}
-
-#[derive(Debug)]
-struct VmRunnerTester {
-    db_dir: TempDir,
-    pool: ConnectionPool<Core>,
-    tasks: Vec<JoinHandle<()>>,
-}
-
-impl VmRunnerTester {
-    fn new(pool: ConnectionPool<Core>) -> Self {
-        Self {
-            db_dir: TempDir::new().unwrap(),
-            pool,
-            tasks: Vec::new(),
-        }
+        let io = self.read().await;
+        Ok(io.current + io.max)
     }
 
-    async fn create_storage(
-        &mut self,
-        loader_mock: Arc<RwLock<LoaderMock>>,
-    ) -> anyhow::Result<VmRunnerStorage<Arc<RwLock<LoaderMock>>>> {
-        let (vm_runner_storage, task) = VmRunnerStorage::new(
-            self.pool.clone(),
-            self.db_dir.path().to_str().unwrap().to_owned(),
-            loader_mock,
-            L2ChainId::from(270),
-        )
-        .await?;
-        let handle = tokio::task::spawn(async move {
-            let (_stop_sender, stop_receiver) = watch::channel(false);
-            task.run(stop_receiver).await.unwrap()
-        });
-        self.tasks.push(handle);
-        Ok(vm_runner_storage)
+    async fn mark_l1_batch_as_completed(
+        &self,
+        _conn: &mut Connection<'_, Core>,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<()> {
+        self.write().await.current = l1_batch_number;
+        Ok(())
     }
 }
 
-impl<L: VmRunnerStorageLoader> VmRunnerStorage<L> {
-    async fn load_batch_eventually(
-        &self,
-        number: L1BatchNumber,
-    ) -> anyhow::Result<BatchExecuteData> {
-        (|| async {
-            self.load_batch(number)
-                .await?
-                .ok_or_else(|| anyhow::anyhow!("Batch #{} is not available yet", number))
-        })
-        .retry(&ExponentialBuilder::default())
-        .await
-    }
+mod wait {
+    use std::{sync::Arc, time::Duration};
 
-    async fn access_storage_eventually(
-        &self,
-        stop_receiver: &watch::Receiver<bool>,
-        number: L1BatchNumber,
-    ) -> anyhow::Result<PgOrRocksdbStorage<'_>> {
-        (|| async {
-            self.access_storage(stop_receiver, number)
-                .await?
-                .ok_or_else(|| {
-                    anyhow::anyhow!("Storage for batch #{} is not available yet", number)
-                })
-        })
-        .retry(&ExponentialBuilder::default())
-        .await
-    }
+    use backon::{ConstantBuilder, Retryable};
+    use tokio::sync::RwLock;
+    use zksync_types::L1BatchNumber;
 
-    async fn ensure_batch_unloads_eventually(&self, number: L1BatchNumber) -> anyhow::Result<()> {
-        (|| async {
-            Ok(anyhow::ensure!(
-                self.load_batch(number).await?.is_none(),
-                "Batch #{} is still available",
-                number
-            ))
-        })
-        .retry(&ExponentialBuilder::default())
-        .await
-    }
+    use crate::tests::IoMock;
+
+    pub(super) async fn for_batch(
+        io: Arc<RwLock<IoMock>>,
+        l1_batch_number: L1BatchNumber,
+        timeout: Duration,
+    ) -> anyhow::Result<()> {
+        const RETRY_INTERVAL: Duration = Duration::from_millis(500);
 
-    async fn batch_stays_unloaded(&self, number: L1BatchNumber) -> bool {
+        let max_tries = (timeout.as_secs_f64() / RETRY_INTERVAL.as_secs_f64()).ceil() as u64;
         (|| async {
-            self.load_batch(number)
-                .await?
-                .ok_or_else(|| anyhow::anyhow!("Batch #{} is not available yet", number))
+            let current = io.read().await.current;
+            anyhow::ensure!(
+                current == l1_batch_number,
+                "Batch #{} has not been processed yet (current is #{})",
+                l1_batch_number,
+                current
+            );
+            Ok(())
         })
         .retry(
             &ConstantBuilder::default()
-                .with_delay(Duration::from_millis(100))
-                .with_max_times(3),
+                .with_delay(RETRY_INTERVAL)
+                .with_max_times(max_tries as usize),
         )
         .await
-        .is_err()
+    }
+
+    pub(super) async fn for_batch_progressively(
+        io: Arc<RwLock<IoMock>>,
+        l1_batch_number: L1BatchNumber,
+        timeout: Duration,
+    ) -> anyhow::Result<()> {
+        const SLEEP_INTERVAL: Duration = Duration::from_millis(500);
+
+        let mut current = io.read().await.current;
+        let max_tries = (timeout.as_secs_f64() / SLEEP_INTERVAL.as_secs_f64()).ceil() as u64;
+        let mut try_num = 0;
+        loop {
+            tokio::time::sleep(SLEEP_INTERVAL).await;
+            try_num += 1;
+            if try_num >= max_tries {
+                anyhow::bail!("Timeout");
+            }
+            let new_current = io.read().await.current;
+            // Ensure we did not go back in latest processed batch
+            if new_current < current {
+                anyhow::bail!(
+                    "Latest processed batch regressed to #{} back from #{}",
+                    new_current,
+                    current
+                );
+            }
+            current = new_current;
+            if current >= l1_batch_number {
+                return Ok(());
+            }
+        }
+    }
+}
+
+#[derive(Debug)]
+struct TestOutputFactory {
+    delays: HashMap<L1BatchNumber, Duration>,
+}
+
+#[async_trait]
+impl OutputHandlerFactory for TestOutputFactory {
+    async fn create_handler(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> anyhow::Result<Box<dyn StateKeeperOutputHandler>> {
+        let delay = self.delays.get(&l1_batch_number).copied();
+        #[derive(Debug)]
+        struct TestOutputHandler {
+            delay: Option<Duration>,
+        }
+        #[async_trait]
+        impl StateKeeperOutputHandler for TestOutputHandler {
+            async fn handle_l2_block(
+                &mut self,
+                _updates_manager: &UpdatesManager,
+            ) -> anyhow::Result<()> {
+                Ok(())
+            }
+
+            async fn handle_l1_batch(
+                &mut self,
+                _updates_manager: Arc<UpdatesManager>,
+            ) -> anyhow::Result<()> {
+                if let Some(delay) = self.delay {
+                    tokio::time::sleep(delay).await
+                }
+                Ok(())
+            }
+        }
+        Ok(Box::new(TestOutputHandler { delay }))
     }
 }
 
-async fn store_l2_blocks(
+/// Creates an L2 transaction with randomized parameters.
+pub fn create_l2_transaction(
+    account: &mut Account,
+    fee_per_gas: u64,
+    gas_per_pubdata: u64,
+) -> L2Tx {
+    let fee = Fee {
+        gas_limit: (get_intrinsic_constants().l2_tx_intrinsic_gas * 10).into(),
+        max_fee_per_gas: fee_per_gas.into(),
+        max_priority_fee_per_gas: 0_u64.into(),
+        gas_per_pubdata_limit: gas_per_pubdata.into(),
+    };
+    let tx = account.get_l2_tx_for_execute(
+        Execute {
+            contract_address: Address::random(),
+            calldata: vec![],
+            value: Default::default(),
+            factory_deps: vec![],
+        },
+        Some(fee),
+    );
+    L2Tx::try_from(tx).unwrap()
+}
+
+async fn store_l1_batches(
     conn: &mut Connection<'_, Core>,
     numbers: ops::RangeInclusive<u32>,
     contract_hashes: BaseSystemContractsHashes,
+    accounts: &mut [Account],
 ) -> anyhow::Result<Vec<L1BatchHeader>> {
     let mut rng = rand::thread_rng();
     let mut batches = Vec::new();
@@ -161,9 +211,20 @@ async fn store_l2_blocks(
         .map(|m| m.number)
         .unwrap_or_default()
         + 1;
+    let mut last_l2_block_hash = if l2_block_number == 1.into() {
+        // First L2 block ever has a special `prev_l2_block_hash`
+        L2BlockHasher::legacy_hash(L2BlockNumber(0))
+    } else {
+        conn.blocks_dal()
+            .get_l2_block_header(l2_block_number - 1)
+            .await?
+            .unwrap()
+            .hash
+    };
     for l1_batch_number in numbers {
         let l1_batch_number = L1BatchNumber(l1_batch_number);
-        let tx = create_l2_transaction(10, 100);
+        let account = accounts.choose_mut(&mut rng).unwrap();
+        let tx = create_l2_transaction(account, 1000000, 100);
         conn.transactions_dal()
             .insert_transaction_l2(&tx, TransactionExecutionMetrics::default())
             .await?;
@@ -172,9 +233,9 @@ async fn store_l2_blocks(
         for _ in 0..10 {
             let key = StorageKey::new(AccountTreeId::new(H160::random()), H256::random());
             let value = StorageValue::random();
-            written_keys.push(key);
+            written_keys.push(key.hashed_key());
             logs.push(StorageLog {
-                kind: StorageLogKind::Write,
+                kind: StorageLogKind::RepeatedWrite,
                 key,
                 value,
             });
@@ -184,7 +245,7 @@ async fn store_l2_blocks(
             factory_deps.insert(H256::random(), rng.gen::<[u8; 32]>().into());
         }
         conn.storage_logs_dal()
-            .insert_storage_logs(l2_block_number, &[(tx.hash(), logs)])
+            .insert_storage_logs(l2_block_number, &logs)
             .await?;
         conn.storage_logs_dedup_dal()
             .insert_initial_writes(l1_batch_number, &written_keys)
@@ -193,19 +254,43 @@ async fn store_l2_blocks(
             .insert_factory_deps(l2_block_number, &factory_deps)
             .await?;
         let mut new_l2_block = create_l2_block(l2_block_number.0);
+
+        let mut digest = L2BlockHasher::new(
+            new_l2_block.number,
+            new_l2_block.timestamp,
+            last_l2_block_hash,
+        );
+        digest.push_tx_hash(tx.hash());
+        new_l2_block.hash = digest.finalize(ProtocolVersionId::latest());
+
         l2_block_number += 1;
         new_l2_block.base_system_contracts_hashes = contract_hashes;
         new_l2_block.l2_tx_count = 1;
         conn.blocks_dal().insert_l2_block(&new_l2_block).await?;
-        let tx_result = execute_l2_transaction(tx);
+        last_l2_block_hash = new_l2_block.hash;
+        let tx_result = execute_l2_transaction(tx.clone());
         conn.transactions_dal()
-            .mark_txs_as_executed_in_l2_block(new_l2_block.number, &[tx_result], 1.into())
+            .mark_txs_as_executed_in_l2_block(
+                new_l2_block.number,
+                &[tx_result.clone()],
+                1.into(),
+                ProtocolVersionId::latest(),
+                false,
+            )
             .await?;
 
         // Insert a fictive L2 block at the end of the batch
-        let fictive_l2_block = create_l2_block(l2_block_number.0);
+        let mut fictive_l2_block = create_l2_block(l2_block_number.0);
+        let mut digest = L2BlockHasher::new(
+            fictive_l2_block.number,
+            fictive_l2_block.timestamp,
+            last_l2_block_hash,
+        );
+        digest.push_tx_hash(tx.hash());
+        fictive_l2_block.hash = digest.finalize(ProtocolVersionId::latest());
         l2_block_number += 1;
         conn.blocks_dal().insert_l2_block(&fictive_l2_block).await?;
+        last_l2_block_hash = fictive_l2_block.hash;
 
         let header = L1BatchHeader::new(
             l1_batch_number,
@@ -224,6 +309,9 @@ async fn store_l2_blocks(
         conn.blocks_dal()
             .mark_l2_blocks_as_executed_in_l1_batch(l1_batch_number)
             .await?;
+        conn.transactions_dal()
+            .mark_txs_as_executed_in_l1_batch(l1_batch_number, &[tx_result])
+            .await?;
 
         let metadata = create_l1_batch_metadata(l1_batch_number.0);
         conn.blocks_dal()
@@ -241,241 +329,34 @@ async fn store_l2_blocks(
     Ok(batches)
 }
 
-#[tokio::test]
-async fn rerun_storage_on_existing_data() -> anyhow::Result<()> {
-    let connection_pool = ConnectionPool::<Core>::test_pool().await;
-    let mut conn = connection_pool.connection().await.unwrap();
-    let genesis_params = GenesisParams::mock();
-    insert_genesis_batch(&mut conn, &genesis_params)
-        .await
-        .unwrap();
-    drop(conn);
+async fn fund(pool: &ConnectionPool<Core>, accounts: &[Account]) {
+    let mut conn = pool.connection().await.unwrap();
 
-    // Generate 10 batches worth of data and persist it in Postgres
-    let batches = store_l2_blocks(
-        &mut connection_pool.connection().await?,
-        1u32..=10u32,
-        genesis_params.base_system_contracts().hashes(),
-    )
-    .await?;
+    let eth_amount = U256::from(10).pow(U256::from(32)); //10^32 wei
 
-    let mut tester = VmRunnerTester::new(connection_pool.clone());
-    let loader_mock = Arc::new(RwLock::new(LoaderMock {
-        current: 0.into(),
-        max: 10.into(),
-    }));
-    let storage = tester.create_storage(loader_mock.clone()).await?;
-    // Check that existing batches are returned in the exact same order with the exact same data
-    for batch in &batches {
-        let batch_data = storage.load_batch_eventually(batch.number).await?;
-        let mut conn = connection_pool.connection().await.unwrap();
-        let (previous_batch_hash, _) = conn
-            .blocks_dal()
-            .get_l1_batch_state_root_and_timestamp(batch_data.l1_batch_env.number - 1)
-            .await?
-            .unwrap();
-        assert_eq!(
-            batch_data.l1_batch_env.previous_batch_hash,
-            Some(previous_batch_hash)
-        );
-        assert_eq!(batch_data.l1_batch_env.number, batch.number);
-        assert_eq!(batch_data.l1_batch_env.timestamp, batch.timestamp);
-        let (first_l2_block_number, _) = conn
-            .blocks_dal()
-            .get_l2_block_range_of_l1_batch(batch.number)
-            .await?
-            .unwrap();
-        let previous_l2_block_header = conn
-            .blocks_dal()
-            .get_l2_block_header(first_l2_block_number - 1)
-            .await?
-            .unwrap();
-        let l2_block_header = conn
-            .blocks_dal()
-            .get_l2_block_header(first_l2_block_number)
-            .await?
-            .unwrap();
-        assert_eq!(
-            batch_data.l1_batch_env.first_l2_block.number,
-            l2_block_header.number.0
-        );
-        assert_eq!(
-            batch_data.l1_batch_env.first_l2_block.timestamp,
-            l2_block_header.timestamp
+    for account in accounts {
+        let key = storage_key_for_standard_token_balance(
+            AccountTreeId::new(L2_BASE_TOKEN_ADDRESS),
+            &account.address,
         );
-        assert_eq!(
-            batch_data.l1_batch_env.first_l2_block.prev_block_hash,
-            previous_l2_block_header.hash
-        );
-        let l2_blocks = conn
-            .transactions_dal()
-            .get_l2_blocks_to_execute_for_l1_batch(batch_data.l1_batch_env.number)
-            .await?;
-        assert_eq!(batch_data.l2_blocks, l2_blocks);
-    }
-
-    // "Mark" these batches as processed
-    loader_mock.write().await.current += batches.len() as u32;
-
-    // All old batches should no longer be loadable
-    for batch in batches {
-        storage
-            .ensure_batch_unloads_eventually(batch.number)
-            .await?;
-    }
-
-    Ok(())
-}
-
-#[tokio::test]
-async fn continuously_load_new_batches() -> anyhow::Result<()> {
-    let connection_pool = ConnectionPool::<Core>::test_pool().await;
-    let mut conn = connection_pool.connection().await.unwrap();
-    let genesis_params = GenesisParams::mock();
-    insert_genesis_batch(&mut conn, &genesis_params)
-        .await
-        .unwrap();
-    drop(conn);
-
-    let mut tester = VmRunnerTester::new(connection_pool.clone());
-    let loader_mock = Arc::new(RwLock::new(LoaderMock::default()));
-    let storage = tester.create_storage(loader_mock.clone()).await?;
-    // No batches available yet
-    assert!(storage.load_batch(L1BatchNumber(1)).await?.is_none());
+        let value = u256_to_h256(eth_amount);
+        let storage_log = StorageLog::new_write_log(key, value);
 
-    // Generate one batch and persist it in Postgres
-    store_l2_blocks(
-        &mut connection_pool.connection().await?,
-        1u32..=1u32,
-        genesis_params.base_system_contracts().hashes(),
-    )
-    .await?;
-    loader_mock.write().await.max += 1;
-
-    // Load batch and mark it as processed
-    assert_eq!(
-        storage
-            .load_batch_eventually(L1BatchNumber(1))
-            .await?
-            .l1_batch_env
-            .number,
-        L1BatchNumber(1)
-    );
-    loader_mock.write().await.current += 1;
-
-    // No more batches after that
-    assert!(storage.batch_stays_unloaded(L1BatchNumber(2)).await);
-
-    // Generate one more batch and persist it in Postgres
-    store_l2_blocks(
-        &mut connection_pool.connection().await?,
-        2u32..=2u32,
-        genesis_params.base_system_contracts().hashes(),
-    )
-    .await?;
-    loader_mock.write().await.max += 1;
-
-    // Load batch and mark it as processed
-
-    assert_eq!(
-        storage
-            .load_batch_eventually(L1BatchNumber(2))
-            .await?
-            .l1_batch_env
-            .number,
-        L1BatchNumber(2)
-    );
-    loader_mock.write().await.current += 1;
-
-    // No more batches after that
-    assert!(storage.batch_stays_unloaded(L1BatchNumber(3)).await);
-
-    Ok(())
-}
-
-#[tokio::test]
-async fn access_vm_runner_storage() -> anyhow::Result<()> {
-    let connection_pool = ConnectionPool::<Core>::test_pool().await;
-    let mut conn = connection_pool.connection().await.unwrap();
-    let genesis_params = GenesisParams::mock();
-    insert_genesis_batch(&mut conn, &genesis_params)
-        .await
-        .unwrap();
-    drop(conn);
-
-    // Generate 10 batches worth of data and persist it in Postgres
-    let batch_range = 1u32..=10u32;
-    store_l2_blocks(
-        &mut connection_pool.connection().await?,
-        batch_range,
-        genesis_params.base_system_contracts().hashes(),
-    )
-    .await?;
-
-    let mut conn = connection_pool.connection().await?;
-    let storage_logs = conn
-        .storage_logs_dal()
-        .dump_all_storage_logs_for_tests()
-        .await;
-    let factory_deps = conn
-        .factory_deps_dal()
-        .dump_all_factory_deps_for_tests()
-        .await;
-    drop(conn);
-
-    let (_sender, receiver) = watch::channel(false);
-    let mut tester = VmRunnerTester::new(connection_pool.clone());
-    let loader_mock = Arc::new(RwLock::new(LoaderMock {
-        current: 0.into(),
-        max: 10.into(),
-    }));
-    let rt_handle = Handle::current();
-    let handle = tokio::task::spawn_blocking(move || {
-        let vm_runner_storage =
-            rt_handle.block_on(async { tester.create_storage(loader_mock.clone()).await.unwrap() });
-        for i in 1..=10 {
-            let mut conn = rt_handle.block_on(connection_pool.connection()).unwrap();
-            let (_, last_l2_block_number) = rt_handle
-                .block_on(
-                    conn.blocks_dal()
-                        .get_l2_block_range_of_l1_batch(L1BatchNumber(i)),
-                )?
+        conn.storage_logs_dal()
+            .append_storage_logs(L2BlockNumber(0), &[storage_log])
+            .await
+            .unwrap();
+        if conn
+            .storage_logs_dedup_dal()
+            .filter_written_slots(&[storage_log.key.hashed_key()])
+            .await
+            .unwrap()
+            .is_empty()
+        {
+            conn.storage_logs_dedup_dal()
+                .insert_initial_writes(L1BatchNumber(0), &[storage_log.key.hashed_key()])
+                .await
                 .unwrap();
-            let mut pg_storage =
-                PostgresStorage::new(rt_handle.clone(), conn, last_l2_block_number, true);
-            let mut vm_storage = rt_handle.block_on(async {
-                vm_runner_storage
-                    .access_storage_eventually(&receiver, L1BatchNumber(i))
-                    .await
-            })?;
-            // Check that both storages have identical key-value pairs written in them
-            for storage_log in &storage_logs {
-                let storage_key =
-                    StorageKey::new(AccountTreeId::new(storage_log.address), storage_log.key);
-                assert_eq!(
-                    pg_storage.read_value(&storage_key),
-                    vm_storage.read_value(&storage_key)
-                );
-                assert_eq!(
-                    pg_storage.get_enumeration_index(&storage_key),
-                    vm_storage.get_enumeration_index(&storage_key)
-                );
-                assert_eq!(
-                    pg_storage.is_write_initial(&storage_key),
-                    vm_storage.is_write_initial(&storage_key)
-                );
-            }
-            for hash in factory_deps.keys() {
-                assert_eq!(
-                    pg_storage.load_factory_dep(*hash),
-                    vm_storage.load_factory_dep(*hash)
-                );
-            }
         }
-
-        anyhow::Ok(())
-    });
-    handle.await??;
-
-    Ok(())
+    }
 }
diff --git a/core/node/vm_runner/src/tests/output_handler.rs b/core/node/vm_runner/src/tests/output_handler.rs
new file mode 100644
index 000000000000..453507328c4f
--- /dev/null
+++ b/core/node/vm_runner/src/tests/output_handler.rs
@@ -0,0 +1,146 @@
+use std::{collections::HashMap, sync::Arc, time::Duration};
+
+use tokio::{
+    sync::{watch, RwLock},
+    task::JoinHandle,
+};
+use zksync_contracts::{BaseSystemContracts, SystemContractCode};
+use zksync_dal::{ConnectionPool, Core};
+use zksync_multivm::interface::{L1BatchEnv, L2BlockEnv, SystemEnv, TxExecutionMode};
+use zksync_state_keeper::UpdatesManager;
+use zksync_types::L1BatchNumber;
+
+use crate::{
+    tests::{wait, IoMock, TestOutputFactory},
+    ConcurrentOutputHandlerFactory, OutputHandlerFactory,
+};
+
+struct OutputHandlerTester {
+    output_factory: ConcurrentOutputHandlerFactory<Arc<RwLock<IoMock>>, TestOutputFactory>,
+    tasks: Vec<JoinHandle<()>>,
+    stop_sender: watch::Sender<bool>,
+}
+
+impl OutputHandlerTester {
+    fn new(
+        io: Arc<RwLock<IoMock>>,
+        pool: ConnectionPool<Core>,
+        delays: HashMap<L1BatchNumber, Duration>,
+    ) -> Self {
+        let test_factory = TestOutputFactory { delays };
+        let (output_factory, task) = ConcurrentOutputHandlerFactory::new(pool, io, test_factory);
+        let (stop_sender, stop_receiver) = watch::channel(false);
+        let join_handle = tokio::task::spawn(async move { task.run(stop_receiver).await.unwrap() });
+        let tasks = vec![join_handle];
+        Self {
+            output_factory,
+            tasks,
+            stop_sender,
+        }
+    }
+
+    async fn spawn_test_task(&mut self, l1_batch_number: L1BatchNumber) -> anyhow::Result<()> {
+        let mut output_handler = self.output_factory.create_handler(l1_batch_number).await?;
+        let join_handle = tokio::task::spawn(async move {
+            let l1_batch_env = L1BatchEnv {
+                previous_batch_hash: None,
+                number: Default::default(),
+                timestamp: 0,
+                fee_input: Default::default(),
+                fee_account: Default::default(),
+                enforced_base_fee: None,
+                first_l2_block: L2BlockEnv {
+                    number: 0,
+                    timestamp: 0,
+                    prev_block_hash: Default::default(),
+                    max_virtual_blocks_to_create: 0,
+                },
+            };
+            let system_env = SystemEnv {
+                zk_porter_available: false,
+                version: Default::default(),
+                base_system_smart_contracts: BaseSystemContracts {
+                    bootloader: SystemContractCode {
+                        code: vec![],
+                        hash: Default::default(),
+                    },
+                    default_aa: SystemContractCode {
+                        code: vec![],
+                        hash: Default::default(),
+                    },
+                },
+                bootloader_gas_limit: 0,
+                execution_mode: TxExecutionMode::VerifyExecute,
+                default_validation_computational_gas_limit: 0,
+                chain_id: Default::default(),
+            };
+            let updates_manager = UpdatesManager::new(&l1_batch_env, &system_env);
+            output_handler
+                .handle_l2_block(&updates_manager)
+                .await
+                .unwrap();
+            output_handler
+                .handle_l1_batch(Arc::new(updates_manager))
+                .await
+                .unwrap();
+        });
+        self.tasks.push(join_handle);
+        Ok(())
+    }
+
+    async fn stop_and_wait_for_all_tasks(self) -> anyhow::Result<()> {
+        self.stop_sender.send(true)?;
+        futures::future::join_all(self.tasks).await;
+        Ok(())
+    }
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 10)]
+async fn monotonically_progress_processed_batches() -> anyhow::Result<()> {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let io = Arc::new(RwLock::new(IoMock {
+        current: 0.into(),
+        max: 10,
+    }));
+    // Distribute progressively higher delays for higher batches so that we can observe
+    // each batch being marked as processed. In other words, batch 1 would be marked as processed,
+    // then there will be a minimum 1 sec of delay (more in <10 thread environments), then batch
+    // 2 would be marked as processed etc.
+    let delays = (1..10)
+        .map(|i| (L1BatchNumber(i), Duration::from_secs(i as u64)))
+        .collect();
+    let mut tester = OutputHandlerTester::new(io.clone(), pool, delays);
+    for i in 1..10 {
+        tester.spawn_test_task(i.into()).await?;
+    }
+    assert_eq!(io.read().await.current, L1BatchNumber(0));
+    for i in 1..10 {
+        wait::for_batch(io.clone(), i.into(), Duration::from_secs(10)).await?;
+    }
+    tester.stop_and_wait_for_all_tasks().await?;
+    assert_eq!(io.read().await.current, L1BatchNumber(9));
+    Ok(())
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 10)]
+async fn do_not_progress_with_gaps() -> anyhow::Result<()> {
+    let pool = ConnectionPool::<Core>::test_pool().await;
+    let io = Arc::new(RwLock::new(IoMock {
+        current: 0.into(),
+        max: 10,
+    }));
+    // Distribute progressively lower delays for higher batches so that we can observe last
+    // processed batch not move until the first batch (with longest delay) is processed.
+    let delays = (1..10)
+        .map(|i| (L1BatchNumber(i), Duration::from_secs(10 - i as u64)))
+        .collect();
+    let mut tester = OutputHandlerTester::new(io.clone(), pool, delays);
+    for i in 1..10 {
+        tester.spawn_test_task(i.into()).await?;
+    }
+    assert_eq!(io.read().await.current, L1BatchNumber(0));
+    wait::for_batch_progressively(io.clone(), L1BatchNumber(9), Duration::from_secs(60)).await?;
+    tester.stop_and_wait_for_all_tasks().await?;
+    assert_eq!(io.read().await.current, L1BatchNumber(9));
+    Ok(())
+}
diff --git a/core/node/vm_runner/src/tests/process.rs b/core/node/vm_runner/src/tests/process.rs
new file mode 100644
index 000000000000..664bdeebf855
--- /dev/null
+++ b/core/node/vm_runner/src/tests/process.rs
@@ -0,0 +1,83 @@
+use std::{collections::HashMap, sync::Arc, time::Duration};
+
+use tempfile::TempDir;
+use tokio::sync::{watch, RwLock};
+use zksync_dal::{ConnectionPool, Core};
+use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
+use zksync_state_keeper::MainBatchExecutor;
+use zksync_test_account::Account;
+use zksync_types::L2ChainId;
+
+use crate::{
+    tests::{fund, store_l1_batches, wait, IoMock, TestOutputFactory},
+    ConcurrentOutputHandlerFactory, VmRunner, VmRunnerStorage,
+};
+
+// Testing more than a one-batch scenario is pretty difficult as that requires storage to have
+// completely valid state after each L2 block execution (current block number, hash, rolling txs
+// hash etc written to the correct places). To achieve this we could run state keeper e2e but that
+// is pretty difficult to set up.
+//
+// Instead, we rely on integration tests to verify the correctness of VM runner main process.
+#[tokio::test]
+async fn process_one_batch() -> anyhow::Result<()> {
+    let rocksdb_dir = TempDir::new()?;
+    let connection_pool = ConnectionPool::<Core>::test_pool().await;
+    let mut conn = connection_pool.connection().await.unwrap();
+    let genesis_params = GenesisParams::mock();
+    insert_genesis_batch(&mut conn, &genesis_params)
+        .await
+        .unwrap();
+    let alice = Account::random();
+    let bob = Account::random();
+    let mut accounts = vec![alice, bob];
+    fund(&connection_pool, &accounts).await;
+
+    let batches = store_l1_batches(
+        &mut conn,
+        1..=1,
+        genesis_params.base_system_contracts().hashes(),
+        &mut accounts,
+    )
+    .await?;
+    drop(conn);
+
+    let io = Arc::new(RwLock::new(IoMock {
+        current: 0.into(),
+        max: 1,
+    }));
+    let (storage, task) = VmRunnerStorage::new(
+        connection_pool.clone(),
+        rocksdb_dir.path().to_str().unwrap().to_owned(),
+        io.clone(),
+        L2ChainId::default(),
+    )
+    .await?;
+    let (_, stop_receiver) = watch::channel(false);
+    let storage_stop_receiver = stop_receiver.clone();
+    tokio::task::spawn(async move { task.run(storage_stop_receiver).await.unwrap() });
+    let test_factory = TestOutputFactory {
+        delays: HashMap::new(),
+    };
+    let (output_factory, task) =
+        ConcurrentOutputHandlerFactory::new(connection_pool.clone(), io.clone(), test_factory);
+    let output_stop_receiver = stop_receiver.clone();
+    tokio::task::spawn(async move { task.run(output_stop_receiver).await.unwrap() });
+
+    let storage = Arc::new(storage);
+    let batch_executor = MainBatchExecutor::new(false, false);
+    let vm_runner = VmRunner::new(
+        connection_pool,
+        Box::new(io.clone()),
+        storage,
+        Box::new(output_factory),
+        Box::new(batch_executor),
+    );
+    tokio::task::spawn(async move { vm_runner.run(&stop_receiver).await.unwrap() });
+
+    for batch in batches {
+        wait::for_batch(io.clone(), batch.number, Duration::from_secs(1)).await?;
+    }
+
+    Ok(())
+}
diff --git a/core/node/vm_runner/src/tests/storage.rs b/core/node/vm_runner/src/tests/storage.rs
new file mode 100644
index 000000000000..52de43801ff0
--- /dev/null
+++ b/core/node/vm_runner/src/tests/storage.rs
@@ -0,0 +1,371 @@
+use std::{sync::Arc, time::Duration};
+
+use backon::{ConstantBuilder, ExponentialBuilder, Retryable};
+use tempfile::TempDir;
+use tokio::{
+    runtime::Handle,
+    sync::{watch, RwLock},
+    task::JoinHandle,
+};
+use zksync_dal::{ConnectionPool, Core, CoreDal};
+use zksync_node_genesis::{insert_genesis_batch, GenesisParams};
+use zksync_state::{PgOrRocksdbStorage, PostgresStorage, ReadStorage, ReadStorageFactory};
+use zksync_test_account::Account;
+use zksync_types::{AccountTreeId, L1BatchNumber, L2ChainId, StorageKey};
+
+use crate::{
+    storage::StorageLoader,
+    tests::{fund, store_l1_batches, IoMock},
+    BatchExecuteData, VmRunnerIo, VmRunnerStorage,
+};
+
+#[derive(Debug)]
+struct StorageTester {
+    db_dir: TempDir,
+    pool: ConnectionPool<Core>,
+    tasks: Vec<JoinHandle<()>>,
+}
+
+impl StorageTester {
+    fn new(pool: ConnectionPool<Core>) -> Self {
+        Self {
+            db_dir: TempDir::new().unwrap(),
+            pool,
+            tasks: Vec::new(),
+        }
+    }
+
+    async fn create_storage(
+        &mut self,
+        io_mock: Arc<RwLock<IoMock>>,
+    ) -> anyhow::Result<VmRunnerStorage<Arc<RwLock<IoMock>>>> {
+        let (vm_runner_storage, task) = VmRunnerStorage::new(
+            self.pool.clone(),
+            self.db_dir.path().to_str().unwrap().to_owned(),
+            io_mock,
+            L2ChainId::default(),
+        )
+        .await?;
+        let handle = tokio::task::spawn(async move {
+            let (_stop_sender, stop_receiver) = watch::channel(false);
+            task.run(stop_receiver).await.unwrap()
+        });
+        self.tasks.push(handle);
+        Ok(vm_runner_storage)
+    }
+}
+
+impl<Io: VmRunnerIo> VmRunnerStorage<Io> {
+    async fn load_batch_eventually(
+        &self,
+        number: L1BatchNumber,
+    ) -> anyhow::Result<BatchExecuteData> {
+        (|| async {
+            self.load_batch(number)
+                .await?
+                .ok_or_else(|| anyhow::anyhow!("Batch #{} is not available yet", number))
+        })
+        .retry(&ExponentialBuilder::default())
+        .await
+    }
+
+    async fn access_storage_eventually(
+        &self,
+        stop_receiver: &watch::Receiver<bool>,
+        number: L1BatchNumber,
+    ) -> anyhow::Result<PgOrRocksdbStorage<'_>> {
+        (|| async {
+            self.access_storage(stop_receiver, number)
+                .await?
+                .ok_or_else(|| {
+                    anyhow::anyhow!("Storage for batch #{} is not available yet", number)
+                })
+        })
+        .retry(&ExponentialBuilder::default())
+        .await
+    }
+
+    async fn ensure_batch_unloads_eventually(&self, number: L1BatchNumber) -> anyhow::Result<()> {
+        (|| async {
+            Ok(anyhow::ensure!(
+                self.load_batch(number).await?.is_none(),
+                "Batch #{} is still available",
+                number
+            ))
+        })
+        .retry(&ExponentialBuilder::default())
+        .await
+    }
+
+    async fn batch_stays_unloaded(&self, number: L1BatchNumber) -> bool {
+        (|| async {
+            self.load_batch(number)
+                .await?
+                .ok_or_else(|| anyhow::anyhow!("Batch #{} is not available yet", number))
+        })
+        .retry(
+            &ConstantBuilder::default()
+                .with_delay(Duration::from_millis(100))
+                .with_max_times(3),
+        )
+        .await
+        .is_err()
+    }
+}
+
+#[tokio::test]
+async fn rerun_storage_on_existing_data() -> anyhow::Result<()> {
+    let connection_pool = ConnectionPool::<Core>::test_pool().await;
+    let mut conn = connection_pool.connection().await.unwrap();
+    let genesis_params = GenesisParams::mock();
+    insert_genesis_batch(&mut conn, &genesis_params)
+        .await
+        .unwrap();
+    drop(conn);
+    let alice = Account::random();
+    let bob = Account::random();
+    let mut accounts = vec![alice, bob];
+    fund(&connection_pool, &accounts).await;
+
+    // Generate 10 batches worth of data and persist it in Postgres
+    let batches = store_l1_batches(
+        &mut connection_pool.connection().await?,
+        1..=10,
+        genesis_params.base_system_contracts().hashes(),
+        &mut accounts,
+    )
+    .await?;
+
+    let mut tester = StorageTester::new(connection_pool.clone());
+    let io_mock = Arc::new(RwLock::new(IoMock {
+        current: 0.into(),
+        max: 10,
+    }));
+    let storage = tester.create_storage(io_mock.clone()).await?;
+    // Check that existing batches are returned in the exact same order with the exact same data
+    for batch in &batches {
+        let batch_data = storage.load_batch_eventually(batch.number).await?;
+        let mut conn = connection_pool.connection().await.unwrap();
+        let (previous_batch_hash, _) = conn
+            .blocks_dal()
+            .get_l1_batch_state_root_and_timestamp(batch_data.l1_batch_env.number - 1)
+            .await?
+            .unwrap();
+        assert_eq!(
+            batch_data.l1_batch_env.previous_batch_hash,
+            Some(previous_batch_hash)
+        );
+        assert_eq!(batch_data.l1_batch_env.number, batch.number);
+        assert_eq!(batch_data.l1_batch_env.timestamp, batch.timestamp);
+        let (first_l2_block_number, _) = conn
+            .blocks_dal()
+            .get_l2_block_range_of_l1_batch(batch.number)
+            .await?
+            .unwrap();
+        let previous_l2_block_header = conn
+            .blocks_dal()
+            .get_l2_block_header(first_l2_block_number - 1)
+            .await?
+            .unwrap();
+        let l2_block_header = conn
+            .blocks_dal()
+            .get_l2_block_header(first_l2_block_number)
+            .await?
+            .unwrap();
+        assert_eq!(
+            batch_data.l1_batch_env.first_l2_block.number,
+            l2_block_header.number.0
+        );
+        assert_eq!(
+            batch_data.l1_batch_env.first_l2_block.timestamp,
+            l2_block_header.timestamp
+        );
+        assert_eq!(
+            batch_data.l1_batch_env.first_l2_block.prev_block_hash,
+            previous_l2_block_header.hash
+        );
+        let l2_blocks = conn
+            .transactions_dal()
+            .get_l2_blocks_to_execute_for_l1_batch(batch_data.l1_batch_env.number)
+            .await?;
+        assert_eq!(batch_data.l2_blocks, l2_blocks);
+    }
+
+    // "Mark" these batches as processed
+    io_mock.write().await.current += batches.len() as u32;
+
+    // All old batches should no longer be loadable
+    for batch in batches {
+        storage
+            .ensure_batch_unloads_eventually(batch.number)
+            .await?;
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn continuously_load_new_batches() -> anyhow::Result<()> {
+    let connection_pool = ConnectionPool::<Core>::test_pool().await;
+    let mut conn = connection_pool.connection().await.unwrap();
+    let genesis_params = GenesisParams::mock();
+    insert_genesis_batch(&mut conn, &genesis_params)
+        .await
+        .unwrap();
+    drop(conn);
+    let alice = Account::random();
+    let bob = Account::random();
+    let mut accounts = vec![alice, bob];
+    fund(&connection_pool, &accounts).await;
+
+    let mut tester = StorageTester::new(connection_pool.clone());
+    let io_mock = Arc::new(RwLock::new(IoMock::default()));
+    let storage = tester.create_storage(io_mock.clone()).await?;
+    // No batches available yet
+    assert!(storage.load_batch(L1BatchNumber(1)).await?.is_none());
+
+    // Generate one batch and persist it in Postgres
+    store_l1_batches(
+        &mut connection_pool.connection().await?,
+        1..=1,
+        genesis_params.base_system_contracts().hashes(),
+        &mut accounts,
+    )
+    .await?;
+    io_mock.write().await.max += 1;
+
+    // Load batch and mark it as processed
+    assert_eq!(
+        storage
+            .load_batch_eventually(L1BatchNumber(1))
+            .await?
+            .l1_batch_env
+            .number,
+        L1BatchNumber(1)
+    );
+    io_mock.write().await.current += 1;
+
+    // No more batches after that
+    assert!(storage.batch_stays_unloaded(L1BatchNumber(2)).await);
+
+    // Generate one more batch and persist it in Postgres
+    store_l1_batches(
+        &mut connection_pool.connection().await?,
+        2..=2,
+        genesis_params.base_system_contracts().hashes(),
+        &mut accounts,
+    )
+    .await?;
+    io_mock.write().await.max += 1;
+
+    // Load batch and mark it as processed
+
+    assert_eq!(
+        storage
+            .load_batch_eventually(L1BatchNumber(2))
+            .await?
+            .l1_batch_env
+            .number,
+        L1BatchNumber(2)
+    );
+    io_mock.write().await.current += 1;
+
+    // No more batches after that
+    assert!(storage.batch_stays_unloaded(L1BatchNumber(3)).await);
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn access_vm_runner_storage() -> anyhow::Result<()> {
+    let connection_pool = ConnectionPool::<Core>::test_pool().await;
+    let mut conn = connection_pool.connection().await.unwrap();
+    let genesis_params = GenesisParams::mock();
+    insert_genesis_batch(&mut conn, &genesis_params)
+        .await
+        .unwrap();
+    drop(conn);
+    let alice = Account::random();
+    let bob = Account::random();
+    let mut accounts = vec![alice, bob];
+    fund(&connection_pool, &accounts).await;
+
+    // Generate 10 batches worth of data and persist it in Postgres
+    let batch_range = 1..=10;
+    store_l1_batches(
+        &mut connection_pool.connection().await?,
+        batch_range,
+        genesis_params.base_system_contracts().hashes(),
+        &mut accounts,
+    )
+    .await?;
+
+    let mut conn = connection_pool.connection().await?;
+    let storage_logs = conn
+        .storage_logs_dal()
+        .dump_all_storage_logs_for_tests()
+        .await;
+    let factory_deps = conn
+        .factory_deps_dal()
+        .dump_all_factory_deps_for_tests()
+        .await;
+    drop(conn);
+
+    let (_sender, receiver) = watch::channel(false);
+    let mut tester = StorageTester::new(connection_pool.clone());
+    let io_mock = Arc::new(RwLock::new(IoMock {
+        current: 0.into(),
+        max: 10,
+    }));
+    let rt_handle = Handle::current();
+    let handle = tokio::task::spawn_blocking(move || {
+        let vm_runner_storage =
+            rt_handle.block_on(async { tester.create_storage(io_mock.clone()).await.unwrap() });
+        for i in 1..=10 {
+            let mut conn = rt_handle.block_on(connection_pool.connection()).unwrap();
+            let (_, last_l2_block_number) = rt_handle
+                .block_on(
+                    conn.blocks_dal()
+                        .get_l2_block_range_of_l1_batch(L1BatchNumber(i)),
+                )?
+                .unwrap();
+            let mut pg_storage =
+                PostgresStorage::new(rt_handle.clone(), conn, last_l2_block_number, true);
+            let mut vm_storage = rt_handle.block_on(async {
+                vm_runner_storage
+                    .access_storage_eventually(&receiver, L1BatchNumber(i))
+                    .await
+            })?;
+            // Check that both storages have identical key-value pairs written in them
+            for storage_log in &storage_logs {
+                let storage_key = StorageKey::new(
+                    AccountTreeId::new(storage_log.address.unwrap()),
+                    storage_log.key.unwrap(),
+                );
+                assert_eq!(
+                    pg_storage.read_value(&storage_key),
+                    vm_storage.read_value(&storage_key)
+                );
+                assert_eq!(
+                    pg_storage.get_enumeration_index(&storage_key),
+                    vm_storage.get_enumeration_index(&storage_key)
+                );
+                assert_eq!(
+                    pg_storage.is_write_initial(&storage_key),
+                    vm_storage.is_write_initial(&storage_key)
+                );
+            }
+            for hash in factory_deps.keys() {
+                assert_eq!(
+                    pg_storage.load_factory_dep(*hash),
+                    vm_storage.load_factory_dep(*hash)
+                );
+            }
+        }
+
+        anyhow::Ok(())
+    });
+    handle.await??;
+
+    Ok(())
+}
diff --git a/core/tests/loadnext/Cargo.toml b/core/tests/loadnext/Cargo.toml
index 3fdf92d3b52d..adb5c9eca429 100644
--- a/core/tests/loadnext/Cargo.toml
+++ b/core/tests/loadnext/Cargo.toml
@@ -19,8 +19,7 @@ zksync_eth_client.workspace = true
 zksync_config.workspace = true
 zksync_contracts.workspace = true
 zksync_system_constants.workspace = true
-vlog.workspace = true
-prometheus_exporter.workspace = true
+zksync_vlog.workspace = true
 
 async-trait.workspace = true
 serde = { workspace = true, features = ["derive"] }
@@ -37,5 +36,5 @@ once_cell.workspace = true
 thiserror.workspace = true
 reqwest = { workspace = true, features = ["blocking", "json"] }
 regex.workspace = true
-metrics.workspace = true
+vise.workspace = true
 tracing.workspace = true
diff --git a/core/tests/loadnext/README.md b/core/tests/loadnext/README.md
index 52b4c68dec34..59288a7160ec 100644
--- a/core/tests/loadnext/README.md
+++ b/core/tests/loadnext/README.md
@@ -1,7 +1,7 @@
-# Loadnext: loadtest for zkSync
+# Loadnext: loadtest for ZKsync
 
-Loadnext is a utility for random stress-testing the zkSync server. It is capable of simulating the behavior of many
-independent users of zkSync network, who are sending quasi-random requests to the server.
+Loadnext is a utility for random stress-testing the ZKsync server. It is capable of simulating the behavior of many
+independent users of ZKsync network, who are sending quasi-random requests to the server.
 
 The general flow is as follows:
 
diff --git a/core/tests/loadnext/src/account/mod.rs b/core/tests/loadnext/src/account/mod.rs
index 627ef04c1df1..5dcd5167165e 100644
--- a/core/tests/loadnext/src/account/mod.rs
+++ b/core/tests/loadnext/src/account/mod.rs
@@ -8,7 +8,10 @@ use futures::{channel::mpsc, SinkExt};
 use tokio::sync::RwLock;
 use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
 use zksync_types::{api::TransactionReceipt, Address, Nonce, H256, U256, U64};
-use zksync_web3_decl::jsonrpsee::core::ClientError as CoreError;
+use zksync_web3_decl::{
+    client::{Client, L2},
+    jsonrpsee::core::ClientError as CoreError,
+};
 
 use crate::{
     account::tx_command_executor::SubmitResult,
@@ -17,7 +20,7 @@ use crate::{
     config::{LoadtestConfig, RequestLimiters},
     constants::{MAX_L1_TRANSACTIONS, POLLING_INTERVAL},
     report::{Report, ReportBuilder, ReportLabel},
-    sdk::{error::ClientError, operations::SyncTransactionHandle, HttpClient},
+    sdk::{error::ClientError, operations::SyncTransactionHandle},
     utils::format_gwei,
 };
 
@@ -351,7 +354,7 @@ impl AccountLifespan {
         }
     }
 
-    /// Generic submitter for zkSync network: it can operate individual transactions,
+    /// Generic submitter for ZKsync network: it can operate individual transactions,
     /// as long as we can provide a `SyncTransactionHandle` to wait for the commitment and the
     /// execution result.
     /// Once result is obtained, it's compared to the expected operation outcome in order to check whether
@@ -359,7 +362,7 @@ impl AccountLifespan {
     async fn submit(
         &mut self,
         modifier: IncorrectnessModifier,
-        send_result: Result<SyncTransactionHandle<'_, HttpClient>, ClientError>,
+        send_result: Result<SyncTransactionHandle<'_, Client<L2>>, ClientError>,
     ) -> Result<SubmitResult, ClientError> {
         let expected_outcome = modifier.expected_outcome();
 
diff --git a/core/tests/loadnext/src/account/pubsub_executor.rs b/core/tests/loadnext/src/account/pubsub_executor.rs
index 246954a26a25..07f45b4ae972 100644
--- a/core/tests/loadnext/src/account/pubsub_executor.rs
+++ b/core/tests/loadnext/src/account/pubsub_executor.rs
@@ -3,7 +3,10 @@ use std::time::{Duration, Instant};
 use futures::{stream, TryStreamExt};
 use zksync_web3_decl::{
     jsonrpsee::{
-        core::client::{Subscription, SubscriptionClientT},
+        core::{
+            client::{Subscription, SubscriptionClientT},
+            ClientError as RpcError,
+        },
         rpc_params,
         ws_client::WsClientBuilder,
     },
@@ -86,7 +89,7 @@ impl AccountLifespan {
             {
                 match resp {
                     None => return Err(ClientError::OperationTimeout),
-                    Some(Err(err)) => return Err(err.into()),
+                    Some(Err(err)) => return Err(RpcError::ParseError(err).into()),
                     _ => {}
                 }
             }
diff --git a/core/tests/loadnext/src/account/tx_command_executor.rs b/core/tests/loadnext/src/account/tx_command_executor.rs
index 2a916564fd61..b085219060b7 100644
--- a/core/tests/loadnext/src/account/tx_command_executor.rs
+++ b/core/tests/loadnext/src/account/tx_command_executor.rs
@@ -1,5 +1,6 @@
 use std::time::Instant;
 
+use zksync_eth_client::EthInterface;
 use zksync_system_constants::MAX_L1_TRANSACTION_GAS_LIMIT;
 use zksync_types::{
     api::{BlockNumber, TransactionReceipt},
diff --git a/core/tests/loadnext/src/account_pool.rs b/core/tests/loadnext/src/account_pool.rs
index 3fc96971ee99..7b5e277e139b 100644
--- a/core/tests/loadnext/src/account_pool.rs
+++ b/core/tests/loadnext/src/account_pool.rs
@@ -6,19 +6,20 @@ use rand::Rng;
 use tokio::time::timeout;
 use zksync_eth_signer::PrivateKeySigner;
 use zksync_types::{Address, K256PrivateKey, L2ChainId, H256};
+use zksync_web3_decl::client::{Client, L2};
 
 use crate::{
     config::LoadtestConfig,
     corrupted_tx::CorruptedSigner,
     fs_utils::{loadnext_contract, TestContract},
     rng::{LoadtestRng, Random},
-    sdk::{signer::Signer, HttpClient, HttpClientBuilder, Wallet, ZksNamespaceClient},
+    sdk::{signer::Signer, Wallet, ZksNamespaceClient},
 };
 
 /// An alias to [`zksync::Wallet`] with HTTP client. Wrapped in `Arc` since
 /// the client cannot be cloned due to limitations in jsonrpsee.
-pub type SyncWallet = Arc<Wallet<PrivateKeySigner, HttpClient>>;
-pub type CorruptedSyncWallet = Arc<Wallet<CorruptedSigner, HttpClient>>;
+pub type SyncWallet = Arc<Wallet<PrivateKeySigner, Client<L2>>>;
+pub type CorruptedSyncWallet = Arc<Wallet<CorruptedSigner, Client<L2>>>;
 
 /// Thread-safe pool of the addresses of accounts used in the loadtest.
 #[derive(Debug, Clone)]
@@ -76,7 +77,7 @@ pub struct TestWallet {
 }
 
 /// Pool of accounts to be used in the test.
-/// Each account is represented as `zksync::Wallet` in order to provide convenient interface of interaction with zkSync.
+/// Each account is represented as `zksync::Wallet` in order to provide convenient interface of interaction with ZKsync.
 #[derive(Debug)]
 pub struct AccountPool {
     /// Main wallet that will be used to initialize all the test wallets.
@@ -90,12 +91,18 @@ pub struct AccountPool {
 impl AccountPool {
     /// Generates all the required test accounts and prepares `Wallet` objects.
     pub async fn new(config: &LoadtestConfig) -> anyhow::Result<Self> {
-        let l2_chain_id = L2ChainId::try_from(config.l2_chain_id).unwrap();
+        let l2_chain_id = L2ChainId::try_from(config.l2_chain_id)
+            .map_err(|err| anyhow::anyhow!("invalid L2 chain ID: {err}"))?;
         // Create a client for pinging the RPC.
-        let client = HttpClientBuilder::default()
-            .build(&config.l2_rpc_address)
-            .unwrap();
-        // Perform a health check: check whether zkSync server is alive.
+        let client = Client::http(
+            config
+                .l2_rpc_address
+                .parse()
+                .context("invalid L2 RPC URL")?,
+        )?
+        .for_network(l2_chain_id.into())
+        .build();
+        // Perform a health check: check whether ZKsync server is alive.
         let mut server_alive = false;
         for _ in 0usize..3 {
             if let Ok(Ok(_)) = timeout(Duration::from_secs(3), client.get_main_contract()).await {
@@ -104,7 +111,7 @@ impl AccountPool {
             }
         }
         if !server_alive {
-            anyhow::bail!("zkSync server does not respond. Please check RPC address and whether server is launched");
+            anyhow::bail!("ZKsync server does not respond. Please check RPC address and whether server is launched");
         }
 
         let test_contract = loadnext_contract(&config.test_contracts_path)?;
diff --git a/core/tests/loadnext/src/command/api.rs b/core/tests/loadnext/src/command/api.rs
index b32620bd3438..2f5628f5759b 100644
--- a/core/tests/loadnext/src/command/api.rs
+++ b/core/tests/loadnext/src/command/api.rs
@@ -53,7 +53,7 @@ impl AllWeighted for ApiRequestType {
 pub struct ApiRequest {
     /// Type of the request to be performed.
     pub request_type: ApiRequestType,
-    /// zkSync block number, generated randomly.
+    /// ZKsync block number, generated randomly.
     pub block_number: api::BlockNumber,
 }
 
diff --git a/core/tests/loadnext/src/command/tx_command.rs b/core/tests/loadnext/src/command/tx_command.rs
index a2ac37dfc8b8..2c325f1a67e4 100644
--- a/core/tests/loadnext/src/command/tx_command.rs
+++ b/core/tests/loadnext/src/command/tx_command.rs
@@ -12,7 +12,7 @@ use crate::{
 
 static WEIGHTS: OnceCell<[(TxType, f32); 5]> = OnceCell::new();
 
-/// Type of transaction. It doesn't copy the zkSync operation list, because
+/// Type of transaction. It doesn't copy the ZKsync operation list, because
 /// it divides some transactions in subcategories (e.g. to new account / to existing account; to self / to other; etc)/
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum TxType {
diff --git a/core/tests/loadnext/src/config.rs b/core/tests/loadnext/src/config.rs
index c8487e4d595e..a9648edb00ae 100644
--- a/core/tests/loadnext/src/config.rs
+++ b/core/tests/loadnext/src/config.rs
@@ -4,6 +4,7 @@ use serde::Deserialize;
 use tokio::sync::Semaphore;
 use zksync_contracts::test_contracts::LoadnextContractExecutionParams;
 use zksync_types::{network::Network, Address, L2ChainId, H160};
+use zksync_utils::workspace_dir_or_current_dir;
 
 use crate::fs_utils::read_tokens;
 
@@ -40,7 +41,7 @@ pub struct LoadtestConfig {
     /// Address of the ERC-20 token to be used in test.
     ///
     /// Token must satisfy two criteria:
-    /// - Be supported by zkSync.
+    /// - Be supported by ZKsync.
     /// - Have `mint` operation.
     ///
     /// Note that we use ERC-20 token since we can't easily mint a lot of ETH on
@@ -189,14 +190,8 @@ fn default_main_token() -> H160 {
 }
 
 fn default_test_contracts_path() -> PathBuf {
-    let test_contracts_path = {
-        let home = std::env::var("ZKSYNC_HOME").unwrap();
-        let path = PathBuf::from(&home);
-        path.join("etc/contracts-test-data")
-    };
-
+    let test_contracts_path = workspace_dir_or_current_dir().join("etc/contracts-test-data");
     tracing::info!("Test contracts path: {}", test_contracts_path.display());
-
     test_contracts_path
 }
 
@@ -346,3 +341,16 @@ impl RequestLimiters {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+    use crate::fs_utils::loadnext_contract;
+
+    #[test]
+    fn check_read_test_contract() {
+        let test_contracts_path = default_test_contracts_path();
+        loadnext_contract(&test_contracts_path).unwrap();
+    }
+}
diff --git a/core/tests/loadnext/src/corrupted_tx.rs b/core/tests/loadnext/src/corrupted_tx.rs
index cb1c8fcf1b7b..cf4064a4cf8f 100644
--- a/core/tests/loadnext/src/corrupted_tx.rs
+++ b/core/tests/loadnext/src/corrupted_tx.rs
@@ -6,7 +6,7 @@ use zksync_types::{
 
 use crate::{command::IncorrectnessModifier, sdk::signer::Signer};
 
-/// Trait that exists solely to extend the signed zkSync transaction interface, providing the ability
+/// Trait that exists solely to extend the signed ZKsync transaction interface, providing the ability
 /// to modify transaction in a way that will make it invalid.
 ///
 /// Loadtest is expected to simulate the user behavior, and it's not that uncommon of users to send incorrect
diff --git a/core/tests/loadnext/src/executor.rs b/core/tests/loadnext/src/executor.rs
index fe262acc138d..48d90f19c1d7 100644
--- a/core/tests/loadnext/src/executor.rs
+++ b/core/tests/loadnext/src/executor.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use anyhow::anyhow;
 use futures::{channel::mpsc, future, SinkExt};
-use zksync_eth_client::Options;
+use zksync_eth_client::{EthInterface, Options};
 use zksync_eth_signer::PrivateKeySigner;
 use zksync_system_constants::MAX_L1_TRANSACTION_GAS_LIMIT;
 use zksync_types::{
@@ -15,6 +15,7 @@ use crate::{
     account_pool::AccountPool,
     config::{ExecutionConfig, LoadtestConfig, RequestLimiters},
     constants::*,
+    metrics::LOADTEST_METRICS,
     report::ReportBuilder,
     report_collector::{LoadtestResult, ReportCollector},
     sdk::{
@@ -114,10 +115,9 @@ impl Executor {
             self.pool.master_wallet.address(),
             format_eth(eth_balance)
         );
-        metrics::gauge!(
-            "loadtest.master_account_balance",
-            eth_balance.as_u128() as f64
-        );
+        LOADTEST_METRICS
+            .master_account_balance
+            .set(eth_balance.as_u128() as f64);
 
         Ok(())
     }
@@ -633,7 +633,7 @@ impl Executor {
 
     /// Returns the amount of funds to be deposited on the main account in L2.
     /// Amount is chosen to be big enough to not worry about precisely calculating the remaining balances on accounts,
-    /// but also to not be close to the supported limits in zkSync.
+    /// but also to not be close to the supported limits in ZKsync.
     fn amount_to_deposit(&self) -> u128 {
         u128::MAX >> 32
     }
@@ -696,7 +696,7 @@ async fn deposit_with_attempts(
 
         tracing::info!("Deposit with tx_hash {deposit_tx_hash:?}");
 
-        // Wait for the corresponding priority operation to be committed in zkSync.
+        // Wait for the corresponding priority operation to be committed in ZKsync.
         match ethereum.wait_for_tx(deposit_tx_hash).await {
             Ok(eth_receipt) => {
                 return Ok(eth_receipt);
diff --git a/core/tests/loadnext/src/fs_utils.rs b/core/tests/loadnext/src/fs_utils.rs
index 9fee9916f916..8af9df8afee7 100644
--- a/core/tests/loadnext/src/fs_utils.rs
+++ b/core/tests/loadnext/src/fs_utils.rs
@@ -5,6 +5,7 @@ use std::{fs::File, io::BufReader, path::Path};
 
 use serde::Deserialize;
 use zksync_types::{ethabi::Contract, network::Network, Address};
+use zksync_utils::workspace_dir_or_current_dir;
 
 /// A token stored in `etc/tokens/{network}.json` files.
 #[derive(Debug, Deserialize)]
@@ -26,10 +27,8 @@ pub struct TestContract {
 }
 
 pub fn read_tokens(network: Network) -> anyhow::Result<Vec<Token>> {
-    let home = std::env::var("ZKSYNC_HOME")?;
-    let path = Path::new(&home);
-    let path = path.join(format!("etc/tokens/{network}.json"));
-
+    let home = workspace_dir_or_current_dir();
+    let path = home.join(format!("etc/tokens/{network}.json"));
     let file = File::open(path)?;
     let reader = BufReader::new(file);
 
@@ -86,21 +85,3 @@ pub fn loadnext_contract(path: &Path) -> anyhow::Result<TestContract> {
     let path = path.join("artifacts-zk/contracts/loadnext/loadnext_contract.sol");
     read_contract_dir(&path)
 }
-
-#[cfg(test)]
-mod tests {
-    use std::path::PathBuf;
-
-    use super::*;
-
-    #[test]
-    fn check_read_test_contract() {
-        let test_contracts_path = {
-            let home = std::env::var("ZKSYNC_HOME").unwrap();
-            let path = PathBuf::from(&home);
-            path.join("etc/contracts-test-data")
-        };
-
-        loadnext_contract(&test_contracts_path).unwrap();
-    }
-}
diff --git a/core/tests/loadnext/src/lib.rs b/core/tests/loadnext/src/lib.rs
index eeb59c9f2fea..c1d2719a4c65 100644
--- a/core/tests/loadnext/src/lib.rs
+++ b/core/tests/loadnext/src/lib.rs
@@ -9,6 +9,7 @@ pub mod constants;
 pub mod corrupted_tx;
 pub mod executor;
 pub mod fs_utils;
+pub(crate) mod metrics;
 pub mod report;
 pub mod report_collector;
 pub mod rng;
diff --git a/core/tests/loadnext/src/main.rs b/core/tests/loadnext/src/main.rs
index 6a3125931f12..c1b6f8b725c1 100644
--- a/core/tests/loadnext/src/main.rs
+++ b/core/tests/loadnext/src/main.rs
@@ -1,8 +1,8 @@
-//! Loadtest: an utility to stress-test the zkSync server.
+//! Loadtest: an utility to stress-test the ZKsync server.
 //!
 //! In order to launch it, you must provide required environmental variables, for details see `README.md`.
 //! Without required variables provided, test is launched in the localhost/development mode with some hard-coded
-//! values to check the local zkSync deployment.
+//! values to check the local ZKsync deployment.
 
 use std::time::Duration;
 
@@ -12,16 +12,16 @@ use loadnext::{
     executor::Executor,
     report_collector::LoadtestResult,
 };
-use prometheus_exporter::PrometheusExporterConfig;
 use tokio::sync::watch;
 use zksync_config::configs::api::PrometheusConfig;
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     // We don't want to introduce dependency on `zksync_env_config` in loadnext,
     // but we historically rely on the environment variables for the observability configuration,
     // so we load them directly here.
-    let log_format: vlog::LogFormat = std::env::var("MISC_LOG_FORMAT")
+    let log_format: zksync_vlog::LogFormat = std::env::var("MISC_LOG_FORMAT")
         .ok()
         .unwrap_or("plain".to_string())
         .parse()?;
@@ -39,7 +39,7 @@ async fn main() -> anyhow::Result<()> {
         }
     };
 
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(sentry_url) = sentry_url {
         builder = builder
             .with_sentry_url(&sentry_url)
diff --git a/core/tests/loadnext/src/metrics.rs b/core/tests/loadnext/src/metrics.rs
new file mode 100644
index 000000000000..2ea273225787
--- /dev/null
+++ b/core/tests/loadnext/src/metrics.rs
@@ -0,0 +1,12 @@
+use vise::{Gauge, LabeledFamily, Metrics};
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "loadtest")]
+pub(crate) struct LoadtestMetrics {
+    #[metrics(labels = ["label"])]
+    pub tps: LabeledFamily<String, Gauge<f64>>,
+    pub master_account_balance: Gauge<f64>,
+}
+
+#[vise::register]
+pub(crate) static LOADTEST_METRICS: vise::Global<LoadtestMetrics> = vise::Global::new();
diff --git a/core/tests/loadnext/src/report_collector/mod.rs b/core/tests/loadnext/src/report_collector/mod.rs
index 6a7a5de39ba2..d891ad1c7156 100644
--- a/core/tests/loadnext/src/report_collector/mod.rs
+++ b/core/tests/loadnext/src/report_collector/mod.rs
@@ -4,6 +4,7 @@ use futures::{channel::mpsc::Receiver, StreamExt};
 use operation_results_collector::OperationResultsCollector;
 
 use crate::{
+    metrics::LOADTEST_METRICS,
     report::{ActionType, Report, ReportLabel},
     report_collector::metrics_collector::MetricsCollector,
 };
@@ -40,11 +41,7 @@ impl Collectors {
         let actual_duration = self.start.elapsed();
         self.metrics.report();
         if !self.is_aborted {
-            metrics::gauge!(
-                "loadtest.tps",
-                self.operation_results.nominal_tps(),
-                "label" => prometheus_label,
-            );
+            LOADTEST_METRICS.tps[&prometheus_label].set(self.operation_results.nominal_tps());
         }
         self.operation_results.report(actual_duration);
     }
diff --git a/core/tests/loadnext/src/sdk/abi/update-abi.sh b/core/tests/loadnext/src/sdk/abi/update-abi.sh
index 35d03a469dfd..3fdcd4d58028 100755
--- a/core/tests/loadnext/src/sdk/abi/update-abi.sh
+++ b/core/tests/loadnext/src/sdk/abi/update-abi.sh
@@ -2,7 +2,7 @@
 
 cd `dirname $0`
 
-# Main zkSync contract interface
+# Main ZKsync contract interface
 cat $ZKSYNC_HOME/contracts/l1-contracts/artifacts/contracts/bridgehub/IBridgehub.sol/IBridgehub.json | jq '{ abi: .abi}' > IBridgehub.json
 cat $ZKSYNC_HOME/contracts/l1-contracts/artifacts/contracts/state-transition/IStateTransitionManager.sol/IStateTransitionManager.json | jq '{ abi: .abi}' > IStateTransitionManager.json
 cat $ZKSYNC_HOME/contracts/l1-contracts/artifacts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol/IZkSyncHyperchain.json | jq '{ abi: .abi}' > IZkSyncHyperchain.json
diff --git a/core/tests/loadnext/src/sdk/ethereum/mod.rs b/core/tests/loadnext/src/sdk/ethereum/mod.rs
index d4dabdeb5194..ca168152a640 100644
--- a/core/tests/loadnext/src/sdk/ethereum/mod.rs
+++ b/core/tests/loadnext/src/sdk/ethereum/mod.rs
@@ -4,8 +4,8 @@ use std::time::{Duration, Instant};
 
 use serde_json::{Map, Value};
 use zksync_eth_client::{
-    clients::{QueryClient, SigningClient},
-    BoundEthInterface, CallFunctionArgs, Error, EthInterface, Options,
+    clients::SigningClient, BoundEthInterface, CallFunctionArgs, ContractCallError, EthInterface,
+    Options,
 };
 use zksync_eth_signer::EthereumSigner;
 use zksync_types::{
@@ -17,7 +17,10 @@ use zksync_types::{
     web3::{contract::Tokenize, TransactionReceipt},
     Address, L1ChainId, L1TxCommonData, H160, H256, REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE, U256,
 };
-use zksync_web3_decl::namespaces::{EthNamespaceClient, ZksNamespaceClient};
+use zksync_web3_decl::{
+    client::{Client, DynClient, L1},
+    namespaces::{EthNamespaceClient, ZksNamespaceClient},
+};
 
 use crate::sdk::{
     error::ClientError,
@@ -84,6 +87,7 @@ impl<S: EthereumSigner> EthereumProvider<S> {
                 "Chain id overflow - Expected chain id to be in range 0..2^64".to_owned(),
             )
         })?;
+        let l1_chain_id = L1ChainId(l1_chain_id);
 
         let contract_address = provider.get_main_contract().await?;
         let default_bridges = provider
@@ -95,16 +99,19 @@ impl<S: EthereumSigner> EthereumProvider<S> {
             .as_ref()
             .parse::<SensitiveUrl>()
             .map_err(|err| ClientError::NetworkError(err.to_string()))?;
-        let query_client = QueryClient::new(eth_web3_url)
-            .map_err(|err| ClientError::NetworkError(err.to_string()))?;
+        let query_client = Client::http(eth_web3_url)
+            .map_err(|err| ClientError::NetworkError(err.to_string()))?
+            .for_network(l1_chain_id.into())
+            .build();
+        let query_client: Box<DynClient<L1>> = Box::new(query_client);
         let eth_client = SigningClient::new(
-            Box::new(query_client).for_component("provider"),
+            query_client.for_component("provider"),
             hyperchain_contract(),
             eth_addr,
             eth_signer,
             contract_address,
             DEFAULT_PRIORITY_FEE.into(),
-            L1ChainId(l1_chain_id),
+            l1_chain_id,
         );
         let erc20_abi = ierc20_contract();
         let l1_erc20_bridge_abi = l1_erc20_bridge_contract();
@@ -124,11 +131,11 @@ impl<S: EthereumSigner> EthereumProvider<S> {
         &self.eth_client
     }
 
-    pub fn query_client(&self) -> &dyn EthInterface {
+    pub fn query_client(&self) -> &DynClient<L1> {
         self.eth_client.as_ref()
     }
 
-    /// Returns the zkSync contract address.
+    /// Returns the ZKsync contract address.
     pub fn contract_address(&self) -> H160 {
         self.client().contract_addr()
     }
@@ -152,7 +159,9 @@ impl<S: EthereumSigner> EthereumProvider<S> {
             .call(self.query_client())
             .await
             .map_err(|err| match err {
-                Error::EthereumGateway(err) => ClientError::NetworkError(err.to_string()),
+                ContractCallError::EthereumGateway(err) => {
+                    ClientError::NetworkError(err.to_string())
+                }
                 _ => ClientError::MalformedResponse(err.to_string()),
             })
     }
@@ -187,7 +196,9 @@ impl<S: EthereumSigner> EthereumProvider<S> {
             .call(self.query_client())
             .await
             .map_err(|err| match err {
-                Error::EthereumGateway(err) => ClientError::NetworkError(err.to_string()),
+                ContractCallError::EthereumGateway(err) => {
+                    ClientError::NetworkError(err.to_string())
+                }
                 _ => ClientError::MalformedResponse(err.to_string()),
             })
     }
@@ -261,7 +272,7 @@ impl<S: EthereumSigner> EthereumProvider<S> {
     }
 
     /// Performs a transfer of funds from one Ethereum account to another.
-    /// Note: This operation is performed on Ethereum, and not related to zkSync directly.
+    /// Note: This operation is performed on Ethereum, and not related to ZKsync directly.
     pub async fn transfer(
         &self,
         token_address: Address,
@@ -354,7 +365,7 @@ impl<S: EthereumSigner> EthereumProvider<S> {
         gas_limit: U256,
         gas_per_pubdata_byte: u32,
         gas_price: Option<U256>,
-    ) -> Result<U256, Error> {
+    ) -> Result<U256, ContractCallError> {
         let gas_price = if let Some(gas_price) = gas_price {
             gas_price
         } else {
@@ -432,7 +443,7 @@ impl<S: EthereumSigner> EthereumProvider<S> {
         Ok(tx_hash)
     }
 
-    /// Performs a deposit in zkSync network.
+    /// Performs a deposit in ZKsync network.
     /// For ERC20 tokens, a deposit must be approved beforehand via the `EthereumProvider::approve_erc20_token_deposits` method.
     #[allow(clippy::too_many_arguments)]
     pub async fn deposit(
diff --git a/core/tests/loadnext/src/sdk/mod.rs b/core/tests/loadnext/src/sdk/mod.rs
index b2abf133b5c2..26c11eb7a2a6 100644
--- a/core/tests/loadnext/src/sdk/mod.rs
+++ b/core/tests/loadnext/src/sdk/mod.rs
@@ -1,7 +1,6 @@
-pub use zksync_types::{self, ethabi, network::Network, web3};
+pub use zksync_types::{self, ethabi, web3};
 pub use zksync_web3_decl::{
-    jsonrpsee::http_client::*,
-    namespaces::{EthNamespaceClient, NetNamespaceClient, Web3NamespaceClient, ZksNamespaceClient},
+    namespaces::{EthNamespaceClient, ZksNamespaceClient},
     types,
 };
 
diff --git a/core/tests/loadnext/src/sdk/operations/deploy_contract.rs b/core/tests/loadnext/src/sdk/operations/deploy_contract.rs
index adf1fe09ee77..af621249ed8b 100644
--- a/core/tests/loadnext/src/sdk/operations/deploy_contract.rs
+++ b/core/tests/loadnext/src/sdk/operations/deploy_contract.rs
@@ -73,7 +73,7 @@ where
                 execute_calldata,
                 fee,
                 nonce,
-                Some(vec![bytecode.clone()]),
+                vec![bytecode.clone()],
                 paymaster_params,
             )
             .await
@@ -150,7 +150,7 @@ where
             Default::default(),
             self.wallet.address(),
             self.value.unwrap_or_default(),
-            Some(factory_deps),
+            factory_deps,
             paymaster_params,
         );
         self.wallet
diff --git a/core/tests/loadnext/src/sdk/operations/execute_contract.rs b/core/tests/loadnext/src/sdk/operations/execute_contract.rs
index 3572d24a8b50..18b93008a73a 100644
--- a/core/tests/loadnext/src/sdk/operations/execute_contract.rs
+++ b/core/tests/loadnext/src/sdk/operations/execute_contract.rs
@@ -67,7 +67,7 @@ where
                 calldata,
                 fee,
                 nonce,
-                self.factory_deps,
+                self.factory_deps.unwrap_or_default(),
                 paymaster_params,
             )
             .await
@@ -150,7 +150,7 @@ where
             Default::default(),
             self.wallet.address(),
             self.value.unwrap_or_default(),
-            self.factory_deps.clone(),
+            self.factory_deps.clone().unwrap_or_default(),
             paymaster_params,
         );
         self.wallet
diff --git a/core/tests/loadnext/src/sdk/operations/transfer.rs b/core/tests/loadnext/src/sdk/operations/transfer.rs
index 8fe35fae92eb..34bab615c7c5 100644
--- a/core/tests/loadnext/src/sdk/operations/transfer.rs
+++ b/core/tests/loadnext/src/sdk/operations/transfer.rs
@@ -155,7 +155,7 @@ where
             Execute {
                 contract_address: to,
                 calldata: Default::default(),
-                factory_deps: None,
+                factory_deps: vec![],
                 value: amount,
             }
         } else {
@@ -163,7 +163,7 @@ where
             Execute {
                 contract_address: token,
                 calldata: create_transfer_calldata(to, amount),
-                factory_deps: None,
+                factory_deps: vec![],
                 value: Default::default(),
             }
         };
diff --git a/core/tests/loadnext/src/sdk/signer.rs b/core/tests/loadnext/src/sdk/signer.rs
index a992772909b0..0f4b1cf29717 100644
--- a/core/tests/loadnext/src/sdk/signer.rs
+++ b/core/tests/loadnext/src/sdk/signer.rs
@@ -57,7 +57,7 @@ impl<S: EthereumSigner> Signer<S> {
                 fee,
                 self.eth_signer.get_address().await?,
                 amount,
-                None,
+                vec![],
                 Default::default(),
             );
 
@@ -79,7 +79,7 @@ impl<S: EthereumSigner> Signer<S> {
             fee,
             self.eth_signer.get_address().await?,
             U256::zero(),
-            None,
+            vec![],
             paymaster_params,
         );
 
@@ -98,7 +98,7 @@ impl<S: EthereumSigner> Signer<S> {
         calldata: Vec<u8>,
         fee: Fee,
         nonce: Nonce,
-        factory_deps: Option<Vec<Vec<u8>>>,
+        factory_deps: Vec<Vec<u8>>,
         paymaster_params: PaymasterParams,
     ) -> Result<L2Tx, SignerError> {
         self.sign_execute_contract_for_deploy(
@@ -118,7 +118,7 @@ impl<S: EthereumSigner> Signer<S> {
         calldata: Vec<u8>,
         fee: Fee,
         nonce: Nonce,
-        factory_deps: Option<Vec<Vec<u8>>>,
+        factory_deps: Vec<Vec<u8>>,
         paymaster_params: PaymasterParams,
     ) -> Result<L2Tx, SignerError> {
         let mut execute_contract = L2Tx::new(
diff --git a/core/tests/loadnext/src/sdk/wallet.rs b/core/tests/loadnext/src/sdk/wallet.rs
index 9dc7eff3c793..c46431f70f48 100644
--- a/core/tests/loadnext/src/sdk/wallet.rs
+++ b/core/tests/loadnext/src/sdk/wallet.rs
@@ -8,7 +8,7 @@ use zksync_types::{
     Address, Eip712Domain, U256,
 };
 use zksync_web3_decl::{
-    jsonrpsee::http_client::{HttpClient, HttpClientBuilder},
+    client::{Client, L2},
     namespaces::{EthNamespaceClient, NetNamespaceClient, Web3NamespaceClient, ZksNamespaceClient},
 };
 
@@ -26,7 +26,7 @@ pub struct Wallet<S: EthereumSigner, P> {
     pub signer: Signer<S>,
 }
 
-impl<S> Wallet<S, HttpClient>
+impl<S> Wallet<S, Client<L2>>
 where
     S: EthereumSigner,
 {
@@ -38,8 +38,14 @@ where
     pub fn with_http_client(
         rpc_address: &str,
         signer: Signer<S>,
-    ) -> Result<Wallet<S, HttpClient>, ClientError> {
-        let client = HttpClientBuilder::default().build(rpc_address)?;
+    ) -> Result<Wallet<S, Client<L2>>, ClientError> {
+        let rpc_address = rpc_address
+            .parse()
+            .map_err(|err| ClientError::NetworkError(format!("error parsing RPC url: {err}")))?;
+        let client = Client::http(rpc_address)
+            .map_err(|err| ClientError::NetworkError(err.to_string()))?
+            .for_network(signer.chain_id.into())
+            .build();
 
         Ok(Wallet {
             provider: client,
@@ -149,6 +155,7 @@ where
                 meta.custom_signature = None;
             }
             req.from = Some(self.address());
+            req.chain_id = Some(self.signer.chain_id.as_u64());
             req
         };
         let domain = Eip712Domain::new(self.signer.chain_id);
@@ -158,7 +165,9 @@ where
             .sign_typed_data(&domain, &transaction_request)
             .await?;
 
-        let encoded_tx = transaction_request.get_signed_bytes(&signature, self.signer.chain_id);
+        let encoded_tx = transaction_request
+            .get_signed_bytes(&signature)
+            .map_err(|_| ClientError::Other)?;
         let bytes = Bytes(encoded_tx);
 
         let tx_hash = self.provider.send_raw_transaction(bytes).await?;
diff --git a/core/tests/recovery-test/README.md b/core/tests/recovery-test/README.md
new file mode 100644
index 000000000000..78833cc08057
--- /dev/null
+++ b/core/tests/recovery-test/README.md
@@ -0,0 +1,18 @@
+# Recovery Integration Tests
+
+These integration tests verify that a full node can initialize from an application snapshot or from genesis and then
+sync with the main node.
+
+## Running locally
+
+The tests require that the main node is running; you can start it with a command like
+
+```shell
+zk server &>server.log &
+```
+
+- [**Snapshot recovery test**](tests/snapshot-recovery.test.ts) can be run using
+  `yarn recovery-test snapshot-recovery-test`. It outputs logs to the files in the test directory:
+  `snapshot-creator.log` (snapshot creator logs) and `snapshot-recovery.log` (full node logs).
+- [**Genesis recovery test**](tests/genesis-recovery.test.ts) can be run using
+  `yarn recovery-test genesis-recovery-test`. It outputs full node logs to `genesis-recovery.log` in the test directory.
diff --git a/core/tests/snapshot-recovery-test/package.json b/core/tests/recovery-test/package.json
similarity index 81%
rename from core/tests/snapshot-recovery-test/package.json
rename to core/tests/recovery-test/package.json
index 981fa8f4f13d..8b2ea7f054c0 100644
--- a/core/tests/snapshot-recovery-test/package.json
+++ b/core/tests/recovery-test/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "snapshot-recovery-test",
+  "name": "recovery-test",
   "version": "1.0.0",
   "license": "MIT",
   "mocha": {
@@ -13,7 +13,8 @@
     ]
   },
   "scripts": {
-    "snapshot-recovery-test": "mocha tests/snapshot-recovery.test.ts"
+    "snapshot-recovery-test": "mocha tests/snapshot-recovery.test.ts",
+    "genesis-recovery-test": "mocha tests/genesis-recovery.test.ts"
   },
   "devDependencies": {
     "@types/chai": "^4.2.21",
@@ -22,12 +23,13 @@
     "@types/node": "^18.19.15",
     "@types/node-fetch": "^2.5.7",
     "chai": "^4.3.4",
+    "ethers": "^6.7.1",
     "mocha": "^9.0.2",
     "mocha-steps": "^1.3.0",
     "node-fetch": "^2.6.1",
     "protobufjs": "^7.2.5",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5",
-    "zksync-web3": "^0.15.5"
+    "zksync-ethers": "^6.9.0"
   }
 }
diff --git a/core/tests/recovery-test/src/index.ts b/core/tests/recovery-test/src/index.ts
new file mode 100644
index 000000000000..9e30a6d7831e
--- /dev/null
+++ b/core/tests/recovery-test/src/index.ts
@@ -0,0 +1,261 @@
+/**
+ * Shared utils for recovery tests.
+ */
+
+import fs, { FileHandle } from 'node:fs/promises';
+import fetch, { FetchError } from 'node-fetch';
+import { promisify } from 'node:util';
+import { ChildProcess, exec, spawn } from 'node:child_process';
+import * as zksync from 'zksync-ethers';
+import * as ethers from 'ethers';
+import path from 'node:path';
+import { expect } from 'chai';
+
+export interface Health<T> {
+    readonly status: string;
+    readonly details?: T;
+}
+
+export interface SnapshotRecoveryDetails {
+    readonly snapshot_l1_batch: number;
+    readonly snapshot_l2_block: number;
+    readonly factory_deps_recovered: boolean;
+    readonly tokens_recovered: boolean;
+    readonly storage_logs_chunks_left_to_process: number;
+}
+
+export interface ConsistencyCheckerDetails {
+    readonly first_checked_batch?: number;
+    readonly last_checked_batch?: number;
+}
+
+export interface ReorgDetectorDetails {
+    readonly last_correct_l1_batch?: number;
+    readonly last_correct_l2_block?: number;
+}
+
+export interface TreeDetails {
+    readonly min_l1_batch_number?: number | null;
+    readonly next_l1_batch_number?: number;
+}
+
+export interface DbPrunerDetails {
+    readonly last_soft_pruned_l1_batch?: number;
+    readonly last_hard_pruned_l1_batch?: number;
+}
+
+export interface TreeDataFetcherDetails {
+    readonly last_updated_l1_batch?: number;
+}
+
+export interface HealthCheckResponse {
+    readonly status: string;
+    readonly components: {
+        snapshot_recovery?: Health<SnapshotRecoveryDetails>;
+        consistency_checker?: Health<ConsistencyCheckerDetails>;
+        reorg_detector?: Health<ReorgDetectorDetails>;
+        tree?: Health<TreeDetails>;
+        db_pruner?: Health<DbPrunerDetails>;
+        tree_pruner?: Health<{}>;
+        tree_data_fetcher?: Health<TreeDataFetcherDetails>;
+    };
+}
+
+export async function sleep(millis: number) {
+    await new Promise((resolve) => setTimeout(resolve, millis));
+}
+
+export async function getExternalNodeHealth() {
+    const EXTERNAL_NODE_HEALTH_URL = 'http://127.0.0.1:3081/health';
+
+    try {
+        const response: HealthCheckResponse = await fetch(EXTERNAL_NODE_HEALTH_URL).then((response) => response.json());
+        return response;
+    } catch (e) {
+        let displayedError = e;
+        if (e instanceof FetchError && e.code === 'ECONNREFUSED') {
+            displayedError = '(connection refused)'; // Don't spam logs with "connection refused" messages
+        }
+        console.log(
+            `Request to EN health check server failed: ${displayedError}. In CI, you can see more details ` +
+                'in "Show * logs" steps'
+        );
+        return null;
+    }
+}
+
+export async function dropNodeDatabase(env: { [key: string]: string }) {
+    await executeNodeCommand(env, 'zk db reset');
+}
+
+export async function dropNodeStorage(env: { [key: string]: string }) {
+    await executeNodeCommand(env, 'zk clean --database');
+}
+
+async function executeNodeCommand(env: { [key: string]: string }, command: string) {
+    const childProcess = spawn(command, {
+        cwd: process.env.ZKSYNC_HOME!!,
+        stdio: 'inherit',
+        shell: true,
+        env
+    });
+    try {
+        await waitForProcess(childProcess, true);
+    } finally {
+        childProcess.kill();
+    }
+}
+
+export async function executeCommandWithLogs(command: string, logsPath: string) {
+    const logs = await fs.open(logsPath, 'w');
+    const childProcess = spawn(command, {
+        cwd: process.env.ZKSYNC_HOME!!,
+        stdio: [null, logs.fd, logs.fd],
+        shell: true
+    });
+    try {
+        await waitForProcess(childProcess, true);
+    } finally {
+        childProcess.kill();
+        await logs.close();
+    }
+}
+
+export enum NodeComponents {
+    STANDARD = 'all',
+    WITH_TREE_FETCHER = 'all,tree_fetcher',
+    WITH_TREE_FETCHER_AND_NO_TREE = 'core,api,tree_fetcher'
+}
+
+function externalNodeArgs(components: NodeComponents = NodeComponents.STANDARD) {
+    const enableConsensus = process.env.ENABLE_CONSENSUS === 'true';
+    const args = ['external-node', '--', `--components=${components}`];
+    if (enableConsensus) {
+        args.push('--enable-consensus');
+    }
+    return args;
+}
+
+export class NodeProcess {
+    static async stopAll(signal: 'INT' | 'KILL' = 'INT') {
+        interface ChildProcessError extends Error {
+            readonly code: number | null;
+        }
+
+        try {
+            await promisify(exec)(`killall -q -${signal} zksync_external_node`);
+        } catch (err) {
+            const typedErr = err as ChildProcessError;
+            if (typedErr.code === 1) {
+                // No matching processes were found; this is fine.
+            } else {
+                throw err;
+            }
+        }
+    }
+
+    static async spawn(
+        env: { [key: string]: string },
+        logsFile: FileHandle | string,
+        components: NodeComponents = NodeComponents.STANDARD
+    ) {
+        const logs = typeof logsFile === 'string' ? await fs.open(logsFile, 'w') : logsFile;
+        const childProcess = spawn('zk', externalNodeArgs(components), {
+            cwd: process.env.ZKSYNC_HOME!!,
+            stdio: [null, logs.fd, logs.fd],
+            shell: true,
+            env
+        });
+        return new NodeProcess(childProcess, logs);
+    }
+
+    private constructor(private childProcess: ChildProcess, readonly logs: FileHandle) {}
+
+    exitCode() {
+        return this.childProcess.exitCode;
+    }
+
+    async stopAndWait(signal: 'INT' | 'KILL' = 'INT') {
+        await NodeProcess.stopAll(signal);
+        await waitForProcess(this.childProcess, signal === 'INT');
+    }
+}
+
+async function waitForProcess(childProcess: ChildProcess, checkExitCode: boolean) {
+    await new Promise((resolve, reject) => {
+        childProcess.on('error', (error) => {
+            reject(error);
+        });
+        childProcess.on('exit', (code) => {
+            if (!checkExitCode || code === 0) {
+                resolve(undefined);
+            } else {
+                reject(new Error(`Process exited with non-zero code: ${code}`));
+            }
+        });
+    });
+}
+
+/**
+ * Funded wallet wrapper that can be used to generate L1 batches.
+ */
+export class FundedWallet {
+    static async create(mainNode: zksync.Provider, eth: ethers.Provider): Promise<FundedWallet> {
+        const testConfigPath = path.join(process.env.ZKSYNC_HOME!, `etc/test_config/constant/eth.json`);
+        const ethTestConfig = JSON.parse(await fs.readFile(testConfigPath, { encoding: 'utf-8' }));
+        const mnemonic = ethers.Mnemonic.fromPhrase(ethTestConfig.test_mnemonic);
+        const walletHD = ethers.HDNodeWallet.fromMnemonic(mnemonic, "m/44'/60'/0'/0/0");
+        const wallet = new zksync.Wallet(walletHD.privateKey, mainNode, eth);
+
+        return new FundedWallet(wallet);
+    }
+
+    private constructor(private readonly wallet: zksync.Wallet) {}
+
+    /** Ensure that this wallet is funded on L2, depositing funds from L1 if necessary. */
+    async ensureIsFunded() {
+        const balance = await this.wallet.getBalance();
+        const minExpectedBalance = ethers.parseEther('0.001');
+        if (balance >= minExpectedBalance) {
+            console.log('Wallet has acceptable balance on L2', balance);
+            return;
+        }
+
+        const l1Balance = await this.wallet.getBalanceL1();
+        expect(l1Balance >= minExpectedBalance, 'L1 balance of funded wallet is too small').to.be.true;
+
+        const baseTokenAddress = await this.wallet.getBaseToken();
+        const isETHBasedChain = baseTokenAddress == zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
+        const depositParams = {
+            token: isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
+            amount: minExpectedBalance,
+            to: this.wallet.address,
+            approveBaseERC20: true,
+            approveERC20: true
+        };
+        console.log('Depositing funds on L2', depositParams);
+        const depositTx = await this.wallet.deposit(depositParams);
+        await depositTx.waitFinalize();
+    }
+
+    /** Generates at least one L1 batch by transfering funds to itself. */
+    async generateL1Batch(): Promise<number> {
+        const transactionResponse = await this.wallet.transfer({
+            to: this.wallet.address,
+            amount: 1,
+            token: zksync.utils.ETH_ADDRESS
+        });
+        console.log('Generated a transaction from funded wallet', transactionResponse);
+        const receipt = await transactionResponse.wait();
+        console.log('Got finalized transaction receipt', receipt);
+
+        // Wait until an L1 batch with the transaction is sealed.
+        const pastL1BatchNumber = await this.wallet.provider.getL1BatchNumber();
+        let newL1BatchNumber: number;
+        while ((newL1BatchNumber = await this.wallet.provider.getL1BatchNumber()) <= pastL1BatchNumber) {
+            await sleep(1000);
+        }
+        console.log(`Sealed L1 batch #${newL1BatchNumber}`);
+        return newL1BatchNumber;
+    }
+}
diff --git a/core/tests/recovery-test/tests/genesis-recovery.test.ts b/core/tests/recovery-test/tests/genesis-recovery.test.ts
new file mode 100644
index 000000000000..8ba9fc2fc79e
--- /dev/null
+++ b/core/tests/recovery-test/tests/genesis-recovery.test.ts
@@ -0,0 +1,240 @@
+import { expect } from 'chai';
+import * as zksync from 'zksync-ethers';
+import { ethers } from 'ethers';
+
+import {
+    NodeProcess,
+    dropNodeDatabase,
+    dropNodeStorage,
+    getExternalNodeHealth,
+    NodeComponents,
+    sleep,
+    FundedWallet
+} from '../src';
+
+/**
+ * Tests recovery of an external node from scratch.
+ *
+ * Assumptions:
+ *
+ * - Main node is run for the duration of the test.
+ * - "Rich wallet" 0x36615Cf349d7F6344891B1e7CA7C72883F5dc049 is funded on L1. This is always true if the environment
+ *   was initialized via `zk init`.
+ * - `ZKSYNC_ENV` variable is not set (checked at the start of the test). For this reason,
+ *   the test doesn't have a `zk` wrapper; it should be launched using `yarn`.
+ */
+describe('genesis recovery', () => {
+    /** Number of L1 batches for the node to process during each phase of the test. */
+    const CATCH_UP_BATCH_COUNT = 3;
+
+    const externalNodeEnvProfile =
+        'ext-node' +
+        (process.env.DEPLOYMENT_MODE === 'Validium' ? '-validium' : '') +
+        (process.env.IN_DOCKER ? '-docker' : '');
+    console.log('Using external node env profile', externalNodeEnvProfile);
+    let externalNodeEnv: { [key: string]: string } = {
+        ...process.env,
+        ZKSYNC_ENV: externalNodeEnvProfile,
+        EN_SNAPSHOTS_RECOVERY_ENABLED: 'false'
+    };
+
+    let mainNode: zksync.Provider;
+    let externalNode: zksync.Provider;
+    let externalNodeProcess: NodeProcess;
+    let externalNodeBatchNumber: number;
+
+    before('prepare environment', async () => {
+        expect(process.env.ZKSYNC_ENV, '`ZKSYNC_ENV` should not be set to allow running both server and EN components')
+            .to.be.undefined;
+        mainNode = new zksync.Provider('http://127.0.0.1:3050');
+        externalNode = new zksync.Provider('http://127.0.0.1:3060');
+        await NodeProcess.stopAll('KILL');
+    });
+
+    let fundedWallet: FundedWallet;
+
+    before('create test wallet', async () => {
+        const ethRpcUrl = process.env.ETH_CLIENT_WEB3_URL ?? 'http://127.0.0.1:8545';
+        console.log(`Using L1 RPC at ${ethRpcUrl}`);
+        const eth = new ethers.JsonRpcProvider(ethRpcUrl);
+        fundedWallet = await FundedWallet.create(mainNode, eth);
+    });
+
+    after(async () => {
+        if (externalNodeProcess) {
+            await externalNodeProcess.stopAndWait('KILL');
+            await externalNodeProcess.logs.close();
+        }
+    });
+
+    step('ensure that wallet has L2 funds', async () => {
+        await fundedWallet.ensureIsFunded();
+    });
+
+    step('generate new batches if necessary', async () => {
+        let pastL1BatchNumber = await mainNode.getL1BatchNumber();
+        while (pastL1BatchNumber < CATCH_UP_BATCH_COUNT) {
+            pastL1BatchNumber = await fundedWallet.generateL1Batch();
+        }
+    });
+
+    step('drop external node database', async () => {
+        await dropNodeDatabase(externalNodeEnv);
+    });
+
+    step('drop external node storage', async () => {
+        await dropNodeStorage(externalNodeEnv);
+    });
+
+    step('initialize external node w/o a tree', async () => {
+        externalNodeProcess = await NodeProcess.spawn(
+            externalNodeEnv,
+            'genesis-recovery.log',
+            NodeComponents.WITH_TREE_FETCHER_AND_NO_TREE
+        );
+
+        const mainNodeBatchNumber = await mainNode.getL1BatchNumber();
+        expect(mainNodeBatchNumber).to.be.greaterThanOrEqual(CATCH_UP_BATCH_COUNT);
+        console.log(`Catching up to L1 batch #${CATCH_UP_BATCH_COUNT}`);
+
+        let reorgDetectorSucceeded = false;
+        let treeFetcherSucceeded = false;
+        let consistencyCheckerSucceeded = false;
+
+        while (!treeFetcherSucceeded || !reorgDetectorSucceeded || !consistencyCheckerSucceeded) {
+            await sleep(1000);
+            const health = await getExternalNodeHealth();
+            if (health === null) {
+                continue;
+            }
+
+            if (!treeFetcherSucceeded) {
+                const status = health.components.tree_data_fetcher?.status;
+                const details = health.components.tree_data_fetcher?.details;
+                if (status === 'ready' && details !== undefined && details.last_updated_l1_batch !== undefined) {
+                    console.log('Received tree health details', details);
+                    treeFetcherSucceeded = details.last_updated_l1_batch >= CATCH_UP_BATCH_COUNT;
+                }
+            }
+
+            if (!reorgDetectorSucceeded) {
+                const status = health.components.reorg_detector?.status;
+                expect(status).to.be.oneOf([undefined, 'not_ready', 'ready']);
+                const details = health.components.reorg_detector?.details;
+                if (status === 'ready' && details !== undefined) {
+                    console.log('Received reorg detector health details', details);
+                    if (details.last_correct_l1_batch !== undefined) {
+                        reorgDetectorSucceeded = details.last_correct_l1_batch >= CATCH_UP_BATCH_COUNT;
+                    }
+                }
+            }
+
+            if (!consistencyCheckerSucceeded) {
+                const status = health.components.consistency_checker?.status;
+                expect(status).to.be.oneOf([undefined, 'not_ready', 'ready']);
+                const details = health.components.consistency_checker?.details;
+                if (status === 'ready' && details !== undefined) {
+                    console.log('Received consistency checker health details', details);
+                    if (details.first_checked_batch !== undefined && details.last_checked_batch !== undefined) {
+                        expect(details.first_checked_batch).to.equal(1);
+                        consistencyCheckerSucceeded = details.last_checked_batch >= CATCH_UP_BATCH_COUNT;
+                    }
+                }
+            }
+        }
+
+        // If `externalNodeProcess` fails early, we'll trip these checks.
+        expect(externalNodeProcess.exitCode()).to.be.null;
+        expect(treeFetcherSucceeded, 'tree fetching failed').to.be.true;
+        expect(reorgDetectorSucceeded, 'reorg detection check failed').to.be.true;
+    });
+
+    step('get EN batch number', async () => {
+        externalNodeBatchNumber = await externalNode.getL1BatchNumber();
+        console.log(`L1 batch number on EN: ${externalNodeBatchNumber}`);
+        expect(externalNodeBatchNumber).to.be.greaterThanOrEqual(CATCH_UP_BATCH_COUNT);
+    });
+
+    step('stop EN', async () => {
+        await externalNodeProcess.stopAndWait();
+    });
+
+    step('generate new batches for 2nd phase if necessary', async () => {
+        let pastL1BatchNumber = await mainNode.getL1BatchNumber();
+        while (pastL1BatchNumber < externalNodeBatchNumber + CATCH_UP_BATCH_COUNT) {
+            pastL1BatchNumber = await fundedWallet.generateL1Batch();
+        }
+    });
+
+    step('restart EN', async () => {
+        externalNodeProcess = await NodeProcess.spawn(
+            externalNodeEnv,
+            externalNodeProcess.logs,
+            NodeComponents.WITH_TREE_FETCHER
+        );
+
+        let isNodeReady = false;
+        while (!isNodeReady) {
+            await sleep(1000);
+            const health = await getExternalNodeHealth();
+            if (health === null) {
+                continue;
+            }
+            console.log('Node health', health);
+            isNodeReady = health.status === 'ready';
+        }
+    });
+
+    step('wait for tree to catch up', async () => {
+        const mainNodeBatchNumber = await mainNode.getL1BatchNumber();
+        expect(mainNodeBatchNumber).to.be.greaterThanOrEqual(externalNodeBatchNumber + CATCH_UP_BATCH_COUNT);
+        const catchUpBatchNumber = Math.min(mainNodeBatchNumber, externalNodeBatchNumber + CATCH_UP_BATCH_COUNT);
+        console.log(`Catching up to L1 batch #${catchUpBatchNumber}`);
+
+        let reorgDetectorSucceeded = false;
+        let treeSucceeded = false;
+        let consistencyCheckerSucceeded = false;
+
+        while (!treeSucceeded || !reorgDetectorSucceeded || !consistencyCheckerSucceeded) {
+            await sleep(1000);
+            const health = await getExternalNodeHealth();
+            if (health === null) {
+                continue;
+            }
+
+            if (!treeSucceeded) {
+                const status = health.components.tree?.status;
+                const details = health.components.tree?.details;
+                if (status === 'ready' && details !== undefined && details.next_l1_batch_number !== undefined) {
+                    console.log('Received tree health details', details);
+                    expect(details.min_l1_batch_number).to.be.equal(0);
+                    treeSucceeded = details.next_l1_batch_number > catchUpBatchNumber;
+                }
+            }
+
+            if (!reorgDetectorSucceeded) {
+                const status = health.components.reorg_detector?.status;
+                expect(status).to.be.oneOf([undefined, 'not_ready', 'ready']);
+                const details = health.components.reorg_detector?.details;
+                if (status === 'ready' && details !== undefined) {
+                    console.log('Received reorg detector health details', details);
+                    if (details.last_correct_l1_batch !== undefined) {
+                        reorgDetectorSucceeded = details.last_correct_l1_batch >= catchUpBatchNumber;
+                    }
+                }
+            }
+
+            if (!consistencyCheckerSucceeded) {
+                const status = health.components.consistency_checker?.status;
+                expect(status).to.be.oneOf([undefined, 'not_ready', 'ready']);
+                const details = health.components.consistency_checker?.details;
+                if (status === 'ready' && details !== undefined) {
+                    console.log('Received consistency checker health details', details);
+                    if (details.first_checked_batch !== undefined && details.last_checked_batch !== undefined) {
+                        consistencyCheckerSucceeded = details.last_checked_batch >= catchUpBatchNumber;
+                    }
+                }
+            }
+        }
+    });
+});
diff --git a/core/tests/snapshot-recovery-test/tests/snapshot-recovery.test.ts b/core/tests/recovery-test/tests/snapshot-recovery.test.ts
similarity index 59%
rename from core/tests/snapshot-recovery-test/tests/snapshot-recovery.test.ts
rename to core/tests/recovery-test/tests/snapshot-recovery.test.ts
index a9bcc3302f0e..f0bd1d83d432 100644
--- a/core/tests/snapshot-recovery-test/tests/snapshot-recovery.test.ts
+++ b/core/tests/recovery-test/tests/snapshot-recovery.test.ts
@@ -1,19 +1,28 @@
 import { expect } from 'chai';
-import fetch, { FetchError } from 'node-fetch';
 import * as protobuf from 'protobufjs';
 import * as zlib from 'zlib';
-import * as zkweb3 from 'zksync-web3';
-import fs, { FileHandle } from 'node:fs/promises';
-import { ChildProcess, spawn, exec } from 'node:child_process';
+import fs from 'node:fs/promises';
 import path from 'node:path';
-import { promisify } from 'node:util';
+import { ethers } from 'ethers';
 import * as zksync from 'zksync-ethers';
 
+import {
+    getExternalNodeHealth,
+    sleep,
+    NodeComponents,
+    NodeProcess,
+    dropNodeDatabase,
+    dropNodeStorage,
+    executeCommandWithLogs,
+    FundedWallet
+} from '../src';
+
 interface AllSnapshotsResponse {
     readonly snapshotsL1BatchNumbers: number[];
 }
 
 interface GetSnapshotResponse {
+    readonly version: number;
     readonly miniblockNumber: number;
     readonly l1BatchNumber: number;
     readonly storageLogsChunks: Array<StorageLogChunkMetadata>;
@@ -40,55 +49,14 @@ interface TokenInfo {
     readonly l2_address: string;
 }
 
-interface Health<T> {
-    readonly status: string;
-    readonly details?: T;
-}
-
-interface SnapshotRecoveryDetails {
-    readonly snapshot_l1_batch: number;
-    readonly snapshot_l2_block: number;
-    readonly factory_deps_recovered: boolean;
-    readonly tokens_recovered: boolean;
-    readonly storage_logs_chunks_left_to_process: number;
-}
-
-interface ConsistencyCheckerDetails {
-    readonly first_checked_batch?: number;
-    readonly last_checked_batch?: number;
-}
-
-interface ReorgDetectorDetails {
-    readonly last_correct_l1_batch?: number;
-    readonly last_correct_l2_block?: number;
-}
-
-interface TreeDetails {
-    readonly min_l1_batch_number?: number | null;
-}
-
-interface DbPrunerDetails {
-    readonly last_soft_pruned_l1_batch?: number;
-    readonly last_hard_pruned_l1_batch?: number;
-}
-
-interface HealthCheckResponse {
-    readonly components: {
-        snapshot_recovery?: Health<SnapshotRecoveryDetails>;
-        consistency_checker?: Health<ConsistencyCheckerDetails>;
-        reorg_detector?: Health<ReorgDetectorDetails>;
-        tree?: Health<TreeDetails>;
-        db_pruner?: Health<DbPrunerDetails>;
-        tree_pruner?: Health<{}>;
-    };
-}
-
 /**
  * Tests snapshot recovery and node state pruning.
  *
  * Assumptions:
  *
  * - Main node is run for the duration of the test.
+ * - "Rich wallet" 0x36615Cf349d7F6344891B1e7CA7C72883F5dc049 is funded on L1. This is always true if the environment
+ *   was initialized via `zk init`.
  * - `ZKSYNC_ENV` variable is not set (checked at the start of the test). For this reason,
  *   the test doesn't have a `zk` wrapper; it should be launched using `yarn`.
  */
@@ -99,6 +67,9 @@ describe('snapshot recovery', () => {
 
     const homeDir = process.env.ZKSYNC_HOME!!;
 
+    const disableTreeDuringPruning = process.env.DISABLE_TREE_DURING_PRUNING === 'true';
+    console.log(`Tree is ${disableTreeDuringPruning ? 'disabled' : 'enabled'} during pruning`);
+
     const externalNodeEnvProfile =
         'ext-node' +
         (process.env.DEPLOYMENT_MODE === 'Validium' ? '-validium' : '') +
@@ -107,37 +78,37 @@ describe('snapshot recovery', () => {
     let externalNodeEnv: { [key: string]: string } = {
         ...process.env,
         ZKSYNC_ENV: externalNodeEnvProfile,
-        EN_SNAPSHOTS_RECOVERY_ENABLED: 'true'
+        EN_SNAPSHOTS_RECOVERY_ENABLED: 'true',
+        // Test parallel persistence for tree recovery, which is (yet) not enabled by default
+        EN_EXPERIMENTAL_SNAPSHOTS_RECOVERY_TREE_PARALLEL_PERSISTENCE_BUFFER: '4'
     };
 
     let snapshotMetadata: GetSnapshotResponse;
-    let mainNode: zkweb3.Provider;
-    let externalNode: zkweb3.Provider;
-    let externalNodeLogs: FileHandle;
-    let externalNodeProcess: ChildProcess;
+    let mainNode: zksync.Provider;
+    let externalNode: zksync.Provider;
+    let externalNodeProcess: NodeProcess;
 
-    let fundedWallet: zkweb3.Wallet;
+    let fundedWallet: FundedWallet;
 
     before('prepare environment', async () => {
         expect(process.env.ZKSYNC_ENV, '`ZKSYNC_ENV` should not be set to allow running both server and EN components')
             .to.be.undefined;
-        mainNode = new zkweb3.Provider('http://127.0.0.1:3050');
-        externalNode = new zkweb3.Provider('http://127.0.0.1:3060');
-        await killExternalNode();
+        mainNode = new zksync.Provider('http://127.0.0.1:3050');
+        externalNode = new zksync.Provider('http://127.0.0.1:3060');
+        await NodeProcess.stopAll('KILL');
     });
 
     before('create test wallet', async () => {
-        const testConfigPath = path.join(process.env.ZKSYNC_HOME!, `etc/test_config/constant/eth.json`);
-        const ethTestConfig = JSON.parse(await fs.readFile(testConfigPath, { encoding: 'utf-8' }));
-        const mnemonic = ethTestConfig.test_mnemonic as string;
-        fundedWallet = zkweb3.Wallet.fromMnemonic(mnemonic, "m/44'/60'/0'/0/0").connect(mainNode);
+        const ethRpcUrl = process.env.ETH_CLIENT_WEB3_URL ?? 'http://127.0.0.1:8545';
+        console.log(`Using L1 RPC at ${ethRpcUrl}`);
+        const eth = new ethers.JsonRpcProvider(ethRpcUrl);
+        fundedWallet = await FundedWallet.create(mainNode, eth);
     });
 
     after(async () => {
         if (externalNodeProcess) {
-            externalNodeProcess.kill();
-            await killExternalNode();
-            await externalNodeLogs.close();
+            await externalNodeProcess.stopAndWait('KILL');
+            await externalNodeProcess.logs.close();
         }
     });
 
@@ -151,24 +122,13 @@ describe('snapshot recovery', () => {
         return output as GetSnapshotResponse;
     }
 
-    async function getAllTokens(provider: zkweb3.Provider, atBlock?: number) {
+    async function getAllTokens(provider: zksync.Provider, atBlock?: number) {
         const output = await provider.send('en_syncTokens', atBlock ? [atBlock] : []);
         return output as TokenInfo[];
     }
 
     step('create snapshot', async () => {
-        const logs = await fs.open('snapshot-creator.log', 'w');
-        const childProcess = spawn('zk run snapshots-creator', {
-            cwd: homeDir,
-            stdio: [null, logs.fd, logs.fd],
-            shell: true
-        });
-        try {
-            await waitForProcess(childProcess);
-        } finally {
-            childProcess.kill();
-            await logs.close();
-        }
+        await executeCommandWithLogs('zk run snapshots-creator', 'snapshot-creator.log');
     });
 
     step('validate snapshot', async () => {
@@ -179,6 +139,7 @@ describe('snapshot recovery', () => {
         const l1BatchNumber = Math.max(...newBatchNumbers);
         snapshotMetadata = await getSnapshot(l1BatchNumber);
         console.log('Obtained latest snapshot', snapshotMetadata);
+        expect(snapshotMetadata.version).to.be.oneOf([0, 1]);
         const l2BlockNumber = snapshotMetadata.miniblockNumber;
 
         const protoPath = path.join(homeDir, 'core/lib/types/src/proto/mod.proto');
@@ -201,58 +162,35 @@ describe('snapshot recovery', () => {
                 }
                 sampledCount++;
 
-                const snapshotAccountAddress = '0x' + storageLog.accountAddress.toString('hex');
-                const snapshotKey = '0x' + storageLog.storageKey.toString('hex');
-                const snapshotValue = '0x' + storageLog.storageValue.toString('hex');
                 const snapshotL1BatchNumber = storageLog.l1BatchNumberOfInitialWrite;
-                const valueOnBlockchain = await mainNode.getStorageAt(
-                    snapshotAccountAddress,
-                    snapshotKey,
-                    l2BlockNumber
-                );
-                expect(snapshotValue).to.equal(valueOnBlockchain);
                 expect(snapshotL1BatchNumber).to.be.lessThanOrEqual(l1BatchNumber);
+
+                if (snapshotMetadata.version === 0) {
+                    const snapshotAccountAddress = '0x' + storageLog.accountAddress.toString('hex');
+                    const snapshotKey = '0x' + storageLog.storageKey.toString('hex');
+                    const snapshotValue = '0x' + storageLog.storageValue.toString('hex');
+                    const valueOnBlockchain = await mainNode.getStorage(
+                        snapshotAccountAddress,
+                        snapshotKey,
+                        l2BlockNumber
+                    );
+                    expect(snapshotValue).to.equal(valueOnBlockchain);
+                }
             }
             console.log(`Checked random ${sampledCount} logs in the chunk`);
         }
     });
 
     step('drop external node database', async () => {
-        const childProcess = spawn('zk db reset', {
-            cwd: homeDir,
-            stdio: 'inherit',
-            shell: true,
-            env: externalNodeEnv
-        });
-        try {
-            await waitForProcess(childProcess);
-        } finally {
-            childProcess.kill();
-        }
+        await dropNodeDatabase(externalNodeEnv);
     });
 
     step('drop external node storage', async () => {
-        const childProcess = spawn('zk clean --database', {
-            cwd: homeDir,
-            stdio: 'inherit',
-            shell: true,
-            env: externalNodeEnv
-        });
-        try {
-            await waitForProcess(childProcess);
-        } finally {
-            childProcess.kill();
-        }
+        await dropNodeStorage(externalNodeEnv);
     });
 
     step('initialize external node', async () => {
-        externalNodeLogs = await fs.open('snapshot-recovery.log', 'w');
-        externalNodeProcess = spawn('zk', externalNodeArgs(), {
-            cwd: homeDir,
-            stdio: [null, externalNodeLogs.fd, externalNodeLogs.fd],
-            shell: true,
-            env: externalNodeEnv
-        });
+        externalNodeProcess = await NodeProcess.spawn(externalNodeEnv, 'snapshot-recovery.log');
 
         let recoveryFinished = false;
         let consistencyCheckerSucceeded = false;
@@ -315,7 +253,7 @@ describe('snapshot recovery', () => {
         }
 
         // If `externalNodeProcess` fails early, we'll trip these checks.
-        expect(externalNodeProcess.exitCode).to.be.null;
+        expect(externalNodeProcess.exitCode()).to.be.null;
         expect(consistencyCheckerSucceeded, 'consistency check failed').to.be.true;
         expect(reorgDetectorSucceeded, 'reorg detection check failed').to.be.true;
     });
@@ -349,9 +287,11 @@ describe('snapshot recovery', () => {
 
     step('restart EN', async () => {
         console.log('Stopping external node');
-        await stopExternalNode();
-        await waitForProcess(externalNodeProcess);
+        await externalNodeProcess.stopAndWait();
 
+        const components = disableTreeDuringPruning
+            ? NodeComponents.WITH_TREE_FETCHER_AND_NO_TREE
+            : NodeComponents.WITH_TREE_FETCHER;
         const pruningParams = {
             EN_PRUNING_ENABLED: 'true',
             EN_PRUNING_REMOVAL_DELAY_SEC: '1',
@@ -360,16 +300,12 @@ describe('snapshot recovery', () => {
         };
         externalNodeEnv = { ...externalNodeEnv, ...pruningParams };
         console.log('Starting EN with pruning params', pruningParams);
-        externalNodeProcess = spawn('zk', externalNodeArgs(), {
-            cwd: homeDir,
-            stdio: [null, externalNodeLogs.fd, externalNodeLogs.fd],
-            shell: true,
-            env: externalNodeEnv
-        });
+        externalNodeProcess = await NodeProcess.spawn(externalNodeEnv, externalNodeProcess.logs, components);
 
         let isDbPrunerReady = false;
-        let isTreePrunerReady = false;
-        while (!isDbPrunerReady || !isTreePrunerReady) {
+        let isTreePrunerReady = disableTreeDuringPruning; // skip health checks if we don't run the tree
+        let isTreeFetcherReady = false;
+        while (!isDbPrunerReady || !isTreePrunerReady || !isTreeFetcherReady) {
             await sleep(1000);
             const health = await getExternalNodeHealth();
             if (health === null) {
@@ -388,31 +324,21 @@ describe('snapshot recovery', () => {
                 expect(status).to.be.oneOf([undefined, 'not_ready', 'affected', 'ready']);
                 isTreePrunerReady = status === 'ready';
             }
+            if (!isTreeFetcherReady) {
+                console.log('Tree fetcher health', health.components.tree_data_fetcher);
+                const status = health.components.tree_data_fetcher?.status;
+                expect(status).to.be.oneOf([undefined, 'not_ready', 'affected', 'ready']);
+                isTreeFetcherReady = status === 'ready';
+            }
         }
     });
 
     // The logic below works fine if there is other transaction activity on the test network; we still
     // create *at least* `PRUNED_BATCH_COUNT + 1` L1 batches; thus, at least `PRUNED_BATCH_COUNT` of them
     // should be pruned eventually.
-    step(`generate ${PRUNED_BATCH_COUNT + 1} transactions`, async () => {
-        let pastL1BatchNumber = snapshotMetadata.l1BatchNumber;
+    step(`generate ${PRUNED_BATCH_COUNT + 1} L1 batches`, async () => {
         for (let i = 0; i < PRUNED_BATCH_COUNT + 1; i++) {
-            const transactionResponse = await fundedWallet.transfer({
-                to: fundedWallet.address,
-                amount: 1,
-                token: zksync.utils.ETH_ADDRESS
-            });
-            console.log('Generated a transaction from funded wallet', transactionResponse);
-            const receipt = await transactionResponse.wait();
-            console.log('Got finalized transaction receipt', receipt);
-
-            // Wait until an L1 batch number with the transaction is sealed.
-            let newL1BatchNumber: number;
-            while ((newL1BatchNumber = await mainNode.getL1BatchNumber()) <= pastL1BatchNumber) {
-                await sleep(1000);
-            }
-            console.log(`Sealed L1 batch #${newL1BatchNumber}`);
-            pastL1BatchNumber = newL1BatchNumber;
+            await fundedWallet.generateL1Batch();
         }
     });
 
@@ -420,7 +346,7 @@ describe('snapshot recovery', () => {
         const expectedPrunedBatchNumber = snapshotMetadata.l1BatchNumber + PRUNED_BATCH_COUNT;
         console.log(`Waiting for L1 batch #${expectedPrunedBatchNumber} to be pruned`);
         let isDbPruned = false;
-        let isTreePruned = false;
+        let isTreePruned = disableTreeDuringPruning;
 
         while (!isDbPruned || !isTreePruned) {
             await sleep(1000);
@@ -431,30 +357,19 @@ describe('snapshot recovery', () => {
             expect(dbPrunerHealth.status).to.be.equal('ready');
             isDbPruned = dbPrunerHealth.details!.last_hard_pruned_l1_batch! >= expectedPrunedBatchNumber;
 
-            const treeHealth = health.components.tree!;
-            console.log('Tree health', treeHealth);
-            expect(treeHealth.status).to.be.equal('ready');
-            const minTreeL1BatchNumber = treeHealth.details?.min_l1_batch_number;
-            // The batch number pruned from the tree is one less than `minTreeL1BatchNumber`.
-            isTreePruned = minTreeL1BatchNumber ? minTreeL1BatchNumber - 1 >= expectedPrunedBatchNumber : false;
-        }
-    });
-});
-
-async function waitForProcess(childProcess: ChildProcess) {
-    await new Promise((resolve, reject) => {
-        childProcess.on('error', (error) => {
-            reject(error);
-        });
-        childProcess.on('exit', (code) => {
-            if (code === 0) {
-                resolve(undefined);
+            if (disableTreeDuringPruning) {
+                expect(health.components.tree).to.be.undefined;
             } else {
-                reject(new Error(`Process exited with non-zero code: ${code}`));
+                const treeHealth = health.components.tree!;
+                console.log('Tree health', treeHealth);
+                expect(treeHealth.status).to.be.equal('ready');
+                const minTreeL1BatchNumber = treeHealth.details?.min_l1_batch_number;
+                // The batch number pruned from the tree is one less than `minTreeL1BatchNumber`.
+                isTreePruned = minTreeL1BatchNumber ? minTreeL1BatchNumber - 1 >= expectedPrunedBatchNumber : false;
             }
-        });
+        }
     });
-}
+});
 
 async function decompressGzip(filePath: string): Promise<Buffer> {
     const readStream = (await fs.open(filePath)).createReadStream();
@@ -468,69 +383,3 @@ async function decompressGzip(filePath: string): Promise<Buffer> {
         readStream.pipe(gunzip);
     });
 }
-
-async function sleep(millis: number) {
-    await new Promise((resolve) => setTimeout(resolve, millis));
-}
-
-async function getExternalNodeHealth() {
-    const EXTERNAL_NODE_HEALTH_URL = 'http://127.0.0.1:3081/health';
-
-    try {
-        const response: HealthCheckResponse = await fetch(EXTERNAL_NODE_HEALTH_URL).then((response) => response.json());
-        return response;
-    } catch (e) {
-        let displayedError = e;
-        if (e instanceof FetchError && e.code === 'ECONNREFUSED') {
-            displayedError = '(connection refused)'; // Don't spam logs with "connection refused" messages
-        }
-        console.log(
-            `Request to EN health check server failed ${displayedError}, in CI you can see more details 
-            in "Show snapshot-creator.log logs" and "Show contract_verifier.log logs" steps`
-        );
-        return null;
-    }
-}
-
-function externalNodeArgs() {
-    const enableConsensus = process.env.ENABLE_CONSENSUS === 'true';
-    const args = ['external-node', '--'];
-    if (enableConsensus) {
-        args.push('--enable-consensus');
-    }
-    return args;
-}
-
-async function stopExternalNode() {
-    interface ChildProcessError extends Error {
-        readonly code: number | null;
-    }
-
-    try {
-        await promisify(exec)('killall -q -INT zksync_external_node');
-    } catch (err) {
-        const typedErr = err as ChildProcessError;
-        if (typedErr.code === 1) {
-            // No matching processes were found; this is fine.
-        } else {
-            throw err;
-        }
-    }
-}
-
-async function killExternalNode() {
-    interface ChildProcessError extends Error {
-        readonly code: number | null;
-    }
-
-    try {
-        await promisify(exec)('killall -q -KILL zksync_external_node');
-    } catch (err) {
-        const typedErr = err as ChildProcessError;
-        if (typedErr.code === 1) {
-            // No matching processes were found; this is fine.
-        } else {
-            throw err;
-        }
-    }
-}
diff --git a/core/tests/snapshot-recovery-test/tsconfig.json b/core/tests/recovery-test/tsconfig.json
similarity index 84%
rename from core/tests/snapshot-recovery-test/tsconfig.json
rename to core/tests/recovery-test/tsconfig.json
index 6c8907a86016..3de8e1a1c606 100644
--- a/core/tests/snapshot-recovery-test/tsconfig.json
+++ b/core/tests/recovery-test/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es2019",
+        "target": "es2020",
         "module": "commonjs",
         "strict": true,
         "esModuleInterop": true,
diff --git a/core/tests/revert-test/package.json b/core/tests/revert-test/package.json
index 6bf693478ba1..c3be63dff631 100644
--- a/core/tests/revert-test/package.json
+++ b/core/tests/revert-test/package.json
@@ -24,12 +24,12 @@
     "@types/node-fetch": "^2.5.7",
     "chai": "^4.3.4",
     "ethereumjs-abi": "^0.6.8",
-    "ethers": "~5.7.0",
+    "ethers": "^6.7.1",
     "mocha": "^9.0.2",
     "mocha-steps": "^1.3.0",
     "node-fetch": "^2.6.1",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5",
-    "zksync-web3": "^0.15.5"
+    "zksync-ethers": "^6.9.0"
   }
 }
diff --git a/core/tests/revert-test/tests/revert-and-restart-en.test.ts b/core/tests/revert-test/tests/revert-and-restart-en.test.ts
index a74d4f5261d0..ce306134f51f 100644
--- a/core/tests/revert-test/tests/revert-and-restart-en.test.ts
+++ b/core/tests/revert-test/tests/revert-and-restart-en.test.ts
@@ -3,11 +3,10 @@
 // NOTE:
 // main_contract.getTotalBatchesCommitted actually checks the number of batches committed.
 // main_contract.getTotalBatchesExecuted actually checks the number of batches executed.
-// TODO: Migrate from zksync-web3 to zksync-ethers.
-import * as utils from 'zk/build/utils';
+import * as utils from 'utils';
 import { Tester } from './tester';
-import * as zkweb3 from 'zksync-ethers';
-import { BigNumber, ethers } from 'ethers';
+import * as zksync from 'zksync-ethers';
+import * as ethers from 'ethers';
 import { expect, assert } from 'chai';
 import fs from 'fs';
 import * as child_process from 'child_process';
@@ -28,7 +27,7 @@ const mainLogsPath: string = 'revert_main.log';
 const extLogsPath: string = 'revert_ext.log';
 
 interface SuggestedValues {
-    lastExecutedL1BatchNumber: BigNumber;
+    lastExecutedL1BatchNumber: bigint;
     nonce: number;
     priorityFee: number;
 }
@@ -41,7 +40,7 @@ function parseSuggestedValues(jsonString: string): SuggestedValues {
     assert(Number.isInteger(json.nonce));
     assert(Number.isInteger(json.priority_fee));
     return {
-        lastExecutedL1BatchNumber: BigNumber.from(json.last_executed_l1_batch_number),
+        lastExecutedL1BatchNumber: BigInt(json.last_executed_l1_batch_number),
         nonce: json.nonce,
         priorityFee: json.priority_fee
     };
@@ -138,10 +137,11 @@ class MainNode {
         env.DATABASE_MERKLE_TREE_MODE = 'full';
         console.log(`DATABASE_URL = ${env.DATABASE_URL}`);
 
-        let components = 'api,tree,eth,state_keeper,commitment_generator';
+        let components = 'api,tree,eth,state_keeper,commitment_generator,da_dispatcher';
         if (enableConsensus) {
             components += ',consensus';
         }
+
         let proc = spawn('./target/release/zksync_server', ['--components', components], {
             cwd: env.ZKSYNC_HOME,
             stdio: [null, logs, logs],
@@ -151,7 +151,11 @@ class MainNode {
             }
         });
         // Wait until the main node starts responding.
-        let tester: Tester = await Tester.init(env.ETH_CLIENT_WEB3_URL, env.API_WEB3_JSON_RPC_HTTP_URL);
+        let tester: Tester = await Tester.init(
+            env.ETH_CLIENT_WEB3_URL,
+            env.API_WEB3_JSON_RPC_HTTP_URL,
+            env.CONTRACTS_BASE_TOKEN_ADDR
+        );
         while (true) {
             try {
                 await tester.syncWallet.provider.getBlockNumber();
@@ -198,7 +202,11 @@ class ExtNode {
             }
         });
         // Wait until the node starts responding.
-        let tester: Tester = await Tester.init(env.EN_ETH_CLIENT_URL, `http://127.0.0.1:${env.EN_HTTP_PORT}`);
+        let tester: Tester = await Tester.init(
+            env.EN_ETH_CLIENT_URL,
+            `http://127.0.0.1:${env.EN_HTTP_PORT}`,
+            env.CONTRACTS_BASE_TOKEN_ADDR
+        );
         while (true) {
             try {
                 await tester.syncWallet.provider.getBlockNumber();
@@ -232,7 +240,7 @@ describe('Block reverting test', function () {
     const extLogs: fs.WriteStream = fs.createWriteStream(extLogsPath, { flags: 'a' });
     const enableConsensus = process.env.ENABLE_CONSENSUS === 'true';
     console.log(`enableConsensus = ${enableConsensus}`);
-    const depositAmount: BigNumber = ethers.utils.parseEther('0.001');
+    const depositAmount = ethers.parseEther('0.001');
 
     step('run', async () => {
         console.log('Make sure that nodes are not running');
@@ -249,14 +257,14 @@ describe('Block reverting test', function () {
 
         const main_contract = await mainNode.tester.syncWallet.getMainContract();
         const baseTokenAddress = await mainNode.tester.syncWallet.getBaseToken();
-        const isETHBasedChain = baseTokenAddress == zkweb3.utils.ETH_ADDRESS_IN_CONTRACTS;
-        const alice: zkweb3.Wallet = extNode.tester.emptyWallet();
+        const isETHBasedChain = baseTokenAddress === zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
+        const alice: zksync.Wallet = extNode.tester.emptyWallet();
 
         console.log(
             'Finalize an L1 transaction to ensure at least 1 executed L1 batch and that all transactions are processed'
         );
-        const h: zkweb3.types.PriorityOpResponse = await extNode.tester.syncWallet.deposit({
-            token: isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
+        const h: zksync.types.PriorityOpResponse = await extNode.tester.syncWallet.deposit({
+            token: isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -269,12 +277,12 @@ describe('Block reverting test', function () {
         mainNode = await MainNode.spawn(mainLogs, enableConsensus, false);
 
         console.log('Commit at least 2 L1 batches which are not executed');
-        const lastExecuted: BigNumber = await main_contract.getTotalBatchesExecuted();
+        const lastExecuted = await main_contract.getTotalBatchesExecuted();
         // One is not enough to test the reversion of sk cache because
         // it gets updated with some batch logs only at the start of the next batch.
-        const initialL1BatchNumber = (await main_contract.getTotalBatchesCommitted()).toNumber();
+        const initialL1BatchNumber = await main_contract.getTotalBatchesCommitted();
         const firstDepositHandle = await extNode.tester.syncWallet.deposit({
-            token: isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
+            token: isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -287,21 +295,21 @@ describe('Block reverting test', function () {
         }
 
         const secondDepositHandle = await extNode.tester.syncWallet.deposit({
-            token: isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
+            token: isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
             approveERC20: true
         });
         await secondDepositHandle.wait();
-        while ((await extNode.tester.web3Provider.getL1BatchNumber()) <= initialL1BatchNumber + 1) {
+        while ((await extNode.tester.web3Provider.getL1BatchNumber()) <= initialL1BatchNumber + 1n) {
             await utils.sleep(0.3);
         }
 
         while (true) {
-            const lastCommitted: BigNumber = await main_contract.getTotalBatchesCommitted();
+            const lastCommitted = await main_contract.getTotalBatchesCommitted();
             console.log(`lastExecuted = ${lastExecuted}, lastCommitted = ${lastCommitted}`);
-            if (lastCommitted.sub(lastExecuted).gte(2)) {
+            if (lastCommitted - lastExecuted >= 2n) {
                 break;
             }
             await utils.sleep(0.3);
@@ -319,7 +327,7 @@ describe('Block reverting test', function () {
         ]);
         console.log(`values = ${values_json}`);
         const values = parseSuggestedValues(values_json);
-        assert(lastExecuted.eq(values.lastExecutedL1BatchNumber));
+        assert(lastExecuted === values.lastExecutedL1BatchNumber);
 
         console.log('Send reverting transaction to L1');
         runBlockReverter([
@@ -335,7 +343,7 @@ describe('Block reverting test', function () {
         console.log('Check that batches are reverted on L1');
         const lastCommitted2 = await main_contract.getTotalBatchesCommitted();
         console.log(`lastCommitted = ${lastCommitted2}, want ${lastExecuted}`);
-        assert(lastCommitted2.eq(lastExecuted));
+        assert(lastCommitted2 === lastExecuted);
 
         console.log('Rollback db');
         runBlockReverter([
@@ -358,7 +366,7 @@ describe('Block reverting test', function () {
 
         console.log('Execute an L1 transaction');
         const depositHandle = await extNode.tester.syncWallet.deposit({
-            token: isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
+            token: isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -390,13 +398,13 @@ describe('Block reverting test', function () {
 
         // The reverted transactions are expected to be reexecuted before the next transaction is applied.
         // Hence we compare the state against the alice2, rather than against alice3.
-        const alice4want = alice2.add(BigNumber.from(depositAmount));
+        const alice4want = alice2 + depositAmount;
         const alice4 = await alice.getBalance();
         console.log(`Alice's balance is ${alice4}, want ${alice4want}`);
-        assert(alice4.eq(alice4want));
+        assert(alice4 === alice4want);
 
         console.log('Execute an L2 transaction');
-        await checkedRandomTransfer(alice, BigNumber.from(1));
+        await checkedRandomTransfer(alice, 1n);
     });
 
     after('Terminate nodes', async () => {
@@ -406,10 +414,10 @@ describe('Block reverting test', function () {
 });
 
 // Transfers amount from sender to a random wallet in an L2 transaction.
-async function checkedRandomTransfer(sender: zkweb3.Wallet, amount: BigNumber) {
+async function checkedRandomTransfer(sender: zksync.Wallet, amount: bigint) {
     const senderBalanceBefore = await sender.getBalance();
-    const receiver = zkweb3.Wallet.createRandom().connect(sender.provider);
-    const transferHandle = await sender.sendTransaction({ to: receiver.address, value: amount });
+    const receiver = zksync.Wallet.createRandom().connect(sender.provider);
+    const transferHandle = await sender.sendTransaction({ to: receiver.address, value: amount, type: 0 });
 
     // ethers doesn't work well with block reversions, so we poll for the receipt manually.
     let txReceipt = null;
@@ -419,11 +427,10 @@ async function checkedRandomTransfer(sender: zkweb3.Wallet, amount: BigNumber) {
     } while (txReceipt === null);
 
     const senderBalance = await sender.getBalance();
-    const receiverBalance = await receiver.getBalance();
+    const receiverBalance = await receiver.provider!.getBalance(receiver.address);
 
-    expect(receiverBalance.eq(amount), 'Failed updated the balance of the receiver').to.be.true;
+    expect(receiverBalance === amount, 'Failed updated the balance of the receiver').to.be.true;
 
-    const spentAmount = txReceipt.gasUsed.mul(transferHandle.gasPrice!).add(amount);
-    expect(senderBalance.add(spentAmount).gte(senderBalanceBefore), 'Failed to update the balance of the sender').to.be
-        .true;
+    const spentAmount = txReceipt.gasUsed * transferHandle.gasPrice! + amount;
+    expect(senderBalance + spentAmount >= senderBalanceBefore, 'Failed to update the balance of the sender').to.be.true;
 }
diff --git a/core/tests/revert-test/tests/revert-and-restart.test.ts b/core/tests/revert-test/tests/revert-and-restart.test.ts
index 7c747afc9148..25ed90ea72eb 100644
--- a/core/tests/revert-test/tests/revert-and-restart.test.ts
+++ b/core/tests/revert-test/tests/revert-and-restart.test.ts
@@ -1,12 +1,20 @@
-import * as utils from 'zk/build/utils';
+import * as utils from 'utils';
+import { loadConfig, shouldLoadConfigFromFile, getAllConfigsPath } from 'utils/build/file-configs';
+import { runServerInBackground } from 'utils/build/server';
 import { Tester } from './tester';
-import * as zkweb3 from 'zksync-ethers';
-import { BigNumber, Contract, ethers } from 'ethers';
+import * as zksync from 'zksync-ethers';
+import * as ethers from 'ethers';
 import { expect } from 'chai';
 import fs from 'fs';
+import { IZkSyncHyperchain } from 'zksync-ethers/build/typechain';
+import path from 'path';
 
 // Parses output of "print-suggested-values" command of the revert block tool.
-function parseSuggestedValues(suggestedValuesString: string) {
+function parseSuggestedValues(suggestedValuesString: string): {
+    lastL1BatchNumber: bigint;
+    nonce: bigint;
+    priorityFee: bigint;
+} {
     const json = JSON.parse(suggestedValuesString);
     if (!json || typeof json !== 'object') {
         throw new TypeError('suggested values are not an object');
@@ -25,7 +33,11 @@ function parseSuggestedValues(suggestedValuesString: string) {
         throw new TypeError('suggested `priorityFee` is not an integer');
     }
 
-    return { lastL1BatchNumber, nonce, priorityFee };
+    return {
+        lastL1BatchNumber: BigInt(lastL1BatchNumber),
+        nonce: BigInt(nonce),
+        priorityFee: BigInt(priorityFee)
+    };
 }
 
 async function killServerAndWaitForShutdown(tester: Tester) {
@@ -51,27 +63,67 @@ function ignoreError(_err: any, context?: string) {
     console.info(message);
 }
 
-const depositAmount = ethers.utils.parseEther('0.001');
+const depositAmount = ethers.parseEther('0.001');
 
 describe('Block reverting test', function () {
     let tester: Tester;
-    let alice: zkweb3.Wallet;
-    let mainContract: Contract;
-    let blocksCommittedBeforeRevert: number;
+    let alice: zksync.Wallet;
+    let mainContract: IZkSyncHyperchain;
+    let blocksCommittedBeforeRevert: bigint;
     let logs: fs.WriteStream;
-    let operatorAddress = process.env.ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR;
+    let operatorAddress: string;
+    let ethClientWeb3Url: string;
+    let apiWeb3JsonRpcHttpUrl: string;
 
-    let enable_consensus = process.env.ENABLE_CONSENSUS == 'true';
-    let components = 'api,tree,eth,state_keeper,commitment_generator';
-    if (enable_consensus) {
+    const fileConfig = shouldLoadConfigFromFile();
+
+    const pathToHome = path.join(__dirname, '../../../..');
+
+    const enableConsensus = process.env.ENABLE_CONSENSUS == 'true';
+    let components = 'api,tree,eth,state_keeper,commitment_generator,da_dispatcher';
+    if (enableConsensus) {
         components += ',consensus';
     }
 
-    before('create test wallet', async () => {
-        tester = await Tester.init(
-            process.env.ETH_CLIENT_WEB3_URL as string,
-            process.env.API_WEB3_JSON_RPC_HTTP_URL as string
-        );
+    before('initialize test', async () => {
+        // Clone file configs if necessary
+        let baseTokenAddress: string;
+
+        if (!fileConfig.loadFromFile) {
+            operatorAddress = process.env.ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR!;
+            ethClientWeb3Url = process.env.ETH_CLIENT_WEB3_URL!;
+            apiWeb3JsonRpcHttpUrl = process.env.API_WEB3_JSON_RPC_HTTP_URL!;
+            baseTokenAddress = process.env.CONTRACTS_BASE_TOKEN_ADDR!;
+        } else {
+            const generalConfig = loadConfig({
+                pathToHome,
+                chain: fileConfig.chain,
+                config: 'general.yaml'
+            });
+            const secretsConfig = loadConfig({
+                pathToHome,
+                chain: fileConfig.chain,
+                config: 'secrets.yaml'
+            });
+            const walletsConfig = loadConfig({
+                pathToHome,
+                chain: fileConfig.chain,
+                config: 'wallets.yaml'
+            });
+            const contractsConfig = loadConfig({
+                pathToHome,
+                chain: fileConfig.chain,
+                config: 'contracts.yaml'
+            });
+
+            operatorAddress = walletsConfig.operator.address;
+            ethClientWeb3Url = secretsConfig.l1.l1_rpc_url;
+            apiWeb3JsonRpcHttpUrl = generalConfig.api.web3_json_rpc.http_url;
+            baseTokenAddress = contractsConfig.l1.base_token_addr;
+        }
+
+        // Create test wallets
+        tester = await Tester.init(ethClientWeb3Url, apiWeb3JsonRpcHttpUrl, baseTokenAddress);
         alice = tester.emptyWallet();
         logs = fs.createWriteStream('revert.log', { flags: 'a' });
     });
@@ -80,14 +132,14 @@ describe('Block reverting test', function () {
         // Make sure server isn't running.
         await killServerAndWaitForShutdown(tester).catch(ignoreError);
 
-        // Set 1000 seconds deadline for `ExecuteBlocks` operation.
-        process.env.ETH_SENDER_SENDER_AGGREGATED_BLOCK_EXECUTE_DEADLINE = '1000';
-        // Set full mode for the Merkle tree as it is required to get blocks committed.
-        process.env.DATABASE_MERKLE_TREE_MODE = 'full';
-
         // Run server in background.
+        runServerInBackground({
+            components: [components],
+            stdio: [null, logs, logs],
+            cwd: pathToHome,
+            useZkInception: fileConfig.loadFromFile
+        });
 
-        utils.background(`zk server --components ${components}`, [null, logs, logs]);
         // Server may need some time to recompile if it's a cold run, so wait for it.
         let iter = 0;
         while (iter < 30 && !mainContract) {
@@ -110,7 +162,7 @@ describe('Block reverting test', function () {
         // it gets updated with some batch logs only at the start of the next batch.
         const initialL1BatchNumber = await tester.web3Provider.getL1BatchNumber();
         const firstDepositHandle = await tester.syncWallet.deposit({
-            token: tester.isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
+            token: tester.isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -121,7 +173,7 @@ describe('Block reverting test', function () {
             await utils.sleep(1);
         }
         const secondDepositHandle = await tester.syncWallet.deposit({
-            token: tester.isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
+            token: tester.isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -133,19 +185,19 @@ describe('Block reverting test', function () {
         }
 
         const balance = await alice.getBalance();
-        expect(balance.eq(depositAmount.mul(2)), 'Incorrect balance after deposits').to.be.true;
+        expect(balance === depositAmount * 2n, 'Incorrect balance after deposits').to.be.true;
 
         // Check L1 committed and executed blocks.
         let blocksCommitted = await mainContract.getTotalBatchesCommitted();
         let blocksExecuted = await mainContract.getTotalBatchesExecuted();
         let tryCount = 0;
-        while (blocksCommitted.eq(blocksExecuted) && tryCount < 100) {
+        while (blocksCommitted === blocksExecuted && tryCount < 100) {
             blocksCommitted = await mainContract.getTotalBatchesCommitted();
             blocksExecuted = await mainContract.getTotalBatchesExecuted();
             tryCount += 1;
             await utils.sleep(1);
         }
-        expect(blocksCommitted.gt(blocksExecuted), 'There is no committed but not executed block').to.be.true;
+        expect(blocksCommitted > blocksExecuted, 'There is no committed but not executed block').to.be.true;
         blocksCommittedBeforeRevert = blocksCommitted;
 
         // Stop server.
@@ -153,9 +205,20 @@ describe('Block reverting test', function () {
     });
 
     step('revert blocks', async () => {
+        let fileConfigFlags = '';
+        if (fileConfig.loadFromFile) {
+            const configPaths = getAllConfigsPath({ pathToHome, chain: fileConfig.chain });
+            fileConfigFlags = `
+                --config-path=${configPaths['general.yaml']}
+                --contracts-config-path=${configPaths['contracts.yaml']}
+                --secrets-path=${configPaths['secrets.yaml']}
+                --wallets-path=${configPaths['wallets.yaml']}
+                --genesis-path=${configPaths['genesis.yaml']}
+            `;
+        }
+
         const executedProcess = await utils.exec(
-            'cd $ZKSYNC_HOME && ' +
-                `RUST_LOG=off cargo run --bin block_reverter --release -- print-suggested-values --json --operator-address ${operatorAddress}`
+            `cd ${pathToHome} && RUST_LOG=off cargo run --bin block_reverter --release -- print-suggested-values --json --operator-address ${operatorAddress} ${fileConfigFlags}`
             // ^ Switch off logs to not pollute the output JSON
         );
         const suggestedValuesOutput = executedProcess.stdout;
@@ -169,32 +232,34 @@ describe('Block reverting test', function () {
 
         console.log('Sending ETH transaction..');
         await utils.spawn(
-            `cd $ZKSYNC_HOME && cargo run --bin block_reverter --release -- send-eth-transaction --l1-batch-number ${lastL1BatchNumber} --nonce ${nonce} --priority-fee-per-gas ${priorityFee}`
+            `cd ${pathToHome} && cargo run --bin block_reverter --release -- send-eth-transaction --l1-batch-number ${lastL1BatchNumber} --nonce ${nonce} --priority-fee-per-gas ${priorityFee} ${fileConfigFlags}`
         );
 
         console.log('Rolling back DB..');
         await utils.spawn(
-            `cd $ZKSYNC_HOME && cargo run --bin block_reverter --release -- rollback-db --l1-batch-number ${lastL1BatchNumber} --rollback-postgres --rollback-tree --rollback-sk-cache`
+            `cd ${pathToHome} && cargo run --bin block_reverter --release -- rollback-db --l1-batch-number ${lastL1BatchNumber} --rollback-postgres --rollback-tree --rollback-sk-cache ${fileConfigFlags}`
         );
 
         let blocksCommitted = await mainContract.getTotalBatchesCommitted();
-        expect(blocksCommitted.eq(lastL1BatchNumber), 'Revert on contract was unsuccessful').to.be.true;
+        expect(blocksCommitted === lastL1BatchNumber, 'Revert on contract was unsuccessful').to.be.true;
     });
 
     step('execute transaction after revert', async () => {
-        // Set 1 second deadline for `ExecuteBlocks` operation.
-        process.env.ETH_SENDER_SENDER_AGGREGATED_BLOCK_EXECUTE_DEADLINE = '1';
-
         // Run server.
-        utils.background(`zk server --components ${components}`, [null, logs, logs]);
-        await utils.sleep(10);
+        runServerInBackground({
+            components: [components],
+            stdio: [null, logs, logs],
+            cwd: pathToHome,
+            useZkInception: fileConfig.loadFromFile
+        });
+        await utils.sleep(30);
 
         const balanceBefore = await alice.getBalance();
-        expect(balanceBefore.eq(depositAmount.mul(2)), 'Incorrect balance after revert').to.be.true;
+        expect(balanceBefore === depositAmount * 2n, 'Incorrect balance after revert').to.be.true;
 
         // Execute a transaction
         const depositHandle = await tester.syncWallet.deposit({
-            token: tester.isETHBasedChain ? zkweb3.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
+            token: tester.isETHBasedChain ? zksync.utils.LEGACY_ETH_ADDRESS : tester.baseTokenAddress,
             amount: depositAmount,
             to: alice.address,
             approveBaseERC20: true,
@@ -220,23 +285,27 @@ describe('Block reverting test', function () {
         expect(receipt.status).to.be.eql(1);
 
         const balanceAfter = await alice.getBalance();
-        expect(balanceAfter.eq(BigNumber.from(depositAmount).mul(3)), 'Incorrect balance after another deposit').to.be
-            .true;
+        expect(balanceAfter === depositAmount * 3n, 'Incorrect balance after another deposit').to.be.true;
     });
 
     step('execute transactions after simple restart', async () => {
         // Execute an L2 transaction
-        await checkedRandomTransfer(alice, BigNumber.from(1));
+        await checkedRandomTransfer(alice, 1n);
 
         // Stop server.
         await killServerAndWaitForShutdown(tester);
 
         // Run again.
-        utils.background(`zk server --components=${components}`, [null, logs, logs]);
-        await utils.sleep(10);
+        runServerInBackground({
+            components: [components],
+            stdio: [null, logs, logs],
+            cwd: pathToHome,
+            useZkInception: fileConfig.loadFromFile
+        });
+        await utils.sleep(30);
 
         // Trying to send a transaction from the same address again
-        await checkedRandomTransfer(alice, BigNumber.from(1));
+        await checkedRandomTransfer(alice, 1n);
     });
 
     after('Try killing server', async () => {
@@ -244,12 +313,14 @@ describe('Block reverting test', function () {
     });
 });
 
-async function checkedRandomTransfer(sender: zkweb3.Wallet, amount: BigNumber) {
+async function checkedRandomTransfer(sender: zksync.Wallet, amount: bigint) {
     const senderBalanceBefore = await sender.getBalance();
-    const receiver = zkweb3.Wallet.createRandom().connect(sender.provider);
+    const receiverHD = zksync.Wallet.createRandom();
+    const receiver = new zksync.Wallet(receiverHD.privateKey, sender.provider);
     const transferHandle = await sender.sendTransaction({
         to: receiver.address,
-        value: amount
+        value: amount,
+        type: 0
     });
 
     // ethers doesn't work well with block reversions, so we poll for the receipt manually.
@@ -262,9 +333,8 @@ async function checkedRandomTransfer(sender: zkweb3.Wallet, amount: BigNumber) {
     const senderBalance = await sender.getBalance();
     const receiverBalance = await receiver.getBalance();
 
-    expect(receiverBalance.eq(amount), 'Failed updated the balance of the receiver').to.be.true;
+    expect(receiverBalance === amount, 'Failed updated the balance of the receiver').to.be.true;
 
-    const spentAmount = txReceipt.gasUsed.mul(transferHandle.gasPrice!).add(amount);
-    expect(senderBalance.add(spentAmount).gte(senderBalanceBefore), 'Failed to update the balance of the sender').to.be
-        .true;
+    const spentAmount = txReceipt.gasUsed * transferHandle.gasPrice! + amount;
+    expect(senderBalance + spentAmount >= senderBalanceBefore, 'Failed to update the balance of the sender').to.be.true;
 }
diff --git a/core/tests/revert-test/tests/tester.ts b/core/tests/revert-test/tests/tester.ts
index 246af0280aeb..faf7f0949232 100644
--- a/core/tests/revert-test/tests/tester.ts
+++ b/core/tests/revert-test/tests/tester.ts
@@ -1,18 +1,18 @@
 import { expect } from 'chai';
 import * as ethers from 'ethers';
-import * as zkweb3 from 'zksync-ethers';
+import * as zksync from 'zksync-ethers';
 import * as fs from 'fs';
 import * as path from 'path';
 
-const BASE_ERC20_TO_MINT = ethers.utils.parseEther('100');
+const BASE_ERC20_TO_MINT = ethers.parseEther('100');
 
 export class Tester {
-    public runningFee: Map<zkweb3.types.Address, ethers.BigNumber>;
+    public runningFee: Map<zksync.types.Address, bigint>;
     constructor(
-        public ethProvider: ethers.providers.Provider,
+        public ethProvider: ethers.Provider,
         public ethWallet: ethers.Wallet,
-        public syncWallet: zkweb3.Wallet,
-        public web3Provider: zkweb3.Provider,
+        public syncWallet: zksync.Wallet,
+        public web3Provider: zksync.Provider,
         public hyperchainAdmin: ethers.Wallet, // We need to add validator to ValidatorTimelock with admin rights
         public isETHBasedChain: boolean,
         public baseTokenAddress: string
@@ -21,37 +21,39 @@ export class Tester {
     }
 
     // prettier-ignore
-    static async init(l1_rpc_addr: string, l2_rpc_addr: string) : Promise<Tester> {
-        const ethProvider = new ethers.providers.JsonRpcProvider(l1_rpc_addr);
+    static async init(l1_rpc_addr: string, l2_rpc_addr: string, baseTokenAddress: string) : Promise<Tester> {
+        const ethProvider = new ethers.JsonRpcProvider(l1_rpc_addr);
         ethProvider.pollingInterval = 100;
 
         const testConfigPath = path.join(process.env.ZKSYNC_HOME!, `etc/test_config/constant`);
         const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
-        let ethWallet = ethers.Wallet.fromMnemonic(
-            ethTestConfig.test_mnemonic as string,
+        const ethWalletHD = ethers.HDNodeWallet.fromMnemonic(
+            ethers.Mnemonic.fromPhrase(ethTestConfig.test_mnemonic),
             "m/44'/60'/0'/0/0"
-        ).connect(ethProvider);
-        let hyperchainAdmin = ethers.Wallet.fromMnemonic(
-            ethTestConfig.mnemonic as string,
+        );
+        const ethWallet = new ethers.Wallet(ethWalletHD.privateKey, ethProvider);
+        const hyperchainAdminHD = ethers.HDNodeWallet.fromMnemonic(
+            ethers.Mnemonic.fromPhrase(ethTestConfig.mnemonic),
             "m/44'/60'/0'/0/1"
-        ).connect(ethProvider);
-        const web3Provider = new zkweb3.Provider(l2_rpc_addr);
+        );
+        const hyperchainAdmin = new ethers.Wallet(hyperchainAdminHD.privateKey, ethProvider);
+        const web3Provider = new zksync.Provider(l2_rpc_addr);
         web3Provider.pollingInterval = 100; // It's OK to keep it low even on stage.
-        const syncWallet = new zkweb3.Wallet(ethWallet.privateKey, web3Provider, ethProvider);
+        const syncWallet = new zksync.Wallet(ethWallet.privateKey, web3Provider, ethProvider);
 
 
         // Since some tx may be pending on stage, we don't want to get stuck because of it.
         // In order to not get stuck transactions, we manually cancel all the pending txs.
-        const latestNonce = await ethWallet.getTransactionCount('latest');
-        const pendingNonce = await ethWallet.getTransactionCount('pending');
+        const latestNonce = await ethWallet.getNonce('latest');
+        const pendingNonce = await ethWallet.getNonce('pending');
         const cancellationTxs = [];
         for (let nonce = latestNonce; nonce != pendingNonce; nonce++) {
-            // For each transaction to override it, we need to provide greater fee. 
+            // For each transaction to override it, we need to provide greater fee.
             // We would manually provide a value high enough (for a testnet) to be both valid
             // and higher than the previous one. It's OK as we'll only be charged for the bass fee
             // anyways. We will also set the miner's tip to 5 gwei, which is also much higher than the normal one.
-            const maxFeePerGas = ethers.utils.parseEther("0.00000025"); // 250 gwei
-            const maxPriorityFeePerGas = ethers.utils.parseEther("0.000000005"); // 5 gwei
+            const maxFeePerGas = ethers.parseEther("0.00000025"); // 250 gwei
+            const maxPriorityFeePerGas = ethers.parseEther("0.000000005"); // 5 gwei
             cancellationTxs.push(ethWallet.sendTransaction({ to: ethWallet.address, nonce, maxFeePerGas, maxPriorityFeePerGas }).then((tx) => tx.wait()));
         }
         if (cancellationTxs.length > 0) {
@@ -59,8 +61,7 @@ export class Tester {
             console.log(`Canceled ${cancellationTxs.length} pending transactions`);
         }
 
-        const baseTokenAddress = process.env.CONTRACTS_BASE_TOKEN_ADDR!;
-        const isETHBasedChain = baseTokenAddress == zkweb3.utils.ETH_ADDRESS_IN_CONTRACTS;
+        const isETHBasedChain = baseTokenAddress == zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
 
         return new Tester(ethProvider, ethWallet, syncWallet, web3Provider, hyperchainAdmin, isETHBasedChain, baseTokenAddress);
     }
@@ -70,22 +71,19 @@ export class Tester {
     /// L2 RPC is active, but we need the L2 RPC to get the base token address.
     async fundSyncWallet() {
         const baseTokenAddress = await this.syncWallet.provider.getBaseTokenContractAddress();
-        if (!(baseTokenAddress === zkweb3.utils.ETH_ADDRESS_IN_CONTRACTS)) {
+        if (!(baseTokenAddress === zksync.utils.ETH_ADDRESS_IN_CONTRACTS)) {
             const l1Erc20ABI = ['function mint(address to, uint256 amount)'];
             const l1Erc20Contract = new ethers.Contract(baseTokenAddress, l1Erc20ABI, this.ethWallet);
             await (await l1Erc20Contract.mint(this.ethWallet.address, BASE_ERC20_TO_MINT)).wait();
         }
     }
 
-    async fundedWallet(
-        ethAmount: ethers.BigNumberish,
-        l1Token: zkweb3.types.Address,
-        tokenAmount: ethers.BigNumberish
-    ) {
-        const newWallet = zkweb3.Wallet.createRandom().connect(this.web3Provider).connectToL1(this.ethProvider);
+    async fundedWallet(ethAmount: bigint, l1Token: zksync.types.Address, tokenAmount: bigint) {
+        const newWalletHD = zksync.Wallet.createRandom();
+        const newWallet = new zksync.Wallet(newWalletHD.privateKey, this.web3Provider, this.ethProvider);
 
         let ethBalance = await this.syncWallet.getBalanceL1();
-        expect(ethBalance.gt(ethAmount), 'Insufficient eth balance to create funded wallet').to.be.true;
+        expect(ethBalance > ethAmount, 'Insufficient eth balance to create funded wallet').to.be.true;
 
         // To make the wallet capable of requesting priority operations,
         // send ETH to L1.
@@ -99,7 +97,7 @@ export class Tester {
         // Funds the wallet with L1 token.
 
         let tokenBalance = await this.syncWallet.getBalanceL1(l1Token);
-        expect(tokenBalance.gt(tokenAmount), 'Insufficient token balance to create funded wallet').to.be.true;
+        expect(tokenBalance > tokenAmount, 'Insufficient token balance to create funded wallet').to.be.true;
 
         const erc20ABI = ['function transfer(address to, uint256 amount)'];
         const erc20Contract = new ethers.Contract(l1Token, erc20ABI, this.ethWallet);
@@ -111,6 +109,7 @@ export class Tester {
     }
 
     emptyWallet() {
-        return zkweb3.Wallet.createRandom().connect(this.web3Provider).connectToL1(this.ethProvider);
+        const walletHD = zksync.Wallet.createRandom();
+        return new zksync.Wallet(walletHD.privateKey, this.web3Provider, this.ethProvider);
     }
 }
diff --git a/core/tests/revert-test/tsconfig.json b/core/tests/revert-test/tsconfig.json
index 6c8907a86016..3de8e1a1c606 100644
--- a/core/tests/revert-test/tsconfig.json
+++ b/core/tests/revert-test/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es2019",
+        "target": "es2020",
         "module": "commonjs",
         "strict": true,
         "esModuleInterop": true,
diff --git a/core/tests/test_account/Cargo.toml b/core/tests/test_account/Cargo.toml
index 0b2e7aa9340f..6df10edd7dca 100644
--- a/core/tests/test_account/Cargo.toml
+++ b/core/tests/test_account/Cargo.toml
@@ -19,3 +19,4 @@ zksync_contracts.workspace = true
 
 hex.workspace = true
 ethabi.workspace = true
+rand.workspace = true
diff --git a/core/tests/test_account/src/lib.rs b/core/tests/test_account/src/lib.rs
index 37da054f53bf..e259ce209c63 100644
--- a/core/tests/test_account/src/lib.rs
+++ b/core/tests/test_account/src/lib.rs
@@ -8,15 +8,10 @@ use zksync_system_constants::{
     REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE,
 };
 use zksync_types::{
-    api,
-    fee::Fee,
-    l1::{OpProcessingType, PriorityQueueType},
-    l2::L2Tx,
-    utils::deployed_address_create,
-    Address, Execute, ExecuteTransactionCommon, K256PrivateKey, L1TxCommonData, L2ChainId, Nonce,
-    PriorityOpId, Transaction, H256, U256,
+    abi, fee::Fee, l2::L2Tx, utils::deployed_address_create, Address, Execute, K256PrivateKey,
+    L2ChainId, Nonce, Transaction, H256, PRIORITY_OPERATION_L2_TX_TYPE, U256,
 };
-use zksync_utils::bytecode::hash_bytecode;
+use zksync_utils::{address_to_u256, bytecode::hash_bytecode, h256_to_u256};
 
 pub const L1_TEST_GAS_PER_PUBDATA_BYTE: u32 = 800;
 const BASE_FEE: u64 = 2_000_000_000;
@@ -55,6 +50,10 @@ impl Account {
         Self::new(K256PrivateKey::random())
     }
 
+    pub fn random_using(rng: &mut impl rand::Rng) -> Self {
+        Self::new(K256PrivateKey::random_using(rng))
+    }
+
     pub fn get_l2_tx_for_execute(&mut self, execute: Execute, fee: Option<Fee>) -> Transaction {
         let tx = self.get_l2_tx_for_execute_with_nonce(execute, fee, self.nonce);
         self.nonce += 1;
@@ -73,27 +72,22 @@ impl Account {
             value,
             factory_deps,
         } = execute;
-        let mut tx = L2Tx::new_signed(
+        L2Tx::new_signed(
             contract_address,
             calldata,
             nonce,
-            fee.unwrap_or_else(|| self.default_fee()),
+            fee.unwrap_or_else(Self::default_fee),
             value,
             L2ChainId::default(),
             &self.private_key,
             factory_deps,
             Default::default(),
         )
-        .expect("should create a signed execute transaction");
-
-        // Set the real transaction hash, which is necessary for transaction execution in VM to function properly.
-        let tx_request = api::TransactionRequest::from(tx.clone());
-        let tx_hash = tx_request.get_tx_hash(L2ChainId::default()).unwrap();
-        tx.set_input(H256::random().0.to_vec(), tx_hash);
-        tx.into()
+        .expect("should create a signed execute transaction")
+        .into()
     }
 
-    fn default_fee(&self) -> Fee {
+    pub fn default_fee() -> Fee {
         Fee {
             gas_limit: U256::from(2000000000u32),
             max_fee_per_gas: U256::from(BASE_FEE),
@@ -137,7 +131,7 @@ impl Account {
         let execute = Execute {
             contract_address: CONTRACT_DEPLOYER_ADDRESS,
             calldata,
-            factory_deps: Some(factory_deps),
+            factory_deps,
             value: U256::zero(),
         };
 
@@ -159,29 +153,42 @@ impl Account {
     pub fn get_l1_tx(&self, execute: Execute, serial_id: u64) -> Transaction {
         let max_fee_per_gas = U256::from(0u32);
         let gas_limit = U256::from(20_000_000);
-
-        Transaction {
-            common_data: ExecuteTransactionCommon::L1(L1TxCommonData {
-                sender: self.address,
+        let factory_deps = execute.factory_deps;
+        abi::Transaction::L1 {
+            tx: abi::L2CanonicalTransaction {
+                tx_type: PRIORITY_OPERATION_L2_TX_TYPE.into(),
+                from: address_to_u256(&self.address),
+                to: address_to_u256(&execute.contract_address),
                 gas_limit,
-                gas_per_pubdata_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
-                to_mint: gas_limit * max_fee_per_gas + execute.value,
-                serial_id: PriorityOpId(serial_id),
+                gas_per_pubdata_byte_limit: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_BYTE.into(),
                 max_fee_per_gas,
-                canonical_tx_hash: H256::from_low_u64_be(serial_id),
-                deadline_block: 100000,
-                layer_2_tip_fee: Default::default(),
-                op_processing_type: OpProcessingType::Common,
-                priority_queue_type: PriorityQueueType::Deque,
-                eth_hash: H256::random(),
-                eth_block: 1,
-                refund_recipient: self.address,
-                full_fee: Default::default(),
-            }),
-            execute,
-            received_timestamp_ms: 0,
-            raw_bytes: None,
+                max_priority_fee_per_gas: 0.into(),
+                paymaster: 0.into(),
+                nonce: serial_id.into(),
+                value: execute.value,
+                reserved: [
+                    // `to_mint`
+                    gas_limit * max_fee_per_gas + execute.value,
+                    // `refund_recipient`
+                    address_to_u256(&self.address),
+                    0.into(),
+                    0.into(),
+                ],
+                data: execute.calldata,
+                signature: vec![],
+                factory_deps: factory_deps
+                    .iter()
+                    .map(|b| h256_to_u256(hash_bytecode(b)))
+                    .collect(),
+                paymaster_input: vec![],
+                reserved_dynamic: vec![],
+            }
+            .into(),
+            factory_deps,
+            eth_block: 0,
         }
+        .try_into()
+        .unwrap()
     }
 
     pub fn get_test_contract_transaction(
@@ -212,7 +219,7 @@ impl Account {
             contract_address: address,
             calldata,
             value: value.unwrap_or_default(),
-            factory_deps: None,
+            factory_deps: vec![],
         };
         match tx_type {
             TxType::L2 => self.get_l2_tx_for_execute(execute, None),
@@ -231,7 +238,7 @@ impl Account {
             contract_address: address,
             calldata,
             value: U256::zero(),
-            factory_deps: None,
+            factory_deps: vec![],
         };
 
         match tx_type {
diff --git a/core/tests/ts-integration/README.md b/core/tests/ts-integration/README.md
index cb3a1aa5ae7e..93c225066698 100644
--- a/core/tests/ts-integration/README.md
+++ b/core/tests/ts-integration/README.md
@@ -1,6 +1,6 @@
 # NFTF -- New Fancy Test Framework
 
-This folder contains a framework for writing integration tests for zkSync Era, as well as set of integration test
+This folder contains a framework for writing integration tests for ZKsync Era, as well as set of integration test
 suites.
 
 This framework is built atop of [jest](https://jestjs.io/). It is _highly recommended_ to familiarize yourself with its
@@ -23,7 +23,7 @@ prepare the context for tests. Context initialization consists of:
 - Creating personal accounts for each test suite.
 - Providing funds to these accounts.
 
-Basically, during initialization, everything is prepared for writing tests that interact with zkSync.
+Basically, during initialization, everything is prepared for writing tests that interact with ZKsync.
 
 After that, each test suite is ran _in parallel_. Each test suite can claim its own account and be sure that this
 account has funds on it and is not used by any other suite.
diff --git a/core/tests/ts-integration/contracts/README.md b/core/tests/ts-integration/contracts/README.md
index d08f934e8456..532703ad210f 100644
--- a/core/tests/ts-integration/contracts/README.md
+++ b/core/tests/ts-integration/contracts/README.md
@@ -1,4 +1,4 @@
 # Contracts test data
 
 This folder contains data for contracts that are being used for testing to check the correctness of the smart contract
-flow in zkSync.
+flow in ZKsync.
diff --git a/core/tests/ts-integration/contracts/custom-account/SystemContractsCaller.sol b/core/tests/ts-integration/contracts/custom-account/SystemContractsCaller.sol
index 01b7b5198add..c5be4983e377 100644
--- a/core/tests/ts-integration/contracts/custom-account/SystemContractsCaller.sol
+++ b/core/tests/ts-integration/contracts/custom-account/SystemContractsCaller.sol
@@ -6,7 +6,7 @@ import {MSG_VALUE_SIMULATOR_IS_SYSTEM_BIT, MSG_VALUE_SYSTEM_CONTRACT} from "./Co
 import "./Utils.sol";
 
 // Addresses used for the compiler to be replaced with the
-// zkSync-specific opcodes during the compilation.
+// ZKsync-specific opcodes during the compilation.
 // IMPORTANT: these are just compile-time constants and are used
 // only if used in-place by Yul optimizer.
 address constant TO_L1_CALL_ADDRESS = address((1 << 16) - 1);
diff --git a/core/tests/ts-integration/contracts/custom-account/TransactionHelper.sol b/core/tests/ts-integration/contracts/custom-account/TransactionHelper.sol
index 7fc883ed882c..82747b88d358 100644
--- a/core/tests/ts-integration/contracts/custom-account/TransactionHelper.sol
+++ b/core/tests/ts-integration/contracts/custom-account/TransactionHelper.sol
@@ -10,7 +10,7 @@ import "./interfaces/IContractDeployer.sol";
 import {BASE_TOKEN_SYSTEM_CONTRACT, BOOTLOADER_FORMAL_ADDRESS} from "./Constants.sol";
 import "./RLPEncoder.sol";
 
-/// @dev The type id of zkSync's EIP-712-signed transaction.
+/// @dev The type id of ZKsync's EIP-712-signed transaction.
 uint8 constant EIP_712_TX_TYPE = 0x71;
 
 /// @dev The type id of legacy transactions.
@@ -20,7 +20,7 @@ uint8 constant EIP_2930_TX_TYPE = 0x01;
 /// @dev The type id of EIP1559 transactions.
 uint8 constant EIP_1559_TX_TYPE = 0x02;
 
-/// @notice Structure used to represent zkSync transaction.
+/// @notice Structure used to represent ZKsync transaction.
 struct Transaction {
     // The type of the transaction.
     uint256 txType;
@@ -118,7 +118,7 @@ library TransactionHelper {
         }
     }
 
-    /// @notice Encode hash of the zkSync native transaction type.
+    /// @notice Encode hash of the ZKsync native transaction type.
     /// @return keccak256 hash of the EIP-712 encoded representation of transaction
     function _encodeHashEIP712Transaction(Transaction calldata _transaction)
         private
@@ -251,7 +251,7 @@ library TransactionHelper {
         // Hash of EIP2930 transactions is encoded the following way:
         // H(0x01 || RLP(chain_id, nonce, gas_price, gas_limit, destination, amount, data, access_list))
         //
-        // Note, that on zkSync access lists are not supported and should always be empty.
+        // Note, that on ZKsync access lists are not supported and should always be empty.
 
         // Encode all fixed-length params to avoid "stack too deep error"
         bytes memory encodedFixedLengthParams;
@@ -290,7 +290,7 @@ library TransactionHelper {
             // Otherwise the length is not encoded at all.
         }
 
-        // On zkSync, access lists are always zero length (at least for now).
+        // On ZKsync, access lists are always zero length (at least for now).
         bytes memory encodedAccessListLength = RLPEncoder.encodeListLen(0);
 
         bytes memory encodedListLength;
@@ -327,7 +327,7 @@ library TransactionHelper {
         // Hash of EIP1559 transactions is encoded the following way:
         // H(0x02 || RLP(chain_id, nonce, max_priority_fee_per_gas, max_fee_per_gas, gas_limit, destination, amount, data, access_list))
         //
-        // Note, that on zkSync access lists are not supported and should always be empty.
+        // Note, that on ZKsync access lists are not supported and should always be empty.
 
         // Encode all fixed-length params to avoid "stack too deep error"
         bytes memory encodedFixedLengthParams;
@@ -368,7 +368,7 @@ library TransactionHelper {
             // Otherwise the length is not encoded at all.
         }
 
-        // On zkSync, access lists are always zero length (at least for now).
+        // On ZKsync, access lists are always zero length (at least for now).
         bytes memory encodedAccessListLength = RLPEncoder.encodeListLen(0);
 
         bytes memory encodedListLength;
diff --git a/core/tests/ts-integration/contracts/custom-account/Utils.sol b/core/tests/ts-integration/contracts/custom-account/Utils.sol
index da3d4eb60878..e562948942d7 100644
--- a/core/tests/ts-integration/contracts/custom-account/Utils.sol
+++ b/core/tests/ts-integration/contracts/custom-account/Utils.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0;
 
 /**
  * @author Matter Labs
- * @dev Common utilities used in zkSync system contracts
+ * @dev Common utilities used in ZKsync system contracts
  */
 library Utils {
     function safeCastToU128(uint256 _x) internal pure returns (uint128) {
diff --git a/core/tests/ts-integration/contracts/custom-account/interfaces/ISystemContext.sol b/core/tests/ts-integration/contracts/custom-account/interfaces/ISystemContext.sol
new file mode 100644
index 000000000000..6b83f6d6ada4
--- /dev/null
+++ b/core/tests/ts-integration/contracts/custom-account/interfaces/ISystemContext.sol
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+/**
+ * @author Matter Labs
+ * @custom:security-contact security@matterlabs.dev
+ * @notice Contract that stores some of the context variables, that may be either
+ * block-scoped, tx-scoped or system-wide.
+ */
+interface ISystemContext {
+    struct BlockInfo {
+        uint128 timestamp;
+        uint128 number;
+    }
+
+    /// @notice A structure representing the timeline for the upgrade from the batch numbers to the L2 block numbers.
+    /// @dev It will be used for the L1 batch -> L2 block migration in Q3 2023 only.
+    struct VirtualBlockUpgradeInfo {
+        /// @notice In order to maintain consistent results for `blockhash` requests, we'll
+        /// have to remember the number of the batch when the upgrade to the virtual blocks has been done.
+        /// The hashes for virtual blocks before the upgrade are identical to the hashes of the corresponding batches.
+        uint128 virtualBlockStartBatch;
+        /// @notice L2 block when the virtual blocks have caught up with the L2 blocks. Starting from this block,
+        /// all the information returned to users for block.timestamp/number, etc should be the information about the L2 blocks and
+        /// not virtual blocks.
+        uint128 virtualBlockFinishL2Block;
+    }
+
+    function chainId() external view returns (uint256);
+
+    function origin() external view returns (address);
+
+    function gasPrice() external view returns (uint256);
+
+    function blockGasLimit() external view returns (uint256);
+
+    function coinbase() external view returns (address);
+
+    function difficulty() external view returns (uint256);
+
+    function baseFee() external view returns (uint256);
+
+    function txNumberInBlock() external view returns (uint16);
+
+    function getBlockHashEVM(uint256 _block) external view returns (bytes32);
+
+    function getBatchHash(uint256 _batchNumber) external view returns (bytes32 hash);
+
+    function getBlockNumber() external view returns (uint128);
+
+    function getBlockTimestamp() external view returns (uint128);
+
+    function getBatchNumberAndTimestamp() external view returns (uint128 blockNumber, uint128 blockTimestamp);
+
+    function getL2BlockNumberAndTimestamp() external view returns (uint128 blockNumber, uint128 blockTimestamp);
+
+    function gasPerPubdataByte() external view returns (uint256 gasPerPubdataByte);
+
+    function getCurrentPubdataSpent() external view returns (uint256 currentPubdataSpent);
+}
diff --git a/core/tests/ts-integration/contracts/inner-outer/inner.sol b/core/tests/ts-integration/contracts/inner-outer/inner.sol
new file mode 100644
index 000000000000..2d857c9dd63b
--- /dev/null
+++ b/core/tests/ts-integration/contracts/inner-outer/inner.sol
@@ -0,0 +1,9 @@
+pragma solidity ^0.8.0;
+
+contract Inner {
+    uint256 public value;
+
+    constructor(uint256 _value) {
+        value = _value;
+    }
+}
diff --git a/core/tests/ts-integration/contracts/inner-outer/outer.sol b/core/tests/ts-integration/contracts/inner-outer/outer.sol
new file mode 100644
index 000000000000..935fd5a529ed
--- /dev/null
+++ b/core/tests/ts-integration/contracts/inner-outer/outer.sol
@@ -0,0 +1,11 @@
+pragma solidity ^0.8.0;
+
+import "./inner.sol";
+
+contract Outer {
+    Inner public innerContract;
+
+    constructor(uint256 _value) {
+        innerContract = new Inner(_value);
+    }
+}
diff --git a/core/tests/ts-integration/package.json b/core/tests/ts-integration/package.json
index 1cd704855a29..03bd84bb3f48 100644
--- a/core/tests/ts-integration/package.json
+++ b/core/tests/ts-integration/package.json
@@ -13,16 +13,16 @@
     "build-yul": "hardhat run scripts/compile-yul.ts"
   },
   "devDependencies": {
-    "@matterlabs/hardhat-zksync-deploy": "^0.6.5",
-    "@matterlabs/hardhat-zksync-solc": "0.4.2",
-    "@matterlabs/hardhat-zksync-vyper": "^1.0.0",
-    "@nomiclabs/hardhat-vyper": "^3.0.5",
+    "@matterlabs/hardhat-zksync-deploy": "^1.3.0",
+    "@matterlabs/hardhat-zksync-solc": "^1.1.4",
+    "@matterlabs/hardhat-zksync-vyper": "^1.0.8",
+    "@nomiclabs/hardhat-vyper": "^3.0.6",
     "@types/jest": "^29.0.3",
     "@types/node": "^18.19.15",
     "@types/node-fetch": "^2.5.7",
     "chalk": "^4.0.0",
     "ethereumjs-abi": "^0.6.8",
-    "ethers": "~5.7.0",
+    "ethers": "^6.7.1",
     "hardhat": "=2.22.2",
     "jest": "^29.0.3",
     "jest-matcher-utils": "^29.0.3",
@@ -30,7 +30,8 @@
     "ts-jest": "^29.0.1",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5",
-    "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#sb-old-sdk",
-    "elliptic": "^6.5.5"
+    "zksync-ethers": "^6.9.0",
+    "elliptic": "^6.5.5",
+    "yaml": "^2.4.2"
   }
 }
diff --git a/core/tests/ts-integration/scripts/compile-yul.ts b/core/tests/ts-integration/scripts/compile-yul.ts
index bdf253644180..dda65456a6c6 100644
--- a/core/tests/ts-integration/scripts/compile-yul.ts
+++ b/core/tests/ts-integration/scripts/compile-yul.ts
@@ -35,12 +35,18 @@ export function spawn(command: string) {
     });
 }
 
-export async function compile(path: string, files: string[], outputDirName: string | null, type: string) {
+export async function compile(
+    pathToHome: string,
+    path: string,
+    files: string[],
+    outputDirName: string | null,
+    type: string
+) {
     if (!files.length) {
         console.log(`No test files provided in folder ${path}.`);
         return;
     }
-    let paths = preparePaths(path, files, outputDirName);
+    let paths = preparePaths(pathToHome, path, files, outputDirName);
 
     let systemMode = type === 'yul' ? '--system-mode  --optimization 3' : '';
 
@@ -50,23 +56,23 @@ export async function compile(path: string, files: string[], outputDirName: stri
     );
 }
 
-export async function compileFolder(path: string, type: string) {
+export async function compileFolder(pathToHome: string, path: string, type: string) {
     let files: string[] = (await fs.promises.readdir(path)).filter((fn) => fn.endsWith(`.${type}`));
     for (const file of files) {
-        await compile(path, [file], `${file}`, type);
+        await compile(pathToHome, path, [file], `${file}`, type);
     }
 }
 
-function preparePaths(path: string, files: string[], outputDirName: string | null): CompilerPaths {
+function preparePaths(pathToHome: string, path: string, files: string[], outputDirName: string | null): CompilerPaths {
     const filePaths = files
         .map((val, _) => {
             return `sources/${val}`;
         })
         .join(' ');
     const outputDir = outputDirName || files[0];
-    let absolutePathSources = `${process.env.ZKSYNC_HOME}/core/tests/ts-integration/${path}`;
+    let absolutePathSources = `${pathToHome}/core/tests/ts-integration/${path}`;
 
-    let absolutePathArtifacts = `${process.env.ZKSYNC_HOME}/core/tests/ts-integration/${path}/artifacts`;
+    let absolutePathArtifacts = `${pathToHome}/core/tests/ts-integration/${path}/artifacts`;
 
     return new CompilerPaths(filePaths, outputDir, absolutePathSources, absolutePathArtifacts);
 }
@@ -76,6 +82,7 @@ class CompilerPaths {
     public outputDir: string;
     public absolutePathSources: string;
     public absolutePathArtifacts: string;
+
     constructor(filePath: string, outputDir: string, absolutePathSources: string, absolutePathArtifacts: string) {
         this.filePath = filePath;
         this.outputDir = outputDir;
@@ -85,8 +92,9 @@ class CompilerPaths {
 }
 
 async function main() {
-    await compileFolder('contracts/yul', 'yul');
-    await compileFolder('contracts/zkasm', 'zkasm');
+    const pathToHome = path.join(__dirname, '../../../../');
+    await compileFolder(pathToHome, 'contracts/yul', 'yul');
+    await compileFolder(pathToHome, 'contracts/zkasm', 'zkasm');
 }
 
 main()
diff --git a/core/tests/ts-integration/src/context-owner.ts b/core/tests/ts-integration/src/context-owner.ts
index cde9b3bd84ac..634e8c950a69 100644
--- a/core/tests/ts-integration/src/context-owner.ts
+++ b/core/tests/ts-integration/src/context-owner.ts
@@ -15,14 +15,14 @@ import { RetryProvider } from './retry-provider';
 //
 // Please DO NOT change these constants if you don't know why you have to do that. Try to debug the particular issue
 // you face first.
-export const L1_DEFAULT_ETH_PER_ACCOUNT = ethers.utils.parseEther('0.08');
+export const L1_DEFAULT_ETH_PER_ACCOUNT = ethers.parseEther('0.08');
 // Stress tests for L1->L2 transactions on localhost require a lot of upfront payment, but these are skipped during tests on normal environments
-export const L1_EXTENDED_TESTS_ETH_PER_ACCOUNT = ethers.utils.parseEther('0.5');
-export const L2_DEFAULT_ETH_PER_ACCOUNT = ethers.utils.parseEther('0.5');
+export const L1_EXTENDED_TESTS_ETH_PER_ACCOUNT = ethers.parseEther('0.5');
+export const L2_DEFAULT_ETH_PER_ACCOUNT = ethers.parseEther('0.5');
 
 // Stress tests on local host may require a lot of additiomal funds, but these are skipped during tests on normal environments
-export const L2_EXTENDED_TESTS_ETH_PER_ACCOUNT = ethers.utils.parseEther('50');
-export const ERC20_PER_ACCOUNT = ethers.utils.parseEther('10000.0');
+export const L2_EXTENDED_TESTS_ETH_PER_ACCOUNT = ethers.parseEther('50');
+export const ERC20_PER_ACCOUNT = ethers.parseEther('10000.0');
 
 /**
  * This class is responsible for preparing the test environment for all the other test suites.
@@ -56,7 +56,7 @@ export class TestContextOwner {
     private mainEthersWallet: ethers.Wallet;
     private mainSyncWallet: zksync.Wallet;
 
-    private l1Provider: ethers.providers.JsonRpcProvider;
+    private l1Provider: ethers.JsonRpcProvider;
     private l2Provider: zksync.Provider;
 
     private reporter: Reporter = new Reporter();
@@ -67,7 +67,7 @@ export class TestContextOwner {
         this.reporter.message('Using L1 provider: ' + env.l1NodeUrl);
         this.reporter.message('Using L2 provider: ' + env.l2NodeUrl);
 
-        this.l1Provider = new ethers.providers.JsonRpcProvider(env.l1NodeUrl);
+        this.l1Provider = new ethers.JsonRpcProvider(env.l1NodeUrl);
         this.l2Provider = new RetryProvider(
             {
                 url: env.l2NodeUrl,
@@ -132,16 +132,16 @@ export class TestContextOwner {
         // Since some tx may be pending on stage, we don't want to get stuck because of it.
         // In order to not get stuck transactions, we manually cancel all the pending txs.
         const ethWallet = this.mainEthersWallet;
-        const latestNonce = await ethWallet.getTransactionCount('latest');
-        const pendingNonce = await ethWallet.getTransactionCount('pending');
+        const latestNonce = await ethWallet.getNonce('latest');
+        const pendingNonce = await ethWallet.getNonce('pending');
         this.reporter.debug(`Latest nonce is ${latestNonce}, pending nonce is ${pendingNonce}`);
         // For each transaction to override it, we need to provide greater fee.
         // We would manually provide a value high enough (for a testnet) to be both valid
         // and higher than the previous one. It's OK as we'll only be charged for the base fee
         // anyways. We will also set the miner's tip to 5 gwei, which is also much higher than the normal one.
         // Scaled gas price to be used to prevent transactions from being stuck.
-        const maxPriorityFeePerGas = ethers.utils.parseEther('0.000000005'); // 5 gwei
-        const maxFeePerGas = ethers.utils.parseEther('0.00000025'); // 250 gwei
+        const maxPriorityFeePerGas = ethers.parseEther('0.000000005'); // 5 gwei
+        const maxFeePerGas = ethers.parseEther('0.00000025'); // 250 gwei
         this.reporter.debug(`Max nonce is ${latestNonce}, pending nonce is ${pendingNonce}`);
 
         const cancellationTxs = [];
@@ -166,7 +166,7 @@ export class TestContextOwner {
         this.reporter.startAction(`Cancelling allowances transactions`);
         // Since some tx may be pending on stage, we don't want to get stuck because of it.
         // In order to not get stuck transactions, we manually cancel all the pending txs.
-        const chainId = process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!;
+        const chainId = this.env.l2ChainId;
 
         const bridgehub = await this.mainSyncWallet.getBridgehubContract();
         const erc20Bridge = await bridgehub.sharedBridge();
@@ -202,12 +202,13 @@ export class TestContextOwner {
         this.reporter.message(`Found following suites: ${suites.join(', ')}`);
 
         // `+ 1  for the main account (it has to send all these transactions).
-        const accountsAmount = suites.length + 1;
+        const accountsAmount = BigInt(suites.length) + 1n;
 
         const l2ETHAmountToDeposit = await this.ensureBalances(accountsAmount);
-        const l2ERC20AmountToDeposit = ERC20_PER_ACCOUNT.mul(accountsAmount);
+        const l2ERC20AmountToDeposit = ERC20_PER_ACCOUNT * accountsAmount;
         const wallets = this.createTestWallets(suites);
-        const baseTokenAddress = await this.mainSyncWallet.provider.getBaseTokenContractAddress();
+        const bridgehubContract = await this.mainSyncWallet.getBridgehubContract();
+        const baseTokenAddress = await bridgehubContract.baseToken(this.env.l2ChainId);
         await this.distributeL1BaseToken(wallets, l2ERC20AmountToDeposit, baseTokenAddress);
         await this.cancelAllowances();
         await this.distributeL1Tokens(wallets, l2ETHAmountToDeposit, l2ERC20AmountToDeposit, baseTokenAddress);
@@ -220,27 +221,26 @@ export class TestContextOwner {
     /**
      * Checks the operator account balances on L1 and L2 and deposits funds if required.
      */
-    private async ensureBalances(accountsAmount: number): Promise<ethers.BigNumber> {
+    private async ensureBalances(accountsAmount: bigint): Promise<bigint> {
         this.reporter.startAction(`Checking main account balance`);
 
         this.reporter.message(`Operator address is ${this.mainEthersWallet.address}`);
 
-        const requiredL2ETHAmount = this.requiredL2ETHPerAccount().mul(accountsAmount);
+        const requiredL2ETHAmount = this.requiredL2ETHPerAccount() * accountsAmount;
         const actualL2ETHAmount = await this.mainSyncWallet.getBalance();
-        this.reporter.message(`Operator balance on L2 is ${ethers.utils.formatEther(actualL2ETHAmount)} ETH`);
+        this.reporter.message(`Operator balance on L2 is ${ethers.formatEther(actualL2ETHAmount)} ETH`);
 
         // We may have enough funds in L2. If that's the case, no need to deposit more than required.
-        const l2ETHAmountToDeposit = requiredL2ETHAmount.gt(actualL2ETHAmount)
-            ? requiredL2ETHAmount.sub(actualL2ETHAmount)
-            : ethers.BigNumber.from(0);
+        const l2ETHAmountToDeposit =
+            requiredL2ETHAmount > actualL2ETHAmount ? requiredL2ETHAmount - actualL2ETHAmount : 0n;
 
-        const requiredL1ETHAmount = this.requiredL1ETHPerAccount().mul(accountsAmount).add(l2ETHAmountToDeposit);
+        const requiredL1ETHAmount = this.requiredL1ETHPerAccount() * accountsAmount + l2ETHAmountToDeposit;
         const actualL1ETHAmount = await this.mainSyncWallet.getBalanceL1();
-        this.reporter.message(`Operator balance on L1 is ${ethers.utils.formatEther(actualL1ETHAmount)} ETH`);
+        this.reporter.message(`Operator balance on L1 is ${ethers.formatEther(actualL1ETHAmount)} ETH`);
 
-        if (requiredL1ETHAmount.gt(actualL1ETHAmount)) {
-            const required = ethers.utils.formatEther(requiredL1ETHAmount);
-            const actual = ethers.utils.formatEther(actualL1ETHAmount);
+        if (requiredL1ETHAmount > actualL1ETHAmount) {
+            const required = ethers.formatEther(requiredL1ETHAmount);
+            const actual = ethers.formatEther(actualL1ETHAmount);
             const errorMessage = `There must be at least ${required} ETH on main account, but only ${actual} is available`;
             throw new Error(errorMessage);
         }
@@ -270,17 +270,15 @@ export class TestContextOwner {
      */
     private async distributeL1BaseToken(
         wallets: TestWallets,
-        l2erc20DepositAmount: ethers.BigNumber,
+        l2erc20DepositAmount: bigint,
         baseTokenAddress: zksync.types.Address
     ) {
+        this.reporter.debug(`Base token address is ${baseTokenAddress}`);
+        const ethIsBaseToken = baseTokenAddress == zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
         this.reporter.startAction(`Distributing base tokens on L1`);
-        if (baseTokenAddress != zksync.utils.ETH_ADDRESS_IN_CONTRACTS) {
-            const chainId = process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!;
-            const l1startNonce = await this.mainEthersWallet.getTransactionCount();
+        if (!ethIsBaseToken) {
+            const l1startNonce = await this.mainEthersWallet.getNonce();
             this.reporter.debug(`Start nonce is ${l1startNonce}`);
-            const ethIsBaseToken =
-                (await (await this.mainSyncWallet.getBridgehubContract()).baseToken(chainId)) ==
-                zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
             // All the promises we send in this function.
             const l1TxPromises: Promise<any>[] = [];
             // Mutable nonce to send the transactions before actually `await`ing them.
@@ -289,7 +287,7 @@ export class TestContextOwner {
             const gasPrice = await scaledGasPrice(this.mainEthersWallet);
 
             // Define values for handling ERC20 transfers/deposits.
-            const baseMintAmount = l2erc20DepositAmount.mul(1000);
+            const baseMintAmount = l2erc20DepositAmount * 1000n;
             // Mint ERC20.
             const l1Erc20ABI = ['function mint(address to, uint256 amount)'];
             const l1Erc20Contract = new ethers.Contract(baseTokenAddress, l1Erc20ABI, this.mainEthersWallet);
@@ -302,12 +300,12 @@ export class TestContextOwner {
                     this.reporter.debug(`Sent ERC20 mint transaction. Hash: ${tx.hash}, tx nonce ${tx.nonce}`);
                     return tx.wait();
                 });
-            l1TxPromises.push(baseMintPromise);
+            this.reporter.debug(`Nonce changed by 1 for ERC20 mint, new nonce: ${nonce}`);
+            await baseMintPromise;
 
             // Deposit base token if needed
-            let baseDepositPromise;
             const baseIsTransferred = true;
-            baseDepositPromise = this.mainSyncWallet
+            const baseDepositPromise = this.mainSyncWallet
                 .deposit({
                     token: baseTokenAddress,
                     amount: l2erc20DepositAmount,
@@ -329,25 +327,27 @@ export class TestContextOwner {
                 .then((tx) => {
                     // Note: there is an `approve` tx, not listed here.
                     this.reporter.debug(`Sent ERC20 deposit transaction. Hash: ${tx.hash}, tx nonce: ${tx.nonce}`);
-                    tx.wait();
-
-                    nonce = nonce + 1 + (ethIsBaseToken ? 0 : 1) + (baseIsTransferred ? 0 : 1);
-
-                    if (!ethIsBaseToken) {
-                        // Send base token on L1.
-                        const baseTokenTransfers = sendTransfers(
-                            baseTokenAddress,
-                            this.mainEthersWallet,
-                            wallets,
-                            ERC20_PER_ACCOUNT,
-                            nonce,
-                            gasPrice,
-                            this.reporter
-                        );
-                        return baseTokenTransfers;
-                    }
+                    return tx.wait();
                 });
+            nonce = nonce + 1 + (ethIsBaseToken ? 0 : 1) + (baseIsTransferred ? 0 : 1);
+            this.reporter.debug(
+                `Nonce changed by ${
+                    1 + (ethIsBaseToken ? 0 : 1) + (baseIsTransferred ? 0 : 1)
+                } for ERC20 deposit, new nonce: ${nonce}`
+            );
+            // Send base token on L1.
+            const baseTokenTransfers = await sendTransfers(
+                baseTokenAddress,
+                this.mainEthersWallet,
+                wallets,
+                ERC20_PER_ACCOUNT,
+                nonce,
+                gasPrice,
+                this.reporter
+            );
+
             l1TxPromises.push(baseDepositPromise);
+            l1TxPromises.push(...baseTokenTransfers);
 
             this.reporter.debug(`Sent ${l1TxPromises.length} base token initial transactions on L1`);
             await Promise.all(l1TxPromises);
@@ -361,17 +361,14 @@ export class TestContextOwner {
      */
     private async distributeL1Tokens(
         wallets: TestWallets,
-        l2ETHAmountToDeposit: ethers.BigNumber,
-        l2erc20DepositAmount: ethers.BigNumber,
+        l2ETHAmountToDeposit: bigint,
+        l2erc20DepositAmount: bigint,
         baseTokenAddress: zksync.types.Address
     ) {
-        const chainId = process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!;
+        const ethIsBaseToken = baseTokenAddress == zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
         this.reporter.startAction(`Distributing tokens on L1`);
-        const l1startNonce = await this.mainEthersWallet.getTransactionCount();
+        const l1startNonce = await this.mainEthersWallet.getNonce();
         this.reporter.debug(`Start nonce is ${l1startNonce}`);
-        const ethIsBaseToken =
-            (await (await this.mainSyncWallet.getBridgehubContract()).baseToken(chainId)) ==
-            zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
         // All the promises we send in this function.
         const l1TxPromises: Promise<any>[] = [];
         // Mutable nonce to send the transactions before actually `await`ing them.
@@ -380,7 +377,7 @@ export class TestContextOwner {
         const gasPrice = await scaledGasPrice(this.mainEthersWallet);
 
         // Deposit L2 tokens (if needed).
-        if (!l2ETHAmountToDeposit.isZero()) {
+        if (l2ETHAmountToDeposit != 0n) {
             // Given that we've already sent a number of transactions,
             // we have to correctly send nonce.
             const depositHandle = this.mainSyncWallet
@@ -401,7 +398,7 @@ export class TestContextOwner {
                     l2GasLimit: 1000000
                 })
                 .then((tx) => {
-                    const amount = ethers.utils.formatEther(l2ETHAmountToDeposit);
+                    const amount = ethers.formatEther(l2ETHAmountToDeposit);
                     this.reporter.debug(`Sent ETH deposit. Nonce ${tx.nonce}, amount: ${amount}, hash: ${tx.hash}`);
                     tx.wait();
                 });
@@ -409,21 +406,21 @@ export class TestContextOwner {
             this.reporter.debug(
                 `Nonce changed by ${1 + (ethIsBaseToken ? 0 : 1)} for ETH deposit, new nonce: ${nonce}`
             );
-            // Add this promise to the list of L1 tx promises.
-            // l1TxPromises.push(depositHandle);
             await depositHandle;
         }
         // Define values for handling ERC20 transfers/deposits.
         const erc20Token = this.env.erc20Token.l1Address;
-        const erc20MintAmount = l2erc20DepositAmount.mul(100);
+        const erc20MintAmount = l2erc20DepositAmount * 100n;
         // Mint ERC20.
         const baseIsTransferred = false; // we are not transferring the base
         const l1Erc20ABI = ['function mint(address to, uint256 amount)'];
         const l1Erc20Contract = new ethers.Contract(erc20Token, l1Erc20ABI, this.mainEthersWallet);
+        const gasLimit = await l1Erc20Contract.mint.estimateGas(this.mainSyncWallet.address, erc20MintAmount);
         const erc20MintPromise = l1Erc20Contract
             .mint(this.mainSyncWallet.address, erc20MintAmount, {
                 nonce: nonce++,
-                gasPrice
+                gasPrice,
+                gasLimit
             })
             .then((tx: any) => {
                 this.reporter.debug(`Sent ERC20 mint transaction. Hash: ${tx.hash}, nonce ${tx.nonce}`);
@@ -513,7 +510,7 @@ export class TestContextOwner {
      */
     private async distributeL2Tokens(wallets: TestWallets) {
         this.reporter.startAction(`Distributing tokens on L2`);
-        let l2startNonce = await this.mainSyncWallet.getTransactionCount();
+        let l2startNonce = await this.mainSyncWallet.getNonce();
 
         // ETH transfers.
         const l2TxPromises = await sendTransfers(
@@ -606,16 +603,16 @@ export async function sendTransfers(
     token: string,
     wallet: ethers.Wallet | zksync.Wallet,
     wallets: TestWallets,
-    value: ethers.BigNumber,
+    value: bigint,
     overrideStartNonce?: number,
-    gasPrice?: ethers.BigNumber,
+    gasPrice?: bigint,
     reporter?: Reporter
 ): Promise<Promise<any>[]> {
     const erc20Contract =
         wallet instanceof zksync.Wallet
             ? new zksync.Contract(token, zksync.utils.IERC20, wallet)
             : new ethers.Contract(token, zksync.utils.IERC20, wallet);
-    const startNonce = overrideStartNonce ?? (await wallet.getTransactionCount());
+    const startNonce = overrideStartNonce ?? (await wallet.getNonce());
     reporter?.debug(`Sending transfers. Token address is ${token}`);
 
     const walletsPK = Array.from(Object.values(wallets));
@@ -626,7 +623,7 @@ export async function sendTransfers(
         const testWalletPK = walletsPK[index];
         if (token == zksync.utils.ETH_ADDRESS) {
             const tx = {
-                to: ethers.utils.computeAddress(testWalletPK),
+                to: ethers.computeAddress(testWalletPK),
                 value,
                 nonce: startNonce + index,
                 gasPrice
@@ -638,23 +635,25 @@ export async function sendTransfers(
 
             txPromises.push(
                 transactionResponse.wait().then((tx) => {
-                    reporter?.debug(`Obtained receipt for ETH transfer tx: ${tx.transactionHash} `);
+                    reporter?.debug(`Obtained receipt for ETH transfer tx: ${tx?.hash} `);
                     return tx;
                 })
             );
         } else {
             const txNonce = startNonce + index;
             reporter?.debug(`Inititated ERC20 transfer with nonce: ${txNonce}`);
-            const tx = await erc20Contract.transfer(ethers.utils.computeAddress(testWalletPK), value, {
+            const gasLimit = await erc20Contract.transfer.estimateGas(ethers.computeAddress(testWalletPK), value);
+            const tx = await erc20Contract.transfer(ethers.computeAddress(testWalletPK), value, {
                 nonce: txNonce,
-                gasPrice
+                gasPrice,
+                gasLimit
             });
             reporter?.debug(`Sent ERC20 transfer tx: ${tx.hash}, nonce: ${tx.nonce}`);
 
             txPromises.push(
                 // @ts-ignore
                 tx.wait().then((tx) => {
-                    reporter?.debug(`Obtained receipt for ERC20 transfer tx: ${tx.transactionHash}`);
+                    reporter?.debug(`Obtained receipt for ERC20 transfer tx: ${tx.hash}`);
                     return tx;
                 })
             );
@@ -694,21 +693,21 @@ export async function claimEtherBack(
         }
         // We use scaled gas price to increase chances of tx not being stuck.
         const gasPrice = await scaledGasPrice(from);
-        const transferPrice = gasLimit.mul(gasPrice);
+        const transferPrice = gasLimit * gasPrice;
 
-        const balance = await from.getBalance();
+        const balance = await from.provider!.getBalance(from.address);
 
         // If we can't afford sending funds back (or the wallet is empty), do nothing.
-        if (transferPrice.gt(balance)) {
+        if (transferPrice > balance) {
             continue;
         }
 
-        const value = balance.sub(transferPrice);
+        const value = balance - transferPrice;
 
         reporter?.debug(
-            `Wallet balance: ${ethers.utils.formatEther(balance)} ETH,\
-             estimated cost is ${ethers.utils.formatEther(transferPrice)} ETH,\
-             value for tx is ${ethers.utils.formatEther(value)} ETH`
+            `Wallet balance: ${ethers.formatEther(balance)} ETH,\
+             estimated cost is ${ethers.formatEther(transferPrice)} ETH,\
+             value for tx is ${ethers.formatEther(value)} ETH`
         );
 
         const txPromise = from
@@ -736,4 +735,4 @@ export async function claimEtherBack(
 /**
  * Type represents a transaction that may have been sent.
  */
-type ReceiptFuture = Promise<ethers.ethers.providers.TransactionReceipt>;
+type ReceiptFuture = Promise<ethers.TransactionReceipt>;
diff --git a/core/tests/ts-integration/src/env.ts b/core/tests/ts-integration/src/env.ts
index 556239ff9312..cb2638929d05 100644
--- a/core/tests/ts-integration/src/env.ts
+++ b/core/tests/ts-integration/src/env.ts
@@ -2,9 +2,11 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as ethers from 'ethers';
 import * as zksync from 'zksync-ethers';
-import { TestEnvironment } from './types';
+import { DataAvailabityMode, NodeMode, TestEnvironment } from './types';
 import { Reporter } from './reporter';
-import { L2_BASE_TOKEN_ADDRESS } from 'zksync-ethers/build/src/utils';
+import * as yaml from 'yaml';
+import { L2_BASE_TOKEN_ADDRESS } from 'zksync-ethers/build/utils';
+import { loadConfig, loadEcosystem, shouldLoadConfigFromFile } from 'utils/build/file-configs';
 
 /**
  * Attempts to connect to server.
@@ -14,16 +16,12 @@ import { L2_BASE_TOKEN_ADDRESS } from 'zksync-ethers/build/src/utils';
  * This function is expected to be called *before* loading an environment via `loadTestEnvironment`,
  * because the latter expects server to be running and may throw otherwise.
  */
-export async function waitForServer() {
+export async function waitForServer(l2NodeUrl: string) {
     const reporter = new Reporter();
     // Server startup may take a lot of time on the staging.
     const attemptIntervalMs = 1000;
     const maxAttempts = 20 * 60; // 20 minutes
 
-    const l2NodeUrl = ensureVariable(
-        process.env.ZKSYNC_WEB3_API_URL || process.env.API_WEB3_JSON_RPC_HTTP_URL,
-        'L2 node URL'
-    );
     const l2Provider = new zksync.Provider(l2NodeUrl);
 
     reporter.startAction('Connecting to server');
@@ -45,25 +43,156 @@ export async function waitForServer() {
     throw new Error('Failed to wait for the server to start');
 }
 
+function getMainWalletPk(pathToHome: string, network: string): string {
+    if (network.toLowerCase() == 'localhost') {
+        const testConfigPath = path.join(pathToHome, `etc/test_config/constant`);
+        const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
+        return ethers.Wallet.fromPhrase(ethTestConfig.test_mnemonic).privateKey;
+    } else {
+        return ensureVariable(process.env.MASTER_WALLET_PK, 'Main wallet private key');
+    }
+}
+
+/*
+    Loads the environment for file based configs.
+ */
+async function loadTestEnvironmentFromFile(chain: string): Promise<TestEnvironment> {
+    const pathToHome = path.join(__dirname, '../../../..');
+    let nodeMode;
+    if (process.env.EXTERNAL_NODE == 'true') {
+        nodeMode = NodeMode.External;
+    } else {
+        nodeMode = NodeMode.Main;
+    }
+    let ecosystem = loadEcosystem(pathToHome);
+    // Genesis file is common for both EN and Main node
+    let genesisConfig = loadConfig({ pathToHome, chain, config: 'genesis.yaml' });
+
+    let configsFolderSuffix = nodeMode == NodeMode.External ? 'external_node' : undefined;
+    let generalConfig = loadConfig({ pathToHome, chain, config: 'general.yaml', configsFolderSuffix });
+    let secretsConfig = loadConfig({ pathToHome, chain, config: 'secrets.yaml', configsFolderSuffix });
+
+    const network = ecosystem.l1_network;
+    let mainWalletPK = getMainWalletPk(pathToHome, network);
+    const l2NodeUrl = generalConfig.api.web3_json_rpc.http_url;
+
+    await waitForServer(l2NodeUrl);
+
+    const l2Provider = new zksync.Provider(l2NodeUrl);
+    const baseTokenAddress = await l2Provider.getBaseTokenContractAddress();
+
+    const l1NodeUrl = secretsConfig.l1.l1_rpc_url;
+    const wsL2NodeUrl = generalConfig.api.web3_json_rpc.ws_url;
+
+    const contractVerificationUrl = generalConfig.contract_verifier.url;
+
+    const tokens = getTokensNew(pathToHome);
+    // wBTC is chosen because it has decimals different from ETH (8 instead of 18).
+    // Using this token will help us to detect decimals-related errors.
+    // but if it's not available, we'll use the first token from the list.
+    let token = tokens.tokens['WBTC'];
+    if (token === undefined) {
+        token = Object.values(tokens.tokens)[0];
+        if (token.symbol == 'WETH') {
+            token = Object.values(tokens.tokens)[1];
+        }
+    }
+    const weth = tokens.tokens['WETH'];
+    let baseToken;
+
+    for (const key in tokens.tokens) {
+        const token = tokens.tokens[key];
+        if (zksync.utils.isAddressEq(token.address, baseTokenAddress)) {
+            baseToken = token;
+        }
+    }
+    // `waitForServer` is expected to be executed. Otherwise this call may throw.
+
+    const l2TokenAddress = await new zksync.Wallet(
+        mainWalletPK,
+        l2Provider,
+        ethers.getDefaultProvider(l1NodeUrl)
+    ).l2TokenAddress(token.address);
+
+    const l2WethAddress = await new zksync.Wallet(
+        mainWalletPK,
+        l2Provider,
+        ethers.getDefaultProvider(l1NodeUrl)
+    ).l2TokenAddress(weth.address);
+
+    const baseTokenAddressL2 = L2_BASE_TOKEN_ADDRESS;
+    const l2ChainId = BigInt(genesisConfig.l2_chain_id);
+    const l1BatchCommitDataGeneratorMode = genesisConfig.l1_batch_commit_data_generator_mode as DataAvailabityMode;
+    const minimalL2GasPrice = BigInt(generalConfig.state_keeper.minimal_l2_gas_price);
+
+    const validationComputationalGasLimit = parseInt(generalConfig.state_keeper.validation_computational_gas_limit);
+    // TODO set it properly
+    const priorityTxMaxGasLimit = 72000000n;
+    const maxLogsLimit = parseInt(generalConfig.api.web3_json_rpc.req_entities_limit);
+
+    return {
+        maxLogsLimit,
+        pathToHome,
+        priorityTxMaxGasLimit,
+        validationComputationalGasLimit,
+        nodeMode,
+        minimalL2GasPrice,
+        l1BatchCommitDataGeneratorMode,
+        l2ChainId,
+        network,
+        mainWalletPK,
+        l2NodeUrl,
+        l1NodeUrl,
+        wsL2NodeUrl,
+        contractVerificationUrl,
+        erc20Token: {
+            name: token.name,
+            symbol: token.symbol,
+            decimals: token.decimals,
+            l1Address: token.address,
+            l2Address: l2TokenAddress
+        },
+        wethToken: {
+            name: weth.name,
+            symbol: weth.symbol,
+            decimals: weth.decimals,
+            l1Address: weth.address,
+            l2Address: l2WethAddress
+        },
+        baseToken: {
+            name: baseToken?.name || token.name,
+            symbol: baseToken?.symbol || token.symbol,
+            decimals: baseToken?.decimals || token.decimals,
+            l1Address: baseToken?.address || token.address,
+            l2Address: baseTokenAddressL2
+        }
+    };
+}
+
+export async function loadTestEnvironment(): Promise<TestEnvironment> {
+    const { loadFromFile, chain } = shouldLoadConfigFromFile();
+
+    if (loadFromFile) {
+        return await loadTestEnvironmentFromFile(chain);
+    }
+    return await loadTestEnvironmentFromEnv();
+}
+
 /**
  * Loads the test environment from the env variables.
  */
-export async function loadTestEnvironment(): Promise<TestEnvironment> {
+export async function loadTestEnvironmentFromEnv(): Promise<TestEnvironment> {
     const network = process.env.CHAIN_ETH_NETWORK || 'localhost';
+    const pathToHome = path.join(__dirname, '../../../../');
 
-    let mainWalletPK;
-    if (network == 'localhost') {
-        const testConfigPath = path.join(process.env.ZKSYNC_HOME!, `etc/test_config/constant`);
-        const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
-        mainWalletPK = ethers.Wallet.fromMnemonic(ethTestConfig.test_mnemonic as string, "m/44'/60'/0'/0/0").privateKey;
-    } else {
-        mainWalletPK = ensureVariable(process.env.MASTER_WALLET_PK, 'Main wallet private key');
-    }
+    let mainWalletPK = getMainWalletPk(pathToHome, network);
 
     const l2NodeUrl = ensureVariable(
         process.env.ZKSYNC_WEB3_API_URL || process.env.API_WEB3_JSON_RPC_HTTP_URL,
         'L2 node URL'
     );
+
+    await waitForServer(l2NodeUrl);
     const l2Provider = new zksync.Provider(l2NodeUrl);
     const baseTokenAddress = await l2Provider.getBaseTokenContractAddress();
 
@@ -76,7 +205,7 @@ export async function loadTestEnvironment(): Promise<TestEnvironment> {
         ? process.env.CONTRACT_VERIFIER_URL!
         : ensureVariable(process.env.CONTRACT_VERIFIER_URL, 'Contract verification API');
 
-    const tokens = getTokens(process.env.CHAIN_ETH_NETWORK || 'localhost');
+    const tokens = getTokens(pathToHome, process.env.CHAIN_ETH_NETWORK || 'localhost');
     // wBTC is chosen because it has decimals different from ETH (8 instead of 18).
     // Using this token will help us to detect decimals-related errors.
     // but if it's not available, we'll use the first token from the list.
@@ -103,8 +232,41 @@ export async function loadTestEnvironment(): Promise<TestEnvironment> {
     ).l2TokenAddress(weth.address);
 
     const baseTokenAddressL2 = L2_BASE_TOKEN_ADDRESS;
+    const l2ChainId = BigInt(process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!);
+    // If the `CHAIN_STATE_KEEPER_L1_BATCH_COMMIT_DATA_GENERATOR_MODE` is not set, the default value is `Rollup`.
+    const l1BatchCommitDataGeneratorMode = (process.env.CHAIN_STATE_KEEPER_L1_BATCH_COMMIT_DATA_GENERATOR_MODE ||
+        process.env.EN_L1_BATCH_COMMIT_DATA_GENERATOR_MODE ||
+        'Rollup') as DataAvailabityMode;
+    let minimalL2GasPrice;
+    if (process.env.CHAIN_STATE_KEEPER_MINIMAL_L2_GAS_PRICE !== undefined) {
+        minimalL2GasPrice = BigInt(process.env.CHAIN_STATE_KEEPER_MINIMAL_L2_GAS_PRICE!);
+    } else {
+        minimalL2GasPrice = 0n;
+    }
+    let nodeMode;
+    if (process.env.EN_MAIN_NODE_URL !== undefined) {
+        nodeMode = NodeMode.External;
+    } else {
+        nodeMode = NodeMode.Main;
+    }
+
+    const validationComputationalGasLimit = parseInt(
+        process.env.CHAIN_STATE_KEEPER_VALIDATION_COMPUTATIONAL_GAS_LIMIT!
+    );
+    const priorityTxMaxGasLimit = BigInt(process.env.CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT!);
+    const maxLogsLimit = parseInt(
+        process.env.EN_REQ_ENTITIES_LIMIT ?? process.env.API_WEB3_JSON_RPC_REQ_ENTITIES_LIMIT!
+    );
 
     return {
+        maxLogsLimit,
+        pathToHome,
+        priorityTxMaxGasLimit,
+        validationComputationalGasLimit,
+        nodeMode,
+        minimalL2GasPrice,
+        l1BatchCommitDataGeneratorMode,
+        l2ChainId,
         network,
         mainWalletPK,
         l2NodeUrl,
@@ -145,21 +307,65 @@ function ensureVariable(value: string | undefined, variableName: string): string
     return value;
 }
 
+interface TokensDict {
+    [key: string]: L1Token;
+}
+
+type Tokens = {
+    tokens: TokensDict;
+};
+
 type L1Token = {
     name: string;
     symbol: string;
-    decimals: number;
+    decimals: bigint;
     address: string;
 };
 
-function getTokens(network: string): L1Token[] {
-    const configPath = `${process.env.ZKSYNC_HOME}/etc/tokens/${network}.json`;
+function getTokens(pathToHome: string, network: string): L1Token[] {
+    const configPath = `${pathToHome}/etc/tokens/${network}.json`;
     if (!fs.existsSync(configPath)) {
         return [];
     }
-    return JSON.parse(
+    const parsed = JSON.parse(
+        fs.readFileSync(configPath, {
+            encoding: 'utf-8'
+        }),
+        (key, value) => (key === 'decimals' ? BigInt(value) : value)
+    );
+    return parsed;
+}
+
+function getTokensNew(pathToHome: string): Tokens {
+    const configPath = path.join(pathToHome, '/configs/erc20.yaml');
+    if (!fs.existsSync(configPath)) {
+        throw Error('Tokens config not found');
+    }
+
+    const parsedObject = yaml.parse(
         fs.readFileSync(configPath, {
             encoding: 'utf-8'
-        })
+        }),
+        {
+            customTags
+        }
     );
+
+    for (const key in parsedObject.tokens) {
+        parsedObject.tokens[key].decimals = BigInt(parsedObject.tokens[key].decimals);
+    }
+    return parsedObject;
+}
+
+function customTags(tags: yaml.Tags): yaml.Tags {
+    for (const tag of tags) {
+        // @ts-ignore
+        if (tag.format === 'HEX') {
+            // @ts-ignore
+            tag.resolve = (str, _onError, _opt) => {
+                return str;
+            };
+        }
+    }
+    return tags;
 }
diff --git a/core/tests/ts-integration/src/helpers.ts b/core/tests/ts-integration/src/helpers.ts
index ea20ee4b7048..8e31c1a691ff 100644
--- a/core/tests/ts-integration/src/helpers.ts
+++ b/core/tests/ts-integration/src/helpers.ts
@@ -4,6 +4,8 @@ import * as ethers from 'ethers';
 import * as hre from 'hardhat';
 import { ZkSyncArtifact } from '@matterlabs/hardhat-zksync-solc/dist/src/types';
 
+export const SYSTEM_CONTEXT_ADDRESS = '0x000000000000000000000000000000000000800b';
+
 /**
  * Loads the test contract
  *
@@ -22,7 +24,7 @@ export function getTestContract(name: string): ZkSyncArtifact {
  * @returns Conta
  */
 export function getContractSource(relativePath: string): string {
-    const contractPath = `${process.env.ZKSYNC_HOME}/core/tests/ts-integration/contracts/${relativePath}`;
+    const contractPath = `${__dirname}/../contracts/${relativePath}`;
     const source = fs.readFileSync(contractPath, 'utf8');
     return source;
 }
@@ -45,8 +47,8 @@ export async function deployContract(
     overrides: any = {}
 ): Promise<zksync.Contract> {
     const contractFactory = new zksync.ContractFactory(artifact.abi, artifact.bytecode, initiator, deploymentType);
-    const contract = await contractFactory.deploy(...args, overrides);
-    await contract.deployed();
+    const contract = (await contractFactory.deploy(...args, overrides)) as zksync.Contract;
+    await contract.waitForDeployment();
     return contract;
 }
 
@@ -57,12 +59,12 @@ export async function deployContract(
  * @param wallet Wallet to send a transaction from. Should have enough balance to cover the fee.
  * @returns Transaction receipt.
  */
-export async function anyTransaction(wallet: zksync.Wallet): Promise<ethers.providers.TransactionReceipt> {
+export async function anyTransaction(wallet: zksync.Wallet): Promise<ethers.TransactionReceipt> {
     return await wallet.transfer({ to: wallet.address, amount: 0 }).then((tx) => tx.wait());
 }
 
 /**
- * Waits until a new L1 batch is created on zkSync node.
+ * Waits until a new L1 batch is created on ZKsync node.
  * This function attempts to trigger this action by sending an additional transaction,
  * however it may not be enough in some env (e.g. if some testnet is configured to utilize the block capacity).
  *
@@ -72,11 +74,12 @@ export async function waitForNewL1Batch(wallet: zksync.Wallet): Promise<zksync.t
     // Send a dummy transaction and wait until the new L1 batch is created.
     const oldReceipt = await anyTransaction(wallet);
     // Invariant: even with 1 transaction, l1 batch must be eventually sealed, so this loop must exit.
-    while (!(await wallet.provider.getTransactionReceipt(oldReceipt.transactionHash)).l1BatchNumber) {
+    while (!(await wallet.provider.getTransactionReceipt(oldReceipt.hash))?.l1BatchNumber) {
         await zksync.utils.sleep(wallet.provider.pollingInterval);
     }
-    return await wallet.provider.getTransactionReceipt(oldReceipt.transactionHash);
+    return (await wallet.provider.getTransactionReceipt(oldReceipt.hash))!;
 }
+
 /**
  * Waits until the requested block is finalized.
  *
@@ -100,8 +103,41 @@ export async function waitUntilBlockFinalized(wallet: zksync.Wallet, blockNumber
  * @param wallet Wallet to use to fetch the gas price.
  * @returns Scaled gas price.
  */
-export async function scaledGasPrice(wallet: ethers.Wallet | zksync.Wallet): Promise<ethers.BigNumber> {
-    const gasPrice = await wallet.getGasPrice();
+export async function scaledGasPrice(wallet: ethers.Wallet | zksync.Wallet): Promise<bigint> {
+    const provider = wallet.provider;
+    if (!provider) {
+        throw new Error('Wallet should have provider');
+    }
+    const feeData = await provider.getFeeData();
+    const gasPrice = feeData.gasPrice;
+    if (!gasPrice) {
+        throw new Error('Failed to fetch gas price');
+    }
     // Increase by 40%
-    return gasPrice.mul(140).div(100);
+    return (gasPrice * 140n) / 100n;
+}
+
+export const bigIntReviver = (_: string, value: any) => {
+    if (typeof value === 'string' && value.endsWith('n')) {
+        const number = value.slice(0, -1);
+        if (/^-?\d+$/.test(number)) {
+            return BigInt(number);
+        }
+    }
+    return value;
+};
+
+export const bigIntReplacer = (_: string, value: any) => {
+    if (typeof value === 'bigint') {
+        return `${value}n`;
+    }
+    return value;
+};
+
+export function bigIntMax(...args: bigint[]) {
+    if (args.length === 0) {
+        throw new Error('No arguments provided');
+    }
+
+    return args.reduce((max, current) => (current > max ? current : max), args[0]);
 }
diff --git a/core/tests/ts-integration/src/jest-setup/add-matchers.ts b/core/tests/ts-integration/src/jest-setup/add-matchers.ts
index e673e7a909d1..f3e10bab07af 100644
--- a/core/tests/ts-integration/src/jest-setup/add-matchers.ts
+++ b/core/tests/ts-integration/src/jest-setup/add-matchers.ts
@@ -1,9 +1,7 @@
-import * as bigNumberMatchers from '../matchers/big-number';
 import * as ethPrimitives from '../matchers/eth-primitives';
 import * as transaction from '../matchers/transaction';
 import * as fail from '../matchers/fail';
 
-expect.extend(bigNumberMatchers);
 expect.extend(ethPrimitives);
 expect.extend(transaction);
 expect.extend(fail);
diff --git a/core/tests/ts-integration/src/jest-setup/global-setup.ts b/core/tests/ts-integration/src/jest-setup/global-setup.ts
index b0e2c8bf56dc..d84d70fe69da 100644
--- a/core/tests/ts-integration/src/jest-setup/global-setup.ts
+++ b/core/tests/ts-integration/src/jest-setup/global-setup.ts
@@ -1,4 +1,5 @@
-import { TestContextOwner, loadTestEnvironment, waitForServer } from '../index';
+import { bigIntReplacer } from '../helpers';
+import { TestContextOwner, loadTestEnvironment } from '../index';
 
 declare global {
     var __ZKSYNC_TEST_CONTEXT_OWNER__: TestContextOwner;
@@ -18,7 +19,6 @@ async function performSetup(_globalConfig: any, _projectConfig: any) {
 
     // Before starting any actual logic, we need to ensure that the server is running (it may not
     // be the case, for example, right after deployment on stage).
-    await waitForServer();
 
     const testEnvironment = await loadTestEnvironment();
     const testContextOwner = new TestContextOwner(testEnvironment);
@@ -27,7 +27,7 @@ async function performSetup(_globalConfig: any, _projectConfig: any) {
     // Set the test context for test suites to pick up.
     // Currently, jest doesn't provide a way to pass data from `globalSetup` to suites,
     // so we store the data as serialized JSON.
-    process.env.ZKSYNC_JEST_TEST_CONTEXT = JSON.stringify(testContext);
+    process.env.ZKSYNC_JEST_TEST_CONTEXT = JSON.stringify(testContext, bigIntReplacer);
 
     // Store the context object for teardown script, so it can perform, well, the teardown.
     globalThis.__ZKSYNC_TEST_CONTEXT_OWNER__ = testContextOwner;
diff --git a/core/tests/ts-integration/src/matchers/big-number.ts b/core/tests/ts-integration/src/matchers/big-number.ts
deleted file mode 100644
index df93ad1c71af..000000000000
--- a/core/tests/ts-integration/src/matchers/big-number.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { BigNumber, BigNumberish } from 'ethers';
-import { TestMessage } from './matcher-helpers';
-
-// Note: I attempted to "overload" the existing matchers from Jest (like `toBeGreaterThan`),
-// but failed. There is a proposed hack in one GitHub issue from 2018: if you'll be trying to
-// do the same, know: this hack doesn't work anymore. Default matchers rely on `this` to have
-// certain properties, so attempt to load default matchers from `build` directory and call them
-// as a fallback won't work (or I failed to make it work).
-
-// This file contains implementation of matchers for BigNumber objects.
-// For actual doc-comments, see `typings/jest.d.ts` file.
-
-// Matcher for `l.gt(r)`
-export function bnToBeGt(l: BigNumberish, r: BigNumberish, additionalInfo?: string) {
-    const comparator = (l: BigNumber, r: BigNumber) => l.gt(r);
-    const matcherName = `bnToBeGt`;
-    const matcherMessage = `greater than`;
-    return matcherBody(l, r, comparator, matcherName, matcherMessage, additionalInfo);
-}
-
-// Matcher for `l.gte(r)`
-export function bnToBeGte(l: BigNumberish, r: BigNumberish, additionalInfo?: string) {
-    const comparator = (l: BigNumber, r: BigNumber) => l.gte(r);
-    const matcherName = `bnToBeGte`;
-    const matcherMessage = `greater or equal than`;
-    return matcherBody(l, r, comparator, matcherName, matcherMessage, additionalInfo);
-}
-
-// Matcher for `l.eq(r)`
-export function bnToBeEq(l: BigNumberish, r: BigNumberish, additionalInfo?: string) {
-    const comparator = (l: BigNumber, r: BigNumber) => l.eq(r);
-    const matcherName = `bnToBeEq`;
-    const matcherMessage = `equal to`;
-    return matcherBody(l, r, comparator, matcherName, matcherMessage, additionalInfo);
-}
-
-// Matcher for `l.lt(r)`
-export function bnToBeLt(l: BigNumberish, r: BigNumberish, additionalInfo?: string) {
-    const comparator = (l: BigNumber, r: BigNumber) => l.lt(r);
-    const matcherName = `bnToBeLt`;
-    const matcherMessage = `less than`;
-    return matcherBody(l, r, comparator, matcherName, matcherMessage, additionalInfo);
-}
-
-// Matcher for `l.lte(r)`
-export function bnToBeLte(l: BigNumberish, r: BigNumberish, additionalInfo?: string) {
-    const comparator = (l: BigNumber, r: BigNumber) => l.lte(r);
-    const matcherName = `bnToBeLte`;
-    const matcherMessage = `less than or equal`;
-    return matcherBody(l, r, comparator, matcherName, matcherMessage, additionalInfo);
-}
-
-/**
- * Generic body of the BigNumber matchers. Use to reduce the amount of boilerplate code.
- *
- * @param l Initial number (from `expect(l)`).
- * @param r Number to compare to (from `.bnToBeXXX(r)`).
- * @param comparator Comparator function to invoke to see if test passes (e.g. `(l, r) => l.gt(r)`).
- * @param matcherName Name of the matcher function (e.g. `bnToBeGt`).
- * @param matcherMessage Generic part of the failure message (e.g. `greater than`).
- * @param additionalInfo Message provided by user to be included in case of failure.
- * @returns Object expected by jest matcher.
- */
-function matcherBody(
-    l: BigNumberish,
-    r: BigNumberish,
-    comparator: (l: BigNumber, r: BigNumber) => boolean,
-    matcherName: string,
-    matcherMessage: string,
-    additionalInfo?: string
-) {
-    // Numbers are provided as `BigNumberish`, so they can be strings or numbers.
-    const left = BigNumber.from(l);
-    const right = BigNumber.from(r);
-    const pass = comparator(left, right);
-
-    // Declare messages for normal case and case where matcher was preceded by `.not`.
-    let passMessage = new TestMessage()
-        .matcherHint(`.not.${matcherName}`)
-        .line('Expected the following number:')
-        .received(left)
-        .line(`to not be ${matcherMessage}:`)
-        .expected(right)
-        .additional(additionalInfo)
-        .build();
-
-    let failMessage = new TestMessage()
-        .matcherHint(`.${matcherName}`)
-        .line('Expected the following number:')
-        .received(left)
-        .line(`to be ${matcherMessage}:`)
-        .expected(right)
-        .additional(additionalInfo)
-        .build();
-
-    return {
-        pass,
-        message: () => (pass ? passMessage : failMessage)
-    };
-}
diff --git a/core/tests/ts-integration/src/matchers/eth-primitives.ts b/core/tests/ts-integration/src/matchers/eth-primitives.ts
index 509b4aa51d26..87347e1e1228 100644
--- a/core/tests/ts-integration/src/matchers/eth-primitives.ts
+++ b/core/tests/ts-integration/src/matchers/eth-primitives.ts
@@ -5,7 +5,7 @@ import { TestMessage } from './matcher-helpers';
 // For actual doc-comments, see `typings/jest.d.ts` file.
 
 export function toBeAddress(value: string, additionalInfo?: string) {
-    const pass = ethers.utils.isAddress(value);
+    const pass = ethers.isAddress(value);
 
     // Declare messages for normal case and case where matcher was preceded by `.not`.
     let passMessage = new TestMessage()
@@ -29,7 +29,7 @@ export function toBeAddress(value: string, additionalInfo?: string) {
 }
 
 export function toBeHexString(value: string, additionalInfo?: string) {
-    const pass = ethers.utils.isHexString(value);
+    const pass = ethers.isHexString(value);
 
     // Declare messages for normal case and case where matcher was preceded by `.not`.
     let passMessage = new TestMessage()
diff --git a/core/tests/ts-integration/src/matchers/transaction.ts b/core/tests/ts-integration/src/matchers/transaction.ts
index 95d9ff122936..89e90b6d5f16 100644
--- a/core/tests/ts-integration/src/matchers/transaction.ts
+++ b/core/tests/ts-integration/src/matchers/transaction.ts
@@ -3,7 +3,7 @@ import { MatcherModifier } from '../modifiers';
 import * as zksync from 'zksync-ethers';
 import { AugmentedTransactionResponse } from '../retry-provider';
 
-// This file contains implementation of matchers for zkSync/ethereum transaction.
+// This file contains implementation of matchers for ZKsync/ethereum transaction.
 // For actual doc-comments, see `typings/jest.d.ts` file.
 
 export async function toBeAccepted(
@@ -219,7 +219,8 @@ function checkReceiptFields(request: zksync.types.TransactionResponse, receipt:
     if (receipt.status !== 0 && receipt.status !== 1) {
         return failWith(`Status field in the receipt has an unexpected value (expected 0 or 1): ${receipt.status}`);
     }
-    if (!receipt.effectiveGasPrice) {
+    const effectiveGasPrice = receipt.gasUsed * receipt.gasPrice;
+    if (effectiveGasPrice <= 0n) {
         return failWith(`Effective gas price expected to be greater than 0`);
     }
     if (!receipt.gasUsed) {
diff --git a/core/tests/ts-integration/src/modifiers/balance-checker.ts b/core/tests/ts-integration/src/modifiers/balance-checker.ts
index aeb60aaf4ab1..bdf04db05982 100644
--- a/core/tests/ts-integration/src/modifiers/balance-checker.ts
+++ b/core/tests/ts-integration/src/modifiers/balance-checker.ts
@@ -7,7 +7,7 @@ import * as ethers from 'ethers';
 import { TestMessage } from '../matchers/matcher-helpers';
 import { MatcherModifier, MatcherMessage } from '.';
 import { Fee } from '../types';
-import { Ierc20Factory as IERC20Factory } from 'zksync-ethers/build/typechain/Ierc20Factory';
+import { IERC20__factory as IERC20Factory } from 'zksync-ethers/build/typechain';
 
 /**
  * Modifier that ensures that fee was taken from the wallet for a transaction.
@@ -19,7 +19,7 @@ import { Ierc20Factory as IERC20Factory } from 'zksync-ethers/build/typechain/Ie
  * @returns Matcher object
  */
 export async function shouldOnlyTakeFee(wallet: zksync.Wallet, isL1ToL2?: boolean): Promise<ShouldChangeBalance> {
-    return await ShouldChangeBalance.create(zksync.utils.ETH_ADDRESS, [{ wallet, change: 0 }], { l1ToL2: isL1ToL2 });
+    return await ShouldChangeBalance.create(zksync.utils.ETH_ADDRESS, [{ wallet, change: 0n }], { l1ToL2: isL1ToL2 });
 }
 
 /**
@@ -69,7 +69,7 @@ export async function shouldChangeTokenBalances(
  */
 export interface BalanceChange {
     wallet: zksync.Wallet;
-    change: ethers.BigNumberish;
+    change: bigint;
     addressToCheck?: string;
 }
 
@@ -87,7 +87,7 @@ export interface Params {
  * *before* the transaction was sent.
  */
 interface PopulatedBalanceChange extends BalanceChange {
-    initialBalance: ethers.BigNumber;
+    initialBalance: bigint;
 }
 
 /**
@@ -156,20 +156,19 @@ class ShouldChangeBalance extends MatcherModifier {
                 // To "ignore" subtracted fee, we just add it back to the account balance.
                 // For L1->L2 transactions the sender might be different from the refund recipient
                 if (this.l1ToL2) {
-                    newBalance = newBalance.sub(extractRefundForL1ToL2(receipt, address));
+                    newBalance = newBalance - extractRefundForL1ToL2(receipt, address);
                 } else if (address == receipt.from) {
-                    newBalance = newBalance.add(extractFee(receipt).feeAfterRefund);
+                    newBalance = newBalance + extractFee(receipt).feeAfterRefund;
                 }
             }
 
-            const diff = newBalance.sub(prevBalance);
-            const change = ethers.BigNumber.from(balanceChange.change);
-            if (!diff.eq(change)) {
+            const diff = newBalance - prevBalance;
+            if (diff != balanceChange.change) {
                 const message = new TestMessage()
                     .matcherHint(`ShouldChangeBalance modifier`)
                     .line(`Incorrect balance change for wallet ${balanceChange.wallet.address} (index ${id} in array)`)
                     .line(`Expected balance change to be:`)
-                    .expected(change)
+                    .expected(balanceChange.change)
                     .line(`But actual change is:`)
                     .received(diff)
                     .line(`Balance before: ${prevBalance}, balance after: ${newBalance}`)
@@ -201,7 +200,7 @@ export function extractFee(receipt: zksync.types.TransactionReceipt, from?: stri
 
     const systemAccountAddress = '0x0000000000000000000000000000000000000000000000000000000000008001';
     // We need to pad address to represent 256-bit value.
-    const fromAccountAddress = ethers.utils.hexZeroPad(ethers.utils.arrayify(from), 32);
+    const fromAccountAddress = ethers.zeroPadValue(ethers.getBytes(from), 32);
     // Fee log is one that sends money to the system contract account.
     const feeLog = receipt.logs.find((log) => {
         return log.topics.length == 3 && log.topics[1] == fromAccountAddress && log.topics[2] == systemAccountAddress;
@@ -213,7 +212,7 @@ export function extractFee(receipt: zksync.types.TransactionReceipt, from?: stri
         };
     }
 
-    const feeAmount = ethers.BigNumber.from(feeLog.data);
+    const feeAmount = BigInt(feeLog.data);
 
     // There may be more than one refund log for the user
     const feeRefund = receipt.logs
@@ -222,14 +221,14 @@ export function extractFee(receipt: zksync.types.TransactionReceipt, from?: stri
                 log.topics.length == 3 && log.topics[1] == systemAccountAddress && log.topics[2] == fromAccountAddress
             );
         })
-        .map((log) => ethers.BigNumber.from(log.data))
+        .map((log) => BigInt(log.data))
         .reduce((prev, cur) => {
-            return prev.add(cur);
-        }, ethers.BigNumber.from(0));
+            return prev + cur;
+        }, 0n);
 
     return {
         feeBeforeRefund: feeAmount,
-        feeAfterRefund: feeAmount.sub(feeRefund),
+        feeAfterRefund: feeAmount - feeRefund,
         refund: feeRefund
     };
 }
@@ -241,10 +240,10 @@ export function extractFee(receipt: zksync.types.TransactionReceipt, from?: stri
  * @param from Optional substitute to `receipt.from`.
  * @returns Extracted fee
  */
-function extractRefundForL1ToL2(receipt: zksync.types.TransactionReceipt, refundRecipient?: string): ethers.BigNumber {
+function extractRefundForL1ToL2(receipt: zksync.types.TransactionReceipt, refundRecipient?: string): bigint {
     refundRecipient = refundRecipient ?? receipt.from;
 
-    const mintTopic = ethers.utils.keccak256(ethers.utils.toUtf8Bytes('Mint(address,uint256)'));
+    const mintTopic = ethers.keccak256(ethers.toUtf8Bytes('Mint(address,uint256)'));
 
     const refundLogs = receipt.logs.filter((log) => {
         return log.topics.length == 2 && log.topics[0] == mintTopic;
@@ -262,7 +261,7 @@ function extractRefundForL1ToL2(receipt: zksync.types.TransactionReceipt, refund
     // final refund.
     const refundLog = refundLogs[refundLogs.length - 1];
 
-    const formattedRefundRecipient = ethers.utils.hexlify(ethers.utils.zeroPad(refundRecipient, 32));
+    const formattedRefundRecipient = ethers.hexlify(ethers.zeroPadValue(refundRecipient, 32));
 
     if (refundLog.topics[1].toLowerCase() !== formattedRefundRecipient.toLowerCase()) {
         throw {
@@ -271,7 +270,7 @@ function extractRefundForL1ToL2(receipt: zksync.types.TransactionReceipt, refund
         };
     }
 
-    return ethers.BigNumber.from(refundLog.data);
+    return BigInt(refundLog.data);
 }
 
 /**
@@ -283,12 +282,7 @@ function extractRefundForL1ToL2(receipt: zksync.types.TransactionReceipt, refund
  * @param token Address of the token
  * @returns Token balance
  */
-async function getBalance(
-    l1: boolean,
-    wallet: zksync.Wallet,
-    address: string,
-    token: string
-): Promise<ethers.BigNumber> {
+async function getBalance(l1: boolean, wallet: zksync.Wallet, address: string, token: string): Promise<bigint> {
     const provider = l1 ? wallet.providerL1! : wallet.provider;
     if (zksync.utils.isETH(token)) {
         return await provider.getBalance(address);
diff --git a/core/tests/ts-integration/src/prerequisites.ts b/core/tests/ts-integration/src/prerequisites.ts
index c20e33bbab4d..15e1cc096df9 100644
--- a/core/tests/ts-integration/src/prerequisites.ts
+++ b/core/tests/ts-integration/src/prerequisites.ts
@@ -1,17 +1,17 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
-// All zkSync test suites are expected to be named `*.test.ts`.
+// All ZKsync test suites are expected to be named `*.test.ts`.
 const TEST_SUITE_MARKER = 'test.ts';
 
 // Files that are excluded from the integration test suited (e.g. unit tests for the framework itself).
 const EXCLUDED_FILES = ['self-unit.test.ts'];
 
 /**
- * Gets all the files that contain zkSync integration test suites.
+ * Gets all the files that contain ZKsync integration test suites.
  * Used to provide each test suite a funded wallet.
  *
- * @returns list of filenames that correspond to zkSync integration test suites.
+ * @returns list of filenames that correspond to ZKsync integration test suites.
  */
 export function lookupPrerequisites(): string[] {
     const files = loadFilesRecursively(`${__dirname}/../tests/`);
diff --git a/core/tests/ts-integration/src/retry-provider.ts b/core/tests/ts-integration/src/retry-provider.ts
index 64c7faaf5377..1763c0e4edf5 100644
--- a/core/tests/ts-integration/src/retry-provider.ts
+++ b/core/tests/ts-integration/src/retry-provider.ts
@@ -1,7 +1,6 @@
 import * as zksync from 'zksync-ethers';
 import * as ethers from 'ethers';
 import { Reporter } from './reporter';
-import { TransactionResponse } from 'zksync-web3/src/types';
 
 /**
  * RetryProvider retries every RPC request if it detects a timeout-related issue on the server side.
@@ -9,11 +8,16 @@ import { TransactionResponse } from 'zksync-web3/src/types';
 export class RetryProvider extends zksync.Provider {
     private readonly reporter: Reporter;
 
-    constructor(
-        url?: string | ethers.ethers.utils.ConnectionInfo | undefined,
-        network?: ethers.ethers.providers.Networkish | undefined,
-        reporter?: Reporter
-    ) {
+    constructor(_url?: string | { url: string; timeout: number }, network?: ethers.Networkish, reporter?: Reporter) {
+        let url;
+        if (typeof _url === 'object') {
+            const fetchRequest: ethers.FetchRequest = new ethers.FetchRequest(_url.url);
+            fetchRequest.timeout = _url.timeout;
+            url = fetchRequest;
+        } else {
+            url = _url;
+        }
+
         super(url, network);
         this.reporter = reporter ?? new Reporter();
     }
@@ -51,21 +55,15 @@ export class RetryProvider extends zksync.Provider {
         }
     }
 
-    override _wrapTransaction(tx: ethers.Transaction, hash?: string): AugmentedTransactionResponse {
-        const wrapped = super._wrapTransaction(tx, hash);
-        const originalWait = wrapped.wait;
-        wrapped.wait = async (confirmations) => {
-            this.reporter.debug(`Started waiting for transaction ${tx.hash} (from=${tx.from}, nonce=${tx.nonce})`);
-            const receipt = await originalWait(confirmations);
-            this.reporter.debug(
-                `Obtained receipt for transaction ${tx.hash}: blockNumber=${receipt.blockNumber}, status=${receipt.status}`
-            );
-            return receipt;
-        };
-        return { ...wrapped, reporter: this.reporter };
+    override _wrapTransactionReceipt(receipt: any): zksync.types.TransactionReceipt {
+        const wrapped = super._wrapTransactionReceipt(receipt);
+        this.reporter.debug(
+            `Obtained receipt for transaction ${receipt.transactionHash}: blockNumber=${receipt.blockNumber}, status=${receipt.status}`
+        );
+        return wrapped;
     }
 }
 
-export interface AugmentedTransactionResponse extends TransactionResponse {
+export interface AugmentedTransactionResponse extends zksync.types.TransactionResponse {
     readonly reporter?: Reporter;
 }
diff --git a/core/tests/ts-integration/src/test-master.ts b/core/tests/ts-integration/src/test-master.ts
index 3072c3244e6b..09fddd1589ca 100644
--- a/core/tests/ts-integration/src/test-master.ts
+++ b/core/tests/ts-integration/src/test-master.ts
@@ -4,6 +4,7 @@ import { TestEnvironment, TestContext } from './types';
 import { claimEtherBack } from './context-owner';
 import { RetryProvider } from './retry-provider';
 import { Reporter } from './reporter';
+import { bigIntReviver } from './helpers';
 
 /**
  * Test master is a singleton class (per suite) that is capable of providing wallets to the suite.
@@ -18,7 +19,7 @@ export class TestMaster {
 
     private readonly env: TestEnvironment;
     readonly reporter: Reporter;
-    private readonly l1Provider: ethers.providers.JsonRpcProvider;
+    private readonly l1Provider: ethers.JsonRpcProvider;
     private readonly l2Provider: zksync.Provider;
 
     private readonly mainWallet: zksync.Wallet;
@@ -34,7 +35,7 @@ export class TestMaster {
             throw new Error('Test context was not initialized; unable to load context environment variable');
         }
 
-        const context = JSON.parse(contextStr) as TestContext;
+        const context = JSON.parse(contextStr, bigIntReviver) as TestContext;
         this.env = context.environment;
         this.reporter = new Reporter();
 
@@ -51,7 +52,7 @@ export class TestMaster {
         if (!suiteWalletPK) {
             throw new Error(`Wallet for ${suiteName} suite was not provided`);
         }
-        this.l1Provider = new ethers.providers.JsonRpcProvider(this.env.l1NodeUrl);
+        this.l1Provider = new ethers.JsonRpcProvider(this.env.l1NodeUrl);
         this.l2Provider = new RetryProvider(
             {
                 url: this.env.l2NodeUrl,
diff --git a/core/tests/ts-integration/src/types.ts b/core/tests/ts-integration/src/types.ts
index bd4300031b84..058dcd4929d9 100644
--- a/core/tests/ts-integration/src/types.ts
+++ b/core/tests/ts-integration/src/types.ts
@@ -1,4 +1,12 @@
-import { ethers } from 'ethers';
+export enum NodeMode {
+    Main,
+    External
+}
+
+export enum DataAvailabityMode {
+    Rollup = 'Rollup',
+    Validium = 'Validium'
+}
 
 /**
  * Description of an ERC20 token.
@@ -6,7 +14,7 @@ import { ethers } from 'ethers';
 export interface Token {
     name: string;
     symbol: string;
-    decimals: number;
+    decimals: bigint;
     l1Address: string;
     l2Address: string;
 }
@@ -15,6 +23,38 @@ export interface Token {
  * Description of the environment the integration tests are being run in.
  */
 export interface TestEnvironment {
+    /*
+     * Max Logs limit
+     */
+    maxLogsLimit: number;
+    /*
+     * Gas limit for priority txs
+     */
+    priorityTxMaxGasLimit: bigint;
+    /*
+     * Gas limit for computations
+     */
+    validationComputationalGasLimit: number;
+    /*
+     * Minimal gas price of l2
+     */
+    minimalL2GasPrice: bigint;
+    /*
+     * Data availability mode
+     */
+    l1BatchCommitDataGeneratorMode: DataAvailabityMode;
+    /*
+     * Path to code home directory
+     */
+    pathToHome: string;
+    /**
+     * Chain Id of the L2 Network
+     */
+    l2ChainId: bigint;
+    /*
+     * Mode of the l2 node
+     */
+    nodeMode: NodeMode;
     /**
      * Plaintext name of the L1 network name (i.e. `localhost` or `goerli`).
      */
@@ -26,7 +66,7 @@ export interface TestEnvironment {
      */
     mainWalletPK: string;
     /**
-     * URL of zkSync node's HTTP Web3 API.
+     * URL of ZKsync node's HTTP Web3 API.
      */
     l2NodeUrl: string;
     /**
@@ -34,11 +74,11 @@ export interface TestEnvironment {
      */
     l1NodeUrl: string;
     /**
-     * URL of zkSync node's WS Web3 API.
+     * URL of ZKsync node's WS Web3 API.
      */
     wsL2NodeUrl: string;
     /**
-     * URL of zkSync node's contract verification API.
+     * URL of ZKsync node's contract verification API.
      */
     contractVerificationUrl: string;
     /**
@@ -78,7 +118,7 @@ export interface TestContext {
 }
 
 export interface Fee {
-    feeBeforeRefund: ethers.BigNumber;
-    feeAfterRefund: ethers.BigNumber;
-    refund: ethers.BigNumber;
+    feeBeforeRefund: bigint;
+    feeAfterRefund: bigint;
+    refund: bigint;
 }
diff --git a/core/tests/ts-integration/tests/api/contract-verification.test.ts b/core/tests/ts-integration/tests/api/contract-verification.test.ts
index 204eac2d8733..c0cd887bcf7d 100644
--- a/core/tests/ts-integration/tests/api/contract-verification.test.ts
+++ b/core/tests/ts-integration/tests/api/contract-verification.test.ts
@@ -1,10 +1,11 @@
-import { TestMaster } from '../../src/index';
+import { TestMaster } from '../../src';
 import * as zksync from 'zksync-ethers';
 import * as ethers from 'ethers';
 import fetch from 'node-fetch';
 import fs from 'fs';
 import { deployContract, getContractSource, getTestContract } from '../../src/helpers';
-import { sleep } from 'zksync-ethers/build/src/utils';
+import { sleep } from 'zksync-ethers/build/utils';
+import { NodeMode } from '../../src/types';
 
 // Regular expression to match ISO dates.
 const DATE_REGEX = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{6})?/;
@@ -44,7 +45,7 @@ describe('Tests for the contract verification API', () => {
             testMaster = TestMaster.getInstance(__filename);
             alice = testMaster.mainAccount();
 
-            if (process.env.ZKSYNC_ENV!.startsWith('ext-node')) {
+            if (testMaster.environment().nodeMode == NodeMode.External) {
                 console.warn("You are trying to run contract verification tests on external node. It's not supported.");
             }
         });
@@ -54,7 +55,7 @@ describe('Tests for the contract verification API', () => {
             const constructorArguments = counterContract.interface.encodeDeploy([]);
 
             const requestBody = {
-                contractAddress: counterContract.address,
+                contractAddress: await counterContract.getAddress(),
                 contractName: 'contracts/counter/counter.sol:Counter',
                 sourceCode: getContractSource('counter/counter.sol'),
                 compilerZksolcVersion: ZKSOLC_VERSION,
@@ -72,7 +73,7 @@ describe('Tests for the contract verification API', () => {
             let artifact = contracts.counter;
             // TODO: use plugin compilation when it's ready instead of pre-compiled bytecode.
             artifact.bytecode = fs.readFileSync(
-                `${process.env.ZKSYNC_HOME}/core/tests/ts-integration/contracts/counter/zkVM_bytecode.txt`,
+                `${testMaster.environment().pathToHome}/core/tests/ts-integration/contracts/counter/zkVM_bytecode.txt`,
                 'utf8'
             );
 
@@ -80,7 +81,7 @@ describe('Tests for the contract verification API', () => {
             const constructorArguments = counterContract.interface.encodeDeploy([]);
 
             const requestBody = {
-                contractAddress: counterContract.address,
+                contractAddress: await counterContract.getAddress(),
                 contractName: 'contracts/counter/counter.sol:Counter',
                 sourceCode: getContractSource('counter/counter.sol'),
                 compilerZksolcVersion: ZKSOLC_VERSION,
@@ -101,7 +102,7 @@ describe('Tests for the contract verification API', () => {
                     factoryDeps: [contracts.create.factoryDep]
                 }
             });
-            const importContract = await contractHandle.deployed();
+            const importContract = await contractHandle.waitForDeployment();
             const standardJsonInput = {
                 language: 'Solidity',
                 sources: {
@@ -121,7 +122,7 @@ describe('Tests for the contract verification API', () => {
             const constructorArguments = importContract.interface.encodeDeploy([]);
 
             const requestBody = {
-                contractAddress: importContract.address,
+                contractAddress: await importContract.getAddress(),
                 contractName: 'contracts/create/create.sol:Import',
                 sourceCode: standardJsonInput,
                 codeFormat: 'solidity-standard-json-input',
@@ -136,15 +137,19 @@ describe('Tests for the contract verification API', () => {
         });
 
         test('should test yul contract verification', async () => {
-            const contractPath = `${process.env.ZKSYNC_HOME}/core/tests/ts-integration/contracts/yul/Empty.yul`;
+            const contractPath = `${
+                testMaster.environment().pathToHome
+            }/core/tests/ts-integration/contracts/yul/Empty.yul`;
             const sourceCode = fs.readFileSync(contractPath, 'utf8');
 
-            const bytecodePath = `${process.env.ZKSYNC_HOME}/core/tests/ts-integration/contracts/yul/artifacts/Empty.yul/Empty.yul.zbin`;
+            const bytecodePath = `${
+                testMaster.environment().pathToHome
+            }/core/tests/ts-integration/contracts/yul/artifacts/Empty.yul/Empty.yul.zbin`;
             const bytecode = fs.readFileSync(bytecodePath);
 
             const contractFactory = new zksync.ContractFactory([], bytecode, alice);
             const deployTx = await contractFactory.deploy();
-            const contractAddress = (await deployTx.deployed()).address;
+            const contractAddress = await (await deployTx.waitForDeployment()).getAddress();
 
             const requestBody = {
                 contractAddress,
@@ -168,17 +173,17 @@ describe('Tests for the contract verification API', () => {
                 contracts.greeter2.bytecode,
                 alice
             );
-            const randomAddress = ethers.utils.hexlify(ethers.utils.randomBytes(20));
+            const randomAddress = ethers.hexlify(ethers.randomBytes(20));
             const contractHandle = await contractFactory.deploy(randomAddress, {
                 customData: {
                     factoryDeps: [contracts.greeter2.factoryDep]
                 }
             });
-            const contract = await contractHandle.deployed();
+            const contract = await contractHandle.waitForDeployment();
             const constructorArguments = contract.interface.encodeDeploy([randomAddress]);
 
             const requestBody = {
-                contractAddress: contract.address,
+                contractAddress: await contract.getAddress(),
                 contractName: 'Greeter2',
                 sourceCode: {
                     Greeter: getContractSource('vyper/Greeter.vy'),
diff --git a/core/tests/ts-integration/tests/api/debug.test.ts b/core/tests/ts-integration/tests/api/debug.test.ts
index b2ec606e0ef8..dd1ea141a419 100644
--- a/core/tests/ts-integration/tests/api/debug.test.ts
+++ b/core/tests/ts-integration/tests/api/debug.test.ts
@@ -7,7 +7,7 @@ import { Token } from '../../src/types';
 
 import * as zksync from 'zksync-ethers';
 import { ethers } from 'ethers';
-import { BOOTLOADER_FORMAL_ADDRESS } from 'zksync-ethers/build/src/utils';
+import { BOOTLOADER_FORMAL_ADDRESS } from 'zksync-ethers/build/utils';
 import fs from 'fs';
 
 describe('Debug methods', () => {
@@ -27,12 +27,14 @@ describe('Debug methods', () => {
     });
 
     test('Should not fail for infinity recursion', async () => {
-        const bytecodePath = `${process.env.ZKSYNC_HOME}/core/tests/ts-integration/contracts/zkasm/artifacts/deep_stak.zkasm/deep_stak.zkasm.zbin`;
+        const bytecodePath = `${
+            testMaster.environment().pathToHome
+        }/core/tests/ts-integration/contracts/zkasm/artifacts/deep_stak.zkasm/deep_stak.zkasm.zbin`;
         const bytecode = fs.readFileSync(bytecodePath);
 
         const contractFactory = new zksync.ContractFactory([], bytecode, testMaster.mainAccount());
         const deployTx = await contractFactory.deploy();
-        const contractAddress = (await deployTx.deployed()).address;
+        const contractAddress = await (await deployTx.waitForDeployment()).getAddress();
         let txCallTrace = await testMaster.mainAccount().provider.send('debug_traceCall', [
             {
                 to: contractAddress,
@@ -41,7 +43,7 @@ describe('Debug methods', () => {
         ]);
         let expected = {
             error: null,
-            from: ethers.constants.AddressZero,
+            from: ethers.ZeroAddress,
             gas: expect.any(String),
             gasUsed: expect.any(String),
             input: expect.any(String),
@@ -56,7 +58,7 @@ describe('Debug methods', () => {
     });
 
     test('Debug sending erc20 token in a block', async () => {
-        const value = ethers.BigNumber.from(200);
+        const value = 200n;
         await aliceErc20.transfer(bob.address, value).then((tx: any) => tx.wait());
         const tx = await aliceErc20.transfer(bob.address, value);
         const receipt = await tx.wait();
@@ -67,7 +69,7 @@ describe('Debug methods', () => {
             .mainAccount()
             .provider.send('debug_traceBlockByNumber', [receipt.blockNumber.toString(16), { tracer: 'callTracer' }]);
         const expectedTraceInBlock = {
-            from: ethers.constants.AddressZero,
+            from: ethers.ZeroAddress,
             gas: expect.any(String),
             gasUsed: expect.any(String),
             input: expect.any(String),
@@ -86,14 +88,14 @@ describe('Debug methods', () => {
 
         const expected = {
             error: null,
-            from: ethers.constants.AddressZero,
+            from: ethers.ZeroAddress,
             gas: expect.any(String),
             gasUsed: expect.any(String),
             input: `0xa9059cbb000000000000000000000000${bob.address
                 .slice(2, 42)
                 .toLowerCase()}00000000000000000000000000000000000000000000000000000000000000${value
-                .toHexString()
-                .slice(2, 4)}`,
+                .toString(16)
+                .slice(0, 2)}`, // no 0x prefix
             output: '0x',
             revertReason: null,
             to: BOOTLOADER_FORMAL_ADDRESS,
diff --git a/core/tests/ts-integration/tests/api/web3.test.ts b/core/tests/ts-integration/tests/api/web3.test.ts
index 37d37b25e676..f306d3be43a4 100644
--- a/core/tests/ts-integration/tests/api/web3.test.ts
+++ b/core/tests/ts-integration/tests/api/web3.test.ts
@@ -1,35 +1,38 @@
 /**
- * This suite contains tests for the Web3 API compatibility and zkSync-specific extensions.
+ * This suite contains tests for the Web3 API compatibility and ZKsync-specific extensions.
  */
 import { TestMaster } from '../../src';
 import * as zksync from 'zksync-ethers';
 import { types } from 'zksync-ethers';
-import { BigNumberish, ethers, Event } from 'ethers';
-import { serialize } from '@ethersproject/transactions';
-import { deployContract, getTestContract, waitForNewL1Batch, anyTransaction } from '../../src/helpers';
+import * as ethers from 'ethers';
+import { anyTransaction, deployContract, getTestContract, waitForNewL1Batch } from '../../src/helpers';
 import { shouldOnlyTakeFee } from '../../src/modifiers/balance-checker';
 import fetch, { RequestInit } from 'node-fetch';
-import { EIP712_TX_TYPE, PRIORITY_OPERATION_L2_TX_TYPE } from 'zksync-ethers/build/src/utils';
+import { EIP712_TX_TYPE, PRIORITY_OPERATION_L2_TX_TYPE } from 'zksync-ethers/build/utils';
+import { NodeMode } from '../../src/types';
+
 // Regular expression to match variable-length hex number.
 const HEX_VALUE_REGEX = /^0x[\da-fA-F]*$/;
 const DATE_REGEX = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{6})?/;
 
 const contracts = {
     counter: getTestContract('Counter'),
-    events: getTestContract('Emitter')
+    events: getTestContract('Emitter'),
+    outer: getTestContract('Outer'),
+    inner: getTestContract('Inner')
 };
 
 describe('web3 API compatibility tests', () => {
     let testMaster: TestMaster;
     let alice: zksync.Wallet;
     let l2Token: string;
-    let chainId: BigNumberish;
+    let chainId: bigint;
 
     beforeAll(async () => {
         testMaster = TestMaster.getInstance(__filename);
         alice = testMaster.mainAccount();
         l2Token = testMaster.environment().erc20Token.l2Address;
-        chainId = process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!;
+        chainId = testMaster.environment().l2ChainId;
     });
 
     test('Should test block/transaction web3 methods', async () => {
@@ -37,20 +40,20 @@ describe('web3 API compatibility tests', () => {
         const blockNumberHex = '0x1';
 
         // eth_getBlockByNumber
-        const blockHash = (await alice.provider.getBlock(blockNumber)).hash;
-        const blockWithTxsByNumber = await alice.provider.getBlockWithTransactions(blockNumber);
-        expect(blockWithTxsByNumber.gasLimit).bnToBeGt(0);
-        let sumTxGasUsed = ethers.BigNumber.from(0);
+        const blockHash = (await alice.provider.getBlock(blockNumber)).hash!;
+        const blockWithTxsByNumber = await alice.provider.getBlock(blockNumber, true);
+        expect(blockWithTxsByNumber.gasLimit).toBeGreaterThan(0n);
+        let sumTxGasUsed = 0n;
 
-        for (const tx of blockWithTxsByNumber.transactions) {
+        for (const tx of blockWithTxsByNumber.prefetchedTransactions) {
             const receipt = await alice.provider.getTransactionReceipt(tx.hash);
-            sumTxGasUsed = sumTxGasUsed.add(receipt.gasUsed);
+            sumTxGasUsed = sumTxGasUsed + receipt!.gasUsed;
         }
-        expect(blockWithTxsByNumber.gasUsed).bnToBeGte(sumTxGasUsed);
+        expect(blockWithTxsByNumber.gasUsed).toBeGreaterThanOrEqual(sumTxGasUsed);
 
         let expectedReceipts = [];
 
-        for (const tx of blockWithTxsByNumber.transactions) {
+        for (const tx of blockWithTxsByNumber.prefetchedTransactions) {
             const receipt = await alice.provider.send('eth_getTransactionReceipt', [tx.hash]);
             expectedReceipts.push(receipt);
         }
@@ -60,16 +63,16 @@ describe('web3 API compatibility tests', () => {
 
         // eth_getBlockByHash
         await alice.provider.getBlock(blockHash);
-        const blockWithTxsByHash = await alice.provider.getBlockWithTransactions(blockHash);
+        const blockWithTxsByHash = await alice.provider.getBlock(blockHash, true);
         expect(blockWithTxsByNumber.number).toEqual(blockWithTxsByHash.number);
 
         // eth_getBlockTransactionCountByNumber
         const txCountByNumber = await alice.provider.send('eth_getBlockTransactionCountByNumber', [blockNumberHex]);
-        expect(parseInt(txCountByNumber, 16)).toEqual(blockWithTxsByNumber.transactions.length);
+        expect(parseInt(txCountByNumber, 16)).toEqual(blockWithTxsByNumber.prefetchedTransactions.length);
 
         // eth_getBlockTransactionCountByHash
         const txCountByHash = await alice.provider.send('eth_getBlockTransactionCountByHash', [blockHash]);
-        expect(parseInt(txCountByHash, 16)).toEqual(blockWithTxsByNumber.transactions.length);
+        expect(parseInt(txCountByHash, 16)).toEqual(blockWithTxsByNumber.prefetchedTransactions.length);
 
         // eth_getTransactionByBlockNumberAndIndex
         const txByBlockNumberAndIndex = await alice.provider.send('eth_getTransactionByBlockNumberAndIndex', [
@@ -93,15 +96,15 @@ describe('web3 API compatibility tests', () => {
         const counterContract = await deployContract(alice, contracts.counter, []);
 
         // eth_getCode
-        const code = await alice.provider.getCode(counterContract.address);
-        expect(code).toEqual(ethers.utils.hexlify(contracts.counter.bytecode));
+        const code = await alice.provider.getCode(await counterContract.getAddress());
+        expect(code).toEqual(ethers.hexlify(contracts.counter.bytecode));
 
         // eth_getStorageAt
         const accCodeStorageAddress = '0x0000000000000000000000000000000000008002';
-        const codeKey = '0x000000000000000000000000' + counterContract.address.substring(2);
-        const codeHash = await alice.provider.getStorageAt(accCodeStorageAddress, codeKey);
+        const codeKey = '0x000000000000000000000000' + (await counterContract.getAddress()).substring(2);
+        const codeHash = await alice.provider.getStorage(accCodeStorageAddress, codeKey);
 
-        const expectedHash = ethers.utils.sha256(contracts.counter.bytecode);
+        const expectedHash = ethers.sha256(contracts.counter.bytecode);
         expect(codeHash.substring(10)).toEqual(expectedHash.substring(10));
     });
 
@@ -109,14 +112,14 @@ describe('web3 API compatibility tests', () => {
         // zks_getAllAccountBalances
         // NOTE: `getAllBalances` will not work on external node,
         // since TokenListFetcher is not running
-        if (!process.env.EN_MAIN_NODE_URL) {
+        if (testMaster.environment().nodeMode === NodeMode.Main) {
             const balances = await alice.getAllBalances();
             const tokenBalance = await alice.getBalance(l2Token);
-            expect(balances[l2Token.toLowerCase()].eq(tokenBalance));
+            expect(balances[l2Token.toLowerCase()] == tokenBalance);
         }
         // zks_L1ChainId
         const l1ChainId = (await alice.providerL1!.getNetwork()).chainId;
-        const l1ChainIdFromL2Provider = await alice.provider.l1ChainId();
+        const l1ChainIdFromL2Provider = BigInt(await alice.provider.l1ChainId());
         expect(l1ChainId).toEqual(l1ChainIdFromL2Provider);
         // zks_getBlockDetails
         const blockDetails = await alice.provider.getBlockDetails(1);
@@ -124,7 +127,7 @@ describe('web3 API compatibility tests', () => {
         expect(blockDetails.rootHash).toEqual(block.hash);
         expect(blockDetails.l1BatchNumber).toEqual(block.l1BatchNumber);
         // zks_getL1BatchDetails
-        const batchDetails = await alice.provider.getL1BatchDetails(block.l1BatchNumber);
+        const batchDetails = await alice.provider.getL1BatchDetails(block.l1BatchNumber!);
         expect(batchDetails.number).toEqual(block.l1BatchNumber);
         // zks_estimateFee
         const response = await alice.provider.send('zks_estimateFee', [
@@ -140,7 +143,7 @@ describe('web3 API compatibility tests', () => {
     });
 
     test('Should check the network version', async () => {
-        // Valid network IDs for zkSync are greater than 270.
+        // Valid network IDs for ZKsync are greater than 270.
         // This test suite may run on different envs, so we don't expect a particular ID.
         await expect(alice.provider.send('net_version', [])).resolves.toMatch(chainId.toString());
     });
@@ -174,6 +177,7 @@ describe('web3 API compatibility tests', () => {
             return;
         }
 
+        const EIP1559_TX_TYPE = 2;
         const amount = 1;
         const erc20ABI = ['function transfer(address to, uint256 amount)'];
         const erc20contract = new ethers.Contract(l2Token, erc20ABI, alice);
@@ -185,33 +189,33 @@ describe('web3 API compatibility tests', () => {
 
         // We must get the receipt explicitly, because the receipt obtained via `tx.wait()` could resolve
         // *before* the batch was created and not have all the fields set.
-        const receipt = await alice.provider.getTransactionReceipt(tx.transactionHash);
+        const receipt = await alice.provider.getTransactionReceipt(tx.hash);
         const logs = await alice.provider.getLogs({
-            fromBlock: receipt.blockNumber,
-            toBlock: receipt.blockNumber
+            fromBlock: receipt!.blockNumber,
+            toBlock: receipt!.blockNumber
         });
-        const block = await alice.provider.getBlock(receipt.blockNumber);
-        const blockWithTransactions = await alice.provider.getBlockWithTransactions(receipt.blockNumber);
-        const tx1 = await alice.provider.getTransaction(tx.transactionHash);
+        const block = await alice.provider.getBlock(receipt!.blockNumber);
+        const blockWithTransactions = await alice.provider.getBlock(receipt!.blockNumber, true);
+        const tx1 = await alice.provider.getTransaction(tx.hash);
         expect(tx1.l1BatchNumber).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
         expect(tx1.l1BatchTxIndex).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
-        expect(tx1.chainId).toEqual(+process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!);
-        expect(tx1.type).toEqual(0);
-
-        expect(receipt.l1BatchNumber).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
-        expect(receipt.l1BatchTxIndex).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
-        expect(receipt.logs[0].l1BatchNumber).toEqual(receipt.l1BatchNumber);
-        expect(logs[0].l1BatchNumber).toEqual(receipt.l1BatchNumber);
-        expect(block.l1BatchNumber).toEqual(receipt.l1BatchNumber);
+        expect(tx1.chainId).toEqual(chainId);
+        expect(tx1.type).toEqual(EIP1559_TX_TYPE);
+
+        expect(receipt!.l1BatchNumber).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
+        expect(receipt!.l1BatchTxIndex).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
+        expect(receipt!.logs[0].l1BatchNumber).toEqual(receipt!.l1BatchNumber);
+        expect(logs[0].l1BatchNumber).toEqual(receipt!.l1BatchNumber);
+        expect(block.l1BatchNumber).toEqual(receipt!.l1BatchNumber);
         expect(block.l1BatchTimestamp).toEqual(expect.anything());
-        expect(blockWithTransactions.l1BatchNumber).toEqual(receipt.l1BatchNumber);
+        expect(blockWithTransactions.l1BatchNumber).toEqual(receipt!.l1BatchNumber);
         expect(blockWithTransactions.l1BatchTimestamp).toEqual(expect.anything());
-        blockWithTransactions.transactions.forEach((txInBlock, _) => {
-            expect(txInBlock.l1BatchNumber).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
-            expect(txInBlock.l1BatchTxIndex).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
-            expect(txInBlock.chainId).toEqual(+process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!);
-            expect([0, EIP712_TX_TYPE, PRIORITY_OPERATION_L2_TX_TYPE]).toContain(txInBlock.type);
-        });
+        for (const tx of blockWithTransactions.prefetchedTransactions) {
+            expect(tx.l1BatchNumber).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
+            expect(tx.l1BatchTxIndex).toEqual(expect.anything()); // Can be anything except `null` or `undefined`.
+            expect(tx.chainId).toEqual(chainId);
+            expect([0, EIP712_TX_TYPE, PRIORITY_OPERATION_L2_TX_TYPE, EIP1559_TX_TYPE]).toContain(tx.type);
+        }
     });
 
     test('Should check transactions from API / Legacy tx', async () => {
@@ -223,7 +227,7 @@ describe('web3 API compatibility tests', () => {
         await legacyTx.wait();
 
         const legacyApiReceipt = await alice.provider.getTransaction(legacyTx.hash);
-        expect(legacyApiReceipt.gasPrice).bnToBeLte(legacyTx.gasPrice!);
+        expect(legacyApiReceipt.gasPrice).toBeLessThanOrEqual(legacyTx.gasPrice!);
     });
 
     test('Should check transactions from API / EIP1559 tx', async () => {
@@ -235,12 +239,12 @@ describe('web3 API compatibility tests', () => {
         await eip1559Tx.wait();
 
         const eip1559ApiReceipt = await alice.provider.getTransaction(eip1559Tx.hash);
-        expect(eip1559ApiReceipt.maxFeePerGas).bnToBeEq(eip1559Tx.maxFeePerGas!);
-        expect(eip1559ApiReceipt.maxPriorityFeePerGas).bnToBeEq(eip1559Tx.maxPriorityFeePerGas!);
+        expect(eip1559ApiReceipt.maxFeePerGas).toEqual(eip1559Tx.maxFeePerGas!);
+        expect(eip1559ApiReceipt.maxPriorityFeePerGas).toEqual(eip1559Tx.maxPriorityFeePerGas!);
     });
 
     test('Should test getFilterChanges for pending transactions', async () => {
-        if (process.env.EN_MAIN_NODE_URL) {
+        if (testMaster.environment().nodeMode === NodeMode.External) {
             // Pending transactions logic doesn't work on EN since we don't have a proper mempool -
             // transactions only appear in the DB after they are included in the block.
             return;
@@ -291,7 +295,7 @@ describe('web3 API compatibility tests', () => {
 
     test('Should test pub-sub API: blocks', async () => {
         // Checks that we can receive an event for new block being created.
-        let wsProvider = new ethers.providers.WebSocketProvider(testMaster.environment().wsL2NodeUrl);
+        let wsProvider = new ethers.WebSocketProvider(testMaster.environment().wsL2NodeUrl);
 
         let newBlock: number | null = null;
         const currentBlock = await alice._providerL2().getBlockNumber();
@@ -326,7 +330,7 @@ describe('web3 API compatibility tests', () => {
 
     test('Should test pub-sub API: txs', async () => {
         // Checks that we can receive an event for new pending transactions.
-        let wsProvider = new ethers.providers.WebSocketProvider(testMaster.environment().wsL2NodeUrl);
+        let wsProvider = new ethers.WebSocketProvider(testMaster.environment().wsL2NodeUrl);
 
         // We're sending a few transfers from the wallet, so we'll use a new account to make event unique.
         let uniqueRecipient = testMaster.newEmptyAccount().address;
@@ -347,7 +351,7 @@ describe('web3 API compatibility tests', () => {
         const tx = await alice.transfer({
             to: uniqueRecipient,
             amount: 1,
-            token: zksync.utils.ETH_ADDRESS // With ERC20 "to" would be an address of the contract.
+            token: zksync.utils.L2_BASE_TOKEN_ADDRESS // With ERC20 "to" would be an address of the contract.
         });
 
         let iterationsCount = 0;
@@ -363,20 +367,20 @@ describe('web3 API compatibility tests', () => {
 
     test('Should test pub-sub API: events', async () => {
         // Checks that we can receive an event for events matching a certain filter.
-        let wsProvider = new ethers.providers.WebSocketProvider(testMaster.environment().wsL2NodeUrl);
+        let wsProvider = new ethers.WebSocketProvider(testMaster.environment().wsL2NodeUrl);
         let newEvent: Event | null = null;
 
         // We're sending a few transfers from the wallet, so we'll use a new account to make event unique.
         let uniqueRecipient = testMaster.newEmptyAccount().address;
 
         // Setup a filter for an ERC20 transfer.
-        const erc20TransferTopic = ethers.utils.id('Transfer(address,address,uint256)');
+        const erc20TransferTopic = ethers.id('Transfer(address,address,uint256)');
         let filter = {
             address: l2Token,
             topics: [
                 erc20TransferTopic,
-                ethers.utils.hexZeroPad(alice.address, 32), // Filter only transfers from this wallet.,
-                ethers.utils.hexZeroPad(uniqueRecipient, 32) // Recipient
+                ethers.zeroPadValue(alice.address, 32), // Filter only transfers from this wallet.,
+                ethers.zeroPadValue(uniqueRecipient, 32) // Recipient
             ]
         };
         wsProvider.once(filter, (event) => {
@@ -402,7 +406,7 @@ describe('web3 API compatibility tests', () => {
             await tryWait(iterationsCount++);
         }
 
-        expect((newEvent as any as Event).transactionHash).toEqual(tx.hash);
+        expect((newEvent as any).transactionHash).toEqual(tx.hash);
         await tx.wait(); // To not leave a hanging promise.
         wsProvider.removeAllListeners();
         await wsProvider.destroy();
@@ -412,7 +416,7 @@ describe('web3 API compatibility tests', () => {
         const amount = 1;
         const token = l2Token;
 
-        const randomHash = ethers.utils.hexlify(ethers.utils.randomBytes(32));
+        const randomHash = ethers.hexlify(ethers.randomBytes(32));
         let status = await alice.provider.getTransactionStatus(randomHash);
         expect(status).toEqual(types.TransactionStatus.NotFound);
 
@@ -448,7 +452,7 @@ describe('web3 API compatibility tests', () => {
         const amount = 1;
         const token = l2Token;
 
-        const randomHash = ethers.utils.hexlify(ethers.utils.randomBytes(32));
+        const randomHash = ethers.hexlify(ethers.randomBytes(32));
         let details = await alice.provider.getTransactionDetails(randomHash);
         expect(details).toEqual(null);
 
@@ -471,14 +475,14 @@ describe('web3 API compatibility tests', () => {
         const receipt = await sentTx.wait();
         expectedDetails.status = expect.stringMatching(/failed|included|verified/);
 
-        details = await alice.provider.getTransactionDetails(receipt.transactionHash);
+        details = await alice.provider.getTransactionDetails(receipt.hash);
         expect(details).toMatchObject(expectedDetails);
 
         if (!testMaster.isFastMode()) {
             // It's not worth it to wait for finalization in the API test.
             // If it works on localhost, it *must* work elsewhere.
             await sentTx.waitFinalize();
-            details = await alice.provider.getTransactionDetails(receipt.transactionHash);
+            details = await alice.provider.getTransactionDetails(receipt.hash);
             expectedDetails.status = expect.stringMatching(/verified/);
             expect(details).toMatchObject(expectedDetails);
         }
@@ -497,7 +501,7 @@ describe('web3 API compatibility tests', () => {
         });
         const receipt = await sentTx.wait();
 
-        let details = await alice.provider.getTransactionDetails(receipt.transactionHash);
+        let details = await alice.provider.getTransactionDetails(receipt.hash);
 
         let expectedDetails = {
             fee: expect.stringMatching(HEX_VALUE_REGEX),
@@ -518,18 +522,18 @@ describe('web3 API compatibility tests', () => {
         const [from, to] = range!;
 
         for (let i = from; i <= to; i++) {
-            const block = await alice.provider.getBlockWithTransactions(i);
+            const block = await alice.provider.getBlock(i, true);
             expect(block.l1BatchNumber).toEqual(l1BatchNumber);
             expect(block.l1BatchTimestamp).toEqual(expect.anything());
             expect(block.number).toEqual(i);
-            for (let tx of block.transactions) {
+            for (let tx of block.prefetchedTransactions) {
                 expect(tx.blockNumber).toEqual(i);
                 const receipt = await alice.provider.getTransactionReceipt(tx.hash);
-                expect(receipt.l1BatchNumber).toEqual(l1BatchNumber);
+                expect(receipt!.l1BatchNumber).toEqual(l1BatchNumber);
             }
         }
 
-        const prevBlock = await alice.provider.getBlockWithTransactions(from - 1);
+        const prevBlock = await alice.provider.getBlock(from - 1, true);
         expect(prevBlock.l1BatchNumber).toEqual(l1BatchNumber - 1);
 
         const nextBlock = await alice.provider.getBlock(to + 1);
@@ -540,12 +544,12 @@ describe('web3 API compatibility tests', () => {
     // subscribe for events and then send transactions. However, this test
     // sometimes fails because one of the events was not received. Probably, there is
     // some problem in the pub-sub API that should be found & fixed.
-    test.skip('Should listen for human-readable events', async () => {
+    test('Should listen for human-readable events', async () => {
         const contract = await deployContract(alice, contracts.events, []);
 
         const blockNumber = await alice.provider.getBlockNumber();
-        const deadbeef = ethers.utils.hexZeroPad('0xdeadbeef', 20);
-        const c0ffee = ethers.utils.hexZeroPad('0xc0ffee', 20);
+        const deadbeef = ethers.zeroPadValue('0xdeadbeef', 20);
+        const c0ffee = ethers.zeroPadValue('0xc0ffee', 20);
         const emitted = {
             trivial: 0,
             simple: 0,
@@ -553,17 +557,18 @@ describe('web3 API compatibility tests', () => {
         };
 
         contract.connect(alice);
-        contract
-            .on(contract.filters.Trivial(), () => ++emitted.trivial)
-            .on(contract.filters.Simple(), (_number: any, address: any) => {
+        (
+            await (
+                await contract.on(contract.filters.Trivial(), () => ++emitted.trivial)
+            ).on(contract.filters.Simple(), (_number: any, address: any) => {
                 ++emitted.simple;
                 expect(address.toLowerCase()).toEqual(deadbeef);
             })
-            .on(contract.filters.Indexed(42), (number: any, address: any) => {
-                ++emitted.indexed;
-                expect(number.toNumber()).toEqual(42);
-                expect(address.toLowerCase()).toEqual(c0ffee);
-            });
+        ).on(contract.filters.Indexed(42), (number: any, address: any) => {
+            ++emitted.indexed;
+            expect(number.toNumber()).toEqual(42);
+            expect(address.toLowerCase()).toEqual(c0ffee);
+        });
 
         let tx = await contract.test(42);
         await tx.wait();
@@ -604,10 +609,10 @@ describe('web3 API compatibility tests', () => {
 
     test('Should check metamask interoperability', async () => {
         // Prepare "metamask" wallet.
-        const from = new MockMetamask(alice);
+        const from = new MockMetamask(alice, chainId);
         const to = alice.address;
-        const web3Provider = new zksync.Web3Provider(from);
-        const signer = web3Provider.getSigner();
+        const browserProvider = new zksync.BrowserProvider(from);
+        const signer = zksync.Signer.from(await browserProvider.getSigner(), Number(chainId), alice.provider);
 
         // Check to ensure that tx was correctly processed.
         const feeCheck = await shouldOnlyTakeFee(alice);
@@ -647,9 +652,7 @@ describe('web3 API compatibility tests', () => {
 
     test('Should check API returns error when there are too many logs in eth_getLogs', async () => {
         const contract = await deployContract(alice, contracts.events, []);
-        const maxLogsLimit = parseInt(
-            process.env.EN_REQ_ENTITIES_LIMIT ?? process.env.API_WEB3_JSON_RPC_REQ_ENTITIES_LIMIT!
-        );
+        const maxLogsLimit = testMaster.environment().maxLogsLimit;
 
         // Send 3 transactions that emit `maxLogsLimit / 2` events.
         const tx1 = await contract.emitManyEvents(maxLogsLimit / 2);
@@ -675,7 +678,9 @@ describe('web3 API compatibility tests', () => {
 
     test('Should throw error for estimate gas for account with balance < tx.value', async () => {
         let poorBob = testMaster.newEmptyAccount();
-        expect(poorBob.estimateGas({ value: 1, to: alice.address })).toBeRejected('insufficient balance for transfer');
+        expect(
+            poorBob.estimateGas({ value: 1, to: alice.address })
+        ).toBeRejected(/*'insufficient balance for transfer'*/);
     });
 
     test('Should check API returns correct block for every tag', async () => {
@@ -687,6 +692,8 @@ describe('web3 API compatibility tests', () => {
         expect(+finalizedBlock.number!).toEqual(expect.any(Number));
         const latestBlock = await alice.provider.send('eth_getBlockByNumber', ['latest', true]);
         expect(+latestBlock.number!).toEqual(expect.any(Number));
+        const l1CommittedBlock = await alice.provider.send('eth_getBlockByNumber', ['l1_committed', true]);
+        expect(+l1CommittedBlock.number!).toEqual(expect.any(Number));
         const pendingBlock = await alice.provider.send('eth_getBlockByNumber', ['pending', true]);
         expect(pendingBlock).toEqual(null);
     });
@@ -695,12 +702,12 @@ describe('web3 API compatibility tests', () => {
         const gasPrice = await alice.provider.getGasPrice();
         const chainId = (await alice.provider.getNetwork()).chainId;
         const address = zksync.Wallet.createRandom().address;
-        const senderNonce = await alice.getTransactionCount();
-        const tx: ethers.providers.TransactionRequest = {
+        const senderNonce = await alice.getNonce();
+        const tx: ethers.TransactionRequest = {
             to: address,
             from: alice.address,
             nonce: senderNonce,
-            gasLimit: ethers.BigNumber.from(300000),
+            gasLimit: 300000n,
             gasPrice,
             data: '0x',
             value: 0,
@@ -729,8 +736,8 @@ describe('web3 API compatibility tests', () => {
             address: l2Token,
             topics: [
                 '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
-                ethers.utils.hexZeroPad(alice.address, 32),
-                ethers.utils.hexZeroPad(uniqueRecipient, 32)
+                ethers.zeroPadValue(alice.address, 32),
+                ethers.zeroPadValue(uniqueRecipient, 32)
             ]
         });
         expect(logs).toHaveLength(1);
@@ -784,16 +791,10 @@ describe('web3 API compatibility tests', () => {
                 toBlock: latestBlock.number
             })
         ).map((x) => {
-            x.l1BatchNumber = 0; // Set bogus value.
-            return x;
+            return new zksync.types.Log({ ...x, l1BatchNumber: 0 }, alice.provider); // Set bogus value.
         });
-        const getLogsByHash = (
-            await alice.provider.getLogs({
-                blockHash: latestBlock.hash
-            })
-        ).map((x) => {
-            x.l1BatchNumber = 0; // Set bogus value.
-            return x;
+        const getLogsByHash = (await alice.provider.getLogs({ blockHash: latestBlock.hash || undefined })).map((x) => {
+            return new zksync.types.Log({ ...x, l1BatchNumber: 0 }, alice.provider); // Set bogus value.
         });
         await expect(getLogsByNumber).toEqual(getLogsByHash);
 
@@ -802,25 +803,21 @@ describe('web3 API compatibility tests', () => {
             alice.provider.getLogs({
                 fromBlock: latestBlock.number,
                 toBlock: latestBlock.number,
-                blockHash: latestBlock.hash
+                blockHash: latestBlock.hash || undefined
             })
-        ).rejects.toThrow(`invalid filter: if blockHash is supplied fromBlock and toBlock must not be`);
+        ).rejects.toThrow(`invalid filter`);
     });
 
     test('Should check eth_feeHistory', async () => {
         const receipt = await anyTransaction(alice);
-        const response = await alice.provider.send('eth_feeHistory', [
-            '0x2',
-            ethers.utils.hexlify(receipt.blockNumber),
-            []
-        ]);
+        const response = await alice.provider.send('eth_feeHistory', ['0x2', ethers.toBeHex(receipt.blockNumber), []]);
 
-        expect(ethers.BigNumber.from(response.oldestBlock).toNumber()).toEqual(receipt.blockNumber - 1);
+        expect(parseInt(response.oldestBlock)).toEqual(receipt.blockNumber - 1);
 
         expect(response.baseFeePerGas).toHaveLength(3);
         for (let i = 0; i < 2; i += 1) {
             const expectedBaseFee = (await alice.provider.getBlock(receipt.blockNumber - 1 + i)).baseFeePerGas;
-            expect(ethers.BigNumber.from(response.baseFeePerGas[i])).toEqual(expectedBaseFee);
+            expect(BigInt(response.baseFeePerGas[i])).toEqual(expectedBaseFee);
         }
     });
 
@@ -832,7 +829,10 @@ describe('web3 API compatibility tests', () => {
         };
         let expectedProtocolVersion = {
             version_id: expect.any(Number),
+            minorVersion: expect.any(Number),
             base_system_contracts: expectedSysContractsHashes,
+            bootloaderCodeHash: expect.stringMatching(HEX_VALUE_REGEX),
+            defaultAccountCodeHash: expect.stringMatching(HEX_VALUE_REGEX),
             verification_keys_hashes: {
                 params: {
                     recursion_circuits_set_vks_hash: expect.stringMatching(HEX_VALUE_REGEX),
@@ -846,86 +846,103 @@ describe('web3 API compatibility tests', () => {
         expect(latestProtocolVersion).toMatchObject(expectedProtocolVersion);
 
         const exactProtocolVersion = await alice.provider.send('zks_getProtocolVersion', [
-            latestProtocolVersion.version_id
+            latestProtocolVersion.minorVersion
         ]);
         expect(exactProtocolVersion).toMatchObject(expectedProtocolVersion);
     });
 
-    test('Should check transaction signature', async () => {
-        const CHAIN_ID = +process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!;
+    test('Should check transaction signature for legacy transaction type', async () => {
         const value = 1;
         const gasLimit = 350000;
         const gasPrice = await alice.provider.getGasPrice();
         const data = '0x';
         const to = alice.address;
 
-        let tx_handle;
-        let txFromApi;
-        let signerAddr;
-
-        // check for legacy transaction type
         const LEGACY_TX_TYPE = 0;
         const legacyTxReq = {
             type: LEGACY_TX_TYPE,
             to,
             value,
-            chainId: CHAIN_ID,
+            chainId,
             gasLimit,
             gasPrice,
             data,
-            nonce: await alice.getTransactionCount()
+            nonce: await alice.getNonce()
         };
         const signedLegacyTx = await alice.signTransaction(legacyTxReq);
-        tx_handle = await alice.provider.sendTransaction(signedLegacyTx);
+        const tx_handle = await alice.provider.broadcastTransaction(signedLegacyTx);
         await tx_handle.wait();
 
-        txFromApi = await alice.provider.getTransaction(tx_handle.hash);
+        const txFromApi = await alice.provider.getTransaction(tx_handle.hash);
 
-        const serializedLegacyTxReq = ethers.utils.serializeTransaction(legacyTxReq);
+        const serializedLegacyTxReq = ethers.Transaction.from(legacyTxReq).unsignedSerialized;
 
         // check that API returns correct signature values for the given transaction
         // by invoking recoverAddress() method with the serialized transaction and signature values
-        signerAddr = ethers.utils.recoverAddress(ethers.utils.keccak256(serializedLegacyTxReq), {
-            r: txFromApi.r!,
-            s: txFromApi.s!,
-            v: txFromApi.v!
-        });
+        const signerAddr = ethers.recoverAddress(ethers.keccak256(serializedLegacyTxReq), txFromApi.signature);
         expect(signerAddr).toEqual(alice.address);
 
-        const expectedV = 35 + CHAIN_ID! * 2;
-        expect(Math.abs(txFromApi.v! - expectedV) <= 1).toEqual(true);
+        const expectedV = 35n + BigInt(chainId) * 2n;
+        const actualV = ethers.Signature.getChainIdV(chainId, txFromApi.signature.v);
+        expect(actualV === expectedV);
+    });
+
+    test('Should check transaction signature for EIP1559 transaction type', async () => {
+        const value = 1;
+        const gasLimit = 350000;
+        const gasPrice = await alice.provider.getGasPrice();
+        const data = '0x';
+        const to = alice.address;
 
-        // check for EIP1559 transaction type
         const EIP1559_TX_TYPE = 2;
         const eip1559TxReq = {
             type: EIP1559_TX_TYPE,
             to,
             value,
-            chainId: CHAIN_ID,
+            chainId,
             gasLimit,
             data,
-            nonce: await alice.getTransactionCount(),
+            nonce: await alice.getNonce(),
             maxFeePerGas: gasPrice,
             maxPriorityFeePerGas: gasPrice
         };
 
         const signedEip1559TxReq = await alice.signTransaction(eip1559TxReq);
-        tx_handle = await alice.provider.sendTransaction(signedEip1559TxReq);
+        const tx_handle = await alice.provider.broadcastTransaction(signedEip1559TxReq);
         await tx_handle.wait();
 
-        txFromApi = await alice.provider.getTransaction(tx_handle.hash);
+        const txFromApi = await alice.provider.getTransaction(tx_handle.hash);
 
-        const serializedEip1559TxReq = ethers.utils.serializeTransaction(eip1559TxReq);
+        const serializedEip1559TxReq = ethers.Transaction.from(eip1559TxReq).unsignedSerialized;
 
         // check that API returns correct signature values for the given transaction
         // by invoking recoverAddress() method with the serialized transaction and signature values
-        signerAddr = ethers.utils.recoverAddress(ethers.utils.keccak256(serializedEip1559TxReq), {
-            r: txFromApi.r!,
-            s: txFromApi.s!,
-            v: txFromApi.v!
-        });
+        const signerAddr = ethers.recoverAddress(ethers.keccak256(serializedEip1559TxReq), txFromApi.signature);
         expect(signerAddr).toEqual(alice.address);
-        expect(txFromApi.v! <= 1).toEqual(true);
+        expect(txFromApi.signature.v! === 27 || 28);
+    });
+
+    // We want to be sure that correct(outer) contract address is return in the transaction receipt,
+    // when there is a contract that initializa another contract in the constructor
+    test('Should check inner-outer contract address in the receipt of the deploy tx', async () => {
+        const deploymentNonce = await alice.getDeploymentNonce();
+        const expectedAddress = zksync.utils.createAddress(alice.address, deploymentNonce);
+
+        const expectedBytecode = contracts.outer.bytecode;
+
+        let innerContractBytecode = contracts.inner.bytecode;
+        let outerContractOverrides = {
+            customData: {
+                factoryDeps: [innerContractBytecode]
+            }
+        };
+        const outerContract = await deployContract(alice, contracts.outer, [1], undefined, outerContractOverrides);
+        const contract = await outerContract.waitForDeployment();
+
+        const deployedBytecode = await alice.provider.getCode(await contract.getAddress());
+
+        expect(expectedAddress).toEqual(await contract.getAddress());
+        expect(expectedBytecode).toEqual(deployedBytecode);
     });
 
     afterAll(async () => {
@@ -949,10 +966,11 @@ describe('web3 API compatibility tests', () => {
 
 export class MockMetamask {
     readonly isMetaMask: boolean = true;
-    readonly networkVersion = parseInt(process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!, 10);
-    readonly chainId: string = ethers.utils.hexlify(parseInt(process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!, 10));
+    readonly chainId: string;
 
-    constructor(readonly wallet: zksync.Wallet) {}
+    constructor(readonly wallet: zksync.Wallet, readonly networkVersion: bigint) {
+        this.chainId = ethers.toBeHex(networkVersion);
+    }
 
     // EIP-1193
     async request(req: { method: string; params?: any[] }) {
@@ -974,19 +992,18 @@ export class MockMetamask {
                 delete tx.gas;
                 let populated = {
                     ...(await this.wallet.populateTransaction(tx)),
-                    nonce: await this.wallet.getTransactionCount()
+                    nonce: await this.wallet.getNonce()
                 };
                 delete populated.from;
-                const signature = this.wallet._signingKey().signDigest(ethers.utils.keccak256(serialize(populated)));
-                const signed = serialize(populated, signature);
-                const response = await this.wallet.provider.sendTransaction(signed);
+                const signed = await this.wallet.signTransaction(populated);
+                const response = await this.wallet.provider.broadcastTransaction(signed);
                 return response.hash;
             case 'eth_getTransactionCount':
-                return this.wallet.getTransactionCount();
+                return this.wallet.getNonce();
             case 'eth_signTypedData_v4':
                 let payload = JSON.parse(params[1]);
                 delete payload.types.EIP712Domain;
-                return this.wallet._signTypedData(payload.domain, payload.types, payload.message);
+                return this.wallet.signTypedData(payload.domain, payload.types, payload.message);
             default:
                 // unfortunately though, metamask does not forward methods from zks_ namespace
                 if (method.startsWith('zks')) {
diff --git a/core/tests/ts-integration/tests/base-token.test.ts b/core/tests/ts-integration/tests/base-token.test.ts
index 00c7196ea854..51d88f7dd52a 100644
--- a/core/tests/ts-integration/tests/base-token.test.ts
+++ b/core/tests/ts-integration/tests/base-token.test.ts
@@ -2,11 +2,11 @@
  * This suite contains tests checking default ERC-20 contract behavior.
  */
 
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 import { Token } from '../src/types';
 
 import * as zksync from 'zksync-ethers';
-import { BigNumber, utils as etherUtils } from 'ethers';
+import * as ethers from 'ethers';
 import { scaledGasPrice } from '../src/helpers';
 
 describe('base ERC20 contract checks', () => {
@@ -27,8 +27,8 @@ describe('base ERC20 contract checks', () => {
     });
 
     test('Can perform a deposit', async () => {
-        const amount = 1; // 1 wei is enough.
-        const gasPrice = scaledGasPrice(alice);
+        const amount = 1n; // 1 wei is enough.
+        const gasPrice = await scaledGasPrice(alice);
 
         const initialEthBalance = await alice.getBalanceL1();
         const initialL1Balance = await alice.getBalanceL1(baseTokenDetails.l1Address);
@@ -53,23 +53,26 @@ describe('base ERC20 contract checks', () => {
         await depositTx.wait();
 
         const receipt = await alice._providerL1().getTransactionReceipt(depositHash);
-        const fee = receipt.effectiveGasPrice.mul(receipt.gasUsed);
+        if (!receipt) {
+            throw new Error('No receipt for deposit');
+        }
+        const fee = receipt.gasPrice * receipt.gasUsed;
 
         // TODO: should all the following tests use strict equality?
 
         const finalEthBalance = await alice.getBalanceL1();
-        expect(initialEthBalance).bnToBeGt(finalEthBalance.add(fee)); // Fee should be taken from the ETH balance on L1.
+        expect(initialEthBalance).toBeGreaterThan(finalEthBalance + fee); // Fee should be taken from the ETH balance on L1.
 
         const finalL1Balance = await alice.getBalanceL1(baseTokenDetails.l1Address);
-        expect(initialL1Balance).bnToBeGte(finalL1Balance.add(amount));
+        expect(initialL1Balance).toBeGreaterThanOrEqual(finalL1Balance + amount);
 
         const finalL2Balance = await alice.getBalance();
-        expect(initialL2Balance).bnToBeLte(finalL2Balance.add(amount));
+        expect(initialL2Balance).toBeLessThanOrEqual(finalL2Balance + amount);
     });
 
     test('Not enough balance should revert', async () => {
-        const amount = BigNumber.from('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffff');
-        const gasPrice = scaledGasPrice(alice);
+        const amount = BigInt('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffff');
+        const gasPrice = await scaledGasPrice(alice);
         let errorMessage;
 
         await expect(
@@ -92,7 +95,7 @@ describe('base ERC20 contract checks', () => {
     });
 
     test('Can perform a transfer to self', async () => {
-        const amount = BigNumber.from(200);
+        const amount = 200n;
 
         const initialAliceBalance = await alice.getBalance();
 
@@ -107,14 +110,14 @@ describe('base ERC20 contract checks', () => {
         await transferTx.waitFinalize();
 
         const receipt = await alice._providerL2().getTransactionReceipt(transferTx.hash);
-        const fee = receipt.effectiveGasPrice.mul(receipt.gasUsed);
+        const fee = receipt!.gasPrice * receipt!.gasUsed;
 
         const finalAliceBalance = await alice.getBalance();
-        expect(initialAliceBalance.sub(fee)).bnToBeEq(finalAliceBalance);
+        expect(initialAliceBalance - fee).toEqual(finalAliceBalance);
     });
 
     test('Incorrect transfer should revert', async () => {
-        const amount = etherUtils.parseEther('1000000.0');
+        const amount = ethers.parseEther('1000000.0');
 
         const initialAliceBalance = await alice.getBalance();
         const initialBobBalance = await bob.getBalance();
@@ -131,15 +134,15 @@ describe('base ERC20 contract checks', () => {
         const finalAliceBalance = await alice.getBalance();
         const finalBobBalance = await bob.getBalance();
 
-        await expect(finalAliceBalance).bnToBeEq(initialAliceBalance);
-        await expect(finalBobBalance).bnToBeEq(initialBobBalance);
+        await expect(finalAliceBalance).toEqual(initialAliceBalance);
+        await expect(finalBobBalance).toEqual(initialBobBalance);
     });
 
     test('Can perform a withdrawal', async () => {
         if (testMaster.isFastMode() || isETHBasedChain) {
             return;
         }
-        const amount = 1;
+        const amount = 1n;
 
         const initialL1Balance = await alice.getBalanceL1(baseTokenDetails.l1Address);
         const initialL2Balance = await alice.getBalance();
@@ -151,13 +154,13 @@ describe('base ERC20 contract checks', () => {
 
         await expect(alice.finalizeWithdrawal(withdrawalTx.hash)).toBeAccepted([]);
         const receipt = await alice._providerL2().getTransactionReceipt(withdrawalTx.hash);
-        const fee = receipt.effectiveGasPrice.mul(receipt.gasUsed);
+        const fee = receipt!.gasPrice * receipt!.gasUsed;
 
         const finalL1Balance = await alice.getBalanceL1(baseTokenDetails.l1Address);
         const finalL2Balance = await alice.getBalance();
 
-        expect(finalL1Balance).bnToBeEq(initialL1Balance.add(amount));
-        expect(finalL2Balance.add(amount).add(fee)).bnToBeEq(initialL2Balance);
+        expect(finalL1Balance).toEqual(initialL1Balance + amount);
+        expect(finalL2Balance + amount + fee).toEqual(initialL2Balance);
     });
 
     afterAll(async () => {
diff --git a/core/tests/ts-integration/tests/contracts.test.ts b/core/tests/ts-integration/tests/contracts.test.ts
index 443820b1dab1..e22385a1b278 100644
--- a/core/tests/ts-integration/tests/contracts.test.ts
+++ b/core/tests/ts-integration/tests/contracts.test.ts
@@ -6,13 +6,12 @@
  * Let's try to keep only relatively simple and self-contained tests here.
  */
 
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 import { deployContract, getTestContract, waitForNewL1Batch } from '../src/helpers';
 import { shouldOnlyTakeFee } from '../src/modifiers/balance-checker';
 
 import * as ethers from 'ethers';
 import * as zksync from 'zksync-ethers';
-import { Provider } from 'zksync-ethers';
 import * as elliptic from 'elliptic';
 import { RetryProvider } from '../src/retry-provider';
 
@@ -47,27 +46,27 @@ describe('Smart contract behavior checks', () => {
         const feeCheck = await shouldOnlyTakeFee(alice);
 
         // Change the storage slot and ensure it actually changes.
-        expect(counterContract.get()).resolves.bnToBeEq(0);
+        expect(counterContract.get()).resolves.toEqual(0n);
         await expect(counterContract.increment(42)).toBeAccepted([feeCheck]);
-        expect(counterContract.get()).resolves.bnToBeEq(42);
+        expect(counterContract.get()).resolves.toEqual(42n);
     });
 
     test('Should deploy contract with a constructor', async () => {
         const contract1 = await deployContract(alice, contracts.constructor, [2, 3, false]);
-        await expect(contract1.get()).resolves.bnToBeEq(2 * 3);
+        await expect(contract1.get()).resolves.toEqual(2n * 3n);
 
         const contract2 = await deployContract(alice, contracts.constructor, [5, 10, false]);
-        await expect(contract2.get()).resolves.bnToBeEq(5 * 10);
+        await expect(contract2.get()).resolves.toEqual(5n * 10n);
     });
 
     test('Should deploy contract with create', async () => {
         const contractFactory = new zksync.ContractFactory(contracts.create.abi, contracts.create.bytecode, alice);
-        const contract = await contractFactory.deploy({
+        const contract = (await contractFactory.deploy({
             customData: {
                 factoryDeps: [contracts.create.factoryDep]
             }
-        });
-        await contract.deployed();
+        })) as zksync.Contract;
+        await contract.waitForDeployment();
         await expect(contract.getFooName()).resolves.toBe('Foo');
     });
 
@@ -80,7 +79,7 @@ describe('Smart contract behavior checks', () => {
         // Second, check that processable transaction may fail with "out of gas" error.
         // To do so, we estimate gas for arg "1" and supply it to arg "20".
         // This guarantees that transaction won't fail during verification.
-        const lowGasLimit = await expensiveContract.estimateGas.expensive(1);
+        const lowGasLimit = await expensiveContract.expensive.estimateGas(1);
         await expect(
             expensiveContract.expensive(20, {
                 gasLimit: lowGasLimit
@@ -114,86 +113,124 @@ describe('Smart contract behavior checks', () => {
 
         // The tx has been reverted, so the value Should not have been changed:
         const newValue = await counterContract.get();
-        expect(newValue).bnToBeEq(prevValue, 'The counter has changed despite the revert');
+        expect(newValue).toEqual(prevValue); // The counter has changed despite the revert
     });
 
     test('Should not allow invalid constructor calldata', async () => {
         const randomWrongArgs = [12, 12, true];
-        await expect(deployContract(alice, contracts.counter, randomWrongArgs)).toBeRejected('too many arguments');
+        await expect(deployContract(alice, contracts.counter, randomWrongArgs)).toBeRejected(
+            'incorrect number of arguments to constructor'
+        );
     });
 
     test('Should not allow invalid contract bytecode', async () => {
         // In this test we ensure that bytecode validity is checked by server.
 
         // Helpers to interact with the RPC API directly.
-        const send = (tx: any) => alice.provider.send('eth_sendRawTransaction', [zksync.utils.serialize(tx)]);
-        const call = (tx: any) => alice.provider.send('eth_call', [Provider.hexlifyTransaction(tx)]);
-        const estimateGas = (tx: any) => alice.provider.send('eth_estimateGas', [Provider.hexlifyTransaction(tx)]);
+        const send = (tx: any) => alice.provider.send('eth_sendRawTransaction', [zksync.utils.serializeEip712(tx)]);
+        const call = (tx: any) => alice.provider.send('eth_call', [alice.provider.getRpcTransaction(tx)]);
+        const estimateGas = (tx: any) => alice.provider.send('eth_estimateGas', [alice.provider.getRpcTransaction(tx)]);
         // Prepares an invalid serialized transaction with the bytecode of provided length.
         const invalidTx = (length: number) => invalidBytecodeTestTransaction(alice.provider, [new Uint8Array(length)]);
 
         const txWithUnchunkableBytecode = await invalidTx(17);
         const unchunkableError = 'Bytecode length is not divisible by 32';
         await expect(send(txWithUnchunkableBytecode)).toBeRejected(unchunkableError);
-        await expect(call(txWithUnchunkableBytecode)).toBeRejected(unchunkableError);
-        await expect(estimateGas(txWithUnchunkableBytecode)).toBeRejected(unchunkableError);
+
+        /*
+        Ethers v6 error handling is not capable of handling this format of messages.
+        See: https://github.com/ethers-io/ethers.js/blob/main/src.ts/providers/provider-jsonrpc.ts#L976
+        {
+          code: 3,
+          message: 'Failed to serialize transaction: factory dependency #0 is invalid: Bytecode length is not divisible by 32'
+        }
+         */
+        await expect(call(txWithUnchunkableBytecode)).toBeRejected(/*unchunkableError*/);
+        await expect(estimateGas(txWithUnchunkableBytecode)).toBeRejected(/*unchunkableError*/);
 
         const txWithBytecodeWithEvenChunks = await invalidTx(64);
         const evenChunksError = 'Bytecode has even number of 32-byte words';
         await expect(send(txWithBytecodeWithEvenChunks)).toBeRejected(evenChunksError);
-        await expect(call(txWithBytecodeWithEvenChunks)).toBeRejected(evenChunksError);
-        await expect(estimateGas(txWithBytecodeWithEvenChunks)).toBeRejected(evenChunksError);
+
+        /*
+        {
+          code: 3,
+          message: 'Failed to serialize transaction: factory dependency #0 is invalid: Bytecode has even number of 32-byte words'
+        }
+         */
+        await expect(call(txWithBytecodeWithEvenChunks)).toBeRejected(/*evenChunksError*/);
+        await expect(estimateGas(txWithBytecodeWithEvenChunks)).toBeRejected(/*evenChunksError*/);
 
         const longBytecodeLen = zksync.utils.MAX_BYTECODE_LEN_BYTES + 32;
         const txWithTooLongBytecode = await invalidTx(longBytecodeLen);
         const tooLongBytecodeError = `Bytecode too long: ${longBytecodeLen} bytes, while max ${zksync.utils.MAX_BYTECODE_LEN_BYTES} allowed`;
         await expect(send(txWithTooLongBytecode)).toBeRejected(tooLongBytecodeError);
-        await expect(call(txWithTooLongBytecode)).toBeRejected(tooLongBytecodeError);
-        await expect(estimateGas(txWithTooLongBytecode)).toBeRejected(tooLongBytecodeError);
+        /*
+        {
+          code: 3,
+          message: 'Failed to serialize transaction: factory dependency #0 is invalid: Bytecode too long: 2097152 bytes, while max 2097120 allowed'
+        }
+         */
+        await expect(call(txWithTooLongBytecode)).toBeRejected(/*tooLongBytecodeError*/);
+        await expect(estimateGas(txWithTooLongBytecode)).toBeRejected(/*tooLongBytecodeError*/);
     });
 
     test('Should interchangeably use ethers for eth calls', async () => {
         // In this test we make sure that we can use `ethers` `Contract` object and provider
-        // to do an `eth_Call` and send transactions to zkSync contract.
+        // to do an `eth_Call` and send transactions to ZKsync contract.
         // This check is important to ensure that external apps do not have to use our SDK and
         // can keep using `ethers` on their side.
 
         const rpcAddress = testMaster.environment().l2NodeUrl;
         const provider = new RetryProvider(rpcAddress);
         const wallet = new ethers.Wallet(alice.privateKey, provider);
-        const ethersBasedContract = new ethers.Contract(counterContract.address, counterContract.interface, wallet);
+        const ethersBasedContract = new ethers.Contract(
+            await counterContract.getAddress(),
+            counterContract.interface,
+            wallet
+        );
 
         const oldValue = await ethersBasedContract.get();
         await expect(ethersBasedContract.increment(1)).toBeAccepted([]);
-        expect(ethersBasedContract.get()).resolves.bnToBeEq(oldValue.add(1));
+        expect(ethersBasedContract.get()).resolves.toEqual(oldValue + 1n);
     });
 
     test('Should check that eth_call works with custom block tags', async () => {
         // Retrieve value normally.
+        counterContract = await deployContract(alice, contracts.counter, []);
         const counterValue = await counterContract.get();
 
         // Check current block tag.
-        await expect(counterContract.callStatic.get({ blockTag: 'pending' })).resolves.bnToBeEq(counterValue);
-
+        await expect(counterContract.get.staticCall({ blockTag: 'pending' })).resolves.toEqual(counterValue);
+
+        /*
+        Ethers v6 error handling is not capable of handling this format of messages.
+        See: https://github.com/ethers-io/ethers.js/blob/main/src.ts/providers/provider-jsonrpc.ts#L976
+        {
+          "code": -32602,
+          "message": "Block with such an ID doesn't exist yet"
+        }
+         */
         // Block from the future.
-        await expect(counterContract.callStatic.get({ blockTag: 1000000000 })).toBeRejected(
-            "Block with such an ID doesn't exist yet"
-        );
+        await expect(counterContract.get.staticCall({ blockTag: 1000000000 }))
+            .toBeRejected
+            //"Block with such an ID doesn't exist yet"
+            ();
 
         // Genesis block
-        await expect(counterContract.callStatic.get({ blockTag: 0 })).toBeRejected('call revert exception');
+        await expect(counterContract.get.staticCall({ blockTag: 0 })).toBeRejected('could not decode result data');
     });
 
     test('Should correctly process msg.value inside constructor and in ethCall', async () => {
-        const value = ethers.BigNumber.from(1);
+        const value = 1n;
 
         // Check that value provided to the constructor is processed.
         const contextContract = await deployContract(alice, contracts.context, [], undefined, { value });
-        await expect(contextContract.valueOnCreate()).resolves.bnToBeEq(value);
+        await expect(contextContract.valueOnCreate()).resolves.toEqual(value);
 
         // Check that value provided to `eth_Call` is processed.
         // This call won't return anything, but will throw if it'll result in a revert.
-        await contextContract.callStatic.requireMsgValue(value, {
+        await contextContract.requireMsgValue.staticCall(value, {
             value
         });
     });
@@ -201,16 +238,27 @@ describe('Smart contract behavior checks', () => {
     test('Should return correct error during fee estimation', async () => {
         const errorContract = await deployContract(alice, contracts.error, []);
 
-        await expect(errorContract.estimateGas.require_long()).toBeRevertedEstimateGas('longlonglong');
-        await expect(errorContract.require_long()).toBeRevertedEthCall('longlonglong');
-        await expect(errorContract.estimateGas.new_error()).toBeRevertedEstimateGas(
+        /*
+         {
+           "code": 3,
+           "message": "execution reverted: longlonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglonglong",
+           "data": "0x08c379a0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000c86c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e676c6f6e67000000000000000000000000000000000000000000000000"
+         }
+         */
+        await expect(errorContract.require_long.estimateGas()).toBeRevertedEstimateGas(/*'longlonglong'*/);
+        await expect(errorContract.require_long()).toBeRevertedEthCall(/*'longlonglong'*/);
+        await expect(errorContract.new_error.estimateGas()).toBeRevertedEstimateGas(
             undefined,
             '0x157bea60000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000046461746100000000000000000000000000000000000000000000000000000000'
         );
-        await expect(errorContract.callStatic.new_error()).toBeRevertedEthCall(
+        // execution reverted: TestError(uint256,uint256,uint256,string)
+        await expect(errorContract.new_error.staticCall())
+            .toBeRevertedEthCall
+            /*
             undefined,
             '0x157bea60000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000046461746100000000000000000000000000000000000000000000000000000000'
-        );
+            */
+            ();
     });
 
     test('Should check block properties for tx execution', async () => {
@@ -225,14 +273,14 @@ describe('Smart contract behavior checks', () => {
         // will correspond to the last *sealed* batch (e.g. previous one).
 
         const contextContract = await deployContract(alice, contracts.context, []);
-        const deploymentBlock = contextContract.deployTransaction.blockNumber!;
+        const deploymentBlock = await contextContract.deploymentTransaction()!.blockNumber!;
         const deploymentBlockInfo = await alice.provider.getBlock(deploymentBlock);
         // If batch was not sealed, its number may not be present in the receipt.
         const deploymentl1Batch = deploymentBlockInfo.l1BatchNumber ?? (await alice.provider.getL1BatchNumber()) + 1;
 
         // Check that block gas limit is correct.
         const blockGasLimit = await contextContract.getBlockGasLimit({ blockTag: 'pending' });
-        expect(blockGasLimit).bnToBeGt(0);
+        expect(blockGasLimit).toBeGreaterThan(0n);
 
         // Record values from the contract right after deployment to compare them with new ones later.
         const initialL1Batch = await contextContract.getBlockNumber({
@@ -247,7 +295,7 @@ describe('Smart contract behavior checks', () => {
         // Check that current number of L1 batch on contract has sane value.
         // Here and below we use "gte"/"gt" instead of strict checks because tests are executed in parallel
         // and we can't guarantee a certain block commitment order.
-        expect(initialL1Batch).bnToBeGte(deploymentl1Batch);
+        expect(initialL1Batch).toBeGreaterThanOrEqual(deploymentl1Batch);
 
         // Wait till the new L1 batch is created.
         await waitForNewL1Batch(alice);
@@ -260,17 +308,17 @@ describe('Smart contract behavior checks', () => {
             blockTag: 'pending'
         });
 
-        expect(newL1Batch).bnToBeGt(initialL1Batch, 'New L1 batch number must be strictly greater');
-        expect(newTimestamp).bnToBeGte(initialTimestamp, 'New timestamp must not be less than previous one');
+        expect(newL1Batch).toBeGreaterThan(initialL1Batch); // New L1 batch number must be strictly greater
+        expect(newTimestamp).toBeGreaterThanOrEqual(initialTimestamp); // New timestamp must not be less than previous one
 
         // And finally check block properties for the actual contract execution (not `eth_call`).
-        const acceptedBlockLag = 20;
-        const acceptedTimestampLag = 600;
-        await expect(contextContract.checkBlockNumber(newL1Batch, newL1Batch.add(acceptedBlockLag))).toBeAccepted([]);
+        const acceptedBlockLag = 20n;
+        const acceptedTimestampLag = 600n;
+        await expect(contextContract.checkBlockNumber(newL1Batch, newL1Batch + acceptedBlockLag)).toBeAccepted([]);
         // `newTimestamp` was received from the API, so actual timestamp in the state keeper may be lower.
         // This is why we use `initialTimestamp` here.
         await expect(
-            contextContract.checkBlockTimestamp(initialTimestamp, initialTimestamp.add(acceptedTimestampLag))
+            contextContract.checkBlockTimestamp(initialTimestamp, initialTimestamp + acceptedTimestampLag)
         ).toBeAccepted([]);
     });
 
@@ -311,7 +359,7 @@ describe('Smart contract behavior checks', () => {
         // Transaction should be rejected by API.
 
         const BYTECODE_LEN = 50016;
-        const bytecode = ethers.utils.hexlify(ethers.utils.randomBytes(BYTECODE_LEN));
+        const bytecode = ethers.hexlify(ethers.randomBytes(BYTECODE_LEN));
 
         // Estimate gas for "no-op". It's a good estimate for validation gas.
         const gasLimit = await alice.estimateGas({
@@ -338,7 +386,7 @@ describe('Smart contract behavior checks', () => {
 
         const message =
             '0x5905238877c77421f73e43ee3da6f2d9e2ccad5fc942dcec0cbd25482935faaf416983fe165b1a045ee2bcd2e6dca3bdf46c4310a7461f9a37960ca672d3feb5473e253605fb1ddfd28065b53cb5858a8ad28175bf9bd386a5e471ea7a65c17cc934a9d791e91491eb3754d03799790fe2d308d16146d5c9b0d0debd97d79ce8';
-        const digest = ethers.utils.arrayify(ethers.utils.keccak256(message));
+        const digest = ethers.getBytes(ethers.keccak256(message));
         const signature = ec.sign(digest, privateKey);
 
         const publicKeyHex =
@@ -347,7 +395,7 @@ describe('Smart contract behavior checks', () => {
         // Check that verification succeeds.
         const res = await alice.provider.call({
             to: '0x0000000000000000000000000000000000000100',
-            data: ethers.utils.concat([
+            data: ethers.concat([
                 digest,
                 '0x' + signature.r.toString('hex'),
                 '0x' + signature.s.toString('hex'),
@@ -359,7 +407,7 @@ describe('Smart contract behavior checks', () => {
         // Send the transaction.
         const tx = await alice.sendTransaction({
             to: '0x0000000000000000000000000000000000000100',
-            data: ethers.utils.concat([
+            data: ethers.concat([
                 digest,
                 '0x' + signature.r.toString('hex'),
                 '0x' + signature.s.toString('hex'),
@@ -371,10 +419,12 @@ describe('Smart contract behavior checks', () => {
     });
 
     test('Should check transient storage', async () => {
-        const artifact = require(`${process.env.ZKSYNC_HOME}/etc/contracts-test-data/artifacts-zk/contracts/storage/storage.sol/StorageTester.json`);
+        const artifact = require(`${
+            testMaster.environment().pathToHome
+        }/etc/contracts-test-data/artifacts-zk/contracts/storage/storage.sol/StorageTester.json`);
         const contractFactory = new zksync.ContractFactory(artifact.abi, artifact.bytecode, alice);
-        const storageContract = await contractFactory.deploy();
-        await storageContract.deployed();
+        const storageContract = (await contractFactory.deploy()) as zksync.Contract;
+        await storageContract.waitForDeployment();
         // Tests transient storage, see contract code for details.
         await expect(storageContract.testTransientStore()).toBeAccepted([]);
         // Checks that transient storage is cleaned up after each tx.
@@ -383,14 +433,16 @@ describe('Smart contract behavior checks', () => {
 
     test('Should check code oracle works', async () => {
         // Deploy contract that calls CodeOracle.
-        const artifact = require(`${process.env.ZKSYNC_HOME}/etc/contracts-test-data/artifacts-zk/contracts/precompiles/precompiles.sol/Precompiles.json`);
+        const artifact = require(`${
+            testMaster.environment().pathToHome
+        }/etc/contracts-test-data/artifacts-zk/contracts/precompiles/precompiles.sol/Precompiles.json`);
         const contractFactory = new zksync.ContractFactory(artifact.abi, artifact.bytecode, alice);
-        const contract = await contractFactory.deploy();
-        await contract.deployed();
+        const contract = (await contractFactory.deploy()) as zksync.Contract;
+        await contract.waitForDeployment();
 
         // Check that CodeOracle can decommit code of just deployed contract.
         const versionedHash = zksync.utils.hashBytecode(artifact.bytecode);
-        const expectedBytecodeHash = ethers.utils.keccak256(artifact.bytecode);
+        const expectedBytecodeHash = ethers.keccak256(artifact.bytecode);
 
         await expect(contract.callCodeOracle(versionedHash, expectedBytecodeHash)).toBeAccepted([]);
     });
@@ -403,17 +455,17 @@ describe('Smart contract behavior checks', () => {
 async function invalidBytecodeTestTransaction(
     provider: zksync.Provider,
     factoryDeps: Uint8Array[]
-): Promise<ethers.providers.TransactionRequest> {
+): Promise<ethers.TransactionRequest> {
     const chainId = (await provider.getNetwork()).chainId;
 
     const gasPrice = await provider.getGasPrice();
     const address = zksync.Wallet.createRandom().address;
-    const tx: ethers.providers.TransactionRequest = {
+    const tx: ethers.TransactionRequest = {
         to: address,
         from: address,
         nonce: 0,
 
-        gasLimit: ethers.BigNumber.from(300000),
+        gasLimit: 300000n,
 
         data: '0x',
         value: 0,
@@ -425,7 +477,7 @@ async function invalidBytecodeTestTransaction(
         maxFeePerGas: gasPrice,
 
         customData: {
-            gasPerPubdataByte: zksync.utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
+            gasPerPubdata: zksync.utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
             factoryDeps,
             customSignature: new Uint8Array(17)
         }
diff --git a/core/tests/ts-integration/tests/custom-account.test.ts b/core/tests/ts-integration/tests/custom-account.test.ts
index 67dd9e49c76b..46ddba95323a 100644
--- a/core/tests/ts-integration/tests/custom-account.test.ts
+++ b/core/tests/ts-integration/tests/custom-account.test.ts
@@ -2,10 +2,9 @@
  * This suite contains tests checking the behavior of custom accounts (accounts represented by smart contracts).
  */
 
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 
 import * as zksync from 'zksync-ethers';
-import { utils, types } from 'zksync-ethers';
 import * as ethers from 'ethers';
 import { deployContract, getTestContract } from '../src/helpers';
 import { ERC20_PER_ACCOUNT, L2_DEFAULT_ETH_PER_ACCOUNT } from '../src/context-owner';
@@ -17,8 +16,8 @@ const contracts = {
 };
 
 // We create multiple custom accounts and we need to fund them with ETH to pay for fees.
-const ETH_PER_CUSTOM_ACCOUNT = L2_DEFAULT_ETH_PER_ACCOUNT.div(8);
-const TRANSFER_AMOUNT = 1;
+const ETH_PER_CUSTOM_ACCOUNT = L2_DEFAULT_ETH_PER_ACCOUNT / 8n;
+const TRANSFER_AMOUNT = 1n;
 
 describe('Tests for the custom account behavior', () => {
     let testMaster: TestMaster;
@@ -33,7 +32,7 @@ describe('Tests for the custom account behavior', () => {
         erc20Address = testMaster.environment().erc20Token.l2Address;
         erc20 = new zksync.Contract(
             erc20Address,
-            utils.IERC20,
+            zksync.utils.IERC20,
             // Signer doesn't matter for custom account transactions, as signature would be replaced with custom one.
             alice
         );
@@ -44,33 +43,36 @@ describe('Tests for the custom account behavior', () => {
         customAccount = await deployContract(alice, contracts.customAccount, [violateRules], 'createAccount');
 
         // Now we need to check that it was correctly marked as an account:
-        const contractAccountInfo = await alice.provider.getContractAccountInfo(customAccount.address);
+        const contractAccountInfo = await alice.provider.getContractAccountInfo(await customAccount.getAddress());
 
         // Checking that the version of the account abstraction is correct
-        expect(contractAccountInfo.supportedAAVersion).toEqual(types.AccountAbstractionVersion.Version1);
+        expect(contractAccountInfo.supportedAAVersion).toEqual(zksync.types.AccountAbstractionVersion.Version1);
 
         // Checking that the nonce ordering is correct
-        expect(contractAccountInfo.nonceOrdering).toEqual(types.AccountNonceOrdering.Sequential);
+        expect(contractAccountInfo.nonceOrdering).toEqual(zksync.types.AccountNonceOrdering.Sequential);
     });
 
     test('Should fund the custom account', async () => {
-        await alice.transfer({ to: customAccount.address, amount: ETH_PER_CUSTOM_ACCOUNT }).then((tx) => tx.wait());
+        await alice
+            .transfer({ to: await customAccount.getAddress(), amount: ETH_PER_CUSTOM_ACCOUNT })
+            .then((tx) => tx.wait());
         await alice
             .transfer({
-                to: customAccount.address,
+                to: await customAccount.getAddress(),
                 token: erc20Address,
-                amount: ERC20_PER_ACCOUNT.div(4)
+                amount: ERC20_PER_ACCOUNT / 4n
             })
             .then((tx) => tx.wait());
     });
 
     test('Should execute contract by custom account', async () => {
-        const tx = await erc20.populateTransaction.transfer(alice.address, TRANSFER_AMOUNT);
+        const tx = await erc20.transfer.populateTransaction(alice.address, TRANSFER_AMOUNT);
+        const customAccountAddress = await customAccount.getAddress();
 
         const erc20BalanceChange = await shouldChangeTokenBalances(erc20Address, [
             // Custom account change (sender)
             {
-                addressToCheck: customAccount.address,
+                addressToCheck: customAccountAddress,
                 wallet: alice,
                 change: -TRANSFER_AMOUNT
             },
@@ -79,21 +81,31 @@ describe('Tests for the custom account behavior', () => {
         ]);
         const feeCheck = await shouldChangeETHBalances([
             // 0 change would only check for fees.
-            { addressToCheck: customAccount.address, wallet: alice, change: 0 }
+            { addressToCheck: customAccountAddress, wallet: alice, change: 0n }
         ]);
 
         // Check that transaction succeeds.
-        await expect(sendCustomAccountTransaction(tx, alice.provider, customAccount.address)).toBeAccepted([
-            erc20BalanceChange,
-            feeCheck
-        ]);
+        await expect(
+            sendCustomAccountTransaction(
+                tx as zksync.types.Transaction,
+                alice.provider,
+                customAccountAddress,
+                testMaster.environment().l2ChainId
+            )
+        ).toBeAccepted([erc20BalanceChange, feeCheck]);
     });
 
     test('Should fail the validation with incorrect signature', async () => {
-        const tx = await erc20.populateTransaction.transfer(alice.address, TRANSFER_AMOUNT);
+        const tx = await erc20.transfer.populateTransaction(alice.address, TRANSFER_AMOUNT);
         const fakeSignature = new Uint8Array(12);
         await expect(
-            sendCustomAccountTransaction(tx, alice.provider, customAccount.address, fakeSignature)
+            sendCustomAccountTransaction(
+                tx as zksync.types.Transaction,
+                alice.provider,
+                await customAccount.getAddress(),
+                testMaster.environment().l2ChainId,
+                fakeSignature
+            )
         ).toBeRejected('failed to validate the transaction.');
     });
 
@@ -101,26 +113,32 @@ describe('Tests for the custom account behavior', () => {
         // We configure account to violate storage access rules during tx validation.
         const violateRules = true;
         const badCustomAccount = await deployContract(alice, contracts.customAccount, [violateRules], 'createAccount');
+        const badCustomAccountAddress = await badCustomAccount.getAddress();
 
         // Fund the account.
         await alice
             .transfer({
-                to: badCustomAccount.address,
+                to: badCustomAccountAddress,
                 amount: ETH_PER_CUSTOM_ACCOUNT
             })
             .then((tx) => tx.wait());
         await alice
             .transfer({
-                to: badCustomAccount.address,
+                to: badCustomAccountAddress,
                 token: erc20Address,
                 amount: TRANSFER_AMOUNT
             })
             .then((tx) => tx.wait());
 
-        let tx = await erc20.populateTransaction.transfer(alice.address, TRANSFER_AMOUNT);
-        await expect(sendCustomAccountTransaction(tx, alice.provider, badCustomAccount.address)).toBeRejected(
-            'Violated validation rules'
-        );
+        let tx = await erc20.transfer.populateTransaction(alice.address, TRANSFER_AMOUNT);
+        await expect(
+            sendCustomAccountTransaction(
+                tx as zksync.types.Transaction,
+                alice.provider,
+                badCustomAccountAddress,
+                testMaster.environment().l2ChainId
+            )
+        ).toBeRejected('Violated validation rules');
     });
 
     test('Should not execute from non-account', async () => {
@@ -128,21 +146,36 @@ describe('Tests for the custom account behavior', () => {
         // be treated as a common contract.
         const violateRules = false;
         const nonAccount = await deployContract(alice, contracts.customAccount, [violateRules], 'create');
+        const nonAccountAddress = await nonAccount.getAddress();
 
         // Fund the account.
-        await alice.transfer({ to: nonAccount.address, amount: ETH_PER_CUSTOM_ACCOUNT }).then((tx) => tx.wait());
+        await alice.transfer({ to: nonAccountAddress, amount: ETH_PER_CUSTOM_ACCOUNT }).then((tx) => tx.wait());
         await alice
             .transfer({
-                to: nonAccount.address,
+                to: nonAccountAddress,
                 token: erc20Address,
                 amount: TRANSFER_AMOUNT
             })
             .then((tx) => tx.wait());
 
-        let tx = await erc20.populateTransaction.transfer(alice.address, TRANSFER_AMOUNT);
-        await expect(sendCustomAccountTransaction(tx, alice.provider, nonAccount.address)).toBeRejected(
-            "invalid sender. can't start a transaction from a non-account"
-        );
+        let tx = await erc20.transfer.populateTransaction(alice.address, TRANSFER_AMOUNT);
+        /*
+        Ethers v6 error handling is not capable of handling this format of messages.
+        See: https://github.com/ethers-io/ethers.js/blob/main/src.ts/providers/provider-jsonrpc.ts#L976
+        {
+            "code": 3,
+            "message": "invalid sender. can't start a transaction from a non-account",
+            "data": "0x"
+         }
+         */
+        await expect(
+            sendCustomAccountTransaction(
+                tx as zksync.types.Transaction,
+                alice.provider,
+                nonAccountAddress,
+                testMaster.environment().l2ChainId
+            )
+        ).toBeRejected(/*"invalid sender. can't start a transaction from a non-account"*/);
     });
 
     test('Should provide correct tx.origin for EOA and custom accounts', async () => {
@@ -152,8 +185,17 @@ describe('Tests for the custom account behavior', () => {
         await expect(contextContract.checkTxOrigin(alice.address)).toBeAccepted([]);
 
         // For custom accounts, the tx.origin should be the bootloader address
-        const customAATx = await contextContract.populateTransaction.checkTxOrigin(utils.BOOTLOADER_FORMAL_ADDRESS);
-        await expect(sendCustomAccountTransaction(customAATx, alice.provider, customAccount.address)).toBeAccepted([]);
+        const customAATx = await contextContract.checkTxOrigin.populateTransaction(
+            zksync.utils.BOOTLOADER_FORMAL_ADDRESS
+        );
+        await expect(
+            sendCustomAccountTransaction(
+                customAATx as zksync.types.Transaction,
+                alice.provider,
+                await customAccount.getAddress(),
+                testMaster.environment().l2ChainId
+            )
+        ).toBeAccepted([]);
     });
 
     test('API should reject validation that takes too many computational ergs', async () => {
@@ -164,31 +206,37 @@ describe('Tests for the custom account behavior', () => {
             [violateStorageRules],
             'createAccount'
         );
+        const badCustomAccountAddress = await badCustomAccount.getAddress();
         badCustomAccount.connect(alice);
 
         // Fund the account.
         await alice
             .transfer({
-                to: badCustomAccount.address,
+                to: badCustomAccountAddress,
                 amount: ETH_PER_CUSTOM_ACCOUNT
             })
             .then((tx) => tx.wait());
         await alice
             .transfer({
-                to: badCustomAccount.address,
+                to: badCustomAccountAddress,
                 token: erc20Address,
                 amount: TRANSFER_AMOUNT
             })
             .then((tx) => tx.wait());
 
         // Set flag to do many calculations during validation.
-        const validationGasLimit = +process.env.CHAIN_STATE_KEEPER_VALIDATION_COMPUTATIONAL_GAS_LIMIT!;
+        const validationGasLimit = testMaster.environment().validationComputationalGasLimit;
         await badCustomAccount.setGasToSpent(validationGasLimit).then((tx: any) => tx.wait());
 
-        let tx = await erc20.populateTransaction.transfer(alice.address, TRANSFER_AMOUNT);
-        await expect(sendCustomAccountTransaction(tx, alice.provider, badCustomAccount.address)).toBeRejected(
-            'Violated validation rules: Took too many computational gas'
-        );
+        let tx = await erc20.transfer.populateTransaction(alice.address, TRANSFER_AMOUNT);
+        await expect(
+            sendCustomAccountTransaction(
+                tx as zksync.types.Transaction,
+                alice.provider,
+                badCustomAccountAddress,
+                testMaster.environment().l2ChainId
+            )
+        ).toBeRejected('Violated validation rules: Took too many computational gas');
     });
 
     test('State keeper should reject validation that takes too many computational ergs', async () => {
@@ -199,41 +247,50 @@ describe('Tests for the custom account behavior', () => {
             [violateStorageRules],
             'createAccount'
         );
+        const badCustomAccountAddress = await badCustomAccount.getAddress();
         badCustomAccount.connect(alice);
 
         // Fund the account.
         await alice
             .transfer({
-                to: badCustomAccount.address,
+                to: badCustomAccountAddress,
                 amount: ETH_PER_CUSTOM_ACCOUNT
             })
             .then((tx) => tx.wait());
         await alice
             .transfer({
-                to: badCustomAccount.address,
+                to: badCustomAccountAddress,
                 token: erc20Address,
                 amount: TRANSFER_AMOUNT
             })
             .then((tx) => tx.wait());
 
-        const transfer = await erc20.populateTransaction.transfer(alice.address, TRANSFER_AMOUNT);
-        const nonce = await alice.provider.getTransactionCount(badCustomAccount.address);
+        const transfer = await erc20.transfer.populateTransaction(alice.address, TRANSFER_AMOUNT);
+        const nonce = await alice.provider.getTransactionCount(badCustomAccountAddress);
 
         // delayedTx should pass API checks (if not then error will be thrown on the next lime)
         // but should be rejected by the state-keeper (checked later).
         const delayedTx = await sendCustomAccountTransaction(
-            transfer,
+            transfer as zksync.types.Transaction,
             alice.provider,
-            badCustomAccount.address,
+            badCustomAccountAddress,
+            testMaster.environment().l2ChainId,
             undefined,
             nonce + 1
         );
 
         // Increase nonce and set flag to do many calculations during validation.
-        const validationGasLimit = +process.env.CHAIN_STATE_KEEPER_VALIDATION_COMPUTATIONAL_GAS_LIMIT!;
-        const tx = await badCustomAccount.populateTransaction.setGasToSpent(validationGasLimit);
+        const validationGasLimit = testMaster.environment().validationComputationalGasLimit;
+        const tx = await badCustomAccount.setGasToSpent.populateTransaction(validationGasLimit);
         await expect(
-            sendCustomAccountTransaction(tx, alice.provider, badCustomAccount.address, undefined, nonce)
+            sendCustomAccountTransaction(
+                tx as zksync.types.Transaction,
+                alice.provider,
+                badCustomAccountAddress,
+                testMaster.environment().l2ChainId,
+                undefined,
+                nonce
+            )
         ).toBeAccepted();
 
         // We don't have a good check that tx was indeed rejected.
@@ -254,37 +311,37 @@ describe('Tests for the custom account behavior', () => {
 // Accepts the tx request with filled transaction's data and
 // sends the transaction that should be accepted by the `custom-aa.sol` test contract.
 async function sendCustomAccountTransaction(
-    tx: ethers.PopulatedTransaction,
-    web3Provider: zksync.Provider,
+    tx: zksync.types.Transaction,
+    browserProvider: zksync.Provider,
     accountAddress: string,
+    chainId: bigint,
     customSignature?: Uint8Array,
     nonce?: number
 ) {
-    const gasLimit = await web3Provider.estimateGas({
+    const gasLimit = await browserProvider.estimateGas({
         ...tx,
         from: accountAddress
     });
-    const gasPrice = await web3Provider.getGasPrice();
+    const gasPrice = await browserProvider.getGasPrice();
 
     tx.gasLimit = gasLimit;
     tx.gasPrice = gasPrice;
-    tx.chainId = parseInt(process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!, 10);
-    tx.value = ethers.BigNumber.from(0);
-    tx.nonce = nonce ?? (await web3Provider.getTransactionCount(accountAddress));
+    tx.chainId = chainId;
+    tx.value = 0n;
+    tx.nonce = nonce ?? (await browserProvider.getTransactionCount(accountAddress));
     tx.type = 113;
     tx.from = accountAddress;
 
     tx.customData = {
-        gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT
+        gasPerPubdata: zksync.utils.DEFAULT_GAS_PER_PUBDATA_LIMIT
     };
 
     const signedTxHash = zksync.EIP712Signer.getSignedDigest(tx);
     tx.customData = {
         ...tx.customData,
-        from: accountAddress,
-        customSignature: customSignature ?? ethers.utils.concat([signedTxHash, accountAddress])
+        customSignature: customSignature ?? ethers.concat([signedTxHash, accountAddress])
     };
-    const serializedTx = utils.serialize({ ...tx });
+    const serializedTx = zksync.utils.serializeEip712({ ...tx });
 
-    return await web3Provider.sendTransaction(serializedTx);
+    return await browserProvider.broadcastTransaction(serializedTx);
 }
diff --git a/core/tests/ts-integration/tests/erc20.test.ts b/core/tests/ts-integration/tests/erc20.test.ts
index 053f41829f1f..3b1d107e560a 100644
--- a/core/tests/ts-integration/tests/erc20.test.ts
+++ b/core/tests/ts-integration/tests/erc20.test.ts
@@ -2,12 +2,11 @@
  * This suite contains tests checking default ERC-20 contract behavior.
  */
 
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 import { Token } from '../src/types';
 import { shouldChangeTokenBalances, shouldOnlyTakeFee } from '../src/modifiers/balance-checker';
 
 import * as zksync from 'zksync-ethers';
-import { BigNumber, utils as etherUtils } from 'ethers';
 import * as ethers from 'ethers';
 import { scaledGasPrice, waitUntilBlockFinalized } from '../src/helpers';
 import { L2_DEFAULT_ETH_PER_ACCOUNT } from '../src/context-owner';
@@ -34,12 +33,12 @@ describe('ERC20 contract checks', () => {
         expect(aliceErc20.name()).resolves.toBe(tokenDetails.name);
         expect(aliceErc20.decimals()).resolves.toBe(tokenDetails.decimals);
         expect(aliceErc20.symbol()).resolves.toBe(tokenDetails.symbol);
-        expect(aliceErc20.balanceOf(alice.address)).resolves.bnToBeGt(0, 'Alice should have non-zero balance');
+        expect(aliceErc20.balanceOf(alice.address)).resolves.toBeGreaterThan(0n); // 'Alice should have non-zero balance'
     });
 
     test('Can perform a deposit', async () => {
-        const amount = 1; // 1 wei is enough.
-        const gasPrice = scaledGasPrice(alice);
+        const amount = 1n; // 1 wei is enough.
+        const gasPrice = await scaledGasPrice(alice);
 
         // Note: for L1 we should use L1 token address.
         const l1BalanceChange = await shouldChangeTokenBalances(
@@ -70,7 +69,7 @@ describe('ERC20 contract checks', () => {
     });
 
     test('Can perform a transfer', async () => {
-        const value = BigNumber.from(200);
+        const value = 200n;
 
         const balanceChange = await shouldChangeTokenBalances(tokenDetails.l2Address, [
             { wallet: alice, change: -value },
@@ -83,24 +82,24 @@ describe('ERC20 contract checks', () => {
     });
 
     test('Can perform a transfer to self', async () => {
-        const value = BigNumber.from(200);
+        const value = 200n;
 
         // When transferring to self, balance should not change.
-        const balanceChange = await shouldChangeTokenBalances(tokenDetails.l2Address, [{ wallet: alice, change: 0 }]);
+        const balanceChange = await shouldChangeTokenBalances(tokenDetails.l2Address, [{ wallet: alice, change: 0n }]);
         const feeCheck = await shouldOnlyTakeFee(alice);
         await expect(aliceErc20.transfer(alice.address, value)).toBeAccepted([balanceChange, feeCheck]);
     });
 
     test('Incorrect transfer should revert', async () => {
-        const value = etherUtils.parseEther('1000000.0');
+        const value = ethers.parseEther('1000000.0');
 
         // Since gas estimation is expected to fail, we request gas limit for similar non-failing tx.
-        const gasLimit = await aliceErc20.estimateGas.transfer(bob.address, 1);
+        const gasLimit = await aliceErc20.transfer.estimateGas(bob.address, 1);
 
         // Balances should not change for this token.
         const noBalanceChange = await shouldChangeTokenBalances(tokenDetails.l2Address, [
-            { wallet: alice, change: 0 },
-            { wallet: bob, change: 0 }
+            { wallet: alice, change: 0n },
+            { wallet: bob, change: 0n }
         ]);
         // Fee in ETH should be taken though.
         const feeTaken = await shouldOnlyTakeFee(alice);
@@ -110,14 +109,16 @@ describe('ERC20 contract checks', () => {
     });
 
     test('Transfer to zero address should revert', async () => {
-        const zeroAddress = ethers.constants.AddressZero;
-        const value = BigNumber.from(200);
+        const zeroAddress = ethers.ZeroAddress;
+        const value = 200n;
 
         // Since gas estimation is expected to fail, we request gas limit for similar non-failing tx.
-        const gasLimit = await aliceErc20.estimateGas.transfer(bob.address, 1);
+        const gasLimit = await aliceErc20.transfer.estimateGas(bob.address, 1);
 
         // Balances should not change for this token.
-        const noBalanceChange = await shouldChangeTokenBalances(tokenDetails.l2Address, [{ wallet: alice, change: 0 }]);
+        const noBalanceChange = await shouldChangeTokenBalances(tokenDetails.l2Address, [
+            { wallet: alice, change: 0n }
+        ]);
         // Fee in ETH should be taken though.
         const feeTaken = await shouldOnlyTakeFee(alice);
 
@@ -126,32 +127,39 @@ describe('ERC20 contract checks', () => {
     });
 
     test('Approve and transferFrom should work', async () => {
-        const approveAmount = 42;
+        const approveAmount = 42n;
         const bobErc20 = new zksync.Contract(tokenDetails.l2Address, zksync.utils.IERC20, bob);
 
         // Fund bob's account to perform a transaction from it.
         await alice
-            .transfer({ to: bob.address, amount: L2_DEFAULT_ETH_PER_ACCOUNT.div(8), token: zksync.utils.ETH_ADDRESS })
+            .transfer({
+                to: bob.address,
+                amount: L2_DEFAULT_ETH_PER_ACCOUNT / 8n,
+                token: zksync.utils.L2_BASE_TOKEN_ADDRESS
+            })
             .then((tx) => tx.wait());
 
-        await expect(aliceErc20.allowance(alice.address, bob.address)).resolves.bnToBeEq(0);
+        await expect(aliceErc20.allowance(alice.address, bob.address)).resolves.toEqual(0n);
         await expect(aliceErc20.approve(bob.address, approveAmount)).toBeAccepted();
-        await expect(aliceErc20.allowance(alice.address, bob.address)).resolves.bnToBeEq(approveAmount);
+        await expect(aliceErc20.allowance(alice.address, bob.address)).resolves.toEqual(approveAmount);
         await expect(bobErc20.transferFrom(alice.address, bob.address, approveAmount)).toBeAccepted();
-        await expect(aliceErc20.allowance(alice.address, bob.address)).resolves.bnToBeEq(0);
+        await expect(aliceErc20.allowance(alice.address, bob.address)).resolves.toEqual(0n);
     });
 
     test('Can perform a withdrawal', async () => {
         if (testMaster.isFastMode()) {
             return;
         }
-        const amount = 1;
+        const amount = 1n;
 
         const l2BalanceChange = await shouldChangeTokenBalances(tokenDetails.l2Address, [
             { wallet: alice, change: -amount }
         ]);
         const feeCheck = await shouldOnlyTakeFee(alice);
-        const withdrawalPromise = alice.withdraw({ token: tokenDetails.l2Address, amount });
+        const withdrawalPromise = alice.withdraw({
+            token: tokenDetails.l2Address,
+            amount
+        });
         await expect(withdrawalPromise).toBeAccepted([l2BalanceChange, feeCheck]);
         const withdrawalTx = await withdrawalPromise;
         await withdrawalTx.waitFinalize();
@@ -172,12 +180,12 @@ describe('ERC20 contract checks', () => {
             return;
         }
 
-        const amount = 1;
+        const amount = 1n;
         const initialBalance = await alice.getBalanceL1(tokenDetails.l1Address);
         // Deposit to the zero address is forbidden and should fail with the current implementation.
         const depositHandle = await alice.deposit({
             token: tokenDetails.l1Address,
-            to: ethers.constants.AddressZero,
+            to: ethers.ZeroAddress,
             amount,
             approveERC20: true,
             approveBaseERC20: true,
@@ -186,7 +194,7 @@ describe('ERC20 contract checks', () => {
         const l1Receipt = await depositHandle.waitL1Commit();
 
         // L1 balance should change, but tx should fail in L2.
-        await expect(alice.getBalanceL1(tokenDetails.l1Address)).resolves.bnToBeEq(initialBalance.sub(amount));
+        await expect(alice.getBalanceL1(tokenDetails.l1Address)).resolves.toEqual(initialBalance - amount);
         await expect(depositHandle).toBeReverted();
 
         // Wait for tx to be finalized.
@@ -194,35 +202,30 @@ describe('ERC20 contract checks', () => {
         // It throws once it gets status == 0 in the receipt and doesn't wait for the finalization.
         const l2Hash = zksync.utils.getL2HashFromPriorityOp(l1Receipt, await alice.provider.getMainContractAddress());
         const l2TxReceipt = await alice.provider.getTransactionReceipt(l2Hash);
-        await waitUntilBlockFinalized(alice, l2TxReceipt.blockNumber);
+        await waitUntilBlockFinalized(alice, l2TxReceipt!.blockNumber);
         // Claim failed deposit.
         await expect(alice.claimFailedDeposit(l2Hash)).toBeAccepted();
-        await expect(alice.getBalanceL1(tokenDetails.l1Address)).resolves.bnToBeEq(initialBalance);
+        await expect(alice.getBalanceL1(tokenDetails.l1Address)).resolves.toEqual(initialBalance);
     });
 
     test('Can perform a deposit with precalculated max value', async () => {
         const maxAmountBase = await alice.getBalanceL1(baseTokenDetails.l1Address);
         const maxAmount = await alice.getBalanceL1(tokenDetails.l1Address);
-
         // Approving the needed allowance to ensure that the user has enough funds.
         await (await alice.approveERC20(baseTokenDetails.l1Address, maxAmountBase)).wait();
         await (await alice.approveERC20(tokenDetails.l1Address, maxAmount)).wait();
-
         const depositFee = await alice.getFullRequiredDepositFee({
             token: tokenDetails.l1Address
         });
-        const l1Fee = depositFee.l1GasLimit.mul(depositFee.maxFeePerGas! || depositFee.gasPrice!);
+        const l1Fee = depositFee.l1GasLimit * (depositFee.maxFeePerGas! || depositFee.gasPrice!);
         const l2Fee = depositFee.baseCost;
-
         const aliceETHBalance = await alice.getBalanceL1();
-        if (aliceETHBalance.lt(l1Fee.add(l2Fee))) {
+        if (aliceETHBalance < l1Fee + l2Fee) {
             throw new Error('Not enough ETH to perform a deposit');
         }
-
         const l2ERC20BalanceChange = await shouldChangeTokenBalances(tokenDetails.l2Address, [
             { wallet: alice, change: maxAmount }
         ]);
-
         const overrides: ethers.Overrides = depositFee.gasPrice
             ? { gasPrice: depositFee.gasPrice }
             : {
@@ -236,7 +239,6 @@ describe('ERC20 contract checks', () => {
             l2GasLimit: depositFee.l2GasLimit,
             overrides
         });
-
         await expect(depositOp).toBeAccepted([l2ERC20BalanceChange]);
     });
 
diff --git a/core/tests/ts-integration/tests/ether.test.ts b/core/tests/ts-integration/tests/ether.test.ts
index 53cb479caf83..4e6b2eb0ef3d 100644
--- a/core/tests/ts-integration/tests/ether.test.ts
+++ b/core/tests/ts-integration/tests/ether.test.ts
@@ -2,7 +2,7 @@
  * This suite contains tests checking our handling of Ether (such as depositing, checking `msg.value`, etc).
  */
 
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 import {
     shouldChangeETHBalances,
     shouldChangeTokenBalances,
@@ -11,11 +11,8 @@ import {
 import { checkReceipt } from '../src/modifiers/receipt-check';
 
 import * as zksync from 'zksync-ethers';
-import { BigNumber, Overrides } from 'ethers';
 import { scaledGasPrice } from '../src/helpers';
-import { ETH_ADDRESS_IN_CONTRACTS } from 'zksync-ethers/build/src/utils';
-
-const ETH_ADDRESS = zksync.utils.ETH_ADDRESS;
+import { ethers } from 'ethers';
 
 describe('ETH token checks', () => {
     let testMaster: TestMaster;
@@ -38,13 +35,13 @@ describe('ETH token checks', () => {
 
     test('Can perform a deposit', async () => {
         if (!isETHBasedChain) {
-            // Approving the needed allowance previously so we don't do it inside of the deposit.
+            // Approving the needed allowance previously, so we don't do it inside the deposit.
             // This prevents the deposit fee from being miscalculated.
             const l1MaxBaseTokenBalance = await alice.getBalanceL1(baseTokenAddress);
             await (await alice.approveERC20(baseTokenAddress, l1MaxBaseTokenBalance)).wait();
         }
-        const amount = 1; // 1 wei is enough.
-        const gasPrice = scaledGasPrice(alice);
+        const amount = 1n; // 1 wei is enough.
+        const gasPrice = await scaledGasPrice(alice);
 
         // Unfortunately, since fee is taken in ETH, we must calculate the L1 ETH balance diff explicitly.
         const l1EthBalanceBefore = await alice.getBalanceL1();
@@ -59,30 +56,28 @@ describe('ETH token checks', () => {
         const l2BaseTokenBalanceBefore = await alice.getBalance(); // Base token balance on L2
 
         const gasPerPubdataByte = zksync.utils.REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT;
-        const isBaseToken = isETHBasedChain;
 
         const l2GasLimit = await zksync.utils.estimateDefaultBridgeDepositL2Gas(
             alice.providerL1!,
             alice.provider,
-            isETHBasedChain ? ETH_ADDRESS : ETH_ADDRESS_IN_CONTRACTS, // ToDo: fix sdk so if it receives ETH_ADDRESS it should use ETH_ADDRESS_IN_CONTRACTS
+            zksync.utils.ETH_ADDRESS,
             amount,
             alice.address,
             alice.address,
-            gasPerPubdataByte,
-            isBaseToken
+            gasPerPubdataByte
         );
         const expectedL2Costs = await alice.getBaseCost({
             gasLimit: l2GasLimit,
             gasPerPubdataByte,
-            gasPrice: await gasPrice
+            gasPrice
         });
 
         const depositOp = alice.deposit({
-            token: ETH_ADDRESS,
+            token: zksync.utils.ETH_ADDRESS,
             amount,
             gasPerPubdataByte,
             l2GasLimit,
-            approveERC20: isETHBasedChain ? true : false,
+            approveERC20: isETHBasedChain,
             approveBaseOverrides: {
                 gasPrice
             },
@@ -95,36 +90,36 @@ describe('ETH token checks', () => {
         const depositFee = await depositOp
             .then((op) => op.waitL1Commit())
             .then(async (receipt) => {
-                const l1GasFee = receipt.gasUsed.mul(receipt.effectiveGasPrice);
+                const l1GasFee = receipt.gasUsed * receipt.gasPrice;
                 if (!isETHBasedChain) {
                     return l1GasFee;
                 }
-                return l1GasFee.add(expectedL2Costs);
+                return l1GasFee + expectedL2Costs;
             });
 
         const l1EthBalanceAfter = await alice.getBalanceL1();
         if (isETHBasedChain) {
-            expect(l1EthBalanceBefore.sub(depositFee).sub(l1EthBalanceAfter)).bnToBeEq(amount);
+            expect(l1EthBalanceBefore - depositFee - l1EthBalanceAfter).toEqual(amount);
         } else {
             // Base token checks
             const l1BaseTokenBalanceAfter = await alice.getBalanceL1(baseTokenAddress);
-            expect(l1BaseTokenBalanceBefore).bnToBeEq(l1BaseTokenBalanceAfter.add(expectedL2Costs));
+            expect(l1BaseTokenBalanceBefore).toEqual(l1BaseTokenBalanceAfter + expectedL2Costs);
 
             const l2BaseTokenBalanceAfter = await alice.getBalance();
-            expect(l1EthBalanceBefore).bnToBeEq(l1EthBalanceAfter.add(depositFee).add(amount));
+            expect(l1EthBalanceBefore).toEqual(l1EthBalanceAfter + depositFee + amount);
 
             // L2 balance for the base token increases do to some "overminting" of the base token
             // We verify that the amount reduced on L1 is greater than the amount increased on L2
             // so that we are not generating tokens out of thin air
-            const l1BaseTokenBalanceDiff = l1BaseTokenBalanceBefore.sub(l1BaseTokenBalanceAfter);
-            const l2BaseTokenBalanceDiff = l2BaseTokenBalanceAfter.sub(l2BaseTokenBalanceBefore);
-            expect(l1BaseTokenBalanceDiff).bnToBeGt(l2BaseTokenBalanceDiff);
+            const l1BaseTokenBalanceDiff = l1BaseTokenBalanceBefore - l1BaseTokenBalanceAfter;
+            const l2BaseTokenBalanceDiff = l2BaseTokenBalanceAfter - l2BaseTokenBalanceBefore;
+            expect(l1BaseTokenBalanceDiff).toBeGreaterThan(l2BaseTokenBalanceDiff);
         }
     });
 
     test('Can perform a transfer (legacy pre EIP-155)', async () => {
         const LEGACY_TX_TYPE = 0;
-        const value = BigNumber.from(200);
+        const value = 200n;
 
         const ethBalanceChange = await shouldChangeETHBalances([
             { wallet: alice, change: -value },
@@ -140,7 +135,7 @@ describe('ETH token checks', () => {
         // Remove chainId and sign the transaction without it.
         transaction.chainId = undefined;
         const signedTransaction = await alice.signTransaction(transaction);
-        await expect(alice.provider.sendTransaction(signedTransaction)).toBeAccepted([
+        await expect(alice.provider.broadcastTransaction(signedTransaction)).toBeAccepted([
             ethBalanceChange,
             correctReceiptType
         ]);
@@ -148,7 +143,7 @@ describe('ETH token checks', () => {
 
     test('Can perform a transfer (legacy EIP-155)', async () => {
         const LEGACY_TX_TYPE = 0;
-        const value = BigNumber.from(200);
+        const value = 200n;
 
         const ethBalanceChange = await shouldChangeETHBalances([
             { wallet: alice, change: -value },
@@ -166,7 +161,7 @@ describe('ETH token checks', () => {
     });
 
     test('Can perform a transfer (EIP712)', async () => {
-        const value = BigNumber.from(200);
+        const value = 200n;
 
         const ethBalanceChange = await shouldChangeETHBalances([
             { wallet: alice, change: -value },
@@ -184,7 +179,7 @@ describe('ETH token checks', () => {
 
     test('Can perform a transfer (EIP1559)', async () => {
         const EIP1559_TX_TYPE = 2;
-        const value = BigNumber.from(200);
+        const value = 200n;
 
         const ethBalanceChange = await shouldChangeETHBalances([
             { wallet: alice, change: -value },
@@ -204,7 +199,7 @@ describe('ETH token checks', () => {
     test('Should reject transactions with access lists', async () => {
         const EIP_2930_TX_TYPE = 0x01;
         const EIP_1559_TX_TYPE = 0x02;
-        const value = BigNumber.from(200);
+        const value = 200n;
 
         await expect(alice.sendTransaction({ type: EIP_2930_TX_TYPE, to: bob.address, value })).toBeRejected(
             'access lists are not supported'
@@ -221,7 +216,7 @@ describe('ETH token checks', () => {
     });
 
     test('Can perform a transfer to self', async () => {
-        const value = BigNumber.from(200);
+        const value = 200n;
 
         // Balance should not change, only fee should be taken.
         const ethBalanceChange = await shouldOnlyTakeFee(alice);
@@ -249,14 +244,14 @@ describe('ETH token checks', () => {
         if (testMaster.isFastMode()) {
             return;
         }
-        const amount = 1;
+        const amount = 1n;
 
         const l2ethBalanceChange = isETHBasedChain
             ? await shouldChangeETHBalances([{ wallet: alice, change: -amount }])
             : await shouldChangeTokenBalances(l2EthTokenAddressNonBase, [{ wallet: alice, change: -amount }]);
 
         const withdrawalPromise = alice.withdraw({
-            token: isETHBasedChain ? ETH_ADDRESS : l2EthTokenAddressNonBase,
+            token: isETHBasedChain ? zksync.utils.ETH_ADDRESS : l2EthTokenAddressNonBase,
             amount
         });
         await expect(withdrawalPromise).toBeAccepted([l2ethBalanceChange]);
@@ -267,7 +262,7 @@ describe('ETH token checks', () => {
         await expect(alice.finalizeWithdrawal(withdrawalTx.hash)).toBeAccepted();
         const tx = await alice.provider.getTransactionReceipt(withdrawalTx.hash);
 
-        expect(tx.l2ToL1Logs[0].txIndexInL1Batch).toEqual(expect.anything());
+        expect(tx!.l2ToL1Logs[0].transactionIndex).toEqual(expect.anything());
     });
 
     test('Can perform a deposit with precalculated max value', async () => {
@@ -276,40 +271,35 @@ describe('ETH token checks', () => {
             const baseTokenMaxAmount = await alice.getBalanceL1(baseTokenDetails.l1Address);
             await (await alice.approveERC20(baseTokenAddress, baseTokenMaxAmount)).wait();
         }
-
         const depositFee = await alice.getFullRequiredDepositFee({
-            token: ETH_ADDRESS
+            token: zksync.utils.ETH_ADDRESS
         });
-        const l1Fee = depositFee.l1GasLimit.mul(depositFee.maxFeePerGas! || depositFee.gasPrice!);
+        const l1Fee = depositFee.l1GasLimit * (depositFee.maxFeePerGas! || depositFee.gasPrice!);
         const l2Fee = depositFee.baseCost;
         const maxAmount = isETHBasedChain
-            ? (await alice.getBalanceL1()).sub(l1Fee).sub(l2Fee)
-            : (await alice.getBalanceL1()).sub(l1Fee); // l2Fee is paid in base token
-
+            ? (await alice.getBalanceL1()) - l1Fee - l2Fee
+            : (await alice.getBalanceL1()) - l1Fee; // l2Fee is paid in base token
         // Approving the needed allowance to ensure that the user has enough funds.
         const l2ethBalanceChange = isETHBasedChain
             ? await shouldChangeETHBalances([{ wallet: alice, change: maxAmount }], {
                   l1ToL2: true
               })
             : await shouldChangeTokenBalances(l2EthTokenAddressNonBase, [{ wallet: alice, change: maxAmount }]);
-
-        const overrides: Overrides = depositFee.gasPrice
+        const overrides: ethers.Overrides = depositFee.gasPrice
             ? { gasPrice: depositFee.gasPrice }
             : {
                   maxFeePerGas: depositFee.maxFeePerGas,
                   maxPriorityFeePerGas: depositFee.maxPriorityFeePerGas
               };
         overrides.gasLimit = depositFee.l1GasLimit;
-
         const depositOp = await alice.deposit({
-            token: ETH_ADDRESS,
+            token: zksync.utils.ETH_ADDRESS,
             amount: maxAmount,
             l2GasLimit: depositFee.l2GasLimit,
             approveBaseERC20: true,
             approveERC20: true,
             overrides
         });
-
         await expect(depositOp).toBeAccepted([l2ethBalanceChange]);
     });
 
diff --git a/core/tests/ts-integration/tests/fees.test.ts b/core/tests/ts-integration/tests/fees.test.ts
index e7aba50f997f..522a9d8fd5be 100644
--- a/core/tests/ts-integration/tests/fees.test.ts
+++ b/core/tests/ts-integration/tests/fees.test.ts
@@ -9,15 +9,17 @@
  * sure that the test is maintained does not get broken.
  *
  */
-import * as utils from 'zk/build/utils';
+import * as utils from 'utils';
 import * as fs from 'fs';
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 
 import * as zksync from 'zksync-ethers';
-import { BigNumber, ethers } from 'ethers';
-import { Token } from '../src/types';
+import * as ethers from 'ethers';
+import { DataAvailabityMode, Token } from '../src/types';
+import { SYSTEM_CONTEXT_ADDRESS, getTestContract } from '../src/helpers';
 
-const UINT32_MAX = BigNumber.from(2).pow(32).sub(1);
+const UINT32_MAX = 2n ** 32n - 1n;
+const MAX_GAS_PER_PUBDATA = 50_000n;
 
 const logs = fs.createWriteStream('fees.log', { flags: 'a' });
 
@@ -28,21 +30,21 @@ const testFees = process.env.RUN_FEE_TEST ? describe : describe.skip;
 // For CI we use only 2 gas prices to not slow it down too much.
 const L1_GAS_PRICES_TO_TEST = process.env.CI
     ? [
-          5_000_000_000, // 5 gwei
-          10_000_000_000 // 10 gwei
+          5_000_000_000n, // 5 gwei
+          10_000_000_000n // 10 gwei
       ]
     : [
-          1_000_000_000, // 1 gwei
-          5_000_000_000, // 5 gwei
-          10_000_000_000, // 10 gwei
-          25_000_000_000, // 25 gwei
-          50_000_000_000, // 50 gwei
-          100_000_000_000, // 100 gwei
-          200_000_000_000, // 200 gwei
-          400_000_000_000, // 400 gwei
-          800_000_000_000, // 800 gwei
-          1_000_000_000_000, // 1000 gwei
-          2_000_000_000_000 // 2000 gwei
+          1_000_000_000n, // 1 gwei
+          5_000_000_000n, // 5 gwei
+          10_000_000_000n, // 10 gwei
+          25_000_000_000n, // 25 gwei
+          50_000_000_000n, // 50 gwei
+          100_000_000_000n, // 100 gwei
+          200_000_000_000n, // 200 gwei
+          400_000_000_000n, // 400 gwei
+          800_000_000_000n, // 800 gwei
+          1_000_000_000_000n, // 1000 gwei
+          2_000_000_000_000n // 2000 gwei
       ];
 
 testFees('Test fees', () => {
@@ -67,28 +69,36 @@ testFees('Test fees', () => {
         const feeTestL1Receipt = await (
             await alice.ethWallet().sendTransaction({
                 to: receiver,
-                value: BigNumber.from(1)
+                value: 1n
             })
         ).wait();
 
+        if (feeTestL1Receipt === null) {
+            throw new Error('Failed to send ETH transaction');
+        }
+
         const feeTestL1ReceiptERC20 = await (
             await alice.ethWallet().sendTransaction({
-                to: aliceErc20.address,
-                data: aliceErc20.interface.encodeFunctionData('transfer', [receiver, BigNumber.from(1)])
+                to: aliceErc20.getAddress(),
+                data: aliceErc20.interface.encodeFunctionData('transfer', [receiver, 1n])
             })
         ).wait();
 
+        if (feeTestL1ReceiptERC20 === null) {
+            throw new Error('Failed to send ERC20 transaction');
+        }
+
         // Warming up slots for the receiver
         await (
             await alice.sendTransaction({
                 to: receiver,
-                value: BigNumber.from(1)
+                value: BigInt(1)
             })
         ).wait();
 
         await (
             await alice.sendTransaction({
-                data: aliceErc20.interface.encodeFunctionData('transfer', [receiver, BigNumber.from(1)]),
+                data: aliceErc20.interface.encodeFunctionData('transfer', [receiver, 1n]),
                 to: tokenDetails.l2Address
             })
         ).wait();
@@ -107,21 +117,21 @@ testFees('Test fees', () => {
                 [
                     {
                         to: ethers.Wallet.createRandom().address,
-                        value: BigNumber.from(1)
+                        value: 1n
                     },
                     {
                         to: receiver,
-                        value: BigNumber.from(1)
+                        value: 1n
                     },
                     {
                         data: aliceErc20.interface.encodeFunctionData('transfer', [
                             ethers.Wallet.createRandom().address,
-                            BigNumber.from(1)
+                            1n
                         ]),
                         to: tokenDetails.l2Address
                     },
                     {
-                        data: aliceErc20.interface.encodeFunctionData('transfer', [receiver, BigNumber.from(1)]),
+                        data: aliceErc20.interface.encodeFunctionData('transfer', [receiver, 1n]),
                         to: tokenDetails.l2Address
                     }
                 ],
@@ -134,7 +144,7 @@ testFees('Test fees', () => {
     });
 
     test('Test gas consumption under large L1 gas price', async () => {
-        if (process.env.CHAIN_STATE_KEEPER_L1_BATCH_COMMIT_DATA_GENERATOR_MODE === 'Validium') {
+        if (testMaster.environment().l1BatchCommitDataGeneratorMode === DataAvailabityMode.Validium) {
             // We skip this test for Validium mode, since L1 gas price has little impact on the gasLimit in this mode.
             return;
         }
@@ -144,14 +154,14 @@ testFees('Test fees', () => {
 
         // In this test we will set gas per pubdata byte to its maximum value, while publishing a large L1->L2 message.
 
-        const minimalL2GasPrice = ethers.BigNumber.from(process.env.CHAIN_STATE_KEEPER_MINIMAL_L2_GAS_PRICE!);
+        const minimalL2GasPrice = testMaster.environment().minimalL2GasPrice;
 
         // We want the total gas limit to be over u32::MAX, so we need the gas per pubdata to be 50k.
         //
         // Note, that in case, any sort of overhead is present in the l2 fair gas price calculation, the final
         // gas per pubdata may be lower than 50_000. Here we assume that it is not the case, but we'll double check
         // that the gasLimit is indeed over u32::MAX, which is the most important tested property.
-        const requiredPubdataPrice = minimalL2GasPrice.mul(100_000);
+        const requiredPubdataPrice = minimalL2GasPrice * 100_000n;
 
         await setInternalL1GasPrice(
             alice._providerL2(),
@@ -162,19 +172,29 @@ testFees('Test fees', () => {
         const l1Messenger = new ethers.Contract(zksync.utils.L1_MESSENGER_ADDRESS, zksync.utils.L1_MESSENGER, alice);
 
         // Firstly, let's test a successful transaction.
-        const largeData = ethers.utils.randomBytes(90_000);
-        const tx = await l1Messenger.sendToL1(largeData);
-        expect(tx.gasLimit.gt(UINT32_MAX)).toBeTruthy();
+        const largeData = ethers.randomBytes(90_000);
+        const tx = await l1Messenger.sendToL1(largeData, { type: 0 });
+        expect(tx.gasLimit > UINT32_MAX).toBeTruthy();
         const receipt = await tx.wait();
-        expect(receipt.gasUsed.gt(UINT32_MAX)).toBeTruthy();
+        expect(receipt.gasUsed > UINT32_MAX).toBeTruthy();
+
+        // Let's also check that the same transaction would work as eth_call
+        const systemContextArtifact = getTestContract('ISystemContext');
+        const systemContext = new ethers.Contract(SYSTEM_CONTEXT_ADDRESS, systemContextArtifact.abi, alice.provider);
+        const systemContextGasPerPubdataByte = await systemContext.gasPerPubdataByte();
+        expect(systemContextGasPerPubdataByte).toEqual(MAX_GAS_PER_PUBDATA);
+
+        const dataHash = await l1Messenger.sendToL1.staticCall(largeData, { type: 0 });
+        expect(dataHash).toEqual(ethers.keccak256(largeData));
 
         // Secondly, let's test an unsuccessful transaction with large refund.
 
         // The size of the data has increased, so the previous gas limit is not enough.
-        const largerData = ethers.utils.randomBytes(91_000);
+        const largerData = ethers.randomBytes(91_000);
         const gasToPass = receipt.gasUsed;
         const unsuccessfulTx = await l1Messenger.sendToL1(largerData, {
-            gasLimit: gasToPass
+            gasLimit: gasToPass,
+            type: 0
         });
 
         try {
@@ -182,7 +202,7 @@ testFees('Test fees', () => {
             throw new Error('The transaction should have reverted');
         } catch {
             const receipt = await alice.provider.getTransactionReceipt(unsuccessfulTx.hash);
-            expect(gasToPass.sub(receipt.gasUsed).gt(UINT32_MAX)).toBeTruthy();
+            expect(gasToPass - receipt!.gasUsed > UINT32_MAX).toBeTruthy();
         }
     });
 
@@ -196,9 +216,9 @@ testFees('Test fees', () => {
 
 async function appendResults(
     sender: zksync.Wallet,
-    originalL1Receipts: ethers.providers.TransactionReceipt[],
-    transactionRequests: ethers.providers.TransactionRequest[],
-    newL1GasPrice: number,
+    originalL1Receipts: ethers.TransactionReceipt[],
+    transactionRequests: ethers.TransactionRequest[],
+    newL1GasPrice: bigint,
     reports: string[]
 ): Promise<string[]> {
     // For the sake of simplicity, we'll use the same pubdata price as the L1 gas price.
@@ -223,32 +243,32 @@ async function appendResults(
 
 async function updateReport(
     sender: zksync.Wallet,
-    l1Receipt: ethers.providers.TransactionReceipt,
-    transactionRequest: ethers.providers.TransactionRequest,
-    newL1GasPrice: number,
+    l1Receipt: ethers.TransactionReceipt,
+    transactionRequest: ethers.TransactionRequest,
+    newL1GasPrice: bigint,
     oldReport: string
 ): Promise<string> {
-    const expectedL1Price = +ethers.utils.formatEther(l1Receipt.gasUsed.mul(newL1GasPrice));
+    const expectedL1Price = +ethers.formatEther(l1Receipt.gasUsed * newL1GasPrice);
 
-    const estimatedL2GasPrice = await sender.getGasPrice();
+    const estimatedL2GasPrice = await sender.provider.getGasPrice();
     const estimatedL2GasLimit = await sender.estimateGas(transactionRequest);
-    const estimatedPrice = estimatedL2GasPrice.mul(estimatedL2GasLimit);
+    const estimatedPrice = estimatedL2GasPrice * estimatedL2GasLimit;
 
     const balanceBefore = await sender.getBalance();
     const transaction = await sender.sendTransaction(transactionRequest);
     console.log(`Sending transaction: ${transaction.hash}`);
     await transaction.wait();
     const balanceAfter = await sender.getBalance();
-    const balanceDiff = balanceBefore.sub(balanceAfter);
+    const balanceDiff = balanceBefore - balanceAfter;
 
-    const l2PriceAsNumber = +ethers.utils.formatEther(balanceDiff);
-    const l2EstimatedPriceAsNumber = +ethers.utils.formatEther(estimatedPrice);
+    const l2PriceAsNumber = +ethers.formatEther(balanceDiff);
+    const l2EstimatedPriceAsNumber = +ethers.formatEther(estimatedPrice);
 
-    const gasReport = `Gas price ${newL1GasPrice / 1000000000} gwei:
-    L1 cost ${expectedL1Price}, 
+    const gasReport = `Gas price ${newL1GasPrice / 1000000000n} gwei:
+    L1 cost ${expectedL1Price},
     L2 estimated cost: ${l2EstimatedPriceAsNumber}
     Estimated Gain: ${expectedL1Price / l2EstimatedPriceAsNumber}
-    L2 cost: ${l2PriceAsNumber}, 
+    L2 cost: ${l2PriceAsNumber},
     Gain: ${expectedL1Price / l2PriceAsNumber}\n`;
     console.log(gasReport);
 
@@ -285,7 +305,7 @@ async function setInternalL1GasPrice(
     } catch (_) {}
 
     // Run server in background.
-    let command = 'zk server --components api,tree,eth,state_keeper';
+    let command = 'zk server --components api,tree,eth,state_keeper,da_dispatcher';
     command = `DATABASE_MERKLE_TREE_MODE=full ${command}`;
 
     if (newPubdataPrice) {
@@ -303,7 +323,7 @@ async function setInternalL1GasPrice(
         command = `CHAIN_STATE_KEEPER_TRANSACTION_SLOTS=1 ${command}`;
     }
 
-    const zkSyncServer = utils.background(command, [null, logs, logs]);
+    const zkSyncServer = utils.background({ command, stdio: [null, logs, logs] });
 
     if (disconnect) {
         zkSyncServer.unref();
diff --git a/core/tests/ts-integration/tests/l1.test.ts b/core/tests/ts-integration/tests/l1.test.ts
index b1ee21324aeb..0f8466ec463b 100644
--- a/core/tests/ts-integration/tests/l1.test.ts
+++ b/core/tests/ts-integration/tests/l1.test.ts
@@ -1,22 +1,20 @@
 /**
  * This suite contains tests checking the interaction with L1.
  *
- * !WARN! Tests that interact with L1 may be very time consuming on stage.
+ * !WARN! Tests that interact with L1 may be very time-consuming on stage.
  * Please only do the minimal amount of actions to test the behavior (e.g. no unnecessary deposits/withdrawals
  * and waiting for the block finalization).
  */
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 import * as zksync from 'zksync-ethers';
 import * as ethers from 'ethers';
-import { deployContract, getTestContract, scaledGasPrice, waitForNewL1Batch } from '../src/helpers';
+import { bigIntMax, deployContract, getTestContract, scaledGasPrice, waitForNewL1Batch } from '../src/helpers';
 import {
     getHashedL2ToL1Msg,
     L1_MESSENGER,
     L1_MESSENGER_ADDRESS,
     REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT
-} from 'zksync-ethers/build/src/utils';
-
-const SYSTEM_CONFIG = require(`${process.env.ZKSYNC_HOME}/contracts/SystemConfig.json`);
+} from 'zksync-ethers/build/utils';
 
 const contracts = {
     counter: getTestContract('Counter'),
@@ -37,7 +35,7 @@ describe('Tests for L1 behavior', () => {
     let errorContract: zksync.Contract;
 
     let isETHBasedChain: boolean;
-    let expectedL2Costs: ethers.BigNumberish;
+    let expectedL2Costs: bigint;
 
     beforeAll(() => {
         testMaster = TestMaster.getInstance(__filename);
@@ -53,7 +51,7 @@ describe('Tests for L1 behavior', () => {
     });
 
     test('Should provide allowance to shared bridge, if base token is not ETH', async () => {
-        const baseTokenAddress = process.env.CONTRACTS_BASE_TOKEN_ADDR!;
+        const baseTokenAddress = testMaster.environment().baseToken.l1Address;
         isETHBasedChain = baseTokenAddress == zksync.utils.ETH_ADDRESS_IN_CONTRACTS;
         if (!isETHBasedChain) {
             const baseTokenDetails = testMaster.environment().baseToken;
@@ -65,27 +63,26 @@ describe('Tests for L1 behavior', () => {
     test('Should calculate l2 base cost, if base token is not ETH', async () => {
         const gasPrice = await scaledGasPrice(alice);
         if (!isETHBasedChain) {
-            expectedL2Costs = (
-                await alice.getBaseCost({
-                    gasLimit: maxL2GasLimitForPriorityTxs(),
+            expectedL2Costs =
+                ((await alice.getBaseCost({
+                    gasLimit: maxL2GasLimitForPriorityTxs(testMaster.environment().priorityTxMaxGasLimit),
                     gasPerPubdataByte: REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT,
                     gasPrice
-                })
-            )
-                .mul(140)
-                .div(100);
+                })) *
+                    140n) /
+                100n;
         }
     });
 
     test('Should request L1 execute', async () => {
         const calldata = counterContract.interface.encodeFunctionData('increment', ['1']);
-        const gasPrice = scaledGasPrice(alice);
+        const gasPrice = await scaledGasPrice(alice);
 
         await expect(
             alice.requestExecute({
-                contractAddress: counterContract.address,
+                contractAddress: await counterContract.getAddress(),
                 calldata,
-                mintValue: isETHBasedChain ? ethers.BigNumber.from(0) : expectedL2Costs,
+                mintValue: isETHBasedChain ? 0n : expectedL2Costs,
                 overrides: {
                     gasPrice
                 }
@@ -96,14 +93,14 @@ describe('Tests for L1 behavior', () => {
     test('Should request L1 execute with msg.value', async () => {
         const l2Value = 10;
         const calldata = contextContract.interface.encodeFunctionData('requireMsgValue', [l2Value]);
-        const gasPrice = scaledGasPrice(alice);
+        const gasPrice = await scaledGasPrice(alice);
 
         await expect(
             alice.requestExecute({
-                contractAddress: contextContract.address,
+                contractAddress: await contextContract.getAddress(),
                 calldata,
                 l2Value,
-                mintValue: isETHBasedChain ? ethers.BigNumber.from(0) : expectedL2Costs,
+                mintValue: isETHBasedChain ? 0n : expectedL2Costs,
                 overrides: {
                     gasPrice
                 }
@@ -113,14 +110,14 @@ describe('Tests for L1 behavior', () => {
 
     test('Should fail requested L1 execute', async () => {
         const calldata = errorContract.interface.encodeFunctionData('require_short', []);
-        const gasPrice = scaledGasPrice(alice);
+        const gasPrice = await scaledGasPrice(alice);
 
         await expect(
             alice.requestExecute({
-                contractAddress: errorContract.address,
+                contractAddress: await errorContract.getAddress(),
                 calldata,
                 l2GasLimit: DEFAULT_L2_GAS_LIMIT,
-                mintValue: isETHBasedChain ? ethers.BigNumber.from(0) : expectedL2Costs,
+                mintValue: isETHBasedChain ? 0n : expectedL2Costs,
                 overrides: {
                     gasPrice
                 }
@@ -135,9 +132,9 @@ describe('Tests for L1 behavior', () => {
         const contract = new zksync.Contract(L1_MESSENGER_ADDRESS, L1_MESSENGER, alice);
 
         // Send message to L1 and wait until it gets there.
-        const message = ethers.utils.toUtf8Bytes('Some L2->L1 message');
+        const message = ethers.toUtf8Bytes('Some L2->L1 message');
         const tx = await contract.sendToL1(message);
-        const receipt = await tx.waitFinalize();
+        const receipt = await (await alice.provider.getTransaction(tx.hash)).waitFinalize();
 
         // Get the proof for the sent message from the server, expect it to exist.
         const l2ToL1LogIndex = receipt.l2ToL1Logs.findIndex(
@@ -148,16 +145,16 @@ describe('Tests for L1 behavior', () => {
 
         // Ensure that received proof matches the provided root hash.
         const { id, proof, root } = msgProof!;
-        const accumutatedRoot = calculateAccumulatedRoot(alice.address, message, receipt.l1BatchTxIndex, id, proof);
-        expect(accumutatedRoot).toBe(root);
+        const accumulatedRoot = calculateAccumulatedRoot(alice.address, message, receipt.l1BatchTxIndex!, id, proof);
+        expect(accumulatedRoot).toBe(root);
 
-        // Ensure that provided proof is accepted by the main zkSync contract.
+        // Ensure that provided proof is accepted by the main ZKsync contract.
         const chainContract = await alice.getMainContract();
         const acceptedByContract = await chainContract.proveL2MessageInclusion(
-            receipt.l1BatchNumber,
+            receipt.l1BatchNumber!,
             id,
             {
-                txNumberInBatch: receipt.l1BatchTxIndex,
+                txNumberInBatch: receipt.l1BatchTxIndex!,
                 sender: alice.address,
                 data: message
             },
@@ -167,15 +164,15 @@ describe('Tests for L1 behavior', () => {
     });
 
     test('Should check max L2 gas limit for priority txs', async () => {
-        const gasPrice = scaledGasPrice(alice);
-        const l2GasLimit = maxL2GasLimitForPriorityTxs();
+        const gasPrice = await scaledGasPrice(alice);
+        const l2GasLimit = maxL2GasLimitForPriorityTxs(testMaster.environment().priorityTxMaxGasLimit);
 
         // Check that the request with higher `gasLimit` fails.
         let priorityOpHandle = await alice.requestExecute({
             contractAddress: alice.address,
             calldata: '0x',
-            l2GasLimit: l2GasLimit + 1,
-            mintValue: isETHBasedChain ? ethers.BigNumber.from(0) : expectedL2Costs,
+            l2GasLimit: l2GasLimit + 1n,
+            mintValue: isETHBasedChain ? 0n : expectedL2Costs,
             overrides: {
                 gasPrice,
                 gasLimit: 600_000
@@ -194,7 +191,7 @@ describe('Tests for L1 behavior', () => {
             contractAddress: alice.address,
             calldata: '0x',
             l2GasLimit,
-            mintValue: isETHBasedChain ? ethers.BigNumber.from(0) : expectedL2Costs,
+            mintValue: isETHBasedChain ? 0n : expectedL2Costs,
             overrides: {
                 gasPrice
             }
@@ -210,19 +207,19 @@ describe('Tests for L1 behavior', () => {
         }
 
         const contract = await deployContract(alice, contracts.writesAndMessages, []);
-        testMaster.reporter.debug(`Deployed 'writesAndMessages' contract at ${contract.address}`);
+        testMaster.reporter.debug(`Deployed 'writesAndMessages' contract at ${await contract.getAddress()}`);
         // The circuit allows us to have ~4700 initial writes for an L1 batch.
         // We check that we will run out of gas if we do a bit smaller amount of writes.
         const calldata = contract.interface.encodeFunctionData('writes', [0, 4500, 1]);
-        const gasPrice = scaledGasPrice(alice);
+        const gasPrice = await scaledGasPrice(alice);
 
-        const l2GasLimit = maxL2GasLimitForPriorityTxs();
+        const l2GasLimit = maxL2GasLimitForPriorityTxs(testMaster.environment().priorityTxMaxGasLimit);
 
         const priorityOpHandle = await alice.requestExecute({
-            contractAddress: contract.address,
+            contractAddress: await contract.getAddress(),
             calldata,
             l2GasLimit,
-            mintValue: isETHBasedChain ? ethers.BigNumber.from(0) : expectedL2Costs,
+            mintValue: isETHBasedChain ? 0n : expectedL2Costs,
             overrides: {
                 gasPrice
             }
@@ -245,13 +242,13 @@ describe('Tests for L1 behavior', () => {
         }
 
         const contract = await deployContract(alice, contracts.writesAndMessages, []);
-        testMaster.reporter.debug(`Deployed 'writesAndMessages' contract at ${contract.address}`);
+        testMaster.reporter.debug(`Deployed 'writesAndMessages' contract at ${await contract.getAddress()}`);
         // The circuit allows us to have ~7500 repeated writes for an L1 batch.
         // We check that we will run out of gas if we do a bit smaller amount of writes.
         // In order for writes to be repeated we should firstly write to the keys initially.
         const initialWritesInOneTx = 500;
         const repeatedWritesInOneTx = 8500;
-        const gasLimit = await contract.estimateGas.writes(0, initialWritesInOneTx, 1);
+        const gasLimit = await contract.writes.estimateGas(0, initialWritesInOneTx, 1);
 
         let proms = [];
         const nonce = await alice.getNonce();
@@ -270,14 +267,14 @@ describe('Tests for L1 behavior', () => {
         testMaster.reporter.debug('L1 batch sealed with write transactions');
 
         const calldata = contract.interface.encodeFunctionData('writes', [0, repeatedWritesInOneTx, 2]);
-        const gasPrice = scaledGasPrice(alice);
-        const l2GasLimit = maxL2GasLimitForPriorityTxs();
+        const gasPrice = await scaledGasPrice(alice);
+        const l2GasLimit = maxL2GasLimitForPriorityTxs(testMaster.environment().priorityTxMaxGasLimit);
 
         const priorityOpHandle = await alice.requestExecute({
-            contractAddress: contract.address,
+            contractAddress: await contract.getAddress(),
             calldata,
             l2GasLimit,
-            mintValue: isETHBasedChain ? ethers.BigNumber.from(0) : expectedL2Costs,
+            mintValue: isETHBasedChain ? 0n : expectedL2Costs,
             overrides: {
                 gasPrice
             }
@@ -300,19 +297,19 @@ describe('Tests for L1 behavior', () => {
         }
 
         const contract = await deployContract(alice, contracts.writesAndMessages, []);
-        testMaster.reporter.debug(`Deployed 'writesAndMessages' contract at ${contract.address}`);
+        testMaster.reporter.debug(`Deployed 'writesAndMessages' contract at ${await contract.getAddress()}`);
         // The circuit allows us to have 512 L2->L1 logs for an L1 batch.
         // We check that we will run out of gas if we send a bit smaller amount of L2->L1 logs.
         const calldata = contract.interface.encodeFunctionData('l2_l1_messages', [1000]);
-        const gasPrice = scaledGasPrice(alice);
+        const gasPrice = await scaledGasPrice(alice);
 
-        const l2GasLimit = maxL2GasLimitForPriorityTxs();
+        const l2GasLimit = maxL2GasLimitForPriorityTxs(testMaster.environment().priorityTxMaxGasLimit);
 
         const priorityOpHandle = await alice.requestExecute({
-            contractAddress: contract.address,
+            contractAddress: await contract.getAddress(),
             calldata,
             l2GasLimit,
-            mintValue: isETHBasedChain ? ethers.BigNumber.from(0) : expectedL2Costs,
+            mintValue: isETHBasedChain ? 0n : expectedL2Costs,
             overrides: {
                 gasPrice
             }
@@ -336,21 +333,23 @@ describe('Tests for L1 behavior', () => {
 
         const contract = await deployContract(alice, contracts.writesAndMessages, []);
         testMaster.reporter.debug(`Deployed 'writesAndMessages' contract at ${contract.address}`);
-        const MAX_PUBDATA_PER_BATCH = ethers.BigNumber.from(SYSTEM_CONFIG['PRIORITY_TX_PUBDATA_PER_BATCH']);
+
+        const SYSTEM_CONFIG = require(`${testMaster.environment().pathToHome}/contracts/SystemConfig.json`);
+        const MAX_PUBDATA_PER_BATCH = BigInt(SYSTEM_CONFIG['PRIORITY_TX_PUBDATA_PER_BATCH']);
         // We check that we will run out of gas if we send a bit
         // smaller than `MAX_PUBDATA_PER_BATCH` amount of pubdata in a single tx.
         const calldata = contract.interface.encodeFunctionData('big_l2_l1_message', [
-            MAX_PUBDATA_PER_BATCH.mul(9).div(10)
+            (MAX_PUBDATA_PER_BATCH * 9n) / 10n
         ]);
-        const gasPrice = scaledGasPrice(alice);
+        const gasPrice = await scaledGasPrice(alice);
 
-        const l2GasLimit = maxL2GasLimitForPriorityTxs();
+        const l2GasLimit = maxL2GasLimitForPriorityTxs(testMaster.environment().priorityTxMaxGasLimit);
 
         const priorityOpHandle = await alice.requestExecute({
-            contractAddress: contract.address,
+            contractAddress: await contract.getAddress(),
             calldata,
             l2GasLimit,
-            mintValue: isETHBasedChain ? ethers.BigNumber.from(0) : expectedL2Costs,
+            mintValue: isETHBasedChain ? 0n : expectedL2Costs,
             overrides: {
                 gasPrice
             }
@@ -386,31 +385,29 @@ function calculateAccumulatedRoot(
     for (const elem of proof) {
         const bytes =
             (idCopy & 1) == 0
-                ? new Uint8Array([...ethers.utils.arrayify(accumutatedRoot), ...ethers.utils.arrayify(elem)])
-                : new Uint8Array([...ethers.utils.arrayify(elem), ...ethers.utils.arrayify(accumutatedRoot)]);
+                ? new Uint8Array([...ethers.getBytes(accumutatedRoot), ...ethers.getBytes(elem)])
+                : new Uint8Array([...ethers.getBytes(elem), ...ethers.getBytes(accumutatedRoot)]);
 
-        accumutatedRoot = ethers.utils.keccak256(bytes);
+        accumutatedRoot = ethers.keccak256(bytes);
         idCopy /= 2;
     }
     return accumutatedRoot;
 }
 
-function maxL2GasLimitForPriorityTxs(): number {
+function maxL2GasLimitForPriorityTxs(maxGasBodyLimit: bigint): bigint {
     // Find maximum `gasLimit` that satisfies `txBodyGasLimit <= CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT`
     // using binary search.
-    let maxGasBodyLimit = +process.env.CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT!;
-
     const overhead = getOverheadForTransaction(
         // We can just pass 0 as `encodingLength` because the overhead for the transaction's slot
         // will be greater than `overheadForLength` for a typical transacction
-        ethers.BigNumber.from(0)
+        0n
     );
     return maxGasBodyLimit + overhead;
 }
 
-function getOverheadForTransaction(encodingLength: ethers.BigNumber): number {
-    const TX_SLOT_OVERHEAD_GAS = 10_000;
-    const TX_LENGTH_BYTE_OVERHEAD_GAS = 10;
+function getOverheadForTransaction(encodingLength: bigint): bigint {
+    const TX_SLOT_OVERHEAD_GAS = 10_000n;
+    const TX_LENGTH_BYTE_OVERHEAD_GAS = 10n;
 
-    return Math.max(TX_SLOT_OVERHEAD_GAS, TX_LENGTH_BYTE_OVERHEAD_GAS * encodingLength.toNumber());
+    return bigIntMax(TX_SLOT_OVERHEAD_GAS, TX_LENGTH_BYTE_OVERHEAD_GAS * encodingLength);
 }
diff --git a/core/tests/ts-integration/tests/mempool.test.ts b/core/tests/ts-integration/tests/mempool.test.ts
index 9dcf86b25693..367e6569e88c 100644
--- a/core/tests/ts-integration/tests/mempool.test.ts
+++ b/core/tests/ts-integration/tests/mempool.test.ts
@@ -2,7 +2,7 @@
  * This suite contains tests checking the mempool behavior: how transactions are inserted,
  * scheduled, processed and/or postponed.
  */
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 import * as zksync from 'zksync-ethers';
 
 describe('Tests for the mempool behavior', () => {
@@ -17,7 +17,7 @@ describe('Tests for the mempool behavior', () => {
     test('Should allow a nonce gap', async () => {
         // Here we check a basic case: first we send a transaction with nonce +1, then with valid nonce.
         // Both transactions should be processed.
-        const startNonce = await alice.getTransactionCount();
+        const startNonce = await alice.getNonce();
 
         const tx2 = await sendTxWithNonce(alice, startNonce + 1);
         const tx1 = await sendTxWithNonce(alice, startNonce);
@@ -29,7 +29,7 @@ describe('Tests for the mempool behavior', () => {
 
     test('Should process shuffled nonces', async () => {
         // More complex nonce mixup: we send 5 txs completely out of order.
-        const startNonce = await alice.getTransactionCount();
+        const startNonce = await alice.getNonce();
 
         const nonceOffsets = [4, 0, 3, 1, 2];
         const txs = nonceOffsets.map((offset) => sendTxWithNonce(alice, startNonce + offset).then((tx) => tx.wait()));
@@ -41,23 +41,23 @@ describe('Tests for the mempool behavior', () => {
     }, 600000);
 
     test('Should discard too low nonce', async () => {
-        const startNonce = await alice.getTransactionCount();
+        const startNonce = await alice.getNonce();
         await expect(sendTxWithNonce(alice, startNonce - 1)).toBeRejected('nonce too low.');
     });
 
     test('Should discard too big nonce', async () => {
         const maxNonceAhead = 450; // Matches the server config.
-        const startNonce = await alice.getTransactionCount();
+        const startNonce = await alice.getNonce();
         await expect(sendTxWithNonce(alice, startNonce + maxNonceAhead + 1)).toBeRejected('nonce too high.');
     });
 
     test('Should correctly show pending nonce', async () => {
-        const startNonce = await alice.getTransactionCount();
+        const startNonce = await alice.getNonce();
         // Send tx with nonce + 1
         const tx2 = await sendTxWithNonce(alice, startNonce + 1);
 
         // Nonce from API should not change (e.g. not become "nonce + 2").
-        const nonce = await alice.getTransactionCount();
+        const nonce = await alice.getNonce();
         expect(nonce).toEqual(startNonce);
 
         // Finish both transactions to not ruin the flow for other tests.
@@ -66,7 +66,7 @@ describe('Tests for the mempool behavior', () => {
     });
 
     test('Should replace the transaction', async () => {
-        const startNonce = await alice.getTransactionCount();
+        const startNonce = await alice.getNonce();
         // Send tx with nonce + 1
         const tx2 = await sendTxWithNonce(alice, startNonce + 1);
         await expect(alice.provider.getTransaction(tx2.hash)).resolves.toMatchObject({
@@ -102,17 +102,24 @@ describe('Tests for the mempool behavior', () => {
 
         const gasLimit = await alice.estimateGas({ to: alice.address });
         const gasPrice = await alice.provider.getGasPrice();
-        const fund = gasLimit.mul(gasPrice).mul(13).div(10);
+        const fund = (gasLimit * gasPrice * 13n) / 10n;
         await alice.sendTransaction({ to: poorBob.address, value: fund }).then((tx) => tx.wait());
 
         // delayedTx should pass API checks (if not then error will be thrown on the next lime)
         // but should be rejected by the state-keeper (checked later).
         const delayedTx = await poorBob.sendTransaction({
             to: poorBob.address,
-            nonce: nonce + 1
+            nonce: nonce + 1,
+            type: 0
         });
 
-        await expect(poorBob.sendTransaction({ to: poorBob.address, nonce })).toBeAccepted();
+        await expect(
+            poorBob.sendTransaction({
+                to: poorBob.address,
+                nonce,
+                type: 0
+            })
+        ).toBeAccepted();
 
         // We don't have a good check that tx was indeed rejected.
         // Most that we can do is to ensure that tx wasn't mined for some time.
@@ -130,7 +137,7 @@ describe('Tests for the mempool behavior', () => {
 });
 
 /**
- * Sends a valid zkSync transaction with a certain nonce.
+ * Sends a valid ZKsync transaction with a certain nonce.
  * What transaction does is assumed to be not important besides the fact that it should be accepted.
  *
  * @param wallet Wallet to send transaction from.
@@ -139,7 +146,7 @@ describe('Tests for the mempool behavior', () => {
  *
  * @returns Transaction request object.
  */
-function sendTxWithNonce(wallet: zksync.Wallet, nonce: number, to?: string) {
+function sendTxWithNonce(wallet: zksync.Wallet, nonce: number, to?: string): Promise<zksync.types.TransactionResponse> {
     return wallet.sendTransaction({
         to: to ?? wallet.address,
         value: 1,
diff --git a/core/tests/ts-integration/tests/paymaster.test.ts b/core/tests/ts-integration/tests/paymaster.test.ts
index 66fa6c0b5878..8c9024dc4372 100644
--- a/core/tests/ts-integration/tests/paymaster.test.ts
+++ b/core/tests/ts-integration/tests/paymaster.test.ts
@@ -1,7 +1,7 @@
 /**
  * This suite contains tests checking the behavior of paymasters -- entities that can cover fees for users.
  */
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 import * as zksync from 'zksync-ethers';
 import { Provider, Wallet, utils, Contract } from 'zksync-ethers';
 import * as ethers from 'ethers';
@@ -10,7 +10,7 @@ import { L2_DEFAULT_ETH_PER_ACCOUNT } from '../src/context-owner';
 import { checkReceipt } from '../src/modifiers/receipt-check';
 import { extractFee } from '../src/modifiers/balance-checker';
 import { TestMessage } from '../src/matchers/matcher-helpers';
-import { Address } from 'zksync-ethers/build/src/types';
+import { Address } from 'zksync-ethers/build/types';
 import * as hre from 'hardhat';
 import { Deployer } from '@matterlabs/hardhat-zksync-deploy';
 import { ZkSyncArtifact } from '@matterlabs/hardhat-zksync-deploy/dist/types';
@@ -20,12 +20,12 @@ const contracts = {
 };
 
 // The amount of tokens to transfer (in wei).
-const AMOUNT = 1;
+const AMOUNT = 1n;
 
 // Exchange ratios for each 1 ETH wei
-const CUSTOM_PAYMASTER_RATE_NUMERATOR = ethers.BigNumber.from(5);
-const TESTNET_PAYMASTER_RATE_NUMERATOR = ethers.BigNumber.from(1);
-const PAYMASTER_RATE_DENOMINATOR = ethers.BigNumber.from(1);
+const CUSTOM_PAYMASTER_RATE_NUMERATOR = 5n;
+const TESTNET_PAYMASTER_RATE_NUMERATOR = 1n;
+const PAYMASTER_RATE_DENOMINATOR = 1n;
 
 describe('Paymaster tests', () => {
     let testMaster: TestMaster;
@@ -50,31 +50,30 @@ describe('Paymaster tests', () => {
         paymaster = await deployContract(alice, contracts.customPaymaster, []);
         // Supplying paymaster with ETH it would need to cover the fees for the user
         await alice
-            .transfer({ to: paymaster.address, amount: L2_DEFAULT_ETH_PER_ACCOUNT.div(4) })
+            .transfer({ to: await paymaster.getAddress(), amount: L2_DEFAULT_ETH_PER_ACCOUNT / 4n })
             .then((tx) => tx.wait());
     });
 
     test('Should pay fee with paymaster', async () => {
         paymaster = await deployContract(alice, contracts.customPaymaster, []);
+        const paymasterAddress = await paymaster.getAddress();
         // Supplying paymaster with ETH it would need to cover the fees for the user
-        await alice
-            .transfer({ to: paymaster.address, amount: L2_DEFAULT_ETH_PER_ACCOUNT.div(4) })
-            .then((tx) => tx.wait());
+        await alice.transfer({ to: paymasterAddress, amount: L2_DEFAULT_ETH_PER_ACCOUNT / 4n }).then((tx) => tx.wait());
 
         const correctSignature = new Uint8Array(46);
 
         const paymasterParamsForEstimation = await getTestPaymasterParamsForFeeEstimation(
             erc20,
             alice.address,
-            paymaster.address
+            paymasterAddress
         );
-        const tx = await erc20.populateTransaction.transfer(alice.address, AMOUNT, {
+        const tx = await erc20.transfer.populateTransaction(alice.address, AMOUNT, {
             customData: {
                 gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
                 paymasterParams: paymasterParamsForEstimation
             }
         });
-        tx.gasLimit = await erc20.estimateGas.transfer(alice.address, AMOUNT, {
+        tx.gasLimit = await erc20.transfer.estimateGas(alice.address, AMOUNT, {
             customData: {
                 gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
                 paymasterParams: paymasterParamsForEstimation
@@ -82,16 +81,17 @@ describe('Paymaster tests', () => {
         });
 
         const txPromise = sendTxWithTestPaymasterParams(
-            tx,
+            tx as zksync.types.Transaction,
             alice.provider,
             alice,
-            paymaster.address,
+            paymasterAddress,
             erc20Address,
-            correctSignature
+            correctSignature,
+            testMaster.environment().l2ChainId
         );
         await expect(txPromise).toBeAccepted([
             checkReceipt(
-                (receipt) => paidFeeWithPaymaster(receipt, CUSTOM_PAYMASTER_RATE_NUMERATOR, paymaster.address),
+                (receipt) => paidFeeWithPaymaster(receipt, CUSTOM_PAYMASTER_RATE_NUMERATOR, paymasterAddress),
                 'Fee was not paid (or paid incorrectly)'
             )
         ]);
@@ -99,19 +99,20 @@ describe('Paymaster tests', () => {
 
     test('Should call postOp of the paymaster', async () => {
         const correctSignature = new Uint8Array(46);
+        const paymasterAddress = await paymaster.getAddress();
 
         const paymasterParamsForEstimation = await getTestPaymasterParamsForFeeEstimation(
             erc20,
             alice.address,
-            paymaster.address
+            paymasterAddress
         );
-        const tx = await erc20.populateTransaction.transfer(alice.address, AMOUNT, {
+        const tx = await erc20.transfer.populateTransaction(alice.address, AMOUNT, {
             customData: {
                 gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
                 paymasterParams: paymasterParamsForEstimation
             }
         });
-        tx.gasLimit = await erc20.estimateGas.transfer(alice.address, AMOUNT, {
+        tx.gasLimit = await erc20.transfer.estimateGas(alice.address, AMOUNT, {
             customData: {
                 gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
                 paymasterParams: paymasterParamsForEstimation
@@ -120,19 +121,21 @@ describe('Paymaster tests', () => {
         // We add 300k gas to make sure that the postOp is successfully called
         // Note, that the successful call of the postOp is not guaranteed by the protocol &
         // should not be required from the users. We still do it here for the purpose of the test.
-        tx.gasLimit = tx.gasLimit!.add(300000);
+        tx.gasLimit = tx.gasLimit! + 300000n;
 
+        testMaster.environment().l2ChainId;
         const txPromise = sendTxWithTestPaymasterParams(
-            tx,
+            tx as zksync.types.Transaction,
             alice.provider,
             alice,
-            paymaster.address,
+            paymasterAddress,
             erc20Address,
-            correctSignature
+            correctSignature,
+            testMaster.environment().l2ChainId
         );
         await expect(txPromise).toBeAccepted([
             checkReceipt(
-                (receipt) => paidFeeWithPaymaster(receipt, CUSTOM_PAYMASTER_RATE_NUMERATOR, paymaster.address),
+                (receipt) => paidFeeWithPaymaster(receipt, CUSTOM_PAYMASTER_RATE_NUMERATOR, paymasterAddress),
                 'Fee was not paid (or paid incorrectly)'
             )
         ]);
@@ -152,11 +155,9 @@ describe('Paymaster tests', () => {
         expect(testnetPaymaster).toBeTruthy();
 
         // Supplying paymaster with ETH it would need to cover the fees for the user
-        await alice
-            .transfer({ to: testnetPaymaster, amount: L2_DEFAULT_ETH_PER_ACCOUNT.div(4) })
-            .then((tx) => tx.wait());
+        await alice.transfer({ to: testnetPaymaster, amount: L2_DEFAULT_ETH_PER_ACCOUNT / 4n }).then((tx) => tx.wait());
 
-        const tx = await erc20.populateTransaction.transfer(alice.address, AMOUNT);
+        const tx = await erc20.transfer.populateTransaction(alice.address, AMOUNT);
         const gasPrice = await alice.provider.getGasPrice();
 
         const aliceERC20Balance = await erc20.balanceOf(alice.address);
@@ -165,7 +166,7 @@ describe('Paymaster tests', () => {
             // For transaction estimation we provide the paymasterInput with large
             // minimalAllowance. It is safe for the end users, since the transaction is never
             // actually signed.
-            minimalAllowance: aliceERC20Balance.sub(AMOUNT),
+            minimalAllowance: aliceERC20Balance - AMOUNT,
             token: erc20Address,
             // While the "correct" paymaster signature may not be available in the true mainnet
             // paymasters, it is accessible in this test to make the test paymaster simpler.
@@ -173,13 +174,13 @@ describe('Paymaster tests', () => {
             // to cover the fee for him.
             innerInput: new Uint8Array()
         });
-        const gasLimit = await erc20.estimateGas.transfer(alice.address, AMOUNT, {
+        const gasLimit = await erc20.transfer.estimateGas(alice.address, AMOUNT, {
             customData: {
                 gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
                 paymasterParams: paramsForFeeEstimation
             }
         });
-        const fee = gasPrice.mul(gasLimit);
+        const fee = gasPrice * gasLimit;
 
         const paymasterParams = utils.getPaymasterParams(testnetPaymaster, {
             type: 'ApprovalBased',
@@ -205,18 +206,19 @@ describe('Paymaster tests', () => {
     });
 
     test('Should reject tx with invalid paymaster input', async () => {
+        const paymasterAddress = await paymaster.getAddress();
         const paymasterParamsForEstimation = await getTestPaymasterParamsForFeeEstimation(
             erc20,
             alice.address,
-            paymaster.address
+            paymasterAddress
         );
-        const tx = await erc20.populateTransaction.transfer(alice.address, AMOUNT, {
+        const tx = await erc20.transfer.populateTransaction(alice.address, AMOUNT, {
             customData: {
                 gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
                 paymasterParams: paymasterParamsForEstimation
             }
         });
-        tx.gasLimit = await erc20.estimateGas.transfer(alice.address, AMOUNT, {
+        tx.gasLimit = await erc20.transfer.estimateGas(alice.address, AMOUNT, {
             customData: {
                 gasPerPubdata: utils.DEFAULT_GAS_PER_PUBDATA_LIMIT,
                 paymasterParams: paymasterParamsForEstimation
@@ -226,32 +228,34 @@ describe('Paymaster tests', () => {
         const incorrectSignature = new Uint8Array(45);
         await expect(
             sendTxWithTestPaymasterParams(
-                tx,
+                tx as zksync.types.Transaction,
                 alice.provider,
                 alice,
-                paymaster.address,
+                paymasterAddress,
                 erc20Address,
-                incorrectSignature
+                incorrectSignature,
+                testMaster.environment().l2ChainId
             )
         ).toBeRejected('Paymaster validation error');
     });
 
-    it('Should deploy nonce-check paymaster and not fail validation', async function () {
+    test('Should deploy nonce-check paymaster and not fail validation', async function () {
         const deployer = new Deployer(hre as any, alice as any);
         const paymaster = await deployPaymaster(deployer);
+        const paymasterAddress = await paymaster.getAddress();
         const token = testMaster.environment().erc20Token;
 
         await (
             await deployer.zkWallet.sendTransaction({
-                to: paymaster.address,
-                value: ethers.utils.parseEther('0.01')
+                to: paymasterAddress,
+                value: ethers.parseEther('0.01')
             })
         ).wait();
 
-        const paymasterParams = utils.getPaymasterParams(paymaster.address, {
+        const paymasterParams = utils.getPaymasterParams(paymasterAddress, {
             type: 'ApprovalBased',
             token: token.l2Address,
-            minimalAllowance: ethers.BigNumber.from(1),
+            minimalAllowance: 1n,
             innerInput: new Uint8Array()
         });
 
@@ -277,7 +281,16 @@ describe('Paymaster tests', () => {
             }
         });
 
-        await expect(bobTx).toBeRejected('Nonce is zerooo');
+        /*
+        Ethers v6 error handling is not capable of handling this format of messages.
+        See: https://github.com/ethers-io/ethers.js/blob/main/src.ts/providers/provider-jsonrpc.ts#L976
+        {
+          "code": 3,
+          "message": "failed paymaster validation. error message: Nonce is zerooo",
+          "data": "0x"
+        }
+         */
+        await expect(bobTx).toBeRejected(/*'Nonce is zerooo'*/);
 
         const aliceTx2 = alice.transfer({
             to: alice.address,
@@ -300,13 +313,13 @@ describe('Paymaster tests', () => {
 });
 
 /**
- * Matcher modifer that checks if the fee was paid with the paymaster.
+ * Matcher modifier that checks if the fee was paid with the paymaster.
  * It only checks the receipt logs and assumes that logs are correct (e.g. if event is present, tokens were moved).
  * Assumption is that other tests ensure this invariant.
  */
 function paidFeeWithPaymaster(
     receipt: zksync.types.TransactionReceipt,
-    ratioNumerator: ethers.BigNumber,
+    ratioNumerator: bigint,
     paymaster: string
 ): boolean {
     const errorMessage = (line: string) => {
@@ -338,11 +351,11 @@ function paidFeeWithPaymaster(
 
     // Find the log showing that the fee in ERC20 was taken from the user.
     // We need to pad values to represent 256-bit value.
-    const fromAccountAddress = ethers.utils.hexZeroPad(ethers.utils.arrayify(receipt.from), 32);
-    const paddedAmount = ethers.utils.hexZeroPad(ethers.utils.arrayify(expectedErc20Fee), 32);
-    const paddedPaymaster = ethers.utils.hexZeroPad(ethers.utils.arrayify(paymaster), 32);
+    const fromAccountAddress = ethers.zeroPadValue(receipt.from, 32);
+    const paddedAmount = ethers.toBeHex(expectedErc20Fee, 32);
+    const paddedPaymaster = ethers.zeroPadValue(paymaster, 32);
     // ERC20 fee log is one that sends money to the paymaster.
-    const erc20TransferTopic = ethers.utils.id('Transfer(address,address,uint256)');
+    const erc20TransferTopic = ethers.id('Transfer(address,address,uint256)');
     const erc20FeeLog = receipt.logs.find((log) => {
         return (
             log.topics.length == 3 &&
@@ -361,7 +374,7 @@ function paidFeeWithPaymaster(
     return true;
 }
 
-function getTestPaymasterFeeInToken(feeInEth: ethers.BigNumber, numerator: ethers.BigNumber) {
+function getTestPaymasterFeeInToken(feeInEth: bigint, numerator: bigint) {
     // The number of ETH that the paymaster agrees to swap is equal to
     // tokenAmount * exchangeRateNumerator / exchangeRateDenominator
     //
@@ -370,11 +383,11 @@ function getTestPaymasterFeeInToken(feeInEth: ethers.BigNumber, numerator: ether
     // tokenAmount = ceil(feeInEth * exchangeRateDenominator / exchangeRateNumerator)
     // for easier ceiling we do the following:
     // tokenAmount = (ethNeeded * exchangeRateDenominator + exchangeRateNumerator - 1) / exchangeRateNumerator
-    return feeInEth.mul(PAYMASTER_RATE_DENOMINATOR).add(numerator).sub(1).div(numerator);
+    return (feeInEth * PAYMASTER_RATE_DENOMINATOR + numerator - 1n) / numerator;
 }
 
-function getTestPaymasterInnerInput(signature: ethers.BytesLike, tokenAmount: ethers.BigNumber) {
-    const abiEncoder = new ethers.utils.AbiCoder();
+function getTestPaymasterInnerInput(signature: ethers.BytesLike, tokenAmount: bigint) {
+    const abiEncoder = new ethers.AbiCoder();
     return abiEncoder.encode(
         ['bytes', 'uint256', 'uint256', 'uint256'],
         [signature, CUSTOM_PAYMASTER_RATE_NUMERATOR, PAYMASTER_RATE_DENOMINATOR, tokenAmount]
@@ -397,21 +410,16 @@ async function getTestPaymasterParamsForFeeEstimation(
         // minimalAllowance. It is safe for the end users, since the transaction is never
         // actually signed.
         minimalAllowance: aliceERC20Balance,
-        token: erc20.address,
+        token: await erc20.getAddress(),
         // The amount that is passed does not matter, since the testnet paymaster does not enforce it
         // to cover the fee for him.
-        innerInput: getTestPaymasterInnerInput(correctSignature, ethers.BigNumber.from(1))
+        innerInput: getTestPaymasterInnerInput(correctSignature, 1n)
     });
 
     return paramsForFeeEstimation;
 }
 
-function getTestPaymasterParams(
-    paymaster: string,
-    token: string,
-    ethNeeded: ethers.BigNumber,
-    signature: ethers.BytesLike
-) {
+function getTestPaymasterParams(paymaster: string, token: string, ethNeeded: bigint, signature: ethers.BytesLike) {
     const tokenAmount = getTestPaymasterFeeInToken(ethNeeded, CUSTOM_PAYMASTER_RATE_NUMERATOR);
     // The input to the tester paymaster
     const innerInput = getTestPaymasterInnerInput(signature, tokenAmount);
@@ -425,22 +433,23 @@ function getTestPaymasterParams(
 }
 
 async function sendTxWithTestPaymasterParams(
-    tx: ethers.PopulatedTransaction,
-    web3Provider: Provider,
+    tx: zksync.types.Transaction,
+    browserProvider: Provider,
     sender: Wallet,
     paymasterAddress: string,
     token: string,
-    paymasterSignature: ethers.BytesLike
+    paymasterSignature: ethers.BytesLike,
+    l2ChainId: bigint
 ) {
-    const gasPrice = await web3Provider.getGasPrice();
+    const gasPrice = await browserProvider.getGasPrice();
 
     tx.gasPrice = gasPrice;
-    tx.chainId = parseInt(process.env.CHAIN_ETH_ZKSYNC_NETWORK_ID!, 10);
-    tx.value = ethers.BigNumber.from(0);
-    tx.nonce = await web3Provider.getTransactionCount(sender.address);
+    tx.chainId = l2ChainId;
+    tx.value = 0n;
+    tx.nonce = await browserProvider.getTransactionCount(sender.address);
     tx.type = 113;
 
-    const ethNeeded = tx.gasLimit!.mul(gasPrice);
+    const ethNeeded = tx.gasLimit! * gasPrice;
     const paymasterParams = getTestPaymasterParams(paymasterAddress, token, ethNeeded, paymasterSignature);
 
     tx.customData = {
@@ -449,7 +458,7 @@ async function sendTxWithTestPaymasterParams(
         paymasterParams
     };
     const signedTx = await sender.signTransaction(tx);
-    return await web3Provider.sendTransaction(signedTx);
+    return await browserProvider.broadcastTransaction(signedTx);
 }
 
 async function deployPaymaster(deployer: Deployer): Promise<Contract> {
diff --git a/core/tests/ts-integration/tests/self-unit.test.ts b/core/tests/ts-integration/tests/self-unit.test.ts
deleted file mode 100644
index f59d66f1361f..000000000000
--- a/core/tests/ts-integration/tests/self-unit.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * This file contains unit tests for the framework itself.
- * It does not receive a funced account and should not interact with the zkSync server.
- */
-import { TestMaster } from '../src/index';
-import { BigNumber } from 'ethers';
-
-describe('Common checks for library invariants', () => {
-    test('Should not have a test master', () => {
-        // Should not receive a test account in the unit tests file.
-        expect(() => TestMaster.getInstance(__filename)).toThrow('Wallet for self-unit.test.ts suite was not provided');
-    });
-
-    test('BigNumber matchers should work', () => {
-        const hundred = BigNumber.from(100);
-
-        // gt
-        expect(hundred).bnToBeGt(0);
-        expect(hundred).not.bnToBeGt(100);
-
-        // gte
-        expect(hundred).bnToBeGte(0);
-        expect(hundred).bnToBeGte(100);
-        expect(hundred).not.bnToBeGte(200);
-
-        // eq
-        expect(hundred).bnToBeEq(100);
-        expect(hundred).not.bnToBeEq(200);
-
-        // lte
-        expect(hundred).not.bnToBeLte(90);
-        expect(hundred).bnToBeLte(100);
-        expect(hundred).bnToBeLte(101);
-
-        // lt
-        expect(hundred).not.bnToBeLt(100);
-        expect(hundred).bnToBeLt(101);
-    });
-});
diff --git a/core/tests/ts-integration/tests/system.test.ts b/core/tests/ts-integration/tests/system.test.ts
index c6a76dadbd60..3c09bcb7b466 100644
--- a/core/tests/ts-integration/tests/system.test.ts
+++ b/core/tests/ts-integration/tests/system.test.ts
@@ -5,15 +5,15 @@
  * Stuff related to the edge cases, bootloader and system contracts normally expected to go here.
  */
 
-import { TestMaster } from '../src/index';
+import { TestMaster } from '../src';
 import { shouldChangeTokenBalances } from '../src/modifiers/balance-checker';
 import { L2_DEFAULT_ETH_PER_ACCOUNT } from '../src/context-owner';
 
 import * as zksync from 'zksync-ethers';
 import * as ethers from 'ethers';
-import { BigNumberish, BytesLike } from 'ethers';
-import { serialize, hashBytecode } from 'zksync-ethers/build/src/utils';
-import { getTestContract } from '../src/helpers';
+import { SYSTEM_CONTEXT_ADDRESS, getTestContract } from '../src/helpers';
+import { DataAvailabityMode } from '../src/types';
+import { BigNumberish } from 'ethers';
 
 const contracts = {
     counter: getTestContract('Counter'),
@@ -59,9 +59,9 @@ describe('System behavior checks', () => {
         );
 
         const sender = zksync.Wallet.createRandom().address;
-        const hash = ethers.utils.randomBytes(32);
-        const salt = ethers.utils.randomBytes(32);
-        const input = ethers.utils.randomBytes(128);
+        const hash = ethers.randomBytes(32);
+        const salt = ethers.randomBytes(32);
+        const input = ethers.randomBytes(128);
         const nonce = 5;
 
         const create2AddressBySDK = zksync.utils.create2Address(sender, hash, salt, input);
@@ -75,7 +75,7 @@ describe('System behavior checks', () => {
 
     test('Should accept transactions with small gasPerPubdataByte', async () => {
         const smallGasPerPubdata = 1;
-        const senderNonce = await alice.getTransactionCount();
+        const senderNonce = await alice.getNonce();
 
         // A safe low value to determine whether we can run this test.
         // It's higher than `smallGasPerPubdata` to not make the test flaky.
@@ -102,7 +102,7 @@ describe('System behavior checks', () => {
         }
     });
 
-    test('Should check that bootloader utils: Legacy tx hash', async () => {
+    test('Should check bootloader utils: Legacy tx hash', async () => {
         const bootloaderUtils = bootloaderUtilsContract();
 
         // Testing the correctness of calculating the legacy tx hashes
@@ -115,12 +115,12 @@ describe('System behavior checks', () => {
             gasLimit: 50000
         });
         const txBytes = await alice.signTransaction(legacyTx);
-        const parsedTx = zksync.utils.parseTransaction(txBytes);
+        const parsedTx = ethers.Transaction.from(txBytes);
+
         const txData = signedTxToTransactionData(parsedTx)!;
 
         const expectedTxHash = parsedTx.hash;
-        delete legacyTx.from;
-        const expectedSignedHash = ethers.utils.keccak256(serialize(legacyTx));
+        const expectedSignedHash = ethers.keccak256(parsedTx.unsignedSerialized);
 
         const proposedHashes = await bootloaderUtils.getTransactionHashes(txData);
         expect(proposedHashes.txHash).toEqual(expectedTxHash);
@@ -141,12 +141,12 @@ describe('System behavior checks', () => {
             gasPrice: 55000
         });
         const signedEip2930Tx = await alice.signTransaction(eip2930Tx);
-        const parsedEIP2930tx = zksync.utils.parseTransaction(signedEip2930Tx);
+        const parsedEIP2930tx = ethers.Transaction.from(signedEip2930Tx);
 
         const EIP2930TxData = signedTxToTransactionData(parsedEIP2930tx)!;
-        delete eip2930Tx.from;
+
         const expectedEIP2930TxHash = parsedEIP2930tx.hash;
-        const expectedEIP2930SignedHash = ethers.utils.keccak256(serialize(eip2930Tx));
+        const expectedEIP2930SignedHash = ethers.keccak256(parsedEIP2930tx.unsignedSerialized);
 
         const proposedEIP2930Hashes = await bootloaderUtils.getTransactionHashes(EIP2930TxData);
         expect(proposedEIP2930Hashes.txHash).toEqual(expectedEIP2930TxHash);
@@ -167,12 +167,12 @@ describe('System behavior checks', () => {
             maxPriorityFeePerGas: 100
         });
         const signedEip1559Tx = await alice.signTransaction(eip1559Tx);
-        const parsedEIP1559tx = zksync.utils.parseTransaction(signedEip1559Tx);
+        const parsedEIP1559tx = ethers.Transaction.from(signedEip1559Tx);
 
         const EIP1559TxData = signedTxToTransactionData(parsedEIP1559tx)!;
-        delete eip1559Tx.from;
+
         const expectedEIP1559TxHash = parsedEIP1559tx.hash;
-        const expectedEIP1559SignedHash = ethers.utils.keccak256(serialize(eip1559Tx));
+        const expectedEIP1559SignedHash = ethers.keccak256(parsedEIP1559tx.unsignedSerialized);
 
         const proposedEIP1559Hashes = await bootloaderUtils.getTransactionHashes(EIP1559TxData);
         expect(proposedEIP1559Hashes.txHash).toEqual(expectedEIP1559TxHash);
@@ -194,7 +194,7 @@ describe('System behavior checks', () => {
             }
         });
         const signedEip712Tx = await alice.signTransaction(eip712Tx);
-        const parsedEIP712tx = zksync.utils.parseTransaction(signedEip712Tx);
+        const parsedEIP712tx = zksync.utils.parseEip712(signedEip712Tx);
 
         const eip712TxData = signedTxToTransactionData(parsedEIP712tx)!;
         const expectedEIP712TxHash = parsedEIP712tx.hash;
@@ -216,13 +216,17 @@ describe('System behavior checks', () => {
 
         const l2Token = testMaster.environment().erc20Token.l2Address;
         const l1Token = testMaster.environment().erc20Token.l1Address;
-        const amount = 1;
+        const amount = 1n;
 
         // Fund Bob's account.
         await alice.transfer({ amount, to: bob.address, token: l2Token }).then((tx) => tx.wait());
         testMaster.reporter.debug('Sent L2 token to Bob');
         await alice
-            .transfer({ amount: L2_DEFAULT_ETH_PER_ACCOUNT.div(8), to: bob.address, token: zksync.utils.ETH_ADDRESS })
+            .transfer({
+                amount: L2_DEFAULT_ETH_PER_ACCOUNT / 8n,
+                to: bob.address,
+                token: zksync.utils.L2_BASE_TOKEN_ADDRESS
+            })
             .then((tx) => tx.wait());
         testMaster.reporter.debug('Sent ethereum on L2 to Bob');
 
@@ -247,9 +251,9 @@ describe('System behavior checks', () => {
         testMaster.reporter.debug(
             `Obtained withdrawal receipt for Bob: blockNumber=${bobReceipt.blockNumber}, l1BatchNumber=${bobReceipt.l1BatchNumber}, status=${bobReceipt.status}`
         );
-        await expect(alice.finalizeWithdrawal(aliceReceipt.transactionHash)).toBeAccepted([aliceChange]);
+        await expect(alice.finalizeWithdrawal(aliceReceipt.hash)).toBeAccepted([aliceChange]);
         testMaster.reporter.debug('Finalized withdrawal for Alice');
-        await expect(alice.finalizeWithdrawal(bobReceipt.transactionHash)).toBeAccepted([bobChange]);
+        await expect(alice.finalizeWithdrawal(bobReceipt.hash)).toBeAccepted([bobChange]);
         testMaster.reporter.debug('Finalized withdrawal for Bob');
     });
 
@@ -262,18 +266,20 @@ describe('System behavior checks', () => {
 
         const l2Token = testMaster.environment().erc20Token.l2Address;
         const l1Token = testMaster.environment().erc20Token.l1Address;
-        const amount = 1;
+        const amount = 1n;
 
         // Prepare matcher modifiers. These modifiers would record the *current* Alice's balance, so after
         // the first finalization the diff would be (compared to now) `amount`, and after the second -- `amount*2`.
         const change1 = await shouldChangeTokenBalances(l1Token, [{ wallet: alice, change: amount }], { l1: true });
-        const change2 = await shouldChangeTokenBalances(l1Token, [{ wallet: alice, change: amount * 2 }], { l1: true });
+        const change2 = await shouldChangeTokenBalances(l1Token, [{ wallet: alice, change: amount * 2n }], {
+            l1: true
+        });
         testMaster.reporter.debug('Prepared token balance modifiers');
 
         // Maximize chances of including transactions into the same block by first creating both promises
         // and only then awaiting them. This is still probabilistic though: if this test becomes flaky,
         // most likely there exists a very big problem in the system.
-        const nonce = await alice.getTransactionCount();
+        const nonce = await alice.getNonce();
         testMaster.reporter.debug(`Obtained Alice's nonce: ${nonce}`);
         const withdrawal1 = alice
             .withdraw({ token: l2Token, amount, overrides: { nonce } })
@@ -289,18 +295,18 @@ describe('System behavior checks', () => {
         testMaster.reporter.debug(
             `Obtained withdrawal receipt #2: blockNumber=${receipt2.blockNumber}, l1BatchNumber=${receipt2.l1BatchNumber}, status=${receipt2.status}`
         );
-        await expect(alice.finalizeWithdrawal(receipt1.transactionHash)).toBeAccepted([change1]);
+        await expect(alice.finalizeWithdrawal(receipt1.hash)).toBeAccepted([change1]);
         testMaster.reporter.debug('Finalized withdrawal #1');
-        await expect(alice.finalizeWithdrawal(receipt2.transactionHash)).toBeAccepted([change2]);
+        await expect(alice.finalizeWithdrawal(receipt2.hash)).toBeAccepted([change2]);
         testMaster.reporter.debug('Finalized withdrawal #2');
     });
 
     test('should accept transaction with duplicated factory dep', async () => {
         const bytecode = contracts.counter.bytecode;
         // We need some bytecodes that weren't deployed before to test behavior properly.
-        const dep1 = ethers.utils.hexConcat([bytecode, ethers.utils.randomBytes(64)]);
-        const dep2 = ethers.utils.hexConcat([bytecode, ethers.utils.randomBytes(64)]);
-        const dep3 = ethers.utils.hexConcat([bytecode, ethers.utils.randomBytes(64)]);
+        const dep1 = ethers.concat([bytecode, ethers.randomBytes(64)]);
+        const dep2 = ethers.concat([bytecode, ethers.randomBytes(64)]);
+        const dep3 = ethers.concat([bytecode, ethers.randomBytes(64)]);
         await expect(
             alice.sendTransaction({
                 to: alice.address,
@@ -311,28 +317,48 @@ describe('System behavior checks', () => {
         ).toBeAccepted();
     });
 
+    test('Gas per pubdata byte getter should work', async () => {
+        const systemContextArtifact = getTestContract('ISystemContext');
+        const systemContext = new ethers.Contract(SYSTEM_CONTEXT_ADDRESS, systemContextArtifact.abi, alice.provider);
+        const currentGasPerPubdata = await systemContext.gasPerPubdataByte();
+
+        // The current gas per pubdata depends on a lot of factors, so it wouldn't be sustainable to check the exact value.
+        // We'll just check that it is greater than zero.
+        if (testMaster.environment().l1BatchCommitDataGeneratorMode === DataAvailabityMode.Rollup) {
+            expect(currentGasPerPubdata).toBeGreaterThan(0n);
+        } else {
+            expect(currentGasPerPubdata).toEqual(0n);
+        }
+    });
+
     it('should reject transaction with huge gas limit', async () => {
-        await expect(
-            alice.sendTransaction({ to: alice.address, gasLimit: ethers.BigNumber.from(2).pow(51) })
-        ).toBeRejected('exceeds block gas limit');
+        await expect(alice.sendTransaction({ to: alice.address, gasLimit: 2n ** 51n })).toBeRejected(
+            'exceeds block gas limit'
+        );
     });
 
     it('Create2Factory should work', async () => {
         // For simplicity, we'll just deploy a contract factory
-        const salt = ethers.utils.randomBytes(32);
+        const salt = ethers.randomBytes(32);
 
         const bytecode = await alice.provider.getCode(BUILTIN_CREATE2_FACTORY_ADDRESS);
         const abi = getTestContract('ICreate2Factory').abi;
-        const hash = hashBytecode(bytecode);
+        const hash = zksync.utils.hashBytecode(bytecode);
 
         const contractFactory = new ethers.Contract(BUILTIN_CREATE2_FACTORY_ADDRESS, abi, alice);
 
-        const deploymentTx = await (await contractFactory.create2(salt, hash, [])).wait();
+        const deploymentTx = await (await contractFactory.create2(salt, hash, new Uint8Array(0))).wait();
 
         const deployedAddresses = zksync.utils.getDeployedContracts(deploymentTx);
         expect(deployedAddresses.length).toEqual(1);
         const deployedAddress = deployedAddresses[0];
-        const correctCreate2Address = zksync.utils.create2Address(contractFactory.address, hash, salt, []);
+        const contractFactoryAddress = await contractFactory.getAddress();
+        const correctCreate2Address = zksync.utils.create2Address(
+            contractFactoryAddress,
+            hash,
+            salt,
+            new Uint8Array(0)
+        );
 
         expect(deployedAddress.deployedAddress.toLocaleLowerCase()).toEqual(correctCreate2Address.toLocaleLowerCase());
         expect(await alice.provider.getCode(deployedAddress.deployedAddress)).toEqual(bytecode);
@@ -344,8 +370,10 @@ describe('System behavior checks', () => {
 
     function bootloaderUtilsContract() {
         const BOOTLOADER_UTILS_ADDRESS = '0x000000000000000000000000000000000000800c';
-        const BOOTLOADER_UTILS = new ethers.utils.Interface(
-            require(`${process.env.ZKSYNC_HOME}/contracts/system-contracts/artifacts-zk/contracts-preprocessed/BootloaderUtilities.sol/BootloaderUtilities.json`).abi
+        const BOOTLOADER_UTILS = new ethers.Interface(
+            require(`${
+                testMaster.environment().pathToHome
+            }/contracts/system-contracts/artifacts-zk/contracts-preprocessed/BootloaderUtilities.sol/BootloaderUtilities.json`).abi
         );
 
         return new ethers.Contract(BOOTLOADER_UTILS_ADDRESS, BOOTLOADER_UTILS, alice);
@@ -373,29 +401,16 @@ export interface TransactionData {
     // it would allow easier proof integration (in case we will need
     // some special circuit for preprocessing transactions).
     reserved: BigNumberish[];
-    data: BytesLike;
-    signature: BytesLike;
-    factoryDeps: BytesLike[];
-    paymasterInput: BytesLike;
+    data: ethers.BytesLike;
+    signature: ethers.BytesLike;
+    factoryDeps: ethers.BytesLike[];
+    paymasterInput: ethers.BytesLike;
     // Reserved dynamic type for the future use-case. Using it should be avoided,
     // But it is still here, just in case we want to enable some additional functionality.
-    reservedDynamic: BytesLike;
+    reservedDynamic: ethers.BytesLike;
 }
 
-function signedTxToTransactionData(tx: ethers.Transaction) {
-    // Transform legacy transaction's `v` part of the signature
-    // to a single byte used in the packed eth signature
-    function unpackV(v: number) {
-        if (v >= 35) {
-            const chainId = Math.floor((v - 35) / 2);
-            return v - chainId * 2 - 8;
-        } else if (v <= 1) {
-            return 27 + v;
-        }
-
-        throw new Error('Invalid `v`');
-    }
-
+function signedTxToTransactionData(tx: ethers.TransactionLike) {
     function legacyTxToTransactionData(tx: any): TransactionData {
         return {
             txType: 0,
@@ -410,7 +425,7 @@ function signedTxToTransactionData(tx: ethers.Transaction) {
             value: tx.value || 0,
             reserved: [tx.chainId || 0, 0, 0, 0],
             data: tx.data!,
-            signature: ethers.utils.hexConcat([tx.r, tx.s, new Uint8Array([unpackV(tx.v)])]),
+            signature: tx.signature.serialized,
             factoryDeps: [],
             paymasterInput: '0x',
             reservedDynamic: '0x'
@@ -431,7 +446,7 @@ function signedTxToTransactionData(tx: ethers.Transaction) {
             value: tx.value || 0,
             reserved: [0, 0, 0, 0],
             data: tx.data!,
-            signature: ethers.utils.hexConcat([tx.r, tx.s, unpackV(tx.v)]),
+            signature: tx.signature.serialized,
             factoryDeps: [],
             paymasterInput: '0x',
             reservedDynamic: '0x'
@@ -452,7 +467,7 @@ function signedTxToTransactionData(tx: ethers.Transaction) {
             value: tx.value || 0,
             reserved: [0, 0, 0, 0],
             data: tx.data!,
-            signature: ethers.utils.hexConcat([tx.r, tx.s, unpackV(tx.v)]),
+            signature: tx.signature.serialized,
             factoryDeps: [],
             paymasterInput: '0x',
             reservedDynamic: '0x'
@@ -474,7 +489,7 @@ function signedTxToTransactionData(tx: ethers.Transaction) {
             reserved: [0, 0, 0, 0],
             data: tx.data!,
             signature: tx.customData.customSignature,
-            factoryDeps: tx.customData.factoryDeps.map(hashBytecode),
+            factoryDeps: tx.customData.factoryDeps.map(zksync.utils.hashBytecode),
             paymasterInput: tx.customData.paymasterParams?.paymasterInput || '0x',
             reservedDynamic: '0x'
         };
diff --git a/core/tests/ts-integration/tsconfig.json b/core/tests/ts-integration/tsconfig.json
index baf2b2d0a791..e8a4c8ca30c4 100644
--- a/core/tests/ts-integration/tsconfig.json
+++ b/core/tests/ts-integration/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es2019",
+        "target": "es2020",
         "module": "commonjs",
         "esModuleInterop": true,
         "strict": true,
diff --git a/core/tests/ts-integration/typings/jest.d.ts b/core/tests/ts-integration/typings/jest.d.ts
index 9a15e4516aab..4d8f1c3530c5 100644
--- a/core/tests/ts-integration/typings/jest.d.ts
+++ b/core/tests/ts-integration/typings/jest.d.ts
@@ -1,4 +1,3 @@
-import { BigNumberish } from 'ethers';
 import { MatcherModifier } from '../src/matchers/transaction-modifiers';
 
 export declare global {
@@ -17,44 +16,6 @@ export declare global {
              */
             fail(message: string): R;
 
-            // BigNumber matchers
-
-            /**
-             * Checks if initial number is greater than the provided one.
-             *
-             * @param r Number to be checked against.
-             * @param additionalInfo Optional message to be included if test fails.
-             */
-            bnToBeGt(r: BigNumberish, additionalInfo?: string): R;
-            /**
-             * Checks if initial number is greater than or equal to the provided one.
-             *
-             * @param r Number to be checked against.
-             * @param additionalInfo Optional message to be included if test fails.
-             */
-            bnToBeGte(r: BigNumberish, additionalInfo?: string): R;
-            /**
-             * Checks if initial number is equals the provided one.
-             *
-             * @param r Number to be checked against.
-             * @param additionalInfo Optional message to be included if test fails.
-             */
-            bnToBeEq(r: BigNumberish, additionalInfo?: string): R;
-            /**
-             * Checks if initial number is less than the provided one.
-             *
-             * @param r Number to be checked against.
-             * @param additionalInfo Optional message to be included if test fails.
-             */
-            bnToBeLt(r: BigNumberish, additionalInfo?: string): R;
-            /**
-             * Checks if initial number is less than or equal to the provided one.
-             *
-             * @param r Number to be checked against.
-             * @param additionalInfo Optional message to be included if test fails.
-             */
-            bnToBeLte(r: BigNumberish, additionalInfo?: string): R;
-
             // Ethereum primitives matchers
 
             /**
diff --git a/core/tests/upgrade-test/package.json b/core/tests/upgrade-test/package.json
index d3cb4875790d..5bb23c36d3b8 100644
--- a/core/tests/upgrade-test/package.json
+++ b/core/tests/upgrade-test/package.json
@@ -23,14 +23,13 @@
     "@types/node-fetch": "^2.5.7",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
-    "ethereumjs-abi": "^0.6.8",
-    "ethers": "~5.7.0",
+    "ethers": "^6.7.1",
     "mocha": "^9.0.2",
     "mocha-steps": "^1.3.0",
     "node-fetch": "^2.6.1",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5",
-    "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#sb-old-sdk"
+    "zksync-ethers": "^6.9.0"
   },
   "dependencies": {
     "prettier": "^2.3.2"
diff --git a/core/tests/upgrade-test/tests/tester.ts b/core/tests/upgrade-test/tests/tester.ts
index e4e2b960fb4d..62bf21cd6949 100644
--- a/core/tests/upgrade-test/tests/tester.ts
+++ b/core/tests/upgrade-test/tests/tester.ts
@@ -1,25 +1,25 @@
 import * as ethers from 'ethers';
-import * as zkweb3 from 'zksync-ethers';
+import * as zksync from 'zksync-ethers';
 import * as fs from 'fs';
 import * as path from 'path';
 
 type Network = string;
 
 export class Tester {
-    public runningFee: Map<zkweb3.types.Address, ethers.BigNumber>;
+    public runningFee: Map<zksync.types.Address, bigint>;
     constructor(
         public network: Network,
-        public ethProvider: ethers.providers.Provider,
+        public ethProvider: ethers.Provider,
         public ethWallet: ethers.Wallet,
-        public syncWallet: zkweb3.Wallet,
-        public web3Provider: zkweb3.Provider
+        public syncWallet: zksync.Wallet,
+        public web3Provider: zksync.Provider
     ) {
         this.runningFee = new Map();
     }
 
     // prettier-ignore
     static async init(network: Network) {
-        const ethProvider = new ethers.providers.JsonRpcProvider(process.env.L1_RPC_ADDRESS || process.env.ETH_CLIENT_WEB3_URL);
+        const ethProvider = new ethers.JsonRpcProvider(process.env.L1_RPC_ADDRESS || process.env.ETH_CLIENT_WEB3_URL);
 
         let ethWallet;
         if (network == 'localhost') {
@@ -27,32 +27,33 @@ export class Tester {
 
             const testConfigPath = path.join(process.env.ZKSYNC_HOME!, `etc/test_config/constant`);
             const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
-            ethWallet = ethers.Wallet.fromMnemonic(
-                ethTestConfig.test_mnemonic as string,
+            const ethWalletHD = ethers.HDNodeWallet.fromMnemonic(
+                ethers.Mnemonic.fromPhrase(ethTestConfig.test_mnemonic),
                 "m/44'/60'/0'/0/0"
-            )
+            );
+            ethWallet = new ethers.Wallet(ethWalletHD.privateKey, ethProvider);
         }
         else {
             ethWallet = new ethers.Wallet(process.env.MASTER_WALLET_PK!);
         }
         ethWallet = ethWallet.connect(ethProvider);
-        const web3Provider = new zkweb3.Provider(process.env.ZKSYNC_WEB3_API_URL || process.env.API_WEB3_JSON_RPC_HTTP_URL ||  "http://localhost:3050");
+        const web3Provider = new zksync.Provider(process.env.ZKSYNC_WEB3_API_URL || process.env.API_WEB3_JSON_RPC_HTTP_URL ||  "http://localhost:3050");
         web3Provider.pollingInterval = 100; // It's OK to keep it low even on stage.
-        const syncWallet = new zkweb3.Wallet(ethWallet.privateKey, web3Provider, ethProvider);
+        const syncWallet = new zksync.Wallet(ethWallet.privateKey, web3Provider, ethProvider);
 
 
         // Since some tx may be pending on stage, we don't want to get stuck because of it.
         // In order to not get stuck transactions, we manually cancel all the pending txs.
-        const latestNonce = await ethWallet.getTransactionCount('latest');
-        const pendingNonce = await ethWallet.getTransactionCount('pending');
+        const latestNonce = await ethWallet.getNonce('latest');
+        const pendingNonce = await ethWallet.getNonce('pending');
         const cancellationTxs = [];
         for (let nonce = latestNonce; nonce != pendingNonce; nonce++) {
             // For each transaction to override it, we need to provide greater fee. 
             // We would manually provide a value high enough (for a testnet) to be both valid
             // and higher than the previous one. It's OK as we'll only be charged for the bass fee
             // anyways. We will also set the miner's tip to 5 gwei, which is also much higher than the normal one.
-            const maxFeePerGas = ethers.utils.parseEther("0.00000025"); // 250 gwei
-            const maxPriorityFeePerGas = ethers.utils.parseEther("0.000000005"); // 5 gwei
+            const maxFeePerGas = ethers.parseEther("0.00000025"); // 250 gwei
+            const maxPriorityFeePerGas = ethers.parseEther("0.000000005"); // 5 gwei
             cancellationTxs.push(ethWallet.sendTransaction({ to: ethWallet.address, nonce, maxFeePerGas, maxPriorityFeePerGas }).then((tx) => tx.wait()));
         }
         if (cancellationTxs.length > 0) {
@@ -64,6 +65,7 @@ export class Tester {
     }
 
     emptyWallet() {
-        return zkweb3.Wallet.createRandom().connect(this.web3Provider).connectToL1(this.ethProvider);
+        const walletHD = zksync.Wallet.createRandom();
+        return new zksync.Wallet(walletHD.privateKey, this.web3Provider, this.ethProvider);
     }
 }
diff --git a/core/tests/upgrade-test/tests/upgrade.test.ts b/core/tests/upgrade-test/tests/upgrade.test.ts
index e82d3ee09da3..c9c454d64bbd 100644
--- a/core/tests/upgrade-test/tests/upgrade.test.ts
+++ b/core/tests/upgrade-test/tests/upgrade.test.ts
@@ -1,48 +1,48 @@
-import * as utils from 'zk/build/utils';
+import * as utils from 'utils';
 import { Tester } from './tester';
-import * as zkweb3 from 'zksync-ethers';
-import { BigNumber, BigNumberish, ethers } from 'ethers';
+import * as zksync from 'zksync-ethers';
+import * as ethers from 'ethers';
 import { expect } from 'chai';
-import { hashBytecode } from 'zksync-web3/build/src/utils';
 import fs from 'fs';
-import { TransactionResponse } from 'zksync-web3/build/src/types';
 import { BytesLike } from '@ethersproject/bytes';
-import { isAddressEq } from 'zksync-ethers/build/src/utils';
+import { IZkSyncHyperchain } from 'zksync-ethers/build/typechain';
+import { BigNumberish } from 'ethers';
 
 const L1_CONTRACTS_FOLDER = `${process.env.ZKSYNC_HOME}/contracts/l1-contracts/artifacts/contracts`;
-const L1_DEFAULT_UPGRADE_ABI = new ethers.utils.Interface(
+const L1_DEFAULT_UPGRADE_ABI = new ethers.Interface(
     require(`${L1_CONTRACTS_FOLDER}/upgrades/DefaultUpgrade.sol/DefaultUpgrade.json`).abi
 );
-const GOVERNANCE_ABI = new ethers.utils.Interface(
+const GOVERNANCE_ABI = new ethers.Interface(
     require(`${L1_CONTRACTS_FOLDER}/governance/Governance.sol/Governance.json`).abi
 );
-const ADMIN_FACET_ABI = new ethers.utils.Interface(
+const ADMIN_FACET_ABI = new ethers.Interface(
     require(`${L1_CONTRACTS_FOLDER}/state-transition/chain-interfaces/IAdmin.sol/IAdmin.json`).abi
 );
-const L2_FORCE_DEPLOY_UPGRADER_ABI = new ethers.utils.Interface(
+const L2_FORCE_DEPLOY_UPGRADER_ABI = new ethers.Interface(
     require(`${process.env.ZKSYNC_HOME}/contracts/l2-contracts/artifacts-zk/contracts/ForceDeployUpgrader.sol/ForceDeployUpgrader.json`).abi
 );
-const COMPLEX_UPGRADER_ABI = new ethers.utils.Interface(
+const COMPLEX_UPGRADER_ABI = new ethers.Interface(
     require(`${process.env.ZKSYNC_HOME}/contracts/system-contracts/artifacts-zk/contracts-preprocessed/ComplexUpgrader.sol/ComplexUpgrader.json`).abi
 );
 const COUNTER_BYTECODE =
     require(`${process.env.ZKSYNC_HOME}/core/tests/ts-integration/artifacts-zk/contracts/counter/counter.sol/Counter.json`).deployedBytecode;
-const STATE_TRANSITON_MANAGER = new ethers.utils.Interface(
+const STATE_TRANSITON_MANAGER = new ethers.Interface(
     require(`${L1_CONTRACTS_FOLDER}/state-transition/StateTransitionManager.sol/StateTransitionManager.json`).abi
 );
 
-const depositAmount = ethers.utils.parseEther('0.001');
+let serverComponents = 'api,tree,eth,state_keeper,commitment_generator,da_dispatcher';
+
+const depositAmount = ethers.parseEther('0.001');
 
 describe('Upgrade test', function () {
     let tester: Tester;
-    let alice: zkweb3.Wallet;
+    let alice: zksync.Wallet;
     let govWallet: ethers.Wallet;
-    let mainContract: ethers.Contract;
+    let mainContract: IZkSyncHyperchain;
     let governanceContract: ethers.Contract;
     let bootloaderHash: string;
     let scheduleTransparentOperation: string;
     let executeOperation: string;
-    let finalizeOperation: string;
     let forceDeployAddress: string;
     let forceDeployBytecode: string;
     let logs: fs.WriteStream;
@@ -52,8 +52,11 @@ describe('Upgrade test', function () {
         alice = tester.emptyWallet();
         logs = fs.createWriteStream('upgrade.log', { flags: 'a' });
 
-        const govMnemonic = require('../../../../etc/test_config/constant/eth.json').mnemonic;
-        govWallet = ethers.Wallet.fromMnemonic(govMnemonic, "m/44'/60'/0'/0/1").connect(alice._providerL1());
+        const govMnemonic = ethers.Mnemonic.fromPhrase(
+            require('../../../../etc/test_config/constant/eth.json').mnemonic
+        );
+        const govWalletHD = ethers.HDNodeWallet.fromMnemonic(govMnemonic, "m/44'/60'/0'/0/1");
+        govWallet = new ethers.Wallet(govWalletHD.privateKey, alice._providerL1());
     });
 
     step('Run server and execute some transactions', async () => {
@@ -71,10 +74,10 @@ describe('Upgrade test', function () {
         // Must be > 1s, because bootloader requires l1 batch timestamps to be incremental.
         process.env.CHAIN_STATE_KEEPER_BLOCK_COMMIT_DEADLINE_MS = '2000';
         // Run server in background.
-        utils.background(
-            'cd $ZKSYNC_HOME && cargo run --bin zksync_server --release -- --components=api,tree,eth,state_keeper,commitment_generator',
-            [null, logs, logs]
-        );
+        utils.background({
+            command: `cd $ZKSYNC_HOME && cargo run --bin zksync_server --release -- --components=${serverComponents}`,
+            stdio: [null, logs, logs]
+        });
         // Server may need some time to recompile if it's a cold run, so wait for it.
         let iter = 0;
         while (iter < 30 && !mainContract) {
@@ -99,9 +102,9 @@ describe('Upgrade test', function () {
 
         const baseToken = await tester.syncWallet.provider.getBaseTokenContractAddress();
 
-        if (!isAddressEq(baseToken, zkweb3.utils.ETH_ADDRESS_IN_CONTRACTS)) {
-            await (await tester.syncWallet.approveERC20(baseToken, ethers.constants.MaxUint256)).wait();
-            await mintToWallet(baseToken, tester.syncWallet, depositAmount.mul(10));
+        if (!zksync.utils.isAddressEq(baseToken, zksync.utils.ETH_ADDRESS_IN_CONTRACTS)) {
+            await (await tester.syncWallet.approveERC20(baseToken, ethers.MaxUint256)).wait();
+            await mintToWallet(baseToken, tester.syncWallet, depositAmount * 10n);
         }
 
         const firstDepositHandle = await tester.syncWallet.deposit({
@@ -125,20 +128,20 @@ describe('Upgrade test', function () {
         }
 
         const balance = await alice.getBalance();
-        expect(balance.eq(depositAmount.mul(2)), 'Incorrect balance after deposits').to.be.true;
+        expect(balance === depositAmount * 2n, 'Incorrect balance after deposits').to.be.true;
 
         if (process.env.CHECK_EN_URL) {
             console.log('Checking EN after deposit');
             await utils.sleep(2);
-            const enProvider = new ethers.providers.JsonRpcProvider(process.env.CHECK_EN_URL);
+            const enProvider = new ethers.JsonRpcProvider(process.env.CHECK_EN_URL);
             const enBalance = await enProvider.getBalance(alice.address);
-            expect(enBalance.eq(balance), 'Failed to update the balance on EN after deposit').to.be.true;
+            expect(enBalance === balance, 'Failed to update the balance on EN after deposit').to.be.true;
         }
 
         // Wait for at least one new committed block
         let newBlocksCommitted = await mainContract.getTotalBatchesCommitted();
         let tryCount = 0;
-        while (blocksCommitted.eq(newBlocksCommitted) && tryCount < 30) {
+        while (blocksCommitted === newBlocksCommitted && tryCount < 30) {
             newBlocksCommitted = await mainContract.getTotalBatchesCommitted();
             tryCount += 1;
             await utils.sleep(1);
@@ -147,10 +150,10 @@ describe('Upgrade test', function () {
 
     step('Send l1 tx for saving new bootloader', async () => {
         const path = `${process.env.ZKSYNC_HOME}/contracts/system-contracts/bootloader/build/artifacts/playground_batch.yul.zbin`;
-        const bootloaderCode = ethers.utils.hexlify(fs.readFileSync(path));
-        bootloaderHash = ethers.utils.hexlify(hashBytecode(bootloaderCode));
+        const bootloaderCode = ethers.hexlify(fs.readFileSync(path));
+        bootloaderHash = ethers.hexlify(zksync.utils.hashBytecode(bootloaderCode));
         const txHandle = await tester.syncWallet.requestExecute({
-            contractAddress: ethers.constants.AddressZero,
+            contractAddress: ethers.ZeroAddress,
             calldata: '0x',
             l2GasLimit: 20000000,
             factoryDeps: [bootloaderCode],
@@ -167,10 +170,10 @@ describe('Upgrade test', function () {
         forceDeployBytecode = COUNTER_BYTECODE;
 
         const forceDeployment: ForceDeployment = {
-            bytecodeHash: hashBytecode(forceDeployBytecode),
+            bytecodeHash: ethers.hexlify(zksync.utils.hashBytecode(forceDeployBytecode)),
             newAddress: forceDeployAddress,
             callConstructor: false,
-            value: BigNumber.from(0),
+            value: 0n,
             input: '0x'
         };
 
@@ -178,39 +181,39 @@ describe('Upgrade test', function () {
         const delegateCalldata = L2_FORCE_DEPLOY_UPGRADER_ABI.encodeFunctionData('forceDeploy', [[forceDeployment]]);
         const data = COMPLEX_UPGRADER_ABI.encodeFunctionData('upgrade', [delegateTo, delegateCalldata]);
 
-        const oldProtocolVersion = await alice._providerL2().send('zks_getProtocolVersion', [null]);
-        const calldata = await prepareUpgradeCalldata(govWallet, alice._providerL2(), {
-            l2ProtocolUpgradeTx: {
-                txType: 254,
-                from: '0x0000000000000000000000000000000000008007', // FORCE_DEPLOYER address
-                to: '0x000000000000000000000000000000000000800f', // ComplexUpgrader address
-                gasLimit: process.env.CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT!,
-                gasPerPubdataByteLimit: zkweb3.utils.REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT,
-                maxFeePerGas: 0,
-                maxPriorityFeePerGas: 0,
-                paymaster: 0,
-                value: 0,
-                reserved: [0, 0, 0, 0],
-                data,
-                signature: '0x',
-                factoryDeps: [hashBytecode(forceDeployBytecode)],
-                paymasterInput: '0x',
-                reservedDynamic: '0x'
-            },
-            factoryDeps: [forceDeployBytecode],
-            bootloaderHash,
-            upgradeTimestamp: 0,
-            oldProtocolVersion: oldProtocolVersion.version_id
-        });
-        scheduleTransparentOperation = calldata.scheduleTransparentOperation;
-        executeOperation = calldata.executeOperation;
-        finalizeOperation = calldata.finalizeOperation;
+        const { stmUpgradeData, chainUpgradeData } = await prepareUpgradeCalldata(
+            govWallet,
+            alice._providerL2(),
+            await mainContract.getAddress(),
+            {
+                l2ProtocolUpgradeTx: {
+                    txType: 254,
+                    from: '0x0000000000000000000000000000000000008007', // FORCE_DEPLOYER address
+                    to: '0x000000000000000000000000000000000000800f', // ComplexUpgrader address
+                    gasLimit: process.env.CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT!,
+                    gasPerPubdataByteLimit: zksync.utils.REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT,
+                    maxFeePerGas: 0,
+                    maxPriorityFeePerGas: 0,
+                    paymaster: 0,
+                    value: 0,
+                    reserved: [0, 0, 0, 0],
+                    data,
+                    signature: '0x',
+                    factoryDeps: [ethers.hexlify(zksync.utils.hashBytecode(forceDeployBytecode))],
+                    paymasterInput: '0x',
+                    reservedDynamic: '0x'
+                },
+                factoryDeps: [forceDeployBytecode],
+                bootloaderHash,
+                upgradeTimestamp: 0
+            }
+        );
+        scheduleTransparentOperation = chainUpgradeData.scheduleTransparentOperation;
+        executeOperation = chainUpgradeData.executeOperation;
 
-        const scheduleUpgrade = await govWallet.sendTransaction({
-            to: governanceContract.address,
-            data: scheduleTransparentOperation
-        });
-        await scheduleUpgrade.wait();
+        await sendGovernanceOperation(stmUpgradeData.scheduleTransparentOperation);
+        await sendGovernanceOperation(stmUpgradeData.executeOperation);
+        await sendGovernanceOperation(scheduleTransparentOperation);
 
         // Wait for server to process L1 event.
         await utils.sleep(2);
@@ -218,11 +221,11 @@ describe('Upgrade test', function () {
 
     step('Check bootloader is updated on L2', async () => {
         const receipt = await waitForNewL1Batch(alice);
-        const batchDetails = await alice.provider.getL1BatchDetails(receipt.l1BatchNumber);
+        const batchDetails = await alice.provider.getL1BatchDetails(receipt.l1BatchNumber!);
         expect(batchDetails.baseSystemContractsHashes.bootloader).to.eq(bootloaderHash);
     });
 
-    step('Execute upgrade', async () => {
+    step('Finalize upgrade on the target chain', async () => {
         // Wait for batches with old bootloader to be executed on L1.
         let l1BatchNumber = await alice.provider.getL1BatchNumber();
         while (
@@ -243,21 +246,8 @@ describe('Upgrade test', function () {
             throw new Error('Server did not execute old blocks');
         }
 
-        // Send execute tx.
-        const execute = await govWallet.sendTransaction({
-            to: governanceContract.address,
-            data: executeOperation
-        });
-        await execute.wait();
-    });
-
-    step('Finalize upgrade on the target chain', async () => {
-        // Send finalize tx.
-        const finalize = await govWallet.sendTransaction({
-            to: mainContract.address,
-            data: finalizeOperation
-        });
-        await finalize.wait();
+        // Execute the upgrade
+        await sendGovernanceOperation(executeOperation);
 
         let bootloaderHashL1 = await mainContract.getL2BootloaderBytecodeHash();
         expect(bootloaderHashL1).eq(bootloaderHash);
@@ -265,7 +255,7 @@ describe('Upgrade test', function () {
 
     step('Wait for block finalization', async () => {
         // Execute an L2 transaction
-        const txHandle = await checkedRandomTransfer(alice, BigNumber.from(1));
+        const txHandle = await checkedRandomTransfer(alice, 1n);
         await txHandle.waitFinalize();
     });
 
@@ -280,14 +270,14 @@ describe('Upgrade test', function () {
         await utils.sleep(10);
 
         // Run again.
-        utils.background(
-            'cd $ZKSYNC_HOME && zk f cargo run --bin zksync_server --release -- --components=api,tree,eth,state_keeper,commitment_generator &> upgrade.log',
-            [null, logs, logs]
-        );
+        utils.background({
+            command: `cd $ZKSYNC_HOME && zk f cargo run --bin zksync_server --release -- --components=${serverComponents} &> upgrade.log`,
+            stdio: [null, logs, logs]
+        });
         await utils.sleep(10);
 
         // Trying to send a transaction from the same address again
-        await checkedRandomTransfer(alice, BigNumber.from(1));
+        await checkedRandomTransfer(alice, 1n);
     });
 
     after('Try killing server', async () => {
@@ -295,32 +285,44 @@ describe('Upgrade test', function () {
             await utils.exec('pkill zksync_server');
         } catch (_) {}
     });
+
+    async function sendGovernanceOperation(data: string) {
+        await (
+            await govWallet.sendTransaction({
+                to: await governanceContract.getAddress(),
+                data: data,
+                type: 0
+            })
+        ).wait();
+    }
 });
 
-async function checkedRandomTransfer(sender: zkweb3.Wallet, amount: BigNumber): Promise<TransactionResponse> {
+async function checkedRandomTransfer(sender: zksync.Wallet, amount: bigint): Promise<zksync.types.TransactionResponse> {
     const senderBalanceBefore = await sender.getBalance();
-    const receiver = zkweb3.Wallet.createRandom().connect(sender.provider);
+    const receiverHD = zksync.Wallet.createRandom();
+    const receiver = new zksync.Wallet(receiverHD.privateKey, sender.provider);
     const transferHandle = await sender.sendTransaction({
         to: receiver.address,
-        value: amount
+        value: amount,
+        type: 0
     });
     const txReceipt = await transferHandle.wait();
 
     const senderBalanceAfter = await sender.getBalance();
     const receiverBalanceAfter = await receiver.getBalance();
 
-    expect(receiverBalanceAfter.eq(amount), 'Failed updated the balance of the receiver').to.be.true;
+    expect(receiverBalanceAfter === amount, 'Failed updated the balance of the receiver').to.be.true;
 
-    const spentAmount = txReceipt.gasUsed.mul(transferHandle.gasPrice!).add(amount);
-    expect(senderBalanceAfter.add(spentAmount).gte(senderBalanceBefore), 'Failed to update the balance of the sender')
-        .to.be.true;
+    const spentAmount = txReceipt.gasUsed * transferHandle.gasPrice! + amount;
+    expect(senderBalanceAfter + spentAmount >= senderBalanceBefore, 'Failed to update the balance of the sender').to.be
+        .true;
 
     if (process.env.CHECK_EN_URL) {
         console.log('Checking EN after transfer');
         await utils.sleep(2);
-        const enProvider = new ethers.providers.JsonRpcProvider(process.env.CHECK_EN_URL);
+        const enProvider = new ethers.JsonRpcProvider(process.env.CHECK_EN_URL);
         const enSenderBalance = await enProvider.getBalance(sender.address);
-        expect(enSenderBalance.eq(senderBalanceAfter), 'Failed to update the balance of the sender on EN').to.be.true;
+        expect(enSenderBalance === senderBalanceAfter, 'Failed to update the balance of the sender on EN').to.be.true;
     }
 
     return transferHandle;
@@ -334,24 +336,29 @@ interface ForceDeployment {
     // Whether to call the constructor
     callConstructor: boolean;
     // The value with which to initialize a contract
-    value: BigNumber;
+    value: bigint;
     // The constructor calldata
     input: BytesLike;
 }
 
-async function waitForNewL1Batch(wallet: zkweb3.Wallet): Promise<zkweb3.types.TransactionReceipt> {
+async function waitForNewL1Batch(wallet: zksync.Wallet): Promise<zksync.types.TransactionReceipt> {
     // Send a dummy transaction and wait until the new L1 batch is created.
     const oldReceipt = await wallet.transfer({ to: wallet.address, amount: 0 }).then((tx) => tx.wait());
     // Invariant: even with 1 transaction, l1 batch must be eventually sealed, so this loop must exit.
-    while (!(await wallet.provider.getTransactionReceipt(oldReceipt.transactionHash)).l1BatchNumber) {
-        await zkweb3.utils.sleep(wallet.provider.pollingInterval);
+    while (!(await wallet.provider.getTransactionReceipt(oldReceipt.hash))!.l1BatchNumber) {
+        await zksync.utils.sleep(wallet.provider.pollingInterval);
     }
-    return await wallet.provider.getTransactionReceipt(oldReceipt.transactionHash);
+    const receipt = await wallet.provider.getTransactionReceipt(oldReceipt.hash);
+    if (!receipt) {
+        throw new Error('Failed to get the receipt of the transaction');
+    }
+    return receipt;
 }
 
 async function prepareUpgradeCalldata(
     govWallet: ethers.Wallet,
-    l2Provider: zkweb3.Provider,
+    l2Provider: zksync.Provider,
+    mainContract: zksync.types.Address,
     params: {
         l2ProtocolUpgradeTx: {
             txType: BigNumberish;
@@ -383,7 +390,6 @@ async function prepareUpgradeCalldata(
         l1ContractsUpgradeCalldata?: BytesLike;
         postUpgradeCalldata?: BytesLike;
         upgradeTimestamp: BigNumberish;
-        oldProtocolVersion?: BigNumberish;
     }
 ) {
     const upgradeAddress = process.env.CONTRACTS_DEFAULT_UPGRADE_ADDR;
@@ -393,20 +399,21 @@ async function prepareUpgradeCalldata(
     }
 
     const zksyncAddress = await l2Provider.getMainContractAddress();
-    const zksync = new ethers.Contract(zksyncAddress, zkweb3.utils.ZKSYNC_MAIN_ABI, govWallet);
-    const stmAddress = await zksync.getStateTransitionManager();
+    const zksyncContract = new ethers.Contract(zksyncAddress, zksync.utils.ZKSYNC_MAIN_ABI, govWallet);
+    const stmAddress = await zksyncContract.getStateTransitionManager();
+
+    const oldProtocolVersion = Number(await zksyncContract.getProtocolVersion());
+    const newProtocolVersion = addToProtocolVersion(oldProtocolVersion, 1, 1);
 
-    const oldProtocolVersion = params.oldProtocolVersion ?? (await zksync.getProtocolVersion());
-    const newProtocolVersion = ethers.BigNumber.from(oldProtocolVersion).add(1);
-    params.l2ProtocolUpgradeTx.nonce ??= newProtocolVersion;
+    params.l2ProtocolUpgradeTx.nonce ??= BigInt(unpackNumberSemVer(newProtocolVersion)[1]);
     const upgradeInitData = L1_DEFAULT_UPGRADE_ABI.encodeFunctionData('upgrade', [
         [
             params.l2ProtocolUpgradeTx,
             params.factoryDeps,
-            params.bootloaderHash ?? ethers.constants.HashZero,
-            params.defaultAAHash ?? ethers.constants.HashZero,
-            params.verifier ?? ethers.constants.AddressZero,
-            params.verifierParams ?? [ethers.constants.HashZero, ethers.constants.HashZero, ethers.constants.HashZero],
+            params.bootloaderHash ?? ethers.ZeroHash,
+            params.defaultAAHash ?? ethers.ZeroHash,
+            params.verifier ?? ethers.ZeroAddress,
+            params.verifierParams ?? [ethers.ZeroHash, ethers.ZeroHash, ethers.ZeroHash],
             params.l1ContractsUpgradeCalldata ?? '0x',
             params.postUpgradeCalldata ?? '0x',
             params.upgradeTimestamp,
@@ -426,19 +433,40 @@ async function prepareUpgradeCalldata(
         upgradeParam,
         oldProtocolVersion,
         // The protocol version will not have any deadline in this upgrade
-        ethers.constants.MaxUint256,
+        ethers.MaxUint256,
         newProtocolVersion
     ]);
 
+    // Execute this upgrade on a specific chain under this STM.
+    const chainUpgradeCalldata = ADMIN_FACET_ABI.encodeFunctionData('upgradeChainFromVersion', [
+        oldProtocolVersion,
+        upgradeParam
+    ]);
+
+    const stmUpgradeData = prepareGovernanceCalldata(stmAddress, stmUpgradeCalldata);
+    const chainUpgradeData = prepareGovernanceCalldata(mainContract, chainUpgradeCalldata);
+
+    return {
+        chainUpgradeData,
+        stmUpgradeData
+    };
+}
+
+interface UpgradeCalldata {
+    scheduleTransparentOperation: string;
+    executeOperation: string;
+}
+
+function prepareGovernanceCalldata(to: string, data: BytesLike): UpgradeCalldata {
     const call = {
-        target: stmAddress,
+        target: to,
         value: 0,
-        data: stmUpgradeCalldata
+        data
     };
     const governanceOperation = {
         calls: [call],
-        predecessor: ethers.constants.HashZero,
-        salt: ethers.constants.HashZero
+        predecessor: ethers.ZeroHash,
+        salt: ethers.ZeroHash
     };
 
     // Get transaction data of the `scheduleTransparent`
@@ -450,25 +478,37 @@ async function prepareUpgradeCalldata(
     // Get transaction data of the `execute`
     const executeOperation = GOVERNANCE_ABI.encodeFunctionData('execute', [governanceOperation]);
 
-    // Execute this upgrade on a specific chain under this STM.
-    const finalizeOperation = ADMIN_FACET_ABI.encodeFunctionData('upgradeChainFromVersion', [
-        oldProtocolVersion,
-        upgradeParam
-    ]);
-
     return {
         scheduleTransparentOperation,
-        executeOperation,
-        finalizeOperation
+        executeOperation
     };
 }
 
-async function mintToWallet(
-    baseTokenAddress: zkweb3.types.Address,
-    ethersWallet: ethers.Wallet,
-    amountToMint: ethers.BigNumber
-) {
+async function mintToWallet(baseTokenAddress: zksync.types.Address, ethersWallet: ethers.Wallet, amountToMint: bigint) {
     const l1Erc20ABI = ['function mint(address to, uint256 amount)'];
     const l1Erc20Contract = new ethers.Contract(baseTokenAddress, l1Erc20ABI, ethersWallet);
     await (await l1Erc20Contract.mint(ethersWallet.address, amountToMint)).wait();
 }
+
+const SEMVER_MINOR_VERSION_MULTIPLIER = 4294967296;
+
+function unpackNumberSemVer(semver: number): [number, number, number] {
+    const major = 0;
+    const minor = Math.floor(semver / SEMVER_MINOR_VERSION_MULTIPLIER);
+    const patch = semver % SEMVER_MINOR_VERSION_MULTIPLIER;
+    return [major, minor, patch];
+}
+
+// The major version is always 0 for now
+export function packSemver(major: number, minor: number, patch: number) {
+    if (major !== 0) {
+        throw new Error('Major version must be 0');
+    }
+
+    return minor * SEMVER_MINOR_VERSION_MULTIPLIER + patch;
+}
+
+export function addToProtocolVersion(packedProtocolVersion: number, minor: number, patch: number) {
+    const [major, minorVersion, patchVersion] = unpackNumberSemVer(packedProtocolVersion);
+    return packSemver(major, minorVersion + minor, patchVersion + patch);
+}
diff --git a/core/tests/upgrade-test/tsconfig.json b/core/tests/upgrade-test/tsconfig.json
index 6c8907a86016..3de8e1a1c606 100644
--- a/core/tests/upgrade-test/tsconfig.json
+++ b/core/tests/upgrade-test/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "target": "es2019",
+        "target": "es2020",
         "module": "commonjs",
         "strict": true,
         "esModuleInterop": true,
diff --git a/core/tests/vm-benchmark/Cargo.toml b/core/tests/vm-benchmark/Cargo.toml
index 98bef08124bb..f5f85b3b4d29 100644
--- a/core/tests/vm-benchmark/Cargo.toml
+++ b/core/tests/vm-benchmark/Cargo.toml
@@ -3,11 +3,12 @@ name = "vm-benchmark"
 version = "0.1.0"
 edition.workspace = true
 license.workspace = true
+publish = false
 
 [dependencies]
-vm-benchmark-harness.workspace = true
-metrics-exporter-prometheus.workspace = true
-metrics.workspace = true
+zksync_vm_benchmark_harness.workspace = true
+zksync_vlog.workspace = true
+vise.workspace = true
 tokio.workspace = true
 
 [dev-dependencies]
diff --git a/core/tests/vm-benchmark/benches/criterion.rs b/core/tests/vm-benchmark/benches/criterion.rs
index c6c81d723365..5becccfab801 100644
--- a/core/tests/vm-benchmark/benches/criterion.rs
+++ b/core/tests/vm-benchmark/benches/criterion.rs
@@ -1,5 +1,5 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use vm_benchmark_harness::{cut_to_allowed_bytecode_size, get_deploy_tx, BenchmarkingVm};
+use zksync_vm_benchmark_harness::{cut_to_allowed_bytecode_size, get_deploy_tx, BenchmarkingVm};
 
 fn benches_in_folder(c: &mut Criterion) {
     for path in std::fs::read_dir("deployment_benchmarks").unwrap() {
diff --git a/core/tests/vm-benchmark/benches/diy_benchmark.rs b/core/tests/vm-benchmark/benches/diy_benchmark.rs
index b99837d8eab2..1601de5eb85f 100644
--- a/core/tests/vm-benchmark/benches/diy_benchmark.rs
+++ b/core/tests/vm-benchmark/benches/diy_benchmark.rs
@@ -1,7 +1,8 @@
 use std::time::{Duration, Instant};
 
 use criterion::black_box;
-use vm_benchmark_harness::{cut_to_allowed_bytecode_size, get_deploy_tx, BenchmarkingVm};
+use vise::{Gauge, LabeledFamily, Metrics};
+use zksync_vm_benchmark_harness::{cut_to_allowed_bytecode_size, get_deploy_tx, BenchmarkingVm};
 
 fn main() {
     let mut results = vec![];
@@ -34,9 +35,19 @@ fn main() {
         vm_benchmark::with_prometheus::with_prometheus(|| {
             for (name, timings) in results {
                 for (i, timing) in timings.into_iter().enumerate() {
-                    metrics::gauge!("vm_benchmark.timing", timing, "benchmark" => name.clone(), "run_no" => i.to_string());
+                    VM_BENCHMARK_METRICS.timing[&(name.clone(), i.to_string())].set(timing);
                 }
             }
         });
     }
 }
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "vm_benchmark")]
+pub(crate) struct VmBenchmarkMetrics {
+    #[metrics(labels = ["benchmark", "run_no"])]
+    pub timing: LabeledFamily<(String, String), Gauge<Duration>, 2>,
+}
+
+#[vise::register]
+pub(crate) static VM_BENCHMARK_METRICS: vise::Global<VmBenchmarkMetrics> = vise::Global::new();
diff --git a/core/tests/vm-benchmark/benches/iai.rs b/core/tests/vm-benchmark/benches/iai.rs
index a7c8a9c2ecd4..f0ba43f26853 100644
--- a/core/tests/vm-benchmark/benches/iai.rs
+++ b/core/tests/vm-benchmark/benches/iai.rs
@@ -1,5 +1,5 @@
 use iai::black_box;
-use vm_benchmark_harness::{cut_to_allowed_bytecode_size, get_deploy_tx, BenchmarkingVm};
+use zksync_vm_benchmark_harness::{cut_to_allowed_bytecode_size, get_deploy_tx, BenchmarkingVm};
 
 fn run_bytecode(path: &str) {
     let test_contract = std::fs::read(path).expect("failed to read file");
diff --git a/core/tests/vm-benchmark/harness/Cargo.toml b/core/tests/vm-benchmark/harness/Cargo.toml
index da786ee391b1..acd5f37cbc7b 100644
--- a/core/tests/vm-benchmark/harness/Cargo.toml
+++ b/core/tests/vm-benchmark/harness/Cargo.toml
@@ -1,11 +1,12 @@
 [package]
-name = "vm-benchmark-harness"
+name = "zksync_vm_benchmark_harness"
 version.workspace = true
 edition.workspace = true
 license.workspace = true
+publish = false
 
 [dependencies]
-multivm.workspace = true
+zksync_multivm.workspace = true
 zksync_types.workspace = true
 zksync_state.workspace = true
 zksync_utils.workspace = true
diff --git a/core/tests/vm-benchmark/harness/src/instruction_counter.rs b/core/tests/vm-benchmark/harness/src/instruction_counter.rs
index 8ab861c56ae8..0d80658c7208 100644
--- a/core/tests/vm-benchmark/harness/src/instruction_counter.rs
+++ b/core/tests/vm-benchmark/harness/src/instruction_counter.rs
@@ -1,6 +1,6 @@
 use std::{cell::RefCell, rc::Rc};
 
-use multivm::{
+use zksync_multivm::{
     interface::{dyn_tracers::vm_1_5_0::DynTracer, tracer::TracerExecutionStatus},
     vm_latest::{BootloaderState, HistoryMode, SimpleMemory, VmTracer, ZkSyncVmState},
 };
@@ -32,7 +32,7 @@ impl<S: WriteStorage, H: HistoryMode> VmTracer<S, H> for InstructionCounter {
         &mut self,
         _state: &mut ZkSyncVmState<S, H>,
         _bootloader_state: &BootloaderState,
-        _stop_reason: multivm::interface::tracer::VmExecutionStopReason,
+        _stop_reason: zksync_multivm::interface::tracer::VmExecutionStopReason,
     ) {
         *self.output.borrow_mut() = self.count;
     }
diff --git a/core/tests/vm-benchmark/harness/src/lib.rs b/core/tests/vm-benchmark/harness/src/lib.rs
index 83750d2e2a2f..35e7530e9aad 100644
--- a/core/tests/vm-benchmark/harness/src/lib.rs
+++ b/core/tests/vm-benchmark/harness/src/lib.rs
@@ -1,14 +1,14 @@
 use std::{cell::RefCell, rc::Rc};
 
-use multivm::{
+use once_cell::sync::Lazy;
+use zksync_contracts::{deployer_contract, BaseSystemContracts};
+use zksync_multivm::{
     interface::{
         L2BlockEnv, TxExecutionMode, VmExecutionMode, VmExecutionResultAndLogs, VmInterface,
     },
     utils::get_max_gas_per_pubdata_byte,
     vm_latest::{constants::BATCH_COMPUTATIONAL_GAS_LIMIT, HistoryEnabled, TracerDispatcher, Vm},
 };
-use once_cell::sync::Lazy;
-use zksync_contracts::{deployer_contract, BaseSystemContracts};
 use zksync_state::{InMemoryStorage, StorageView};
 use zksync_types::{
     block::L2BlockHasher,
@@ -69,7 +69,7 @@ impl BenchmarkingVm {
         let timestamp = unix_timestamp_ms();
 
         Self(Vm::new(
-            multivm::interface::L1BatchEnv {
+            zksync_multivm::interface::L1BatchEnv {
                 previous_batch_hash: None,
                 number: L1BatchNumber(1),
                 timestamp,
@@ -86,7 +86,7 @@ impl BenchmarkingVm {
                     max_virtual_blocks_to_create: 100,
                 },
             },
-            multivm::interface::SystemEnv {
+            zksync_multivm::interface::SystemEnv {
                 zk_porter_available: false,
                 version: ProtocolVersionId::latest(),
                 base_system_smart_contracts: SYSTEM_CONTRACTS.clone(),
@@ -147,7 +147,7 @@ pub fn get_deploy_tx(code: &[u8]) -> Transaction {
         U256::zero(),
         L2ChainId::from(270),
         &PRIVATE_KEY,
-        Some(vec![code.to_vec()]), // maybe not needed?
+        vec![code.to_vec()], // maybe not needed?
         Default::default(),
     )
     .expect("should create a signed execute transaction");
@@ -173,7 +173,7 @@ mod tests {
 
         assert!(matches!(
             res.result,
-            multivm::interface::ExecutionResult::Success { .. }
+            zksync_multivm::interface::ExecutionResult::Success { .. }
         ));
     }
 }
diff --git a/core/tests/vm-benchmark/src/find_slowest.rs b/core/tests/vm-benchmark/src/find_slowest.rs
index 2bc2a894d2d0..97a6acd5acd9 100644
--- a/core/tests/vm-benchmark/src/find_slowest.rs
+++ b/core/tests/vm-benchmark/src/find_slowest.rs
@@ -3,7 +3,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use vm_benchmark_harness::*;
+use zksync_vm_benchmark_harness::*;
 
 fn main() {
     let mut results = vec![];
diff --git a/core/tests/vm-benchmark/src/iai_results_to_prometheus.rs b/core/tests/vm-benchmark/src/iai_results_to_prometheus.rs
index 396d59948a87..d419603bae87 100644
--- a/core/tests/vm-benchmark/src/iai_results_to_prometheus.rs
+++ b/core/tests/vm-benchmark/src/iai_results_to_prometheus.rs
@@ -1,5 +1,6 @@
 use std::io::BufReader;
 
+use vise::{Gauge, LabeledFamily, Metrics};
 use vm_benchmark::parse_iai::IaiResult;
 
 fn main() {
@@ -8,11 +9,29 @@ fn main() {
 
     vm_benchmark::with_prometheus::with_prometheus(|| {
         for r in results {
-            metrics::gauge!("vm_cachegrind.instructions", r.instructions as f64, "benchmark" => r.name.clone());
-            metrics::gauge!("vm_cachegrind.l1_accesses", r.l1_accesses as f64, "benchmark" => r.name.clone());
-            metrics::gauge!("vm_cachegrind.l2_accesses", r.l2_accesses as f64, "benchmark" => r.name.clone());
-            metrics::gauge!("vm_cachegrind.ram_accesses", r.ram_accesses as f64, "benchmark" => r.name.clone());
-            metrics::gauge!("vm_cachegrind.cycles", r.cycles as f64, "benchmark" => r.name);
+            VM_CACHEGRIND_METRICS.instructions[&r.name.clone()].set(r.instructions as f64);
+            VM_CACHEGRIND_METRICS.l1_accesses[&r.name.clone()].set(r.l1_accesses as f64);
+            VM_CACHEGRIND_METRICS.l2_accesses[&r.name.clone()].set(r.l2_accesses as f64);
+            VM_CACHEGRIND_METRICS.ram_accesses[&r.name.clone()].set(r.ram_accesses as f64);
+            VM_CACHEGRIND_METRICS.cycles[&r.name.clone()].set(r.cycles as f64);
         }
     })
 }
+
+#[derive(Debug, Metrics)]
+#[metrics(prefix = "vm_cachegrind")]
+pub(crate) struct VmCachegrindMetrics {
+    #[metrics(labels = ["benchmark"])]
+    pub instructions: LabeledFamily<String, Gauge<f64>>,
+    #[metrics(labels = ["benchmark"])]
+    pub l1_accesses: LabeledFamily<String, Gauge<f64>>,
+    #[metrics(labels = ["benchmark"])]
+    pub l2_accesses: LabeledFamily<String, Gauge<f64>>,
+    #[metrics(labels = ["benchmark"])]
+    pub ram_accesses: LabeledFamily<String, Gauge<f64>>,
+    #[metrics(labels = ["benchmark"])]
+    pub cycles: LabeledFamily<String, Gauge<f64>>,
+}
+
+#[vise::register]
+pub(crate) static VM_CACHEGRIND_METRICS: vise::Global<VmCachegrindMetrics> = vise::Global::new();
diff --git a/core/tests/vm-benchmark/src/instruction_counts.rs b/core/tests/vm-benchmark/src/instruction_counts.rs
index a80d8a7ffd67..c038c8f2bf6b 100644
--- a/core/tests/vm-benchmark/src/instruction_counts.rs
+++ b/core/tests/vm-benchmark/src/instruction_counts.rs
@@ -2,7 +2,7 @@
 
 use std::path::Path;
 
-use vm_benchmark_harness::{cut_to_allowed_bytecode_size, get_deploy_tx, BenchmarkingVm};
+use zksync_vm_benchmark_harness::{cut_to_allowed_bytecode_size, get_deploy_tx, BenchmarkingVm};
 
 fn main() {
     // using source file location because this is just a script, the binary isn't meant to be reused
diff --git a/core/tests/vm-benchmark/src/main.rs b/core/tests/vm-benchmark/src/main.rs
index 99105e078ea7..925ec78ceb3c 100644
--- a/core/tests/vm-benchmark/src/main.rs
+++ b/core/tests/vm-benchmark/src/main.rs
@@ -1,4 +1,4 @@
-use vm_benchmark_harness::*;
+use zksync_vm_benchmark_harness::*;
 
 fn main() {
     let test_contract = std::fs::read(
diff --git a/core/tests/vm-benchmark/src/with_prometheus.rs b/core/tests/vm-benchmark/src/with_prometheus.rs
index 1fcf5652c6dd..f9b79adedc09 100644
--- a/core/tests/vm-benchmark/src/with_prometheus.rs
+++ b/core/tests/vm-benchmark/src/with_prometheus.rs
@@ -1,23 +1,27 @@
 use std::time::Duration;
 
-use metrics_exporter_prometheus::PrometheusBuilder;
+use tokio::sync::watch;
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 pub fn with_prometheus<F: FnOnce()>(f: F) {
+    tokio::runtime::Runtime::new()
+        .unwrap()
+        .block_on(with_prometheus_async(f));
+}
+
+async fn with_prometheus_async<F: FnOnce()>(f: F) {
     println!("Pushing results to Prometheus");
 
     let endpoint =
         "http://vmagent.stage.matterlabs.corp/api/v1/import/prometheus/metrics/job/vm-benchmark";
+    let (stop_sender, stop_receiver) = watch::channel(false);
+    let prometheus_config =
+        PrometheusExporterConfig::push(endpoint.to_owned(), Duration::from_millis(100));
+    tokio::spawn(prometheus_config.run(stop_receiver));
 
-    tokio::runtime::Runtime::new().unwrap().block_on(async {
-        PrometheusBuilder::new()
-            .with_push_gateway(endpoint, Duration::from_millis(100), None, None)
-            .unwrap()
-            .install()
-            .unwrap();
-
-        f();
+    f();
 
-        println!("Waiting for push to happen...");
-        tokio::time::sleep(Duration::from_secs(1)).await;
-    });
+    println!("Waiting for push to happen...");
+    tokio::time::sleep(Duration::from_secs(1)).await;
+    stop_sender.send_replace(true);
 }
diff --git a/docker/build-base/Dockerfile b/docker/build-base/Dockerfile
index 1fec4cca7e03..436843eed3de 100644
--- a/docker/build-base/Dockerfile
+++ b/docker/build-base/Dockerfile
@@ -9,7 +9,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     PATH=/usr/local/cargo/bin:$PATH
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-    rustup install nightly-2023-08-21 && \
-    rustup default nightly-2023-08-21
+    rustup install nightly-2024-05-07 && \
+    rustup default nightly-2024-05-07
 
 RUN cargo install sqlx-cli --version 0.7.3
diff --git a/docker/contract-verifier/Dockerfile b/docker/contract-verifier/Dockerfile
index c5f12672ebae..736409bac5fe 100644
--- a/docker/contract-verifier/Dockerfile
+++ b/docker/contract-verifier/Dockerfile
@@ -33,6 +33,13 @@ RUN mkdir -p /etc/zksolc-bin/vm-1.5.0-a167aa3 && \
     wget https://github.com/matter-labs/era-compiler-solidity/releases/download/prerelease-a167aa3-code4rena/zksolc-linux-amd64-musl-v1.5.0 -O /etc/zksolc-bin/vm-1.5.0-a167aa3/zksolc && \
     chmod +x /etc/zksolc-bin/vm-1.5.0-a167aa3/zksolc
 
+# install zksolc 1.5.x
+RUN for VERSION in $(seq -f "v1.5.%g" 0 1); do \
+    mkdir -p /etc/zksolc-bin/$VERSION && \
+    wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-$VERSION -O /etc/zksolc-bin/$VERSION/zksolc && \
+    chmod +x /etc/zksolc-bin/$VERSION/zksolc; \
+    done
+
 # install zkvyper 1.3.x
 RUN for VERSION in $(seq -f "v1.3.%g" 9 17); do \
     mkdir -p /etc/zkvyper-bin/$VERSION && \
@@ -47,6 +54,13 @@ RUN for VERSION in $(seq -f "v1.4.%g" 0 1); do \
     chmod +x /etc/zkvyper-bin/$VERSION/zkvyper; \
     done
 
+# install zkvyper 1.5.x
+RUN for VERSION in $(seq -f "v1.5.%g" 0 2); do \
+    mkdir -p /etc/zkvyper-bin/$VERSION && \
+    wget https://github.com/matter-labs/zkvyper-bin/raw/main/linux-amd64/zkvyper-linux-amd64-musl-$VERSION -O /etc/zkvyper-bin/$VERSION/zkvyper && \
+    chmod +x /etc/zkvyper-bin/$VERSION/zkvyper; \
+    done
+
 # install solc
 COPY docker/contract-verifier/install-all-solc.sh install-all-solc.sh
 RUN bash ./install-all-solc.sh
diff --git a/docker/contract-verifier/install-all-solc.sh b/docker/contract-verifier/install-all-solc.sh
index dd17dce2d80c..bc7cec143ccd 100755
--- a/docker/contract-verifier/install-all-solc.sh
+++ b/docker/contract-verifier/install-all-solc.sh
@@ -24,7 +24,10 @@ do
 done
 
 # Download zkVM solc
-list=("0.8.25-1.0.0" "0.8.24-1.0.0" "0.8.23-1.0.0" "0.8.22-1.0.0" "0.8.21-1.0.0" "0.8.20-1.0.0" "0.8.19-1.0.0" "0.8.18-1.0.0" "0.8.17-1.0.0" "0.8.16-1.0.0" "0.8.15-1.0.0" "0.8.14-1.0.0" "0.8.13-1.0.0" "0.8.12-1.0.0" "0.8.11-1.0.0" "0.8.10-1.0.0" "0.8.9-1.0.0" "0.8.8-1.0.0" "0.8.7-1.0.0" "0.8.6-1.0.0" "0.8.5-1.0.0" "0.8.4-1.0.0" "0.8.3-1.0.0" "0.8.2-1.0.0" "0.8.1-1.0.0" "0.8.0-1.0.0" "0.7.6-1.0.0" "0.7.5-1.0.0" "0.7.4-1.0.0" "0.7.3-1.0.0" "0.7.2-1.0.0" "0.7.1-1.0.0" "0.7.0-1.0.0" "0.6.12-1.0.0" "0.6.11-1.0.0" "0.6.10-1.0.0" "0.6.9-1.0.0" "0.6.8-1.0.0" "0.6.7-1.0.0" "0.6.6-1.0.0" "0.6.5-1.0.0" "0.6.4-1.0.0" "0.6.3-1.0.0" "0.6.2-1.0.0" "0.6.1-1.0.0" "0.6.0-1.0.0" "0.5.17-1.0.0" "0.5.16-1.0.0" "0.5.15-1.0.0" "0.5.14-1.0.0" "0.5.13-1.0.0" "0.5.12-1.0.0" "0.5.11-1.0.0" "0.5.10-1.0.0" "0.5.9-1.0.0" "0.5.8-1.0.0" "0.5.7-1.0.0" "0.5.6-1.0.0" "0.5.5-1.0.0" "0.5.4-1.0.0" "0.5.3-1.0.0" "0.5.2-1.0.0" "0.5.1-1.0.0" "0.5.0-1.0.0" "0.4.26-1.0.0" "0.4.25-1.0.0" "0.4.24-1.0.0" "0.4.23-1.0.0" "0.4.22-1.0.0" "0.4.21-1.0.0" "0.4.20-1.0.0" "0.4.19-1.0.0" "0.4.18-1.0.0" "0.4.17-1.0.0" "0.4.16-1.0.0" "0.4.15-1.0.0" "0.4.14-1.0.0" "0.4.13-1.0.0" "0.4.12-1.0.0")
+list=(
+  "0.8.25-1.0.0" "0.8.24-1.0.0" "0.8.23-1.0.0" "0.8.22-1.0.0" "0.8.21-1.0.0" "0.8.20-1.0.0" "0.8.19-1.0.0" "0.8.18-1.0.0" "0.8.17-1.0.0" "0.8.16-1.0.0" "0.8.15-1.0.0" "0.8.14-1.0.0" "0.8.13-1.0.0" "0.8.12-1.0.0" "0.8.11-1.0.0" "0.8.10-1.0.0" "0.8.9-1.0.0" "0.8.8-1.0.0" "0.8.7-1.0.0" "0.8.6-1.0.0" "0.8.5-1.0.0" "0.8.4-1.0.0" "0.8.3-1.0.0" "0.8.2-1.0.0" "0.8.1-1.0.0" "0.8.0-1.0.0" "0.7.6-1.0.0" "0.7.5-1.0.0" "0.7.4-1.0.0" "0.7.3-1.0.0" "0.7.2-1.0.0" "0.7.1-1.0.0" "0.7.0-1.0.0" "0.6.12-1.0.0" "0.6.11-1.0.0" "0.6.10-1.0.0" "0.6.9-1.0.0" "0.6.8-1.0.0" "0.6.7-1.0.0" "0.6.6-1.0.0" "0.6.5-1.0.0" "0.6.4-1.0.0" "0.6.3-1.0.0" "0.6.2-1.0.0" "0.6.1-1.0.0" "0.6.0-1.0.0" "0.5.17-1.0.0" "0.5.16-1.0.0" "0.5.15-1.0.0" "0.5.14-1.0.0" "0.5.13-1.0.0" "0.5.12-1.0.0" "0.5.11-1.0.0" "0.5.10-1.0.0" "0.5.9-1.0.0" "0.5.8-1.0.0" "0.5.7-1.0.0" "0.5.6-1.0.0" "0.5.5-1.0.0" "0.5.4-1.0.0" "0.5.3-1.0.0" "0.5.2-1.0.0" "0.5.1-1.0.0" "0.5.0-1.0.0" "0.4.26-1.0.0" "0.4.25-1.0.0" "0.4.24-1.0.0" "0.4.23-1.0.0" "0.4.22-1.0.0" "0.4.21-1.0.0" "0.4.20-1.0.0" "0.4.19-1.0.0" "0.4.18-1.0.0" "0.4.17-1.0.0" "0.4.16-1.0.0" "0.4.15-1.0.0" "0.4.14-1.0.0" "0.4.13-1.0.0" "0.4.12-1.0.0"
+  "0.8.26-1.0.1" "0.8.25-1.0.1" "0.8.24-1.0.1" "0.8.23-1.0.1" "0.8.22-1.0.1" "0.8.21-1.0.1" "0.8.20-1.0.1" "0.8.19-1.0.1" "0.8.18-1.0.1" "0.8.17-1.0.1" "0.8.16-1.0.1" "0.8.15-1.0.1" "0.8.14-1.0.1" "0.8.13-1.0.1" "0.8.12-1.0.1" "0.8.11-1.0.1" "0.8.10-1.0.1" "0.8.9-1.0.1" "0.8.8-1.0.1" "0.8.7-1.0.1" "0.8.6-1.0.1" "0.8.5-1.0.1" "0.8.4-1.0.1" "0.8.3-1.0.1" "0.8.2-1.0.1" "0.8.1-1.0.1" "0.8.0-1.0.1" "0.7.6-1.0.1" "0.7.5-1.0.1" "0.7.4-1.0.1" "0.7.3-1.0.1" "0.7.2-1.0.1" "0.7.1-1.0.1" "0.7.0-1.0.1" "0.6.12-1.0.1" "0.6.11-1.0.1" "0.6.10-1.0.1" "0.6.9-1.0.1" "0.6.8-1.0.1" "0.6.7-1.0.1" "0.6.6-1.0.1" "0.6.5-1.0.1" "0.6.4-1.0.1" "0.6.3-1.0.1" "0.6.2-1.0.1" "0.6.1-1.0.1" "0.6.0-1.0.1" "0.5.17-1.0.1" "0.5.16-1.0.1" "0.5.15-1.0.1" "0.5.14-1.0.1" "0.5.13-1.0.1" "0.5.12-1.0.1" "0.5.11-1.0.1" "0.5.10-1.0.1" "0.5.9-1.0.1" "0.5.8-1.0.1" "0.5.7-1.0.1" "0.5.6-1.0.1" "0.5.5-1.0.1" "0.5.4-1.0.1" "0.5.3-1.0.1" "0.5.2-1.0.1" "0.5.1-1.0.1" "0.5.0-1.0.1" "0.4.26-1.0.1" "0.4.25-1.0.1" "0.4.24-1.0.1" "0.4.23-1.0.1" "0.4.22-1.0.1" "0.4.21-1.0.1" "0.4.20-1.0.1" "0.4.19-1.0.1" "0.4.18-1.0.1" "0.4.17-1.0.1" "0.4.16-1.0.1" "0.4.15-1.0.1" "0.4.14-1.0.1" "0.4.13-1.0.1" "0.4.12-1.0.1"
+)
 for version in ${list[@]};
 do
     mkdir -p etc/solc-bin/zkVM-$version/
diff --git a/docker/local-node/entrypoint.sh b/docker/local-node/entrypoint.sh
index 381bde189bb5..e57d849802ec 100755
--- a/docker/local-node/entrypoint.sh
+++ b/docker/local-node/entrypoint.sh
@@ -17,30 +17,63 @@ if [ -z "$ETH_CLIENT_WEB3_URL" ]; then
   exit 1
 fi
 
-# Updates the value in the .toml config.
+# Updates the value in the .toml config or .env file.
 update_config() {
-    # Assigning arguments to readable variable names
-    local file="$1"
-    local parameter="$2"
-    local new_value="$3"
-    local pattern="^${parameter} =.*$"
-
-    # Check if the parameter exists in the file
-    if grep -q "$pattern" "$file"; then
-        # The parameter exists, so replace its value
-        sed -i "s!$pattern!${parameter} =\"${new_value}\"!" "$file"
-        echo "Update successful for $parameter in $file."
-    else
-        # The parameter does not exist in the file, output error message and return non-zero status
-        echo "Error: '$parameter' not found in $file."
-        return 1  # Return with an error status
-    fi
+  # Assigning arguments to readable variable names
+  local file="$1"
+  local parameter="$2"
+  local new_value="$3"
+  local pattern_toml="^${parameter} =.*$"
+  local pattern_env="^${parameter}=.*$"
+
+  # Check if the parameter exists in the file
+  if grep -q "$pattern_toml" "$file"; then
+    # The parameter exists in the .toml file, so replace its value
+    sed -i "s!$pattern_toml!${parameter} = \"$new_value\"!" "$file"
+    echo "Update successful for $parameter in $file."
+  elif grep -q "$pattern_env" "$file"; then
+    # The parameter exists in the .env file, so replace its value
+    sed -i "s!$pattern_env!${parameter}=$new_value!" "$file"
+    echo "Update successful for $parameter in $file."
+  else
+    # The parameter does not exist in the file, output error message and return non-zero status
+    echo "Error: '$parameter' not found in $file."
+    return 1 # Return with an error status
+  fi
 }
 
+# Reads the value of the parameter from the .toml config or .env file.
+read_value_from_config() {
+  local file="$1"
+  local parameter="$2"
+  local pattern_toml="^${parameter} =.*$"
+  local pattern_env="^${parameter}=.*$"
+  local res=""
+
+  # Check if the parameter exists in the file
+  if grep -q "$pattern_toml" "$file"; then
+    # The parameter exists in the .toml file, so extract its value
+    res=$(grep "$pattern_toml" "$file" | sed "s/${parameter} = //; s/\"//g")
+  elif grep -q "$pattern_env" "$file"; then
+    # The parameter exists in the .env file, so extract its value
+    res=$(grep "$pattern_env" "$file" | sed "s/${parameter}=//; s/\"//g")
+  else
+    # The parameter does not exist in the file, output error message and return non-zero status
+    echo "Error: '$parameter' not found in $file."
+    return 1 # Return with an error status
+  fi
+
+  if [ -z "$res" ]; then
+    echo "ERROR: $parameter is not set in $file."
+    exit 1
+  fi
+
+  echo $res
+}
 
 # wait till db service is ready
 until psql ${DATABASE_URL%/*} -c '\q'; do
-  >&2 echo "Postgres is unavailable - sleeping"
+  echo >&2 "Postgres is unavailable - sleeping"
   sleep 5
 done
 
@@ -50,11 +83,20 @@ else
   # If running in slave mode - wait for the master to be up and running.
   echo "Waiting for zksync master to init hyperchain"
   until curl --fail ${MASTER_HEALTH_URL}; do
-    >&2 echo "Master zksync not ready yet, sleeping"
+    echo >&2 "Master zksync not ready yet, sleeping"
     sleep 5
   done
 fi
 
+if [ -n "$LEGACY_BRIDGE_TESTING" ]; then
+  if [ -z "$MASTER_URL" ]; then
+    echo "Running in legacy bridge testing mode"
+  else
+    # LEGACY_BRIDGE_TESTING flag is for the master only
+    unset LEGACY_BRIDGE_TESTING
+  fi
+fi
+
 # Normally, the /etc/env and /var/lib/zksync/data should be mapped to volumes
 # so that they are persisted between docker restarts - which would allow even faster starts.
 
@@ -62,56 +104,89 @@ fi
 INIT_FILE="/var/lib/zksync/data/INIT_COMPLETED.remove_to_reset"
 
 if [ -f "$INIT_FILE" ]; then
-    echo "Initialization was done in the past - simply starting server"
+  echo "Initialization was done in the past - simply starting server"
 else
-    echo "Initialing local environment"
+  echo "Initialing local environment"
+
+  mkdir -p /var/lib/zksync/data
+
+  update_config "/etc/env/base/private.toml" "database_url" "$DATABASE_URL"
+  update_config "/etc/env/base/private.toml" "database_prover_url" "$DATABASE_PROVER_URL"
+  update_config "/etc/env/base/eth_client.toml" "web3_url" "$ETH_CLIENT_WEB3_URL"
+  # Put database in a special /var/lib directory so that it is persisted between docker runs.
+  update_config "/etc/env/base/database.toml" "path" "/var/lib/zksync/data"
+  update_config "/etc/env/base/database.toml" "state_keeper_db_path" "/var/lib/zksync/data/state_keeper"
+  update_config "/etc/env/base/database.toml" "backup_path" "/var/lib/zksync/data/backups"
+
+  if [ -n "$LEGACY_BRIDGE_TESTING" ]; then
+    # making era chain id same as current chain id for legacy bridge testing
+    chain_eth_zksync_network_id=$(read_value_from_config "/etc/env/base/chain.toml" "zksync_network_id")
+    update_config "/etc/env/base/contracts.toml" "ERA_CHAIN_ID" "$chain_eth_zksync_network_id"
+  fi
+
+  if [ -z "$MASTER_URL" ]; then
+    echo "Starting with hyperchain"
+  else
+    # Updates all the stuff (from the '/etc/master_env') - it assumes that it is mapped via docker compose.
+    zk f yarn --cwd /infrastructure/local-setup-preparation join
+  fi
 
-    mkdir -p /var/lib/zksync/data
+  zk config compile
 
-    update_config "/etc/env/base/private.toml" "database_url" "$DATABASE_URL"
-    update_config "/etc/env/base/private.toml" "database_prover_url" "$DATABASE_PROVER_URL"
-    update_config "/etc/env/base/eth_client.toml" "web3_url" "$ETH_CLIENT_WEB3_URL"
-    # Put database in a special /var/lib directory so that it is persisted between docker runs.
-    update_config "/etc/env/base/database.toml" "path" "/var/lib/zksync/data"
-    update_config "/etc/env/base/database.toml" "state_keeper_db_path" "/var/lib/zksync/data/state_keeper"
-    update_config "/etc/env/base/database.toml" "backup_path" "/var/lib/zksync/data/backups"
+  zk db reset
 
+  # Perform initialization (things needed to be done only if you're running in the master mode)
+  if [ -z "$MASTER_URL" ]; then
+    zk contract deploy-verifier
+    zk run deploy-erc20 dev # (created etc/tokens/localhost)
 
-    if [ -z "$MASTER_URL" ]; then
-      echo "Starting with hyperchain"
+    ## init bridgehub state transition
+    zk contract deploy # (deploy L1)
+    zk contract initialize-governance
+    zk contract initialize-validator
+  fi
+
+
+  if [ -z "$CUSTOM_BASE_TOKEN" ]; then
+    echo "Starting chain with ETH as gas token"
+
+    if [ -z "$VALIDIUM_MODE" ]; then
+      ## init hyperchain in rollup mode
+      zk contract register-hyperchain
     else
-      # Updates all the stuff (from the '/etc/master_env') - it assumes that it is mapped via docker compose.
-      zk f yarn --cwd /infrastructure/local-setup-preparation join
+      zk contract register-hyperchain --deployment-mode 1
     fi
-
-    zk config compile
+  else
+    echo "Starting chain with custom gas token $CUSTOM_BASE_TOKEN"
+    zk contract register-hyperchain --base-token-name $CUSTOM_BASE_TOKEN
+  fi
   
-    zk db reset
-    
-    # Perform initialization (things needed to be done only if you're running in the master mode)
-    if [ -z "$MASTER_URL" ]; then
-      zk contract deploy-verifier
-      zk run deploy-erc20 dev # (created etc/tokens/localhost)
-
-      ## init bridgehub state transition
-      zk contract deploy # (deploy L1)
-      zk contract initialize-governance
-      zk contract initialize-validator
-    fi
+  
+  zk f zksync_server --genesis
 
-    ## init hyperchain
-    zk contract register-hyperchain
-    zk f zksync_server --genesis
+  deploy_l2_args=""
+  if [ -n "$LEGACY_BRIDGE_TESTING" ]; then
+    # setting the flag for legacy bridge testing
+    deploy_l2_args="--local-legacy-bridge-testing"
+  fi
 
+  zk contract deploy-l2-through-l1 $deploy_l2_args
 
-    zk contract deploy-l2-through-l1
+  if [ -z "$MASTER_URL" ]; then
+    zk f yarn --cwd /infrastructure/local-setup-preparation start
+  fi
 
-    if [ -z "$MASTER_URL" ]; then
-      zk f yarn --cwd /infrastructure/local-setup-preparation start
-    fi
+  if [ -n "$LEGACY_BRIDGE_TESTING" ]; then
+    # making era address same as current address for legacy bridge testing
+    contracts_diamond_proxy_addr=$(read_value_from_config "/etc/env/target/dev.env" "CONTRACTS_DIAMOND_PROXY_ADDR")
+    update_config "/etc/env/target/dev.env" "CONTRACTS_ERA_DIAMOND_PROXY_ADDR" "$contracts_diamond_proxy_addr"
+
+    # setup-legacy-bridge-era waits for the server to be ready, so starting it in the background
+    zk contract setup-legacy-bridge-era &
+  fi
 
-    # Create init file.
-    echo "System initialized. Please remove this file if you want to reset the system" > $INIT_FILE
+  # Create init file.
+  echo "System initialized. Please remove this file if you want to reset the system" >$INIT_FILE
 
 fi
 
diff --git a/docker/proof-fri-gpu-compressor/Dockerfile b/docker/proof-fri-gpu-compressor/Dockerfile
new file mode 100644
index 000000000000..8249f123081b
--- /dev/null
+++ b/docker/proof-fri-gpu-compressor/Dockerfile
@@ -0,0 +1,48 @@
+# Will work locally only after prior universal setup key download
+FROM nvidia/cuda:12.2.0-devel-ubuntu22.04 as builder
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+ARG CUDA_ARCH=89
+ENV CUDAARCHS=${CUDA_ARCH}
+
+RUN apt-get update && apt-get install -y curl clang openssl libssl-dev gcc g++ git \
+    pkg-config build-essential libclang-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
+
+RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
+    rustup install nightly-2024-05-07 && \
+    rustup default nightly-2024-05-07
+
+RUN curl -Lo cmake-3.24.2-linux-x86_64.sh https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh && \
+    chmod +x cmake-3.24.2-linux-x86_64.sh && \
+    ./cmake-3.24.2-linux-x86_64.sh --skip-license --prefix=/usr/local
+
+WORKDIR /usr/src/zksync
+COPY . .
+
+RUN cd prover && \
+    git clone https://github.com/matter-labs/era-bellman-cuda.git --branch main bellman-cuda && \
+    cmake -Bbellman-cuda/build -Sbellman-cuda/ -DCMAKE_BUILD_TYPE=Release && \
+    cmake --build bellman-cuda/build/
+
+RUN cd prover && BELLMAN_CUDA_DIR=$PWD/bellman-cuda cargo build --features "gpu" --release --bin zksync_proof_fri_compressor
+
+FROM nvidia/cuda:12.2.0-runtime-ubuntu22.04
+
+RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
+
+# copy VK required for proof wrapping
+COPY prover/vk_setup_data_generator_server_fri/data/ /prover/vk_setup_data_generator_server_fri/data/
+
+COPY setup_2\^24.key /setup_2\^24.key
+
+ENV CRS_FILE=/setup_2\^24.key
+
+COPY --from=builder /usr/src/zksync/prover/target/release/zksync_proof_fri_compressor /usr/bin/
+
+ENTRYPOINT ["zksync_proof_fri_compressor"]
diff --git a/docker/prover-gpu-fri/Dockerfile b/docker/prover-gpu-fri/Dockerfile
index 152e768d298f..1093ed9e4ebf 100644
--- a/docker/prover-gpu-fri/Dockerfile
+++ b/docker/prover-gpu-fri/Dockerfile
@@ -14,8 +14,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     PATH=/usr/local/cargo/bin:$PATH
 
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
-    rustup install nightly-2023-08-21 && \
-    rustup default nightly-2023-08-21
+    rustup install nightly-2024-05-07 && \
+    rustup default nightly-2024-05-07
 
 RUN curl -Lo cmake-3.24.2-linux-x86_64.sh https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh && \
     chmod +x cmake-3.24.2-linux-x86_64.sh && \
diff --git a/docker/verified-sources-fetcher/Dockerfile b/docker/verified-sources-fetcher/Dockerfile
new file mode 100644
index 000000000000..972f85d0faf5
--- /dev/null
+++ b/docker/verified-sources-fetcher/Dockerfile
@@ -0,0 +1,19 @@
+FROM matterlabs/zksync-build-base:latest as builder
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+WORKDIR /usr/src/zksync
+COPY . .
+
+RUN cargo build --release --bin verified_sources_fetcher
+
+FROM debian:bookworm-slim
+RUN apt-get update && apt-get install -y apt-transport-https ca-certificates gnupg curl git && rm -rf /var/lib/apt/lists/*
+
+RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg
+RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+RUN apt-get update && apt-get install -y google-cloud-cli && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /usr/src/zksync/target/release/verified_sources_fetcher /usr/bin/
+
+ENTRYPOINT ["verified_sources_fetcher"]
diff --git a/docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile b/docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile
index bd77e680d5fc..a50587e9a83b 100644
--- a/docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile
+++ b/docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile
@@ -73,7 +73,7 @@ RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/so
     gcloud config set metrics/environment github_docker_image
 
 RUN wget -c -O - https://sh.rustup.rs | bash -s -- -y
-RUN rustup install nightly-2023-08-21
+RUN rustup install nightly-2024-05-07
 RUN rustup default stable
 RUN cargo install --version=0.7.3 sqlx-cli
 RUN cargo install cargo-nextest
diff --git a/docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile b/docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile
index d0bb05fed16e..9e56613f9ead 100644
--- a/docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile
+++ b/docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile
@@ -71,7 +71,7 @@ RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/so
     gcloud config set metrics/environment github_docker_image
 
 RUN wget -c -O - https://sh.rustup.rs | bash -s -- -y
-RUN rustup install nightly-2023-08-21
+RUN rustup install nightly-2024-05-07
 RUN rustup default stable
 RUN cargo install --version=0.7.3 sqlx-cli
 RUN cargo install cargo-nextest
diff --git a/docker/zk-environment/Dockerfile b/docker/zk-environment/Dockerfile
index 6690d317d2a3..c5cb35cf1a07 100644
--- a/docker/zk-environment/Dockerfile
+++ b/docker/zk-environment/Dockerfile
@@ -84,7 +84,7 @@ RUN mkdir -p /etc/apt/keyrings && \
     wget -c -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
     echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
     apt-get update && apt-get install nodejs -y && \
-    npm install -g yarn && npm install -g cspell
+    npm install -g yarn
 
 # Install Rust and required cargo packages
 ENV RUSTUP_HOME=/usr/local/rustup \
@@ -105,7 +105,6 @@ RUN wget -c -O - https://sh.rustup.rs | bash -s -- -y && \
 
 RUN cargo install --version=0.7.3 sqlx-cli
 RUN cargo install cargo-nextest
-RUN cargo install cargo-spellcheck
 
 # Copy compiler (both solc and zksolc) binaries
 # Obtain `solc` 0.8.20.
@@ -125,6 +124,10 @@ RUN wget -c https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2 && \
     cd valgrind-3.20.0 && ./configure && make && make install && \
     cd ../ && rm -rf valgrind-3.20.0.tar.bz2 && rm -rf valgrind-3.20.0
 
+# Install foundry
+RUN cargo install --git https://github.com/foundry-rs/foundry \
+    --profile local --locked forge cast
+
 # Setup the environment
 ENV ZKSYNC_HOME=/usr/src/zksync
 ENV PATH="${ZKSYNC_HOME}/bin:${PATH}"
@@ -134,5 +137,5 @@ ENV RUSTC_WRAPPER=/usr/local/cargo/bin/sccache
 
 FROM rust-lightweight as rust-lightweight-nightly
 
-RUN rustup install nightly-2023-08-21 && \
-    rustup default nightly-2023-08-21
+RUN rustup install nightly-2024-05-07 && \
+    rustup default nightly-2024-05-07
diff --git a/docs/guides/advanced/01_initialization.md b/docs/guides/advanced/01_initialization.md
index 7e7e74957cb8..79c33434d3b5 100644
--- a/docs/guides/advanced/01_initialization.md
+++ b/docs/guides/advanced/01_initialization.md
@@ -1,6 +1,6 @@
-# zkSync deeper dive
+# ZKsync deeper dive
 
-The goal of this doc is to show you some more details on how zkSync works internally.
+The goal of this doc is to show you some more details on how ZKsync works internally.
 
 Please do the dev_setup.md and development.md (these commands do all the heavy lifting on starting the components of the
 system).
@@ -20,9 +20,9 @@ there, make sure to run `zk` (that compiles this code), before re-running `zk in
 
 As first step, it gets the docker images for postgres and reth.
 
-Reth (one of the Ethereum clients) will be used to setup our own copy of L1 chain (that our local zkSync would use).
+Reth (one of the Ethereum clients) will be used to setup our own copy of L1 chain (that our local ZKsync would use).
 
-Postgres is one of the two databases, that is used by zkSync (the other one is RocksDB). Currently most of the data is
+Postgres is one of the two databases, that is used by ZKsync (the other one is RocksDB). Currently most of the data is
 stored in postgres (blocks, transactions etc) - while RocksDB is only storing the state (Tree & Map) - and it used by
 VM.
 
@@ -116,7 +116,7 @@ This is one of the "rich wallets" we predefined for local L1.
 **Note:** This reth shell is running official Ethereum JSON RPC with Reth-specific extensions documented at
 [reth docs](https://paradigmxyz.github.io/reth/jsonrpc/intro.html)
 
-In order to communicate with L2 (our zkSync) - we have to deploy multiple contracts onto L1 (our local reth created
+In order to communicate with L2 (our ZKsync) - we have to deploy multiple contracts onto L1 (our local reth created
 Ethereum). You can look on the `deployL1.log` file - to see the list of contracts that were deployed and their accounts.
 
 First thing in the file, is the deployer/governor wallet - this is the account that can change, freeze and unfreeze the
diff --git a/docs/guides/advanced/02_deposits.md b/docs/guides/advanced/02_deposits.md
index 7a40e33f91c9..4018fed46325 100644
--- a/docs/guides/advanced/02_deposits.md
+++ b/docs/guides/advanced/02_deposits.md
@@ -33,7 +33,7 @@ Now, let's see how many tokens we have:
 // This checks the tokens on 'L1' (reth)
 ./web3 --rpc-url http://localhost:8545 balance  0x618263CE921F7dd5F4f40C29f6c524Aaf97b9bbd
 
-// This checks the tokens on 'L2' (zkSync)
+// This checks the tokens on 'L2' (ZKsync)
 ./web3 --rpc-url http://localhost:3050 balance  0x618263CE921F7dd5F4f40C29f6c524Aaf97b9bbd
 ```
 
@@ -55,7 +55,7 @@ and now let's bridge it over to L2.
 
 ## Bridging over to L2
 
-For an easy way to bridge we'll use [zkSync CLI](https://github.com/matter-labs/zksync-cli)
+For an easy way to bridge we'll use [ZKsync CLI](https://github.com/matter-labs/zksync-cli)
 
 ```shell
 npx zksync-cli bridge deposit --chain=dockerized-node --amount 3 --pk=0x5090c024edb3bdf4ce2ebc2da96bedee925d9d77d729687e5e2d56382cf0a5a6 --to=0x618263CE921F7dd5F4f40C29f6c524Aaf97b9bbd
diff --git a/docs/guides/advanced/03_withdrawals.md b/docs/guides/advanced/03_withdrawals.md
index 3d1a46ff4cb9..69f5b0f87089 100644
--- a/docs/guides/advanced/03_withdrawals.md
+++ b/docs/guides/advanced/03_withdrawals.md
@@ -1,4 +1,4 @@
-# zkSync deeper dive bridging stuff back (a.k.a withdrawals)
+# ZKsync deeper dive bridging stuff back (a.k.a withdrawals)
 
 Assuming that you have completed [part 1](01_initialization.md) and [part 2](02_deposits.md) already, we can bridge the
 tokens back by simply calling the zksync-cli:
diff --git a/docs/guides/advanced/0_alternative_vm_intro.md b/docs/guides/advanced/0_alternative_vm_intro.md
index b47c71bde2f5..fab623e38ae3 100644
--- a/docs/guides/advanced/0_alternative_vm_intro.md
+++ b/docs/guides/advanced/0_alternative_vm_intro.md
@@ -4,7 +4,7 @@
 
 [Back to ToC](../../specs/README.md)
 
-The zkSync zkEVM plays a fundamentally different role in the zkStack than the EVM does in Ethereum. The EVM is used to
+The ZKsync zkEVM plays a fundamentally different role in the zkStack than the EVM does in Ethereum. The EVM is used to
 execute code in Ethereum's state transition function. This STF needs a client to implement and run it. Ethereum has a
 multi-client philosophy, there are multiple clients, and they are written in Go, Rust, and other traditional programming
 languages, all running and verifying the same STF.
@@ -68,7 +68,7 @@ For each frame, the following memory areas are allocated:
   calldata/copy the `returndata` from the calls to system contracts to not interfere with the standard Solidity memory
   alignment.
 - _Stack_. Unlike Ethereum, stack is not the primary place to get arguments for opcodes. The biggest difference between
-  stack on zkEVM and EVM is that on zkSync stack can be accessed at any location (just like memory). While users do not
+  stack on zkEVM and EVM is that on ZKsync stack can be accessed at any location (just like memory). While users do not
   pay for the growth of stack, the stack can be fully cleared at the end of the frame, so the overhead is minimal.
 - _Code_. The memory area from which the VM executes the code of the contract. The contract itself can not read the code
   page, it is only done implicitly by the VM.
@@ -115,7 +115,7 @@ copying.
 
 Some of the operations which are opcodes on Ethereum, have become calls to some of the system contracts. The most
 notable examples are `Keccak256`, `SystemContext`, etc. Note, that, if done naively, the following lines of code would
-work differently on zkSync and Ethereum:
+work differently on ZKsync and Ethereum:
 
 ```solidity
 pop(call(...))
@@ -142,7 +142,7 @@ result in `revert(0,0)`.
 - `mimic_call`. The same as a normal `call`, but it can alter the `msg.sender` field of the transaction.
 - `to_l1`. Sends a system L2→L1 log to Ethereum. The structure of this log can be seen
   [here](https://github.com/code-423n4/2023-10-zksync/blob/ef99273a8fdb19f5912ca38ba46d6bd02071363d/code/contracts/ethereum/contracts/zksync/Storage.sol#L47).
-- `event`. Emits an L2 log to zkSync. Note, that L2 logs are not equivalent to Ethereum events. Each L2 log can emit 64
+- `event`. Emits an L2 log to ZKsync. Note, that L2 logs are not equivalent to Ethereum events. Each L2 log can emit 64
   bytes of data (the actual size is 88 bytes, because it includes the emitter address, etc). A single Ethereum event is
   represented with multiple `event` logs constitute. This opcode is only used by `EventWriter` system contract.
 - `precompile_call`. This is an opcode that accepts two parameters: the uint256 representing the packed parameters for
@@ -227,7 +227,7 @@ by another system contract (since Matter Labs is fully aware of system contracts
 ### Simulations via our compiler
 
 In the future, we plan to introduce our “extended” version of Solidity with more supported opcodes than the original
-one. However, right now it was beyond the capacity of the team to do, so in order to represent accessing zkSync-specific
+one. However, right now it was beyond the capacity of the team to do, so in order to represent accessing ZKsync-specific
 opcodes, we use `call` opcode with certain constant parameters that will be automatically replaced by the compiler with
 zkEVM native opcode.
 
@@ -251,7 +251,7 @@ Full list of opcode simulations can be found
 
 We also use
 [verbatim-like](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/extensions/verbatim.md)
-statements to access zkSync-specific opcodes in the bootloader.
+statements to access ZKsync-specific opcodes in the bootloader.
 
 All the usages of the simulations in our Solidity code are implemented in the
 [SystemContractHelper](https://github.com/code-423n4/2023-10-zksync/blob/main/code/system-contracts/contracts/libraries/SystemContractHelper.sol)
@@ -284,7 +284,7 @@ above substitutions to work.
 
 ## Bytecode hashes
 
-On zkSync the bytecode hashes are stored in the following format:
+On ZKsync the bytecode hashes are stored in the following format:
 
 - The 0th byte denotes the version of the format. Currently the only version that is used is “1”.
 - The 1st byte is `0` for deployed contracts’ code and `1` for the contract code
@@ -306,6 +306,6 @@ Note, that it does not have to consist of only correct opcodes. In case the VM e
 simply revert (similar to how EVM would treat them).
 
 A call to a contract with invalid bytecode can not be proven. That is why it is **essential** that no contract with
-invalid bytecode is ever deployed on zkSync. It is the job of the
+invalid bytecode is ever deployed on ZKsync. It is the job of the
 [KnownCodesStorage](https://github.com/matter-labs/zksync-era/blob/main/docs/specs/zk_evm/system_contracts.md#knowncodestorage)
 to ensure that all allowed bytecodes in the system are valid.
diff --git a/docs/guides/advanced/contracts.md b/docs/guides/advanced/contracts.md
index 98065a787b71..5148ee917f7f 100644
--- a/docs/guides/advanced/contracts.md
+++ b/docs/guides/advanced/contracts.md
@@ -1,10 +1,10 @@
-# zkSync contracts
+# ZKsync contracts
 
-Now that we know how to bridge tokens back and forth, let's talk about running things on zkSync.
+Now that we know how to bridge tokens back and forth, let's talk about running things on ZKsync.
 
-We have a bunch of great tutorials (like this one <https://era.zksync.io/docs/api/hardhat/getting-started.html>) that
+We have a bunch of great tutorials (like this one <https://docs.zksync.io/build/tooling/hardhat/getting-started>) that
 you can follow to get the exact code & command line calls to create the contracts - so in this article, let's focus on
-how things differ between zkSync and Ethereum.
+how things differ between ZKsync and Ethereum.
 
 **Note** Before reading this article, I'd recommend doing the hardhat tutorial above.
 
@@ -23,9 +23,9 @@ the ABI, so that they can set the proper function arguments).
 All the bytecode will be run on the EVM (Ethereum Virtual Machine) - that has a stack, access to memory and storage, and
 a bunch of opcodes.
 
-## zkSync flow
+## ZKsync flow
 
-The main part (and the main cost) of the zkSync is the proving system. In order to make proof as fast as possible, we're
+The main part (and the main cost) of the ZKsync is the proving system. In order to make proof as fast as possible, we're
 running a little bit different virtual machine (zkEVM) - that has a slightly different set of opcodes, and also contains
 a bunch of registers. More details on this will be written in the future articles.
 
@@ -37,7 +37,7 @@ While having a separate compiler introduces a bunch of challenges (for example,
 allows us to move some of the VM logic (like new contract deployment) into System contracts - which allows faster &
 cheaper modifications and increased flexibility.
 
-### zkSync system contracts
+### ZKsync system contracts
 
 Small note on system contracts: as mentioned above, we moved some of the VM logic into system contracts, which allows us
 to keep VM simpler (and with this - keep the proving system simpler).
@@ -51,15 +51,15 @@ visible - like our `ContractDeployer`
 
 ### ContractDeployer
 
-Deploying a new contract differs on Ethereum and zkSync.
+Deploying a new contract differs on Ethereum and ZKsync.
 
-While on Ethereum - you send the transaction to 0x00 address - on zkSync you have to call the special `ContractDeployer`
+While on Ethereum - you send the transaction to 0x00 address - on ZKsync you have to call the special `ContractDeployer`
 system contract.
 
 If you look on your hardhat example, you'll notice that your `deploy.ts` is actually using a `Deployer` class from the
 `hardhat-zksync-deploy` plugin.
 
-Which inside uses the zkSync's web3.js, that calls the contract deployer
+Which inside uses the ZKsync's web3.js, that calls the contract deployer
 [here](https://github.com/zksync-sdk/zksync2-js/blob/b1d11aa016d93ebba240cdeceb40e675fb948133/src/contract.ts#L76)
 
 ```typescript
@@ -71,14 +71,14 @@ override getDeployTransaction(..) {
 ```
 
 Also `ContractDeployer` adding a special prefix for all the new contract addresses. This means that contract addresses
-WILL be different on `zkSync` and Ethereum (and also leaves us the possibility of adding Ethereum addresses in the
+WILL be different on `ZKsync` and Ethereum (and also leaves us the possibility of adding Ethereum addresses in the
 future if needed).
 
 You can look for `CREATE2_PREFIX` and `CREATE_PREFIX` in the code.
 
 ### Gas costs
 
-Another part, where zkSync differs from Ethereum is gas cost. The best example for this are storage slots.
+Another part, where ZKsync differs from Ethereum is gas cost. The best example for this are storage slots.
 
 If you have two transactions that are updating the same storage slot - and they are in the same 'batch' - only the first
 one would be charged (as when we write the final storage to ethereum, we just write the final diff of what slots have
@@ -86,11 +86,11 @@ changed - so updating the same slot multiple times doesn't increase the amount o
 
 ### Account abstraction and some method calls
 
-As `zkSync` has a built-in Account Abstraction (more on this in a separate article) - you shouldn't depend on some of
+As `ZKsync` has a built-in Account Abstraction (more on this in a separate article) - you shouldn't depend on some of
 the solidity functions (like `ecrecover` - that checks the keys, or `tx.origin`) - in all the cases, the compiler will
 try to warn you.
 
 ## Summary
 
-In this article, we looked at how contract development & deployment differs on Ethereum and zkSync (looking at
+In this article, we looked at how contract development & deployment differs on Ethereum and ZKsync (looking at
 differences in VMs, compilers and system contracts).
diff --git a/docs/guides/advanced/docker_and_ci.md b/docs/guides/advanced/docker_and_ci.md
new file mode 100644
index 000000000000..ff1c7843b8b1
--- /dev/null
+++ b/docs/guides/advanced/docker_and_ci.md
@@ -0,0 +1,73 @@
+# Docker and CI
+
+How to efficiently debug CI issues locally.
+
+This document will be useful in case you struggle with reproducing some CI issues on your local machine.
+
+In most cases, this is due to the fact that your local machine has some arifacts, configs, files that you might have set
+in the past, that are missing from the CI.
+
+## Basic docker commands
+
+- `docker ps` - prints the list of currently running containers
+- `docker run` - starts a new docker container
+- `docker exec` - connects to a running container and executes the command.
+- `docker kill` - stops the container.
+- `docker cp` - allows copying files between your system and docker container.
+
+Usually docker containers have a specific binary that they run, but for debugging we often want to start a bash instead.
+
+The command below starts a new docker containers, and instead of running its binary - runs `/bin/bash` in interactive
+mode.
+
+```
+docker run  -it matterlabs/zk-environment:latest2.0-lightweight-nightly /bin/bash
+```
+
+Connects to **already running** job, and gets you the interactive shell.
+
+```
+docker exec -i -it local-setup-zksync-1 /bin/bash
+```
+
+## Debugging CI
+
+Many of the tests require postgres & reth - you initialize them with:
+
+```
+docker compose up -d
+
+```
+
+You should see something like this:
+
+```
+[+] Running 3/3
+ ⠿ Network zksync-era_default       Created   0.0s
+ ⠿ Container zksync-era-postgres-1  Started   0.3s
+ ⠿ Container zksync-era-reth-1      Started   0.3s
+```
+
+Start the docker with the 'basic' imge
+
+```
+# We tell it to connect to the same 'subnetwork' as other containers (zksync-era_default).
+# the IN_DOCKER variable is changing different urls (like postgres) from localhost to postgres - so that it can connect to those
+# containers above.
+docker run --network zksync-era_default -e IN_DOCKER=1   -it matterlabs/zk-environment:latest2.0-lightweight-nightly /bin/bash
+# and then inside, run:
+
+git clone https://github.com/matter-labs/zksync-era.git .
+git checkout YOUR_BRANCH
+zk
+```
+
+After this, you can run any commands you need.
+
+When you see a command like `ci_run zk contract build` in the CI - this simply means that it executed
+`zk contract build` inside that docker container.
+
+**IMPORTANT** - by default, docker is running in the mode, where it does NOT persist the changes. So if you exit that
+shell, all the changes will be removed (so when you restart, you'll end up in the same pristine condition). You can
+'commit' your changes into a new docker image, using `docker commit XXX some_name`, where XXX is your container id from
+`docker ps`. Afterwards you can 'start' this docker image with `docker run ... some_name`.
diff --git a/docs/guides/advanced/fee_model.md b/docs/guides/advanced/fee_model.md
index 40974f461ea3..3e6473d3ab96 100644
--- a/docs/guides/advanced/fee_model.md
+++ b/docs/guides/advanced/fee_model.md
@@ -182,7 +182,7 @@ meaning it cannot be less than 80M or more than 4G.
 ### Why validation is special
 
 In Ethereum, there is a fixed cost for verifying a transaction's correctness by checking its signature. However, in
-zkSync, due to Account Abstraction, we may need to execute some contract code to determine whether it's ready to accept
+ZKsync, due to Account Abstraction, we may need to execute some contract code to determine whether it's ready to accept
 the transaction. If the contract rejects the transaction, it must be dropped, and there's no one to charge for that
 process.
 
@@ -224,7 +224,7 @@ You can find this code in [get_txs_fee_in_wei][get_txs_fee_in_wei] function.
 
 ## Q&A
 
-### Is zkSync really cheaper
+### Is ZKsync really cheaper
 
 In short, yes. As seen in the table at the beginning, the regular L2 gas price is set to 0.25 Gwei, while the standard
 Ethereum price is around 60-100 Gwei. However, the cost of publishing to L1 depends on L1 prices, meaning that the
@@ -232,7 +232,7 @@ actual transaction costs will increase if the L1 gas price rises.
 
 ### Why do I hear about large refunds
 
-There are a few reasons why refunds might be 'larger' on zkSync (i.e., why we might be overestimating the fees):
+There are a few reasons why refunds might be 'larger' on ZKsync (i.e., why we might be overestimating the fees):
 
 - We must assume (pessimistically) that you'll have to pay for all the slot/storage writes. In practice, if multiple
   transactions touch the same slot, we only charge one of them.
diff --git a/docs/guides/advanced/how_l2_messaging_works.md b/docs/guides/advanced/how_l2_messaging_works.md
index 3120b8b04772..45aba51da03b 100644
--- a/docs/guides/advanced/how_l2_messaging_works.md
+++ b/docs/guides/advanced/how_l2_messaging_works.md
@@ -1,6 +1,6 @@
 # How L2 to L1 messaging works
 
-In this article, we will explore the workings of Layer 2 (L2) to Layer 1 (L1) messaging in zkSync Era.
+In this article, we will explore the workings of Layer 2 (L2) to Layer 1 (L1) messaging in ZKsync Era.
 
 If you're uncertain about why messaging is necessary in the first place, please refer to our [user
 documentation][user_docs].
@@ -183,7 +183,7 @@ explored how it's ultimately included in the execution results (as part of Query
 transmitted to L1 for final verification.
 
 [overview_image]: https://user-images.githubusercontent.com/128217157/257739371-f971c10b-87c7-4ee9-bd0e-731670c616ac.png
-[user_docs]: https://era.zksync.io/docs/dev/how-to/send-message-l2-l1.html
+[user_docs]: https://code.zksync.io/tutorials/how-to-send-l2-l1-message
 [l1_messenger]:
   https://github.com/matter-labs/era-system-contracts/blob/f01df555c03860b6093dd669d119eed4d9f8ec99/contracts/L1Messenger.sol#L22
 [list_of_opcodes]:
diff --git a/docs/guides/advanced/how_transaction_works.md b/docs/guides/advanced/how_transaction_works.md
index 800b2612d162..96c75e3609cc 100644
--- a/docs/guides/advanced/how_transaction_works.md
+++ b/docs/guides/advanced/how_transaction_works.md
@@ -26,7 +26,7 @@ Here's a simplified table of the transaction types:
 | 0x0     | 'Legacy'                                                   | Only includes `gas price`                                                                          | These are traditional Ethereum transactions.                                          | 60% / 82%                           |
 | 0x1     | EIP-2930                                                   | Contains a list of storage keys/addresses the transaction will access                              | At present, this type of transaction is not enabled.                                  |
 | 0x2     | EIP-1559                                                   | Includes `max_priority_fee_per_gas`, `max_gas_price`                                               | These are Ethereum transactions that provide more control over the gas fee.           | 35% / 12%                           |
-| 0x71    | EIP-712 (specific to zkSync)                               | Similar to EIP-1559, but also adds `max_gas_per_pubdata`, custom signatures, and Paymaster support | This is used by those who are using zkSync specific Software Development Kits (SDKs). | 1% / 2%                             |
+| 0x71    | EIP-712 (specific to ZKsync)                               | Similar to EIP-1559, but also adds `max_gas_per_pubdata`, custom signatures, and Paymaster support | This is used by those who are using ZKsync specific Software Development Kits (SDKs). | 1% / 2%                             |
 | 0xFF    | L1 transactions also known as priority transactions `L1Tx` | Originating from L1, these have more custom fields like 'refund' addresses etc                     | Mainly used to transfer funds/data between L1 & L2 layer.                             | 4% / 3%                             |
 
 Here's the code that does the parsing: [TransactionRequest::from_bytes][transaction_request_from_bytes]
diff --git a/docs/guides/advanced/pubdata-with-blobs.md b/docs/guides/advanced/pubdata-with-blobs.md
new file mode 100644
index 000000000000..edeaa5b4ebf0
--- /dev/null
+++ b/docs/guides/advanced/pubdata-with-blobs.md
@@ -0,0 +1,300 @@
+# Pubdata Post 4844
+
+## Motivation
+
+EIP-4844, commonly known as Proto-Danksharding, is an upgrade to the ethereum protocol that introduces a new data
+availability solution embedded in layer 1. More information about it can be found
+[here](https://ethereum.org/en/roadmap/danksharding/). With proto-danksharding we can utilize the new blob data
+availability for cheaper storage of pubdata when we commit batches resulting in more transactions per batch and cheaper
+batches/transactions. We want to ensure we have the flexibility at the contract level to process both pubdata via
+calldata, as well as pubdata via blobs. A quick callout here, while 4844 has introduced blobs as new DA layer, it is the
+first step in full Danksharding. With full Danksharding ethereum will be able to handle a total of 64 blobs per block
+unlike 4844 which supports just 6 per block.
+
+> 💡 Given the nature of 4844 development from a solidity viewpoint, we’ve had to create a temporary contract
+> `BlobVersionedHash.yul` which acts in place of the eventual `BLOBHASH` opcode.
+
+## Technical Approach
+
+The approach spans both L2 system contracts and L1 ZKsync contracts (namely `Executor.sol`). When a batch is sealed on
+L2 we will chunk it into blob-sized pieces (4096 elements \* 31 bytes per what is required by our circuits), take the
+hash of each chunk, and send them to L1 via system logs. Within `Executor.sol` , when we are dealing with blob-based
+commitments, we verify that the blob contains the correct data with the point evaluation precompile. If the batch
+utilizes calldata instead, the processing should remain the same as in a pre-4844 ZKsync. Regardless of if pubdata is in
+calldata or blobs are used, the batch’s commitment changes as we include new data within the auxiliary output.
+
+Given that this is the first step to a longer-term solution, and the restrictions of proto-danksharding that get lifted
+for full danksharding, we impose the following constraints:
+
+1. we will support a maximum of 2 blobs per batch
+2. only 1 batch will be committed in a given transaction
+3. we will always send 2 system logs (one for each potential blob commitment) even if the batch only uses 1 blob.
+
+This simplifies the processing logic on L1 and stops us from increasing the blob base fee (increases when there 3 or
+more blobs in a given block).
+
+## Backward-compatibility
+
+While some of the parameter formatting changes, we maintain the same function signature for `commitBatches` and still
+allow for pubdata to be submitted via calldata:
+
+```solidity
+struct StoredBatchInfo {
+  uint64 batchNumber;
+  bytes32 batchHash;
+  uint64 indexRepeatedStorageChanges;
+  uint256 numberOfLayer1Txs;
+  bytes32 priorityOperationsHash;
+  bytes32 l2LogsTreeRoot;
+  uint256 timestamp;
+  bytes32 commitment;
+}
+
+struct CommitBatchInfo {
+  uint64 batchNumber;
+  uint64 timestamp;
+  uint64 indexRepeatedStorageChanges;
+  bytes32 newStateRoot;
+  uint256 numberOfLayer1Txs;
+  bytes32 priorityOperationsHash;
+  bytes32 bootloaderHeapInitialContentsHash;
+  bytes32 eventsQueueStateHash;
+  bytes systemLogs;
+  bytes pubdataCommitments;
+}
+
+function commitBatches(StoredBatchInfo calldata _lastCommittedBatchData, CommitBatchInfo[] calldata _newBatchesData)
+  external;
+
+```
+
+## Implementation
+
+### Bootloader Memory
+
+With the increase in the amount of pubdata due to blobs, changes can be made to the bootloader memory to facilitate more
+l2 to l1 logs, compressed bytecodes, and pubdata. We take the naive approach for l2 to l1 logs and the compressed
+bytecode, doubling their previous constraints from `2048` logs and `32768 slots` to `4096 logs` and `65536 slots`
+respectively. We then increase the number of slots for pubdata from `208000` to `411900`. Copying the comment around
+pubdata slot calculation from our code:
+
+```solidity
+One of "worst case" scenarios for the number of state diffs in a batch is when 240kb of pubdata is spent
+on repeated writes, that are all zeroed out. In this case, the number of diffs is 240k / 5 = 48k. This means that they will have
+accommodate 13056000 bytes of calldata for the uncompressed state diffs. Adding 120k on top leaves us with
+roughly 13176000 bytes needed for calldata. 411750 slots are needed to accommodate this amount of data.
+We round up to 411900 slots just in case.
+```
+
+The overall bootloader max memory is increased from `24000000` to `30000000` bytes to accommodate the increases.
+
+### L2 System Contracts
+
+We introduce a new system contract PubdataChunkPublisher that takes the full pubdata, creates chunks that are each
+126,976 bytes in length (this is calculated as 4096 elements per blob each of which has 31 bytes), and commits them in
+the form of 2 system logs. We have the following keys for system logs:
+
+```solidity
+enum SystemLogKey {
+  L2_TO_L1_LOGS_TREE_ROOT_KEY,
+  TOTAL_L2_TO_L1_PUBDATA_KEY,
+  STATE_DIFF_HASH_KEY,
+  PACKED_BATCH_AND_L2_BLOCK_TIMESTAMP_KEY,
+  PREV_BATCH_HASH_KEY,
+  CHAINED_PRIORITY_TXN_HASH_KEY,
+  NUMBER_OF_LAYER_1_TXS_KEY,
+  BLOB_ONE_HASH_KEY,
+  BLOB_TWO_HASH_KEY,
+  EXPECTED_SYSTEM_CONTRACT_UPGRADE_TX_HASH_KEY
+}
+
+```
+
+In addition to the blob commitments, the hash of the total pubdata is still sent and is used if a batch is committed
+with pubdata as calldata vs as blob data. As stated earlier, even when we only have enough pubdata for a single blob, 2
+system logs are sent. The hash value in the second log in this case will `bytes32(0)` .
+
+One important thing is that we don’t try to reason about the data here, that is done in the L1Messenger and Compressor
+contracts. The main purpose of this is to commit to blobs and have those commitments travel to L1 via system logs.
+
+### L1 Executor Facet
+
+While the function signature for `commitBatches` and the structure of `CommitBatchInfo` stays the same, the format of
+`CommitBatchInfo.pubdataCommitments` changes. Before 4844, this field held a byte array of pubdata, now it can hold
+either the total pubdata as before or it can hold a list of concatenated info for kzg blob commitments. To differentiate
+between the two, a header byte is prepended to the byte array. At the moment we only support 2 values:
+
+```solidity
+/// @dev Enum used to determine the source of pubdata. At first we will support calldata and blobs but this can be extended.
+enum PubdataSource {
+    Calldata = 0,
+    Blob = 1
+}
+```
+
+We reject all other values in the first byte.
+
+### Calldata Based Pubdata Processing
+
+When using calldata, we want to operate on `pubdataCommitments[1:pubdataCommitments.length - 32]` as this is the full
+pubdata that was committed to via system logs. The reason we don’t operate on the last 32 bytes is that we also include
+what the blob commitment for this data would be as a way to make our witness generation more generic. Only a single blob
+commitment is needed for this as the max size of calldata is the same size as a single blob. When processing the system
+logs in this context, we will check the hash of the supplied pubdata without the 1 byte header for pubdata source
+against the value in the corresponding system log with key `TOTAL_L2_TO_L1_PUBDATA_KEY`. We still require logs for the 2
+blob commitments, even if these logs contain values we will substitute them for `bytes32(0)` when constructing the batch
+commitment.
+
+### Blob Based Pubdata Processing
+
+The format for `pubdataCommitments` changes when we send pubdata as blobs, containing data we need to verify the blob
+contents via the newly introduced point evaluation precompile. The data is `pubdataCommitments[1:]` is the concatenation
+of `opening point (16 bytes) || claimed value (32 bytes) || commitment (48 bytes) || proof (48 bytes)` for each blob
+attached to the transaction, lowering our calldata from N → 144 bytes per blob. More on how this is used later on.
+
+Utilizing blobs causes us to process logs in a slightly different way. Similar to how it's done when pubdata is sent via
+calldata, we require a system log with a key of the `TOTAL_L2_TO_L1_PUBDATA_KEY` , although the value is ignored and
+extract the 2 blob hashes from the `BLOB_ONE_HASH_KEY` and `BLOB_TWO_HASH_KEY` system logs to be used in the batch
+commitment.
+
+While calldata verification is simple, comparing the hash of the supplied calldata versus the value in the system log,
+we need to take a few extra steps when verifying the blobs attached to the transaction contain the correct data. After
+processing the logs and getting the 2 blob linear hashes, we will have all the data we need to call the
+[point evaluation precompile](https://eips.ethereum.org/EIPS/eip-4844#point-evaluation-precompile). Recall that the
+contents of `pubdataCommitments` have the opening point (in its 16 byte form), claimed value, the commitment, and the
+proof of this claimed value. The last piece of information we need is the blob’s versioned hash (obtained via `BLOBHASH`
+opcode).
+
+There are checks within `_verifyBlobInformation` that ensure that we have the correct blob linear hashes and that if we
+aren’t expecting a second blob, the linear hash should be equal to `bytes32(0)`. This is how we signal to our circuits
+that we didn’t publish any information in the second blob.
+
+Verifying the commitment via the point evaluation precompile goes as follows (note that we assume the header byte for
+pubdataSource has already been removed by this point):
+
+```solidity
+// The opening point is passed as 16 bytes as that is what our circuits expect and use when verifying the new batch commitment
+// PUBDATA_COMMITMENT_SIZE = 144 bytes
+pubdata_commitments <- [opening point (16 bytes) || claimed value (32 bytes) || commitment (48 bytes) || proof (48 bytes)] from calldata
+opening_point = bytes32(pubdata_commitments[:16])
+versioned_hash <- from BLOBHASH opcode
+
+// Given that we needed to pad the opening point for the precompile, append the data after.
+point_eval_input = versioned_hash || opening_point || pubdataCommitments[16: PUBDATA_COMMITMENT_SIZE]
+
+// this part handles the following:
+// verify versioned_hash == hash(commitment)
+// verify P(z) = y
+res <- point_valuation_precompile(point_eval_input)
+
+assert uint256(res[32:]) == BLS_MODULUS
+```
+
+Where correctness is validated by checking the latter 32 bytes of output from the point evaluation call is equal to
+`BLS_MODULUS`.
+
+### Batch Commitment and Proof of Equivalence
+
+With the contents of the blob being verified, we need to add this information to the batch commitment so that it can
+further be part of the verification of the overall batch by our proof system. Our batch commitment is the hashing of a
+few different values: passthrough data (holding our new state root, and next enumeration index to be used), meta
+parameters (flag for if zk porter is available, bootloader bytecode hash, and default account bytecode hash), and
+auxiliary output. The auxiliary output changes with 4844, adding in 4 new fields and the new corresponding encoding:
+
+- 2 `bytes32` fields for linear hashes
+  - These are the hashes of the blob’s preimages
+- 2 `bytes32` for 4844 output commitment hashes
+  - These are `(versioned hash || opening point || evaluation value)`
+  - The format of the opening point here is expected to be the 16 byte value passed by calldata
+- We encode an additional 28 `bytes32(0)` at the end because with the inclusion of vm 1.5.0, our circuits support a
+  total of 16 blobs that will be used once the total number of blobs supported by ethereum increase.
+
+```solidity
+abi.encode(
+    l2ToL1LogsHash,
+    _stateDiffHash,
+    _batch.bootloaderHeapInitialContentsHash,
+    _batch.eventsQueueStateHash,
+    _blob1LinearHash,
+    _blob1OutputCommitment,
+    _blob2LinearHash,
+    _blob2OutputCommitment,
+    _encode28Bytes32Zeroes()
+);
+```
+
+There are 3 different scenarios that change the values posted here:
+
+1. We submit pubdata via calldata
+2. We only utilize a single blob
+3. We use both blobs
+
+When we use calldata, the values `_blob1LinearHash`, `_blob1OutputCommitment`, `_blob2LinearHash`, and
+`_blob2OutputCommitment` should all be `bytes32(0)`. If we are using blobs but only have a single blob,
+`_blob1LinearHash` and `_blob1OutputCommitment` should correspond to that blob, while `_blob2LinearHash` and
+`_blob2OutputCommitment` will be `bytes32(0)`. Following this, when we use both blobs, the data for these should be
+present in all of the values.
+
+Our circuits will then handle the proof of equivalence, following a method similar to the moderate approach mentioned
+[here](https://notes.ethereum.org/@vbuterin/proto_danksharding_faq#Moderate-approach-works-with-any-ZK-SNARK), verifying
+that the total pubdata can be repackaged as the blobs we submitted and that the commitments in fact evaluate to the
+given value at the computed opening point.
+
+## Pubdata Contents and Blobs
+
+Given how data representation changes on the consensus layer (where blobs live) versus on the execution layer (where
+calldata is found), there is some preprocessing that takes place to make it compatible. When calldata is used for
+pubdata, we keep it as is and no additional processing is required to transform it. Recalling the above section when
+pubdata is sent via calldata it has the format: source byte (1 bytes) || pubdata || blob commitment (32 bytes) and so we
+must first trim it of the source byte and blob commitment before decoding it. A more detailed guide on the format can be
+found in our documentation. Using blobs requires a few more steps:
+
+```python
+ZKSYNC_BLOB_SIZE = 31 * 4096
+
+# First we pad the pubdata with the required amount of zeroes to fill
+# the nearest blobs
+padding_amount = ZKSYNC_BLOB_SIZE - len(pubdata) % ZKSYNC_BLOB_SIZE)
+padded_pubdata = pad_right_with_zeroes(pubdata, padding_amount)
+
+# We then chunk them into `ZKSYNC_BLOB_SIZE` sized arrays
+blobs = chunk(padded_pubdata, ZKSYNC_BLOB_SIZE)
+
+# Each blob is then encoded to be compatible with the CL
+for blob in blobs:
+    encoded_blob = zksync_pubdata_into_ethereum_4844_data(blob)
+```
+
+Now we can apply the encoding formula, with some of the data from the blob commit transaction to move from encoded blobs
+back into decodable zksync pubdata:
+
+```python
+# opening point (16 bytes) || claimed value (32 bytes) || commitment (48 bytes) || proof (48 bytes)
+BLOB_PUBDATA_COMMITMENT_SIZE = 144
+
+# Parse the kzg commitment from the commit calldata
+commit_calldata_without_source = commit_calldata[1:]
+for i in range(0, len(commit_calldata_without_source), BLOB_PUBDATA_COMMITMENT_SIZE):
+    # We can skip the opening point and claimed value, ignoring the proof
+    kzg_commitment = commit_calldata_without_source[48:96]
+
+# We then need to pull the blobs in the correct order, this can be found by matching
+# each blob with their kzg_commitment keeping the order from the calldata
+encoded_blobs = pull_blob_for_each_kzg_commitment(kzg_commitments)
+
+# Decode each blob into the zksync specific format
+for encoded_blob in encoded_blobs:
+    decoded_blob = ethereum_4844_data_into_zksync_pubdata(encoded_blob)
+
+reconstructed_pubdata = concat(decoded_blobs)
+```
+
+The last thing to do depends on the strategy taken, the two approaches are:
+
+- Remove all trailing zeroes after concatenation
+- Parse the data and ignore the extra zeroes at the end
+
+The second option is a bit messier so going with the first, we can then decode the pubdata and when we get to the last
+state diff, if the number of bytes is less than specified we know that the remaining data are zeroes. The needed
+functions can be found within the
+[zkevm_circuits code](https://github.com/matter-labs/era-zkevm_circuits/blob/3a973afb3cf2b50b7138c1af61cc6ac3d7d0189f/src/eip_4844/mod.rs#L358).
diff --git a/docs/guides/advanced/pubdata.md b/docs/guides/advanced/pubdata.md
index f0e159a8010c..7a32076221f1 100644
--- a/docs/guides/advanced/pubdata.md
+++ b/docs/guides/advanced/pubdata.md
@@ -1,6 +1,6 @@
 # Overview
 
-Pubdata in zkSync can be divided up into 4 different categories:
+Pubdata in ZKsync can be divided up into 4 different categories:
 
 1. L2 to L1 Logs
 2. L2 to L1 Messages
@@ -12,14 +12,14 @@ One thing to note is that the way that the data is represented changes in a pre-
 level, in a pre-boojum era these are represented as separate fields while in boojum they are packed into a single bytes
 array.
 
-> Note: Once 4844 gets integrated this bytes array will move from being part of the calldata to blob data.
+> Note: When the 4844 was integrated this bytes array was moved from being part of the calldata to blob data.
 
 While the structure of the pubdata changes, we can use the same strategy to pull the relevant information. First, we
-need to filter all of the transactions to the L1 zkSync contract for only the `commitBlocks` transactions where the
-proposed block has been referenced by a corresponding `executeBlocks` call (the reason for this is that a committed or
-even proven block can be reverted but an executed one cannot). Once we have all the committed blocks that have been
-executed, we then will pull the transaction input and the relevant fields, applying them in order to reconstruct the
-current state of L2.
+need to filter all of the transactions to the L1 ZKsync contract for only the `commitBlocks/commitBatches` transactions
+where the proposed block has been referenced by a corresponding `executeBlocks/executeBatches` call (the reason for this
+is that a committed or even proven block can be reverted but an executed one cannot). Once we have all the committed
+blocks that have been executed, we then will pull the transaction input and the relevant fields, applying them in order
+to reconstruct the current state of L2.
 
 One thing to note is that in both systems some of the contract bytecode is compressed into an array of indices where
 each 2 byte index corresponds to an 8 byte word in a dictionary. More on how that is done [here](./compression.md). Once
@@ -90,35 +90,44 @@ id generated as part of a batch will be in the `indexRepeatedStorageChanges` fie
 ### Post-Boojum Era
 
 ```solidity
-/// @notice Data needed to commit new block
-/// @param blockNumber Number of the committed block
-/// @param timestamp Unix timestamp denoting the start of the block execution
+/// @notice Data needed to commit new batch
+/// @param batchNumber Number of the committed batch
+/// @param timestamp Unix timestamp denoting the start of the batch execution
 /// @param indexRepeatedStorageChanges The serial number of the shortcut index that's used as a unique identifier for storage keys that were used twice or more
 /// @param newStateRoot The state root of the full state tree
 /// @param numberOfLayer1Txs Number of priority operations to be processed
-/// @param priorityOperationsHash Hash of all priority operations from this block
-/// @param systemLogs concatenation of all L2 -> L1 system logs in the block
-/// @param totalL2ToL1Pubdata Total pubdata committed to as part of bootloader run. Contents are: l2Tol1Logs <> l2Tol1Messages <> publishedBytecodes <> stateDiffs
-struct CommitBlockInfo {
-  uint64 blockNumber;
+/// @param priorityOperationsHash Hash of all priority operations from this batch
+/// @param bootloaderHeapInitialContentsHash Hash of the initial contents of the bootloader heap. In practice it serves as the commitment to the transactions in the batch.
+/// @param eventsQueueStateHash Hash of the events queue state. In practice it serves as the commitment to the events in the batch.
+/// @param systemLogs concatenation of all L2 -> L1 system logs in the batch
+/// @param pubdataCommitments Packed pubdata commitments/data.
+/// @dev pubdataCommitments format: This will always start with a 1 byte pubdataSource flag. Current allowed values are 0 (calldata) or 1 (blobs)
+///                             kzg: list of: opening point (16 bytes) || claimed value (32 bytes) || commitment (48 bytes) || proof (48 bytes) = 144 bytes
+///                             calldata: pubdataCommitments.length - 1 - 32 bytes of pubdata
+///                                       and 32 bytes appended to serve as the blob commitment part for the aux output part of the batch commitment
+/// @dev For 2 blobs we will be sending 288 bytes of calldata instead of the full amount for pubdata.
+/// @dev When using calldata, we only need to send one blob commitment since the max number of bytes in calldata fits in a single blob and we can pull the
+///     linear hash from the system logs
+struct CommitBatchInfo {
+  uint64 batchNumber;
   uint64 timestamp;
   uint64 indexRepeatedStorageChanges;
   bytes32 newStateRoot;
   uint256 numberOfLayer1Txs;
   bytes32 priorityOperationsHash;
+  bytes32 bootloaderHeapInitialContentsHash;
+  bytes32 eventsQueueStateHash;
   bytes systemLogs;
-  bytes totalL2ToL1Pubdata;
+  bytes pubdataCommitments;
 }
 
 ```
 
-The main difference between the two `CommitBlockInfo` structs is that we have taken a few of the fields and merged them
-into a single bytes array called `totalL2ToL1Pubdata`. The contents of pubdata include:
-
-1. L2 to L1 Logs
-2. L2 to L1 Messages
-3. Published Bytecodes
-4. Compressed State Diffs
+The main difference between the two `CommitBatchInfo` and `CommitBlockInfo` structs is that we have taken a few of the
+fields and merged them into a single bytes array called `pubdataCommitments`. In the `calldata` mode, the pubdata is
+being passed using that field. In the `blobs` mode, that field is used to store the KZG commitments and proofs. More on
+EIP-4844 blobs [here](./pubdata-with-blobs.md). In the Validium mode, the field will either be empty or store the
+inclusion proof for the DA blob.
 
 The 2 main fields needed for state reconstruction are the bytecodes and the state diffs. The bytecodes follow the same
 structure and reasoning in the old system (as explained above). The state diffs will follow the compression illustrated
diff --git a/docs/guides/architecture.md b/docs/guides/architecture.md
index e87f4bca7e55..25676ad74aa7 100644
--- a/docs/guides/architecture.md
+++ b/docs/guides/architecture.md
@@ -1,7 +1,7 @@
-# zkSync v2 Project Architecture
+# ZKsync v2 Project Architecture
 
 This document will help you answer the question: _where can I find the logic for x?_ by giving a directory-tree style
-structure of the physical architecture of the zkSync Era project.
+structure of the physical architecture of the ZKsync Era project.
 
 ## High-Level Overview
 
@@ -10,15 +10,15 @@ The zksync-2-dev repository has the following main units:
 <ins>**Smart Contracts:**</ins> All the smart contracts in charge of the protocols on the L1 & L2. Some main contracts:
 
 - L1 & L2 bridge contracts.
-- The zkSync rollup contract on Ethereum.
+- The ZKsync rollup contract on Ethereum.
 - The L1 proof verifier contract.
 
-**<ins>Core App:**</ins> The execution layer. A node running the zkSync network in charge of the following components:
+**<ins>Core App:**</ins> The execution layer. A node running the ZKsync network in charge of the following components:
 
 - Monitoring the L1 smart contract for deposits or priority operations.
 - Maintaining a mempool that receives transactions.
 - Picking up transactions from the mempool, executing them in a VM, and changing the state accordingly.
-- Generating zkSync chain blocks.
+- Generating ZKsync chain blocks.
 - Preparing circuits for executed blocks to be proved.
 - Submitting blocks and proofs to the L1 smart contract.
 - Exposing the Ethereum-compatible web3 API.
@@ -36,27 +36,27 @@ This section provides a physical map of folders & files in this repository.
 - `/contracts`
 
   - `/ethereum`: Smart contracts deployed on the Ethereum L1.
-  - `/zksync`: Smart contracts deployed on the zkSync L2.
+  - `/zksync`: Smart contracts deployed on the ZKsync L2.
 
 - `/core`
 
-  - `/bin`: Executables for the microservices components comprising zkSync Core Node.
+  - `/bin`: Executables for the microservices components comprising ZKsync Core Node.
 
     - `/admin-tools`: CLI tools for admin operations (e.g. restarting prover jobs).
     - `/external_node`: A read replica that can sync from the main node.
 
   - `/lib`: All the library crates used as dependencies of the binary crates above.
 
-    - `/basic_types`: Crate with essential zkSync primitive types.
-    - `/config`: All the configured values used by the different zkSync apps.
+    - `/basic_types`: Crate with essential ZKsync primitive types.
+    - `/config`: All the configured values used by the different ZKsync apps.
     - `/contracts`: Contains definitions of commonly used smart contracts.
-    - `/crypto`: Cryptographical primitives used by the different zkSync crates.
+    - `/crypto`: Cryptographical primitives used by the different ZKsync crates.
     - `/dal`: Data availability layer
       - `/migrations`: All the db migrations applied to create the storage layer.
       - `/src`: Functionality to interact with the different db tables.
     - `/eth_client`: Module providing an interface to interact with an Ethereum node.
     - `/eth_signer`: Module to sign messages and txs.
-    - `/mempool`: Implementation of the zkSync transaction pool.
+    - `/mempool`: Implementation of the ZKsync transaction pool.
     - `/merkle_tree`: Implementation of a sparse Merkle tree.
     - `/mini_merkle_tree`: In-memory implementation of a sparse Merkle tree.
     - `/multivm`: A wrapper over several versions of VM that have been used by the main node.
@@ -65,47 +65,47 @@ This section provides a physical map of folders & files in this repository.
     - `/queued_job_processor`: An abstraction for async job processing
     - `/state`: A state keeper responsible for handling transaction execution and creating miniblocks and L1 batches.
     - `/storage`: An encapsulated database interface.
-    - `/test_account`: A representation of zkSync account.
-    - `/types`: zkSync network operations, transactions, and common types.
-    - `/utils`: Miscellaneous helpers for zkSync crates.
-    - `/vlog`: zkSync logging utility.
+    - `/test_account`: A representation of ZKsync account.
+    - `/types`: ZKsync network operations, transactions, and common types.
+    - `/utils`: Miscellaneous helpers for ZKsync crates.
+    - `/vlog`: ZKsync logging utility.
     - `/vm`: ULightweight out-of-circuit VM interface.
     - `/web3_decl`: Declaration of the Web3 API.
     - `zksync_core/src`
       - `/api_server` Externally facing APIs.
-        - `/web3`: zkSync implementation of the Web3 API.
+        - `/web3`: ZKsync implementation of the Web3 API.
         - `/tx_sender`: Helper module encapsulating the transaction processing logic.
-      - `/bin`: The executable main starting point for the zkSync server.
-      - `/consistency_checker`: zkSync watchdog.
-      - `/eth_sender`: Submits transactions to the zkSync smart contract.
+      - `/bin`: The executable main starting point for the ZKsync server.
+      - `/consistency_checker`: ZKsync watchdog.
+      - `/eth_sender`: Submits transactions to the ZKsync smart contract.
       - `/eth_watch`: Fetches data from the L1. for L2 censorship resistance.
       - `/fee_monitor`: Monitors the ratio of fees collected by executing txs over the costs of interacting with
         Ethereum.
       - `/fee_ticker`: Module to define the price components of L2 transactions.
       - `/gas_adjuster`: Module to determine the fees to pay in txs containing blocks submitted to the L1.
       - `/gas_tracker`: Module for predicting L1 gas cost for the Commit/PublishProof/Execute operations.
-      - `/metadata_calculator`: Module to maintain the zkSync state tree.
+      - `/metadata_calculator`: Module to maintain the ZKsync state tree.
       - `/state_keeper`: The sequencer. In charge of collecting the pending txs from the mempool, executing them in the
         VM, and sealing them in blocks.
       - `/witness_generator`: Takes the sealed blocks and generates a _Witness_, the input for the prover containing the
         circuits to be proved.
 
-  - `/tests`: Testing infrastructure for zkSync network.
+  - `/tests`: Testing infrastructure for ZKsync network.
     - `/cross_external_nodes_checker`: A tool for checking external nodes consistency against the main node.
-    - `/loadnext`: An app for load testing the zkSync server.
+    - `/loadnext`: An app for load testing the ZKsync server.
     - `/ts-integration`: Integration tests set implemented in TypeScript.
 
-- `/prover`: zkSync prover orchestrator application.
+- `/prover`: ZKsync prover orchestrator application.
 
 - `/docker`: Project docker files.
 
-- `/bin` & `/infrastructure`: Infrastructure scripts that help to work with zkSync applications.
+- `/bin` & `/infrastructure`: Infrastructure scripts that help to work with ZKsync applications.
 
 - `/etc`: Configuration files.
 
-  - `/env`:`.env` files that contain environment variables for different configurations of zkSync Server / Prover.
+  - `/env`:`.env` files that contain environment variables for different configurations of ZKsync Server / Prover.
 
 - `/keys`: Verification keys for `circuit` module.
 
-- `/sdk`: Implementation of client libraries for the zkSync network in different programming languages.
-  - `/zksync-rs`: Rust client library for zkSync.
+- `/sdk`: Implementation of client libraries for the ZKsync network in different programming languages.
+  - `/zksync-rs`: Rust client library for ZKsync.
diff --git a/docs/guides/development.md b/docs/guides/development.md
index 16d497f876ed..c859017848b5 100644
--- a/docs/guides/development.md
+++ b/docs/guides/development.md
@@ -1,6 +1,6 @@
 # Development guide
 
-This document covers development-related actions in zkSync.
+This document covers development-related actions in ZKsync.
 
 ## Initializing the project
 
@@ -89,56 +89,6 @@ Currently the following criteria are checked:
 - Other code should always be formatted via `zk fmt`.
 - Dummy Prover should not be staged for commit (see below for the explanation).
 
-## Spell Checking
-
-In our development workflow, we utilize a spell checking process to ensure the quality and accuracy of our documentation
-and code comments. This is achieved using two primary tools: `cspell` and `cargo-spellcheck`. This section outlines how
-to use these tools and configure them for your needs.
-
-### Using the Spellcheck Command
-
-The spell check command `zk spellcheck` is designed to check for spelling errors in our documentation and code. To run
-the spell check, use the following command:
-
-```
-zk spellcheck
-Options:
---pattern <pattern>: Specifies the glob pattern for files to check. Default is docs/**/*.
---use-cargo: Utilize cargo spellcheck.
---use-cspell: Utilize cspell.
-```
-
-### General Rules
-
-**Code References in Comments**: When referring to code elements within development comments, they should be wrapped in
-backticks. For example, reference a variable as `block_number`.
-
-**Code Blocks in Comments**: For larger blocks of pseudocode or commented-out code, use code blocks formatted as
-follows:
-
-````
-// ```
-// let overhead_for_pubdata = {
-//     let numerator: U256 = overhead_for_block_gas * total_gas_limit
-//         + gas_per_pubdata_byte_limit * U256::from(MAX_PUBDATA_PER_BLOCK);
-//     let denominator =
-//         gas_per_pubdata_byte_limit * U256::from(MAX_PUBDATA_PER_BLOCK) + overhead_for_block_gas;
-// ```
-````
-
-**Language Settings**: We use the Hunspell language setting of `en_US`.
-
-**CSpell Usage**: For spell checking within the `docs/` directory, we use `cspell`. The configuration for this tool is
-found in `cspell.json`. It's tailored to check our documentation for spelling errors.
-
-**Cargo-Spellcheck for Rust and Dev Comments**: For Rust code and development comments, `cargo-spellcheck` is used. Its
-configuration is maintained in `era.cfg`.
-
-### Adding Words to the Dictionary
-
-To add a new word to the spell checker dictionary, navigate to `/spellcheck/era.dic` and include the word. Ensure that
-the word is relevant and necessary to be included in the dictionary to maintain the integrity of our documentation.
-
 ## Using Dummy Prover
 
 By default, the chosen prover is a "dummy" one, meaning that it doesn't actually compute proofs but rather uses mocks to
diff --git a/docs/guides/external-node/00_quick_start.md b/docs/guides/external-node/00_quick_start.md
index 5fd6bae2b9ac..3902fdc15560 100644
--- a/docs/guides/external-node/00_quick_start.md
+++ b/docs/guides/external-node/00_quick_start.md
@@ -4,7 +4,7 @@
 
 Install `docker compose` and `Docker`
 
-## Running ZkSync external node locally
+## Running ZKsync node locally
 
 To start a mainnet instance, run:
 
@@ -37,7 +37,7 @@ docker compose --file testnet-external-node-docker-compose.yml down --volumes
 You can see the status of the node (after recovery) in
 [local grafana dashboard](http://localhost:3000/d/0/external-node).
 
-Those commands start external node locally inside docker.
+Those commands start ZKsync node locally inside docker.
 
 The HTTP JSON-RPC API can be accessed on port `3060` and WebSocket API can be accessed on port `3061`.
 
@@ -52,17 +52,29 @@ The HTTP JSON-RPC API can be accessed on port `3060` and WebSocket API can be ac
 
 ### System Requirements
 
-This configuration is approximate and should be considered as **minimal** requirements.
+> [!NOTE]
+>
+> This configuration is only for nodes that use snapshots recovery (the default for docker-compose setup), for
+> requirements for nodes running from DB dump see
+> [03_running.md](https://github.com/matter-labs/zksync-era/blob/main/docs/guides/external-node/03_running.md). DB dumps
+> are a way to start ZKsync node with full historical transactions history
+
+> [!NOTE]
+>
+> Those are requirements for a freshly started node and the the state grows about 1TB per month for mainnet
+
+> [!NOTE]
+>
+> To stop state growth, you can enable state pruning by uncommenting `EN_PRUNING_ENABLED: true` in docker compose file,
+> you can read more about pruning in
+> [08_pruning.md](https://github.com/matter-labs/zksync-era/blob/main/docs/guides/external-node/08_pruning.md)
 
-- 32-core CPU
-- 64GB RAM
-- SSD storage (NVME recommended):
-  - Sepolia Testnet - 10GB EN + 50GB PostgreSQL (at the time of writing, will grow over time, so should be constantly
-    monitored)
-  - Mainnet - 3TB EN + 7TB PostgreSQL (at the time of writing, will grow over time, so should be constantly monitored)
+- 32 GB of RAM and a relatively modern CPU
+- 30 GB of storage for testnet nodes
+- 300 GB of storage for mainnet nodes
 - 100 Mbps connection (1 Gbps+ recommended)
 
 ## Advanced setup
 
-If you need monitoring, backups, to recover from DB dump/snapshot or a more customized PostgreSQL settings, etc, please
-see: [ansible-en-role repo](https://github.com/matter-labs/ansible-en-role)
+If you need monitoring, backups, to recover from DB dump or a more customized PostgreSQL settings, etc, please see:
+[ansible-en-role repo](https://github.com/matter-labs/ansible-en-role)
diff --git a/docs/guides/external-node/01_intro.md b/docs/guides/external-node/01_intro.md
index bd443a58f9bd..c9d01d9a87f9 100644
--- a/docs/guides/external-node/01_intro.md
+++ b/docs/guides/external-node/01_intro.md
@@ -1,19 +1,19 @@
-# External Node Documentation
+# ZkSync Node Documentation
 
-This documentation explains the basics of the zkSync Era External Node.
+This documentation explains the basics of the ZKsync Node.
 
 ## Disclaimers
 
-- The external node is in the alpha phase, and should be used with caution.
-- The EN is a read-only replica of the main node. We are currently working on decentralizing our infrastructure by
-  creating a consensus node. The EN is not going to be the consensus node.
+- The ZKsync node is in the alpha phase, and should be used with caution.
+- The ZKsync node is a read-only replica of the main node. We are currently working on decentralizing our infrastructure
+  by creating a consensus node. The ZKsync node is not going to be the consensus node.
 
-## What is the external node
+## What is the ZKsync node
 
-The external node (herein EN) is a read-replica of the main (centralized) node that can be run by external parties. It
-functions by fetching data from the zkSync API and re-applying transactions locally, starting from the genesis block.
-The EN shares most of its codebase with the main node. Consequently, when it re-applies transactions, it does so exactly
-as the main node did in the past.
+The ZKsync node is a read-replica of the main (centralized) node that can be run by external parties. It functions by
+fetching data from the ZKsync API and re-applying transactions locally, starting from the genesis block. The ZKsync node
+shares most of its codebase with the main node. Consequently, when it re-applies transactions, it does so exactly as the
+main node did in the past.
 
 **It has two modes of initialization:**
 
@@ -23,18 +23,18 @@ as the main node did in the past.
 
 ## High-level overview
 
-At a high level, the EN can be seen as an application that has the following modules:
+At a high level, the ZKsync node can be seen as an application that has the following modules:
 
 - API server that provides the publicly available Web3 interface.
 - Synchronization layer that interacts with the main node and retrieves transactions and blocks to re-execute.
 - Sequencer component that actually executes and persists transactions received from the synchronization layer.
-- Several checker modules that ensure the consistency of the EN state.
+- Several checker modules that ensure the consistency of the ZKsync node state.
 
 With the EN, you are able to:
 
-- Locally recreate and verify the zkSync Era mainnet/testnet state.
+- Locally recreate and verify the ZKsync Era mainnet/testnet state.
 - Interact with the recreated state in a trustless way (in a sense that the validity is locally verified, and you should
-  not rely on a third-party API zkSync Era provides).
+  not rely on a third-party API ZKsync Era provides).
 - Use the Web3 API without having to query the main node.
 - Send L2 transactions (that will be proxied to the main node).
 
@@ -48,8 +48,8 @@ A more detailed overview of the EN's components is provided in the [components](
 
 ## API overview
 
-API exposed by the EN strives to be Web3-compliant. If some method is exposed but behaves differently compared to
-Ethereum, it should be considered a bug. Please [report][contact_us] such cases.
+API exposed by the ZKsync node strives to be Web3-compliant. If some method is exposed but behaves differently compared
+to Ethereum, it should be considered a bug. Please [report][contact_us] such cases.
 
 [contact_us]: https://zksync.io/contact
 
@@ -59,42 +59,42 @@ Data getters in this namespace operate in the L2 space: require/return L2 block
 
 Available methods:
 
-| Method                                    | Notes                                                                     |
-| ----------------------------------------- | ------------------------------------------------------------------------- |
-| `eth_blockNumber`                         |                                                                           |
-| `eth_chainId`                             |                                                                           |
-| `eth_call`                                |                                                                           |
-| `eth_estimateGas`                         |                                                                           |
-| `eth_gasPrice`                            |                                                                           |
-| `eth_newFilter`                           | Maximum amount of installed filters is configurable                       |
-| `eth_newBlockFilter`                      | Same as above                                                             |
-| `eth_newPendingTransactionsFilter`        | Same as above                                                             |
-| `eth_uninstallFilter`                     |                                                                           |
-| `eth_getLogs`                             | Maximum amount of returned entities can be configured                     |
-| `eth_getFilterLogs`                       | Same as above                                                             |
-| `eth_getFilterChanges`                    | Same as above                                                             |
-| `eth_getBalance`                          |                                                                           |
-| `eth_getBlockByNumber`                    |                                                                           |
-| `eth_getBlockByHash`                      |                                                                           |
-| `eth_getBlockTransactionCountByNumber`    |                                                                           |
-| `eth_getBlockTransactionCountByHash`      |                                                                           |
-| `eth_getCode`                             |                                                                           |
-| `eth_getStorageAt`                        |                                                                           |
-| `eth_getTransactionCount`                 |                                                                           |
-| `eth_getTransactionByHash`                |                                                                           |
-| `eth_getTransactionByBlockHashAndIndex`   |                                                                           |
-| `eth_getTransactionByBlockNumberAndIndex` |                                                                           |
-| `eth_getTransactionReceipt`               |                                                                           |
-| `eth_protocolVersion`                     |                                                                           |
-| `eth_sendRawTransaction`                  |                                                                           |
-| `eth_syncing`                             | EN is considered synced if it's less than 11 blocks behind the main node. |
-| `eth_coinbase`                            | Always returns a zero address                                             |
-| `eth_accounts`                            | Always returns an empty list                                              |
-| `eth_getCompilers`                        | Always returns an empty list                                              |
-| `eth_hashrate`                            | Always returns zero                                                       |
-| `eth_getUncleCountByBlockHash`            | Always returns zero                                                       |
-| `eth_getUncleCountByBlockNumber`          | Always returns zero                                                       |
-| `eth_mining`                              | Always returns false                                                      |
+| Method                                    | Notes                                                                              |
+| ----------------------------------------- | ---------------------------------------------------------------------------------- |
+| `eth_blockNumber`                         |                                                                                    |
+| `eth_chainId`                             |                                                                                    |
+| `eth_call`                                |                                                                                    |
+| `eth_estimateGas`                         |                                                                                    |
+| `eth_gasPrice`                            |                                                                                    |
+| `eth_newFilter`                           | Maximum amount of installed filters is configurable                                |
+| `eth_newBlockFilter`                      | Same as above                                                                      |
+| `eth_newPendingTransactionsFilter`        | Same as above                                                                      |
+| `eth_uninstallFilter`                     |                                                                                    |
+| `eth_getLogs`                             | Maximum amount of returned entities can be configured                              |
+| `eth_getFilterLogs`                       | Same as above                                                                      |
+| `eth_getFilterChanges`                    | Same as above                                                                      |
+| `eth_getBalance`                          |                                                                                    |
+| `eth_getBlockByNumber`                    |                                                                                    |
+| `eth_getBlockByHash`                      |                                                                                    |
+| `eth_getBlockTransactionCountByNumber`    |                                                                                    |
+| `eth_getBlockTransactionCountByHash`      |                                                                                    |
+| `eth_getCode`                             |                                                                                    |
+| `eth_getStorageAt`                        |                                                                                    |
+| `eth_getTransactionCount`                 |                                                                                    |
+| `eth_getTransactionByHash`                |                                                                                    |
+| `eth_getTransactionByBlockHashAndIndex`   |                                                                                    |
+| `eth_getTransactionByBlockNumberAndIndex` |                                                                                    |
+| `eth_getTransactionReceipt`               |                                                                                    |
+| `eth_protocolVersion`                     |                                                                                    |
+| `eth_sendRawTransaction`                  |                                                                                    |
+| `eth_syncing`                             | ZKsync node is considered synced if it's less than 11 blocks behind the main node. |
+| `eth_coinbase`                            | Always returns a zero address                                                      |
+| `eth_accounts`                            | Always returns an empty list                                                       |
+| `eth_getCompilers`                        | Always returns an empty list                                                       |
+| `eth_hashrate`                            | Always returns zero                                                                |
+| `eth_getUncleCountByBlockHash`            | Always returns zero                                                                |
+| `eth_getUncleCountByBlockNumber`          | Always returns zero                                                                |
+| `eth_mining`                              | Always returns false                                                               |
 
 ### PubSub
 
@@ -150,9 +150,9 @@ methods come without any kind of stability guarantees and can be changed or remo
 
 Always refer to the documentation linked above to see the list of stabilized methods in this namespace.
 
-[zks_docs]: https://era.zksync.io/docs/api/api.html#zksync-specific-json-rpc-methods
+[zks_docs]: https://docs.zksync.io/build/api-reference/zks-rpc
 
 ### `en` namespace
 
-This namespace contains methods that external nodes call on the main node while syncing. If this namespace is enabled,
+This namespace contains methods that ZKsync nodes call on the main node while syncing. If this namespace is enabled,
 other ENs can sync from this node.
diff --git a/docs/guides/external-node/02_configuration.md b/docs/guides/external-node/02_configuration.md
index 7771c5476f97..5b8b7512eb3e 100644
--- a/docs/guides/external-node/02_configuration.md
+++ b/docs/guides/external-node/02_configuration.md
@@ -1,7 +1,7 @@
-# External Node Configuration
+# ZkSync Node Configuration
 
-This document outlines various configuration options for the EN. Currently, the EN requires the definition of numerous
-environment variables. To streamline this process, we provide prepared configs for the zkSync Era - for both
+This document outlines various configuration options for the EN. Currently, the ZKsync node requires the definition of
+numerous environment variables. To streamline this process, we provide prepared configs for the ZKsync Era - for both
 [mainnet](prepared_configs/mainnet-config.env) and [testnet](prepared_configs/testnet-sepolia-config.env). You can use
 these files as a starting point and modify only the necessary sections.
 
@@ -10,7 +10,7 @@ default settings.**
 
 ## Database
 
-The EN uses two databases: PostgreSQL and RocksDB.
+The ZKsync node uses two databases: PostgreSQL and RocksDB.
 
 PostgreSQL serves as the main source of truth in the EN, so all the API requests fetch the state from there. The
 PostgreSQL connection is configured by the `DATABASE_URL`. Additionally, the `DATABASE_POOL_SIZE` variable defines the
@@ -22,12 +22,12 @@ recommended to use an NVME SSD for RocksDB. RocksDB requires two variables to be
 
 ## L1 Web3 client
 
-EN requires a connection to an Ethereum node. The corresponding env variable is `EN_ETH_CLIENT_URL`. Make sure to set
-the URL corresponding to the correct L1 network (L1 mainnet for L2 mainnet and L1 sepolia for L2 testnet).
+ZKsync node requires a connection to an Ethereum node. The corresponding env variable is `EN_ETH_CLIENT_URL`. Make sure
+to set the URL corresponding to the correct L1 network (L1 mainnet for L2 mainnet and L1 sepolia for L2 testnet).
 
-Note: Currently, the EN makes 2 requests to the L1 per L1 batch, so the Web3 client usage for a synced node should not
-be high. However, during the synchronization phase the new batches would be persisted on the EN quickly, so make sure
-that the L1 client won't exceed any limits (e.g. in case you use Infura).
+Note: Currently, the ZKsync node makes 2 requests to the L1 per L1 batch, so the Web3 client usage for a synced node
+should not be high. However, during the synchronization phase the new batches would be persisted on the ZKsync node
+quickly, so make sure that the L1 client won't exceed any limits (e.g. in case you use Infura).
 
 ## Exposed ports
 
@@ -50,22 +50,22 @@ the metrics, leave this port not configured, and the metrics won't be collected.
 
 There are variables that allow you to fine-tune the limits of the RPC servers, such as limits on the number of returned
 entries or the limit for the accepted transaction size. Provided files contain sane defaults that are recommended for
-use, but these can be edited, e.g. to make the EN more/less restrictive.
+use, but these can be edited, e.g. to make the ZKsync node more/less restrictive.
 
 ## JSON-RPC API namespaces
 
 There are 7 total supported API namespaces: `eth`, `net`, `web3`, `debug` - standard ones; `zks` - rollup-specific one;
-`pubsub` - a.k.a. `eth_subscribe`; `en` - used by external nodes while syncing. You can configure what namespaces you
-want to enable using `EN_API_NAMESPACES` and specifying namespace names in a comma-separated list. By default, all but
-the `debug` namespace are enabled.
+`pubsub` - a.k.a. `eth_subscribe`; `en` - used by ZKsync nodes while syncing. You can configure what namespaces you want
+to enable using `EN_API_NAMESPACES` and specifying namespace names in a comma-separated list. By default, all but the
+`debug` namespace are enabled.
 
 ## Logging and observability
 
 `MISC_LOG_FORMAT` defines the format in which logs are shown: `plain` corresponds to the human-readable format, while
 the other option is `json` (recommended for deployments).
 
-`RUST_LOG` variable allows you to set up the logs granularity (e.g. make the EN emit fewer logs). You can read about the
-format [here](https://docs.rs/env_logger/0.10.0/env_logger/#enabling-logging).
+`RUST_LOG` variable allows you to set up the logs granularity (e.g. make the ZKsync node emit fewer logs). You can read
+about the format [here](https://docs.rs/env_logger/0.10.0/env_logger/#enabling-logging).
 
 `MISC_SENTRY_URL` and `MISC_OTLP_URL` variables can be configured to set up Sentry and OpenTelemetry exporters.
 
diff --git a/docs/guides/external-node/03_running.md b/docs/guides/external-node/03_running.md
index 93bffa33a56c..5789c34cdaa2 100644
--- a/docs/guides/external-node/03_running.md
+++ b/docs/guides/external-node/03_running.md
@@ -1,13 +1,24 @@
-# Running the External Node
+# Running the ZkSync Node
 
 > [!NOTE]
 >
-> If you want to just run external with recommended default setting, please see directory docker-compose-examples
+> If you want to just run node with recommended default setting, please see directory docker-compose-examples
 
 This section assumes that you have prepared a configuration file as described on the
 [previous page](./02_configuration.md).
 
-[**Minimal system requirements**](https://github.com/matter-labs/zksync-era/blob/main/docs/guides/external-node/00_quick_start.md#system-requirements)
+## System Requirements for nodes started from DB dumps
+
+This configuration is approximate and should be considered as **minimal** requirements.
+
+- 32-core CPU
+- 64GB RAM
+- SSD storage (NVME recommended):
+  - Sepolia Testnet - 10GB ZKsync node + 50GB PostgreSQL (at the time of writing, will grow over time, so should be
+    constantly monitored)
+  - Mainnet - 3TB ZKsync node + 8TB PostgreSQL (at the time of writing, will grow over time, so should be constantly
+    monitored)
+- 100 Mbps connection (1 Gbps+ recommended)
 
 ## A note about PostgreSQL storage
 
@@ -25,23 +36,23 @@ it in Docker. There are many of guides on that,
 [here's one example](https://www.docker.com/blog/how-to-use-the-postgres-docker-official-image/).
 
 Note however that if you run PostgresSQL as a stand-alone Docker image (e.g. not in Docker-compose with a network shared
-between EN and Postgres), EN won't be able to access Postgres via `localhost` or `127.0.0.1` URLs. To make it work,
-you'll have to either run it with a `--network host` (on Linux) or use `host.docker.internal` instead of `localhost` in
-the EN configuration ([official docs][host_docker_internal]).
+between ZKsync node and Postgres), ZKsync node won't be able to access Postgres via `localhost` or `127.0.0.1` URLs. To
+make it work, you'll have to either run it with a `--network host` (on Linux) or use `host.docker.internal` instead of
+`localhost` in the ZKsync node configuration ([official docs][host_docker_internal]).
 
 Besides running Postgres, you are expected to have a DB dump from a corresponding env. You can restore it using
 `pg_restore -O -C <DUMP_PATH> --dbname=<DB_URL>`.
 
 You can also refer to
-[External Node configuration management blueprint](https://github.com/matter-labs/zksync-era/blob/main/docs/guides/external-node/00_quick_start.md#advanced-setup)
+[ZKsync Node configuration management blueprint](https://github.com/matter-labs/zksync-era/blob/main/docs/guides/external-node/00_quick_start.md#advanced-setup)
 for advanced DB instance configurations.
 
 [host_docker_internal](https://docs.docker.com/desktop/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host)
 
 ## Running
 
-Assuming you have the EN Docker image, an env file with the prepared configuration, and you have restored your DB with
-the pg dump, that is all you need.
+Assuming you have the ZKsync node Docker image, an env file with the prepared configuration, and you have restored your
+DB with the pg dump, that is all you need.
 
 Sample running command:
 
@@ -58,9 +69,9 @@ in RocksDB (mainly the Merkle tree) is absent. Before the node can make any prog
 RocksDB and verify consistency. The exact time required for that depends on the hardware configuration, but it is
 reasonable to expect the state rebuild on the mainnet to take more than 20 hours.
 
-## Redeploying the EN with a new PG dump
+## Redeploying the ZKsync node with a new PG dump
 
-If you've been running the EN for some time and are going to redeploy it using a new PG dump, you should
+If you've been running the ZKsync node for some time and are going to redeploy it using a new PG dump, you should
 
 - Stop the EN
 - Remove SK cache (corresponding to `EN_STATE_CACHE_PATH`)
diff --git a/docs/guides/external-node/04_observability.md b/docs/guides/external-node/04_observability.md
index c3efc33a30bd..538c1130b62e 100644
--- a/docs/guides/external-node/04_observability.md
+++ b/docs/guides/external-node/04_observability.md
@@ -1,6 +1,6 @@
-# EN Observability
+# ZKsync node Observability
 
-The EN provides several options for setting up observability. Configuring logs and sentry is described in the
+The ZKsync node provides several options for setting up observability. Configuring logs and sentry is described in the
 [configuration](./02_configuration.md) section, so this section focuses on the exposed metrics.
 
 This section is written with the assumption that you're familiar with
@@ -16,8 +16,8 @@ By default, latency histograms are distributed in the following buckets (in seco
 
 ## Metrics
 
-EN exposes a lot of metrics, a significant amount of which aren't interesting outside the development flow. This
-section's purpose is to highlight metrics that may be worth observing in the external setup.
+ZKsync node exposes a lot of metrics, a significant amount of which aren't interesting outside the development flow.
+This section's purpose is to highlight metrics that may be worth observing in the external setup.
 
 If you are not planning to scrape Prometheus metrics, please unset `EN_PROMETHEUS_PORT` environment variable to prevent
 memory leaking.
@@ -25,7 +25,7 @@ memory leaking.
 | Metric name                                    | Type      | Labels                                | Description                                                        |
 | ---------------------------------------------- | --------- | ------------------------------------- | ------------------------------------------------------------------ |
 | `external_node_synced`                         | Gauge     | -                                     | 1 if synced, 0 otherwise. Matches `eth_call` behavior              |
-| `external_node_sync_lag`                       | Gauge     | -                                     | How many blocks behind the main node the EN is                     |
+| `external_node_sync_lag`                       | Gauge     | -                                     | How many blocks behind the main node the ZKsync node is            |
 | `external_node_fetcher_requests`               | Histogram | `stage`, `actor`                      | Duration of requests performed by the different fetcher components |
 | `external_node_fetcher_cache_requests`         | Histogram | -                                     | Duration of requests performed by the fetcher cache layer          |
 | `external_node_fetcher_miniblock`              | Gauge     | `status`                              | The number of the last L2 block update fetched from the main node  |
@@ -40,12 +40,12 @@ memory leaking.
 
 ## Interpretation
 
-After applying a dump, the EN has to rebuild the Merkle tree to verify the correctness of the state in PostgreSQL.
-During this stage, `server_block_number { stage='tree_lightweight_mode' }` is increasing from 0 to
-`server_block_number { stage='sealed' }`, while the latter does not increase (EN needs the tree to be up-to-date to
-progress).
+After applying a dump, the ZKsync node has to rebuild the Merkle tree to verify the correctness of the state in
+PostgreSQL. During this stage, `server_block_number { stage='tree_lightweight_mode' }` is increasing from 0 to
+`server_block_number { stage='sealed' }`, while the latter does not increase (ZKsync node needs the tree to be
+up-to-date to progress).
 
-After that, the EN has to sync with the main node. `server_block_number { stage='sealed' }` is increasing, and
+After that, the ZKsync node has to sync with the main node. `server_block_number { stage='sealed' }` is increasing, and
 `external_node_sync_lag` is decreasing.
 
 Once the node is synchronized, it is indicated by the `external_node_synced`.
diff --git a/docs/guides/external-node/05_troubleshooting.md b/docs/guides/external-node/05_troubleshooting.md
index 58b540542893..43d6ae26b135 100644
--- a/docs/guides/external-node/05_troubleshooting.md
+++ b/docs/guides/external-node/05_troubleshooting.md
@@ -1,8 +1,8 @@
-# EN Troubleshooting
+# ZKsync node Troubleshooting
 
-The EN tries to follow the fail-fast principle: if an anomaly is discovered, instead of attempting state recovery, in
-most cases it will restart. Most of the time it will manifest as crashes, and if it happens once, it shouldn't be
-treated as a problem.
+The ZKsync node tries to follow the fail-fast principle: if an anomaly is discovered, instead of attempting state
+recovery, in most cases it will restart. Most of the time it will manifest as crashes, and if it happens once, it
+shouldn't be treated as a problem.
 
 However, if the node enters the crash loop or otherwise behaves unexpectedly, it may indicate either a bug in the
 implementation or a problem with configuration. This section tries to cover common problems.
@@ -24,8 +24,8 @@ Other kinds of panic aren't normally expected. While in most cases, the state wi
 
 ## Genesis Issues
 
-The EN is supposed to start with an applied DB dump. If you see any genesis-related errors, it probably means the EN was
-started without an applied dump.
+The ZKsync node is supposed to start with an applied DB dump. If you see any genesis-related errors, it probably means
+the ZKsync node was started without an applied dump.
 
 [contact_us]: https://zksync.io/contact
 
@@ -43,7 +43,7 @@ you don't consider actionable, you may disable logs for a component by tweaking
 | WARN  | "Following transport error occurred"                  | There was a problem with fetching data from the main node.                                               |
 | WARN  | "Unable to get the gas price"                         | There was a problem with fetching data from the main node.                                               |
 | WARN  | "Consistency checker error"                           | There are problems querying L1, check the Web3 URL you specified in the config.                          |
-| WARN  | "Reorg detected"                                      | Reorg was detected on the main node, the EN will rollback and restart                                    |
+| WARN  | "Reorg detected"                                      | Reorg was detected on the main node, the ZKsync node will rollback and restart                           |
 
 Same as with panics, normally it's only a problem if a WARN+ level log appears many times in a row.
 
diff --git a/docs/guides/external-node/06_components.md b/docs/guides/external-node/06_components.md
index 0fad9f3837fa..733400058a82 100644
--- a/docs/guides/external-node/06_components.md
+++ b/docs/guides/external-node/06_components.md
@@ -1,59 +1,60 @@
-# EN components
+# ZKsync node components
 
 This section contains an overview of the EN's main components.
 
 ## API
 
-The EN can serve both the HTTP and the WS Web3 API, as well as PubSub. Whenever possible, it provides data based on the
-local state, with a few exceptions:
+The ZKsync node can serve both the HTTP and the WS Web3 API, as well as PubSub. Whenever possible, it provides data
+based on the local state, with a few exceptions:
 
 - Submitting transactions: Since it is a read replica, submitted transactions are proxied to the main node, and the
   response is returned from the main node.
-- Querying transactions: The EN is not aware of the main node's mempool, and it does not sync rejected transactions.
-  Therefore, if a local lookup for a transaction or its receipt fails, the EN will attempt the same query on the main
-  node.
+- Querying transactions: The ZKsync node is not aware of the main node's mempool, and it does not sync rejected
+  transactions. Therefore, if a local lookup for a transaction or its receipt fails, the ZKsync node will attempt the
+  same query on the main node.
 
 Apart from these cases, the API does not depend on the main node. Even if the main node is temporarily unavailable, the
-EN can continue to serve the state it has locally.
+ZKsync node can continue to serve the state it has locally.
 
 ## Fetcher
 
-The Fetcher component is responsible for maintaining synchronization between the EN and the main node. Its primary task
-is to fetch new blocks in order to update the local chain state. However, its responsibilities extend beyond that. For
-instance, the Fetcher is also responsible for keeping track of L1 batch statuses. This involves monitoring whether
-locally applied batches have been committed, proven, or executed on L1.
+The Fetcher component is responsible for maintaining synchronization between the ZKsync node and the main node. Its
+primary task is to fetch new blocks in order to update the local chain state. However, its responsibilities extend
+beyond that. For instance, the Fetcher is also responsible for keeping track of L1 batch statuses. This involves
+monitoring whether locally applied batches have been committed, proven, or executed on L1.
 
-It is worth noting that in addition to fetching the _state_, the EN also retrieves the L1 gas price from the main node
-for the purpose of estimating fees for L2 transactions (since this also happens based on the local state). This
-information is necessary to ensure that gas estimations are performed in the exact same manner as the main node, thereby
-reducing the chances of a transaction not being included in a block.
+It is worth noting that in addition to fetching the _state_, the ZKsync node also retrieves the L1 gas price from the
+main node for the purpose of estimating fees for L2 transactions (since this also happens based on the local state).
+This information is necessary to ensure that gas estimations are performed in the exact same manner as the main node,
+thereby reducing the chances of a transaction not being included in a block.
 
 ## State Keeper / VM
 
 The State Keeper component serves as the "sequencer" part of the node. It shares most of its functionality with the main
 node, with one key distinction. The main node retrieves transactions from the mempool and has the authority to decide
-when a specific L2 block or L1 batch should be sealed. On the other hand, the EN retrieves transactions from the queue
-populated by the Fetcher and seals the corresponding blocks/batches based on the data obtained from the Fetcher queue.
+when a specific L2 block or L1 batch should be sealed. On the other hand, the ZKsync node retrieves transactions from
+the queue populated by the Fetcher and seals the corresponding blocks/batches based on the data obtained from the
+Fetcher queue.
 
-The actual execution of batches takes place within the VM, which is identical in both the Main and External nodes.
+The actual execution of batches takes place within the VM, which is identical in both the Main and ZKsync nodes.
 
 ## Reorg Detector
 
-In zkSync Era, it is theoretically possible for L1 batches to be reverted before the corresponding "execute" operation
+In ZKsync Era, it is theoretically possible for L1 batches to be reverted before the corresponding "execute" operation
 is applied on L1, that is before the block is [final][finality]. Such situations are highly uncommon and typically occur
 due to significant issues: e.g. a bug in the sequencer implementation preventing L1 batch commitment. Prior to batch
-finality, the zkSync operator can perform a rollback, reverting one or more batches and restoring the blockchain state
+finality, the ZKsync operator can perform a rollback, reverting one or more batches and restoring the blockchain state
 to a previous point. Finalized batches cannot be reverted at all.
 
-However, even though such situations are rare, the EN must handle them correctly.
+However, even though such situations are rare, the ZKsync node must handle them correctly.
 
-To address this, the EN incorporates a Reorg Detector component. This module keeps track of all L1 batches that have not
-yet been finalized. It compares the locally obtained state root hashes with those provided by the main node's API. If
-the root hashes for the latest available L1 batch do not match, the Reorg Detector searches for the specific L1 batch
-responsible for the divergence. Subsequently, it rolls back the local state and restarts the node. Upon restart, the EN
-resumes normal operation.
+To address this, the ZKsync node incorporates a Reorg Detector component. This module keeps track of all L1 batches that
+have not yet been finalized. It compares the locally obtained state root hashes with those provided by the main node's
+API. If the root hashes for the latest available L1 batch do not match, the Reorg Detector searches for the specific L1
+batch responsible for the divergence. Subsequently, it rolls back the local state and restarts the node. Upon restart,
+the EN resumes normal operation.
 
-[finality]: https://era.zksync.io/docs/dev/developer-guides/finality.html
+[finality]: https://docs.zksync.io/zk-stack/concepts/finality
 
 ## Consistency Checker
 
@@ -66,12 +67,13 @@ When the Consistency Checker detects that a particular batch has been sent to L1
 known as the "block commitment" for the L1 transaction. The block commitment contains crucial data such as the state
 root and batch number, and is the same commitment that is used for generating a proof for the batch. The Consistency
 Checker then compares the locally obtained commitment with the actual commitment sent to L1. If the data does not match,
-it indicates a potential bug in either the main node or external node implementation or that the main node API has
-provided incorrect data. In either case, the state of the EN cannot be trusted, and the EN enters a crash loop until the
-issue is resolved.
+it indicates a potential bug in either the main node or ZKsync node implementation or that the main node API has
+provided incorrect data. In either case, the state of the ZKsync node cannot be trusted, and the ZKsync node enters a
+crash loop until the issue is resolved.
 
 ## Health check server
 
-The EN also exposes an additional server that returns HTTP 200 response when the EN is operating normally, and HTTP 503
-response when some of the health checks don't pass (e.g. when the EN is not fully initialized yet). This server can be
-used, for example, to implement the readiness probe in an orchestration solution you use.
+The ZKsync node also exposes an additional server that returns HTTP 200 response when the ZKsync node is operating
+normally, and HTTP 503 response when some of the health checks don't pass (e.g. when the ZKsync node is not fully
+initialized yet). This server can be used, for example, to implement the readiness probe in an orchestration solution
+you use.
diff --git a/docs/guides/external-node/07_snapshots_recovery.md b/docs/guides/external-node/07_snapshots_recovery.md
new file mode 100644
index 000000000000..99de05ff2c11
--- /dev/null
+++ b/docs/guides/external-node/07_snapshots_recovery.md
@@ -0,0 +1,97 @@
+# Snapshots Recovery
+
+Instead of initializing a node using a Postgres dump, it's possible to configure a node to recover from a protocol-level
+snapshot. This process is much faster and requires much less storage. Postgres database of a mainnet node recovered from
+a snapshot is only about 300GB. Note that without [pruning](08_pruning.md) enabled, the node state will continuously
+grow at a rate about 15GB per day.
+
+## How it works
+
+A snapshot is effectively a point-in-time snapshot of the VM state at the end of a certain L1 batch. Snapshots are
+created for the latest L1 batches periodically (roughly twice a day) and are stored in a public GCS bucket.
+
+Recovery from a snapshot consists of several parts.
+
+- **Postgres** recovery is the initial stage. The node API is not functioning during this stage. The stage is expected
+  to take about 1 hour on the mainnet.
+- **Merkle tree** recovery starts once Postgres is fully recovered. Merkle tree recovery can take about 3 hours on the
+  mainnet. Ordinarily, Merkle tree recovery is a blocker for node synchronization; i.e., the node will not process
+  blocks newer than the snapshot block until the Merkle tree is recovered.
+- Recovering RocksDB-based **VM state cache** is concurrent with Merkle tree recovery and also depends on Postgres
+  recovery. It takes about 1 hour on the mainnet. Unlike Merkle tree recovery, VM state cache is not necessary for node
+  operation (the node will get the state from Postgres is if it is absent), although it considerably speeds up VM
+  execution.
+
+After Postgres recovery is completed, the node becomes operational, providing Web3 API etc. It still needs some time to
+catch up executing blocks after the snapshot (i.e, roughly several hours worth of blocks / transactions). This may take
+order of 1–2 hours on the mainnet. In total, recovery process and catch-up thus should take roughly 5–6 hours.
+
+## Current limitations
+
+Nodes recovered from snapshot don't have any historical data from before the recovery. There is currently no way to
+back-fill this historic data. E.g., if a node has recovered from a snapshot for L1 batch 500,000; then, it will not have
+data for L1 batches 499,999, 499,998, etc. The relevant Web3 methods, such as `eth_getBlockByNumber`, will return an
+error mentioning the first locally retained block or L1 batch if queried this missing data. The same error messages are
+used for [pruning](08_pruning.md) because logically, recovering from a snapshot is equivalent to pruning node storage to
+the snapshot L1 batch.
+
+## Configuration
+
+To enable snapshot recovery on mainnet, you need to set environment variables for a node before starting it for the
+first time:
+
+```yaml
+EN_SNAPSHOTS_RECOVERY_ENABLED: 'true'
+EN_SNAPSHOTS_OBJECT_STORE_BUCKET_BASE_URL: 'zksync-era-mainnet-external-node-snapshots'
+EN_SNAPSHOTS_OBJECT_STORE_MODE: 'GCSAnonymousReadOnly'
+```
+
+For the Sepolia testnet, use:
+
+```yaml
+EN_SNAPSHOTS_RECOVERY_ENABLED: 'true'
+EN_SNAPSHOTS_OBJECT_STORE_BUCKET_BASE_URL: 'zksync-era-boojnet-external-node-snapshots'
+EN_SNAPSHOTS_OBJECT_STORE_MODE: 'GCSAnonymousReadOnly'
+```
+
+For a working examples of a fully configured Nodes recovering from snapshots, see
+[Docker Compose examples](docker-compose-examples) and [_Quick Start_](00_quick_start.md).
+
+If a node is already recovered (does not matter whether from a snapshot or from a Postgres dump), setting these env
+variables will have no effect; the node will never reset its state.
+
+## Monitoring recovery
+
+Snapshot recovery information is logged with the following targets:
+
+- **Recovery orchestration:** `zksync_external_node::init`
+- **Postgres recovery:** `zksync_snapshots_applier`
+- **Merkle tree recovery:** `zksync_metadata_calculator::recovery`, `zksync_merkle_tree::recovery`
+
+An example of snapshot recovery logs during the first node start:
+
+```text
+2024-06-20T07:25:32.466926Z  INFO zksync_external_node::init: Node has neither genesis L1 batch, nor snapshot recovery info
+2024-06-20T07:25:32.466946Z  INFO zksync_external_node::init: Chosen node initialization strategy: SnapshotRecovery
+2024-06-20T07:25:32.466951Z  WARN zksync_external_node::init: Proceeding with snapshot recovery. This is an experimental feature; use at your own risk
+2024-06-20T07:25:32.475547Z  INFO zksync_snapshots_applier: Found snapshot with data up to L1 batch #7, L2 block #27, version 0, storage logs are divided into 10 chunk(s)
+2024-06-20T07:25:32.516142Z  INFO zksync_snapshots_applier: Applied factory dependencies in 27.768291ms
+2024-06-20T07:25:32.527363Z  INFO zksync_snapshots_applier: Recovering storage log chunks with 10 max concurrency
+2024-06-20T07:25:32.608539Z  INFO zksync_snapshots_applier: Recovered 3007 storage logs in total; checking overall consistency...
+2024-06-20T07:25:32.612967Z  INFO zksync_snapshots_applier: Retrieved 2 tokens from main node
+2024-06-20T07:25:32.616142Z  INFO zksync_external_node::init: Recovered Postgres from snapshot in 148.523709ms
+2024-06-20T07:25:32.645399Z  INFO zksync_metadata_calculator::recovery: Recovering Merkle tree from Postgres snapshot in 1 chunks with max concurrency 10
+2024-06-20T07:25:32.650478Z  INFO zksync_metadata_calculator::recovery: Filtered recovered key chunks; 1 / 1 chunks remaining
+2024-06-20T07:25:32.681327Z  INFO zksync_metadata_calculator::recovery: Recovered 1/1 Merkle tree chunks, there are 0 left to process
+2024-06-20T07:25:32.784597Z  INFO zksync_metadata_calculator::recovery: Recovered Merkle tree from snapshot in 144.040125ms
+```
+
+(Obviously, timestamps and numbers in the logs will differ.)
+
+Recovery logic also exports some metrics, the main of which are as follows:
+
+| Metric name                                             | Type      | Labels       | Description                                                           |
+| ------------------------------------------------------- | --------- | ------------ | --------------------------------------------------------------------- |
+| `snapshots_applier_storage_logs_chunks_left_to_process` | Gauge     | -            | Number of storage log chunks left to process during Postgres recovery |
+| `db_pruner_pruning_chunk_duration_seconds`              | Histogram | `prune_type` | Latency of a single pruning iteration                                 |
+| `merkle_tree_pruning_deleted_stale_key_versions`        | Gauge     | `bound`      | Versions (= L1 batches) pruned from the Merkle tree                   |
diff --git a/docs/guides/external-node/08_pruning.md b/docs/guides/external-node/08_pruning.md
new file mode 100644
index 000000000000..83c127f3826d
--- /dev/null
+++ b/docs/guides/external-node/08_pruning.md
@@ -0,0 +1,92 @@
+# Pruning
+
+It is possible to configure a ZKsync node to periodically prune all data from L1 batches older than a configurable
+threshold. Data is pruned both from Postgres and from tree (RocksDB). Pruning happens continuously (i.e., does not
+require stopping the node) in the background during normal node operation. It is designed to not significantly impact
+node performance.
+
+Types of pruned data in Postgres include:
+
+- Block and L1 batch headers
+- Transactions
+- EVM logs aka events
+- Overwritten storage logs
+- Transaction traces
+
+Pruned data is no longer available via Web3 API of the node. The relevant Web3 methods, such as `eth_getBlockByNumber`,
+will return an error mentioning the first retained block or L1 batch if queried pruned data.
+
+## Interaction with snapshot recovery
+
+Pruning and [snapshot recovery](07_snapshots_recovery.md) are independent features. Pruning works both for archival
+nodes restored from a Postgres dump, and nodes recovered from a snapshot. Conversely, a node recovered from a snapshot
+may have pruning disabled; this would mean that it retains all data starting from the snapshot indefinitely (but not
+earlier data, see [snapshot recovery limitations](07_snapshots_recovery.md#current-limitations)).
+
+A rough guide whether to choose the recovery option and/or pruning is as follows:
+
+- If you need a node with data retention period of up to a few days, set up a node from a snapshot with pruning enabled
+  and wait for it to have enough data.
+- If you need a node with the entire rollup history, using a Postgres dump is the only option, and pruning should be
+  disabled.
+- If you need a node with significant data retention (order of months), the best option right now is using a Postgres
+  dump. You may enable pruning for such a node, but beware that full pruning may take significant amount of time (order
+  of weeks or months). In the future, we intend to offer pre-pruned Postgres dumps with a few months of data.
+
+## Configuration
+
+You can enable pruning by setting the environment variable
+
+```yaml
+EN_PRUNING_ENABLED: 'true'
+```
+
+By default, the node will keep L1 batch data for 7 days determined by the batch timestamp (always equal to the timestamp
+of the first block in the batch). You can configure the retention period using:
+
+```yaml
+EN_PRUNING_DATA_RETENTION_SEC: '259200' # 3 days
+```
+
+The retention period can be set to any value, but for mainnet values under 21h will be ignored because a batch can only
+be pruned after it has been executed on Ethereum.
+
+Pruning can be disabled or enabled and the data retention period can be freely changed during the node lifetime.
+
+## Storage requirements for pruned nodes
+
+The storage requirements depend on how long you configure to retain the data, but are roughly:
+
+- **40GB + ~5GB/day of retained data** of disk space needed on machine that runs the node
+- **300GB + ~15GB/day of retained data** of disk space for Postgres
+
+> [!NOTE]
+>
+> When pruning an existing archival node, Postgres will be unable to reclaim disk space automatically. To reclaim disk
+> space, you need to manually run `VACUUM FULL`, which requires an `ACCESS EXCLUSIVE` lock. You can read more about it
+> in [Postgres docs](https://www.postgresql.org/docs/current/sql-vacuum.html).
+
+## Monitoring pruning
+
+Pruning information is logged with the following targets:
+
+- **Postgres pruning:** `zksync_node_db_pruner`
+- **Merkle tree pruning:** `zksync_metadata_calculator::pruning`, `zksync_merkle_tree::pruning`.
+
+To check whether Postgres pruning works as intended, you should look for logs like this:
+
+```text
+2024-06-20T07:26:03.415382Z  INFO zksync_node_db_pruner: Soft pruned db l1_batches up to 8 and L2 blocks up to 29, operation took 14.850042ms
+2024-06-20T07:26:04.433574Z  INFO zksync_node_db_pruner::metrics: Performed pruning of database, deleted 1 L1 batches, 2 L2 blocks, 68 storage logs, 383 events, 27 call traces, 12 L2-to-L1 logs
+2024-06-20T07:26:04.436516Z  INFO zksync_node_db_pruner: Hard pruned db l1_batches up to 8 and L2 blocks up to 29, operation took 18.653083ms
+```
+
+(Obviously, timestamps and numbers in the logs will differ.)
+
+Pruning logic also exports some metrics, the main of which are as follows:
+
+| Metric name                                      | Type      | Labels       | Description                                         |
+| ------------------------------------------------ | --------- | ------------ | --------------------------------------------------- |
+| `db_pruner_not_pruned_l1_batches_count`          | Gauge     | -            | Number of retained L1 batches                       |
+| `db_pruner_pruning_chunk_duration_seconds`       | Histogram | `prune_type` | Latency of a single pruning iteration               |
+| `merkle_tree_pruning_deleted_stale_key_versions` | Gauge     | `bound`      | Versions (= L1 batches) pruned from the Merkle tree |
diff --git a/docs/guides/external-node/docker-compose-examples/mainnet-external-node-docker-compose.yml b/docs/guides/external-node/docker-compose-examples/mainnet-external-node-docker-compose.yml
index b5026656f7c0..a3e823b260a1 100644
--- a/docs/guides/external-node/docker-compose-examples/mainnet-external-node-docker-compose.yml
+++ b/docs/guides/external-node/docker-compose-examples/mainnet-external-node-docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.2'
+version: "3.2"
 services:
   prometheus:
     image: prom/prometheus:v2.35.0
@@ -21,10 +21,10 @@ services:
   postgres:
     image: "postgres:14"
     command: >
-      postgres 
-      -c max_connections=200 
-      -c log_error_verbosity=terse 
-      -c shared_buffers=2GB 
+      postgres
+      -c max_connections=200
+      -c log_error_verbosity=terse
+      -c shared_buffers=2GB
       -c effective_cache_size=4GB
       -c maintenance_work_mem=1GB
       -c checkpoint_completion_target=0.9
@@ -41,12 +41,16 @@ services:
     healthcheck:
       interval: 1s
       timeout: 3s
-      test: psql -U postgres -c "select exists (select * from pg_stat_activity where datname = '{{ database_name }}' and application_name = 'pg_restore')" | grep -e ".f$"
+      test:
+        [
+          "CMD-SHELL",
+          'psql -U postgres -c "select exists (select * from pg_stat_activity where datname = ''{{ database_name }}'' and application_name = ''pg_restore'')" | grep -e ".f$$"',
+        ]
     environment:
       - POSTGRES_PASSWORD=notsecurepassword
       - PGPORT=5430
   external-node:
-    image: "matterlabs/external-node:2.0-v23.0.0"
+    image: "matterlabs/external-node:2.0-v24.6.0"
     depends_on:
       postgres:
         condition: service_healthy
@@ -70,16 +74,17 @@ services:
       EN_MAIN_NODE_URL: https://zksync2-mainnet.zksync.io
       EN_L1_CHAIN_ID: 1
       EN_L2_CHAIN_ID: 324
+      # EN_PRUNING_ENABLED: true
 
       EN_STATE_CACHE_PATH: "./db/ext-node/state_keeper"
       EN_MERKLE_TREE_PATH: "./db/ext-node/lightweight"
       EN_SNAPSHOTS_RECOVERY_ENABLED: "true"
       EN_SNAPSHOTS_OBJECT_STORE_BUCKET_BASE_URL: "zksync-era-mainnet-external-node-snapshots"
       EN_SNAPSHOTS_OBJECT_STORE_MODE: "GCSAnonymousReadOnly"
-      RUST_LOG: "zksync_core=info,zksync_core::metadata_calculator=debug,zksync_dal=info,zksync_db_connection=info,zksync_eth_client=info,zksync_merkle_tree=info,zksync_storage=info,zksync_state=debug,zksync_types=info,vm=info,zksync_external_node=info,zksync_utils=debug,zksync_snapshots_applier=info"
+      RUST_LOG: "warn,zksync=info,zksync_core::metadata_calculator=debug,zksync_state=debug,zksync_utils=debug,zksync_web3_decl::client=error"
 
 volumes:
   mainnet-postgres: {}
   mainnet-rocksdb: {}
-  mainnet-prometheus-data: { }
-  mainnet-grafana-data: { }
+  mainnet-prometheus-data: {}
+  mainnet-grafana-data: {}
diff --git a/docs/guides/external-node/docker-compose-examples/testnet-external-node-docker-compose.yml b/docs/guides/external-node/docker-compose-examples/testnet-external-node-docker-compose.yml
index 43259aa5c9a1..e7ebaafb3c40 100644
--- a/docs/guides/external-node/docker-compose-examples/testnet-external-node-docker-compose.yml
+++ b/docs/guides/external-node/docker-compose-examples/testnet-external-node-docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.2'
+version: "3.2"
 services:
   prometheus:
     image: prom/prometheus:v2.35.0
@@ -20,11 +20,11 @@ services:
       - "127.0.0.1:3000:3000"
   postgres:
     image: "postgres:14"
-    command: > 
-      postgres 
-      -c max_connections=200 
-      -c log_error_verbosity=terse 
-      -c shared_buffers=2GB 
+    command: >
+      postgres
+      -c max_connections=200
+      -c log_error_verbosity=terse
+      -c shared_buffers=2GB
       -c effective_cache_size=4GB
       -c maintenance_work_mem=1GB
       -c checkpoint_completion_target=0.9
@@ -41,12 +41,16 @@ services:
     healthcheck:
       interval: 1s
       timeout: 3s
-      test: psql -U postgres -c "select exists (select * from pg_stat_activity where datname = '{{ database_name }}' and application_name = 'pg_restore')" | grep -e ".f$"
+      test:
+        [
+          "CMD-SHELL",
+          'psql -U postgres -c "select exists (select * from pg_stat_activity where datname = ''{{ database_name }}'' and application_name = ''pg_restore'')" | grep -e ".f$$"',
+        ]
     environment:
       - POSTGRES_PASSWORD=notsecurepassword
       - PGPORT=5430
   external-node:
-    image: "matterlabs/external-node:2.0-v23.0.0"
+    image: "matterlabs/external-node:2.0-v24.6.0"
     depends_on:
       postgres:
         condition: service_healthy
@@ -70,13 +74,14 @@ services:
       EN_MAIN_NODE_URL: https://sepolia.era.zksync.dev
       EN_L1_CHAIN_ID: 11155111
       EN_L2_CHAIN_ID: 300
+      # EN_PRUNING_ENABLED: true
 
       EN_STATE_CACHE_PATH: "./db/ext-node/state_keeper"
       EN_MERKLE_TREE_PATH: "./db/ext-node/lightweight"
       EN_SNAPSHOTS_RECOVERY_ENABLED: "true"
       EN_SNAPSHOTS_OBJECT_STORE_BUCKET_BASE_URL: "zksync-era-boojnet-external-node-snapshots"
       EN_SNAPSHOTS_OBJECT_STORE_MODE: "GCSAnonymousReadOnly"
-      RUST_LOG: "zksync_core=info,zksync_core::metadata_calculator=debug,zksync_dal=info,zksync_db_connection=info,zksync_eth_client=info,zksync_merkle_tree=info,zksync_storage=info,zksync_state=debug,zksync_types=info,vm=info,zksync_external_node=info,zksync_utils=debug,zksync_snapshots_applier=info"
+      RUST_LOG: "warn,zksync=info,zksync_core::metadata_calculator=debug,zksync_state=debug,zksync_utils=debug,zksync_web3_decl::client=error"
 
 volumes:
   testnet-postgres: {}
diff --git a/docs/guides/external-node/prepared_configs/mainnet-config.env b/docs/guides/external-node/prepared_configs/mainnet-config.env
index efd087b0bb32..35278205b96f 100644
--- a/docs/guides/external-node/prepared_configs/mainnet-config.env
+++ b/docs/guides/external-node/prepared_configs/mainnet-config.env
@@ -75,7 +75,7 @@ RUST_LIB_BACKTRACE=1
 # -------------- THE FOLLOWING VARIABLES DEPEND ON THE ENV ---------------
 # ------------------------------------------------------------------------
 
-# URL of the main zkSync node.
+# URL of the main ZKsync node.
 EN_MAIN_NODE_URL=https://zksync2-mainnet.zksync.io
 
 EN_L2_CHAIN_ID=324
diff --git a/docs/guides/external-node/prepared_configs/testnet-goerli-config-deprecated.env b/docs/guides/external-node/prepared_configs/testnet-goerli-config-deprecated.env
index 2c1723460a27..eb8b6481d75f 100644
--- a/docs/guides/external-node/prepared_configs/testnet-goerli-config-deprecated.env
+++ b/docs/guides/external-node/prepared_configs/testnet-goerli-config-deprecated.env
@@ -75,7 +75,7 @@ RUST_LIB_BACKTRACE=1
 # -------------- THE FOLLOWING VARIABLES DEPEND ON THE ENV ---------------
 # ------------------------------------------------------------------------
 
-# URL of the main zkSync node.
+# URL of the main ZKsync node.
 EN_MAIN_NODE_URL=https://zksync2-testnet.zksync.dev
 
 EN_L2_CHAIN_ID=280
diff --git a/docs/guides/external-node/prepared_configs/testnet-sepolia-config.env b/docs/guides/external-node/prepared_configs/testnet-sepolia-config.env
index d85543a8ec56..98e2ee6bd510 100644
--- a/docs/guides/external-node/prepared_configs/testnet-sepolia-config.env
+++ b/docs/guides/external-node/prepared_configs/testnet-sepolia-config.env
@@ -75,7 +75,7 @@ RUST_LIB_BACKTRACE=1
 # -------------- THE FOLLOWING VARIABLES DEPEND ON THE ENV ---------------
 # ------------------------------------------------------------------------
 
-# URL of the main zkSync node.
+# URL of the main ZKsync node.
 EN_MAIN_NODE_URL=https://sepolia.era.zksync.dev
 
 EN_L2_CHAIN_ID=300
diff --git a/docs/guides/launch.md b/docs/guides/launch.md
index 2889216dbbe9..35588debd3ae 100644
--- a/docs/guides/launch.md
+++ b/docs/guides/launch.md
@@ -1,6 +1,6 @@
 # Running the application
 
-This document covers common scenarios for launching zkSync applications set locally.
+This document covers common scenarios for launching ZKsync applications set locally.
 
 ## Prerequisites
 
diff --git a/docs/guides/repositories.md b/docs/guides/repositories.md
index 75a1780832c8..36a52a2ae76f 100644
--- a/docs/guides/repositories.md
+++ b/docs/guides/repositories.md
@@ -1,6 +1,6 @@
 # Repositories
 
-## zkSync
+## ZKsync
 
 ### Core components
 
@@ -54,10 +54,10 @@
 | --------------------------------------------------------------- | ----------------------------------------------------------------------------- |
 | [era-test-node](https://github.com/matter-labs/era-test-node)   | In memory node for development and smart contract debugging                   |
 | [local-setup](https://github.com/matter-labs/local-setup)       | Docker-based zk server (together with L1), that can be used for local testing |
-| [zksync-cli](https://github.com/matter-labs/zksync-cli)         | Command line tool to interact with zksync                                     |
-| [block-explorer](https://github.com/matter-labs/block-explorer) | Online blockchain browser for viewing and analyzing zkSync chain              |
-| [dapp-portal](https://github.com/matter-labs/dapp-portal)       | zkSync Wallet + Bridge DApp                                                   |
-| [hardhat-zksync](https://github.com/matter-labs/hardhat-zksync) | zkSync Hardhat plugins                                                        |
+| [zksync-cli](https://github.com/matter-labs/zksync-cli)         | Command line tool to interact with ZKsync                                     |
+| [block-explorer](https://github.com/matter-labs/block-explorer) | Online blockchain browser for viewing and analyzing ZKsync chain              |
+| [dapp-portal](https://github.com/matter-labs/dapp-portal)       | ZKsync Wallet + Bridge DApp                                                   |
+| [hardhat-zksync](https://github.com/matter-labs/hardhat-zksync) | ZKsync Hardhat plugins                                                        |
 | [zksolc-bin](https://github.com/matter-labs/zksolc-bin)         | solc compiler binaries                                                        |
 | [zkvyper-bin](https://github.com/matter-labs/zkvyper-bin)       | vyper compiler binaries                                                       |
 
@@ -65,16 +65,16 @@
 
 | Public repository                                                                       | Description                                                                        |
 | --------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- |
-| [zksync-web-era-docs](https://github.com/matter-labs/zksync-web-era-docs)               | [Public zkSync documentation](https://era.zksync.io/docs/), API descriptions etc.  |
+| [zksync-web-era-docs](https://github.com/matter-labs/zksync-docs)                       | [Public ZKsync documentation](https://docs.zksync.io), API descriptions etc.       |
 | [zksync-contract-templates](https://github.com/matter-labs/zksync-contract-templates)   | Quick contract deployment and testing with tools like Hardhat on Solidity or Vyper |
 | [zksync-frontend-templates](https://github.com/matter-labs/zksync-frontend-templates)   | Rapid UI development with templates for Vue, React, Next.js, Nuxt, Vite, etc.      |
-| [zksync-scripting-templates](https://github.com/matter-labs/zksync-scripting-templates) | Automated interactions and advanced zkSync operations using Node.js                |
-| [tutorials](https://github.com/matter-labs/tutorials)                                   | Tutorials for developing on zkSync                                                 |
+| [zksync-scripting-templates](https://github.com/matter-labs/zksync-scripting-templates) | Automated interactions and advanced ZKsync operations using Node.js                |
+| [tutorials](https://github.com/matter-labs/tutorials)                                   | Tutorials for developing on ZKsync                                                 |
 
-## zkSync Lite
+## ZKsync Lite
 
 | Public repository                                                           | Description                      |
 | --------------------------------------------------------------------------- | -------------------------------- |
-| [zksync](https://github.com/matter-labs/zksync)                             | zkSync Lite implementation       |
-| [zksync-lite-docs](https://github.com/matter-labs/zksync-lite-docs)         | Public zkSync Lite documentation |
+| [zksync](https://github.com/matter-labs/zksync)                             | ZKsync Lite implementation       |
+| [ZKsync-lite-docs](https://github.com/matter-labs/zksync-lite-docs)         | Public ZKsync Lite documentation |
 | [zksync-dapp-checkout](https://github.com/matter-labs/zksync-dapp-checkout) | Batch payments DApp              |
diff --git a/docs/guides/setup-dev.md b/docs/guides/setup-dev.md
index a27cdd3ea593..4e005fc2795f 100644
--- a/docs/guides/setup-dev.md
+++ b/docs/guides/setup-dev.md
@@ -27,11 +27,15 @@ cargo install sqlx-cli --version 0.7.3
 sudo systemctl stop postgresql
 # Start docker.
 sudo systemctl start docker
+
+# Foundry
+curl -L https://foundry.paradigm.xyz | bash
+foundryup --branch master
 ```
 
 ## Supported operating systems
 
-zkSync currently can be launched on any \*nix operating system (e.g. any linux distribution or MacOS).
+ZKsync currently can be launched on any \*nix operating system (e.g. any linux distribution or MacOS).
 
 If you're using Windows, then make sure to use WSL 2, since WSL 1 is known to cause troubles.
 
@@ -39,7 +43,7 @@ Additionally, if you are going to use WSL 2, make sure that your project is loca
 accessing NTFS partitions from within WSL is very slow.
 
 If you're using MacOS with an ARM processor (e.g. M1/M2), make sure that you are working in the _native_ environment
-(e.g. your terminal and IDE don't run in Rosetta, and your toolchain is native). Trying to work with zkSync code via
+(e.g. your terminal and IDE don't run in Rosetta, and your toolchain is native). Trying to work with ZKsync code via
 Rosetta may cause problems that are hard to spot and debug, so make sure to check everything before you start.
 
 If you are a NixOS user or would like to have a reproducible environment, skip to the section about `nix`.
@@ -217,7 +221,7 @@ SQLx is a Rust library we use to interact with Postgres, and its CLI is used to
 features of the library.
 
 ```bash
-cargo install sqlx-cli --version 0.7.3
+cargo install --locked sqlx-cli --version 0.7.3
 ```
 
 ## Solidity compiler `solc`
@@ -254,8 +258,12 @@ Install `nix`. Enable the nix command and flakes.
 Install docker, rustup and use rust to install SQLx CLI like described above. If you are on NixOS, you also need to
 enable nix-ld.
 
-Go to the zksync folder and run `nix develop --impure`. After it finishes, you are in a shell that has all the
-dependencies.
+Go to the zksync folder and run `nix develop`. After it finishes, you are in a shell that has all the dependencies.
+
+## Foundry
+
+[Foundry](https://book.getfoundry.sh/getting-started/installation) can be utilized for deploying smart contracts. For
+commands related to deployment, you can pass flags for Foundry integration.
 
 ## Environment
 
diff --git a/docs/specs/README.md b/docs/specs/README.md
index 34103584e547..1f163bf7845f 100644
--- a/docs/specs/README.md
+++ b/docs/specs/README.md
@@ -30,7 +30,7 @@
    - [Circuit testing](./prover/circuit_testing.md)
    - [Boojum gadgets](./prover/boojum_gadgets.md)
    - [Boojum function: check_if_satisfied](./prover/boojum_function_check_if_satisfied.md)
-1. [The Hyperchain](./the_hyperchain/README.md)
-   - [Overview](./the_hyperchain/overview.md)
-   - [Shared Bridge](./the_hyperchain/shared_bridge.md)
-   - [Hyperbridges](./the_hyperchain/hyperbridges.md)
+1. [ZK Chain ecosystem](./zk_chains/README.md)
+   - [Overview](./zk_chains/overview.md)
+   - [Shared Bridge](./zk_chains/shared_bridge.md)
+   - [Hyperbridges](./zk_chains/hyperbridges.md)
diff --git a/docs/specs/blocks_batches.md b/docs/specs/blocks_batches.md
index ce678edf937d..c5d846a39736 100644
--- a/docs/specs/blocks_batches.md
+++ b/docs/specs/blocks_batches.md
@@ -196,7 +196,7 @@ The hash of an L2 block is
 To add a transaction hash to the current miniblock we use the `appendTransactionToCurrentL2Block`
 [function](https://github.com/code-423n4/2023-10-zksync/blob/ef99273a8fdb19f5912ca38ba46d6bd02071363d/code/system-contracts/contracts/SystemContext.sol#L373).
 
-Since zkSync is a state-diff based rollup, there is no way to deduce the hashes of the L2 blocks based on the
+Since ZKsync is a state-diff based rollup, there is no way to deduce the hashes of the L2 blocks based on the
 transactions’ in the batch (because there is no access to the transaction’s hashes). At the same time, in order to
 server `blockhash` method, the VM requires the knowledge of some of the previous L2 block hashes. In order to save up on
 pubdata (by making sure that the same storage slots are reused, i.e. we only have repeated writes) we
diff --git a/docs/specs/data_availability/pubdata.md b/docs/specs/data_availability/pubdata.md
index 3584a0430557..0bbb753411c1 100644
--- a/docs/specs/data_availability/pubdata.md
+++ b/docs/specs/data_availability/pubdata.md
@@ -1,6 +1,6 @@
 # Handling pubdata in Boojum
 
-Pubdata in zkSync can be divided up into 4 different categories:
+Pubdata in ZKsync can be divided up into 4 different categories:
 
 1. L2 to L1 Logs
 2. L2 to L1 Messages
@@ -13,7 +13,7 @@ pre-Boojum system these are represented as separate fields while for boojum they
 array. Once 4844 gets integrated this bytes array will move from being part of the calldata to blob data.
 
 While the structure of the pubdata changes, the way in which one can go about pulling the information will remain the
-same. Basically, we just need to filter all of the transactions to the L1 zkSync contract for only the `commitBatches`
+same. Basically, we just need to filter all of the transactions to the L1 ZKsync contract for only the `commitBatches`
 transactions where the proposed block has been referenced by a corresponding `executeBatches` call (the reason for this
 is that a committed or even proven block can be reverted but an executed one cannot). Once we have all the committed
 batches that have been executed, we then will pull the transaction input and the relevant fields, applying them in order
@@ -106,7 +106,7 @@ be
 [applied](https://github.com/code-423n4/2023-10-zksync/blob/ef99273a8fdb19f5912ca38ba46d6bd02071363d/code/system-contracts/contracts/L1Messenger.sol#L110):
 
 `chainedLogsHash = keccak256(chainedLogsHash, hashedLog)`. L2→L1 logs have the same 88-byte format as in the current
-version of zkSync.
+version of ZKsync.
 
 Note, that the user is charged for necessary future the computation that will be needed to calculate the final merkle
 root. It is roughly 4x higher than the cost to calculate the hash of the leaf, since the eventual tree might have be 4x
@@ -179,7 +179,7 @@ With Boojum, `factoryDeps` are included within the `totalPubdata` bytes and have
 
 ### Compressed Bytecode Publishing
 
-This part stays the same in a pre and post boojum zkSync. Unlike uncompressed bytecode which are published as part of
+This part stays the same in a pre and post boojum ZKsync. Unlike uncompressed bytecode which are published as part of
 `factoryDeps`, compressed bytecodes are published as long l2 → l1 messages which can be seen
 [here](https://github.com/code-423n4/2023-10-zksync/blob/ef99273a8fdb19f5912ca38ba46d6bd02071363d/code/system-contracts/contracts/Compressor.sol#L80).
 
@@ -254,7 +254,7 @@ markAsPublished(hash(_bytecode))
 
 ## Storage diff publishing
 
-zkSync is a statediff-based rollup and so publishing the correct state diffs plays an integral role in ensuring data
+ZKsync is a statediff-based rollup and so publishing the correct state diffs plays an integral role in ensuring data
 availability.
 
 ### How publishing of storage diffs worked before Boojum
@@ -287,9 +287,9 @@ These two fields would be then included into the block commitment and checked by
 
 ### Difference between initial and repeated writes
 
-zkSync publishes state changes that happened within the batch instead of transactions themselves. Meaning, that for
+ZKsync publishes state changes that happened within the batch instead of transactions themselves. Meaning, that for
 instance some storage slot `S` under account `A` has changed to value `V`, we could publish a triple of `A,S,V`. Users
-by observing all the triples could restore the state of zkSync. However, note that our tree unlike Ethereum’s one is not
+by observing all the triples could restore the state of ZKsync. However, note that our tree unlike Ethereum’s one is not
 account based (i.e. there is no first layer of depth 160 of the merkle tree corresponding to accounts and second layer
 of depth 256 of the merkle tree corresponding to users). Our tree is “flat”, i.e. a slot `S` under account `A` is just
 stored in the leaf number `H(S,A)`. Our tree is of depth 256 + 8 (the 256 is for these hashed account/key pairs and 8 is
diff --git a/docs/specs/introduction.md b/docs/specs/introduction.md
index 66f8f95adb88..823817cc527c 100644
--- a/docs/specs/introduction.md
+++ b/docs/specs/introduction.md
@@ -13,7 +13,7 @@ node to verify all transactions, the state of the rollup can be easily checked b
 the proof.
 
 These external validators of a rollup can be other rollups. This means we can connect rollups trustlessly, and create a
-network of rollups. This network is called the hyperchain.
+network of rollups. This network is called the ZK Chain ecosystem.
 
 These specs will provide a high level overview of the zkEVM and a full specification of its more technical components,
-such as the prover, compiler, and the VM itself. We also specify the foundations of the hyperchain ecosystem.
+such as the prover, compiler, and the VM itself. We also specify the foundations of the ZK Chain ecosystem.
diff --git a/docs/specs/l1_l2_communication/l1_to_l2.md b/docs/specs/l1_l2_communication/l1_to_l2.md
index ed1605a039a6..f4a23219e277 100644
--- a/docs/specs/l1_l2_communication/l1_to_l2.md
+++ b/docs/specs/l1_l2_communication/l1_to_l2.md
@@ -1,6 +1,6 @@
 # Handling L1→L2 ops
 
-The transactions on zkSync can be initiated not only on L2, but also on L1. There are two types of transactions that can
+The transactions on ZKsync can be initiated not only on L2, but also on L1. There are two types of transactions that can
 be initiated on L1:
 
 - Priority operations. These are the kind of operations that any user can create.
@@ -103,7 +103,7 @@ We also remember that the upgrade transaction has been processed in this batch (
 
 ### Revert
 
-In a very rare event when the team needs to revert the batch with the upgrade on zkSync, the
+In a very rare event when the team needs to revert the batch with the upgrade on ZKsync, the
 `l2SystemContractsUpgradeBatchNumber` is
 [reset](https://github.com/code-423n4/2023-10-zksync/blob/ef99273a8fdb19f5912ca38ba46d6bd02071363d/code/contracts/ethereum/contracts/zksync/facets/Executor.sol#L412).
 
diff --git a/docs/specs/l1_smart_contracts.md b/docs/specs/l1_smart_contracts.md
index 5644b5494065..65c408714ba3 100644
--- a/docs/specs/l1_smart_contracts.md
+++ b/docs/specs/l1_smart_contracts.md
@@ -6,8 +6,8 @@ This document presumes familiarity with Rollups. For a better understanding, con
 Rollups inherit security and decentralization guarantees from Ethereum, on which they store information about changes in
 their own state, providing validity proofs for state transition, implementing a communication mechanism, etc. In
 practice, all this is achieved by Smart Contracts built on top of Ethereum. This document details the architecture of
-the L2 contracts on Ethereum Layer 1. We also have contracts that support the hyperchain ecosystem, we cover those in
-the [Shared Bridge](./the_hyperchain/shared_bridge.md) section. The Shared Bridge relies on these individual contracts.
+the L2 contracts on Ethereum Layer 1. We also have contracts that support the ZK Chain ecosystem, we cover those in the
+[Shared Bridge](./zk_chains/shared_bridge.md) section. The Shared Bridge relies on these individual contracts.
 
 ## Diamond
 
@@ -32,7 +32,7 @@ then the diamond will be frozen forever.
 The diamond proxy pattern is very flexible and extendable. For now, it allows splitting implementation contracts by
 their logical meaning, removes the limit of bytecode size per contract and implements security features such as
 freezing. In the future, it can also be viewed as [EIP-6900](https://eips.ethereum.org/EIPS/eip-6900) for
-[zkStack](https://blog.matter-labs.io/introducing-the-zk-stack-c24240c2532a), where each hyperchain can implement a
+[ZK Stack](https://blog.matter-labs.io/introducing-the-zk-stack-c24240c2532a), where each ZK Chain can implement a
 sub-set of allowed implementation contracts.
 
 ### GettersFacet
@@ -59,7 +59,7 @@ The admin facet is controlled by two entities:
 ### MailboxFacet
 
 The facet that handles L2 <-> L1 communication, an overview for which can be found in
-[docs](https://era.zksync.io/docs/dev/developer-guides/bridging/l1-l2-interop.html).
+[docs](https://docs.zksync.io/build/developer-reference/l1-l2-interoperability).
 
 The Mailbox performs three functions:
 
@@ -235,8 +235,8 @@ The diagram below outlines the complete journey from the initiation of an operat
 
 ## ValidatorTimelock
 
-An intermediate smart contract between the validator EOA account and the zkSync smart contract. Its primary purpose is
-to provide a trustless means of delaying batch execution without modifying the main zkSync contract. zkSync actively
+An intermediate smart contract between the validator EOA account and the ZKsync smart contract. Its primary purpose is
+to provide a trustless means of delaying batch execution without modifying the main ZKsync contract. ZKsync actively
 monitors the chain activity and reacts to any suspicious activity by freezing the chain. This allows time for
 investigation and mitigation before resuming normal operations.
 
@@ -246,12 +246,12 @@ the Alpha stage.
 This contract consists of four main functions `commitBatches`, `proveBatches`, `executeBatches`, and `revertBatches`,
 which can be called only by the validator.
 
-When the validator calls `commitBatches`, the same calldata will be propagated to the zkSync contract (`DiamondProxy`
+When the validator calls `commitBatches`, the same calldata will be propagated to the ZKsync contract (`DiamondProxy`
 through `call` where it invokes the `ExecutorFacet` through `delegatecall`), and also a timestamp is assigned to these
 batches to track the time these batches are committed by the validator to enforce a delay between committing and
 execution of batches. Then, the validator can prove the already committed batches regardless of the mentioned timestamp,
-and again the same calldata (related to the `proveBatches` function) will be propagated to the zkSync contract. After
-the `delay` is elapsed, the validator is allowed to call `executeBatches` to propagate the same calldata to zkSync
+and again the same calldata (related to the `proveBatches` function) will be propagated to the ZKsync contract. After
+the `delay` is elapsed, the validator is allowed to call `executeBatches` to propagate the same calldata to ZKsync
 contract.
 
 The owner of the ValidatorTimelock contract is the same as the owner of the Governance contract - Matter Labs multisig.
diff --git a/docs/specs/overview.md b/docs/specs/overview.md
index 0f87d91c5c7a..e255f29acd04 100644
--- a/docs/specs/overview.md
+++ b/docs/specs/overview.md
@@ -35,4 +35,4 @@ proof system provides excellent performance, and can be run on just 16Gb of GPU
 generation to be truly decentralized.
 
 Up to this point we have only talked about a single chain. We will connect these chains into a single ecosystem, called
-[the hyperchain](./the_hyperchain/README.md).
+[ZK Chain ecosystem](./zk_chains/README.md).
diff --git a/docs/specs/prover/overview.md b/docs/specs/prover/overview.md
index a7f814a458a8..5ac6dd59b772 100644
--- a/docs/specs/prover/overview.md
+++ b/docs/specs/prover/overview.md
@@ -1,4 +1,4 @@
-# Intro to zkSync’s ZK
+# Intro to ZKsync’s ZK
 
 This page is specific to our cryptography. For a general introduction, please read:
 [https://docs.zksync.io/build/developer-reference/rollups.html](https://docs.zksync.io/build/developer-reference/rollups.html)
@@ -6,8 +6,8 @@ This page is specific to our cryptography. For a general introduction, please re
 As a ZK rollup, we want everything to be verified by cryptography and secured by Ethereum. The power of ZK allows for
 transaction compression, reducing fees for users while inheriting the same security.
 
-ZK Proofs allow a verifier to easily check whether a prover has done a computation correctly. For zkSync, the prover
-will prove the correct execution of zkSync’s EVM, and a smart contract on Ethereum will verify the proof is correct.
+ZK Proofs allow a verifier to easily check whether a prover has done a computation correctly. For ZKsync, the prover
+will prove the correct execution of ZKsync’s EVM, and a smart contract on Ethereum will verify the proof is correct.
 
 In more detail, there are several steps.
 
@@ -46,7 +46,7 @@ It is very important that every step is actually “constrained”. The prover m
 If the circuit is missing a constraint, then a malicious prover can create proofs that will pass verification but not be
 valid. The ZK terminology for this is that an underconstrained circuit could lead to a soundness error.
 
-### What do zkSync’s circuits prove
+### What do ZKsync’s circuits prove
 
 The main goal of our circuits is to prove correct execution of our VM. This includes proving each opcode run within the
 VM, as well as other components such as precompiles, storage, and circuits that connect everything else together. This
diff --git a/docs/specs/prover/zk_terminology.md b/docs/specs/prover/zk_terminology.md
index a0b7d101a64f..a747bb962998 100644
--- a/docs/specs/prover/zk_terminology.md
+++ b/docs/specs/prover/zk_terminology.md
@@ -20,14 +20,14 @@ revealing the actual information.
 
 ### Constraint
 
-A constraint is a rule or restriction that a specific operation or set of operations must follow. zkSync uses
+A constraint is a rule or restriction that a specific operation or set of operations must follow. ZKsync uses
 constraints to verify the validity of certain operations, and in the generation of proofs. Constraints can be missing,
 causing bugs, or there could be too many constraints, leading to restricted operations.
 
 ### Constraint degree
 
 The "constraint degree" of a constraint system refers to the maximum degree of the polynomial gates in the system. In
-simpler terms, it’s the highest power of polynomial equations of the constraint system. At zkSync, we allow gates with
+simpler terms, it’s the highest power of polynomial equations of the constraint system. At ZKsync, we allow gates with
 degree 8 or lower.
 
 ### Constraint system
@@ -42,7 +42,7 @@ assignment of values to these Variables, ensuring that the rules still hold true
 
 The geometry defines the number of rows and columns in the constraint system. As part of PLONK arithmetization, the
 witness data is arranged into a grid, where each row defines a gate (or a few gates), and the columns are as long as
-needed to hold all of the witness data. At zkSync, we have ~164 base witness columns.
+needed to hold all of the witness data. At ZKsync, we have ~164 base witness columns.
 
 ### Log
 
@@ -64,9 +64,9 @@ prover to the verifier.
 
 ### Prover
 
-In our zkSync zk-rollup context, the prover is used to process a set of transactions executing smart contracts in a
+In our ZKsync zk-rollup context, the prover is used to process a set of transactions executing smart contracts in a
 succinct and efficient manner. It computes proofs that all the transactions are correct and ensures a valid transition
-from one state to another. The proof will be sent to a Verifier smart contract on Ethereum. At zkSync, we prove state
+from one state to another. The proof will be sent to a Verifier smart contract on Ethereum. At ZKsync, we prove state
 diffs of a block of transactions, in order to prove the new state root state is valid.
 
 ### Satisfiable
diff --git a/docs/specs/the_hyperchain/README.md b/docs/specs/zk_chains/README.md
similarity index 83%
rename from docs/specs/the_hyperchain/README.md
rename to docs/specs/zk_chains/README.md
index 92bdea7b526a..4de575899dd1 100644
--- a/docs/specs/the_hyperchain/README.md
+++ b/docs/specs/zk_chains/README.md
@@ -1,4 +1,4 @@
-# The Hyperchain
+# ZK Chain Ecosystem
 
 - [Overview](./overview.md)
 - [Shared Bridge](./shared_bridge.md)
diff --git a/docs/specs/the_hyperchain/hyperbridges.md b/docs/specs/zk_chains/hyperbridges.md
similarity index 68%
rename from docs/specs/the_hyperchain/hyperbridges.md
rename to docs/specs/zk_chains/hyperbridges.md
index f8432288fe4a..614fe61427e3 100644
--- a/docs/specs/the_hyperchain/hyperbridges.md
+++ b/docs/specs/zk_chains/hyperbridges.md
@@ -8,21 +8,20 @@ are mostly L2 contracts. In this document we describe what hyperbridges are, and
 
 ### Hyperbridge description
 
-Hyperbridges are trustless and cheap general native bridges between hyperchains, allowing cross-chain function calls.
-Trustlessness is achieved by relying on the main hyperchain bridge to send a compressed message to L1, which is then
-sent to and expanded on the destination hyperchain.
+Hyperbridges are trustless and cheap general native bridges between ZK Chains, allowing cross-chain function calls.
+Trustlessness is achieved by relying on the main ZK Chain bridge to send a compressed message to L1, which is then sent
+to and expanded on the destination ZK Chain.
 
 Technically they are a system of smart contracts that build on top of the enshrined L1<>L2 validating bridges, and can
 interpret messages sent from L2 to L2 by verifying Merkle proofs. They are built alongside the protocol, they can
-transfer the native asset of the ecosystem, and they can be used for asynchronous function calls between hyperchains.
+transfer the native asset of the ecosystem, and they can be used for asynchronous function calls between ZK Chains.
 
 ![Hyperbridges](./img/hyperbridges.png)
 
-The trustless nature of hyperbridges allows the ecosystem to resemble a single VM. To illustrate imagine a new
-hyperchain joining the ecosystem. We will want ether/Dai/etc. to be accessible on this hyperchain. This can be done
-automatically. There will be a central erc20 deployer contract in the ecosystem, which will deploy the new ERC20
-contract via the hyperbridge. After the contract is deployed it will be able to interact other Dai contracts in the
-ecosystem.
+The trustless nature of hyperbridges allows the ecosystem to resemble a single VM. To illustrate imagine a new ZK Chain
+joining the ecosystem. We will want ether/Dai/etc. to be accessible on this ZK Chain. This can be done automatically.
+There will be a central erc20 deployer contract in the ecosystem, which will deploy the new ERC20 contract via the
+hyperbridge. After the contract is deployed it will be able to interact other Dai contracts in the ecosystem.
 
 ### High Level design
 
@@ -37,6 +36,6 @@ For the larger context see the [Shared Bridge](./shared_bridge.md) document, her
 
 ### L2 Contracts
 
-- Outbox system contract. It collects the hyperbridge txs into the hyperlog of the hyperchain.
+- Outbox system contract. It collects the hyperbridge txs into the hyperlog of the ZK Chain.
 - Inbox system contract. This is where the hyperroot is imported and sent to L1 for settlement. Merkle proofs are
   verified here, tx calls are started from here, nullifiers are stored here (add epochs later)
diff --git a/docs/specs/the_hyperchain/img/contractsExternal.png b/docs/specs/zk_chains/img/contractsExternal.png
similarity index 100%
rename from docs/specs/the_hyperchain/img/contractsExternal.png
rename to docs/specs/zk_chains/img/contractsExternal.png
diff --git a/docs/specs/the_hyperchain/img/deployWeth.png b/docs/specs/zk_chains/img/deployWeth.png
similarity index 100%
rename from docs/specs/the_hyperchain/img/deployWeth.png
rename to docs/specs/zk_chains/img/deployWeth.png
diff --git a/docs/specs/the_hyperchain/img/depositWeth.png b/docs/specs/zk_chains/img/depositWeth.png
similarity index 100%
rename from docs/specs/the_hyperchain/img/depositWeth.png
rename to docs/specs/zk_chains/img/depositWeth.png
diff --git a/docs/specs/the_hyperchain/img/hyperbridges.png b/docs/specs/zk_chains/img/hyperbridges.png
similarity index 100%
rename from docs/specs/the_hyperchain/img/hyperbridges.png
rename to docs/specs/zk_chains/img/hyperbridges.png
diff --git a/docs/specs/the_hyperchain/img/hyperbridging.png b/docs/specs/zk_chains/img/hyperbridging.png
similarity index 100%
rename from docs/specs/the_hyperchain/img/hyperbridging.png
rename to docs/specs/zk_chains/img/hyperbridging.png
diff --git a/docs/specs/the_hyperchain/img/newChain.png b/docs/specs/zk_chains/img/newChain.png
similarity index 100%
rename from docs/specs/the_hyperchain/img/newChain.png
rename to docs/specs/zk_chains/img/newChain.png
diff --git a/docs/specs/the_hyperchain/overview.md b/docs/specs/zk_chains/overview.md
similarity index 87%
rename from docs/specs/the_hyperchain/overview.md
rename to docs/specs/zk_chains/overview.md
index f31c4da99f1c..29379e029fb1 100644
--- a/docs/specs/the_hyperchain/overview.md
+++ b/docs/specs/zk_chains/overview.md
@@ -2,5 +2,5 @@
 
 ZK Stack roll chains will be launched on L1 into a [shared bridge](./shared_bridge.md). The shared bridge will create an
 ecosystem of chains, with shared standards, upgrades, and free flow of assets. This free flow of assets will be enabled
-by [hyperbridges](./hyperbridges.md). Hyperbridges are trustless and cheap bridges between hyperchains, allowing
+by [hyperbridges](./hyperbridges.md). Hyperbridges are trustless and cheap bridges between ZK Chains, allowing
 cross-chain function calls.
diff --git a/docs/specs/the_hyperchain/shared_bridge.md b/docs/specs/zk_chains/shared_bridge.md
similarity index 79%
rename from docs/specs/the_hyperchain/shared_bridge.md
rename to docs/specs/zk_chains/shared_bridge.md
index 4ea6c143a7c9..c464a7a154bf 100644
--- a/docs/specs/the_hyperchain/shared_bridge.md
+++ b/docs/specs/zk_chains/shared_bridge.md
@@ -3,39 +3,39 @@
 ## Introduction
 
 Ethereum's future is rollup-centric. This means breaking with the current paradigm of isolated EVM chains to
-infrastructure that is focused on an ecosystem of interconnected zkEVMs, (which we name Hyperchains). This ecosystem
-will be grounded on Ethereum, requiring the appropriate L1 smart contracts. Here we outline our ZK Stack approach for
-these contracts, their interfaces, the needed changes to the existing architecture, as well as future features to be
+infrastructure that is focused on an ecosystem of interconnected zkEVMs, (which we name ZK Chains). This ecosystem will
+be grounded on Ethereum, requiring the appropriate L1 smart contracts. Here we outline our ZK Stack approach for these
+contracts, their interfaces, the needed changes to the existing architecture, as well as future features to be
 implemented.
 
-If you want to know more about Hyperchains, check this
+If you want to know more about ZK Chains, check this
 [blog post](https://blog.matter-labs.io/introduction-to-hyperchains-fdb33414ead7), or go through
-[our docs](https://era.zksync.io/docs/reference/concepts/hyperscaling.html).
+[our docs](https://docs.zksync.io/zk-stack/concepts/zk-chains).
 
 ### High-level design
 
 We want to create a system where:
 
-- Hyperchains should be launched permissionlessly within the ecosystem.
+- ZK Chains should be launched permissionlessly within the ecosystem.
 - Hyperbridges should enable unified liquidity for assets across the ecosystem.
 - Multi-chain smart contracts need to be easy to develop, which means easy access to traditional bridges, and other
   supporting architecture.
 
-Hyperchains have specific trust requirements - they need to satisfy certain common standards so that they can trust each
-other. This means a single set of L1 smart contracts has to manage the proof verification for all hyperchains, and if
-the proof system is upgraded, all chains have to be upgraded together. New chains will be able to be launched
+ZK Chains have specific trust requirements - they need to satisfy certain common standards so that they can trust each
+other. This means a single set of L1 smart contracts has to manage the proof verification for all ZK Chains, and if the
+proof system is upgraded, all chains have to be upgraded together. New chains will be able to be launched
 permissionlessly in the ecosystem according to this shared standard.
 
 To allow unified liquidity each L1 asset (ETH, ERC20, NFTs) will have a single bridge contract on L1 for the whole
-ecosystem. These shared bridges will allow users to deposit, withdraw and transfer from any hyperchain in the ecosystem.
-These shared bridges are also responsible for deploying and maintaining their counterparts on the hyperchains. The
+ecosystem. These shared bridges will allow users to deposit, withdraw and transfer from any ZK Chain in the ecosystem.
+These shared bridges are also responsible for deploying and maintaining their counterparts on the ZK Chains. The
 counterparts will be asset contracts extended with bridging functionality.
 
 To enable the bridging functionality:
 
-- On the L1 we will add a Bridgehub contract which connects asset bridges to all the hyperchains. This will also be the
+- On the L1 we will add a Bridgehub contract which connects asset bridges to all the ZK Chains. This will also be the
   contract that holds the ETH for the ecosystem.
-- On the Hyperchain side we will add special system contracts that enable these features.
+- On the ZK Chain side we will add special system contracts that enable these features.
 
 We want to make the ecosystem as modular as possible, giving developers the ability to modify the architecture as
 needed; consensus mechanism, staking, and DA requirements.
@@ -57,10 +57,10 @@ be able to leverage them when available).
 
 #### Bridgehub
 
-- Acts as a hub for bridges, so that they have a single point of communication with all hyperchain contracts. This
-  allows L1 assets to be locked in the same contract for all hyperchains, including L3s and validiums. The `Bridgehub`
-  also implements the following:
-- `Registry` This is where hyperchains can register, starting in a permissioned manner, but with the goal to be
+- Acts as a hub for bridges, so that they have a single point of communication with all ZK Chain contracts. This allows
+  L1 assets to be locked in the same contract for all ZK Chains, including L3s and validiums. The `Bridgehub` also
+  implements the following:
+- `Registry` This is where ZK Chains can register, starting in a permissioned manner, but with the goal to be
   permissionless in the future. This is where their `chainID` is determined. L3s will also register here. This
   `Registry` is also where State Transition contracts should register. Each chain has to specify its desired ST when
   registering (Initially, only one will be available).
@@ -111,7 +111,7 @@ be able to leverage them when available).
 
 - `Hypermailbox`
   - This will allow general message passing (L2<>L2, L2<>L3, etc). This is where the `Mailbox` sends the `Hyperlogs`.
-    `Hyperlogs` are commitments to these messages sent from a single hyperchain. `Hyperlogs` are aggregated into a
+    `Hyperlogs` are commitments to these messages sent from a single ZK Chain. `Hyperlogs` are aggregated into a
     `HyperRoot` in the `HyperMailbox`.
   - This component has not been implemented yet
 
@@ -119,13 +119,13 @@ be able to leverage them when available).
 
 - Some assets have to be natively supported (ETH, WETH) and it also makes sense to support some generally accepted token
   standards (ERC20 tokens), as this makes it easy to bridge those tokens (and ensures a single version of them exists on
-  the hyperchain). These canonical asset contracts are deployed from L1 by a bridge shared by all hyperchains. This is
-  where assets are locked on L1. These bridges use the BridgeHub to communicate with all hyperchains. Currently, these
-  bridges are the `WETH` and `ERC20` bridges.
+  the ZK Chain ecosystem). These canonical asset contracts are deployed from L1 by a bridge shared by all ZK Chains.
+  This is where assets are locked on L1. These bridges use the BridgeHub to communicate with all ZK Chains. Currently,
+  these bridges are the `WETH` and `ERC20` bridges.
 
-  - The pair on L2 is deployed from L1. The hash of the factory dependencies is stored on L1, and when a hyperchain
-    wants to register, it can passes it in for deployment, it is verified, and the contract is deployed on L2. The
-    actual token contracts on L2 are deployed by the L2 bridge.
+  - The pair on L2 is deployed from L1. The hash of the factory dependencies is stored on L1, and when a ZK Chain wants
+    to register, it can passes it in for deployment, it is verified, and the contract is deployed on L2. The actual
+    token contracts on L2 are deployed by the L2 bridge.
 
   ```
   function initializeChain(
@@ -157,8 +157,8 @@ This topic is now covered more thoroughly by the Custom native token discussion.
   following functionalities:
   - `StateTransitionRegistry` The ST is shared for multiple chains, so initialization and upgrades have to be the same
     for all chains. Registration is not permissionless but happens based on the registrations in the bridgehub’s
-    `Registry`. At registration a `DiamondProxy` is deployed and initialized with the appropriate `Facets` for each
-    Hyperchain.
+    `Registry`. At registration a `DiamondProxy` is deployed and initialized with the appropriate `Facets` for each ZK
+    Chain.
   - `Facets` and `Verifier` are shared across chains that relies on the same ST: `Base`, `Executor` , `Getters`, `Admin`
     , `Mailbox.`The `Verifier` is the contract that actually verifies the proof, and is called by the `Executor`.
   - Upgrade Mechanism The system requires all chains to be up-to-date with the latest implementation, so whenever an
@@ -219,10 +219,9 @@ specified address.
 
 ### Common Standards and Upgrades
 
-In this initial phase, Hyperchains have to follow some common standards, so that they can trust each other. This means
-all chains start out with the same empty state, they have the same VM implementations and proof systems, asset contracts
-can trust each on different chains, and the chains are upgraded together. We elaborate on the shared upgrade mechanism
-here.
+In this initial phase, ZK Chains have to follow some common standards, so that they can trust each other. This means all
+chains start out with the same empty state, they have the same VM implementations and proof systems, asset contracts can
+trust each on different chains, and the chains are upgraded together. We elaborate on the shared upgrade mechanism here.
 
 #### Upgrade mechanism
 
@@ -230,10 +229,10 @@ Currently, there are three types of upgrades for zkEVM. Normal upgrades (used fo
 Governor (a multisig) and are public for a certain timeframe before they can be applied. Shadow upgrades are similar to
 normal upgrades, but the data is not known at the moment the upgrade is proposed, but only when executed (they can be
 executed with the delay, or instantly if approved by the security council). Instant upgrades (used for security issues),
-on the other hand happen quickly and need to be approved by the Security Council in addition to the Governor. For
-hyperchains the difference is that upgrades now happen on multiple chains. This is only a problem for shadow upgrades -
-in this case, the chains have to tightly coordinate to make all the upgrades happen in a short time frame, as the
-content of the upgrade becomes public once the first chain is upgraded. The actual upgrade process is as follows:
+on the other hand happen quickly and need to be approved by the Security Council in addition to the Governor. For ZK
+Chains the difference is that upgrades now happen on multiple chains. This is only a problem for shadow upgrades - in
+this case, the chains have to tightly coordinate to make all the upgrades happen in a short time frame, as the content
+of the upgrade becomes public once the first chain is upgraded. The actual upgrade process is as follows:
 
 1. Prepare Upgrade for all chains:
    - The new facets and upgrade contracts have to be deployed,
diff --git a/docs/specs/zk_evm/account_abstraction.md b/docs/specs/zk_evm/account_abstraction.md
index 748be5341d65..0ea2e3fa4a09 100644
--- a/docs/specs/zk_evm/account_abstraction.md
+++ b/docs/specs/zk_evm/account_abstraction.md
@@ -1,8 +1,8 @@
 # Account abstraction
 
-One of the other important features of zkSync is the support of account abstraction. It is highly recommended to read
+One of the other important features of ZKsync is the support of account abstraction. It is highly recommended to read
 the documentation on our AA protocol here:
-[https://era.zksync.io/docs/reference/concepts/account-abstraction.html#introduction](https://era.zksync.io/docs/reference/concepts/account-abstraction.html#introduction)
+[https://docs.zksync.io/build/developer-reference/account-abstraction](https://docs.zksync.io/build/developer-reference/account-abstraction)
 
 ### Account versioning
 
diff --git a/docs/specs/zk_evm/bootloader.md b/docs/specs/zk_evm/bootloader.md
index ec7f8378151d..41dfefa85168 100644
--- a/docs/specs/zk_evm/bootloader.md
+++ b/docs/specs/zk_evm/bootloader.md
@@ -6,7 +6,7 @@ On standard Ethereum clients, the workflow for executing blocks is the following
 2. Gather the state changes (if the transaction has not reverted), apply them to the state.
 3. Go back to step (1) if the block gas limit has not been yet exceeded.
 
-However, having such flow on zkSync (i.e. processing transaction one-by-one) would be too inefficient, since we have to
+However, having such flow on ZKsync (i.e. processing transaction one-by-one) would be too inefficient, since we have to
 run the entire proving workflow for each individual transaction. That’s why we need the _bootloader_: instead of running
 N transactions separately, we run the entire batch (set of blocks, more can be found
 [here](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/Smart%20contract%20Section/Batches%20%26%20L2%20blocks%20on%20zkSync.md))
@@ -19,7 +19,7 @@ unlike system contracts, the bootloader’s code is not stored anywhere on L2. T
 bootloader’s address as formal. It only exists for the sake of providing some value to `this` / `msg.sender`/etc. When
 someone calls the bootloader address (e.g. to pay fees) the EmptyContract’s code is actually invoked.
 
-Bootloader is the program that accepts an array of transactions and executes the entire zkSync batch. This section will
+Bootloader is the program that accepts an array of transactions and executes the entire ZKsync batch. This section will
 expand on its invariants and methods.
 
 ## Playground bootloader vs proved bootloader
@@ -62,12 +62,12 @@ supported:
 - Note, that unlike type 1 and type 2 transactions, `reserved0` field can be set to a non-zero value, denoting that this
   legacy transaction is EIP-155-compatible and its RLP encoding (as well as signature) should contain the `chainId` of
   the system.
-- `txType`: 1. It means that the transaction is of type 1, i.e. transactions access list. zkSync does not support access
+- `txType`: 1. It means that the transaction is of type 1, i.e. transactions access list. ZKsync does not support access
   lists in any way, so no benefits of fulfilling this list will be provided. The access list is assumed to be empty. The
   same restrictions as for type 0 are enforced, but also `reserved0` must be 0.
 - `txType`: 2. It is EIP1559 transactions. The same restrictions as for type 1 apply, but now `maxFeePerErgs` may not be
   equal to `getMaxPriorityFeePerErg`.
-- `txType`: 113. It is zkSync transaction type. This transaction type is intended for AA support. The only restriction
+- `txType`: 113. It is ZKsync transaction type. This transaction type is intended for AA support. The only restriction
   that applies to this transaction type: fields `reserved0..reserved4` must be equal to 0.
 - `txType`: 254. It is a transaction type that is used for upgrading the L2 system. This is the only type of transaction
   is allowed to start a transaction out of the name of the contracts in kernel space.
@@ -238,7 +238,7 @@ succeeded, the slot `2^19 - 1024 + i` will be marked as 1 and 0 otherwise.
 
 ## L2 transactions
 
-On zkSync, every address is a contract. Users can start transactions from their EOA accounts, because every address that
+On ZKsync, every address is a contract. Users can start transactions from their EOA accounts, because every address that
 does not have any contract deployed on it implicitly contains the code defined in the
 [DefaultAccount.sol](https://github.com/code-423n4/2023-10-zksync/blob/main/code/system-contracts/contracts/DefaultAccount.sol)
 file. Whenever anyone calls a contract that is not in kernel space (i.e. the address is ≥ 2^16) and does not have any
@@ -323,7 +323,7 @@ Also, we
 [set](https://github.com/code-423n4/2023-10-zksync/blob/ef99273a8fdb19f5912ca38ba46d6bd02071363d/code/system-contracts/bootloader/bootloader.yul#L3812)
 the fictive L2 block’s data. Then, we call the system context to ensure that it publishes the timestamp of the L2 block
 as well as L1 batch. We also reset the `txNumberInBlock` counter to avoid its state diffs from being published on L1.
-You can read more about block processing on zkSync
+You can read more about block processing on ZKsync
 [here](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/Smart%20contract%20Section/Batches%20&%20L2%20blocks%20on%20zkSync.md).
 
 After that, we publish the hash as well as the number of priority operations in this batch. More on it
diff --git a/docs/specs/zk_evm/fee_model.md b/docs/specs/zk_evm/fee_model.md
index a75d45a737b9..78f9d38ae366 100644
--- a/docs/specs/zk_evm/fee_model.md
+++ b/docs/specs/zk_evm/fee_model.md
@@ -1,4 +1,4 @@
-# zkSync fee model
+# ZKsync fee model
 
 This document will assume that you already know how gas & fees work on Ethereum.
 
@@ -6,18 +6,18 @@ On Ethereum, all the computational, as well as storage costs, are represented vi
 certain amount of gas, which is generally constant (though it may change during
 [upgrades](https://blog.ethereum.org/2021/03/08/ethereum-berlin-upgrade-announcement)).
 
-zkSync as well as other L2s have the issue which does not allow to adopt the same model as the one for Ethereum so
+ZKsync as well as other L2s have the issue which does not allow to adopt the same model as the one for Ethereum so
 easily: the main reason is the requirement for publishing of the pubdata on Ethereum. This means that prices for L2
 transactions will depend on the volatile L1 gas prices and can not be simply hardcoded.
 
 ## High-level description
 
-zkSync, being a zkRollup is required to prove every operation with zero knowledge proofs. That comes with a few nuances.
+ZKsync, being a zkRollup is required to prove every operation with zero knowledge proofs. That comes with a few nuances.
 
 ### `gas_per_pubdata_limit`
 
-As already mentioned, the transactions on zkSync depend on volatile L1 gas costs to publish the pubdata for batch,
-verify proofs, etc. For this reason, zkSync-specific EIP712 transactions contain the `gas_per_pubdata_limit` field in
+As already mentioned, the transactions on ZKsync depend on volatile L1 gas costs to publish the pubdata for batch,
+verify proofs, etc. For this reason, ZKsync-specific EIP712 transactions contain the `gas_per_pubdata_limit` field in
 them, denoting the maximum price in _gas_ that the operator \*\*can charge from users for a single byte of pubdata.
 
 For Ethereum transactions (which do not contain this field), it is enforced that the operator will not use a value
@@ -28,23 +28,23 @@ larger value than a certain constant.
 The operations tend to have different “complexity”/”pricing” in zero knowledge proof terms than in standard CPU terms.
 For instance, `keccak256` which was optimized for CPU performance, will cost more to prove.
 
-That’s why you will find the prices for operations on zkSync a lot different from the ones on Ethereum.
+That’s why you will find the prices for operations on ZKsync a lot different from the ones on Ethereum.
 
 ### Different intrinsic costs
 
 Unlike Ethereum, where the intrinsic cost of transactions (`21000` gas) is used to cover the price of updating the
-balances of the users, the nonce and signature verification, on zkSync these prices are _not_ included in the intrinsic
+balances of the users, the nonce and signature verification, on ZKsync these prices are _not_ included in the intrinsic
 costs for transactions, due to the native support of account abstraction, meaning that each account type may have their
 own transaction cost. In theory, some may even use more zk-friendly signature schemes or other kinds of optimizations to
 allow cheaper transactions for their users.
 
-That being said, zkSync transactions do come with some small intrinsic costs, but they are mostly used to cover costs
+That being said, ZKsync transactions do come with some small intrinsic costs, but they are mostly used to cover costs
 related to the processing of the transaction by the bootloader which can not be easily measured in code in real-time.
 These are measured via testing and are hard coded.
 
 ### Batch overhead & limited resources of the batch
 
-In order to process the batch, the zkSync team has to pay for proving of the batch, committing to it, etc. Processing a
+In order to process the batch, the ZKsync team has to pay for proving of the batch, committing to it, etc. Processing a
 batch involves some operational costs as well. All of these values we call “Batch overhead”. It consists of two parts:
 
 - The L2 requirements for proving the circuits (denoted in L2 gas).
@@ -57,7 +57,7 @@ resources_.
 
 While on Ethereum, the main reason for the existence of batch gas limit is to keep the system decentralized & load low,
 i.e. assuming the existence of the correct hardware, only time would be a requirement for a batch to adhere to. In the
-case of zkSync batches, there are some limited resources the batch should manage:
+case of ZKsync batches, there are some limited resources the batch should manage:
 
 - **Time.** The same as on Ethereum, the batch should generally not take too much time to be closed in order to provide
   better UX. To represent the time needed we use a batch gas limit, note that it is higher than the gas limit for a
@@ -71,7 +71,7 @@ case of zkSync batches, there are some limited resources the batch should manage
   single slot happening in the same batch need to be published only once, we need to publish all the batch’s public data
   only after the transaction has been processed. Right now, we publish all the data with the storage diffs as well as
   L2→L1 messages, etc in a single transaction at the end of the batch. Most nodes have limit of 128kb per transaction
-  and so this is the limit that each zkSync batch should adhere to.
+  and so this is the limit that each ZKsync batch should adhere to.
 
 Each transaction spends the batch overhead proportionally to how close it consumes the resources above.
 
@@ -79,7 +79,7 @@ Note, that before the transaction is executed, the system can not know how many
 transaction will actually take, so we need to charge for the worst case and provide the refund at the end of the
 transaction.
 
-### How `baseFee` works on zkSync
+### How `baseFee` works on ZKsync
 
 In order to protect us from DDoS attacks we need to set a limited `MAX_TRANSACTION_GAS_LIMIT` per transaction. Since the
 computation costs are relatively constant for us, we _could_ use a “fair” `baseFee` equal to the real costs for us to
@@ -114,16 +114,16 @@ sure that the excess gas will be spent on the pubdata).
 
 ### High-level: conclusion
 
-The zkSync fee model is meant to be the basis of the long-term fee model, which provides both robustness and security.
+The ZKsync fee model is meant to be the basis of the long-term fee model, which provides both robustness and security.
 One of the most distinctive parts of it is the existing of the batch overhead, which is proportional for the resources
 consumed by the transaction.
 
-The other distinctive feature of the fee model used on zkSync is the abundance of refunds, i.e.:
+The other distinctive feature of the fee model used on ZKsync is the abundance of refunds, i.e.:
 
 - For unused limited system resources.
 - For overpaid computation.
 
-This is needed because of the relatively big upfront payments required in zkSync to provide DDoS security.
+This is needed because of the relatively big upfront payments required in ZKsync to provide DDoS security.
 
 ## Formalization
 
@@ -156,7 +156,7 @@ contain almost any arbitrary value depending on the capacity of batch that we wa
 `BOOTLOADER_MEMORY_FOR_TXS` (_BM_) — The size of the bootloader memory that is used for transaction encoding
 (i.e. excluding the constant space, preallocated for other purposes).
 
-`GUARANTEED_PUBDATA_PER_TX` (_PG_) — The guaranteed number of pubdata that should be possible to pay for in one zkSync
+`GUARANTEED_PUBDATA_PER_TX` (_PG_) — The guaranteed number of pubdata that should be possible to pay for in one ZKsync
 batch. This is a number that should be enough for most reasonable cases.
 
 #### Derived constants
diff --git a/docs/specs/zk_evm/precompiles.md b/docs/specs/zk_evm/precompiles.md
index 4874bcdf9404..c6adc00410bb 100644
--- a/docs/specs/zk_evm/precompiles.md
+++ b/docs/specs/zk_evm/precompiles.md
@@ -19,7 +19,7 @@ nor the instructions to put the parameters in memory.
 
 For Go-Ethereum, the code being run is written in Go, and the gas costs are defined in each precompile spec.
 
-In the case of zkSync Era, ecAdd and ecMul precompiles are written as a smart contract for two reasons:
+In the case of ZKsync Era, ecAdd and ecMul precompiles are written as a smart contract for two reasons:
 
 - zkEVM needs to be able to prove their execution (and at the moment it cannot do that if the code being run is executed
   outside the VM)
@@ -36,7 +36,7 @@ The arithmetic is carried out with the field elements encoded in the Montgomery
 operating in the Montgomery form speeds up the computation but also because the native modular multiplication, which is
 carried out by Yul's `mulmod` opcode, is very inefficient.
 
-Instructions set on zkSync and EVM are different, so the performance of the same Yul/Solidity code can be efficient on
+Instructions set on ZKsync and EVM are different, so the performance of the same Yul/Solidity code can be efficient on
 EVM, but not on zkEVM and opposite.
 
 One such very inefficient command is `mulmod`. On EVM there is a native opcode that makes modulo multiplication and it
diff --git a/docs/specs/zk_evm/system_contracts.md b/docs/specs/zk_evm/system_contracts.md
index 136d2136cd9e..48f072435519 100644
--- a/docs/specs/zk_evm/system_contracts.md
+++ b/docs/specs/zk_evm/system_contracts.md
@@ -26,7 +26,7 @@ values are set on genesis explicitly. Notably, if in the future we want to upgra
 This contract is also responsible for ensuring validity and consistency of batches, L2 blocks and virtual blocks. The
 implementation itself is rather straightforward, but to better understand this contract, please take a look at the
 [page](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/Smart%20contract%20Section/Batches%20&%20L2%20blocks%20on%20zkSync.md)
-about the block processing on zkSync.
+about the block processing on ZKsync.
 
 ## AccountCodeStorage
 
@@ -86,7 +86,7 @@ and returns `success=1`.
 
 ## SHA256 & Keccak256
 
-Note that, unlike Ethereum, keccak256 is a precompile (_not an opcode_) on zkSync.
+Note that, unlike Ethereum, keccak256 is a precompile (_not an opcode_) on ZKsync.
 
 These system contracts act as wrappers for their respective crypto precompile implementations. They are expected to be
 used frequently, especially keccak256, since Solidity computes storage slots for mapping and dynamic arrays with its
@@ -128,7 +128,7 @@ More information on the extraAbiParams can be read
 
 ## KnownCodeStorage
 
-This contract is used to store whether a certain code hash is “known”, i.e. can be used to deploy contracts. On zkSync,
+This contract is used to store whether a certain code hash is “known”, i.e. can be used to deploy contracts. On ZKsync,
 the L2 stores the contract’s code _hashes_ and not the codes themselves. Therefore, it must be part of the protocol to
 ensure that no contract with unknown bytecode (i.e. hash with an unknown preimage) is ever deployed.
 
@@ -151,9 +151,9 @@ The KnownCodesStorage contract is also responsible for ensuring that all the “
 
 ## ContractDeployer & ImmutableSimulator
 
-`ContractDeployer` is a system contract responsible for deploying contracts on zkSync. It is better to understand how it
-works in the context of how the contract deployment works on zkSync. Unlike Ethereum, where `create`/`create2` are
-opcodes, on zkSync these are implemented by the compiler via calls to the ContractDeployer system contract.
+`ContractDeployer` is a system contract responsible for deploying contracts on ZKsync. It is better to understand how it
+works in the context of how the contract deployment works on ZKsync. Unlike Ethereum, where `create`/`create2` are
+opcodes, on ZKsync these are implemented by the compiler via calls to the ContractDeployer system contract.
 
 For additional security, we also distinguish the deployment of normal contracts and accounts. That’s why the main
 methods that will be used by the user are `create`, `create2`, `createAccount`, `create2Account`, which simulate the
@@ -168,7 +168,7 @@ the L2 contract). Generally, rollups solve this issue in two ways:
 - XOR/ADD some kind of constant to addresses during L1→L2 communication. That’s how rollups closer to full
   EVM-equivalence solve it, since it allows them to maintain the same derivation rules on L1 at the expense of contract
   accounts on L1 having to redeploy on L2.
-- Have different derivation rules from Ethereum. That is the path that zkSync has chosen, mainly because since we have
+- Have different derivation rules from Ethereum. That is the path that ZKsync has chosen, mainly because since we have
   different bytecode than on EVM, CREATE2 address derivation would be different in practice anyway.
 
 You can see the rules for our address derivation in `getNewAddressCreate2`/ `getNewAddressCreate` methods in the
@@ -179,7 +179,7 @@ way to support EVM bytecodes in the future.
 
 ### **Deployment nonce**
 
-On Ethereum, the same nonce is used for CREATE for accounts and EOA wallets. On zkSync this is not the case, we use a
+On Ethereum, the same nonce is used for CREATE for accounts and EOA wallets. On ZKsync this is not the case, we use a
 separate nonce called “deploymentNonce” to track the nonces for accounts. This was done mostly for consistency with
 custom accounts and for having multicalls feature in the future.
 
@@ -197,13 +197,13 @@ custom accounts and for having multicalls feature in the future.
 - Calls `ImmutableSimulator` to set the immutables that are to be used for the deployed contract.
 
 Note how it is different from the EVM approach: on EVM when the contract is deployed, it executes the initCode and
-returns the deployedCode. On zkSync, contracts only have the deployed code and can set immutables as storage variables
+returns the deployedCode. On ZKsync, contracts only have the deployed code and can set immutables as storage variables
 returned by the constructor.
 
 ### **Constructor**
 
 On Ethereum, the constructor is only part of the initCode that gets executed during the deployment of the contract and
-returns the deployment code of the contract. On zkSync, there is no separation between deployed code and constructor
+returns the deployment code of the contract. On ZKsync, there is no separation between deployed code and constructor
 code. The constructor is always a part of the deployment code of the contract. In order to protect it from being called,
 the compiler-generated contracts invoke constructor only if the `isConstructor` flag provided (it is only available for
 the system contracts). You can read more about flags
@@ -228,7 +228,7 @@ part of the compiler specification. This contract treats it simply as mapping fr
 address.
 
 Whenever a contract needs to access a value of some immutable, they call the
-`ImmutableSimulator.getImmutable(getCodeAddress(), index)`. Note that on zkSync it is possible to get the current
+`ImmutableSimulator.getImmutable(getCodeAddress(), index)`. Note that on ZKsync it is possible to get the current
 execution address you can read more about `getCodeAddress()`
 [here](https://github.com/matter-labs/zksync-era/blob/main/docs/guides/advanced/0_alternative_vm_intro.md#zkevm-specific-opcodes).
 
@@ -248,7 +248,7 @@ are not in kernel space and have no contract deployed on them. This address:
 
 ## L1Messenger
 
-A contract used for sending arbitrary length L2→L1 messages from zkSync to L1. While zkSync natively supports a rather
+A contract used for sending arbitrary length L2→L1 messages from ZKsync to L1. While ZKsync natively supports a rather
 limited number of L1→L2 logs, which can transfer only roughly 64 bytes of data a time, we allowed sending
 nearly-arbitrary length L2→L1 messages with the following trick:
 
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/call.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/call.md
index 8f52a216e2a0..060ba8ec2346 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/call.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/call.md
@@ -6,7 +6,7 @@ The call type is encoded on the assembly level, so we will describe the common h
 distinctions if there are any.
 
 For more information, see the
-[zkSync Era documentation](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#call-staticcall-delegatecall).
+[ZKsync Era documentation](https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#call-staticcall-delegatecall).
 
 ## [CALL](https://www.evm.codes/#f1?fork=shanghai)
 
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/create.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/create.md
index b9c4bba4b7ce..eeecb93526ab 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/create.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/create.md
@@ -3,7 +3,7 @@
 The EVM CREATE instructions are handled similarly.
 
 For more information, see the
-[zkSync Era documentation](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#create-create2).
+[ZKsync Era documentation](https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#create-create2).
 
 ## [CREATE](https://www.evm.codes/#f0?fork=shanghai)
 
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/environment.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/environment.md
index a59fbef36202..dcb19ae1da2e 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/environment.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/environment.md
@@ -160,13 +160,13 @@ is common for Yul and EVMLA representations.
 
 ## [CODECOPY](https://www.evm.codes/#38?fork=shanghai)
 
-See [the EraVM docs](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#codecopy).
+See [the EraVM docs](https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#codecopy).
 
 [The LLVM IR generator code](https://github.com/matter-labs/era-compiler-solidity/blob/main/src/evmla/ethereal_ir/function/block/element/mod.rs#L856).
 
 ## [CODESIZE](https://www.evm.codes/#39?fork=shanghai)
 
-See [the EraVM docs](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#codesize).
+See [the EraVM docs](https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#codesize).
 
 [The LLVM IR generator code](https://github.com/matter-labs/era-compiler-solidity/blob/main/src/evmla/ethereal_ir/function/block/element/mod.rs#L837).
 
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/return.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/return.md
index 5f62b414f7ea..014a2a3e47c1 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/return.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/evm/return.md
@@ -12,7 +12,7 @@ is common for Yul and EVMLA representations.
 ## [RETURN](https://www.evm.codes/#f3?fork=shanghai)
 
 This instruction works differently in deploy code. For more information, see
-[the zkSync Era documentation](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#return).
+[the ZKsync Era documentation](https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#return-stop).
 
 ### LLVM IR
 
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/evmla.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/evmla.md
index 4705962ca48e..06549962244b 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/evmla.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/evmla.md
@@ -26,7 +26,7 @@ LLVM IR codegen references:
 The same as [setimmutable](yul.md#setimmutable).
 
 For more information, see the
-[zkSync Era documentation](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#setimmutable-loadimmutable).
+[ZKsync Era documentation](https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#setimmutable-loadimmutable).
 
 LLVM IR codegen references:
 
@@ -38,7 +38,7 @@ LLVM IR codegen references:
 The same as [loadimmutable](yul.md#loadimmutable).
 
 For more information, see the
-[zkSync Era documentation](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#setimmutable-loadimmutable).
+[ZKsync Era documentation](https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#setimmutable-loadimmutable).
 
 LLVM IR codegen references:
 
@@ -50,7 +50,7 @@ LLVM IR codegen references:
 The same as [linkersymbol](yul.md#linkersymbol).
 
 For more information, see the
-[zkSync Era documentation](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#libraries).
+[ZKsync Era documentation](https://docs.zksync.io/build/developer-reference/ethereum-differences/libraries).
 
 [The LLVM IR generator code](https://github.com/matter-labs/era-compiler-solidity/blob/main/src/yul/parser/statement/expression/function_call/mod.rs#L956).
 
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/call.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/call.md
index 9a6b39d54d7d..bada21b359d0 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/call.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/call.md
@@ -1,4 +1,4 @@
-# zkSync Era Extension Simulation (call)
+# ZKsync Era Extension Simulation (call)
 
 NOTES:
 
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/overview.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/overview.md
index 889865e5f9be..a3fedb085c78 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/overview.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/overview.md
@@ -1,6 +1,6 @@
-# zkSync Era Extensions
+# ZKsync Era Extensions
 
-Since we have no control over the Solidity compiler, we are using temporary hacks to support zkSync-specific
+Since we have no control over the Solidity compiler, we are using temporary hacks to support ZKsync-specific
 instructions:
 
 - [Call substitutions](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/extensions/call.md)
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/verbatim.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/verbatim.md
index f2b1be0ff4f6..7291e5bf46a1 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/verbatim.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/extensions/verbatim.md
@@ -1,4 +1,4 @@
-# zkSync Era Extension Simulation (verbatim)
+# ZKsync Era Extension Simulation (verbatim)
 
 NOTES:
 
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/overview.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/overview.md
index bc8daf3b2e1a..56515c9eadce 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/overview.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/overview.md
@@ -5,7 +5,7 @@ In this specification, instructions are grouped by their relevance to the EVM in
 - [Native EVM instructions](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/extensions/overview.md).
 - [Yul auxiliary instructions](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/yul.md).
 - [EVM legacy assembly auxiliary instructions](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/evmla.md).
-- [zkSync Era extensions](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/extensions/overview.md).
+- [ZKsync Era extensions](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/extensions/overview.md).
 
 Most of the EVM native instructions are represented in both Yul and EVM legacy assembly IRs. If they are not, it is
 stated explicitly in the description of each instruction.
@@ -25,7 +25,7 @@ Every instruction is translated via two IRs available in the Solidity compiler u
 
 ## Yul Extensions
 
-At the moment there is no way of adding zkSync-specific instructions to Yul as long as we use the official Solidity
+At the moment there is no way of adding ZKsync-specific instructions to Yul as long as we use the official Solidity
 compiler, which would produce an error on an unknown instruction.
 
 There are two ways of supporting such instructions: one for Solidity and one for Yul.
@@ -38,13 +38,13 @@ optimizing them out and is not emitting compilation errors.
 
 To see the list of available instructions, visit this page:
 
-[zkSync Era Extension Simulation (call)](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/extensions/call.md)
+[ZKsync Era Extension Simulation (call)](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/extensions/call.md)
 
 ### The Yul Mode
 
-The non-call zkSync-specific instructions are only available in the Yul mode of **zksolc**.  
+The non-call ZKsync-specific instructions are only available in the Yul mode of **zksolc**.  
 To have better compatibility, they are implemented as `verbatim` instructions with some predefined keys.
 
 To see the list of available instructions, visit this page:
 
-[zkSync Era Extension Simulation (verbatim)](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/extensions/verbatim.md)
+[ZKsync Era Extension Simulation (verbatim)](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/extensions/verbatim.md)
diff --git a/docs/specs/zk_evm/vm_specification/compiler/instructions/yul.md b/docs/specs/zk_evm/vm_specification/compiler/instructions/yul.md
index 360683cc9430..55ae98166af8 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/instructions/yul.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/instructions/yul.md
@@ -41,7 +41,7 @@ destination. For more information, see
 Writes immutables to the auxiliary heap.
 
 For more information, see the
-[zkSync Era documentation](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#setimmutable-loadimmutable).
+[ZKsync Era documentation](https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#setimmutable-loadimmutable).
 
 LLVM IR codegen references:
 
@@ -54,7 +54,7 @@ Reads immutables from the
 [ImmutableSimulator](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/system_contracts.md#simulator-of-immutables).
 
 For more information, see the
-[zkSync Era documentation](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#setimmutable-loadimmutable).
+[ZKsync Era documentation](https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#setimmutable-loadimmutable).
 
 LLVM IR codegen references:
 
@@ -71,7 +71,7 @@ compiler will return the list of deployable libraries not provided with `--libra
 like Hardhat to automatically deploy libraries.
 
 For more information, see the
-[zkSync Era documentation](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#libraries).
+[ZKsync Era documentation](https://docs.zksync.io/build/developer-reference/ethereum-differences/libraries).
 
 [The LLVM IR generator code](https://github.com/matter-labs/era-compiler-solidity/blob/main/src/yul/parser/statement/expression/function_call/mod.rs#L956).
 
diff --git a/docs/specs/zk_evm/vm_specification/compiler/overview.md b/docs/specs/zk_evm/vm_specification/compiler/overview.md
index d55b86756162..0af322e0b489 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/overview.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/overview.md
@@ -8,7 +8,7 @@
 | solc                             | The original Solidity compiler, developed by the Ethereum community. Called by zksolc as a subprocess to get the IRs of the source code of the project.                                                                                                                                                                                                                                                                    |
 | LLVM                             | The compiler framework, used for optimizations and assembly generation.                                                                                                                                                                                                                                                                                                                                                    |
 | EraVM assembler/linker           | The tool written in Rust. Translates the assembly emitted by LLVM to the target bytecode.                                                                                                                                                                                                                                                                                                                                  |
-| Virtual machine                  | The zkSync Era virtual machine called EraVM with a custom instruction set.                                                                                                                                                                                                                                                                                                                                                 |
+| Virtual machine                  | The ZKsync Era virtual machine called EraVM with a custom instruction set.                                                                                                                                                                                                                                                                                                                                                 |
 | Intermediate representation (IR) | The data structure or code used internally by the compiler to represent source code.                                                                                                                                                                                                                                                                                                                                       |
 | Yul                              | One of the Solidity IRs. Is a superset of the assembly available in Solidity. Used by default for contracts written in Solidity ≥0.8.                                                                                                                                                                                                                                                                                      |
 | EVMLA                            | One of the Solidity IRs called EVM legacy assembly. Is a predecessor of Yul, but must closer to the pure EVM bytecode. Used by default for contracts written in Solidity <0.8.                                                                                                                                                                                                                                             |
@@ -17,11 +17,11 @@
 | EraVM bytecode                   | The smart contract bytecode, executed by EraVM.                                                                                                                                                                                                                                                                                                                                                                            |
 | Stack                            | The segment of the non-persistent contract memory. Consists of two parts: 1. The global data, accessible from anywhere. Available to the compiler, not available to the user code. 2. The function-local stack frame without the depth limit like in EVM.                                                                                                                                                                  |
 | Heap                             | The segment of the non-persistent contract memory. All the data is globally accessible by both the compiler and user code. The allocation is handled by the solc’s Yul/EVMLA allocator only.                                                                                                                                                                                                                               |
-| Auxiliary heap                   | The segment of the non-persistent contract memory, introduced to avoid conflicts with the solc’s allocator. All the data is globally accessible by the compiler only. The allocation is handled by the zksolc’s compiler only. All contract calls specific to zkSync, including the system contracts, are made via the auxiliary heap. It is also used to return data (e.g. the array of immutables) from the constructor. |
+| Auxiliary heap                   | The segment of the non-persistent contract memory, introduced to avoid conflicts with the solc’s allocator. All the data is globally accessible by the compiler only. The allocation is handled by the zksolc’s compiler only. All contract calls specific to ZKsync, including the system contracts, are made via the auxiliary heap. It is also used to return data (e.g. the array of immutables) from the constructor. |
 | Calldata                         | The segment of the non-persistent contract memory. The heap or auxiliary heap of the parent/caller contract.                                                                                                                                                                                                                                                                                                               |
 | Return data                      | The segment of the non-persistent contract memory. The heap or auxiliary heap of the child/callee contract.                                                                                                                                                                                                                                                                                                                |
 | Contract storage                 | The persistent contract memory. No relevant differences from that of EVM.                                                                                                                                                                                                                                                                                                                                                  |
-| System contracts                 | The special set of zkSync kernel contracts written in Solidity by Matter Labs.                                                                                                                                                                                                                                                                                                                                             |
+| System contracts                 | The special set of ZKsync kernel contracts written in Solidity by Matter Labs.                                                                                                                                                                                                                                                                                                                                             |
 | Contract context                 | The special storage of VM that keeps data like the current address, the caller’s address, etc.                                                                                                                                                                                                                                                                                                                             |
 
 ## Concepts
@@ -95,7 +95,7 @@ the sake of assisting the upcoming audit.
 | calldataload     | CALLDATALOAD    | calldata                     | Stack: 1 input. Calldata: read 32 bytes. Stack: 1 output | -                        | 0 in deploy code.                                                                                        |
 | calldatacopy     | CALLDATACOPY    | calldata, heap               | Stack: 3 inputs. Calldata: read N bytes. Heap: write N bytes | -                        | Generated by solc in the runtime code only. Copies 0 in deploy code.                                     |
 | calldatasize     | CALLDATASIZE    | calldata                     | Stack: 1 output                                    | -                        | 0 in deploy code.                                                                                        |
-| codecopy         | CODECOPY        | calldata                     | Stack: 3 inputs. Calldata: read N bytes. Heap: write N bytes | -                        | Generated by solc in the deploy code only, but is treated as CALLDATACOPY, since the constructor arguments are calldata in zkSync 2.0. Compile time error in Yul runtime code. Copies 0 in EVMLA runtime code. |
+| codecopy         | CODECOPY        | calldata                     | Stack: 3 inputs. Calldata: read N bytes. Heap: write N bytes | -                        | Generated by solc in the deploy code only, but is treated as CALLDATACOPY, since the constructor arguments are calldata in ZKsync 2.0. Compile time error in Yul runtime code. Copies 0 in EVMLA runtime code. |
 | codesize         | CODESIZE        | calldata                     | Stack: 1 output                                    | -                        | -                                                                                                        |
 | returndatacopy   | RETURNDATACOPY  | return data, heap            | Stack: 3 inputs. Return data: read N bytes. Heap: write N bytes | -                        | -                                                                                                        |
 | returndatasize   | RETURNDATASIZE  | return data                  | Stack: 1 output                                    | -                        | -                                                                                                        |
@@ -137,6 +137,6 @@ the sake of assisting the upcoming audit.
 | pc                     | PC                | unsupported                | -                                                                                                            | -                                                                | Compile time error                                                                                                                                                                                             |
 | selfdestruct           | SELFDESTRUCT      | unsupported                | -                                                                                                            | -                                                                | Compile time error                                                                                                                                                                                             |
 
-For more information on how zkSync Era achieves EVM-equivalence, see the
+For more information on how ZKsync Era achieves EVM-equivalence, see the
 [Instructions](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions)
 section.
diff --git a/docs/specs/zk_evm/vm_specification/compiler/system_contracts.md b/docs/specs/zk_evm/vm_specification/compiler/system_contracts.md
index ca93cb6eb315..3e328d663693 100644
--- a/docs/specs/zk_evm/vm_specification/compiler/system_contracts.md
+++ b/docs/specs/zk_evm/vm_specification/compiler/system_contracts.md
@@ -1,12 +1,13 @@
 # System Contracts
 
-Many EVM instructions require special handling by the
-[System Contracts](https://era.zksync.io/docs/reference/architecture/system-contracts.html). Among them are: `ORIGIN`,
-`CALLVALUE`, `BALANCE`, `CREATE`, `SHA3`, and others. To see the full detailed list of instructions requiring special
-handling, see
+Many EVM instructions require special handling by the [System Contracts][docs-system-contracts]. Among them are:
+`ORIGIN`, `CALLVALUE`, `BALANCE`, `CREATE`, `SHA3`, and others. To see the full detailed list of instructions requiring
+special handling, see
 [the EVM instructions reference](https://github.com/code-423n4/2023-10-zksync/blob/main/docs/VM%20Section/How%20compiler%20works/instructions/evm).
 
-There are several types of System Contracts from the perspective of how they are handled by the zkSync Era compilers:
+## Types of System Contracts
+
+There are several types of System Contracts from the perspective of how they are handled by the ZKsync Era compilers:
 
 1. [Environmental data storage](#environmental-data-storage).
 2. [KECCAK256 hash function](#keccak256-hash-function).
@@ -45,17 +46,15 @@ For reference, see
 Handling of this function is similar to [Environmental Data Storage](#environmental-data-storage) with one difference:
 
 Since EVM also uses heap to store the calldata for `KECCAK256`, the required memory chunk is allocated by the IR
-generator, and zkSync Era compiler does not need to use [the auxiliary heap](#auxiliary-heap).
+generator, and ZKsync Era compiler does not need to use [the auxiliary heap](#auxiliary-heap).
 
 For reference, see
 [the LLVM IR codegen source code](https://github.com/matter-labs/era-compiler-llvm-context/blob/main/src/eravm/context/function/llvm_runtime.rs).
 
 ### Contract Deployer
 
-See [handling CREATE](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#create-create2)
-and
-[dependency code substitution instructions](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#datasize-dataoffset-datacopy)
-on zkSync Era documentation.
+See [handling CREATE][docs-create] and [dependency code substitution instructions][docs-data] on ZKsync Era
+documentation.
 
 For reference, see LLVM IR codegen for
 [the deployer call](https://github.com/matter-labs/era-compiler-llvm-context/blob/main/src/eravm/context/function/runtime/deployer_call.rs)
@@ -86,9 +85,7 @@ For reference, see
 
 ### Simulator of Immutables
 
-See
-[handling immutables](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#setimmutable-loadimmutable)
-on zkSync Era documentation.
+See [handling immutables][docs-immutable] on ZKsync Era documentation.
 
 For reference, see LLVM IR codegen for
 [instructions for immutables](https://github.com/matter-labs/era-compiler-llvm-context/blob/main/src/eravm/evm/immutable.rs)
@@ -109,17 +106,24 @@ For reference, see
 
 ## Auxiliary Heap
 
-Both [zksolc](https://era.zksync.io/docs/tools/compiler-toolchain/solidity.html) and
-[zkvyper](https://era.zksync.io/docs/tools/compiler-toolchain/vyper.html) compilers for EraVM operate on
-[the IR level](https://era.zksync.io/docs/tools/compiler-toolchain/overview.html#ir-compilers), so they cannot control
-the heap memory allocator which remains a responsibility of
-[the high-level source code compilers](https://era.zksync.io/docs/tools/compiler-toolchain/overview.html#high-level-source-code-compilers)
-emitting the IRs.
+Both [zksolc][docs-zksolc] and [zkvyper][docs-zkvyper] compilers for EraVM operate on [the IR level][docs-ir], so they
+cannot control the heap memory allocator which remains a responsibility of [the high-level source code
+compilers][docs-high-level-compilers] emitting the IRs.
 
 However, the are several cases where EraVM needs to allocate memory on the heap and EVM does not. The auxiliary heap is
 used for these cases:
 
-1. [Returning immutables](https://era.zksync.io/docs/reference/architecture/differences-with-ethereum.html#setimmutable-loadimmutable)
-   from the constructor.
-2. Allocating calldata and return data for calling the
-   [System Contracts](https://era.zksync.io/docs/reference/architecture/system-contracts.html).
+1. [Returning immutables][docs-immutable] from the constructor.
+2. Allocating calldata and return data for calling the [System Contracts][docs-system-contracts].
+
+[docs-system-contracts]: https://docs.zksync.io/build/developer-reference/era-contracts/system-contracts
+[docs-immutable]:
+  https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#setimmutable-loadimmutable
+[docs-zksolc]: https://docs.zksync.io/zk-stack/components/compiler/toolchain/solidity
+[docs-zkvyper]: https://docs.zksync.io/zk-stack/components/compiler/toolchain/vyper
+[docs-ir]: https://docs.zksync.io/zk-stack/components/compiler/toolchain#ir-compilers
+[docs-high-level-compilers]:
+  https://docs.zksync.io/zk-stack/components/compiler/toolchain#high-level-source-code-compilers
+[docs-create]: https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#create-create2
+[docs-data]:
+  https://docs.zksync.io/build/developer-reference/ethereum-differences/evm-instructions#datasize-dataoffset-datacopy
diff --git a/etc/contracts-test-data/README.md b/etc/contracts-test-data/README.md
index d08f934e8456..532703ad210f 100644
--- a/etc/contracts-test-data/README.md
+++ b/etc/contracts-test-data/README.md
@@ -1,4 +1,4 @@
 # Contracts test data
 
 This folder contains data for contracts that are being used for testing to check the correctness of the smart contract
-flow in zkSync.
+flow in ZKsync.
diff --git a/etc/contracts-test-data/contracts/custom-account/SystemContractsCaller.sol b/etc/contracts-test-data/contracts/custom-account/SystemContractsCaller.sol
index e4d241116a1e..3ec2b81a1074 100644
--- a/etc/contracts-test-data/contracts/custom-account/SystemContractsCaller.sol
+++ b/etc/contracts-test-data/contracts/custom-account/SystemContractsCaller.sol
@@ -6,7 +6,7 @@ import {MSG_VALUE_SYSTEM_CONTRACT, MSG_VALUE_SIMULATOR_IS_SYSTEM_BIT} from "./Co
 import "./Utils.sol";
 
 // Addresses used for the compiler to be replaced with the
-// zkSync-specific opcodes during the compilation.
+// ZKsync-specific opcodes during the compilation.
 // IMPORTANT: these are just compile-time constants and are used
 // only if used in-place by Yul optimizer.
 address constant TO_L1_CALL_ADDRESS = address((1 << 16) - 1);
diff --git a/etc/contracts-test-data/contracts/custom-account/TransactionHelper.sol b/etc/contracts-test-data/contracts/custom-account/TransactionHelper.sol
index 7fc883ed882c..82747b88d358 100644
--- a/etc/contracts-test-data/contracts/custom-account/TransactionHelper.sol
+++ b/etc/contracts-test-data/contracts/custom-account/TransactionHelper.sol
@@ -10,7 +10,7 @@ import "./interfaces/IContractDeployer.sol";
 import {BASE_TOKEN_SYSTEM_CONTRACT, BOOTLOADER_FORMAL_ADDRESS} from "./Constants.sol";
 import "./RLPEncoder.sol";
 
-/// @dev The type id of zkSync's EIP-712-signed transaction.
+/// @dev The type id of ZKsync's EIP-712-signed transaction.
 uint8 constant EIP_712_TX_TYPE = 0x71;
 
 /// @dev The type id of legacy transactions.
@@ -20,7 +20,7 @@ uint8 constant EIP_2930_TX_TYPE = 0x01;
 /// @dev The type id of EIP1559 transactions.
 uint8 constant EIP_1559_TX_TYPE = 0x02;
 
-/// @notice Structure used to represent zkSync transaction.
+/// @notice Structure used to represent ZKsync transaction.
 struct Transaction {
     // The type of the transaction.
     uint256 txType;
@@ -118,7 +118,7 @@ library TransactionHelper {
         }
     }
 
-    /// @notice Encode hash of the zkSync native transaction type.
+    /// @notice Encode hash of the ZKsync native transaction type.
     /// @return keccak256 hash of the EIP-712 encoded representation of transaction
     function _encodeHashEIP712Transaction(Transaction calldata _transaction)
         private
@@ -251,7 +251,7 @@ library TransactionHelper {
         // Hash of EIP2930 transactions is encoded the following way:
         // H(0x01 || RLP(chain_id, nonce, gas_price, gas_limit, destination, amount, data, access_list))
         //
-        // Note, that on zkSync access lists are not supported and should always be empty.
+        // Note, that on ZKsync access lists are not supported and should always be empty.
 
         // Encode all fixed-length params to avoid "stack too deep error"
         bytes memory encodedFixedLengthParams;
@@ -290,7 +290,7 @@ library TransactionHelper {
             // Otherwise the length is not encoded at all.
         }
 
-        // On zkSync, access lists are always zero length (at least for now).
+        // On ZKsync, access lists are always zero length (at least for now).
         bytes memory encodedAccessListLength = RLPEncoder.encodeListLen(0);
 
         bytes memory encodedListLength;
@@ -327,7 +327,7 @@ library TransactionHelper {
         // Hash of EIP1559 transactions is encoded the following way:
         // H(0x02 || RLP(chain_id, nonce, max_priority_fee_per_gas, max_fee_per_gas, gas_limit, destination, amount, data, access_list))
         //
-        // Note, that on zkSync access lists are not supported and should always be empty.
+        // Note, that on ZKsync access lists are not supported and should always be empty.
 
         // Encode all fixed-length params to avoid "stack too deep error"
         bytes memory encodedFixedLengthParams;
@@ -368,7 +368,7 @@ library TransactionHelper {
             // Otherwise the length is not encoded at all.
         }
 
-        // On zkSync, access lists are always zero length (at least for now).
+        // On ZKsync, access lists are always zero length (at least for now).
         bytes memory encodedAccessListLength = RLPEncoder.encodeListLen(0);
 
         bytes memory encodedListLength;
diff --git a/etc/contracts-test-data/contracts/custom-account/Utils.sol b/etc/contracts-test-data/contracts/custom-account/Utils.sol
index da3d4eb60878..e562948942d7 100644
--- a/etc/contracts-test-data/contracts/custom-account/Utils.sol
+++ b/etc/contracts-test-data/contracts/custom-account/Utils.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0;
 
 /**
  * @author Matter Labs
- * @dev Common utilities used in zkSync system contracts
+ * @dev Common utilities used in ZKsync system contracts
  */
 library Utils {
     function safeCastToU128(uint256 _x) internal pure returns (uint128) {
diff --git a/etc/env/base/README.md b/etc/env/base/README.md
index 8bf4ceb48cdb..c583685d953c 100644
--- a/etc/env/base/README.md
+++ b/etc/env/base/README.md
@@ -1,6 +1,6 @@
-# Base configuration for zkSync stack
+# Base configuration for ZKsync stack
 
-This folder contains the template for generating the configuration for zkSync applications. Configs in this folder are
+This folder contains the template for generating the configuration for ZKsync applications. Configs in this folder are
 assigned default values suitable for development.
 
 Since all the applications expect configuration to be set via the environment variables, these configs are compiled into
diff --git a/etc/env/base/alerts.toml b/etc/env/base/alerts.toml
deleted file mode 100644
index b6e494f6486f..000000000000
--- a/etc/env/base/alerts.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[alerts]
-sporadic_crypto_errors_substrs=[
-    "EventDestroyErr",
-    "Can't free memory of DeviceBuf",
-    "value: PoisonError"
-]
diff --git a/etc/env/base/base_token_adjuster.toml b/etc/env/base/base_token_adjuster.toml
new file mode 100644
index 000000000000..100da3b7224f
--- /dev/null
+++ b/etc/env/base/base_token_adjuster.toml
@@ -0,0 +1,6 @@
+# Configuration for the Base Token Adjuster crate
+
+[base_token_adjuster]
+
+# How often to poll external price feeds for the base token price.
+price_polling_interval_ms = "30000"
diff --git a/etc/env/base/chain.toml b/etc/env/base/chain.toml
index 8e0c37b76935..0cb8213119b3 100644
--- a/etc/env/base/chain.toml
+++ b/etc/env/base/chain.toml
@@ -1,13 +1,13 @@
-# zkSync chain parameters
+# ZKsync chain parameters
 
 [chain.eth]
 # Name of the used Ethereum network
 network = "localhost"
-# Name of current zkSync network
+# Name of current ZKsync network
 # Used for Sentry environment
 zksync_network = "localhost"
-# ID of current zkSync network treated as ETH network ID.
-# Used to distinguish zkSync from other Web3-capable networks.
+# ID of current ZKsync network treated as ETH network ID.
+# Used to distinguish ZKsync from other Web3-capable networks.
 zksync_network_id = 270
 
 [chain.state_keeper]
@@ -78,13 +78,13 @@ max_gas_per_batch = 200000000
 max_pubdata_per_batch = 100000
 
 # The version of the fee model to use.
-# - `V1`, the first model that was used in zkSync Era. In this fee model, the pubdata price must be pegged to the L1 gas price.
+# - `V1`, the first model that was used in ZKsync Era. In this fee model, the pubdata price must be pegged to the L1 gas price.
 # Also, the fair L2 gas price is expected to only include the proving/computation price for the operator and not the costs that come from
 # processing the batch on L1.
-# - `V2`, the second model that was used in zkSync Era. There the pubdata price might be independent from the L1 gas price. Also,
-# The fair L2 gas price is expected to both the proving/computation price for the operator and the costs that come from
+# - `V2`, the second model that was used in ZKsync Era. There the pubdata price might be independent from the L1 gas price. Also,
+# The fair L2 gas price is expected to be both the proving/computation price for the operator and the costs that come from
 # processing the batch on L1.
-fee_model_version = "V1"
+fee_model_version = "V2"
 
 # Max number of computational gas that validation step is allowed to take.
 validation_computational_gas_limit = 300000
diff --git a/etc/env/base/contracts.toml b/etc/env/base/contracts.toml
index 63f5836c8f9c..491bd19ea4bf 100644
--- a/etc/env/base/contracts.toml
+++ b/etc/env/base/contracts.toml
@@ -1,4 +1,4 @@
-# Addresses of the deployed zkSync contracts.
+# Addresses of the deployed ZKsync contracts.
 # Values of this file are updated automatically by the contract deploy script.
 
 [contracts]
@@ -32,6 +32,7 @@ PRIORITY_TX_MAX_GAS_LIMIT = 72000000
 DEPLOY_L2_BRIDGE_COUNTERPART_GAS_LIMIT = 10000000
 GENESIS_ROLLUP_LEAF_INDEX = "54"
 GENESIS_PROTOCOL_VERSION = "24"
+GENESIS_PROTOCOL_SEMANTIC_VERSION = "0.24.1"
 L1_WETH_BRIDGE_IMPL_ADDR = "0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 L1_WETH_BRIDGE_PROXY_ADDR = "0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 L1_WETH_TOKEN_ADDR = "0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
@@ -39,7 +40,6 @@ L2_WETH_BRIDGE_ADDR = "0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 L2_WETH_TOKEN_IMPL_ADDR = "0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 L2_WETH_TOKEN_PROXY_ADDR = "0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 BLOB_VERSIONED_HASH_RETRIEVER_ADDR = "0x0000000000000000000000000000000000000000"
-INITIAL_PROTOCOL_VERSION = 22
 
 L1_SHARED_BRIDGE_IMPL_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 # These are currently not used, but will be used once the shared bridge is up
@@ -55,10 +55,10 @@ MAX_NUMBER_OF_HYPERCHAINS = 100
 L1_SHARED_BRIDGE_PROXY_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 L2_SHARED_BRIDGE_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
 L2_SHARED_BRIDGE_IMPL_ADDR = "0xFC073319977e314F251EAE6ae6bE76B0B3BAeeCF"
-FRI_RECURSION_LEAF_LEVEL_VK_HASH = "0x435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f6"
+FRI_RECURSION_LEAF_LEVEL_VK_HASH = "0xf9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c6"
 FRI_RECURSION_NODE_LEVEL_VK_HASH = "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8"
-FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH = "0x6f7e6423c7241bb691c2ad291a8a3e8cb505091117ed8a38ade8f4224b8cf58e"
-SNARK_WRAPPER_VK_HASH = "0x1d485be42d712856dfe85b3cf7823f020fa5f83cb41c83f9da307fdc2089beee"
+FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH = "0xe6ba9d6b042440c480fa1c7182be32387db6e90281e82f37398d3f98f63f098a"
+SNARK_WRAPPER_VK_HASH = "0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2"
 SHARED_BRIDGE_UPGRADE_STORAGE_SWITCH = 0
 ERA_CHAIN_ID = 9
 ERA_DIAMOND_PROXY_ADDR = "0x0000000000000000000000000000000000000000"
diff --git a/etc/env/base/eth_sender.toml b/etc/env/base/eth_sender.toml
index 902efeca1f9d..31fe626c87f2 100644
--- a/etc/env/base/eth_sender.toml
+++ b/etc/env/base/eth_sender.toml
@@ -46,8 +46,6 @@ max_single_tx_gas = 6000000
 # Max acceptable fee for sending tx to L1
 max_acceptable_priority_fee_in_gwei = 100000000000
 
-proof_loading_mode="FriProofFromGcs"
-
 pubdata_sending_mode = "Blobs"
 
 [eth_sender.gas_adjuster]
diff --git a/etc/env/base/fri_proof_compressor.toml b/etc/env/base/fri_proof_compressor.toml
index bda943391f06..9d26fe876896 100644
--- a/etc/env/base/fri_proof_compressor.toml
+++ b/etc/env/base/fri_proof_compressor.toml
@@ -1,10 +1,10 @@
 [fri_proof_compressor]
-compression_mode=1
-prometheus_listener_port=3321
-prometheus_pushgateway_url="http://127.0.0.1:9091"
-prometheus_push_interval_ms=100
-generation_timeout_in_secs=3600
-max_attempts=5
-universal_setup_path="../keys/setup/setup_2^26.key"
-universal_setup_download_url="https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2^26.key"
-verify_wrapper_proof=true
+compression_mode = 1
+prometheus_listener_port = 3321
+prometheus_pushgateway_url = "http://127.0.0.1:9091"
+prometheus_push_interval_ms = 100
+generation_timeout_in_secs = 3600
+max_attempts = 5
+universal_setup_path = "../keys/setup/setup_2^24.key"
+universal_setup_download_url = "https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2^24.key"
+verify_wrapper_proof = true
diff --git a/etc/env/base/private.toml b/etc/env/base/private.toml
index 1d6f8dabf82b..e6367e013519 100644
--- a/etc/env/base/private.toml
+++ b/etc/env/base/private.toml
@@ -9,7 +9,7 @@ test_database_prover_url = "postgres://postgres:notsecurepassword@localhost:5433
 [eth_sender.sender]
 # Set in env file for development, production, staging and testnet.
 operator_private_key = "0x27593fea79697e947890ecbecce7901b0008345e5d7259710d0dd5e500d040be"
-# Address to be used for zkSync account managing the interaction with a contract on Ethereum.
+# Address to be used for ZKsync account managing the interaction with a contract on Ethereum.
 # Derived from the `OPERATOR_PRIVATE_KEY`.
 operator_commit_eth_addr = "0xde03a0B5963f75f1C8485B355fF6D30f3093BDE7"
 
diff --git a/etc/env/base/proof_data_handler.toml b/etc/env/base/proof_data_handler.toml
index 3ea1ee03aa61..7a1999a03c31 100644
--- a/etc/env/base/proof_data_handler.toml
+++ b/etc/env/base/proof_data_handler.toml
@@ -1,3 +1,4 @@
 [proof_data_handler]
-http_port=3320
-proof_generation_timeout_in_secs=18000
+http_port = 3320
+proof_generation_timeout_in_secs = 18000
+tee_support = true
diff --git a/etc/env/base/rust.toml b/etc/env/base/rust.toml
index ba38b517249a..950e78a155a0 100644
--- a/etc/env/base/rust.toml
+++ b/etc/env/base/rust.toml
@@ -17,10 +17,20 @@ zksync_proof_data_handler=info,\
 zksync_shared_metrics=info,\
 zksync_node_test_utils=info,\
 zksync_vm_runner=info,\
+zksync_node_test_utils=info,\
+zksync_state_keeper=info,\
+zksync_reorg_detector=info,\
+zksync_consistency_checker=info,\
+zksync_metadata_calculator=info,\
+zksync_node_sync=info,\
+zksync_node_consensus=info,\
+zksync_contract_verification_server=info,\
+zksync_node_api_server=info,\
+zksync_tee_verifier_input_producer=info,\
 zksync_consensus_bft=info,\
 zksync_consensus_network=info,\
 zksync_consensus_storage=info,\
-zksync_core=debug,\
+zksync_core_leftovers=debug,\
 zksync_server=debug,\
 zksync_contract_verifier=debug,\
 zksync_dal=info,\
@@ -47,6 +57,7 @@ zksync_health_check=debug,\
 zksync_proof_fri_compressor=info,\
 vise_exporter=debug,\
 snapshots_creator=debug,\
+zksync_base_token_adjuster=debug,\
 """
 
 # `RUST_BACKTRACE` variable
diff --git a/etc/env/base/vm_runner.toml b/etc/env/base/vm_runner.toml
new file mode 100644
index 000000000000..c8f259efc3b7
--- /dev/null
+++ b/etc/env/base/vm_runner.toml
@@ -0,0 +1,11 @@
+# Configuration for the VM runner crate
+
+[vm_runner]
+
+[vm_runner.protective_reads]
+# Path to the directory that contains RocksDB with protective reads writer cache.
+db_path = "./db/main/protective_reads"
+# Amount of batches that can be processed in parallel.
+window_size = 3
+# All batches before this one (inclusive) are always considered to be processed.
+first_processed_batch = 0
diff --git a/etc/env/configs/dev_validium.toml b/etc/env/configs/dev_validium.toml
index d1b415180bce..5ed4ccb38e41 100644
--- a/etc/env/configs/dev_validium.toml
+++ b/etc/env/configs/dev_validium.toml
@@ -10,6 +10,9 @@ max_pubdata_per_batch=100000
 fee_model_version="V2"
 l1_batch_commit_data_generator_mode="Validium"
 
+[eth_sender]
+sender_pubdata_sending_mode="Custom"
+
 # This override will be removed soon but it is needed for now.
 [eth_sender.gas_adjuster]
 max_blob_base_fee=0
diff --git a/etc/env/configs/dev_validium_docker.toml b/etc/env/configs/dev_validium_docker.toml
index 4392ca8d2711..7e985cb974ab 100644
--- a/etc/env/configs/dev_validium_docker.toml
+++ b/etc/env/configs/dev_validium_docker.toml
@@ -19,6 +19,9 @@ fee_model_version = "V2"
 l1_batch_commit_data_generator_mode = "Validium"
 miniblock_iteration_interval = 50
 
+[eth_sender]
+sender_pubdata_sending_mode="Custom"
+
 [eth_client]
 web3_url = "http://reth:8545"
 
diff --git a/etc/env/configs/ext-node.toml b/etc/env/configs/ext-node.toml
index eef24cf60370..145b1455ab93 100644
--- a/etc/env/configs/ext-node.toml
+++ b/etc/env/configs/ext-node.toml
@@ -55,16 +55,26 @@ url = "http://127.0.0.1:3050"
 # Here we use TOML multiline strings: newlines will be trimmed.
 log = """\
 warn,\
+zksync_node_framework=info,\
+zksync_node_consensus=info,\
 zksync_consensus_bft=info,\
 zksync_consensus_network=info,\
 zksync_consensus_storage=info,\
+zksync_commitment_generator=info,\
 zksync_core=debug,\
 zksync_dal=info,\
 zksync_db_connection=info,\
 zksync_health_check=debug,\
 zksync_eth_client=info,\
+zksync_state_keeper=info,\
+zksync_node_sync=info,\
 zksync_storage=info,\
+zksync_metadata_calculator=info,\
 zksync_merkle_tree=info,\
+zksync_node_api_server=info,\
+zksync_node_db_pruner=info,\
+zksync_reorg_detector=info,\
+zksync_consistency_checker=info,\
 zksync_state=debug,\
 zksync_utils=debug,\
 zksync_types=info,\
diff --git a/etc/env/configs/mainnet.toml b/etc/env/configs/mainnet.toml
new file mode 100644
index 000000000000..caca6c6a7cf7
--- /dev/null
+++ b/etc/env/configs/mainnet.toml
@@ -0,0 +1,31 @@
+__imports__ = ["base", "l1-inits/mainnet.env", "l2-inits/mainnet.init.env" ]
+L1_ENV_NAME = "mainnet"
+ZKSYNC_DEBUG_LOGS=true
+CHAIN_ETH_ZKSYNC_NETWORK_ID=324
+CONTRACTS_ERA_CHAIN_ID="324"
+ETH_CLIENT_WEB3_URL= ""
+MISC_ETHERSCAN_API_KEY = ""
+API_WEB3_JSON_RPC_HTTP_URL="https://zksync2-mainnet.zksync.io/"
+
+CHAIN_ETH_NETWORK = "mainnet"
+ETH_CLIENT_CHAIN_ID = 1
+CONTRACTS_CREATE2_FACTORY_ADDR="0xce0042b868300000d44a59004da54a005ffdcf9f"
+CONTRACTS_DIAMOND_PROXY_ADDR="0x32400084c286cf3e17e7b677ea9583e60a000324"
+CONTRACTS_ERA_DIAMOND_PROXY_ADDR="0x32400084c286cf3e17e7b677ea9583e60a000324"
+CONTRACTS_L1_WETH_TOKEN_ADDR="0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+CONTRACTS_L2_ERC20_BRIDGE_ADDR="0x11f943b2c77b743AB90f4A0Ae7d5A4e7FCA3E102"
+CONTRACTS_L2_SHARED_BRIDGE_ADDR="0x11f943b2c77b743AB90f4A0Ae7d5A4e7FCA3E102"
+CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR="0x57891966931Eb4Bb6FB81430E6cE0A03AAbDe063"
+CONTRACTS_BASE_TOKEN_ADDR="0x0000000000000000000000000000000000000001"
+CONTRACTS_GOVERNANCE_ADDR="0x0b622A2061EaccAE1c664eBC3E868b8438e03F61"
+CONTRACTS_VALIDATOR_TIMELOCK_EXECUTION_DELAY = "75600"
+CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT = "72000000"
+
+CONTRACTS_ERA_POST_DIAMOND_UPGRADE_FIRST_BATCH="0"
+CONTRACTS_ERA_POST_LEGACY_BRIDGE_UPGRADE_FIRST_BATCH="0"
+CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_BATCH="0"
+CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_TX_NUMBER="0"
+
+# this might be the wrong way around but it does not matter
+ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR="0x0D3250c3D5FAcb74Ac15834096397a3Ef790ec99"
+ETH_SENDER_SENDER_OPERATOR_BLOBS_ETH_ADDR="0x3527439923a63F8C13CF72b8Fe80a77f6e572092"
diff --git a/etc/env/configs/stage-proofs.toml b/etc/env/configs/stage-proofs.toml
new file mode 100644
index 000000000000..06ba6c6c9126
--- /dev/null
+++ b/etc/env/configs/stage-proofs.toml
@@ -0,0 +1,31 @@
+__imports__ = ["base", "l1-inits/stage-proofs.env", "l2-inits/stage-proofs.init.env" ]
+L1_ENV_NAME = "stage-proofs"
+ZKSYNC_DEBUG_LOGS=true
+CHAIN_ETH_ZKSYNC_NETWORK_ID=271
+CONTRACTS_ERA_CHAIN_ID="271"
+ETH_CLIENT_WEB3_URL= ""
+MISC_ETHERSCAN_API_KEY = ""
+API_WEB3_JSON_RPC_HTTP_URL="https://dev-api.era-stage-proofs.zksync.dev/"
+
+CHAIN_ETH_NETWORK = "sepolia"
+ETH_CLIENT_CHAIN_ID = 11155111
+CONTRACTS_CREATE2_FACTORY_ADDR="0xce0042b868300000d44a59004da54a005ffdcf9f"
+CONTRACTS_DIAMOND_PROXY_ADDR="0x5BBdEDe0F0bAc61AA64068b60379fe32ecc0F96C"
+CONTRACTS_ERA_DIAMOND_PROXY_ADDR="0x5BBdEDe0F0bAc61AA64068b60379fe32ecc0F96C"
+CONTRACTS_L1_WETH_TOKEN_ADDR="0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"
+CONTRACTS_L2_ERC20_BRIDGE_ADDR="0x5978EE0398104a68De718c70cB60a4afdeD07EEE"
+CONTRACTS_L2_SHARED_BRIDGE_ADDR="0x5978EE0398104a68De718c70cB60a4afdeD07EEE"
+CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR="0x26d60F0ac5dd7a8DBE98DCf20c0F4b057Ed62775"
+CONTRACTS_BASE_TOKEN_ADDR="0x0000000000000000000000000000000000000001"
+CONTRACTS_GOVERNANCE_ADDR="0xbF4B985eACb623aAFd0B90D9F8C794fa8585edE9"
+CONTRACTS_VALIDATOR_TIMELOCK_EXECUTION_DELAY = 0 
+CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT = "72000000"
+
+CONTRACTS_ERA_POST_DIAMOND_UPGRADE_FIRST_BATCH="3431"
+CONTRACTS_ERA_POST_LEGACY_BRIDGE_UPGRADE_FIRST_BATCH="3431"
+CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_BATCH="3435"
+CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_TX_NUMBER="13"
+
+# this might be the wrong way around but it does not matter
+ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR="0x1edC35c96144E77e162e5FbA34343078dab63acD"
+ETH_SENDER_SENDER_OPERATOR_BLOBS_ETH_ADDR="0x1230007ae8529E38721669Af4D2fAbc769f0FB21"
diff --git a/etc/env/configs/stage.toml b/etc/env/configs/stage.toml
new file mode 100644
index 000000000000..e79968875308
--- /dev/null
+++ b/etc/env/configs/stage.toml
@@ -0,0 +1,29 @@
+__imports__ = ["base", "l1-inits/stage.env", "l2-inits/stage.init.env" ]
+ZKSYNC_DEBUG_LOGS=true
+CHAIN_ETH_ZKSYNC_NETWORK_ID=270
+CONTRACTS_ERA_CHAIN_ID="270"
+ETH_CLIENT_WEB3_URL= ""
+MISC_ETHERSCAN_API_KEY = ""
+API_WEB3_JSON_RPC_HTTP_URL="https://z2-dev-api.zksync.dev/"
+
+CHAIN_ETH_NETWORK = "sepolia"
+ETH_CLIENT_CHAIN_ID = 11155111
+CONTRACTS_CREATE2_FACTORY_ADDR="0xce0042b868300000d44a59004da54a005ffdcf9f"
+CONTRACTS_DIAMOND_PROXY_ADDR="0x6d6e010A2680E2E5a3b097ce411528b36d880EF6"
+CONTRACTS_ERA_DIAMOND_PROXY_ADDR="0x6d6e010A2680E2E5a3b097ce411528b36d880EF6"
+CONTRACTS_L1_WETH_TOKEN_ADDR="0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"
+CONTRACTS_L2_ERC20_BRIDGE_ADDR="0xCEB8d4888d2025aEaAD0272175281e0CaFC33152"
+CONTRACTS_L2_SHARED_BRIDGE_ADDR="0xCEB8d4888d2025aEaAD0272175281e0CaFC33152"
+CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR="0x7303B5Ce64f1ADB0558572611a0b90620b6dd5F4"
+CONTRACTS_BASE_TOKEN_ADDR="0x0000000000000000000000000000000000000001"
+CONTRACTS_GOVERNANCE_ADDR="0xEE73438083629026FAfA1f5F5bBE2bBD6Bad6331"
+CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT = "72000000"
+
+CONTRACTS_ERA_POST_DIAMOND_UPGRADE_FIRST_BATCH="522912"
+CONTRACTS_ERA_POST_LEGACY_BRIDGE_UPGRADE_FIRST_BATCH="522910"
+CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_BATCH="524274"
+CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_TX_NUMBER="0"
+
+# this might be the wrong way around but it does not matter
+ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR="0x85b7B2fCFd6d3E5C063e7a5063359f4e6B3fec29"
+ETH_SENDER_SENDER_OPERATOR_BLOBS_ETH_ADDR="0x9E0b6Bd7Ed925e5629bd46f8b9D55dAfE9c827d8"
diff --git a/etc/env/configs/testnet.toml b/etc/env/configs/testnet.toml
new file mode 100644
index 000000000000..f4510f38cccc
--- /dev/null
+++ b/etc/env/configs/testnet.toml
@@ -0,0 +1,29 @@
+__imports__ = ["base", "l1-inits/testnet.env", "l2-inits/testnet.init.env" ]
+ZKSYNC_DEBUG_LOGS=true
+CHAIN_ETH_ZKSYNC_NETWORK_ID=300
+CONTRACTS_ERA_CHAIN_ID="300"
+ETH_CLIENT_WEB3_URL= ""
+MISC_ETHERSCAN_API_KEY = ""
+API_WEB3_JSON_RPC_HTTP_URL="https://sepolia.era.zksync.dev"
+
+CHAIN_ETH_NETWORK = "sepolia"
+ETH_CLIENT_CHAIN_ID = 11155111
+CONTRACTS_CREATE2_FACTORY_ADDR="0xce0042b868300000d44a59004da54a005ffdcf9f"
+CONTRACTS_DIAMOND_PROXY_ADDR="0x9A6DE0f62Aa270A8bCB1e2610078650D539B1Ef9"
+CONTRACTS_ERA_DIAMOND_PROXY_ADDR="0x9A6DE0f62Aa270A8bCB1e2610078650D539B1Ef9"
+CONTRACTS_L1_WETH_TOKEN_ADDR="0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"
+CONTRACTS_L2_ERC20_BRIDGE_ADDR="0x681A1AFdC2e06776816386500D2D461a6C96cB45"
+CONTRACTS_L2_SHARED_BRIDGE_ADDR="0x681A1AFdC2e06776816386500D2D461a6C96cB45"
+CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR="0x2Ae09702F77a4940621572fBcDAe2382D44a2cbA"
+CONTRACTS_BASE_TOKEN_ADDR="0x0000000000000000000000000000000000000001"
+CONTRACTS_GOVERNANCE_ADDR="0x62E77441531b4B045a6B6f4891be4AdBA7eD4d88"
+CONTRACTS_PRIORITY_TX_MAX_GAS_LIMIT = "72000000"
+
+CONTRACTS_ERA_POST_DIAMOND_UPGRADE_FIRST_BATCH="8801"
+CONTRACTS_ERA_POST_LEGACY_BRIDGE_UPGRADE_FIRST_BATCH="8801"
+CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_BATCH="8807"
+CONTRACTS_ERA_LEGACY_UPGRADE_LAST_DEPOSIT_TX_NUMBER="109"
+
+# this might be the wrong way around but it does not matter
+ETH_SENDER_SENDER_OPERATOR_COMMIT_ETH_ADDR="0xEdAdb6F5B5B8A69a162F5eC56e9B1b067f09780d"
+ETH_SENDER_SENDER_OPERATOR_BLOBS_ETH_ADDR="0x1B6B037B02Bee131391244838364c89D6C8D4b3f"
diff --git a/etc/env/consensus_config.yaml b/etc/env/consensus_config.yaml
index 2b1b543b34f5..4a1f24c58e71 100644
--- a/etc/env/consensus_config.yaml
+++ b/etc/env/consensus_config.yaml
@@ -2,3 +2,11 @@ server_addr: '127.0.0.1:3054'
 public_addr: '127.0.0.1:3054'
 max_payload_size: 2500000
 gossip_dynamic_inbound_limit: 1
+# LOCALHOST TEST CONFIGURATION ONLY, don't copy to other environments.
+genesis_spec:
+  chain_id: 1337
+  protocol_version: 1
+  validators:
+    - key: 'validator:public:bls12_381:b14e3126668ae79e689a2d65c56522889a3812ef5433097c33bd7af601b073dcdddf46e188883aa381725c49e08f90c705df1f78bf918e1978912cebeadff0d0084b1a4fe2ddee243e826348045f528803207f5de303c6a95bc1a701a190dbcf'
+      weight: 1
+  leader: 'validator:public:bls12_381:b14e3126668ae79e689a2d65c56522889a3812ef5433097c33bd7af601b073dcdddf46e188883aa381725c49e08f90c705df1f78bf918e1978912cebeadff0d0084b1a4fe2ddee243e826348045f528803207f5de303c6a95bc1a701a190dbcf'
diff --git a/etc/env/dev.toml b/etc/env/dev.toml
index b50b6ecc5bfc..92e3de295fbb 100644
--- a/etc/env/dev.toml
+++ b/etc/env/dev.toml
@@ -1,6 +1,5 @@
 [_metadata]
 base = [
-    'base/alerts.toml',
     'base/api.toml',
     'base/chain.toml',
     'base/contract_verifier.toml',
diff --git a/etc/env/file_based/contracts.yaml b/etc/env/file_based/contracts.yaml
index 37f8d0fd7e43..e6f175a2727a 100644
--- a/etc/env/file_based/contracts.yaml
+++ b/etc/env/file_based/contracts.yaml
@@ -11,7 +11,6 @@ l2:
 bridges:
   erc20:
     l1_address: "0x0000000000000000000000000000000000000000"
-    l2_address: "0x0000000000000000000000000000000000000000"
   shared:
     l1_address: "0x0000000000000000000000000000000000000000"
     l2_address: "0x0000000000000000000000000000000000000000"
diff --git a/etc/env/file_based/external_node.yaml b/etc/env/file_based/external_node.yaml
new file mode 100644
index 000000000000..675baf739686
--- /dev/null
+++ b/etc/env/file_based/external_node.yaml
@@ -0,0 +1,6 @@
+l1_chain_id: 9
+l2_chain_id: 270
+l1_batch_commit_data_generator_mode: Rollup
+
+main_node_url: http://localhost:3050
+main_node_rate_limit_rps: 1000
diff --git a/etc/env/file_based/general.yaml b/etc/env/file_based/general.yaml
index f1e94e0dff0a..4a258a7cd99d 100644
--- a/etc/env/file_based/general.yaml
+++ b/etc/env/file_based/general.yaml
@@ -1,6 +1,4 @@
 postgres:
-  server_url: postgres://postgres:notsecurepassword@localhost/zksync_local
-  prover_url: postgres://postgres:notsecurepassword@localhost/prover_local
   max_connections: 100
   statement_timeout_sec: 300
   test:
@@ -65,6 +63,7 @@ api:
     estimate_gas_scale_factor: 1.2
     estimate_gas_acceptable_overestimation: 1000
     max_tx_size: 1000000
+    api_namespaces: [ eth,net,web3,zks,pubsub,debug ]
     max_response_body_size_overrides:
       - method: eth_getTransactionReceipt # no size specified, meaning no size limit
       - method: zks_getProof
@@ -93,6 +92,7 @@ state_keeper:
   validation_computational_gas_limit: 300000
   save_call_traces: true
   max_circuits_per_batch: 24100
+  protective_reads_persistence_enabled: true
 mempool:
   delay_interval: 100
   sync_interval_ms: 10
@@ -117,7 +117,6 @@ circuit_breaker:
   replication_lag_limit_sec: 100
   http_req_retry_interval_sec: 2
 eth:
-  web3_url: http://127.0.0.1:8545
   sender:
     wait_confirmations: 1
     tx_poll_period: 1
@@ -131,10 +130,9 @@ eth:
     aggregated_block_execute_deadline: 10
     timestamp_criteria_max_allowed_lag: 30
     max_eth_tx_data_size: 120000
-    aggregated_proof_sizes: [ 1,4 ]
+    aggregated_proof_sizes: [ 1 ]
     max_aggregated_tx_gas: 4000000
     max_acceptable_priority_fee_in_gwei: 100000000000
-    proof_loading_mode: OLD_PROOF_FROM_DB
     pubdata_sending_mode: BLOBS
   gas_adjuster:
     default_priority_fee_per_gas: 1000000000
@@ -160,7 +158,11 @@ snapshot_creator:
 
 
 prover:
-  object_store:
+  prover_object_store:
+    file_backed:
+      file_backed_base_path: artifacts
+    max_retries: 10
+  public_object_store:
     file_backed:
       file_backed_base_path: artifacts
     max_retries: 10
@@ -187,6 +189,10 @@ witness_vector_generator:
   prometheus_push_interval_ms: 100
   specialized_group_id: 100
   max_prover_reservation_duration_in_secs: 1000
+data_handler:
+  http_port: 3320
+  proof_generation_timeout_in_secs: 18000
+  tee_support: true
 prover_gateway:
   api_url: http://127.0.0.1:3320
   api_poll_duration_secs: 1000
@@ -200,8 +206,8 @@ proof_compressor:
   prometheus_push_interval_ms: 100
   generation_timeout_in_secs: 3600
   max_attempts: 5
-  universal_setup_path: keys/setup/setup_2^26.key
-  universal_setup_download_url: https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2^26.key
+  universal_setup_path: keys/setup/setup_2^24.key
+  universal_setup_download_url: https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2^24.key
   verify_wrapper_proof: true
 prover_group:
   group_0:
@@ -289,6 +295,8 @@ prover_group:
       aggregation_round: 1
     - circuit_id: 18
       aggregation_round: 1
+base_token_adjuster:
+  price_polling_interval_ms: 30000
 
 house_keeper:
   l1_batch_metrics_reporting_interval_ms: 10000
@@ -313,7 +321,7 @@ prometheus:
 
 observability:
   log_format: plain
-  log_directives: "zksync_node_framework=info,zksync_block_reverter=info,zksync_commitment_generator=info,zksync_node_db_pruner=info,zksync_eth_sender=info,zksync_node_fee_model=info,zksync_node_genesis=info,zksync_house_keeper=info,zksync_proof_data_handler=info,zksync_shared_metrics=info,zksync_node_test_utils=info,zksync_vm_runner=info,zksync_consensus_bft=info,zksync_consensus_network=info,zksync_consensus_storage=info,zksync_core=debug,zksync_server=debug,zksync_contract_verifier=debug,zksync_dal=info,zksync_db_connection=info,zksync_eth_client=info,zksync_eth_watch=debug,zksync_storage=info,zksync_db_manager=info,zksync_merkle_tree=info,zksync_state=debug,zksync_utils=debug,zksync_queued_job_processor=info,zksync_types=info,zksync_mempool=debug,loadnext=info,vm=info,zksync_object_store=info,zksync_external_node=info,zksync_witness_generator=info,zksync_prover_fri=info,zksync_witness_vector_generator=info,zksync_web3_decl=debug,zksync_health_check=debug,zksync_proof_fri_compressor=info,vise_exporter=debug,snapshots_creator=debug"
+  log_directives: "zksync_node_test_utils=info,zksync_state_keeper=info,zksync_reorg_detector=info,zksync_consistency_checker=info,zksync_metadata_calculator=info,zksync_node_sync=info,zksync_node_consensus=info,zksync_contract_verification_server=info,zksync_node_api_server=info,zksync_tee_verifier_input_producer=info,zksync_node_framework=info,zksync_block_reverter=info,zksync_commitment_generator=info,zksync_node_db_pruner=info,zksync_eth_sender=info,zksync_node_fee_model=info,zksync_node_genesis=info,zksync_house_keeper=info,zksync_proof_data_handler=info,zksync_shared_metrics=info,zksync_node_test_utils=info,zksync_vm_runner=info,zksync_consensus_bft=info,zksync_consensus_network=info,zksync_consensus_storage=info,zksync_core_leftovers=debug,zksync_server=debug,zksync_contract_verifier=debug,zksync_dal=info,zksync_db_connection=info,zksync_eth_client=info,zksync_eth_watch=debug,zksync_storage=info,zksync_db_manager=info,zksync_merkle_tree=info,zksync_state=debug,zksync_utils=debug,zksync_queued_job_processor=info,zksync_types=info,zksync_mempool=debug,loadnext=info,vm=info,zksync_object_store=info,zksync_external_node=info,zksync_witness_generator=info,zksync_prover_fri=info,zksync_witness_vector_generator=info,zksync_web3_decl=debug,zksync_health_check=debug,zksync_proof_fri_compressor=info,vise_exporter=error,snapshots_creator=debug,zksync_base_token_adjuster=debug"
   sentry:
     url: unset
     panic_interval: 1800
@@ -322,8 +330,31 @@ observability:
   opentelemetry:
     endpoint: unset
     level: debug
-  sporadic_crypto_errors_substrs:
-    - "EventDestroyErr"
-    - "Can't free memory of DeviceBuf"
-    - "value: PoisonError"
 
+protective_reads_writer:
+  db_path: "./db/main/protective_reads"
+  window_size: 3
+  first_processed_batch: 0
+
+snapshot_recovery:
+  enabled: false
+  postgres:
+    max_concurrency: 10
+  tree:
+    chunk_size: 200000
+  experimental:
+    tree_recovery_parallel_persistence_buffer: 1
+    drop_storage_key_preimages: true
+pruning:
+  enabled: true
+  chunk_size: 10
+  removal_delay_sec: 60
+  data_retention_sec: 3600
+
+commitment_generator:
+  max_parallelism: 10
+
+core_object_store:
+  file_backed:
+    file_backed_base_path: artifacts
+  max_retries: 10
diff --git a/etc/env/file_based/genesis.yaml b/etc/env/file_based/genesis.yaml
index 8fc3b4136326..e3513a8b6421 100644
--- a/etc/env/file_based/genesis.yaml
+++ b/etc/env/file_based/genesis.yaml
@@ -1,6 +1,8 @@
 genesis_root: 0xabdb766b18a479a5c783a4b80e12686bc8ea3cc2d8a3050491b701d72370ebb5
 genesis_rollup_leaf_index: 54
 genesis_batch_commitment: 0x2d00e5f8d77afcebf58a6b82ae56ba967566fe7dfbcb6760319fb0d215d18ffd
+genesis_protocol_semantic_version: '0.24.0'
+# deprecated
 genesis_protocol_version: 24
 default_aa_hash: 0x01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e32
 bootloader_hash: 0x010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e
@@ -8,9 +10,9 @@ l1_chain_id: 9
 l2_chain_id: 270
 fee_account: '0x0000000000000000000000000000000000000001'
 prover:
-  recursion_scheduler_level_vk_hash: 0x6f7e6423c7241bb691c2ad291a8a3e8cb505091117ed8a38ade8f4224b8cf58e
+  recursion_scheduler_level_vk_hash: 0x712bb009b5d5dc81c79f827ca0abff87b43506a8efed6028a818911d4b1b521f
   recursion_node_level_vk_hash: 0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8
-  recursion_leaf_level_vk_hash: 0x435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f6
+  recursion_leaf_level_vk_hash: 0xffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb
   recursion_circuits_set_vks_hash: '0x0000000000000000000000000000000000000000000000000000000000000000'
   dummy_verifier: true
 l1_batch_commit_data_generator_mode: Rollup
diff --git a/etc/env/file_based/secrets.yaml b/etc/env/file_based/secrets.yaml
new file mode 100644
index 000000000000..a7a75f2c40b0
--- /dev/null
+++ b/etc/env/file_based/secrets.yaml
@@ -0,0 +1,10 @@
+database:
+  server_url: postgres://postgres:notsecurepassword@localhost/zksync_local
+  prover_url: postgres://postgres:notsecurepassword@localhost/prover_local
+l1:
+  l1_rpc_url: http://127.0.0.1:8545
+consensus:
+  # 'validator:public:bls12_381:b14e3126668ae79e689a2d65c56522889a3812ef5433097c33bd7af601b073dcdddf46e188883aa381725c49e08f90c705df1f78bf918e1978912cebeadff0d0084b1a4fe2ddee243e826348045f528803207f5de303c6a95bc1a701a190dbcf'
+  validator_key: 'validator:secret:bls12_381:3cf20d771450fcd0cbb3839b21cab41161af1554e35d8407a53b0a5d98ff04d4'
+  # 'node:public:ed25519:a9995979f228c91e4f387f7e141a9afe409196ee0c4fca0045c1c6b6e7892cb5'
+  node_key: 'node:secret:ed25519:9a40791b5a6b1627fc538b1ddecfa843bd7c4cd01fc0a4d0da186f9d3e740d7c'
diff --git a/etc/env/l1-inits/mainnet.env b/etc/env/l1-inits/mainnet.env
new file mode 100644
index 000000000000..1673e31510c3
--- /dev/null
+++ b/etc/env/l1-inits/mainnet.env
@@ -0,0 +1,18 @@
+CONTRACTS_GENESIS_UPGRADE_ADDR=0x3dDD7ED2AeC0758310A4C6596522FCAeD108DdA2
+CONTRACTS_VALIDATOR_TIMELOCK_ADDR=0x5D8ba173Dc6C3c90C8f7C04C9288BeF5FDbAd06E
+CONTRACTS_HYPERCHAIN_UPGRADE_ADDR=0xD719fca4433646CBD86F6b073EE364D36b856b1D
+CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR=0xC2a36181fB524a6bEfE639aFEd37A67e77d62cf1
+CONTRACTS_BRIDGEHUB_IMPL_ADDR=0x12f893689f9603991a8c22C249FFd0509Be95661
+CONTRACTS_BRIDGEHUB_PROXY_ADDR=0x303a465B659cBB0ab36eE643eA362c509EEb5213
+CONTRACTS_ADMIN_FACET_ADDR=0xF6F26b416CE7AE5e5FE224Be332C7aE4e1f3450a
+CONTRACTS_MAILBOX_FACET_ADDR=0xCDB6228b616EEf8Df47D69A372C4f725C43e718C
+CONTRACTS_GETTERS_FACET_ADDR=0xE60E94fCCb18a81D501a38959E532C0A85A1be89
+CONTRACTS_DIAMOND_INIT_ADDR=0x3C8bE122b2cf684230c54F891C917A8d7dc3Bef8
+CONTRACTS_STATE_TRANSITION_IMPL_ADDR=0x8279B7E48fA074f966385d87AEf29Bd031e54fD5
+CONTRACTS_STATE_TRANSITION_PROXY_ADDR=0xc2eE6b6af7d616f6e27ce7F4A451Aedc2b0F5f5C
+CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR=0xCba1aF8f0bB223b2544F8eB8f69d1c7960f788dB
+CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR=0xD7f9f54194C633F36CCD5F3da84ad4a1c38cB2cB
+CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR=0x8191975d8B0851C7f0740918896Cf298c09aA05E
+CONTRACTS_EXECUTOR_FACET_ADDR=0xaD193aDe635576d8e9f7ada71Af2137b16c64075
+CONTRACTS_VERIFIER_ADDR=0x70F3FBf8a427155185Ec90BED8a3434203de9604
+CONTRACTS_DEFAULT_UPGRADE_ADDR=0x4d376798Ba8F69cEd59642c3AE8687c7457e855d
diff --git a/etc/env/l1-inits/stage-proofs.env b/etc/env/l1-inits/stage-proofs.env
new file mode 100644
index 000000000000..2386cb448c1b
--- /dev/null
+++ b/etc/env/l1-inits/stage-proofs.env
@@ -0,0 +1,18 @@
+CONTRACTS_VERIFIER_ADDR=0xCDFDfbc04A58C79f0597E87E5dE680D0EdeABA9f
+CONTRACTS_EXECUTOR_FACET_ADDR=0x63f4c229F261c2576E8B5A405321769c08134c73
+CONTRACTS_DEFAULT_UPGRADE_ADDR=0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E
+CONTRACTS_GENESIS_UPGRADE_ADDR=0x1d2Fb190B100412Bc4C6e07f926E2855E50E03Ac
+CONTRACTS_VALIDATOR_TIMELOCK_ADDR=0x1A0EdA40D86213F6D0Ca233D9b33CDf66e2ef1ab
+CONTRACTS_HYPERCHAIN_UPGRADE_ADDR=0x706EA5608e5075f6a2eb9C8cf73C37ae9bc58A25
+CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR=0x93AEeE8d98fB0873F8fF595fDd534A1f288786D2
+CONTRACTS_BRIDGEHUB_IMPL_ADDR=0x1cEFbB67C5A98471157594454fDE61340b205feC
+CONTRACTS_BRIDGEHUB_PROXY_ADDR=0x7BDF7970F17278a6Ff75Fdbc671E870b0728ae41
+CONTRACTS_ADMIN_FACET_ADDR=0xE698A6Fb588A7B4f5b4C7478FCeC51aB8f869B36
+CONTRACTS_MAILBOX_FACET_ADDR=0x3aA2A5f021E546f4fe989Fc4b428099D1FA853F5
+CONTRACTS_GETTERS_FACET_ADDR=0x22588e7cac6770e43FB99961Db70c608c45D9924
+CONTRACTS_DIAMOND_INIT_ADDR=0xaee9C9FfDcDcB2165ab06E07D32dc7B46379aA3e
+CONTRACTS_STATE_TRANSITION_IMPL_ADDR=0x99D662d6eAf20bc0aAD185D58BdF945abfc8eDa2
+CONTRACTS_STATE_TRANSITION_PROXY_ADDR=0x925Dd0BC14552b0b261CA8A23ad26df9C6f2C8bA
+CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR=0xAADA1d8Ec8Bc342a642fAEC52F6b92A2ea4411F3
+CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR=0xc488a65b400769295f8C4b762AdCB3E6a036220b
+CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR=0x3aF396F034F64A3DC7A1c5F4295d6a827332f100
diff --git a/etc/env/l1-inits/stage.env b/etc/env/l1-inits/stage.env
new file mode 100644
index 000000000000..89a282a2dda1
--- /dev/null
+++ b/etc/env/l1-inits/stage.env
@@ -0,0 +1,17 @@
+CONTRACTS_VERIFIER_ADDR=0x82856fED36d36e1d4db24398bC2056C440cB45FC
+CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR=0x8fE595B3f92AA34962d7A8aF106Fa50A3e4FC6fA
+CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR=0x6F03861D12E6401623854E494beACd66BC46e6F0
+CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR=0x91E088D2F36500c4826E5623c9C14Dd90912c23E
+CONTRACTS_STATE_TRANSITION_PROXY_ADDR=0x8b448ac7cd0f18F3d8464E2645575772a26A3b6b
+CONTRACTS_STATE_TRANSITION_IMPL_ADDR=0xAe43B3ff4c95351B9B9FA0981968AC98eFc5AEbd
+CONTRACTS_DIAMOND_INIT_ADDR=0x17384Fd6Cc64468b69df514A940caC89B602d01c
+CONTRACTS_GETTERS_FACET_ADDR=0xbF4C2dfBe9E722F0A87E104c3af5780d49872745
+CONTRACTS_MAILBOX_FACET_ADDR=0x445aD49fC6d1845ec774783659aA5351381b0c49
+CONTRACTS_ADMIN_FACET_ADDR=0x21924127192db478faDf6Ae07f57df928EBCA6AE
+CONTRACTS_EXECUTOR_FACET_ADDR=0xd56f4696ecbE9ADc2e1539F5311ae6C92F4B2BAd
+CONTRACTS_BRIDGEHUB_PROXY_ADDR=0x236D1c3Ff32Bd0Ca26b72Af287E895627c0478cE
+CONTRACTS_BRIDGEHUB_IMPL_ADDR=0x22c456Cb8E657bD48e14E9a54CE20169d78CB0F7
+CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR=0xCb7F8e556Ef02771eA32F54e767D6F9742ED31c2
+CONTRACTS_HYPERCHAIN_UPGRADE_ADDR=0xc029cE1EB5C61C4a3B2a6EE920bb3B7b026bc00b
+CONTRACTS_VALIDATOR_TIMELOCK_ADDR=0x8D65310fe158734eEA3197FF9a6211F9Bba3D0A8
+CONTRACTS_GENESIS_UPGRADE_ADDR=0x1d2Fb190B100412Bc4C6e07f926E2855E50E03Ac
diff --git a/etc/env/l1-inits/testnet.env b/etc/env/l1-inits/testnet.env
new file mode 100644
index 000000000000..50e3b56af950
--- /dev/null
+++ b/etc/env/l1-inits/testnet.env
@@ -0,0 +1,19 @@
+CONTRACTS_VERIFIER_ADDR=0xAC3a2Dc46ceA843F0A9d6554f8804AeD18ff0795
+CONTRACTS_EXECUTOR_FACET_ADDR=0x200CAf816BCdd94123d3C18488741d4e4fA40ba6
+CONTRACTS_DEFAULT_UPGRADE_ADDR=0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E
+CONTRACTS_GENESIS_UPGRADE_ADDR=0xc7e2CCe185d9A55F654280DdDbaEaBfA7b9a0C96
+CONTRACTS_VALIDATOR_TIMELOCK_ADDR=0xD3876643180A79d0A56d0900C060528395f34453
+CONTRACTS_HYPERCHAIN_UPGRADE_ADDR=0x4d376798Ba8F69cEd59642c3AE8687c7457e855d
+CONTRACTS_TRANSPARENT_PROXY_ADMIN_ADDR=0x0358BACa94dcD7931B7BA7aAf8a5Ac6090E143a5
+CONTRACTS_BRIDGEHUB_IMPL_ADDR=0x206587142ce5AC36C98F522e42e30e8139D1De30
+CONTRACTS_BRIDGEHUB_PROXY_ADDR=0x35A54c8C757806eB6820629bc82d90E056394C92
+CONTRACTS_ADMIN_FACET_ADDR=0x96b40174102c93155cdB46a5E4691EEB6c4e1B7B
+CONTRACTS_MAILBOX_FACET_ADDR=0x550cf73F4b50aA0DF0257f2D07630D48fA00f73a
+CONTRACTS_GETTERS_FACET_ADDR=0x183a8459E2a4440f364BeC5040d8327bBB619Be3
+CONTRACTS_DIAMOND_INIT_ADDR=0x27A7F18106281fE53d371958E8bC3f833694D24a
+CONTRACTS_STATE_TRANSITION_IMPL_ADDR=0x3e7B9b5daD3E70d490A31dD93094e91739B39215
+CONTRACTS_STATE_TRANSITION_PROXY_ADDR=0x4e39E90746A9ee410A8Ce173C7B96D3AfEd444a5
+CONTRACTS_L1_SHARED_BRIDGE_IMPL_ADDR=0x3658e4a9130E4023bf92a7D7DdAa2698240D82Bc
+CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR=0x3E8b2fe58675126ed30d0d12dea2A9bda72D18Ae
+CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR=0xba7e1C3C4d6dAf4cee0D351BB888D01b548B8960
+CONTRACTS_GOVERNANCE_ADDR=0x62e77441531b4B045a6B6f4891be4AdBA7eD4d88
diff --git a/etc/env/l2-inits/mainnet.init.env b/etc/env/l2-inits/mainnet.init.env
new file mode 100644
index 000000000000..18d79d5b6147
--- /dev/null
+++ b/etc/env/l2-inits/mainnet.init.env
@@ -0,0 +1 @@
+CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR=0x470afaacce2acdaefcc662419b74c79d76c914ae
diff --git a/etc/env/l2-inits/stage-proofs.init.env b/etc/env/l2-inits/stage-proofs.init.env
new file mode 100644
index 000000000000..6cd45f3266ca
--- /dev/null
+++ b/etc/env/l2-inits/stage-proofs.init.env
@@ -0,0 +1 @@
+CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR=0x16ef518222299b363519c39e5471487bcc243fe4
diff --git a/etc/env/l2-inits/stage.init.env b/etc/env/l2-inits/stage.init.env
new file mode 100644
index 000000000000..0961076a4d75
--- /dev/null
+++ b/etc/env/l2-inits/stage.init.env
@@ -0,0 +1 @@
+CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR=0xce0a8c005a73e35d95cec41a9e8b75668470fb8f
diff --git a/etc/env/l2-inits/testnet.init.env b/etc/env/l2-inits/testnet.init.env
new file mode 100644
index 000000000000..d6dabe260290
--- /dev/null
+++ b/etc/env/l2-inits/testnet.init.env
@@ -0,0 +1 @@
+CONTRACTS_L2_SHARED_BRIDGE_IMPL_ADDR=0xf25a793eda9e961db8b56dc0aae77fc8c958dd40
diff --git a/etc/pliconfig b/etc/pliconfig
new file mode 100644
index 000000000000..c1ec05c0137f
--- /dev/null
+++ b/etc/pliconfig
@@ -0,0 +1 @@
+PLI__DB_URL=postgres://postgres:notsecurepassword@localhost/prover_local
diff --git a/etc/test_config/README.md b/etc/test_config/README.md
index ac7ecffd4ec7..3ec67f196736 100644
--- a/etc/test_config/README.md
+++ b/etc/test_config/README.md
@@ -1,6 +1,6 @@
-# Test data for zkSync
+# Test data for ZKsync
 
-This folder contains the data required for various zkSync tests.
+This folder contains the data required for various ZKsync tests.
 
 Directory contains three subfolders:
 
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/README.md b/etc/upgrades/1711451944-hyperchain-upgrade/README.md
new file mode 100644
index 000000000000..a8ce7c90b12b
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/README.md
@@ -0,0 +1,19 @@
+# Hyperchain upgrades
+
+We encountered multiple issues while doing the upgrade. Initially when upgrading stage from v22->v23 ( upgrade stage
+folder) we noticed some issues in the server. We fixed those, and afterwards upgraded stage-proofs and testnet
+(stage-proofs and testnet folders) directly to v24.
+
+We noticed issues with the prover here. We upgraded testnet and stage-proofs directly without changing the protocol
+version (stage-proofs-fix, testnet-fix), just changing the Verification keys, and we also did a hot fix on the Executor
+facet for Validium (a further small issue was that due to the new contracts the upgrade scripts changed to handle
+upgrades happening through the STM).
+
+We found a second similar issue in the prover, doing stage-proof-fix2 and testnet-fix2.
+
+We had further round of issues, we made updating the VKs much easier in the process. We introduced a new protocol
+version semver, so now we are upgrading to 0.24.1, with the .1 being the patch used for VK fixes.
+
+We upgraded stage to 0.24.1.
+
+We are upgrading mainnet directly from v22->0.24.1 with the prover fixes (mainnet folder) all together.
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/common.json b/etc/upgrades/1711451944-hyperchain-upgrade/common.json
index a0d72638671a..54f333578aff 100644
--- a/etc/upgrades/1711451944-hyperchain-upgrade/common.json
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/common.json
@@ -1,5 +1,5 @@
 {
   "name": "hyperchain-upgrade",
   "creationTimestamp": 1711451944,
-  "protocolVersion": "24"
+  "protocolVersion": "0.24.1"
 }
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/localhost/crypto.json b/etc/upgrades/1711451944-hyperchain-upgrade/localhost/crypto.json
deleted file mode 100644
index 85c3f37f33ba..000000000000
--- a/etc/upgrades/1711451944-hyperchain-upgrade/localhost/crypto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "verifier": {
-    "address": "0x3b504cD804b65735b1346fe4aFEfc4B3478518b1",
-    "txHash": "0x1f39124e7dded035a620893118e70a3554a798ed3ca8f410b7e0c438f4e976f5"
-  },
-  "keys": {
-    "recursionNodeLevelVkHash": "0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080",
-    "recursionLeafLevelVkHash": "0x400a4b532c6f072c00d1806ef299300d4c104f4ac55bd8698ade78894fcadc0a",
-    "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-  }
-}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/bridgeUgrade.json b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/bridgeUgrade.json
deleted file mode 100644
index 5db30f287fd5..000000000000
--- a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/bridgeUgrade.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "l2BridgeUpgrade": {
-        "schedule": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000005fe1dacc4e47823f85a74421515ca7361ea5f02b8ac7aed31564ef15a1a297860000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a0003240000000000000000000000000000000000000000000000000654099584706c0000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000244eb67241900000000000000000000000011f943b2c77b743ab90f4a0ae7d5a4e7fca3e102000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000022000000000000000000000000071d84c3404a6ae258e6471d4934b96a2033f943800000000000000000000000000000000000000000000000000000000000001044f1ef286000000000000000000000000470afaacce2acdaefcc662419b74c79d76c914ae00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000084a31ee5b0000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063010001211b0c33353cdf7a320f768e3dc40bce1326d639fcac099bba9ecd8e340000000000000000000000001c732a2061eaccae1c664ebc3e868b8438e050720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "execute": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000005fe1dacc4e47823f85a74421515ca7361ea5f02b8ac7aed31564ef15a1a297860000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a0003240000000000000000000000000000000000000000000000000654099584706c0000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000244eb67241900000000000000000000000011f943b2c77b743ab90f4a0ae7d5a4e7fca3e102000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000022000000000000000000000000071d84c3404a6ae258e6471d4934b96a2033f943800000000000000000000000000000000000000000000000000000000000001044f1ef286000000000000000000000000470afaacce2acdaefcc662419b74c79d76c914ae00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000084a31ee5b0000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063010001211b0c33353cdf7a320f768e3dc40bce1326d639fcac099bba9ecd8e340000000000000000000000001c732a2061eaccae1c664ebc3e868b8438e050720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "value": "456000000048000000"
-    },
-    "l1BridgeTransferAdmin": {
-        "schedule": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000004fa7041c2dd7ae4f5dfadca3f7248f2b9c3dea4340eb8d2bad94e445f6bde4cc0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde0630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000248f283970000000000000000000000000f2c1d17441074ffb18e9a918db81a17db175214600000000000000000000000000000000000000000000000000000000",
-        "execute": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000004fa7041c2dd7ae4f5dfadca3f7248f2b9c3dea4340eb8d2bad94e445f6bde4cc0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde0630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000248f283970000000000000000000000000f2c1d17441074ffb18e9a918db81a17db175214600000000000000000000000000000000000000000000000000000000",
-        "value": "0"
-    },
-    "l1BridgeUpgrade": {
-        "schedule": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000587b437f52256a45b3f8d167a466ffb69883ad7b22bd52e2f12ebd078fef01af00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000f2c1d17441074ffb18e9a918db81a17db175214600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004499a88ec400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000bf3d4109d65a66c629d1999fb630be2ee16d703800000000000000000000000000000000000000000000000000000000",
-        "execute": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000587b437f52256a45b3f8d167a466ffb69883ad7b22bd52e2f12ebd078fef01af00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000f2c1d17441074ffb18e9a918db81a17db175214600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004499a88ec400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000bf3d4109d65a66c629d1999fb630be2ee16d703800000000000000000000000000000000000000000000000000000000",
-        "value": "0"
-    },
-    "acceptAdminBridgehub":{
-        "schedule": "0x2c431917000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000023c1a25bc99b1a92daa73220a13887a1c270c12f3806be8f83b865b1b025ebdf000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000005b5c82f4da996e118b127880492a23391376f65c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040e18b68100000000000000000000000000000000000000000000000000000000",
-        "execute": "0x74da756b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000023c1a25bc99b1a92daa73220a13887a1c270c12f3806be8f83b865b1b025ebdf000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000005b5c82f4da996e118b127880492a23391376f65c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040e18b68100000000000000000000000000000000000000000000000000000000",
-        "value": "0"
-    },
-    "acceptAdminSTM":{
-        "schedule": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000bf1c162511466174ca19b1a984c8142dbb44e15c7724191fe15b9de8bbd3d0b900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040e18b68100000000000000000000000000000000000000000000000000000000",
-        "execute": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000bf1c162511466174ca19b1a984c8142dbb44e15c7724191fe15b9de8bbd3d0b900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040e18b68100000000000000000000000000000000000000000000000000000000",
-        "value": "0"
-    }, 
-    "governanceAcceptOwnership": {
-        "schedule": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000000000000000000000000000000000000000000260000000000000000000000000c2d7a7bd59a548249e64c1a587220c0e4f6f439e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba5097000000000000000000000000000000000000000000000000000000000000000000000000000000005b5c82f4da996e118b127880492a23391376f65c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000", 
-        "execute": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000000000000000000000000000000000000000000260000000000000000000000000c2d7a7bd59a548249e64c1a587220c0e4f6f439e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba5097000000000000000000000000000000000000000000000000000000000000000000000000000000005b5c82f4da996e118b127880492a23391376f65c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000",
-        "value": "0"
-    }
-}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/crypto.json b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/crypto.json
index 954bea1bb183..69f12e02300a 100644
--- a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/crypto.json
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/crypto.json
@@ -1,11 +1,11 @@
 {
   "verifier": {
-    "address": "0x9D6c59D9A234F585B367b4ba3C62e5Ec7A6179FD",
+    "address": "0x70F3FBf8a427155185Ec90BED8a3434203de9604",
     "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
   },
   "keys": {
     "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
-    "recursionLeafLevelVkHash": "0x435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f6",
+    "recursionLeafLevelVkHash": "0xf9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c6",
     "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
   }
 }
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facetCuts.json b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facetCuts.json
index 8127cded9548..540530019328 100644
--- a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facetCuts.json
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facetCuts.json
@@ -82,7 +82,7 @@
     "isFreezable": false
   },
   {
-    "facet": "0x342a09385E9BAD4AD32a6220765A6c333552e565",
+    "facet": "0xF6F26b416CE7AE5e5FE224Be332C7aE4e1f3450a",
     "selectors": [
       "0x0e18b681",
       "0x64bf8d66",
@@ -102,7 +102,7 @@
     "isFreezable": false
   },
   {
-    "facet": "0x345c6ca2F3E08445614f4299001418F125AD330a",
+    "facet": "0xE60E94fCCb18a81D501a38959E532C0A85A1be89",
     "selectors": [
       "0x1de72e34",
       "0xea6c029c",
@@ -125,6 +125,7 @@
       "0x0ec6b0b7",
       "0x33ce93fe",
       "0x06d49e5b",
+      "0xf5c1182c",
       "0x5518c73b",
       "0xdb1f0bf9",
       "0xb8c2f66f",
@@ -149,7 +150,7 @@
     "isFreezable": false
   },
   {
-    "facet": "0x7814399116C17F2750Ca99cBFD2b75bA9a0793d7",
+    "facet": "0xCDB6228b616EEf8Df47D69A372C4f725C43e718C",
     "selectors": [
       "0x12f43dab",
       "0x6c0960f9",
@@ -164,7 +165,7 @@
     "isFreezable": true
   },
   {
-    "facet": "0x1a451d9bFBd176321966e9bc540596Ca9d39B4B1",
+    "facet": "0xaD193aDe635576d8e9f7ada71Af2137b16c64075",
     "selectors": [
       "0x701f58c5",
       "0x6edd4f12",
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facets.json b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facets.json
index 5df987262eb5..1e34f3725f9a 100644
--- a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facets.json
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/facets.json
@@ -1,18 +1,18 @@
 {
     "ExecutorFacet": {
-        "address": "0x1a451d9bFBd176321966e9bc540596Ca9d39B4B1",
+        "address": "0xaD193aDe635576d8e9f7ada71Af2137b16c64075",
         "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
     },
     "AdminFacet": {
-        "address": "0x342a09385E9BAD4AD32a6220765A6c333552e565",
+        "address": "0xF6F26b416CE7AE5e5FE224Be332C7aE4e1f3450a",
         "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
     },
     "GettersFacet": {
-        "address": "0x345c6ca2F3E08445614f4299001418F125AD330a",
+        "address": "0xE60E94fCCb18a81D501a38959E532C0A85A1be89",
         "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
     },
     "MailboxFacet": {
-        "address": "0x7814399116C17F2750Ca99cBFD2b75bA9a0793d7",
+        "address": "0xCDB6228b616EEf8Df47D69A372C4f725C43e718C",
         "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
     }
 }
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/l2Upgrade.json b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/l2Upgrade.json
index 500513b18696..4013090fad73 100644
--- a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/l2Upgrade.json
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/l2Upgrade.json
@@ -376,7 +376,7 @@
     "maxFeePerGas": 0,
     "maxPriorityFeePerGas": 0,
     "paymaster": 0,
-    "nonce": "24",
+    "nonce": 24,
     "value": 0,
     "reserved": [
       0,
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/otherUgrades.json b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/otherUgrades.json
new file mode 100644
index 000000000000..5a33f109bef7
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/otherUgrades.json
@@ -0,0 +1,180 @@
+{
+    "l2BridgeUpgrade": {
+        "schedule": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000007f31345fc6e2cb84ffcfd8c3fc10530c1ef2ee711267934993f1ee696c42ecab0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a0003240000000000000000000000000000000000000000000000000654099584706c0000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000244eb67241900000000000000000000000011f943b2c77b743ab90f4a0ae7d5a4e7fca3e102000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000044aa20000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000220000000000000000000000000343ee72ddd8ccd80cd43d6adbc6c463a2de433a700000000000000000000000000000000000000000000000000000000000001044f1ef286000000000000000000000000470afaacce2acdaefcc662419b74c79d76c914ae00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000084a31ee5b0000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063010001211b0c33353cdf7a320f768e3dc40bce1326d639fcac099bba9ecd8e340000000000000000000000001c732a2061eaccae1c664ebc3e868b8438e050720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "execute": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000007f31345fc6e2cb84ffcfd8c3fc10530c1ef2ee711267934993f1ee696c42ecab0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a0003240000000000000000000000000000000000000000000000000654099584706c0000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000244eb67241900000000000000000000000011f943b2c77b743ab90f4a0ae7d5a4e7fca3e102000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000044aa20000000000000000000000000000000000000000000000000000000000000003200000000000000000000000000000000000000000000000000000000000000220000000000000000000000000343ee72ddd8ccd80cd43d6adbc6c463a2de433a700000000000000000000000000000000000000000000000000000000000001044f1ef286000000000000000000000000470afaacce2acdaefcc662419b74c79d76c914ae00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000084a31ee5b0000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063010001211b0c33353cdf7a320f768e3dc40bce1326d639fcac099bba9ecd8e340000000000000000000000001c732a2061eaccae1c664ebc3e868b8438e050720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+        "value": "456000000048000000"
+    },
+    "l1BridgeTransferProxyAdmin": {
+        "schedule": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000a195d0d43061f0625218b336fdda1e711a225c6d87e9e9fc217f335dd03c38960000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde0630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000248f283970000000000000000000000000c2a36181fb524a6befe639afed37a67e77d62cf100000000000000000000000000000000000000000000000000000000",
+        "execute": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000a195d0d43061f0625218b336fdda1e711a225c6d87e9e9fc217f335dd03c38960000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde0630000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000248f283970000000000000000000000000c2a36181fb524a6befe639afed37a67e77d62cf100000000000000000000000000000000000000000000000000000000",
+        "value": "0"
+    },
+    "l1BridgeUpgrade": {
+        "schedule": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000714ad8d07badbf96a33866ae1797912bfc86203a24f4d827172392496d8d412600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000c2a36181fb524a6befe639afed37a67e77d62cf100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004499a88ec400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde0630000000000000000000000008191975d8b0851c7f0740918896cf298c09aa05e00000000000000000000000000000000000000000000000000000000",
+        "execute": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000714ad8d07badbf96a33866ae1797912bfc86203a24f4d827172392496d8d412600000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000c2a36181fb524a6befe639afed37a67e77d62cf100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004499a88ec400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde0630000000000000000000000008191975d8b0851c7f0740918896cf298c09aa05e00000000000000000000000000000000000000000000000000000000",
+        "value": "0"
+    },
+    "governanceAcceptAdmin":{
+        "schedule": "0x2c431917000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040e18b68100000000000000000000000000000000000000000000000000000000000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb52130000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040e18b68100000000000000000000000000000000000000000000000000000000",
+        "execute": "0x74da756b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040e18b68100000000000000000000000000000000000000000000000000000000000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb52130000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000040e18b68100000000000000000000000000000000000000000000000000000000",
+        "value": "0"
+    }, 
+    "governanceAcceptOwnership": {
+        "schedule": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000002600000000000000000000000005d8ba173dc6c3c90c8f7c04c9288bef5fdbad06e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb521300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000", 
+        "execute": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000002600000000000000000000000005d8ba173dc6c3c90c8f7c04c9288bef5fdbad06e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb521300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000",
+        "value": "0"
+    },
+    "tokenMigrationScheduleArray":   [
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a49d7499271ae71cd8ab9ac515e6694c755d400c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ffffffff2ba8f66d4e51811c519099217693027800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bc396689893d065f41bc2c6ecbee5e008523344700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000471ea49dd8e60e697f4cac262b5fafcc307506e400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f655c8567e0f213e6c634cd2a68d992152161dc600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ba100000625a3754423978a60c9317c58a424e3d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000095b3497bbcccc46a8f45f5cf54b0878b39f8d96c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c17272c3e15074c55b810bceba02ba0c4481cd7900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9c53268e9de692ae1b2ea5216e24e1c3ad7cb1e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000063a3ae78711b52fb75a03acf9996f18ab611b87700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cda4e840411c00a614ad9205caec807c7458a0e300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005f64ab1544d28732f0a24f4713c2c8ec0da089f000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a487bf43cf3b10dffc97a9a744cbb7036965d3b900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004691937a7508860f876c9c0a2a617e7d9e945d4b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eeaa40b28a2d1b0b08f6f97bb1dd4b75316c610700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dddddd4301a082e62e84e43f474f04442392191800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000111111111117dc0aa78b770fa6a738034120c30200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c63e1f3fdae49e9ef5951ab5e84334a6934ce76700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000108a850856db3f85d0269a2693d896b394c8032500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004fabb145d64652a948d72533023f6e7a623c7c5300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c59900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006982508145454ce325ddbe47a25d4ec3d231193300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d38bb40815d2b0c2d2c866e0c72c5728ffc76dd900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d38e031f4529a07996aab977d2b79f0e00656c5600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006dea81c8171d0ba574754ef6f8b412f2ed88c54d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000076054592d1f789ea5958971fb3ba6628334faa8600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d33526068d116ce69f19a9ee46f0bd304f21a51f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae78736cd615f374d3085123a210448e74fc639300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000be9895146f7af43049ca1c1ae358b0541ea4970400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000459706cc06a2095266e623a5684126130e74b93000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001ed81e03d7ddb67a21755d02ed2f24da71c27c5500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fac77a24e52b463ba9857d6b758ba41ae20e31ff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a91ac63d040deb1b7a5e4d4134ad23eb0ba07e1400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e963e120f818f15420ea3dad0083289261923c2e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004e9e4ab99cfc14b852f552f5fb3aa68617825b6c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000021ead867c8c5181854f6f8ce71f75b173d2bc16a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000003bdffa70f4b4e6985eed50453c7c0d4a15dcec5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c6f5d26e9a9cfa5b917e049139ad9ccf5cddde6d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000defa4e8a7bcba345f687a2f1456f5edd9ce9720200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c91a71a1ffa3d8b22ba615ba1b9c01b2bbbf55ad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a7adc1b690e81c758f1bd0f72dfe27ae6ec56a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c6b50d3c36482cba08d2b60183ae17d75b90fdc900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007448c7456a97769f6cd04f1e83a4a23ccdc46abd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001571ed0bed4d987fe2b498ddbae7dfa19519f65100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cf0c122c6b73ff809c693db761e7baebe62b6a2e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000095ad61b0a150d79219dcf64e1e6cc01f0b64c4ce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bb94d52b84568beb26106f5cc66c29f352d85f8d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009ad37205d608b8b219e6a2573f922094cec5c20000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000097e3c21f27182498382f81e32fbe0ea3a0e3d79b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005c1d9aa868a30795f92fae903edc9eff269044bf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000054ea1c9fe9f3987eb2bc69e2b45ac1f19001406d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d41f3d112cb8695c7a8992e4055bd273f3ce872900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000a77ef9bf662d62fbf9ba4cf861eaa83f9cc4fec00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000423f4e6138e475d85cf7ea071ac92097ed631eea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e4815ae53b124e7263f08dcdbbb757d41ed658c600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009469d013805bffb7d3debe5e7839237e535ec48300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072e4f9f808c49a2a61de9c5896298920dc4eeea900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006eff556748ee452cbdaf31bcb8c76a28651509bd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000edcc68cc8b6ec3ede0979f8a52835b238a27202700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ff5b9f95dcaafc8204d4b6b156be2851ac7b604f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b64ef51c888972c908cfacf59b47c1afbc0ab8ac00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004bb3205bf648b7f59ef90dee0f1b62f6116bc7ca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a9c67fee641579deba04928c4bc45f66e26343a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000cec1a9154ff802e7934fc916ed7ca50bde6844e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005bec54282a1b57d5d7fde6330e2d4a78618f050800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000386e113221ccc785b0636898d8b379c1a11371300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bd8fdda057de7e0162b7a386bec253844b5e07a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008353b92201f19b4812eee32efd325f7ede12371800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f0655dcee37e5c0b70fffd70d85f88f8edf0aff600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000068592c5c98c4f4a8a4bc6da2121e65da3d1c091700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b6ed7644c69416d67b522e20bc294a9a9b405b3100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d533a949740bb3306d119cc777fa900ba034cd5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009be89d2a4cd102d8fecc6bf9da793be995c2254100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ea4a1fc739d8b70d16185950332158edfa85d3e800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000600204ae2db743d15dfa5cbbfb47bbca2ba0ac3c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072adadb447784dd7ab1f472467750fc485e4cb2d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007e743f75c2555a7c29068186feed7525d0fe919500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000069e5c11a7c30f0bf84a9faecbd5161aa7a94deca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b50721bcf8d664c30412cfbc6cf7a15145234ad100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe3e6a25e6b192a42a44ecddcd13796471735acf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000086715afa18d9fd7090d5c2e0f8e6e824a8723fba00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f629cbd94d3791c9250152bd8dfbdf380e2a3b9c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ed5464bd5c477b7f71739ce1d741b43e932b97b000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f411903cbc70a74d22900a5de66a2dda6650725500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d7c1eb0fe4a30d3b2a846c04aa6300888f087a5f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a0b73e1ff0b80914ab6fe0444e65848c4c34450b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a0c816a52e71a1e9b6719580ebe754709c5519800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009813037ee2218799597d83d4a5b6f3b6778218d900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000405be842cdb64b69470972eb83c07c2c0788d86400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000064f80550848eff3402c5880851b77dd82a1a71f300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cedefe438860d2789da6419b3a19cece2a41038d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cfa04b9bf3c346b2ac9d3121c1593ba8dd30bcd500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000af5191b0de278c7286d6c7cc6ab6bb8a73ba2cd600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009ee91f9f426fa633d227f7a9b000e28b9dfd859900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008c18d6a985ef69744b9d57248a45c0861874f24400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000085f17cf997934a597031b2e18a9ab6ebd4b9f6a400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000de30da39c46104798bb5aa3fe8b9e0e1f348163f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000f51bb10119727a7e5ea3538074fb341f56b09ad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a98fcbea516cf06857215779fd812ca3bef1b3200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d1d2eb1b1e90b638588728b4130137d262c87cae00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae86f48c0b00f2a3eaef4ba4c23d17368f0f63f400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000010ba1f6604af42ca96aeabca1df6c26fb057251500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000044ff8620b8ca30902395a7bd3f2407e1a091bf7300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e28b3b32b6c345a34ff64674606124dd5aceca3000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000467719ad09025fcc6cf6f8311755809d45a5e5f300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d5d86fc8d5c0ea1ac1ac5dfab6e529c9967a45e900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d31a59c85ae9d8edefec411d448f90841571b89c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000595832f8fc6bf59c85c527fec3740a1b7a36126900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007d1afa7b718fb893db30a3abc0cfc608aacfebb000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c2e2368d4f3efa84489bf3729c55afbc2fa0165200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b5b2d6acd78ac99d202a362b50ac3733a47a7c7b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009a48bd0ec040ea4f1d3147c025cd4076a2e71e3e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bbbbbbbb46a1da0f0c3f64522c275baa4c33263600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe67a4450907459c3e1fff623aa927dd4e28c67a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007659ce147d0e714454073a5dd7003544234b6aa000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001d4241f7370253c0f12efc536b7e16e462fb352600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d5f7838f5c461feff7fe49ea5ebaf7728bb0adfa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000022ee12dfebc4685ba2240d45893d4e479775b4cf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e2353069f71a27bbbe66eeabff05de109c7d5e1900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008f74a5d0a3ba170f2a43b1abba16c251f611500d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f951e335afb289353dc249e82926178eac7ded7800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001f9840a85d5af5bf1d1762f925bdaddc4201f98400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3f7ac3a68369975cff21dcbdb303383c5e203cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000788ddd6f2c13bdc00426deb67add5c057de8494100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004507cef57c46789ef8d1a19ea45f4216bae2b52800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000057f228e13782554feb8fe180738e12a70717cfae00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b4efd85c19999d84251304bda99e90b92300bd9300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000034be5b8c30ee4fde069dc878989686abe988447000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c5190e7fec4d97a3a3b1ab42dfedac608e2d079300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a2b0fde6d710e201d0d608e924a484d1a5fed57c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e55d97a97ae6a17706ee281486e98a84095d8aaf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007bfebd989ef62f7f794d9936908565da42fa6d7000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000fb765ddbd4d26ac524aa5990b0643d0ab6ac2fe00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000de67d97b8770dc98c746a3fc0093c538666eb49300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041f7b8b9b897276b7aae926a9016935280b44e9700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000012970e6868f88f6557b76120662c1b3e50a646bf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072577c54b897f2b10a136bf288360b6baaad92f200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e5f166c0d8872b68790061317bb6cca04582c91200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005114616637bec16b023c9e29632286bcea67012700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000772c44b5166647b135bb4836abc4e06c28e9497800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c834fa996fa3bec7aad3693af486ae53d8aa8b5000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006de037ef9ad2725eb40118bb1702ebb27e4aeb2400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a1290d69c65a6fe4df752f95823fae25cb99e5a700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f6aeaf0fe66cf2ef2e738ba465fb531ffe39b4e200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009b110fda4e20db18ad7052f8468a455de7449eb600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000084ca8bc7997272c7cfb4d0cd3d55cd942b3c941900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000430ef9263e76dae63c84292c3409d61c598e968200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066a0f676479cee1d7373f3dc2e2952778bff5bd600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000cf5003a5262e163fdbb26a9def389fd468e32cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a41d2f8ee4f47d3b860a149765a7df8c3287b7f000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000562e362876c8aee4744fc2c6aac8394c312d215d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005d80a8d8cb80696073e82407968600a37e1dd78000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cdcfc0f66c522fd086a1b725ea3c0eeb9f9e881400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000a58531518dba2009bdfbf1af79602bfd312fdf100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005de8ab7e27f6e7a1fff3e5b337584aa43961beef00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da31d0d1bc934fc34f7189e38a413ca0a5e8b44f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a1d0e215a23d7030842fc67ce582a6afa3ccab8300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000015e6e0d4ebeac120f9a97e71faa6a0235b85ed1200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009b8e9d523d1d6bc8eb209301c82c7d64d10b219e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000137ddb47ee24eaa998a535ab00378d6bfa84f89300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000088acdd2a6425c3faae4bc9650fd7e27e0bebb7ab00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b945e3f853b5f8033c8513cf3ce9f8ad9bebb1c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041ea5d41eeacc2d5c4072260945118a13bb7ebce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb3900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000001a500a6b18995b03f44bb040a5ffc28e45cb000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000048fb253446873234f2febbf9bdeaa72d9d387f9400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000062d0a8458ed7719fdaf978fe5929c6d342b0bfce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006adb5216796fd9d4a53f6cc407075c6c075d468a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000d8775f648430679a709e98d2b0cb6250d2887ef00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b131f4a55907b10d1f0a50d8ab8fa09ec342cd7400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dc8af07a7861bedd104b8093ae3e9376fc8596d200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004ee9968393d5ec65b215b9aa61e5598851f384f200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c5102fe9359fd9a28f877a67e36b0f050d81a3cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006c249b6f6492864d914361308601a7abb32e68f800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000304645590f197d99fad9fa1d05e7bcdc563e137800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000805c2077f3ab224d889f9c3992b41b2f4722c78700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008b5653ae095529155462eda8cf664ed96773f55700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eb2635c62b6b4dda7943928a1a6189df654c850e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004aac461c86abfa71e9d00d9a2cde8d74e4e1aeea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000607f4c5bb672230e8672085532f7e901544a737500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000077f76483399dc6328456105b1db23e2aca455bf900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000b38210ea11411557c13457d4da7dc6ea731b88a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000839e71613f9aa06e5701cf6de63e303616b0dde300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d13c7342e1ef687c5ad21b27c2b65d772cab5c8c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000073fbd93bfda83b111ddc092aa3a4ca77fd30d38000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066b658b7979abf71d212956f62bdd3630cc7f30900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004d5f47fa6a74757f35c14fd3a6ef8e3c9bc514e800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cd5fe23c85820f7b72d0926fc9b05b43e359b7ee00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008e199473348eb597d428d4ce950479771a10971500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000083e6f1e41cdd28eaceb20cb649155049fac3d5aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000061a35258107563f6b6f102ae25490901c8760b1200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bf5495efe5db9ce00f80364c8b423567e58d211000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008457ca5040ad67fdebbcc8edce889a335bc0fbfb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066580f80a00deafab4519dc33c35bf44d8a12b0000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000869b1f57380ae501d387b19262efd3c0eb7501b000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000000000007a58f5f58e697e51ab0357bc9e260a0400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000618e75ac90b12c6049ba3b27f5d5f8651b0037f600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002965395f71b7d97ede251e9b63e44dfa9647cc0a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a520e593f89c908cd2bc27d928bc75913c55c4200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000016aab4738843fb2d9eafc8fd261488797bf0df2900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000043ffdc962db6c1708e218751e7e8e9200915248600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004c11249814f11b9346808179cf06e71ac328c1b500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bcd29da38b66e2b7855c92080ebe82330ed2012a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000152649ea73beab28c5b49b26eb48f7ead6d4c89800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000003007083eaa95497cd6b2b809fb97b6a30bdf53d300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000056fd409e1d7a124bd7017459dfea2f387b6d5cd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9ca9523e5b5a42c3018c62b084db8543478c40000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002c489f6c2b728665f56691744f0336a5cc69ba9400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b627a1bf727f578384ba18b2a2b46f4fb924ab3b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004a0552f34f2237ce3d15ca69d09f65b7d7aa00bb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f57e7e7c23978c3caec3c3548e3d615c346e79ff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000178c820f862b14f316509ec36b13123da19a605400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c56c2b7e71b54d38aab6d52e94a04cbfa8f604fa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005973f93d1efbdcaa91ba2abc7ae1f6926434bcb600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e89c20096b636ffec9fd26d1a623f42a33ead30900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c57d533c50bc22247d49a368880fb49a1caa39f700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000033909c9ce97ce509dab3a038b3ec7ac3d1be323100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b0c7a3ba49c7a6eaba6cd4a96c55a1391070ac9a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e66b3aa360bb78468c00bebe163630269db3324f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000085f138bfee4ef8e540890cfb48f620571d67eda300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cb77467f6cf5cfc913ac5c757284d914ed086cf000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007e931f31b742977ed673de660e54540b4595944700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000175d9dfd6850aa96460e29bc0cead05756965e9100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005d74468b69073f809d4fae90afec439e69bf626300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000455e53cbb86018ac2b8092fdcd39d8444affc3f600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f250b1f6193941bb8bff4152d719edf1a59c0e6900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a23c1194d421f252b4e6d5edcc3205f7650a4ebe00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a8258abc8f2811dd48eccd209db68f25e3e3466700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000035b0ccc549776e927b8fa7f5fc7afe9f8652472c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041b6f91daa1509bfbe06340d756560c4a1d146fd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a07ef0b2523fd41f8fe80c3de1bc75861d86c5100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ecbee2fae67709f718426ddc3bf770b26b95ed2000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bddf3b5a786775f63c2c389b86cddadd04d5a7aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d514b77060e04b1ee7e15f6e1d3b5419e9f3277300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000032a7c02e79c4ea1008dd6564b35f131428673c4100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d9a442856c234a39a81a089c06451ebaa4306a7200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000207e14389183a94343942de7afbc607f5746061800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000967da4048cd07ab37855c090aaf366e4ce1b9f4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000003ee5026c07d85ff8ae791370dd0f4c1ae6c97fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002364bb6dea9cacd4f8541af761d3bcf3d86b26fd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000750a575284fad07fbf2fcc45eb26d1111afee16500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006368e1e18c4c419ddfc608a0bed1ccb87b9250fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fae103dc9cf190ed75350761e95403b7b8afa6c000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000060be1e1fe41c1370adaf5d8e66f07cf1c2df226800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e25bcec5d3801ce3a794079bf94adf1b8ccd802d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000097aeb5066e1a590e868b511457beb6fe99d329f500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000725440512cb7b78bf56b334e50e31707418231cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d9f79fc56839c696e2e9f63948337f49d164a01500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000516d813bc49b0eb556f9d09549f98443acdd7d8f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000054a7cee7b02976ace1bdd4afad87273251ed34cf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008e870d67f660d95d5be530380d0ec0bd388289e100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006732efaf6f39926346bef8b821a04b6361c4f3e500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000065e6b60ea01668634d68d0513fe814679f925bad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3ade5ace1bbb033ccae8177c12ecbfa16bd6a9d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009e32b13ce7f2e80a01932b42553652e053d6ed8e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f32cea5d29c060069372ab9385f6e292387d553500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004cf89ca06ad997bc732dc876ed2a7f26a9e7f36100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a35b1b31ce002fbf2058d22f30f95d405200a15b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d680fff1699ad71f52e29cb4c36010fee7b8d61b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000e573ce2736dd9637a0b21058352e1667925c7a800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d973637d6c982a492bdafe6956cc79163f279b2c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fc448180d5254a55846a37c86146407db48d2a3600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bc4171f45ef0ef66e76f979df021a34b46dcc81d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000163f8c2467924be0ae7b5347228cabf26031875300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000093581991f68dbae1ea105233b67f7fa0d6bdee7b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009144d8e206b98ed9c38f19d3e4760e278faab1c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae66e13e7ff6f505c6e53adfe47b2b9082b9e0ea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fac0403a24229d7e2edd994d50f5940624cbeac200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002de7b02ae3b1f11d51ca7b2495e9094874a064c000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d101dcc414f310268c37eeb4cd376ccfa507f57100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cfc006a32a98031c2338bf9d5ff8ed2c0cae4a9e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009d14bce1daddf408d77295bb1be9b343814f44de00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009fc86c5afb7b336367b8c1cf1f895dbfdd1ca06d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eb8eb73bbf1b0b3a8ef30e48447f47894bf6ffdb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b7df0f42fae30acf30c9a5ba147d6b792b5eb9d900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3d3bcb666588d8b58c921d3d297e04037ad466500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c78b628b060258300218740b1a7a5b3c82b3bd9f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008c30ba8e0b776d0b3654b72d737ecd668b26a19200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000046eee2cc3188071c02bfc1745a6b17c656e3f3d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000db82c0d91e057e05600c8f8dc836beb41da6df1400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000738865301a9b7dd80dc3666dd48cf034ec42bdda00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c9fe6e1c76210be83dc1b5b20ec7fd010b0b1d1500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000216c9bb7380cde431662e37e30098d838d7e1dc800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da546071dcbcec77e707acc6ee32328b91607a2300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002e2364966267b5d7d2ce6cd9a9b5bd19d9c7c6a900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002a2550e0a75acec6d811ae3930732f7f3ad6758800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f79c694605f29ddf3f0eb41319c38672ab6fa89f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ac57de9c1a09fec648e93eb98875b212db0d460b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f96459323030137703483b46fd59a71d712bf0aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006b3595068778dd592e39a122f4f5a5cf09c90fe200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007c9f4c87d911613fe9ca58b579f737911aad2d4300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f2eab3a2034d3f6b63734d2e08262040e3ff7b4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000669c01caf0edcad7c2b8dc771474ad937a7ca4af00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000828e0edf347bd53e57d64426c67f291d8c553a7000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000582d872a1b094fc48f5de31d3b73f2d9be47def100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008f3470a7388c05ee4e7af3d01d8c722b0ff5237400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000015f74458ae0bfdaa1a96ca1aa779d715cc1eefe400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000faba6f8e4a5e8ab82f62fe7c39859fa577269be300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000000000000ca73a6df4c58b84c5b4b847fe8ff3900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000025daf950c6e814dee4c96e13c98d3196d22e60c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e2bca705991ba5f1bb8a33610dba10d481379cd300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a636ee3f2c24748e9fc7fd8b577f7a629e879b4500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9bd51d756a3caf52348f2901b7eff9bd03398e700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000007150e919b4de5fd6a63de1f9384828396f25fdc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000093728f9b63edbb91739f4fbaa84890e5073e3d4f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000865377367054516e17014ccded1e7d814edc9ce400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000debe620609674f21b1089042527f420372ea98a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b58e61c3098d85632df34eecfb899a1ed80921cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe0c30065b384f05761f15d0cc899d4f9f9cc0eb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000726516b20c4692a6bea3900971a37e0ccf7a6bff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004a220e6096b25eadb88358cb44068a324825467500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000084018071282d4b2996272659d9c01cb08dd7327f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c944e90c64b2c07662a292be6244bdf05cda44a700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f65b5c5104c4fafd4b709d9d60a185eae063276c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000088df592f8eb5d7bd38bfef7deb0fbc02cf3778a000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cd4b21deadeebfcff202ce73e976012afad1136100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000036e66fbbce51e4cd5bd3c62b637eb411b18949d400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004c9edd5852cd905f086c759e8383e09bff1e68b300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dbb7a34bf10169d6d2d0d02a6cbb436cf4381bfa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b8c77482e45f1f44de1745f52c74426c631bdd5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000023ec026590d6cccfece04097f9b49ae6a442c3ba00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003400000000000000000000000000000000000000000000000000000000000000460000000000000000000000000000000000000000000000000000000000000058000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000008e0000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da7c0810ce6f8329786160bb3d1734cf6661ca6e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072e364f2abdc788b7e918bc238b21f109cd634d700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001b9ebb707d87fbec93c49d9f2d994ebb60461b9b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d3843c6be03520f45871874375d618b3c792301900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b6ff96b8a8d214544ca0dbc9b33f7ad6503efd3200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002b1d36f5b61addaf7da7ebbd11b35fd8cfb0de3100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e8a25c46d623f12b8ba08b583b6fe1bee3eb31c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000000000000000000000000000000000000000000100000000000000000000000032400084c286cf3e17e7b677ea9583e60a000324000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000"
+    ],
+    "tokenMigrationExecuteArray" : [
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a49d7499271ae71cd8ab9ac515e6694c755d400c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ffffffff2ba8f66d4e51811c519099217693027800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bc396689893d065f41bc2c6ecbee5e008523344700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000471ea49dd8e60e697f4cac262b5fafcc307506e400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f655c8567e0f213e6c634cd2a68d992152161dc600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ba100000625a3754423978a60c9317c58a424e3d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000095b3497bbcccc46a8f45f5cf54b0878b39f8d96c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c17272c3e15074c55b810bceba02ba0c4481cd7900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9c53268e9de692ae1b2ea5216e24e1c3ad7cb1e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000063a3ae78711b52fb75a03acf9996f18ab611b87700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cda4e840411c00a614ad9205caec807c7458a0e300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005f64ab1544d28732f0a24f4713c2c8ec0da089f000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a487bf43cf3b10dffc97a9a744cbb7036965d3b900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004691937a7508860f876c9c0a2a617e7d9e945d4b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eeaa40b28a2d1b0b08f6f97bb1dd4b75316c610700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dddddd4301a082e62e84e43f474f04442392191800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000111111111117dc0aa78b770fa6a738034120c30200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c63e1f3fdae49e9ef5951ab5e84334a6934ce76700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000108a850856db3f85d0269a2693d896b394c8032500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004fabb145d64652a948d72533023f6e7a623c7c5300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c59900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006982508145454ce325ddbe47a25d4ec3d231193300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d38bb40815d2b0c2d2c866e0c72c5728ffc76dd900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d38e031f4529a07996aab977d2b79f0e00656c5600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006dea81c8171d0ba574754ef6f8b412f2ed88c54d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000076054592d1f789ea5958971fb3ba6628334faa8600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d33526068d116ce69f19a9ee46f0bd304f21a51f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae78736cd615f374d3085123a210448e74fc639300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000be9895146f7af43049ca1c1ae358b0541ea4970400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000459706cc06a2095266e623a5684126130e74b93000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001ed81e03d7ddb67a21755d02ed2f24da71c27c5500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fac77a24e52b463ba9857d6b758ba41ae20e31ff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a91ac63d040deb1b7a5e4d4134ad23eb0ba07e1400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e963e120f818f15420ea3dad0083289261923c2e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004e9e4ab99cfc14b852f552f5fb3aa68617825b6c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000021ead867c8c5181854f6f8ce71f75b173d2bc16a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000003bdffa70f4b4e6985eed50453c7c0d4a15dcec5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c6f5d26e9a9cfa5b917e049139ad9ccf5cddde6d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000defa4e8a7bcba345f687a2f1456f5edd9ce9720200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c91a71a1ffa3d8b22ba615ba1b9c01b2bbbf55ad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a7adc1b690e81c758f1bd0f72dfe27ae6ec56a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c6b50d3c36482cba08d2b60183ae17d75b90fdc900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007448c7456a97769f6cd04f1e83a4a23ccdc46abd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001571ed0bed4d987fe2b498ddbae7dfa19519f65100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cf0c122c6b73ff809c693db761e7baebe62b6a2e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000095ad61b0a150d79219dcf64e1e6cc01f0b64c4ce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bb94d52b84568beb26106f5cc66c29f352d85f8d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009ad37205d608b8b219e6a2573f922094cec5c20000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000097e3c21f27182498382f81e32fbe0ea3a0e3d79b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005c1d9aa868a30795f92fae903edc9eff269044bf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000054ea1c9fe9f3987eb2bc69e2b45ac1f19001406d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d41f3d112cb8695c7a8992e4055bd273f3ce872900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000a77ef9bf662d62fbf9ba4cf861eaa83f9cc4fec00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000423f4e6138e475d85cf7ea071ac92097ed631eea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e4815ae53b124e7263f08dcdbbb757d41ed658c600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009469d013805bffb7d3debe5e7839237e535ec48300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072e4f9f808c49a2a61de9c5896298920dc4eeea900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006eff556748ee452cbdaf31bcb8c76a28651509bd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000edcc68cc8b6ec3ede0979f8a52835b238a27202700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ff5b9f95dcaafc8204d4b6b156be2851ac7b604f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b64ef51c888972c908cfacf59b47c1afbc0ab8ac00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004bb3205bf648b7f59ef90dee0f1b62f6116bc7ca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a9c67fee641579deba04928c4bc45f66e26343a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000cec1a9154ff802e7934fc916ed7ca50bde6844e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005bec54282a1b57d5d7fde6330e2d4a78618f050800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000386e113221ccc785b0636898d8b379c1a11371300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bd8fdda057de7e0162b7a386bec253844b5e07a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008353b92201f19b4812eee32efd325f7ede12371800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f0655dcee37e5c0b70fffd70d85f88f8edf0aff600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000068592c5c98c4f4a8a4bc6da2121e65da3d1c091700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b6ed7644c69416d67b522e20bc294a9a9b405b3100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d533a949740bb3306d119cc777fa900ba034cd5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009be89d2a4cd102d8fecc6bf9da793be995c2254100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ea4a1fc739d8b70d16185950332158edfa85d3e800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000600204ae2db743d15dfa5cbbfb47bbca2ba0ac3c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072adadb447784dd7ab1f472467750fc485e4cb2d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007e743f75c2555a7c29068186feed7525d0fe919500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000069e5c11a7c30f0bf84a9faecbd5161aa7a94deca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b50721bcf8d664c30412cfbc6cf7a15145234ad100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe3e6a25e6b192a42a44ecddcd13796471735acf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000086715afa18d9fd7090d5c2e0f8e6e824a8723fba00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f629cbd94d3791c9250152bd8dfbdf380e2a3b9c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ed5464bd5c477b7f71739ce1d741b43e932b97b000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f411903cbc70a74d22900a5de66a2dda6650725500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d7c1eb0fe4a30d3b2a846c04aa6300888f087a5f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a0b73e1ff0b80914ab6fe0444e65848c4c34450b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a0c816a52e71a1e9b6719580ebe754709c5519800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009813037ee2218799597d83d4a5b6f3b6778218d900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000405be842cdb64b69470972eb83c07c2c0788d86400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000064f80550848eff3402c5880851b77dd82a1a71f300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cedefe438860d2789da6419b3a19cece2a41038d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cfa04b9bf3c346b2ac9d3121c1593ba8dd30bcd500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000af5191b0de278c7286d6c7cc6ab6bb8a73ba2cd600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009ee91f9f426fa633d227f7a9b000e28b9dfd859900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008c18d6a985ef69744b9d57248a45c0861874f24400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000085f17cf997934a597031b2e18a9ab6ebd4b9f6a400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000de30da39c46104798bb5aa3fe8b9e0e1f348163f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000f51bb10119727a7e5ea3538074fb341f56b09ad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a98fcbea516cf06857215779fd812ca3bef1b3200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d1d2eb1b1e90b638588728b4130137d262c87cae00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae86f48c0b00f2a3eaef4ba4c23d17368f0f63f400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000010ba1f6604af42ca96aeabca1df6c26fb057251500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000044ff8620b8ca30902395a7bd3f2407e1a091bf7300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e28b3b32b6c345a34ff64674606124dd5aceca3000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000467719ad09025fcc6cf6f8311755809d45a5e5f300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d5d86fc8d5c0ea1ac1ac5dfab6e529c9967a45e900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d31a59c85ae9d8edefec411d448f90841571b89c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000595832f8fc6bf59c85c527fec3740a1b7a36126900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007d1afa7b718fb893db30a3abc0cfc608aacfebb000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c2e2368d4f3efa84489bf3729c55afbc2fa0165200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b5b2d6acd78ac99d202a362b50ac3733a47a7c7b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009a48bd0ec040ea4f1d3147c025cd4076a2e71e3e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bbbbbbbb46a1da0f0c3f64522c275baa4c33263600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe67a4450907459c3e1fff623aa927dd4e28c67a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007659ce147d0e714454073a5dd7003544234b6aa000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001d4241f7370253c0f12efc536b7e16e462fb352600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d5f7838f5c461feff7fe49ea5ebaf7728bb0adfa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000022ee12dfebc4685ba2240d45893d4e479775b4cf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e2353069f71a27bbbe66eeabff05de109c7d5e1900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008f74a5d0a3ba170f2a43b1abba16c251f611500d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f951e335afb289353dc249e82926178eac7ded7800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001f9840a85d5af5bf1d1762f925bdaddc4201f98400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3f7ac3a68369975cff21dcbdb303383c5e203cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000788ddd6f2c13bdc00426deb67add5c057de8494100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004507cef57c46789ef8d1a19ea45f4216bae2b52800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000057f228e13782554feb8fe180738e12a70717cfae00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b4efd85c19999d84251304bda99e90b92300bd9300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000034be5b8c30ee4fde069dc878989686abe988447000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c5190e7fec4d97a3a3b1ab42dfedac608e2d079300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a2b0fde6d710e201d0d608e924a484d1a5fed57c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e55d97a97ae6a17706ee281486e98a84095d8aaf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007bfebd989ef62f7f794d9936908565da42fa6d7000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000fb765ddbd4d26ac524aa5990b0643d0ab6ac2fe00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000de67d97b8770dc98c746a3fc0093c538666eb49300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041f7b8b9b897276b7aae926a9016935280b44e9700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000012970e6868f88f6557b76120662c1b3e50a646bf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072577c54b897f2b10a136bf288360b6baaad92f200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e5f166c0d8872b68790061317bb6cca04582c91200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005114616637bec16b023c9e29632286bcea67012700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000772c44b5166647b135bb4836abc4e06c28e9497800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c834fa996fa3bec7aad3693af486ae53d8aa8b5000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006de037ef9ad2725eb40118bb1702ebb27e4aeb2400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a1290d69c65a6fe4df752f95823fae25cb99e5a700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f6aeaf0fe66cf2ef2e738ba465fb531ffe39b4e200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009b110fda4e20db18ad7052f8468a455de7449eb600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000084ca8bc7997272c7cfb4d0cd3d55cd942b3c941900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000430ef9263e76dae63c84292c3409d61c598e968200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066a0f676479cee1d7373f3dc2e2952778bff5bd600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000cf5003a5262e163fdbb26a9def389fd468e32cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a41d2f8ee4f47d3b860a149765a7df8c3287b7f000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000562e362876c8aee4744fc2c6aac8394c312d215d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005d80a8d8cb80696073e82407968600a37e1dd78000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cdcfc0f66c522fd086a1b725ea3c0eeb9f9e881400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000a58531518dba2009bdfbf1af79602bfd312fdf100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005de8ab7e27f6e7a1fff3e5b337584aa43961beef00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da31d0d1bc934fc34f7189e38a413ca0a5e8b44f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a1d0e215a23d7030842fc67ce582a6afa3ccab8300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000015e6e0d4ebeac120f9a97e71faa6a0235b85ed1200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009b8e9d523d1d6bc8eb209301c82c7d64d10b219e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000137ddb47ee24eaa998a535ab00378d6bfa84f89300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000088acdd2a6425c3faae4bc9650fd7e27e0bebb7ab00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b945e3f853b5f8033c8513cf3ce9f8ad9bebb1c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041ea5d41eeacc2d5c4072260945118a13bb7ebce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb3900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000001a500a6b18995b03f44bb040a5ffc28e45cb000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000048fb253446873234f2febbf9bdeaa72d9d387f9400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000062d0a8458ed7719fdaf978fe5929c6d342b0bfce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006adb5216796fd9d4a53f6cc407075c6c075d468a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000d8775f648430679a709e98d2b0cb6250d2887ef00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b131f4a55907b10d1f0a50d8ab8fa09ec342cd7400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dc8af07a7861bedd104b8093ae3e9376fc8596d200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004ee9968393d5ec65b215b9aa61e5598851f384f200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c5102fe9359fd9a28f877a67e36b0f050d81a3cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006c249b6f6492864d914361308601a7abb32e68f800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000304645590f197d99fad9fa1d05e7bcdc563e137800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000805c2077f3ab224d889f9c3992b41b2f4722c78700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008b5653ae095529155462eda8cf664ed96773f55700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eb2635c62b6b4dda7943928a1a6189df654c850e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004aac461c86abfa71e9d00d9a2cde8d74e4e1aeea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000607f4c5bb672230e8672085532f7e901544a737500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000077f76483399dc6328456105b1db23e2aca455bf900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000b38210ea11411557c13457d4da7dc6ea731b88a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000839e71613f9aa06e5701cf6de63e303616b0dde300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d13c7342e1ef687c5ad21b27c2b65d772cab5c8c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000073fbd93bfda83b111ddc092aa3a4ca77fd30d38000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066b658b7979abf71d212956f62bdd3630cc7f30900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004d5f47fa6a74757f35c14fd3a6ef8e3c9bc514e800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cd5fe23c85820f7b72d0926fc9b05b43e359b7ee00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008e199473348eb597d428d4ce950479771a10971500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000083e6f1e41cdd28eaceb20cb649155049fac3d5aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000061a35258107563f6b6f102ae25490901c8760b1200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bf5495efe5db9ce00f80364c8b423567e58d211000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008457ca5040ad67fdebbcc8edce889a335bc0fbfb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066580f80a00deafab4519dc33c35bf44d8a12b0000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000869b1f57380ae501d387b19262efd3c0eb7501b000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000000000007a58f5f58e697e51ab0357bc9e260a0400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000618e75ac90b12c6049ba3b27f5d5f8651b0037f600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002965395f71b7d97ede251e9b63e44dfa9647cc0a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a520e593f89c908cd2bc27d928bc75913c55c4200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000016aab4738843fb2d9eafc8fd261488797bf0df2900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000043ffdc962db6c1708e218751e7e8e9200915248600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004c11249814f11b9346808179cf06e71ac328c1b500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bcd29da38b66e2b7855c92080ebe82330ed2012a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000152649ea73beab28c5b49b26eb48f7ead6d4c89800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000003007083eaa95497cd6b2b809fb97b6a30bdf53d300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000056fd409e1d7a124bd7017459dfea2f387b6d5cd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9ca9523e5b5a42c3018c62b084db8543478c40000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002c489f6c2b728665f56691744f0336a5cc69ba9400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b627a1bf727f578384ba18b2a2b46f4fb924ab3b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004a0552f34f2237ce3d15ca69d09f65b7d7aa00bb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f57e7e7c23978c3caec3c3548e3d615c346e79ff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000178c820f862b14f316509ec36b13123da19a605400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c56c2b7e71b54d38aab6d52e94a04cbfa8f604fa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005973f93d1efbdcaa91ba2abc7ae1f6926434bcb600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e89c20096b636ffec9fd26d1a623f42a33ead30900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c57d533c50bc22247d49a368880fb49a1caa39f700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000033909c9ce97ce509dab3a038b3ec7ac3d1be323100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b0c7a3ba49c7a6eaba6cd4a96c55a1391070ac9a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e66b3aa360bb78468c00bebe163630269db3324f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000085f138bfee4ef8e540890cfb48f620571d67eda300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cb77467f6cf5cfc913ac5c757284d914ed086cf000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007e931f31b742977ed673de660e54540b4595944700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000175d9dfd6850aa96460e29bc0cead05756965e9100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005d74468b69073f809d4fae90afec439e69bf626300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000455e53cbb86018ac2b8092fdcd39d8444affc3f600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f250b1f6193941bb8bff4152d719edf1a59c0e6900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a23c1194d421f252b4e6d5edcc3205f7650a4ebe00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a8258abc8f2811dd48eccd209db68f25e3e3466700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000035b0ccc549776e927b8fa7f5fc7afe9f8652472c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041b6f91daa1509bfbe06340d756560c4a1d146fd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a07ef0b2523fd41f8fe80c3de1bc75861d86c5100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ecbee2fae67709f718426ddc3bf770b26b95ed2000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bddf3b5a786775f63c2c389b86cddadd04d5a7aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d514b77060e04b1ee7e15f6e1d3b5419e9f3277300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000032a7c02e79c4ea1008dd6564b35f131428673c4100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d9a442856c234a39a81a089c06451ebaa4306a7200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000207e14389183a94343942de7afbc607f5746061800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000967da4048cd07ab37855c090aaf366e4ce1b9f4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000003ee5026c07d85ff8ae791370dd0f4c1ae6c97fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002364bb6dea9cacd4f8541af761d3bcf3d86b26fd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000750a575284fad07fbf2fcc45eb26d1111afee16500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006368e1e18c4c419ddfc608a0bed1ccb87b9250fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fae103dc9cf190ed75350761e95403b7b8afa6c000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000060be1e1fe41c1370adaf5d8e66f07cf1c2df226800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e25bcec5d3801ce3a794079bf94adf1b8ccd802d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000097aeb5066e1a590e868b511457beb6fe99d329f500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000725440512cb7b78bf56b334e50e31707418231cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d9f79fc56839c696e2e9f63948337f49d164a01500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000516d813bc49b0eb556f9d09549f98443acdd7d8f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000054a7cee7b02976ace1bdd4afad87273251ed34cf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008e870d67f660d95d5be530380d0ec0bd388289e100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006732efaf6f39926346bef8b821a04b6361c4f3e500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000065e6b60ea01668634d68d0513fe814679f925bad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3ade5ace1bbb033ccae8177c12ecbfa16bd6a9d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009e32b13ce7f2e80a01932b42553652e053d6ed8e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f32cea5d29c060069372ab9385f6e292387d553500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004cf89ca06ad997bc732dc876ed2a7f26a9e7f36100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a35b1b31ce002fbf2058d22f30f95d405200a15b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d680fff1699ad71f52e29cb4c36010fee7b8d61b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000e573ce2736dd9637a0b21058352e1667925c7a800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d973637d6c982a492bdafe6956cc79163f279b2c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fc448180d5254a55846a37c86146407db48d2a3600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bc4171f45ef0ef66e76f979df021a34b46dcc81d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000163f8c2467924be0ae7b5347228cabf26031875300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000093581991f68dbae1ea105233b67f7fa0d6bdee7b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009144d8e206b98ed9c38f19d3e4760e278faab1c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae66e13e7ff6f505c6e53adfe47b2b9082b9e0ea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fac0403a24229d7e2edd994d50f5940624cbeac200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002de7b02ae3b1f11d51ca7b2495e9094874a064c000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d101dcc414f310268c37eeb4cd376ccfa507f57100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cfc006a32a98031c2338bf9d5ff8ed2c0cae4a9e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009d14bce1daddf408d77295bb1be9b343814f44de00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009fc86c5afb7b336367b8c1cf1f895dbfdd1ca06d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eb8eb73bbf1b0b3a8ef30e48447f47894bf6ffdb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b7df0f42fae30acf30c9a5ba147d6b792b5eb9d900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3d3bcb666588d8b58c921d3d297e04037ad466500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c78b628b060258300218740b1a7a5b3c82b3bd9f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008c30ba8e0b776d0b3654b72d737ecd668b26a19200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000046eee2cc3188071c02bfc1745a6b17c656e3f3d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000db82c0d91e057e05600c8f8dc836beb41da6df1400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000738865301a9b7dd80dc3666dd48cf034ec42bdda00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c9fe6e1c76210be83dc1b5b20ec7fd010b0b1d1500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000216c9bb7380cde431662e37e30098d838d7e1dc800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da546071dcbcec77e707acc6ee32328b91607a2300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002e2364966267b5d7d2ce6cd9a9b5bd19d9c7c6a900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002a2550e0a75acec6d811ae3930732f7f3ad6758800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f79c694605f29ddf3f0eb41319c38672ab6fa89f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ac57de9c1a09fec648e93eb98875b212db0d460b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f96459323030137703483b46fd59a71d712bf0aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006b3595068778dd592e39a122f4f5a5cf09c90fe200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007c9f4c87d911613fe9ca58b579f737911aad2d4300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f2eab3a2034d3f6b63734d2e08262040e3ff7b4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000669c01caf0edcad7c2b8dc771474ad937a7ca4af00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000828e0edf347bd53e57d64426c67f291d8c553a7000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000582d872a1b094fc48f5de31d3b73f2d9be47def100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008f3470a7388c05ee4e7af3d01d8c722b0ff5237400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000015f74458ae0bfdaa1a96ca1aa779d715cc1eefe400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000faba6f8e4a5e8ab82f62fe7c39859fa577269be300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000000000000ca73a6df4c58b84c5b4b847fe8ff3900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000025daf950c6e814dee4c96e13c98d3196d22e60c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e2bca705991ba5f1bb8a33610dba10d481379cd300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a636ee3f2c24748e9fc7fd8b577f7a629e879b4500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9bd51d756a3caf52348f2901b7eff9bd03398e700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000007150e919b4de5fd6a63de1f9384828396f25fdc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000093728f9b63edbb91739f4fbaa84890e5073e3d4f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000865377367054516e17014ccded1e7d814edc9ce400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000debe620609674f21b1089042527f420372ea98a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b58e61c3098d85632df34eecfb899a1ed80921cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe0c30065b384f05761f15d0cc899d4f9f9cc0eb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000726516b20c4692a6bea3900971a37e0ccf7a6bff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004a220e6096b25eadb88358cb44068a324825467500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000084018071282d4b2996272659d9c01cb08dd7327f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c944e90c64b2c07662a292be6244bdf05cda44a700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f65b5c5104c4fafd4b709d9d60a185eae063276c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000088df592f8eb5d7bd38bfef7deb0fbc02cf3778a000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cd4b21deadeebfcff202ce73e976012afad1136100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000036e66fbbce51e4cd5bd3c62b637eb411b18949d400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004c9edd5852cd905f086c759e8383e09bff1e68b300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dbb7a34bf10169d6d2d0d02a6cbb436cf4381bfa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b8c77482e45f1f44de1745f52c74426c631bdd5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000023ec026590d6cccfece04097f9b49ae6a442c3ba00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000",
+
+        "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003400000000000000000000000000000000000000000000000000000000000000460000000000000000000000000000000000000000000000000000000000000058000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000008e0000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da7c0810ce6f8329786160bb3d1734cf6661ca6e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072e364f2abdc788b7e918bc238b21f109cd634d700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001b9ebb707d87fbec93c49d9f2d994ebb60461b9b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d3843c6be03520f45871874375d618b3c792301900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b6ff96b8a8d214544ca0dbc9b33f7ad6503efd3200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002b1d36f5b61addaf7da7ebbd11b35fd8cfb0de3100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e8a25c46d623f12b8ba08b583b6fe1bee3eb31c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000000000000000000000000000000000000000000100000000000000000000000032400084c286cf3e17e7b677ea9583e60a000324000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000"
+    ],
+    "setEraPostDiamondUpgradeFirstBatch" :{
+        "schedule": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000feb63ba784b61e1f2059de3c5d056e49053dd6da45a961a5b4aa0135c259795300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024cc3fbc63000000000000000000000000000000000000000000000000000000000007634b00000000000000000000000000000000000000000000000000000000", 
+        "execute": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000feb63ba784b61e1f2059de3c5d056e49053dd6da45a961a5b4aa0135c259795300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024cc3fbc63000000000000000000000000000000000000000000000000000000000007634b00000000000000000000000000000000000000000000000000000000",
+        "value": "0"
+    },
+    "setEraPostLegacyBridgeUpgradeFirstBatch": {
+        "schedule": " 0x2c431917000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000093e799b8bd978a66f15bd3bbee77a1979a102ecb1c64d51b7e15863ed2c83f8d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024be65940a000000000000000000000000000000000000000000000000000000000007634b00000000000000000000000000000000000000000000000000000000", 
+        "execute": "0x74da756b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000093e799b8bd978a66f15bd3bbee77a1979a102ecb1c64d51b7e15863ed2c83f8d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024be65940a000000000000000000000000000000000000000000000000000000000007634b00000000000000000000000000000000000000000000000000000000",
+        "value": "0"
+    },
+    "setEraLegacyBridgeLastDepositTime" :{
+        "schedule": " 0x2c431917000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000068e79408fd7f74113e7e3b3546b6a0584fb45718f15465bb0bdfdd923c2f56ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044dd85df2d00000000000000000000000000000000000000000000000000000000000763ef000000000000000000000000000000000000000000000000000000000000039200000000000000000000000000000000000000000000000000000000", 
+        "execute": " 0x74da756b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000068e79408fd7f74113e7e3b3546b6a0584fb45718f15465bb0bdfdd923c2f56ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044dd85df2d00000000000000000000000000000000000000000000000000000000000763ef000000000000000000000000000000000000000000000000000000000000039200000000000000000000000000000000000000000000000000000000",
+        "value": "0"
+    }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/postUpgradeCalldata.json b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/postUpgradeCalldata.json
index d29331541e62..27e47b92e715 100644
--- a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/postUpgradeCalldata.json
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/postUpgradeCalldata.json
@@ -1 +1 @@
-"0x00000000000000000000000000000000000000000000000000000000000001440000000000000000000000005b5c82f4da996e118b127880492a23391376f65c000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b8000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f61000000000000000000000000c2d7a7bd59a548249e64c1a587220c0e4f6f439e"
\ No newline at end of file
+"0x0000000000000000000000000000000000000000000000000000000000000144000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb5213000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f610000000000000000000000005d8ba173dc6c3c90c8f7c04c9288bef5fdbad06e"
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/token-migration b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/token-migration
new file mode 100644
index 000000000000..8235ba074b43
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/token-migration
@@ -0,0 +1,137 @@
+Schedule operations to sign: 
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a49d7499271ae71cd8ab9ac515e6694c755d400c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ffffffff2ba8f66d4e51811c519099217693027800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bc396689893d065f41bc2c6ecbee5e008523344700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000471ea49dd8e60e697f4cac262b5fafcc307506e400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f655c8567e0f213e6c634cd2a68d992152161dc600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ba100000625a3754423978a60c9317c58a424e3d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000095b3497bbcccc46a8f45f5cf54b0878b39f8d96c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c17272c3e15074c55b810bceba02ba0c4481cd7900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9c53268e9de692ae1b2ea5216e24e1c3ad7cb1e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000063a3ae78711b52fb75a03acf9996f18ab611b87700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cda4e840411c00a614ad9205caec807c7458a0e300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005f64ab1544d28732f0a24f4713c2c8ec0da089f000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a487bf43cf3b10dffc97a9a744cbb7036965d3b900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004691937a7508860f876c9c0a2a617e7d9e945d4b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eeaa40b28a2d1b0b08f6f97bb1dd4b75316c610700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dddddd4301a082e62e84e43f474f04442392191800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000111111111117dc0aa78b770fa6a738034120c30200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c63e1f3fdae49e9ef5951ab5e84334a6934ce76700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000108a850856db3f85d0269a2693d896b394c8032500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004fabb145d64652a948d72533023f6e7a623c7c5300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c59900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006982508145454ce325ddbe47a25d4ec3d231193300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d38bb40815d2b0c2d2c866e0c72c5728ffc76dd900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d38e031f4529a07996aab977d2b79f0e00656c5600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006dea81c8171d0ba574754ef6f8b412f2ed88c54d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000076054592d1f789ea5958971fb3ba6628334faa8600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d33526068d116ce69f19a9ee46f0bd304f21a51f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae78736cd615f374d3085123a210448e74fc639300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000be9895146f7af43049ca1c1ae358b0541ea4970400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000459706cc06a2095266e623a5684126130e74b93000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001ed81e03d7ddb67a21755d02ed2f24da71c27c5500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fac77a24e52b463ba9857d6b758ba41ae20e31ff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a91ac63d040deb1b7a5e4d4134ad23eb0ba07e1400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e963e120f818f15420ea3dad0083289261923c2e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004e9e4ab99cfc14b852f552f5fb3aa68617825b6c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000021ead867c8c5181854f6f8ce71f75b173d2bc16a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000003bdffa70f4b4e6985eed50453c7c0d4a15dcec5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c6f5d26e9a9cfa5b917e049139ad9ccf5cddde6d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000defa4e8a7bcba345f687a2f1456f5edd9ce9720200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c91a71a1ffa3d8b22ba615ba1b9c01b2bbbf55ad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a7adc1b690e81c758f1bd0f72dfe27ae6ec56a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c6b50d3c36482cba08d2b60183ae17d75b90fdc900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007448c7456a97769f6cd04f1e83a4a23ccdc46abd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001571ed0bed4d987fe2b498ddbae7dfa19519f65100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cf0c122c6b73ff809c693db761e7baebe62b6a2e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000095ad61b0a150d79219dcf64e1e6cc01f0b64c4ce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bb94d52b84568beb26106f5cc66c29f352d85f8d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009ad37205d608b8b219e6a2573f922094cec5c20000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000097e3c21f27182498382f81e32fbe0ea3a0e3d79b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005c1d9aa868a30795f92fae903edc9eff269044bf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000054ea1c9fe9f3987eb2bc69e2b45ac1f19001406d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d41f3d112cb8695c7a8992e4055bd273f3ce872900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000a77ef9bf662d62fbf9ba4cf861eaa83f9cc4fec00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000423f4e6138e475d85cf7ea071ac92097ed631eea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e4815ae53b124e7263f08dcdbbb757d41ed658c600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009469d013805bffb7d3debe5e7839237e535ec48300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072e4f9f808c49a2a61de9c5896298920dc4eeea900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006eff556748ee452cbdaf31bcb8c76a28651509bd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000edcc68cc8b6ec3ede0979f8a52835b238a27202700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ff5b9f95dcaafc8204d4b6b156be2851ac7b604f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b64ef51c888972c908cfacf59b47c1afbc0ab8ac00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004bb3205bf648b7f59ef90dee0f1b62f6116bc7ca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a9c67fee641579deba04928c4bc45f66e26343a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000cec1a9154ff802e7934fc916ed7ca50bde6844e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005bec54282a1b57d5d7fde6330e2d4a78618f050800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000386e113221ccc785b0636898d8b379c1a11371300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bd8fdda057de7e0162b7a386bec253844b5e07a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008353b92201f19b4812eee32efd325f7ede12371800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f0655dcee37e5c0b70fffd70d85f88f8edf0aff600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000068592c5c98c4f4a8a4bc6da2121e65da3d1c091700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b6ed7644c69416d67b522e20bc294a9a9b405b3100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d533a949740bb3306d119cc777fa900ba034cd5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009be89d2a4cd102d8fecc6bf9da793be995c2254100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ea4a1fc739d8b70d16185950332158edfa85d3e800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000600204ae2db743d15dfa5cbbfb47bbca2ba0ac3c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072adadb447784dd7ab1f472467750fc485e4cb2d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007e743f75c2555a7c29068186feed7525d0fe919500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000069e5c11a7c30f0bf84a9faecbd5161aa7a94deca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b50721bcf8d664c30412cfbc6cf7a15145234ad100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe3e6a25e6b192a42a44ecddcd13796471735acf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000086715afa18d9fd7090d5c2e0f8e6e824a8723fba00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f629cbd94d3791c9250152bd8dfbdf380e2a3b9c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ed5464bd5c477b7f71739ce1d741b43e932b97b000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f411903cbc70a74d22900a5de66a2dda6650725500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d7c1eb0fe4a30d3b2a846c04aa6300888f087a5f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a0b73e1ff0b80914ab6fe0444e65848c4c34450b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a0c816a52e71a1e9b6719580ebe754709c5519800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009813037ee2218799597d83d4a5b6f3b6778218d900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000405be842cdb64b69470972eb83c07c2c0788d86400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000064f80550848eff3402c5880851b77dd82a1a71f300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cedefe438860d2789da6419b3a19cece2a41038d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cfa04b9bf3c346b2ac9d3121c1593ba8dd30bcd500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000af5191b0de278c7286d6c7cc6ab6bb8a73ba2cd600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009ee91f9f426fa633d227f7a9b000e28b9dfd859900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008c18d6a985ef69744b9d57248a45c0861874f24400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000085f17cf997934a597031b2e18a9ab6ebd4b9f6a400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000de30da39c46104798bb5aa3fe8b9e0e1f348163f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000f51bb10119727a7e5ea3538074fb341f56b09ad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a98fcbea516cf06857215779fd812ca3bef1b3200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d1d2eb1b1e90b638588728b4130137d262c87cae00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae86f48c0b00f2a3eaef4ba4c23d17368f0f63f400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000010ba1f6604af42ca96aeabca1df6c26fb057251500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000044ff8620b8ca30902395a7bd3f2407e1a091bf7300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e28b3b32b6c345a34ff64674606124dd5aceca3000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000467719ad09025fcc6cf6f8311755809d45a5e5f300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d5d86fc8d5c0ea1ac1ac5dfab6e529c9967a45e900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d31a59c85ae9d8edefec411d448f90841571b89c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000595832f8fc6bf59c85c527fec3740a1b7a36126900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007d1afa7b718fb893db30a3abc0cfc608aacfebb000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c2e2368d4f3efa84489bf3729c55afbc2fa0165200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b5b2d6acd78ac99d202a362b50ac3733a47a7c7b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009a48bd0ec040ea4f1d3147c025cd4076a2e71e3e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bbbbbbbb46a1da0f0c3f64522c275baa4c33263600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe67a4450907459c3e1fff623aa927dd4e28c67a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007659ce147d0e714454073a5dd7003544234b6aa000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001d4241f7370253c0f12efc536b7e16e462fb352600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d5f7838f5c461feff7fe49ea5ebaf7728bb0adfa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000022ee12dfebc4685ba2240d45893d4e479775b4cf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e2353069f71a27bbbe66eeabff05de109c7d5e1900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008f74a5d0a3ba170f2a43b1abba16c251f611500d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f951e335afb289353dc249e82926178eac7ded7800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001f9840a85d5af5bf1d1762f925bdaddc4201f98400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3f7ac3a68369975cff21dcbdb303383c5e203cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000788ddd6f2c13bdc00426deb67add5c057de8494100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004507cef57c46789ef8d1a19ea45f4216bae2b52800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000057f228e13782554feb8fe180738e12a70717cfae00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b4efd85c19999d84251304bda99e90b92300bd9300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000034be5b8c30ee4fde069dc878989686abe988447000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c5190e7fec4d97a3a3b1ab42dfedac608e2d079300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a2b0fde6d710e201d0d608e924a484d1a5fed57c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e55d97a97ae6a17706ee281486e98a84095d8aaf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007bfebd989ef62f7f794d9936908565da42fa6d7000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000fb765ddbd4d26ac524aa5990b0643d0ab6ac2fe00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000de67d97b8770dc98c746a3fc0093c538666eb49300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041f7b8b9b897276b7aae926a9016935280b44e9700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000012970e6868f88f6557b76120662c1b3e50a646bf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072577c54b897f2b10a136bf288360b6baaad92f200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e5f166c0d8872b68790061317bb6cca04582c91200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005114616637bec16b023c9e29632286bcea67012700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000772c44b5166647b135bb4836abc4e06c28e9497800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c834fa996fa3bec7aad3693af486ae53d8aa8b5000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006de037ef9ad2725eb40118bb1702ebb27e4aeb2400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a1290d69c65a6fe4df752f95823fae25cb99e5a700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f6aeaf0fe66cf2ef2e738ba465fb531ffe39b4e200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009b110fda4e20db18ad7052f8468a455de7449eb600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000084ca8bc7997272c7cfb4d0cd3d55cd942b3c941900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000430ef9263e76dae63c84292c3409d61c598e968200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066a0f676479cee1d7373f3dc2e2952778bff5bd600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000cf5003a5262e163fdbb26a9def389fd468e32cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a41d2f8ee4f47d3b860a149765a7df8c3287b7f000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000562e362876c8aee4744fc2c6aac8394c312d215d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005d80a8d8cb80696073e82407968600a37e1dd78000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cdcfc0f66c522fd086a1b725ea3c0eeb9f9e881400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000a58531518dba2009bdfbf1af79602bfd312fdf100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005de8ab7e27f6e7a1fff3e5b337584aa43961beef00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da31d0d1bc934fc34f7189e38a413ca0a5e8b44f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a1d0e215a23d7030842fc67ce582a6afa3ccab8300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000015e6e0d4ebeac120f9a97e71faa6a0235b85ed1200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009b8e9d523d1d6bc8eb209301c82c7d64d10b219e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000137ddb47ee24eaa998a535ab00378d6bfa84f89300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000088acdd2a6425c3faae4bc9650fd7e27e0bebb7ab00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b945e3f853b5f8033c8513cf3ce9f8ad9bebb1c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041ea5d41eeacc2d5c4072260945118a13bb7ebce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb3900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000001a500a6b18995b03f44bb040a5ffc28e45cb000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000048fb253446873234f2febbf9bdeaa72d9d387f9400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000062d0a8458ed7719fdaf978fe5929c6d342b0bfce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006adb5216796fd9d4a53f6cc407075c6c075d468a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000d8775f648430679a709e98d2b0cb6250d2887ef00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b131f4a55907b10d1f0a50d8ab8fa09ec342cd7400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dc8af07a7861bedd104b8093ae3e9376fc8596d200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004ee9968393d5ec65b215b9aa61e5598851f384f200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c5102fe9359fd9a28f877a67e36b0f050d81a3cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006c249b6f6492864d914361308601a7abb32e68f800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000304645590f197d99fad9fa1d05e7bcdc563e137800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000805c2077f3ab224d889f9c3992b41b2f4722c78700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008b5653ae095529155462eda8cf664ed96773f55700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eb2635c62b6b4dda7943928a1a6189df654c850e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004aac461c86abfa71e9d00d9a2cde8d74e4e1aeea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000607f4c5bb672230e8672085532f7e901544a737500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000077f76483399dc6328456105b1db23e2aca455bf900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000b38210ea11411557c13457d4da7dc6ea731b88a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000839e71613f9aa06e5701cf6de63e303616b0dde300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d13c7342e1ef687c5ad21b27c2b65d772cab5c8c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000073fbd93bfda83b111ddc092aa3a4ca77fd30d38000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066b658b7979abf71d212956f62bdd3630cc7f30900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004d5f47fa6a74757f35c14fd3a6ef8e3c9bc514e800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cd5fe23c85820f7b72d0926fc9b05b43e359b7ee00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008e199473348eb597d428d4ce950479771a10971500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000083e6f1e41cdd28eaceb20cb649155049fac3d5aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000061a35258107563f6b6f102ae25490901c8760b1200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bf5495efe5db9ce00f80364c8b423567e58d211000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008457ca5040ad67fdebbcc8edce889a335bc0fbfb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066580f80a00deafab4519dc33c35bf44d8a12b0000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000869b1f57380ae501d387b19262efd3c0eb7501b000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000000000007a58f5f58e697e51ab0357bc9e260a0400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000618e75ac90b12c6049ba3b27f5d5f8651b0037f600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002965395f71b7d97ede251e9b63e44dfa9647cc0a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a520e593f89c908cd2bc27d928bc75913c55c4200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000016aab4738843fb2d9eafc8fd261488797bf0df2900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000043ffdc962db6c1708e218751e7e8e9200915248600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004c11249814f11b9346808179cf06e71ac328c1b500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bcd29da38b66e2b7855c92080ebe82330ed2012a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000152649ea73beab28c5b49b26eb48f7ead6d4c89800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000003007083eaa95497cd6b2b809fb97b6a30bdf53d300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000056fd409e1d7a124bd7017459dfea2f387b6d5cd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9ca9523e5b5a42c3018c62b084db8543478c40000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002c489f6c2b728665f56691744f0336a5cc69ba9400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b627a1bf727f578384ba18b2a2b46f4fb924ab3b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004a0552f34f2237ce3d15ca69d09f65b7d7aa00bb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f57e7e7c23978c3caec3c3548e3d615c346e79ff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000178c820f862b14f316509ec36b13123da19a605400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c56c2b7e71b54d38aab6d52e94a04cbfa8f604fa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005973f93d1efbdcaa91ba2abc7ae1f6926434bcb600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e89c20096b636ffec9fd26d1a623f42a33ead30900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c57d533c50bc22247d49a368880fb49a1caa39f700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000033909c9ce97ce509dab3a038b3ec7ac3d1be323100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b0c7a3ba49c7a6eaba6cd4a96c55a1391070ac9a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e66b3aa360bb78468c00bebe163630269db3324f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000085f138bfee4ef8e540890cfb48f620571d67eda300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cb77467f6cf5cfc913ac5c757284d914ed086cf000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007e931f31b742977ed673de660e54540b4595944700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000175d9dfd6850aa96460e29bc0cead05756965e9100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005d74468b69073f809d4fae90afec439e69bf626300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000455e53cbb86018ac2b8092fdcd39d8444affc3f600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f250b1f6193941bb8bff4152d719edf1a59c0e6900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a23c1194d421f252b4e6d5edcc3205f7650a4ebe00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a8258abc8f2811dd48eccd209db68f25e3e3466700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000035b0ccc549776e927b8fa7f5fc7afe9f8652472c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041b6f91daa1509bfbe06340d756560c4a1d146fd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a07ef0b2523fd41f8fe80c3de1bc75861d86c5100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ecbee2fae67709f718426ddc3bf770b26b95ed2000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bddf3b5a786775f63c2c389b86cddadd04d5a7aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d514b77060e04b1ee7e15f6e1d3b5419e9f3277300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000032a7c02e79c4ea1008dd6564b35f131428673c4100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d9a442856c234a39a81a089c06451ebaa4306a7200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000207e14389183a94343942de7afbc607f5746061800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000967da4048cd07ab37855c090aaf366e4ce1b9f4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000003ee5026c07d85ff8ae791370dd0f4c1ae6c97fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002364bb6dea9cacd4f8541af761d3bcf3d86b26fd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000750a575284fad07fbf2fcc45eb26d1111afee16500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006368e1e18c4c419ddfc608a0bed1ccb87b9250fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fae103dc9cf190ed75350761e95403b7b8afa6c000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000060be1e1fe41c1370adaf5d8e66f07cf1c2df226800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e25bcec5d3801ce3a794079bf94adf1b8ccd802d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000097aeb5066e1a590e868b511457beb6fe99d329f500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000725440512cb7b78bf56b334e50e31707418231cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d9f79fc56839c696e2e9f63948337f49d164a01500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000516d813bc49b0eb556f9d09549f98443acdd7d8f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000054a7cee7b02976ace1bdd4afad87273251ed34cf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008e870d67f660d95d5be530380d0ec0bd388289e100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006732efaf6f39926346bef8b821a04b6361c4f3e500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000065e6b60ea01668634d68d0513fe814679f925bad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3ade5ace1bbb033ccae8177c12ecbfa16bd6a9d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009e32b13ce7f2e80a01932b42553652e053d6ed8e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f32cea5d29c060069372ab9385f6e292387d553500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004cf89ca06ad997bc732dc876ed2a7f26a9e7f36100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a35b1b31ce002fbf2058d22f30f95d405200a15b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d680fff1699ad71f52e29cb4c36010fee7b8d61b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000e573ce2736dd9637a0b21058352e1667925c7a800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d973637d6c982a492bdafe6956cc79163f279b2c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fc448180d5254a55846a37c86146407db48d2a3600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bc4171f45ef0ef66e76f979df021a34b46dcc81d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000163f8c2467924be0ae7b5347228cabf26031875300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000093581991f68dbae1ea105233b67f7fa0d6bdee7b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009144d8e206b98ed9c38f19d3e4760e278faab1c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae66e13e7ff6f505c6e53adfe47b2b9082b9e0ea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fac0403a24229d7e2edd994d50f5940624cbeac200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002de7b02ae3b1f11d51ca7b2495e9094874a064c000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d101dcc414f310268c37eeb4cd376ccfa507f57100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cfc006a32a98031c2338bf9d5ff8ed2c0cae4a9e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009d14bce1daddf408d77295bb1be9b343814f44de00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009fc86c5afb7b336367b8c1cf1f895dbfdd1ca06d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eb8eb73bbf1b0b3a8ef30e48447f47894bf6ffdb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b7df0f42fae30acf30c9a5ba147d6b792b5eb9d900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3d3bcb666588d8b58c921d3d297e04037ad466500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c78b628b060258300218740b1a7a5b3c82b3bd9f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008c30ba8e0b776d0b3654b72d737ecd668b26a19200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000046eee2cc3188071c02bfc1745a6b17c656e3f3d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000db82c0d91e057e05600c8f8dc836beb41da6df1400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000738865301a9b7dd80dc3666dd48cf034ec42bdda00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c9fe6e1c76210be83dc1b5b20ec7fd010b0b1d1500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000216c9bb7380cde431662e37e30098d838d7e1dc800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da546071dcbcec77e707acc6ee32328b91607a2300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002e2364966267b5d7d2ce6cd9a9b5bd19d9c7c6a900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002a2550e0a75acec6d811ae3930732f7f3ad6758800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f79c694605f29ddf3f0eb41319c38672ab6fa89f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ac57de9c1a09fec648e93eb98875b212db0d460b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f96459323030137703483b46fd59a71d712bf0aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006b3595068778dd592e39a122f4f5a5cf09c90fe200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007c9f4c87d911613fe9ca58b579f737911aad2d4300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f2eab3a2034d3f6b63734d2e08262040e3ff7b4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000669c01caf0edcad7c2b8dc771474ad937a7ca4af00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000828e0edf347bd53e57d64426c67f291d8c553a7000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000582d872a1b094fc48f5de31d3b73f2d9be47def100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008f3470a7388c05ee4e7af3d01d8c722b0ff5237400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000015f74458ae0bfdaa1a96ca1aa779d715cc1eefe400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000faba6f8e4a5e8ab82f62fe7c39859fa577269be300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000000000000ca73a6df4c58b84c5b4b847fe8ff3900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000025daf950c6e814dee4c96e13c98d3196d22e60c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e2bca705991ba5f1bb8a33610dba10d481379cd300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a636ee3f2c24748e9fc7fd8b577f7a629e879b4500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9bd51d756a3caf52348f2901b7eff9bd03398e700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000007150e919b4de5fd6a63de1f9384828396f25fdc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000093728f9b63edbb91739f4fbaa84890e5073e3d4f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000865377367054516e17014ccded1e7d814edc9ce400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000debe620609674f21b1089042527f420372ea98a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b58e61c3098d85632df34eecfb899a1ed80921cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe0c30065b384f05761f15d0cc899d4f9f9cc0eb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000726516b20c4692a6bea3900971a37e0ccf7a6bff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004a220e6096b25eadb88358cb44068a324825467500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000084018071282d4b2996272659d9c01cb08dd7327f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c944e90c64b2c07662a292be6244bdf05cda44a700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f65b5c5104c4fafd4b709d9d60a185eae063276c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000088df592f8eb5d7bd38bfef7deb0fbc02cf3778a000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cd4b21deadeebfcff202ce73e976012afad1136100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000036e66fbbce51e4cd5bd3c62b637eb411b18949d400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004c9edd5852cd905f086c759e8383e09bff1e68b300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dbb7a34bf10169d6d2d0d02a6cbb436cf4381bfa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b8c77482e45f1f44de1745f52c74426c631bdd5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000023ec026590d6cccfece04097f9b49ae6a442c3ba00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003400000000000000000000000000000000000000000000000000000000000000460000000000000000000000000000000000000000000000000000000000000058000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000008e0000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da7c0810ce6f8329786160bb3d1734cf6661ca6e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072e364f2abdc788b7e918bc238b21f109cd634d700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001b9ebb707d87fbec93c49d9f2d994ebb60461b9b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d3843c6be03520f45871874375d618b3c792301900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b6ff96b8a8d214544ca0dbc9b33f7ad6503efd3200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002b1d36f5b61addaf7da7ebbd11b35fd8cfb0de3100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e8a25c46d623f12b8ba08b583b6fe1bee3eb31c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000000000000000000000000000000000000000000100000000000000000000000032400084c286cf3e17e7b677ea9583e60a000324000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+Execute operations to sign: 
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a49d7499271ae71cd8ab9ac515e6694c755d400c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ffffffff2ba8f66d4e51811c519099217693027800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bc396689893d065f41bc2c6ecbee5e008523344700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000471ea49dd8e60e697f4cac262b5fafcc307506e400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f655c8567e0f213e6c634cd2a68d992152161dc600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ba100000625a3754423978a60c9317c58a424e3d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005f98805a4e8be255a32880fdec7f6728c6568ba000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000095b3497bbcccc46a8f45f5cf54b0878b39f8d96c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c17272c3e15074c55b810bceba02ba0c4481cd7900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9c53268e9de692ae1b2ea5216e24e1c3ad7cb1e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000063a3ae78711b52fb75a03acf9996f18ab611b87700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cda4e840411c00a614ad9205caec807c7458a0e300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005f64ab1544d28732f0a24f4713c2c8ec0da089f000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a487bf43cf3b10dffc97a9a744cbb7036965d3b900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004691937a7508860f876c9c0a2a617e7d9e945d4b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eeaa40b28a2d1b0b08f6f97bb1dd4b75316c610700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dddddd4301a082e62e84e43f474f04442392191800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000111111111117dc0aa78b770fa6a738034120c30200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c63e1f3fdae49e9ef5951ab5e84334a6934ce76700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000108a850856db3f85d0269a2693d896b394c8032500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004fabb145d64652a948d72533023f6e7a623c7c5300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c59900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006982508145454ce325ddbe47a25d4ec3d231193300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d38bb40815d2b0c2d2c866e0c72c5728ffc76dd900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d38e031f4529a07996aab977d2b79f0e00656c5600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006dea81c8171d0ba574754ef6f8b412f2ed88c54d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000076054592d1f789ea5958971fb3ba6628334faa8600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d33526068d116ce69f19a9ee46f0bd304f21a51f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae78736cd615f374d3085123a210448e74fc639300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000be9895146f7af43049ca1c1ae358b0541ea4970400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000459706cc06a2095266e623a5684126130e74b93000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001ed81e03d7ddb67a21755d02ed2f24da71c27c5500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fac77a24e52b463ba9857d6b758ba41ae20e31ff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a91ac63d040deb1b7a5e4d4134ad23eb0ba07e1400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e963e120f818f15420ea3dad0083289261923c2e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004e9e4ab99cfc14b852f552f5fb3aa68617825b6c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000021ead867c8c5181854f6f8ce71f75b173d2bc16a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000003bdffa70f4b4e6985eed50453c7c0d4a15dcec5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c6f5d26e9a9cfa5b917e049139ad9ccf5cddde6d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000defa4e8a7bcba345f687a2f1456f5edd9ce9720200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c91a71a1ffa3d8b22ba615ba1b9c01b2bbbf55ad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f939e0a03fb07f59a73314e73794be0e57ac1b4e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a7adc1b690e81c758f1bd0f72dfe27ae6ec56a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c6b50d3c36482cba08d2b60183ae17d75b90fdc900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007448c7456a97769f6cd04f1e83a4a23ccdc46abd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001571ed0bed4d987fe2b498ddbae7dfa19519f65100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cf0c122c6b73ff809c693db761e7baebe62b6a2e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000095ad61b0a150d79219dcf64e1e6cc01f0b64c4ce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bb94d52b84568beb26106f5cc66c29f352d85f8d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009ad37205d608b8b219e6a2573f922094cec5c20000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000097e3c21f27182498382f81e32fbe0ea3a0e3d79b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005c1d9aa868a30795f92fae903edc9eff269044bf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000054ea1c9fe9f3987eb2bc69e2b45ac1f19001406d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d41f3d112cb8695c7a8992e4055bd273f3ce872900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000a77ef9bf662d62fbf9ba4cf861eaa83f9cc4fec00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000423f4e6138e475d85cf7ea071ac92097ed631eea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e4815ae53b124e7263f08dcdbbb757d41ed658c600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009469d013805bffb7d3debe5e7839237e535ec48300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072e4f9f808c49a2a61de9c5896298920dc4eeea900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006eff556748ee452cbdaf31bcb8c76a28651509bd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000edcc68cc8b6ec3ede0979f8a52835b238a27202700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ff5b9f95dcaafc8204d4b6b156be2851ac7b604f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b64ef51c888972c908cfacf59b47c1afbc0ab8ac00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004bb3205bf648b7f59ef90dee0f1b62f6116bc7ca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a9c67fee641579deba04928c4bc45f66e26343a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000cec1a9154ff802e7934fc916ed7ca50bde6844e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005bec54282a1b57d5d7fde6330e2d4a78618f050800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000386e113221ccc785b0636898d8b379c1a11371300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bd8fdda057de7e0162b7a386bec253844b5e07a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008353b92201f19b4812eee32efd325f7ede12371800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f0655dcee37e5c0b70fffd70d85f88f8edf0aff600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000068592c5c98c4f4a8a4bc6da2121e65da3d1c091700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b6ed7644c69416d67b522e20bc294a9a9b405b3100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d533a949740bb3306d119cc777fa900ba034cd5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009be89d2a4cd102d8fecc6bf9da793be995c2254100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ea4a1fc739d8b70d16185950332158edfa85d3e800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000600204ae2db743d15dfa5cbbfb47bbca2ba0ac3c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072adadb447784dd7ab1f472467750fc485e4cb2d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007e743f75c2555a7c29068186feed7525d0fe919500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000069e5c11a7c30f0bf84a9faecbd5161aa7a94deca00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b50721bcf8d664c30412cfbc6cf7a15145234ad100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe3e6a25e6b192a42a44ecddcd13796471735acf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000086715afa18d9fd7090d5c2e0f8e6e824a8723fba00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f629cbd94d3791c9250152bd8dfbdf380e2a3b9c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ed5464bd5c477b7f71739ce1d741b43e932b97b000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f411903cbc70a74d22900a5de66a2dda6650725500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d7c1eb0fe4a30d3b2a846c04aa6300888f087a5f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a0b73e1ff0b80914ab6fe0444e65848c4c34450b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008a0c816a52e71a1e9b6719580ebe754709c5519800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009813037ee2218799597d83d4a5b6f3b6778218d900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000405be842cdb64b69470972eb83c07c2c0788d86400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000064f80550848eff3402c5880851b77dd82a1a71f300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cedefe438860d2789da6419b3a19cece2a41038d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cfa04b9bf3c346b2ac9d3121c1593ba8dd30bcd500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000af5191b0de278c7286d6c7cc6ab6bb8a73ba2cd600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009ee91f9f426fa633d227f7a9b000e28b9dfd859900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008c18d6a985ef69744b9d57248a45c0861874f24400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000085f17cf997934a597031b2e18a9ab6ebd4b9f6a400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000de30da39c46104798bb5aa3fe8b9e0e1f348163f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000f51bb10119727a7e5ea3538074fb341f56b09ad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a98fcbea516cf06857215779fd812ca3bef1b3200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d1d2eb1b1e90b638588728b4130137d262c87cae00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae86f48c0b00f2a3eaef4ba4c23d17368f0f63f400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000010ba1f6604af42ca96aeabca1df6c26fb057251500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000044ff8620b8ca30902395a7bd3f2407e1a091bf7300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e28b3b32b6c345a34ff64674606124dd5aceca3000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000467719ad09025fcc6cf6f8311755809d45a5e5f300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d5d86fc8d5c0ea1ac1ac5dfab6e529c9967a45e900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d31a59c85ae9d8edefec411d448f90841571b89c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000595832f8fc6bf59c85c527fec3740a1b7a36126900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007d1afa7b718fb893db30a3abc0cfc608aacfebb000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c2e2368d4f3efa84489bf3729c55afbc2fa0165200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b5b2d6acd78ac99d202a362b50ac3733a47a7c7b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009a48bd0ec040ea4f1d3147c025cd4076a2e71e3e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bbbbbbbb46a1da0f0c3f64522c275baa4c33263600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe67a4450907459c3e1fff623aa927dd4e28c67a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007659ce147d0e714454073a5dd7003544234b6aa000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001d4241f7370253c0f12efc536b7e16e462fb352600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d5f7838f5c461feff7fe49ea5ebaf7728bb0adfa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000022ee12dfebc4685ba2240d45893d4e479775b4cf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e2353069f71a27bbbe66eeabff05de109c7d5e1900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008f74a5d0a3ba170f2a43b1abba16c251f611500d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f951e335afb289353dc249e82926178eac7ded7800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001f9840a85d5af5bf1d1762f925bdaddc4201f98400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3f7ac3a68369975cff21dcbdb303383c5e203cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000788ddd6f2c13bdc00426deb67add5c057de8494100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004507cef57c46789ef8d1a19ea45f4216bae2b52800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000057f228e13782554feb8fe180738e12a70717cfae00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007fc66500c84a76ad7e9c93437bfc5ac33e2ddae900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b4efd85c19999d84251304bda99e90b92300bd9300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000034be5b8c30ee4fde069dc878989686abe988447000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c5190e7fec4d97a3a3b1ab42dfedac608e2d079300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a2b0fde6d710e201d0d608e924a484d1a5fed57c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e55d97a97ae6a17706ee281486e98a84095d8aaf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007bfebd989ef62f7f794d9936908565da42fa6d7000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000fb765ddbd4d26ac524aa5990b0643d0ab6ac2fe00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000de67d97b8770dc98c746a3fc0093c538666eb49300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041f7b8b9b897276b7aae926a9016935280b44e9700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000012970e6868f88f6557b76120662c1b3e50a646bf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072577c54b897f2b10a136bf288360b6baaad92f200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e5f166c0d8872b68790061317bb6cca04582c91200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005114616637bec16b023c9e29632286bcea67012700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000772c44b5166647b135bb4836abc4e06c28e9497800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c834fa996fa3bec7aad3693af486ae53d8aa8b5000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006de037ef9ad2725eb40118bb1702ebb27e4aeb2400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a1290d69c65a6fe4df752f95823fae25cb99e5a700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f6aeaf0fe66cf2ef2e738ba465fb531ffe39b4e200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009b110fda4e20db18ad7052f8468a455de7449eb600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000084ca8bc7997272c7cfb4d0cd3d55cd942b3c941900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000430ef9263e76dae63c84292c3409d61c598e968200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066a0f676479cee1d7373f3dc2e2952778bff5bd600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000cf5003a5262e163fdbb26a9def389fd468e32cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a41d2f8ee4f47d3b860a149765a7df8c3287b7f000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000562e362876c8aee4744fc2c6aac8394c312d215d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005d80a8d8cb80696073e82407968600a37e1dd78000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cdcfc0f66c522fd086a1b725ea3c0eeb9f9e881400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000a58531518dba2009bdfbf1af79602bfd312fdf100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005de8ab7e27f6e7a1fff3e5b337584aa43961beef00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da31d0d1bc934fc34f7189e38a413ca0a5e8b44f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a1d0e215a23d7030842fc67ce582a6afa3ccab8300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000015e6e0d4ebeac120f9a97e71faa6a0235b85ed1200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009b8e9d523d1d6bc8eb209301c82c7d64d10b219e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000137ddb47ee24eaa998a535ab00378d6bfa84f89300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000088acdd2a6425c3faae4bc9650fd7e27e0bebb7ab00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b945e3f853b5f8033c8513cf3ce9f8ad9bebb1c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041ea5d41eeacc2d5c4072260945118a13bb7ebce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb3900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000001a500a6b18995b03f44bb040a5ffc28e45cb000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000048fb253446873234f2febbf9bdeaa72d9d387f9400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000062d0a8458ed7719fdaf978fe5929c6d342b0bfce00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006adb5216796fd9d4a53f6cc407075c6c075d468a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000d8775f648430679a709e98d2b0cb6250d2887ef00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b131f4a55907b10d1f0a50d8ab8fa09ec342cd7400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dc8af07a7861bedd104b8093ae3e9376fc8596d200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004ee9968393d5ec65b215b9aa61e5598851f384f200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c5102fe9359fd9a28f877a67e36b0f050d81a3cc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006c249b6f6492864d914361308601a7abb32e68f800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000304645590f197d99fad9fa1d05e7bcdc563e137800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000805c2077f3ab224d889f9c3992b41b2f4722c78700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008b5653ae095529155462eda8cf664ed96773f55700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eb2635c62b6b4dda7943928a1a6189df654c850e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004aac461c86abfa71e9d00d9a2cde8d74e4e1aeea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000607f4c5bb672230e8672085532f7e901544a737500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000077f76483399dc6328456105b1db23e2aca455bf900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000b38210ea11411557c13457d4da7dc6ea731b88a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000839e71613f9aa06e5701cf6de63e303616b0dde300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d13c7342e1ef687c5ad21b27c2b65d772cab5c8c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000073fbd93bfda83b111ddc092aa3a4ca77fd30d38000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066b658b7979abf71d212956f62bdd3630cc7f30900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004d5f47fa6a74757f35c14fd3a6ef8e3c9bc514e800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cd5fe23c85820f7b72d0926fc9b05b43e359b7ee00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008e199473348eb597d428d4ce950479771a10971500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000083e6f1e41cdd28eaceb20cb649155049fac3d5aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000061a35258107563f6b6f102ae25490901c8760b1200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bf5495efe5db9ce00f80364c8b423567e58d211000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008457ca5040ad67fdebbcc8edce889a335bc0fbfb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000066580f80a00deafab4519dc33c35bf44d8a12b0000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000869b1f57380ae501d387b19262efd3c0eb7501b000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000000000007a58f5f58e697e51ab0357bc9e260a0400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000618e75ac90b12c6049ba3b27f5d5f8651b0037f600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002965395f71b7d97ede251e9b63e44dfa9647cc0a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a520e593f89c908cd2bc27d928bc75913c55c4200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000016aab4738843fb2d9eafc8fd261488797bf0df2900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000043ffdc962db6c1708e218751e7e8e9200915248600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004c11249814f11b9346808179cf06e71ac328c1b500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bcd29da38b66e2b7855c92080ebe82330ed2012a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000152649ea73beab28c5b49b26eb48f7ead6d4c89800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000003007083eaa95497cd6b2b809fb97b6a30bdf53d300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000056fd409e1d7a124bd7017459dfea2f387b6d5cd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9ca9523e5b5a42c3018c62b084db8543478c40000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002c489f6c2b728665f56691744f0336a5cc69ba9400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b627a1bf727f578384ba18b2a2b46f4fb924ab3b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004a0552f34f2237ce3d15ca69d09f65b7d7aa00bb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f57e7e7c23978c3caec3c3548e3d615c346e79ff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000178c820f862b14f316509ec36b13123da19a605400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c56c2b7e71b54d38aab6d52e94a04cbfa8f604fa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005973f93d1efbdcaa91ba2abc7ae1f6926434bcb600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e89c20096b636ffec9fd26d1a623f42a33ead30900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c57d533c50bc22247d49a368880fb49a1caa39f700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000033909c9ce97ce509dab3a038b3ec7ac3d1be323100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b0c7a3ba49c7a6eaba6cd4a96c55a1391070ac9a00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e66b3aa360bb78468c00bebe163630269db3324f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000085f138bfee4ef8e540890cfb48f620571d67eda300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cb77467f6cf5cfc913ac5c757284d914ed086cf000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007e931f31b742977ed673de660e54540b4595944700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000175d9dfd6850aa96460e29bc0cead05756965e9100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005d74468b69073f809d4fae90afec439e69bf626300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000455e53cbb86018ac2b8092fdcd39d8444affc3f600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f250b1f6193941bb8bff4152d719edf1a59c0e6900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a23c1194d421f252b4e6d5edcc3205f7650a4ebe00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a8258abc8f2811dd48eccd209db68f25e3e3466700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000035b0ccc549776e927b8fa7f5fc7afe9f8652472c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000041b6f91daa1509bfbe06340d756560c4a1d146fd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000005a07ef0b2523fd41f8fe80c3de1bc75861d86c5100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ecbee2fae67709f718426ddc3bf770b26b95ed2000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bddf3b5a786775f63c2c389b86cddadd04d5a7aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d514b77060e04b1ee7e15f6e1d3b5419e9f3277300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000032a7c02e79c4ea1008dd6564b35f131428673c4100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d9a442856c234a39a81a089c06451ebaa4306a7200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000207e14389183a94343942de7afbc607f5746061800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000967da4048cd07ab37855c090aaf366e4ce1b9f4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000003ee5026c07d85ff8ae791370dd0f4c1ae6c97fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002364bb6dea9cacd4f8541af761d3bcf3d86b26fd00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000750a575284fad07fbf2fcc45eb26d1111afee16500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006368e1e18c4c419ddfc608a0bed1ccb87b9250fc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fae103dc9cf190ed75350761e95403b7b8afa6c000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000060be1e1fe41c1370adaf5d8e66f07cf1c2df226800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e25bcec5d3801ce3a794079bf94adf1b8ccd802d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000097aeb5066e1a590e868b511457beb6fe99d329f500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000725440512cb7b78bf56b334e50e31707418231cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d9f79fc56839c696e2e9f63948337f49d164a01500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000516d813bc49b0eb556f9d09549f98443acdd7d8f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000054a7cee7b02976ace1bdd4afad87273251ed34cf00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008e870d67f660d95d5be530380d0ec0bd388289e100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006732efaf6f39926346bef8b821a04b6361c4f3e500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000065e6b60ea01668634d68d0513fe814679f925bad00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3ade5ace1bbb033ccae8177c12ecbfa16bd6a9d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009e32b13ce7f2e80a01932b42553652e053d6ed8e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f32cea5d29c060069372ab9385f6e292387d553500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004cf89ca06ad997bc732dc876ed2a7f26a9e7f36100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a35b1b31ce002fbf2058d22f30f95d405200a15b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d680fff1699ad71f52e29cb4c36010fee7b8d61b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000e573ce2736dd9637a0b21058352e1667925c7a800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d973637d6c982a492bdafe6956cc79163f279b2c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fc448180d5254a55846a37c86146407db48d2a3600000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000bc4171f45ef0ef66e76f979df021a34b46dcc81d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000163f8c2467924be0ae7b5347228cabf26031875300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000093581991f68dbae1ea105233b67f7fa0d6bdee7b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009144d8e206b98ed9c38f19d3e4760e278faab1c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ae66e13e7ff6f505c6e53adfe47b2b9082b9e0ea00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fac0403a24229d7e2edd994d50f5940624cbeac200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002de7b02ae3b1f11d51ca7b2495e9094874a064c000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d101dcc414f310268c37eeb4cd376ccfa507f57100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cfc006a32a98031c2338bf9d5ff8ed2c0cae4a9e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009d14bce1daddf408d77295bb1be9b343814f44de00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000009fc86c5afb7b336367b8c1cf1f895dbfdd1ca06d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000eb8eb73bbf1b0b3a8ef30e48447f47894bf6ffdb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b7df0f42fae30acf30c9a5ba147d6b792b5eb9d900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c3d3bcb666588d8b58c921d3d297e04037ad466500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c78b628b060258300218740b1a7a5b3c82b3bd9f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008c30ba8e0b776d0b3654b72d737ecd668b26a19200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000046eee2cc3188071c02bfc1745a6b17c656e3f3d00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000db82c0d91e057e05600c8f8dc836beb41da6df1400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000738865301a9b7dd80dc3666dd48cf034ec42bdda00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c9fe6e1c76210be83dc1b5b20ec7fd010b0b1d1500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000216c9bb7380cde431662e37e30098d838d7e1dc800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da546071dcbcec77e707acc6ee32328b91607a2300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002e2364966267b5d7d2ce6cd9a9b5bd19d9c7c6a900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002a2550e0a75acec6d811ae3930732f7f3ad6758800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f79c694605f29ddf3f0eb41319c38672ab6fa89f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000ac57de9c1a09fec648e93eb98875b212db0d460b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f96459323030137703483b46fd59a71d712bf0aa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000006b3595068778dd592e39a122f4f5a5cf09c90fe200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000007c9f4c87d911613fe9ca58b579f737911aad2d4300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f2eab3a2034d3f6b63734d2e08262040e3ff7b4800000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000669c01caf0edcad7c2b8dc771474ad937a7ca4af00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000828e0edf347bd53e57d64426c67f291d8c553a7000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000582d872a1b094fc48f5de31d3b73f2d9be47def100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000008f3470a7388c05ee4e7af3d01d8c722b0ff5237400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000015f74458ae0bfdaa1a96ca1aa779d715cc1eefe400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000faba6f8e4a5e8ab82f62fe7c39859fa577269be300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000000000000000ca73a6df4c58b84c5b4b847fe8ff3900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000025daf950c6e814dee4c96e13c98d3196d22e60c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e2bca705991ba5f1bb8a33610dba10d481379cd300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000a636ee3f2c24748e9fc7fd8b577f7a629e879b4500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f9bd51d756a3caf52348f2901b7eff9bd03398e700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000007150e919b4de5fd6a63de1f9384828396f25fdc00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000093728f9b63edbb91739f4fbaa84890e5073e3d4f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000865377367054516e17014ccded1e7d814edc9ce400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000debe620609674f21b1089042527f420372ea98a500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b58e61c3098d85632df34eecfb899a1ed80921cb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000fe0c30065b384f05761f15d0cc899d4f9f9cc0eb00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000726516b20c4692a6bea3900971a37e0ccf7a6bff00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004a220e6096b25eadb88358cb44068a324825467500000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006e0000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000b60000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000084018071282d4b2996272659d9c01cb08dd7327f00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000c944e90c64b2c07662a292be6244bdf05cda44a700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000f65b5c5104c4fafd4b709d9d60a185eae063276c00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000088df592f8eb5d7bd38bfef7deb0fbc02cf3778a000000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000cd4b21deadeebfcff202ce73e976012afad1136100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000036e66fbbce51e4cd5bd3c62b637eb411b18949d400000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000004c9edd5852cd905f086c759e8383e09bff1e68b300000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000dbb7a34bf10169d6d2d0d02a6cbb436cf4381bfa00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b8c77482e45f1f44de1745f52c74426c631bdd5200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000023ec026590d6cccfece04097f9b49ae6a442c3ba00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
+
+0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000003400000000000000000000000000000000000000000000000000000000000000460000000000000000000000000000000000000000000000000000000000000058000000000000000000000000000000000000000000000000000000000000006a000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000008e0000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000da7c0810ce6f8329786160bb3d1734cf6661ca6e00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a00000000000000000000000072e364f2abdc788b7e918bc238b21f109cd634d700000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000001b9ebb707d87fbec93c49d9f2d994ebb60461b9b00000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000d3843c6be03520f45871874375d618b3c792301900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000b6ff96b8a8d214544ca0dbc9b33f7ad6503efd3200000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a0000000000000000000000002b1d36f5b61addaf7da7ebbd11b35fd8cfb0de3100000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000e8a25c46d623f12b8ba08b583b6fe1bee3eb31c900000000000000000000000057891966931eb4bb6fb81430e6ce0a03aabde063000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000847a1d8d3a000000000000000000000000000000000000000000000000000000000000000100000000000000000000000032400084c286cf3e17e7b677ea9583e60a000324000000000000000000000000000000000000000000000000000000000000014400000000000000000000000000000000000000000000000000000000000493e000000000000000000000000000000000000000000000000000000000
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/transactions.json b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/transactions.json
index cc28a1f20291..5b7d79d52610 100644
--- a/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/transactions.json
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/mainnet/transactions.json
@@ -9,7 +9,7 @@
       "maxFeePerGas": 0,
       "maxPriorityFeePerGas": 0,
       "paymaster": 0,
-      "nonce": "24",
+      "nonce": 24,
       "value": 0,
       "reserved": [
         0,
@@ -25,34 +25,34 @@
     },
     "bootloaderHash": "0x010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e",
     "defaultAccountHash": "0x01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e32",
-    "verifier": "0x9D6c59D9A234F585B367b4ba3C62e5Ec7A6179FD",
+    "verifier": "0x70F3FBf8a427155185Ec90BED8a3434203de9604",
     "verifierParams": {
       "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
-      "recursionLeafLevelVkHash": "0x435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f6",
+      "recursionLeafLevelVkHash": "0xf9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c6",
       "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
     },
     "l1ContractsUpgradeCalldata": "0x",
-    "postUpgradeCalldata": "0x00000000000000000000000000000000000000000000000000000000000001440000000000000000000000005b5c82f4da996e118b127880492a23391376f65c000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b8000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f61000000000000000000000000c2d7a7bd59a548249e64c1a587220c0e4f6f439e",
+    "postUpgradeCalldata": "0x0000000000000000000000000000000000000000000000000000000000000144000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb5213000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f610000000000000000000000005d8ba173dc6c3c90c8f7c04c9288bef5fdbad06e",
     "upgradeTimestamp": {
       "type": "BigNumber",
-      "hex": "0x6641C9A7"
+      "hex": "0x66615060"
     },
     "factoryDeps": [],
-    "newProtocolVersion": "24",
+    "newProtocolVersion": 103079215105,
     "newAllowList": "0x0000000000000000000000000000000000000000"
   },
-  "l1upgradeCalldata": "0x08284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e320000000000000000000000009d6c59d9a234f585b367b4ba3c62e5ec7a6179fdf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b00000000000000000000000000000000000000000000000000000000006641C9A7000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001440000000000000000000000005b5c82f4da996e118b127880492a23391376f65c000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b8000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f61000000000000000000000000c2d7a7bd59a548249e64c1a587220c0e4f6f439e",
-  "upgradeAddress": "0xb2963DDc6694a989B527AED0B1E19f9F0675AE4d",
-  "protocolVersion": "24",
-  "upgradeTimestamp": "1715587495",
-  "scheduleTransparentOperation": "0x2c431917000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a000324000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000003244a9f6d94100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000b2963ddc6694a989b527aed0b1e19f9f0675ae4d00000000000000000000000000000000000000000000000000000000000015e000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000c80000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000013c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b0e18b68100000000000000000000000000000000000000000000000000000000e58bb6390000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf500000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000173389450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000021cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed6270000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004701f58c500000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000007f61885c0000000000000000000000000000000000000000000000000000000097c09d3400000000000000000000000000000000000000000000000000000000000000000000000000000000342a09385e9bad4ad32a6220765a6c333552e565000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000345c6ca2f3e08445614f4299001418f125ad330a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000007814399116c17f2750ca99cbfd2b75ba9a0793d7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de35000000000000000000000000000000000000000000000000000000000000000000000000000000001a451d9bfbd176321966e9bc540596ca9d39b4b10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0408284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e320000000000000000000000009d6c59d9a234f585b367b4ba3c62e5ec7a6179fdf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b00000000000000000000000000000000000000000000000000000000006641C9A7000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001440000000000000000000000005b5c82f4da996e118b127880492a23391376f65c000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b8000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f61000000000000000000000000c2d7a7bd59a548249e64c1a587220c0e4f6f439e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-  "executeOperation": "0x74da756b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a000324000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000003244a9f6d94100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000b2963ddc6694a989b527aed0b1e19f9f0675ae4d00000000000000000000000000000000000000000000000000000000000015e000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000c80000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000013c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b0e18b68100000000000000000000000000000000000000000000000000000000e58bb6390000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf500000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000173389450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000021cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed6270000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004701f58c500000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000007f61885c0000000000000000000000000000000000000000000000000000000097c09d3400000000000000000000000000000000000000000000000000000000000000000000000000000000342a09385e9bad4ad32a6220765a6c333552e565000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000345c6ca2f3e08445614f4299001418f125ad330a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000007814399116c17f2750ca99cbfd2b75ba9a0793d7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de35000000000000000000000000000000000000000000000000000000000000000000000000000000001a451d9bfbd176321966e9bc540596ca9d39b4b10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0408284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e320000000000000000000000009d6c59d9a234f585b367b4ba3c62e5ec7a6179fdf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b00000000000000000000000000000000000000000000000000000000006641C9A7000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001440000000000000000000000005b5c82f4da996e118b127880492a23391376f65c000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b8000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f61000000000000000000000000c2d7a7bd59a548249e64c1a587220c0e4f6f439e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "l1upgradeCalldata": "0x08284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e3200000000000000000000000070f3fbf8a427155185ec90bed8a3434203de9604f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8f9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000066615060000000000000000000000000000000000000000000000000000000180000000100000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000144000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb5213000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f610000000000000000000000005d8ba173dc6c3c90c8f7c04c9288bef5fdbad06e",
+  "upgradeAddress": "0xD719fca4433646CBD86F6b073EE364D36b856b1D",
+  "protocolVersion": 103079215105,
+  "upgradeTimestamp": "1717653600",
+  "scheduleTransparentOperation": "0x2c431917000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a000324000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000003264a9f6d94100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000d719fca4433646cbd86f6b073ee364d36b856b1d000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000c80000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b0e18b68100000000000000000000000000000000000000000000000000000000e58bb6390000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf500000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000173389450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000021cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed6270000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004701f58c500000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000007f61885c0000000000000000000000000000000000000000000000000000000097c09d3400000000000000000000000000000000000000000000000000000000000000000000000000000000f6f26b416ce7ae5e5fe224be332c7ae4e1f3450a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000e60e94fccb18a81d501a38959e532c0a85a1be8900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000291de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b00000000000000000000000000000000000000000000000000000000f5c1182c000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000cdb6228b616eef8df47d69a372c4f725c43e718c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de3500000000000000000000000000000000000000000000000000000000000000000000000000000000ad193ade635576d8e9f7ada71af2137b16c640750000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0408284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e3200000000000000000000000070f3fbf8a427155185ec90bed8a3434203de9604f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8f9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000066615060000000000000000000000000000000000000000000000000000000180000000100000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000144000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb5213000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f610000000000000000000000005d8ba173dc6c3c90c8f7c04c9288bef5fdbad06e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "executeOperation": "0x74da756b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000032400084c286cf3e17e7b677ea9583e60a000324000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000003264a9f6d94100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000d719fca4433646cbd86f6b073ee364d36b856b1d000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000c80000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b0e18b68100000000000000000000000000000000000000000000000000000000e58bb6390000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf500000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000173389450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000021cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed6270000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004701f58c500000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000007f61885c0000000000000000000000000000000000000000000000000000000097c09d3400000000000000000000000000000000000000000000000000000000000000000000000000000000f6f26b416ce7ae5e5fe224be332c7ae4e1f3450a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000e60e94fccb18a81d501a38959e532c0a85a1be8900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000291de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b00000000000000000000000000000000000000000000000000000000f5c1182c000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000cdb6228b616eef8df47d69a372c4f725c43e718c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de3500000000000000000000000000000000000000000000000000000000000000000000000000000000ad193ade635576d8e9f7ada71af2137b16c640750000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0408284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e3200000000000000000000000070f3fbf8a427155185ec90bed8a3434203de9604f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8f9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000066615060000000000000000000000000000000000000000000000000000000180000000100000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000144000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb5213000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f610000000000000000000000005d8ba173dc6c3c90c8f7c04c9288bef5fdbad06e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
   "governanceOperation": {
     "calls": [
       {
         "target": "0x32400084c286cf3e17e7b677ea9583e60a000324",
         "value": 0,
-        "data": "0xa9f6d94100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000b2963ddc6694a989b527aed0b1e19f9f0675ae4d00000000000000000000000000000000000000000000000000000000000015e000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000c80000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000013c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b0e18b68100000000000000000000000000000000000000000000000000000000e58bb6390000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf500000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000173389450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000021cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed6270000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004701f58c500000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000007f61885c0000000000000000000000000000000000000000000000000000000097c09d3400000000000000000000000000000000000000000000000000000000000000000000000000000000342a09385e9bad4ad32a6220765a6c333552e565000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000345c6ca2f3e08445614f4299001418f125ad330a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000007814399116c17f2750ca99cbfd2b75ba9a0793d7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de35000000000000000000000000000000000000000000000000000000000000000000000000000000001a451d9bfbd176321966e9bc540596ca9d39b4b10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0408284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e320000000000000000000000009d6c59d9a234f585b367b4ba3c62e5ec7a6179fdf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b00000000000000000000000000000000000000000000000000000000006641C9A7000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001440000000000000000000000005b5c82f4da996e118b127880492a23391376f65c000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b8000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f61000000000000000000000000c2d7a7bd59a548249e64c1a587220c0e4f6f439e00000000000000000000000000000000000000000000000000000000"
+        "data": "0xa9f6d94100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000d719fca4433646cbd86f6b073ee364d36b856b1d000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000007c000000000000000000000000000000000000000000000000000000000000009200000000000000000000000000000000000000000000000000000000000000a400000000000000000000000000000000000000000000000000000000000000c80000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000013e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b0e18b68100000000000000000000000000000000000000000000000000000000e58bb6390000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf500000000000000000000000000000000000000000000000000000000f235757f000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf000000000000000000000000000000000000000000000000000000004623c91d00000000000000000000000000000000000000000000000000000000173389450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000021cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed6270000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000004fc07d7500000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da000000000000000000000000000000000000000000000000000000008665b15000000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000066c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb6724190000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000004701f58c500000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000007f61885c0000000000000000000000000000000000000000000000000000000097c09d3400000000000000000000000000000000000000000000000000000000000000000000000000000000f6f26b416ce7ae5e5fe224be332c7ae4e1f3450a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000e60e94fccb18a81d501a38959e532c0a85a1be8900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000291de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b00000000000000000000000000000000000000000000000000000000f5c1182c000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000cdb6228b616eef8df47d69a372c4f725c43e718c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de3500000000000000000000000000000000000000000000000000000000000000000000000000000000ad193ade635576d8e9f7ada71af2137b16c640750000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c0408284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e3200000000000000000000000070f3fbf8a427155185ec90bed8a3434203de9604f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8f9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000066615060000000000000000000000000000000000000000000000000000000180000000100000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000144000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb5213000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f610000000000000000000000005d8ba173dc6c3c90c8f7c04c9288bef5fdbad06e00000000000000000000000000000000000000000000000000000000"
       }
     ],
     "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -143,7 +143,7 @@
         "isFreezable": false
       },
       {
-        "facet": "0x342a09385E9BAD4AD32a6220765A6c333552e565",
+        "facet": "0xF6F26b416CE7AE5e5FE224Be332C7aE4e1f3450a",
         "selectors": [
           "0x0e18b681",
           "0x64bf8d66",
@@ -163,7 +163,7 @@
         "isFreezable": false
       },
       {
-        "facet": "0x345c6ca2F3E08445614f4299001418F125AD330a",
+        "facet": "0xE60E94fCCb18a81D501a38959E532C0A85A1be89",
         "selectors": [
           "0x1de72e34",
           "0xea6c029c",
@@ -186,6 +186,7 @@
           "0x0ec6b0b7",
           "0x33ce93fe",
           "0x06d49e5b",
+          "0xf5c1182c",
           "0x5518c73b",
           "0xdb1f0bf9",
           "0xb8c2f66f",
@@ -210,7 +211,7 @@
         "isFreezable": false
       },
       {
-        "facet": "0x7814399116C17F2750Ca99cBFD2b75bA9a0793d7",
+        "facet": "0xCDB6228b616EEf8Df47D69A372C4f725C43e718C",
         "selectors": [
           "0x12f43dab",
           "0x6c0960f9",
@@ -225,7 +226,7 @@
         "isFreezable": true
       },
       {
-        "facet": "0x1a451d9bFBd176321966e9bc540596Ca9d39B4B1",
+        "facet": "0xaD193aDe635576d8e9f7ada71Af2137b16c64075",
         "selectors": [
           "0x701f58c5",
           "0x6edd4f12",
@@ -240,7 +241,7 @@
         "isFreezable": true
       }
     ],
-    "initAddress": "0xb2963DDc6694a989B527AED0B1E19f9F0675AE4d",
-    "initCalldata": "0x08284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e320000000000000000000000009d6c59d9a234f585b367b4ba3c62e5ec7a6179fdf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b00000000000000000000000000000000000000000000000000000000006641C9A7000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000001440000000000000000000000005b5c82f4da996e118b127880492a23391376f65c000000000000000000000000280372beaaf440c52a2ed893daa14cdacc0422b8000000000000000000000000241f19ea8ccd04515b309f1c9953a322f51891fc0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f61000000000000000000000000c2d7a7bd59a548249e64c1a587220c0e4f6f439e"
+    "initAddress": "0xD719fca4433646CBD86F6b073EE364D36b856b1D",
+    "initCalldata": "0x08284e57000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000001ac0010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e3200000000000000000000000070f3fbf8a427155185ec90bed8a3434203de9604f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8f9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001ae00000000000000000000000000000000000000000000000000000000000001b000000000000000000000000000000000000000000000000000000000066615060000000000000000000000000000000000000000000000000000000180000000100000000000000000000000000000000000000000000000000000000000000fe0000000000000000000000000000000000000000000000000000000000008007000000000000000000000000000000000000000000000000000000000000800600000000000000000000000000000000000000000000000000000000044aa2000000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000018c000000000000000000000000000000000000000000000000000000000000018e0000000000000000000000000000000000000000000000000000000000000190000000000000000000000000000000000000000000000000000000000000019200000000000000000000000000000000000000000000000000000000000001624e9f18c1700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000019000000000000000000000000000000000000000000000000000000000000032000000000000000000000000000000000000000000000000000000000000003e000000000000000000000000000000000000000000000000000000000000004a00000000000000000000000000000000000000000000000000000000000000560000000000000000000000000000000000000000000000000000000000000062000000000000000000000000000000000000000000000000000000000000006e000000000000000000000000000000000000000000000000000000000000007a00000000000000000000000000000000000000000000000000000000000000860000000000000000000000000000000000000000000000000000000000000092000000000000000000000000000000000000000000000000000000000000009e00000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000b600000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000ce00000000000000000000000000000000000000000000000000000000000000da00000000000000000000000000000000000000000000000000000000000000e600000000000000000000000000000000000000000000000000000000000000f200000000000000000000000000000000000000000000000000000000000000fe000000000000000000000000000000000000000000000000000000000000010a00000000000000000000000000000000000000000000000000000000000001160000000000000000000000000000000000000000000000000000000000000122000000000000000000000000000000000000000000000000000000000000012e000000000000000000000000000000000000000000000000000000000000013a0000000000000000000000000000000000000000000000000000000000000146000000000000000000000000000000000000000000000000000000000000015200100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001112e34172b2bc31574d155893a087a1cf4b608cf9895a2201ea7bd6ee00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001752dc8a1a374a6346781205017b7b594d97c28812265865f3a45fcb4500000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000872dd7e2dc1b34416c174086aa84fd80c78acc7b670214da955bd5572800000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000bd8bd7ab008f76e359dc296ff5fe0e8a95fedce1d570943e90143acdfd00000000000000000000000000000000000000000000000000000000000000070000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000f1b3432a32f9fba2115f5dd3b0ee8127e7bf2c609d57d3e231f19119c4300000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000781e55a60f3f14fd7dd67e3c8caab896b7b0fca4a662583959299eede00000000000000000000000000000000000000000000000000000000000080010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007549287362e4263ea5b204f01fc3c7f2ac09d71e6eb21029698220f01a00000000000000000000000000000000000000000000000000000000000080020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000e563d4ad7b4822cc19d8f74f2c41ee3d3153379be4b02b27d4498d52b600000000000000000000000000000000000000000000000000000000000080030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100007d82d4a2eb62e539e3c89cc641f507132b247022ba05ef1ddfed2b007300000000000000000000000000000000000000000000000000000000000080040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100003de00c5ceaa3fdf4566a9822ce94abe676f68b17a6ae11c453e14455fd00000000000000000000000000000000000000000000000000000000000080050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010005215fda00bfbf95847a13078bd16cdcb1b875534261c1dda9940c7754fe00000000000000000000000000000000000000000000000000000000000080060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010002b97ebf3c481ead775617590ffca139bee428e443aa49eb38b6a5b8365700000000000000000000000000000000000000000000000000000000000080080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000695a1e821b6d5fcb25e25793b81de0bdca3ff8277e3ac93a38e729e0a100000000000000000000000000000000000000000000000000000000000080090000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001039329e4bb55b24531c7e7d27ed40d2c82ad145033fdd5ed5b8ea86cf3000000000000000000000000000000000000000000000000000000000000800a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010001b3f2c3a6bdd5ad00ae29a7cbbb32dca3c31fb608b5cd52f8f3056a3847000000000000000000000000000000000000000000000000000000000000800b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010007d1e53f2dca05f7e27ae5b7062291ed3a1470ca511140b8e786aae7eb77000000000000000000000000000000000000000000000000000000000000800c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000010000159a3a08da3ac57cdefec0e9e30da60456bc5643134cf16d6957bcf1ac000000000000000000000000000000000000000000000000000000000000800d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000179842b5aa1c76036f5b90652fe614dacb28438a89649d6ca48131bd402000000000000000000000000000000000000000000000000000000000000800e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000055c1f27b8316ba61bf07959b11cf3b2a418aa357ccc5531c0914a2da27000000000000000000000000000000000000000000000000000000000000800f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100000f248e111a1b587fef850dc4585c39af2dd505bc8a0d5cc6d3fcc7ed3c00000000000000000000000000000000000000000000000000000000000080100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000023b02bbb21baf1367835e56ae17b82688527dc8f78caf34b12e670ee6500000000000000000000000000000000000000000000000000000000000080120000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100001169cd6aa311c1bc9bbe2e7dd085720c96bb197e3223be7e9c66e46ef900000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000001000049eb6d79244e74e5286ed4d3f6eef2b5eb746b67d98691dbc28fa1698400000000000000000000000000000000000000000000000000000000000080110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000100004bc85f45ebf0f0bf004752bcbff1bb99792d6cc6494227970ec77fe53b00000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000144000000000000000000000000303a465b659cbb0ab36ee643ea362c509eeb5213000000000000000000000000c2ee6b6af7d616f6e27ce7f4a451aedc2b0f5f5c000000000000000000000000d7f9f54194c633f36ccd5f3da84ad4a1c38cb2cb0000000000000000000000000b622a2061eaccae1c664ebc3e868b8438e03f610000000000000000000000005d8ba173dc6c3c90c8f7c04c9288bef5fdbad06e"
   }
 }
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/crypto.json b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/crypto.json
new file mode 100644
index 000000000000..c1fff897514b
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/crypto.json
@@ -0,0 +1,11 @@
+{
+  "verifier": {
+    "address": "0xD6F42e1a6CF553Bee033b2C219884512FD365A54",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "keys": {
+    "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+    "recursionLeafLevelVkHash": "0xffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb",
+    "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/facetCuts.json b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/facetCuts.json
new file mode 100644
index 000000000000..d4ccd3f06b3a
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/facetCuts.json
@@ -0,0 +1,196 @@
+[
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x0e18b681",
+      "0x64bf8d66",
+      "0xa9f6d941",
+      "0x27ae4c16",
+      "0x4dd18bf5",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0xe76db865",
+      "0x235d9eb5",
+      "0x21f603d7",
+      "0x4623c91d",
+      "0x17338945",
+      "0xfc57565f"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x1de72e34",
+      "0xea6c029c",
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0x6e9960c3",
+      "0x98acd7a6",
+      "0x086a56f8",
+      "0x3591c1a0",
+      "0x79823c9a",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0xe5355c75",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0xd0468156",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x33ce93fe",
+      "0x06d49e5b",
+      "0x5518c73b",
+      "0xdb1f0bf9",
+      "0xb8c2f66f",
+      "0xef3f0bae",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0xb22dd78e",
+      "0x74f4d30d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x12f43dab",
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419",
+      "0xc924de35"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x701f58c5",
+      "0x6edd4f12",
+      "0xc3d93e7c",
+      "0x6f497ac6",
+      "0x7f61885c",
+      "0xc37533bb",
+      "0x97c09d34",
+      "0x0f23da43"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xE698A6Fb588A7B4f5b4C7478FCeC51aB8f869B36",
+    "selectors": [
+      "0x0e18b681",
+      "0x64bf8d66",
+      "0xa9f6d941",
+      "0x27ae4c16",
+      "0x4dd18bf5",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0xe76db865",
+      "0x235d9eb5",
+      "0x21f603d7",
+      "0x4623c91d",
+      "0x17338945",
+      "0xfc57565f"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x22588e7cac6770e43FB99961Db70c608c45D9924",
+    "selectors": [
+      "0x1de72e34",
+      "0xea6c029c",
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0x6e9960c3",
+      "0x98acd7a6",
+      "0x086a56f8",
+      "0x3591c1a0",
+      "0x79823c9a",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0xe5355c75",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0xd0468156",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x33ce93fe",
+      "0x06d49e5b",
+      "0x5518c73b",
+      "0xdb1f0bf9",
+      "0xb8c2f66f",
+      "0xef3f0bae",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0xb22dd78e",
+      "0x74f4d30d"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x3aA2A5f021E546f4fe989Fc4b428099D1FA853F5",
+    "selectors": [
+      "0x12f43dab",
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419",
+      "0xc924de35"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+    "selectors": [
+      "0x701f58c5",
+      "0x6edd4f12",
+      "0xc3d93e7c",
+      "0x6f497ac6",
+      "0x7f61885c",
+      "0xc37533bb",
+      "0x97c09d34",
+      "0x0f23da43"
+    ],
+    "action": 0,
+    "isFreezable": true
+  }
+]
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/localhost/facets.json b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/facets.json
similarity index 51%
rename from etc/upgrades/1711451944-hyperchain-upgrade/localhost/facets.json
rename to etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/facets.json
index eefd4fe0e32a..63d1af7ec11d 100644
--- a/etc/upgrades/1711451944-hyperchain-upgrade/localhost/facets.json
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/facets.json
@@ -1,18 +1,18 @@
 {
     "ExecutorFacet": {
-        "address": "0x05b457568b5dB6A441E8EE59e62FD2e615D75a74",
+        "address": "0x63f4c229F261c2576E8B5A405321769c08134c73",
         "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-      },
-      "AdminFacet": {
-        "address": "0x4404E6756811E631ddD86d9B08d915595c588001",
+    },
+    "AdminFacet": {
+        "address": "0xE698A6Fb588A7B4f5b4C7478FCeC51aB8f869B36",
         "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-      },
-      "GettersFacet": {
-        "address": "0xA3c5567c001cBA583819137a913D0750f49Bf595",
+    },
+    "GettersFacet": {
+        "address": "0x22588e7cac6770e43FB99961Db70c608c45D9924",
         "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-      },
-      "MailboxFacet": {
-        "address": "0xD1b09a1AC04FE9109fAE124490eAd365D5e221B8",
+    },
+    "MailboxFacet": {
+        "address": "0x3aA2A5f021E546f4fe989Fc4b428099D1FA853F5",
         "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-      }
+    }
 }
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/transactions.json b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/transactions.json
new file mode 100644
index 000000000000..44dc7a1e8796
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix/transactions.json
@@ -0,0 +1,287 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 0,
+      "from": "0x0000000000000000000000000000000000000000",
+      "to": "0x0000000000000000000000000000000000000000",
+      "gasLimit": 0,
+      "gasPerPubdataByteLimit": 0,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": 0,
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0x",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "defaultAccountHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "verifier": "0xD6F42e1a6CF553Bee033b2C219884512FD365A54",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+      "recursionLeafLevelVkHash": "0xffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x6602af28"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "24",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x08284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E",
+  "protocolVersion": "24",
+  "upgradeTimestamp": "1711451944",
+  "stmScheduleTransparentOperation": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000925dd0bc14552b0b261ca8a23ad26df9c6f2c8ba000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d842e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmExecuteOperation": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000925dd0bc14552b0b261ca8a23ad26df9c6f2c8ba000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d842e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "scheduleTransparentOperation": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000005bbdede0f0bac61aa64068b60379fe32ecc0f96c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44fc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "executeOperation": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000005bbdede0f0bac61aa64068b60379fe32ecc0f96c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44fc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmScheduleOperationDirect": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000925dd0bc14552b0b261ca8a23ad26df9c6f2c8ba000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44e34a329a000000000000000000000000000000000000000000000000000000000000010f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmExecuteOperationDirect": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000925dd0bc14552b0b261ca8a23ad26df9c6f2c8ba000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44e34a329a000000000000000000000000000000000000000000000000000000000000010f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "governanceOperation": {
+    "calls": [
+      {
+        "target": "0x5BBdEDe0F0bAc61AA64068b60379fe32ecc0F96C",
+        "value": 0,
+        "data": "0xfc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "stmDirectGovernanceOperation": {
+    "calls": [
+      {
+        "target": "0x925Dd0BC14552b0b261CA8A23ad26df9C6f2C8bA",
+        "value": 0,
+        "data": "0xe34a329a000000000000000000000000000000000000000000000000000000000000010f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "stmGovernanceOperation": {
+    "calls": [
+      {
+        "target": "0x925Dd0BC14552b0b261CA8A23ad26df9C6f2C8bA",
+        "value": 0,
+        "data": "0x2e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "diamondCut": {
+    "facetCuts": [
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x0e18b681",
+          "0x64bf8d66",
+          "0xa9f6d941",
+          "0x27ae4c16",
+          "0x4dd18bf5",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0xe76db865",
+          "0x235d9eb5",
+          "0x21f603d7",
+          "0x4623c91d",
+          "0x17338945",
+          "0xfc57565f"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x1de72e34",
+          "0xea6c029c",
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0x6e9960c3",
+          "0x98acd7a6",
+          "0x086a56f8",
+          "0x3591c1a0",
+          "0x79823c9a",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0xe5355c75",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0xd0468156",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x33ce93fe",
+          "0x06d49e5b",
+          "0x5518c73b",
+          "0xdb1f0bf9",
+          "0xb8c2f66f",
+          "0xef3f0bae",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0xb22dd78e",
+          "0x74f4d30d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x12f43dab",
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419",
+          "0xc924de35"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x701f58c5",
+          "0x6edd4f12",
+          "0xc3d93e7c",
+          "0x6f497ac6",
+          "0x7f61885c",
+          "0xc37533bb",
+          "0x97c09d34",
+          "0x0f23da43"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xE698A6Fb588A7B4f5b4C7478FCeC51aB8f869B36",
+        "selectors": [
+          "0x0e18b681",
+          "0x64bf8d66",
+          "0xa9f6d941",
+          "0x27ae4c16",
+          "0x4dd18bf5",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0xe76db865",
+          "0x235d9eb5",
+          "0x21f603d7",
+          "0x4623c91d",
+          "0x17338945",
+          "0xfc57565f"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x22588e7cac6770e43FB99961Db70c608c45D9924",
+        "selectors": [
+          "0x1de72e34",
+          "0xea6c029c",
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0x6e9960c3",
+          "0x98acd7a6",
+          "0x086a56f8",
+          "0x3591c1a0",
+          "0x79823c9a",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0xe5355c75",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0xd0468156",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x33ce93fe",
+          "0x06d49e5b",
+          "0x5518c73b",
+          "0xdb1f0bf9",
+          "0xb8c2f66f",
+          "0xef3f0bae",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0xb22dd78e",
+          "0x74f4d30d"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x3aA2A5f021E546f4fe989Fc4b428099D1FA853F5",
+        "selectors": [
+          "0x12f43dab",
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419",
+          "0xc924de35"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+        "selectors": [
+          "0x701f58c5",
+          "0x6edd4f12",
+          "0xc3d93e7c",
+          "0x6f497ac6",
+          "0x7f61885c",
+          "0xc37533bb",
+          "0x97c09d34",
+          "0x0f23da43"
+        ],
+        "action": 0,
+        "isFreezable": true
+      }
+    ],
+    "initAddress": "0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E",
+    "initCalldata": "0x08284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/crypto.json b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/crypto.json
new file mode 100644
index 000000000000..af6c87214a12
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/crypto.json
@@ -0,0 +1,11 @@
+{
+  "verifier": {
+    "address": "0xCDFDfbc04A58C79f0597E87E5dE680D0EdeABA9f",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "keys": {
+    "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+    "recursionLeafLevelVkHash": "0xcc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456",
+    "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/facetCuts.json b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/facetCuts.json
new file mode 100644
index 000000000000..d4ccd3f06b3a
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/facetCuts.json
@@ -0,0 +1,196 @@
+[
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x0e18b681",
+      "0x64bf8d66",
+      "0xa9f6d941",
+      "0x27ae4c16",
+      "0x4dd18bf5",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0xe76db865",
+      "0x235d9eb5",
+      "0x21f603d7",
+      "0x4623c91d",
+      "0x17338945",
+      "0xfc57565f"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x1de72e34",
+      "0xea6c029c",
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0x6e9960c3",
+      "0x98acd7a6",
+      "0x086a56f8",
+      "0x3591c1a0",
+      "0x79823c9a",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0xe5355c75",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0xd0468156",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x33ce93fe",
+      "0x06d49e5b",
+      "0x5518c73b",
+      "0xdb1f0bf9",
+      "0xb8c2f66f",
+      "0xef3f0bae",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0xb22dd78e",
+      "0x74f4d30d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x12f43dab",
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419",
+      "0xc924de35"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x701f58c5",
+      "0x6edd4f12",
+      "0xc3d93e7c",
+      "0x6f497ac6",
+      "0x7f61885c",
+      "0xc37533bb",
+      "0x97c09d34",
+      "0x0f23da43"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xE698A6Fb588A7B4f5b4C7478FCeC51aB8f869B36",
+    "selectors": [
+      "0x0e18b681",
+      "0x64bf8d66",
+      "0xa9f6d941",
+      "0x27ae4c16",
+      "0x4dd18bf5",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0xe76db865",
+      "0x235d9eb5",
+      "0x21f603d7",
+      "0x4623c91d",
+      "0x17338945",
+      "0xfc57565f"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x22588e7cac6770e43FB99961Db70c608c45D9924",
+    "selectors": [
+      "0x1de72e34",
+      "0xea6c029c",
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0x6e9960c3",
+      "0x98acd7a6",
+      "0x086a56f8",
+      "0x3591c1a0",
+      "0x79823c9a",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0xe5355c75",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0xd0468156",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x33ce93fe",
+      "0x06d49e5b",
+      "0x5518c73b",
+      "0xdb1f0bf9",
+      "0xb8c2f66f",
+      "0xef3f0bae",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0xb22dd78e",
+      "0x74f4d30d"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x3aA2A5f021E546f4fe989Fc4b428099D1FA853F5",
+    "selectors": [
+      "0x12f43dab",
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419",
+      "0xc924de35"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+    "selectors": [
+      "0x701f58c5",
+      "0x6edd4f12",
+      "0xc3d93e7c",
+      "0x6f497ac6",
+      "0x7f61885c",
+      "0xc37533bb",
+      "0x97c09d34",
+      "0x0f23da43"
+    ],
+    "action": 0,
+    "isFreezable": true
+  }
+]
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/facets.json b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/facets.json
new file mode 100644
index 000000000000..63d1af7ec11d
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/facets.json
@@ -0,0 +1,18 @@
+{
+    "ExecutorFacet": {
+        "address": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "AdminFacet": {
+        "address": "0xE698A6Fb588A7B4f5b4C7478FCeC51aB8f869B36",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "GettersFacet": {
+        "address": "0x22588e7cac6770e43FB99961Db70c608c45D9924",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "MailboxFacet": {
+        "address": "0x3aA2A5f021E546f4fe989Fc4b428099D1FA853F5",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/transactions.json b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/transactions.json
new file mode 100644
index 000000000000..9375aeddc9e6
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/stage-proofs-fix2/transactions.json
@@ -0,0 +1,287 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 0,
+      "from": "0x0000000000000000000000000000000000000000",
+      "to": "0x0000000000000000000000000000000000000000",
+      "gasLimit": 0,
+      "gasPerPubdataByteLimit": 0,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": 0,
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0x",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "defaultAccountHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "verifier": "0xCDFDfbc04A58C79f0597E87E5dE680D0EdeABA9f",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+      "recursionLeafLevelVkHash": "0xcc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x6602af28"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "24",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x08284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E",
+  "protocolVersion": "24",
+  "upgradeTimestamp": "1711451944",
+  "stmScheduleTransparentOperation": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000925dd0bc14552b0b261ca8a23ad26df9c6f2c8ba000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d842e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmExecuteOperation": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000925dd0bc14552b0b261ca8a23ad26df9c6f2c8ba000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d842e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "scheduleTransparentOperation": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000005bbdede0f0bac61aa64068b60379fe32ecc0f96c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44fc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "executeOperation": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000005bbdede0f0bac61aa64068b60379fe32ecc0f96c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44fc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmScheduleOperationDirect": "0x2c4319170000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000925dd0bc14552b0b261ca8a23ad26df9c6f2c8ba000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44e34a329a000000000000000000000000000000000000000000000000000000000000010f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmExecuteOperationDirect": "0x74da756b000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000925dd0bc14552b0b261ca8a23ad26df9c6f2c8ba000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44e34a329a000000000000000000000000000000000000000000000000000000000000010f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "governanceOperation": {
+    "calls": [
+      {
+        "target": "0x5BBdEDe0F0bAc61AA64068b60379fe32ecc0F96C",
+        "value": 0,
+        "data": "0xfc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "stmDirectGovernanceOperation": {
+    "calls": [
+      {
+        "target": "0x925Dd0BC14552b0b261CA8A23ad26df9C6f2C8bA",
+        "value": 0,
+        "data": "0xe34a329a000000000000000000000000000000000000000000000000000000000000010f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "stmGovernanceOperation": {
+    "calls": [
+      {
+        "target": "0x925Dd0BC14552b0b261CA8A23ad26df9C6f2C8bA",
+        "value": 0,
+        "data": "0x2e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000e698a6fb588a7b4f5b4c7478fcec51ab8f869b36000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f0000000000000000000000000000000000000000000000000000000000000000000000000000000022588e7cac6770e43fb99961db70c608c45d992400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000003aa2a5f021e546f4fe989fc4b428099d1fa853f5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "diamondCut": {
+    "facetCuts": [
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x0e18b681",
+          "0x64bf8d66",
+          "0xa9f6d941",
+          "0x27ae4c16",
+          "0x4dd18bf5",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0xe76db865",
+          "0x235d9eb5",
+          "0x21f603d7",
+          "0x4623c91d",
+          "0x17338945",
+          "0xfc57565f"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x1de72e34",
+          "0xea6c029c",
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0x6e9960c3",
+          "0x98acd7a6",
+          "0x086a56f8",
+          "0x3591c1a0",
+          "0x79823c9a",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0xe5355c75",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0xd0468156",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x33ce93fe",
+          "0x06d49e5b",
+          "0x5518c73b",
+          "0xdb1f0bf9",
+          "0xb8c2f66f",
+          "0xef3f0bae",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0xb22dd78e",
+          "0x74f4d30d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x12f43dab",
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419",
+          "0xc924de35"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x701f58c5",
+          "0x6edd4f12",
+          "0xc3d93e7c",
+          "0x6f497ac6",
+          "0x7f61885c",
+          "0xc37533bb",
+          "0x97c09d34",
+          "0x0f23da43"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xE698A6Fb588A7B4f5b4C7478FCeC51aB8f869B36",
+        "selectors": [
+          "0x0e18b681",
+          "0x64bf8d66",
+          "0xa9f6d941",
+          "0x27ae4c16",
+          "0x4dd18bf5",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0xe76db865",
+          "0x235d9eb5",
+          "0x21f603d7",
+          "0x4623c91d",
+          "0x17338945",
+          "0xfc57565f"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x22588e7cac6770e43FB99961Db70c608c45D9924",
+        "selectors": [
+          "0x1de72e34",
+          "0xea6c029c",
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0x6e9960c3",
+          "0x98acd7a6",
+          "0x086a56f8",
+          "0x3591c1a0",
+          "0x79823c9a",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0xe5355c75",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0xd0468156",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x33ce93fe",
+          "0x06d49e5b",
+          "0x5518c73b",
+          "0xdb1f0bf9",
+          "0xb8c2f66f",
+          "0xef3f0bae",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0xb22dd78e",
+          "0x74f4d30d"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x3aA2A5f021E546f4fe989Fc4b428099D1FA853F5",
+        "selectors": [
+          "0x12f43dab",
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419",
+          "0xc924de35"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+        "selectors": [
+          "0x701f58c5",
+          "0x6edd4f12",
+          "0xc3d93e7c",
+          "0x6f497ac6",
+          "0x7f61885c",
+          "0xc37533bb",
+          "0x97c09d34",
+          "0x0f23da43"
+        ],
+        "action": 0,
+        "isFreezable": true
+      }
+    ],
+    "initAddress": "0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E",
+    "initCalldata": "0x08284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/crypto.json b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/crypto.json
new file mode 100644
index 000000000000..c1fff897514b
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/crypto.json
@@ -0,0 +1,11 @@
+{
+  "verifier": {
+    "address": "0xD6F42e1a6CF553Bee033b2C219884512FD365A54",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "keys": {
+    "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+    "recursionLeafLevelVkHash": "0xffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb",
+    "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/facetCuts.json b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/facetCuts.json
new file mode 100644
index 000000000000..83bc50976dbf
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/facetCuts.json
@@ -0,0 +1,196 @@
+[
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x0e18b681",
+      "0x64bf8d66",
+      "0xa9f6d941",
+      "0x27ae4c16",
+      "0x4dd18bf5",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0xe76db865",
+      "0x235d9eb5",
+      "0x21f603d7",
+      "0x4623c91d",
+      "0x17338945",
+      "0xfc57565f"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x1de72e34",
+      "0xea6c029c",
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0x6e9960c3",
+      "0x98acd7a6",
+      "0x086a56f8",
+      "0x3591c1a0",
+      "0x79823c9a",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0xe5355c75",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0xd0468156",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x33ce93fe",
+      "0x06d49e5b",
+      "0x5518c73b",
+      "0xdb1f0bf9",
+      "0xb8c2f66f",
+      "0xef3f0bae",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0xb22dd78e",
+      "0x74f4d30d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x12f43dab",
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419",
+      "0xc924de35"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x701f58c5",
+      "0x6edd4f12",
+      "0xc3d93e7c",
+      "0x6f497ac6",
+      "0x7f61885c",
+      "0xc37533bb",
+      "0x97c09d34",
+      "0x0f23da43"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x7D76D6253EFbC600C1d33e3E2775deD1b649E9b5",
+    "selectors": [
+      "0x0e18b681",
+      "0x64bf8d66",
+      "0xa9f6d941",
+      "0x27ae4c16",
+      "0x4dd18bf5",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0xe76db865",
+      "0x235d9eb5",
+      "0x21f603d7",
+      "0x4623c91d",
+      "0x17338945",
+      "0xfc57565f"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xb74974B077d22cF766aE15a343268E35e97941eD",
+    "selectors": [
+      "0x1de72e34",
+      "0xea6c029c",
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0x6e9960c3",
+      "0x98acd7a6",
+      "0x086a56f8",
+      "0x3591c1a0",
+      "0x79823c9a",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0xe5355c75",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0xd0468156",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x33ce93fe",
+      "0x06d49e5b",
+      "0x5518c73b",
+      "0xdb1f0bf9",
+      "0xb8c2f66f",
+      "0xef3f0bae",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0xb22dd78e",
+      "0x74f4d30d"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xba62b131f121CAEaFfAF443E3547dAD0c84b2e06",
+    "selectors": [
+      "0x12f43dab",
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419",
+      "0xc924de35"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+    "selectors": [
+      "0x701f58c5",
+      "0x6edd4f12",
+      "0xc3d93e7c",
+      "0x6f497ac6",
+      "0x7f61885c",
+      "0xc37533bb",
+      "0x97c09d34",
+      "0x0f23da43"
+    ],
+    "action": 0,
+    "isFreezable": true
+  }
+]
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/facets.json b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/facets.json
new file mode 100644
index 000000000000..ef6bf66d317c
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/facets.json
@@ -0,0 +1,18 @@
+{
+    "ExecutorFacet": {
+        "address": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "AdminFacet": {
+        "address": "0x7D76D6253EFbC600C1d33e3E2775deD1b649E9b5",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "GettersFacet": {
+        "address": "0xb74974B077d22cF766aE15a343268E35e97941eD",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "MailboxFacet": {
+        "address": "0xba62b131f121CAEaFfAF443E3547dAD0c84b2e06",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/transactions.json b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/transactions.json
new file mode 100644
index 000000000000..1cac839ecf0b
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix/transactions.json
@@ -0,0 +1,287 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 0,
+      "from": "0x0000000000000000000000000000000000000000",
+      "to": "0x0000000000000000000000000000000000000000",
+      "gasLimit": 0,
+      "gasPerPubdataByteLimit": 0,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": 0,
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0x",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "defaultAccountHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "verifier": "0xD6F42e1a6CF553Bee033b2C219884512FD365A54",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+      "recursionLeafLevelVkHash": "0xffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x6602af28"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "24",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x08284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E",
+  "protocolVersion": "24",
+  "upgradeTimestamp": "1711451944",
+  "stmScheduleTransparentOperation": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000004e39e90746a9ee410a8ce173c7b96d3afed444a5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d842e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmExecuteOperation": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000004e39e90746a9ee410a8ce173c7b96d3afed444a5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d842e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "scheduleTransparentOperation": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000009a6de0f62aa270a8bcb1e2610078650d539b1ef9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44fc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "executeOperation": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000009a6de0f62aa270a8bcb1e2610078650d539b1ef9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44fc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmScheduleOperationDirect": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000004e39e90746a9ee410a8ce173c7b96d3afed444a5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44e34a329a000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmExecuteOperationDirect": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000004e39e90746a9ee410a8ce173c7b96d3afed444a5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44e34a329a000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "governanceOperation": {
+    "calls": [
+      {
+        "target": "0x9A6DE0f62Aa270A8bCB1e2610078650D539B1Ef9",
+        "value": 0,
+        "data": "0xfc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "stmDirectGovernanceOperation": {
+    "calls": [
+      {
+        "target": "0x4e39E90746A9ee410A8Ce173C7B96D3AfEd444a5",
+        "value": 0,
+        "data": "0xe34a329a000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "stmGovernanceOperation": {
+    "calls": [
+      {
+        "target": "0x4e39E90746A9ee410A8Ce173C7B96D3AfEd444a5",
+        "value": 0,
+        "data": "0x2e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "diamondCut": {
+    "facetCuts": [
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x0e18b681",
+          "0x64bf8d66",
+          "0xa9f6d941",
+          "0x27ae4c16",
+          "0x4dd18bf5",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0xe76db865",
+          "0x235d9eb5",
+          "0x21f603d7",
+          "0x4623c91d",
+          "0x17338945",
+          "0xfc57565f"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x1de72e34",
+          "0xea6c029c",
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0x6e9960c3",
+          "0x98acd7a6",
+          "0x086a56f8",
+          "0x3591c1a0",
+          "0x79823c9a",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0xe5355c75",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0xd0468156",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x33ce93fe",
+          "0x06d49e5b",
+          "0x5518c73b",
+          "0xdb1f0bf9",
+          "0xb8c2f66f",
+          "0xef3f0bae",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0xb22dd78e",
+          "0x74f4d30d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x12f43dab",
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419",
+          "0xc924de35"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x701f58c5",
+          "0x6edd4f12",
+          "0xc3d93e7c",
+          "0x6f497ac6",
+          "0x7f61885c",
+          "0xc37533bb",
+          "0x97c09d34",
+          "0x0f23da43"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x7D76D6253EFbC600C1d33e3E2775deD1b649E9b5",
+        "selectors": [
+          "0x0e18b681",
+          "0x64bf8d66",
+          "0xa9f6d941",
+          "0x27ae4c16",
+          "0x4dd18bf5",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0xe76db865",
+          "0x235d9eb5",
+          "0x21f603d7",
+          "0x4623c91d",
+          "0x17338945",
+          "0xfc57565f"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xb74974B077d22cF766aE15a343268E35e97941eD",
+        "selectors": [
+          "0x1de72e34",
+          "0xea6c029c",
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0x6e9960c3",
+          "0x98acd7a6",
+          "0x086a56f8",
+          "0x3591c1a0",
+          "0x79823c9a",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0xe5355c75",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0xd0468156",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x33ce93fe",
+          "0x06d49e5b",
+          "0x5518c73b",
+          "0xdb1f0bf9",
+          "0xb8c2f66f",
+          "0xef3f0bae",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0xb22dd78e",
+          "0x74f4d30d"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xba62b131f121CAEaFfAF443E3547dAD0c84b2e06",
+        "selectors": [
+          "0x12f43dab",
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419",
+          "0xc924de35"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+        "selectors": [
+          "0x701f58c5",
+          "0x6edd4f12",
+          "0xc3d93e7c",
+          "0x6f497ac6",
+          "0x7f61885c",
+          "0xc37533bb",
+          "0x97c09d34",
+          "0x0f23da43"
+        ],
+        "action": 0,
+        "isFreezable": true
+      }
+    ],
+    "initAddress": "0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E",
+    "initCalldata": "0x08284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d6f42e1a6cf553bee033b2c219884512fd365a54f520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8ffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/crypto.json b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/crypto.json
new file mode 100644
index 000000000000..af6c87214a12
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/crypto.json
@@ -0,0 +1,11 @@
+{
+  "verifier": {
+    "address": "0xCDFDfbc04A58C79f0597E87E5dE680D0EdeABA9f",
+    "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "keys": {
+    "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+    "recursionLeafLevelVkHash": "0xcc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456",
+    "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/facetCuts.json b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/facetCuts.json
new file mode 100644
index 000000000000..83bc50976dbf
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/facetCuts.json
@@ -0,0 +1,196 @@
+[
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x0e18b681",
+      "0x64bf8d66",
+      "0xa9f6d941",
+      "0x27ae4c16",
+      "0x4dd18bf5",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0xe76db865",
+      "0x235d9eb5",
+      "0x21f603d7",
+      "0x4623c91d",
+      "0x17338945",
+      "0xfc57565f"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x1de72e34",
+      "0xea6c029c",
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0x6e9960c3",
+      "0x98acd7a6",
+      "0x086a56f8",
+      "0x3591c1a0",
+      "0x79823c9a",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0xe5355c75",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0xd0468156",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x33ce93fe",
+      "0x06d49e5b",
+      "0x5518c73b",
+      "0xdb1f0bf9",
+      "0xb8c2f66f",
+      "0xef3f0bae",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0xb22dd78e",
+      "0x74f4d30d"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x12f43dab",
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419",
+      "0xc924de35"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x0000000000000000000000000000000000000000",
+    "selectors": [
+      "0x701f58c5",
+      "0x6edd4f12",
+      "0xc3d93e7c",
+      "0x6f497ac6",
+      "0x7f61885c",
+      "0xc37533bb",
+      "0x97c09d34",
+      "0x0f23da43"
+    ],
+    "action": 2,
+    "isFreezable": false
+  },
+  {
+    "facet": "0x7D76D6253EFbC600C1d33e3E2775deD1b649E9b5",
+    "selectors": [
+      "0x0e18b681",
+      "0x64bf8d66",
+      "0xa9f6d941",
+      "0x27ae4c16",
+      "0x4dd18bf5",
+      "0x1cc5d103",
+      "0xbe6f11cf",
+      "0xe76db865",
+      "0x235d9eb5",
+      "0x21f603d7",
+      "0x4623c91d",
+      "0x17338945",
+      "0xfc57565f"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xb74974B077d22cF766aE15a343268E35e97941eD",
+    "selectors": [
+      "0x1de72e34",
+      "0xea6c029c",
+      "0xcdffacc6",
+      "0x52ef6b2c",
+      "0xadfca15e",
+      "0x7a0ed627",
+      "0x6e9960c3",
+      "0x98acd7a6",
+      "0x086a56f8",
+      "0x3591c1a0",
+      "0x79823c9a",
+      "0xd86970d8",
+      "0xfd791f3c",
+      "0xe5355c75",
+      "0x9d1b5a81",
+      "0x7b30c8da",
+      "0xd0468156",
+      "0x631f4bac",
+      "0x0ec6b0b7",
+      "0x33ce93fe",
+      "0x06d49e5b",
+      "0x5518c73b",
+      "0xdb1f0bf9",
+      "0xb8c2f66f",
+      "0xef3f0bae",
+      "0xfe26699e",
+      "0x39607382",
+      "0xaf6a2dcd",
+      "0xa1954fc5",
+      "0x46657fe9",
+      "0x18e3a941",
+      "0x29b98c67",
+      "0xbd7c5412",
+      "0xc3bbd2d7",
+      "0xe81e0ba1",
+      "0xfacd743b",
+      "0x9cd939e4",
+      "0x56142d7a",
+      "0xb22dd78e",
+      "0x74f4d30d"
+    ],
+    "action": 0,
+    "isFreezable": false
+  },
+  {
+    "facet": "0xba62b131f121CAEaFfAF443E3547dAD0c84b2e06",
+    "selectors": [
+      "0x12f43dab",
+      "0x6c0960f9",
+      "0xb473318e",
+      "0x042901c7",
+      "0x263b7f8e",
+      "0xe4948f43",
+      "0xeb672419",
+      "0xc924de35"
+    ],
+    "action": 0,
+    "isFreezable": true
+  },
+  {
+    "facet": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+    "selectors": [
+      "0x701f58c5",
+      "0x6edd4f12",
+      "0xc3d93e7c",
+      "0x6f497ac6",
+      "0x7f61885c",
+      "0xc37533bb",
+      "0x97c09d34",
+      "0x0f23da43"
+    ],
+    "action": 0,
+    "isFreezable": true
+  }
+]
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/facets.json b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/facets.json
new file mode 100644
index 000000000000..ef6bf66d317c
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/facets.json
@@ -0,0 +1,18 @@
+{
+    "ExecutorFacet": {
+        "address": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "AdminFacet": {
+        "address": "0x7D76D6253EFbC600C1d33e3E2775deD1b649E9b5",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "GettersFacet": {
+        "address": "0xb74974B077d22cF766aE15a343268E35e97941eD",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "MailboxFacet": {
+        "address": "0xba62b131f121CAEaFfAF443E3547dAD0c84b2e06",
+        "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    }
+}
\ No newline at end of file
diff --git a/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/transactions.json b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/transactions.json
new file mode 100644
index 000000000000..92e82d248604
--- /dev/null
+++ b/etc/upgrades/1711451944-hyperchain-upgrade/testnet-fix2/transactions.json
@@ -0,0 +1,287 @@
+{
+  "proposeUpgradeTx": {
+    "l2ProtocolUpgradeTx": {
+      "txType": 0,
+      "from": "0x0000000000000000000000000000000000000000",
+      "to": "0x0000000000000000000000000000000000000000",
+      "gasLimit": 0,
+      "gasPerPubdataByteLimit": 0,
+      "maxFeePerGas": 0,
+      "maxPriorityFeePerGas": 0,
+      "paymaster": 0,
+      "nonce": 0,
+      "value": 0,
+      "reserved": [
+        0,
+        0,
+        0,
+        0
+      ],
+      "data": "0x",
+      "signature": "0x",
+      "factoryDeps": [],
+      "paymasterInput": "0x",
+      "reservedDynamic": "0x"
+    },
+    "bootloaderHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "defaultAccountHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "verifier": "0xCDFDfbc04A58C79f0597E87E5dE680D0EdeABA9f",
+    "verifierParams": {
+      "recursionNodeLevelVkHash": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+      "recursionLeafLevelVkHash": "0xcc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456",
+      "recursionCircuitsSetVksHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    },
+    "l1ContractsUpgradeCalldata": "0x",
+    "postUpgradeCalldata": "0x",
+    "upgradeTimestamp": {
+      "type": "BigNumber",
+      "hex": "0x6602af28"
+    },
+    "factoryDeps": [],
+    "newProtocolVersion": "24",
+    "newAllowList": "0x0000000000000000000000000000000000000000"
+  },
+  "l1upgradeCalldata": "0x08284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "upgradeAddress": "0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E",
+  "protocolVersion": "24",
+  "upgradeTimestamp": "1711451944",
+  "stmScheduleTransparentOperation": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000004e39e90746a9ee410a8ce173c7b96d3afed444a5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d842e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmExecuteOperation": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000004e39e90746a9ee410a8ce173c7b96d3afed444a5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d842e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "scheduleTransparentOperation": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000009a6de0f62aa270a8bcb1e2610078650d539b1ef9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44fc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "executeOperation": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000009a6de0f62aa270a8bcb1e2610078650d539b1ef9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44fc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmScheduleOperationDirect": "0x2c43191700000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000004e39e90746a9ee410a8ce173c7b96d3afed444a5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44e34a329a000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "stmExecuteOperationDirect": "0x74da756b0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000004e39e90746a9ee410a8ce173c7b96d3afed444a5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000001d44e34a329a000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+  "governanceOperation": {
+    "calls": [
+      {
+        "target": "0x9A6DE0f62Aa270A8bCB1e2610078650D539B1Ef9",
+        "value": 0,
+        "data": "0xfc57565f000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "stmDirectGovernanceOperation": {
+    "calls": [
+      {
+        "target": "0x4e39E90746A9ee410A8Ce173C7B96D3AfEd444a5",
+        "value": 0,
+        "data": "0xe34a329a000000000000000000000000000000000000000000000000000000000000012c00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "stmGovernanceOperation": {
+    "calls": [
+      {
+        "target": "0x4e39E90746A9ee410A8Ce173C7B96D3AfEd444a5",
+        "value": 0,
+        "data": "0x2e52285100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000060000000000000000000000000e43fd4f615b4989903c4f4000de8bc742fd18f0e00000000000000000000000000000000000000000000000000000000000017c000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000034000000000000000000000000000000000000000000000000000000000000008e00000000000000000000000000000000000000000000000000000000000000a800000000000000000000000000000000000000000000000000000000000000c200000000000000000000000000000000000000000000000000000000000000e60000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000015a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da43000000000000000000000000000000000000000000000000000000000000000000000000000000007d76d6253efbc600c1d33e3e2775ded1b649e9b5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b6810000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d9410000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000001cc5d10300000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000021f603d7000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f00000000000000000000000000000000000000000000000000000000000000000000000000000000b74974b077d22cf766ae15a343268e35e97941ed00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000281de72e3400000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000cdffacc60000000000000000000000000000000000000000000000000000000052ef6b2c00000000000000000000000000000000000000000000000000000000adfca15e000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000098acd7a600000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000003591c1a00000000000000000000000000000000000000000000000000000000079823c9a00000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000e5355c75000000000000000000000000000000000000000000000000000000009d1b5a81000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000000ec6b0b70000000000000000000000000000000000000000000000000000000033ce93fe0000000000000000000000000000000000000000000000000000000006d49e5b000000000000000000000000000000000000000000000000000000005518c73b00000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000fe26699e000000000000000000000000000000000000000000000000000000003960738200000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000a1954fc50000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000018e3a9410000000000000000000000000000000000000000000000000000000029b98c6700000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000facd743b000000000000000000000000000000000000000000000000000000009cd939e40000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000b22dd78e0000000000000000000000000000000000000000000000000000000074f4d30d00000000000000000000000000000000000000000000000000000000000000000000000000000000ba62b131f121caeaffaf443e3547dad0c84b2e06000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000812f43dab000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000042901c700000000000000000000000000000000000000000000000000000000263b7f8e00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000c924de350000000000000000000000000000000000000000000000000000000000000000000000000000000063f4c229f261c2576e8b5a405321769c08134c730000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008701f58c5000000000000000000000000000000000000000000000000000000006edd4f1200000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006f497ac6000000000000000000000000000000000000000000000000000000007f61885c00000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000097c09d34000000000000000000000000000000000000000000000000000000000f23da4300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050408284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    ],
+    "predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
+    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+  },
+  "diamondCut": {
+    "facetCuts": [
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x0e18b681",
+          "0x64bf8d66",
+          "0xa9f6d941",
+          "0x27ae4c16",
+          "0x4dd18bf5",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0xe76db865",
+          "0x235d9eb5",
+          "0x21f603d7",
+          "0x4623c91d",
+          "0x17338945",
+          "0xfc57565f"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x1de72e34",
+          "0xea6c029c",
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0x6e9960c3",
+          "0x98acd7a6",
+          "0x086a56f8",
+          "0x3591c1a0",
+          "0x79823c9a",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0xe5355c75",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0xd0468156",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x33ce93fe",
+          "0x06d49e5b",
+          "0x5518c73b",
+          "0xdb1f0bf9",
+          "0xb8c2f66f",
+          "0xef3f0bae",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0xb22dd78e",
+          "0x74f4d30d"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x12f43dab",
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419",
+          "0xc924de35"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x0000000000000000000000000000000000000000",
+        "selectors": [
+          "0x701f58c5",
+          "0x6edd4f12",
+          "0xc3d93e7c",
+          "0x6f497ac6",
+          "0x7f61885c",
+          "0xc37533bb",
+          "0x97c09d34",
+          "0x0f23da43"
+        ],
+        "action": 2,
+        "isFreezable": false
+      },
+      {
+        "facet": "0x7D76D6253EFbC600C1d33e3E2775deD1b649E9b5",
+        "selectors": [
+          "0x0e18b681",
+          "0x64bf8d66",
+          "0xa9f6d941",
+          "0x27ae4c16",
+          "0x4dd18bf5",
+          "0x1cc5d103",
+          "0xbe6f11cf",
+          "0xe76db865",
+          "0x235d9eb5",
+          "0x21f603d7",
+          "0x4623c91d",
+          "0x17338945",
+          "0xfc57565f"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xb74974B077d22cF766aE15a343268E35e97941eD",
+        "selectors": [
+          "0x1de72e34",
+          "0xea6c029c",
+          "0xcdffacc6",
+          "0x52ef6b2c",
+          "0xadfca15e",
+          "0x7a0ed627",
+          "0x6e9960c3",
+          "0x98acd7a6",
+          "0x086a56f8",
+          "0x3591c1a0",
+          "0x79823c9a",
+          "0xd86970d8",
+          "0xfd791f3c",
+          "0xe5355c75",
+          "0x9d1b5a81",
+          "0x7b30c8da",
+          "0xd0468156",
+          "0x631f4bac",
+          "0x0ec6b0b7",
+          "0x33ce93fe",
+          "0x06d49e5b",
+          "0x5518c73b",
+          "0xdb1f0bf9",
+          "0xb8c2f66f",
+          "0xef3f0bae",
+          "0xfe26699e",
+          "0x39607382",
+          "0xaf6a2dcd",
+          "0xa1954fc5",
+          "0x46657fe9",
+          "0x18e3a941",
+          "0x29b98c67",
+          "0xbd7c5412",
+          "0xc3bbd2d7",
+          "0xe81e0ba1",
+          "0xfacd743b",
+          "0x9cd939e4",
+          "0x56142d7a",
+          "0xb22dd78e",
+          "0x74f4d30d"
+        ],
+        "action": 0,
+        "isFreezable": false
+      },
+      {
+        "facet": "0xba62b131f121CAEaFfAF443E3547dAD0c84b2e06",
+        "selectors": [
+          "0x12f43dab",
+          "0x6c0960f9",
+          "0xb473318e",
+          "0x042901c7",
+          "0x263b7f8e",
+          "0xe4948f43",
+          "0xeb672419",
+          "0xc924de35"
+        ],
+        "action": 0,
+        "isFreezable": true
+      },
+      {
+        "facet": "0x63f4c229F261c2576E8B5A405321769c08134c73",
+        "selectors": [
+          "0x701f58c5",
+          "0x6edd4f12",
+          "0xc3d93e7c",
+          "0x6f497ac6",
+          "0x7f61885c",
+          "0xc37533bb",
+          "0x97c09d34",
+          "0x0f23da43"
+        ],
+        "action": 0,
+        "isFreezable": true
+      }
+    ],
+    "initAddress": "0xe43fd4f615B4989903C4F4000DE8bc742fd18F0E",
+    "initCalldata": "0x08284e5700000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000180000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cdfdfbc04a58c79f0597e87e5de680d0edeaba9ff520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8cc4ac1853353538a166f5c2dde2c24e7e6c461dce8e3dc47d81e9139e1719456000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004a000000000000000000000000000000000000000000000000000000000000004c0000000000000000000000000000000000000000000000000000000006602af280000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000260000000000000000000000000000000000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000000002a000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000002e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+  }
+}
\ No newline at end of file
diff --git a/etc/utils/.gitignore b/etc/utils/.gitignore
new file mode 100644
index 000000000000..796b96d1c402
--- /dev/null
+++ b/etc/utils/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/etc/utils/package.json b/etc/utils/package.json
new file mode 100644
index 000000000000..a239c29e3d51
--- /dev/null
+++ b/etc/utils/package.json
@@ -0,0 +1,15 @@
+{
+    "name": "utils",
+    "version": "0.1.0",
+    "license": "MIT",
+    "main": "build/index.js",
+    "types": "build/index.d.ts",
+    "scripts": {
+        "build": "tsc",
+        "watch": "tsc -w"
+    },
+    "dependencies": {
+        "chalk": "^4.0.0",
+        "yaml": "^2.4.2"
+    }
+}
diff --git a/etc/utils/src/file-configs.ts b/etc/utils/src/file-configs.ts
new file mode 100644
index 000000000000..16b89f8f3c97
--- /dev/null
+++ b/etc/utils/src/file-configs.ts
@@ -0,0 +1,116 @@
+import * as path from 'path';
+import * as fs from 'fs';
+import * as yaml from 'yaml';
+
+export function shouldLoadConfigFromFile() {
+    const chain = process.env.CHAIN_NAME;
+    if (chain) {
+        return {
+            loadFromFile: true,
+            chain
+        } as const;
+    } else {
+        return {
+            loadFromFile: false
+        } as const;
+    }
+}
+
+export const configNames = ['contracts.yaml', 'general.yaml', 'genesis.yaml', 'secrets.yaml', 'wallets.yaml'] as const;
+
+export type ConfigName = (typeof configNames)[number];
+
+export function loadEcosystem(pathToHome: string) {
+    const configPath = path.join(pathToHome, '/ZkStack.yaml');
+    if (!fs.existsSync(configPath)) {
+        return [];
+    }
+    return yaml.parse(
+        fs.readFileSync(configPath, {
+            encoding: 'utf-8'
+        })
+    );
+}
+
+export function loadConfig({
+    pathToHome,
+    chain,
+    configsFolder,
+    configsFolderSuffix,
+    config
+}: {
+    pathToHome: string;
+    chain: string;
+    configsFolder?: string;
+    configsFolderSuffix?: string;
+    config: ConfigName;
+}) {
+    const configPath = path.join(
+        getConfigsFolderPath({ pathToHome, chain, configsFolder, configsFolderSuffix }),
+        config
+    );
+    if (!fs.existsSync(configPath)) {
+        return [];
+    }
+    return yaml.parse(
+        fs.readFileSync(configPath, {
+            encoding: 'utf-8'
+        }),
+        {
+            customTags: (tags) =>
+                tags.filter((tag) => {
+                    if (typeof tag === 'string') {
+                        return true;
+                    }
+                    if (tag.format !== 'HEX') {
+                        return true;
+                    }
+                    return false;
+                })
+        }
+    );
+}
+
+export function getConfigPath({
+    pathToHome,
+    chain,
+    configsFolder,
+    config
+}: {
+    pathToHome: string;
+    chain: string;
+    configsFolder?: string;
+    config: ConfigName;
+}) {
+    return path.join(getConfigsFolderPath({ pathToHome, chain, configsFolder }), config);
+}
+
+export function getAllConfigsPath({
+    pathToHome,
+    chain,
+    configsFolder
+}: {
+    pathToHome: string;
+    chain: string;
+    configsFolder?: string;
+}) {
+    const configPaths = {} as Record<ConfigName, string>;
+    configNames.forEach((config) => {
+        configPaths[config] = getConfigPath({ pathToHome, chain, configsFolder, config });
+    });
+    return configPaths;
+}
+
+export function getConfigsFolderPath({
+    pathToHome,
+    chain,
+    configsFolder,
+    configsFolderSuffix
+}: {
+    pathToHome: string;
+    chain: string;
+    configsFolder?: string;
+    configsFolderSuffix?: string;
+}) {
+    return path.join(pathToHome, 'chains', chain, configsFolder ?? 'configs', configsFolderSuffix ?? '');
+}
diff --git a/infrastructure/zk/src/utils.ts b/etc/utils/src/index.ts
similarity index 92%
rename from infrastructure/zk/src/utils.ts
rename to etc/utils/src/index.ts
index 43030d84fadc..28cd864a1bf6 100644
--- a/infrastructure/zk/src/utils.ts
+++ b/etc/utils/src/index.ts
@@ -1,4 +1,4 @@
-import { exec as _exec, spawn as _spawn } from 'child_process';
+import { exec as _exec, spawn as _spawn, type ProcessEnvOptions } from 'child_process';
 import { promisify } from 'util';
 import fs from 'fs';
 import readline from 'readline';
@@ -25,8 +25,7 @@ const IGNORED_DIRS = [
     'artifacts-zk',
     'cache-zk',
     // Ignore directories with OZ and forge submodules.
-    'contracts/l1-contracts/lib',
-    'contracts/l1-contracts-foundry/lib'
+    'contracts/l1-contracts/lib'
 ];
 const IGNORED_FILES = ['KeysWithPlonkVerifier.sol', 'TokenInit.sol', '.tslintrc.js', '.prettierrc.js'];
 
@@ -54,9 +53,17 @@ export function spawn(command: string) {
 
 // executes a command in background and returns a child process handle
 // by default pipes data to parent's stdio but this can be overridden
-export function background(command: string, stdio: any = 'inherit') {
+export function background({
+    command,
+    stdio = 'inherit',
+    cwd
+}: {
+    command: string;
+    stdio: any;
+    cwd?: ProcessEnvOptions['cwd'];
+}) {
     command = command.replace(/\n/g, ' ');
-    return _spawn(command, { stdio: stdio, shell: true, detached: true });
+    return _spawn(command, { stdio: stdio, shell: true, detached: true, cwd });
 }
 
 export async function confirmAction() {
@@ -172,3 +179,8 @@ export const announced = async (fn: string, promise: Promise<void> | void) => {
     const timestampLine = timestamp(`(${time}ms)`);
     console.log(`${successLine} ${timestampLine}`);
 };
+
+export function unpackStringSemVer(semver: string): [number, number, number] {
+    const [major, minor, patch] = semver.split('.');
+    return [parseInt(major), parseInt(minor), parseInt(patch)];
+}
diff --git a/etc/utils/src/server.ts b/etc/utils/src/server.ts
new file mode 100644
index 000000000000..94184f0db9b6
--- /dev/null
+++ b/etc/utils/src/server.ts
@@ -0,0 +1,23 @@
+import { background } from '.';
+
+// TODO: change to use `zk_inception` once migration is complete
+const BASE_COMMAND = 'zk_inception server';
+const BASE_COMMAND_WITH_ZK = 'zk server';
+
+export function runServerInBackground({
+    components,
+    stdio,
+    cwd,
+    useZkInception
+}: {
+    components?: string[];
+    stdio: any;
+    cwd?: Parameters<typeof background>[0]['cwd'];
+    useZkInception?: boolean;
+}) {
+    let command = useZkInception ? BASE_COMMAND : BASE_COMMAND_WITH_ZK;
+    if (components && components.length > 0) {
+        command += ` --components=${components.join(',')}`;
+    }
+    background({ command, stdio, cwd });
+}
diff --git a/etc/utils/tsconfig.json b/etc/utils/tsconfig.json
new file mode 100644
index 000000000000..66a070f64259
--- /dev/null
+++ b/etc/utils/tsconfig.json
@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+        "target": "es2019",
+        "module": "commonjs",
+        "outDir": "build",
+        "strict": true,
+        "esModuleInterop": true,
+        "noEmitOnError": true,
+        "skipLibCheck": true,
+        "declaration": true
+    }
+}
diff --git a/flake.lock b/flake.lock
index 841f03c77915..8b345701bbc6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -38,16 +38,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708294118,
-        "narHash": "sha256-evZzmLW7qoHXf76VCepvun1esZDxHfVRFUJtumD7L2M=",
+        "lastModified": 1717952948,
+        "narHash": "sha256-mJi4/gjiwQlSaxjA6AusXBN/6rQRaPCycR7bd8fydnQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e0da498ad77ac8909a980f07eff060862417ccf7",
+        "rev": "2819fffa7fa42156680f0d282c60d81e8fb185b7",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -81,11 +81,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1708481452,
-        "narHash": "sha256-s07K6pwJtnB7Z/3wbkf4iaYXj+H5CuDD94I8hohm3Ig=",
+        "lastModified": 1718072316,
+        "narHash": "sha256-p33h73iQ1HkLalCplV5MH0oP3HXRaH3zufnFqb5//ps=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "3d6647bf9d1f8e537b0d026c51ea25c0cdd92055",
+        "rev": "bedc47af18fc41bb7d2edc2b212d59ca36253f59",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 30111a90ab66..0287d4cf09d1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,16 +13,16 @@
 # $ nix build .#zksync_server.block_reverter
 #
 # To enter the development shell, run:
-# $ nix develop --impure
+# $ nix develop
 #
 # To vendor the dependencies manually, run:
 # $ nix shell .#cargo-vendor -c cargo vendor --no-merge-sources
 #
 ###################################################################################################
 {
-  description = "zkSync-era";
+  description = "ZKsync-era";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     flake-utils.url = "github:numtide/flake-utils";
     rust-overlay.url = "github:oxalica/rust-overlay";
   };
@@ -46,7 +46,7 @@
         # patched version of cargo to support `cargo vendor` for vendoring dependencies
         # see https://github.com/matter-labs/zksync-era/issues/1086
         # used as `cargo vendor --no-merge-sources`
-        cargo-vendor = pkgs.rustPlatform.buildRustPackage rec {
+        cargo-vendor = pkgs.rustPlatform.buildRustPackage {
           pname = "cargo-vendor";
           version = "0.78.0";
           src = pkgs.fetchFromGitHub {
@@ -68,7 +68,7 @@
 
         # custom import-cargo-lock to import Cargo.lock file and vendor dependencies
         # see https://github.com/matter-labs/zksync-era/issues/1086
-        import-cargo-lock = { lib, cacert, runCommand }: { src, cargoHash ? null } @ args:
+        import-cargo-lock = { lib, cacert, runCommand }: { src, cargoHash ? null }:
           runCommand "import-cargo-lock"
             {
               inherit src;
@@ -96,12 +96,12 @@
 
         stdenv = pkgs.stdenvAdapters.useMoldLinker pkgs.clangStdenv;
 
-        rustPlatform = (pkgs.makeRustPlatform {
+        rustPlatform = pkgs.makeRustPlatform {
           cargo = rustVersion;
           rustc = rustVersion;
           inherit stdenv;
-        });
-        zksync_server_cargoToml = (builtins.fromTOML (builtins.readFile ./core/bin/zksync_server/Cargo.toml));
+        };
+        zksync_server_cargoToml = builtins.fromTOML (builtins.readFile ./core/bin/zksync_server/Cargo.toml);
 
         hardeningEnable = [ "fortify3" "pie" "relro" ];
 
@@ -212,7 +212,7 @@
               export CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER="clang"
 
               if [ "x$NIX_LD" = "x" ]; then
-                export NIX_LD="$ZK_NIX_LD"
+                export NIX_LD="$(<${clangStdenv.cc}/nix-support/dynamic-linker)"
               fi
               if [ "x$NIX_LD_LIBRARY_PATH" = "x" ]; then
                 export NIX_LD_LIBRARY_PATH="$ZK_NIX_LD_LIBRARY_PATH"
@@ -222,7 +222,6 @@
             '';
 
             ZK_NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [ ];
-            ZK_NIX_LD = builtins.readFile "${clangStdenv.cc}/nix-support/dynamic-linker";
           };
         };
       });
diff --git a/infrastructure/local-setup-preparation/README.md b/infrastructure/local-setup-preparation/README.md
index fe59f930bf4c..6f3c97961434 100644
--- a/infrastructure/local-setup-preparation/README.md
+++ b/infrastructure/local-setup-preparation/README.md
@@ -1,6 +1,6 @@
 # Scripts for local setup preparation
 
-This project contains scripts that should be executed when preparing the zkSync local setup used by outside developers,
+This project contains scripts that should be executed when preparing the ZKsync local setup used by outside developers,
 e.g. deposit ETH to some of the test accounts.
 
 With the server running (`zk server`), execute the following from `$ZKSYNC_HOME` to fund the L2 wallets
diff --git a/infrastructure/local-setup-preparation/package.json b/infrastructure/local-setup-preparation/package.json
index 1dc00029b12a..9e870d2a96a5 100644
--- a/infrastructure/local-setup-preparation/package.json
+++ b/infrastructure/local-setup-preparation/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "ethers": "~5.7.0",
     "ts-node": "^10.7.0",
-    "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub"
+    "zksync-ethers": "5.8.0-beta.5"
   },
   "devDependencies": {
     "typescript": "^4.5.5",
diff --git a/infrastructure/local-setup-preparation/src/index.ts b/infrastructure/local-setup-preparation/src/index.ts
index 805d13aadcdb..9d8b7efea66d 100644
--- a/infrastructure/local-setup-preparation/src/index.ts
+++ b/infrastructure/local-setup-preparation/src/index.ts
@@ -16,7 +16,7 @@ async function depositWithRichAccounts() {
     const handles: Promise<any>[] = [];
 
     if (!process.env.CONTRACTS_BRIDGEHUB_PROXY_ADDR) {
-        throw new Error('zkSync L1 Main contract address was not found');
+        throw new Error('ZKsync L1 Main contract address was not found');
     }
 
     // During the preparation for the local node, the L2 server is not available, so
diff --git a/infrastructure/local-setup-preparation/src/join_hyperchain.ts b/infrastructure/local-setup-preparation/src/join_hyperchain.ts
index 1600dba5abb0..ffaad9b803d1 100644
--- a/infrastructure/local-setup-preparation/src/join_hyperchain.ts
+++ b/infrastructure/local-setup-preparation/src/join_hyperchain.ts
@@ -35,6 +35,7 @@ async function joinHyperchain() {
     const varsToKeep = [
         'CONTRACTS_BRIDGEHUB_PROXY_ADDR',
         'CONTRACTS_STATE_TRANSITION_PROXY_ADDR',
+        'CONTRACTS_L1_SHARED_BRIDGE_PROXY_ADDR',
         'CONTRACTS_ADMIN_FACET_ADDR',
         'CONTRACTS_MAILBOX_FACET_ADDR',
         'CONTRACTS_EXECUTOR_FACET_ADDR',
diff --git a/infrastructure/protocol-upgrade/package.json b/infrastructure/protocol-upgrade/package.json
index b0b19f5e8838..3cd0383915ad 100644
--- a/infrastructure/protocol-upgrade/package.json
+++ b/infrastructure/protocol-upgrade/package.json
@@ -25,7 +25,7 @@
     "l1-contracts": "link:../../contracts/l1-contracts",
     "l2-contracts": "link:../../contracts/l2-contracts",
     "system-contracts": "link:../../contracts/system-contracts",
-    "zksync-web3": "^0.15.5"
+    "zksync-ethers": "5.8.0-beta.5"
   },
   "scripts": {
     "build": "tsc",
diff --git a/infrastructure/protocol-upgrade/src/crypto/deployer.ts b/infrastructure/protocol-upgrade/src/crypto/deployer.ts
index 98043d0c4498..685f64c46656 100644
--- a/infrastructure/protocol-upgrade/src/crypto/deployer.ts
+++ b/infrastructure/protocol-upgrade/src/crypto/deployer.ts
@@ -1,4 +1,4 @@
-import { spawn } from 'zk/build/utils';
+import { spawn } from 'utils';
 
 export async function deployVerifier(
     l1Rpc: string,
diff --git a/infrastructure/protocol-upgrade/src/hyperchain-upgrade.ts b/infrastructure/protocol-upgrade/src/hyperchain-upgrade.ts
index 84bae2e891ca..102c67e509fe 100644
--- a/infrastructure/protocol-upgrade/src/hyperchain-upgrade.ts
+++ b/infrastructure/protocol-upgrade/src/hyperchain-upgrade.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import { spawn } from 'zk/build/utils';
+import { spawn } from 'utils';
 import fs from 'fs';
 import { ethers } from 'ethers';
 
diff --git a/infrastructure/protocol-upgrade/src/index.ts b/infrastructure/protocol-upgrade/src/index.ts
index c94d280495f2..d78726437852 100644
--- a/infrastructure/protocol-upgrade/src/index.ts
+++ b/infrastructure/protocol-upgrade/src/index.ts
@@ -15,7 +15,7 @@ async function main() {
     const ZKSYNC_HOME = process.env.ZKSYNC_HOME;
 
     if (!ZKSYNC_HOME) {
-        throw new Error('Please set $ZKSYNC_HOME to the root of zkSync repo!');
+        throw new Error('Please set $ZKSYNC_HOME to the root of ZKsync repo!');
     } else {
         process.chdir(ZKSYNC_HOME);
     }
diff --git a/infrastructure/protocol-upgrade/src/l1upgrade/deployer.ts b/infrastructure/protocol-upgrade/src/l1upgrade/deployer.ts
index ba639cfd89b8..b7595aaea9d3 100644
--- a/infrastructure/protocol-upgrade/src/l1upgrade/deployer.ts
+++ b/infrastructure/protocol-upgrade/src/l1upgrade/deployer.ts
@@ -1,4 +1,4 @@
-import { spawn } from 'zk/build/utils';
+import { spawn } from 'utils';
 
 export async function callFacetDeployer(
     l1RpcProvider: string,
diff --git a/infrastructure/protocol-upgrade/src/l1upgrade/facets.ts b/infrastructure/protocol-upgrade/src/l1upgrade/facets.ts
index 4f89ec477a7b..5aec166968f0 100644
--- a/infrastructure/protocol-upgrade/src/l1upgrade/facets.ts
+++ b/infrastructure/protocol-upgrade/src/l1upgrade/facets.ts
@@ -1,6 +1,6 @@
 import fs from 'fs';
 import { Command } from 'commander';
-import { spawn } from 'zk/build/utils';
+import { spawn } from 'utils';
 import { getFacetCutsFileName, getFacetsFileName, getUpgradePath } from '../utils';
 import { callFacetDeployer } from './deployer';
 
diff --git a/infrastructure/protocol-upgrade/src/l2upgrade/deployer.ts b/infrastructure/protocol-upgrade/src/l2upgrade/deployer.ts
index d72c8c8e46f4..e3b5f364efd9 100644
--- a/infrastructure/protocol-upgrade/src/l2upgrade/deployer.ts
+++ b/infrastructure/protocol-upgrade/src/l2upgrade/deployer.ts
@@ -1,4 +1,4 @@
-import { spawn } from 'zk/build/utils';
+import { spawn } from 'utils';
 
 export async function callSystemContractDeployer(
     l1RpcProvider: string,
diff --git a/infrastructure/protocol-upgrade/src/l2upgrade/transactions.ts b/infrastructure/protocol-upgrade/src/l2upgrade/transactions.ts
index 511b03d1c05c..30b3da0c7b98 100644
--- a/infrastructure/protocol-upgrade/src/l2upgrade/transactions.ts
+++ b/infrastructure/protocol-upgrade/src/l2upgrade/transactions.ts
@@ -3,9 +3,9 @@ import { ComplexUpgraderFactory, ContractDeployerFactory } from 'system-contract
 import { ForceDeployment, L2CanonicalTransaction } from '../transaction';
 import { ForceDeployUpgraderFactory } from 'l2-contracts/typechain';
 import { Command } from 'commander';
-import { getCommonDataFileName, getL2UpgradeFileName } from '../utils';
+import { getCommonDataFileName, getL2UpgradeFileName, unpackStringSemVer } from '../utils';
 import fs from 'fs';
-import { REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT } from 'zksync-web3/build/src/utils';
+import { REQUIRED_L1_TO_L2_GAS_PER_PUBDATA_LIMIT } from 'zksync-ethers/build/utils';
 
 const SYSTEM_UPGRADE_TX_TYPE = 254;
 const FORCE_DEPLOYER_ADDRESS = '0x0000000000000000000000000000000000008007';
@@ -151,7 +151,9 @@ command
                 l2Upgrade.calldata = prepareCallDataForComplexUpgrader(delegatedCalldata, l2UpgraderAddress);
             }
 
-            l2Upgrade.tx = buildL2CanonicalTransaction(l2Upgrade.calldata, commonData.protocolVersion, toAddress);
+            const protocolVersionSemVer: string = commonData.protocolVersion;
+            const minorVersion = unpackStringSemVer(protocolVersionSemVer)[1];
+            l2Upgrade.tx = buildL2CanonicalTransaction(l2Upgrade.calldata, minorVersion, toAddress);
             fs.writeFileSync(l2upgradeFileName, JSON.stringify(l2Upgrade, null, 2));
         } else {
             throw new Error(`No l2 upgrade file found at ${l2upgradeFileName}`);
diff --git a/infrastructure/protocol-upgrade/src/protocol-upgrade-manager.ts b/infrastructure/protocol-upgrade/src/protocol-upgrade-manager.ts
index 563967f9f603..562e28df6cf4 100644
--- a/infrastructure/protocol-upgrade/src/protocol-upgrade-manager.ts
+++ b/infrastructure/protocol-upgrade/src/protocol-upgrade-manager.ts
@@ -2,7 +2,7 @@ import fs from 'fs';
 import { Command } from 'commander';
 import { DEFAULT_UPGRADE_PATH, getNameOfTheLastUpgrade, getTimestampInSeconds } from './utils';
 
-function createNewUpgrade(name, protocolVersion: number) {
+function createNewUpgrade(name, protocolVersion: string) {
     const timestamp = getTimestampInSeconds();
     const upgradePath = `${DEFAULT_UPGRADE_PATH}/${timestamp}-${name}`;
     fs.mkdirSync(upgradePath, { recursive: true });
diff --git a/infrastructure/protocol-upgrade/src/transaction.ts b/infrastructure/protocol-upgrade/src/transaction.ts
index b5e8c73c3267..4aaed4186d75 100644
--- a/infrastructure/protocol-upgrade/src/transaction.ts
+++ b/infrastructure/protocol-upgrade/src/transaction.ts
@@ -1,10 +1,10 @@
-import { BigNumberish } from '@ethersproject/bignumber';
-import { BytesLike, ethers } from 'ethers';
+import { BytesLike, ethers, BigNumberish } from 'ethers';
 import { ForceDeployUpgraderFactory as ForceDeployUpgraderFactoryL2 } from 'l2-contracts/typechain';
 import {
     DefaultUpgradeFactory as DefaultUpgradeFactoryL1,
     AdminFacetFactory,
-    GovernanceFactory
+    GovernanceFactory,
+    StateTransitionManagerFactory
 } from 'l1-contracts/typechain';
 import { FacetCut } from 'l1-contracts/src.ts/diamondCut';
 import { IZkSyncFactory } from '../pre-boojum/IZkSyncFactory';
@@ -16,17 +16,19 @@ import {
     getL2TransactionsFileName,
     getPostUpgradeCalldataFileName,
     getL2UpgradeFileName,
-    VerifierParams
+    VerifierParams,
+    unpackStringSemVer,
+    packSemver
 } from './utils';
 import fs from 'fs';
 import { Command } from 'commander';
-import { web3Url } from 'zk/build/utils';
+import { web3Url } from 'utils';
 import * as path from 'path';
 
 const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, `etc/test_config/constant`);
 const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
 
-export interface TransparentUpgrade {
+export interface DiamondCutData {
     facetCuts: FacetCut[];
     initAddress: string;
     initCalldata: string;
@@ -168,78 +170,120 @@ export function prepareDefaultCalldataForL2upgrade(forcedDeployments: ForceDeplo
     return complexUpgraderCalldata;
 }
 
-export function prepareProposeTransparentUpgradeCalldata(
-    initCalldata,
-    upgradeAddress: string,
-    facetCuts: FacetCut[],
-    diamondUpgradeProposalId: number
-) {
-    let zkSyncFactory = IZkSyncFactory.connect(upgradeAddress, ethers.providers.getDefaultProvider());
-    let transparentUpgrade: TransparentUpgrade = {
-        facetCuts,
-        initAddress: upgradeAddress,
-        initCalldata
+interface GovernanceTx {
+    scheduleCalldata: string;
+    executeCalldata: string;
+    operation: any;
+}
+
+function prepareGovernanceTxs(target: string, data: BytesLike): GovernanceTx {
+    const govCall = {
+        target: target,
+        value: 0,
+        data: data
     };
 
-    let proposeTransparentUpgradeCalldata = zkSyncFactory.interface.encodeFunctionData('proposeTransparentUpgrade', [
-        transparentUpgrade,
-        diamondUpgradeProposalId
-    ]);
+    const operation = {
+        calls: [govCall],
+        predecessor: ethers.constants.HashZero,
+        salt: ethers.constants.HashZero
+    };
+
+    const governance = new GovernanceFactory();
 
-    let executeUpgradeCalldata = zkSyncFactory.interface.encodeFunctionData('executeUpgrade', [
-        transparentUpgrade,
-        ethers.constants.HashZero
+    // Get transaction data of the `scheduleTransparent`
+    const scheduleCalldata = governance.interface.encodeFunctionData('scheduleTransparent', [
+        operation,
+        0 // delay
     ]);
+
+    // Get transaction data of the `execute`
+    const executeCalldata = governance.interface.encodeFunctionData('execute', [operation]);
+
     return {
-        transparentUpgrade,
-        proposeTransparentUpgradeCalldata,
-        executeUpgradeCalldata
+        scheduleCalldata,
+        executeCalldata,
+        operation
     };
 }
 
 export function prepareTransparentUpgradeCalldataForNewGovernance(
+    oldProtocolVersion,
+    oldProtocolVersionDeadline,
+    newProtocolVersion,
     initCalldata,
     upgradeAddress: string,
     facetCuts: FacetCut[],
-    zksyncAddress: string
+    stmAddress: string,
+    zksyncAddress: string,
+    prepareDirectOperation?: boolean,
+    chainId?: string
 ) {
-    let transparentUpgrade: TransparentUpgrade = {
+    let diamondCut: DiamondCutData = {
         facetCuts,
         initAddress: upgradeAddress,
         initCalldata
     };
+    // Prepare calldata for STM
+    let stm = new StateTransitionManagerFactory();
+    const stmUpgradeCalldata = stm.interface.encodeFunctionData('setNewVersionUpgrade', [
+        diamondCut,
+        oldProtocolVersion,
+        oldProtocolVersionDeadline,
+        newProtocolVersion
+    ]);
+
+    const { scheduleCalldata: stmScheduleTransparentOperation, executeCalldata: stmExecuteOperation } =
+        prepareGovernanceTxs(stmAddress, stmUpgradeCalldata);
 
     // Prepare calldata for upgrading diamond proxy
     let adminFacet = new AdminFacetFactory();
-    const diamondProxyUpgradeCalldata = adminFacet.interface.encodeFunctionData('executeUpgrade', [transparentUpgrade]);
-
-    const call = {
-        target: zksyncAddress,
-        value: 0,
-        data: diamondProxyUpgradeCalldata
-    };
-    const governanceOperation = {
-        calls: [call],
-        predecessor: ethers.constants.HashZero,
-        salt: ethers.constants.HashZero
-    };
-
-    const governance = new GovernanceFactory();
-    // Get transaction data of the `scheduleTransparent`
-    const scheduleTransparentOperation = governance.interface.encodeFunctionData('scheduleTransparent', [
-        governanceOperation,
-        0 // delay
+    const diamondProxyUpgradeCalldata = adminFacet.interface.encodeFunctionData('upgradeChainFromVersion', [
+        oldProtocolVersion,
+        diamondCut
     ]);
 
-    // Get transaction data of the `execute`
-    const executeOperation = governance.interface.encodeFunctionData('execute', [governanceOperation]);
+    const {
+        scheduleCalldata: scheduleTransparentOperation,
+        executeCalldata: executeOperation,
+        operation: governanceOperation
+    } = prepareGovernanceTxs(zksyncAddress, diamondProxyUpgradeCalldata);
 
-    return {
+    const legacyScheduleTransparentOperation = adminFacet.interface.encodeFunctionData('executeUpgrade', [diamondCut]);
+    const { scheduleCalldata: legacyScheduleOperation, executeCalldata: legacyExecuteOperation } = prepareGovernanceTxs(
+        zksyncAddress,
+        legacyScheduleTransparentOperation
+    );
+
+    let result: any = {
+        stmScheduleTransparentOperation,
+        stmExecuteOperation,
         scheduleTransparentOperation,
         executeOperation,
+        diamondCut,
         governanceOperation,
-        transparentUpgrade
+        legacyScheduleOperation,
+        legacyExecuteOperation
     };
+
+    if (prepareDirectOperation) {
+        if (!chainId) {
+            throw new Error('chainId is required for direct operation');
+        }
+
+        const stmDirecUpgradeCalldata = stm.interface.encodeFunctionData('executeUpgrade', [chainId, diamondCut]);
+
+        const { scheduleCalldata: stmScheduleOperationDirect, executeCalldata: stmExecuteOperationDirect } =
+            prepareGovernanceTxs(stmAddress, stmDirecUpgradeCalldata);
+
+        result = {
+            ...result,
+            stmScheduleOperationDirect,
+            stmExecuteOperationDirect
+        };
+    }
+
+    return result;
 }
 
 export function buildDefaultUpgradeTx(
@@ -247,16 +291,21 @@ export function buildDefaultUpgradeTx(
     diamondUpgradeProposalId,
     upgradeAddress,
     l2UpgraderAddress,
+    oldProtocolVersion,
+    oldProtocolVersionDeadline,
     upgradeTimestamp,
     newAllowList,
+    stmAddress,
     zksyncAddress,
-    useNewGovernance,
-    postUpgradeCalldataFlag
+    postUpgradeCalldataFlag,
+    prepareDirectOperation?,
+    chainId?
 ) {
     const commonData = JSON.parse(fs.readFileSync(getCommonDataFileName(), { encoding: 'utf-8' }));
-    const protocolVersion = commonData.protocolVersion;
+    const newProtocolVersionSemVer: string = commonData.protocolVersion;
+    const packedNewProtocolVersion = packSemver(...unpackStringSemVer(newProtocolVersionSemVer));
     console.log(
-        `Building default upgrade tx for ${environment} protocol version ${protocolVersion} upgradeTimestamp ${upgradeTimestamp} `
+        `Building default upgrade tx for ${environment} protocol version ${newProtocolVersionSemVer} upgradeTimestamp ${upgradeTimestamp} `
     );
     let facetCuts = [];
     let facetCutsFileName = getFacetCutsFileName(environment);
@@ -316,7 +365,7 @@ export function buildDefaultUpgradeTx(
 
     let proposeUpgradeTx = buildProposeUpgrade(
         ethers.BigNumber.from(upgradeTimestamp),
-        protocolVersion,
+        packedNewProtocolVersion,
         '0x',
         postUpgradeCalldata,
         cryptoVerifierParams,
@@ -329,27 +378,25 @@ export function buildDefaultUpgradeTx(
 
     let l1upgradeCalldata = prepareDefaultCalldataForL1upgrade(proposeUpgradeTx);
 
-    let upgradeData;
-    if (useNewGovernance) {
-        upgradeData = prepareTransparentUpgradeCalldataForNewGovernance(
-            l1upgradeCalldata,
-            upgradeAddress,
-            facetCuts,
-            zksyncAddress
-        );
-    } else {
-        upgradeData = prepareProposeTransparentUpgradeCalldata(
-            l1upgradeCalldata,
-            upgradeAddress,
-            facetCuts,
-            diamondUpgradeProposalId
-        );
-    }
+    let upgradeData = prepareTransparentUpgradeCalldataForNewGovernance(
+        oldProtocolVersion,
+        oldProtocolVersionDeadline,
+        packedNewProtocolVersion,
+        l1upgradeCalldata,
+        upgradeAddress,
+        facetCuts,
+        stmAddress,
+        zksyncAddress,
+        prepareDirectOperation,
+        chainId
+    );
+
     const transactions = {
         proposeUpgradeTx,
         l1upgradeCalldata,
         upgradeAddress,
-        protocolVersion,
+        protocolVersionSemVer: newProtocolVersionSemVer,
+        packedProtocolVersion: packedNewProtocolVersion,
         diamondUpgradeProposalId,
         upgradeTimestamp,
         ...upgradeData
@@ -398,50 +445,21 @@ export function getWallet(l1rpc, privateKey) {
           ).connect(provider);
 }
 
-async function proposeUpgrade(
+async function sendPreparedTx(
     privateKey: string,
     l1rpc: string,
-    zksyncAddress: string,
     environment: string,
     gasPrice: ethers.BigNumber,
     nonce: number,
-    newGovernanceAddress: string
+    governanceAddr: string,
+    transactionsJsonField: string,
+    logText: string
 ) {
     const transactions = JSON.parse(fs.readFileSync(getL2TransactionsFileName(environment)).toString());
-    let to;
-    let calldata;
-    if (newGovernanceAddress != null) {
-        to = newGovernanceAddress;
-        calldata = transactions.scheduleTransparentOperation;
-    } else {
-        to = zksyncAddress ?? process.env.CONTRACTS_DIAMOND_PROXY_ADDR;
-        calldata = transactions.proposeTransparentUpgradeCalldata;
-    }
-    console.log(`Proposing upgrade for protocolVersion ${transactions.protocolVersion}`);
-    await sendTransaction(calldata, privateKey, l1rpc, to, environment, gasPrice, nonce);
-}
+    const calldata = transactions[transactionsJsonField];
 
-async function executeUpgrade(
-    privateKey: string,
-    l1rpc: string,
-    zksyncAddress: string,
-    environment: string,
-    gasPrice: ethers.BigNumber,
-    nonce: number,
-    newGovernanceAddress: string
-) {
-    const transactions = JSON.parse(fs.readFileSync(getL2TransactionsFileName(environment)).toString());
-    let to;
-    let calldata;
-    if (newGovernanceAddress != null) {
-        to = newGovernanceAddress;
-        calldata = transactions.executeOperation;
-    } else {
-        to = zksyncAddress ?? process.env.CONTRACTS_DIAMOND_PROXY_ADDR;
-        calldata = transactions.executeUpgradeCalldata;
-    }
-    console.log(`Execute upgrade for protocolVersion ${transactions.protocolVersion}`);
-    await sendTransaction(calldata, privateKey, l1rpc, to, environment, gasPrice, nonce);
+    console.log(`${logText} for protocolVersion ${transactions.protocolVersion}`);
+    await sendTransaction(calldata, privateKey, l1rpc, governanceAddr, environment, gasPrice, nonce);
 }
 
 async function cancelUpgrade(
@@ -532,8 +550,13 @@ command
     .option('--new-allow-list <newAllowList>')
     .option('--l2-upgrader-address <l2UpgraderAddress>')
     .option('--diamond-upgrade-proposal-id <diamondUpgradeProposalId>')
+    .option('--old-protocol-version <oldProtocolVersion>')
+    .option('--old-protocol-version-deadline <oldProtocolVersionDeadline>')
     .option('--l1rpc <l1prc>')
     .option('--zksync-address <zksyncAddress>')
+    .option('--state-transition-manager-address <stateTransitionManagerAddress>')
+    .option('--chain-id <chainId>')
+    .option('--prepare-direct-operation <prepareDirectOperation>')
     .option('--use-new-governance')
     .option('--post-upgrade-calldata')
     .action(async (options) => {
@@ -552,11 +575,65 @@ command
             diamondUpgradeProposalId,
             options.upgradeAddress,
             options.l2UpgraderAddress,
+            options.oldProtocolVersion,
+            options.oldProtocolVersionDeadline,
             options.upgradeTimestamp,
             options.newAllowList,
+            options.stateTransitionManagerAddress,
             options.zksyncAddress,
-            options.useNewGovernance,
-            options.postUpgradeCalldata
+            options.postUpgradeCalldata,
+            options.prepareDirectOperation,
+            options.chainId
+        );
+    });
+
+command
+    .command('propose-upgrade-stm')
+    .option('--environment <env>')
+    .option('--private-key <privateKey>')
+    .option('--gas-price <gasPrice>')
+    .option('--nonce <nonce>')
+    .option('--l1rpc <l1prc>')
+    .option('--governance-addr <governanceAddr>')
+    .action(async (options) => {
+        if (!options.governanceAddr) {
+            throw new Error('Governance address must be provided');
+        }
+
+        await sendPreparedTx(
+            options.privateKey,
+            options.l1rpc,
+            options.environment,
+            options.gasPrice,
+            options.nonce,
+            options.governanceAddr,
+            'stmScheduleTransparentOperation',
+            'Proposing upgrade for STM'
+        );
+    });
+
+command
+    .command('execute-upgrade-stm')
+    .option('--environment <env>')
+    .option('--private-key <privateKey>')
+    .option('--gas-price <gasPrice>')
+    .option('--nonce <nonce>')
+    .option('--l1rpc <l1prc>')
+    .option('--governance-addr <governanceAddr>')
+    .action(async (options) => {
+        if (!options.governanceAddr) {
+            throw new Error('Governance address must be provided');
+        }
+
+        await sendPreparedTx(
+            options.privateKey,
+            options.l1rpc,
+            options.environment,
+            options.gasPrice,
+            options.nonce,
+            options.governanceAddr,
+            'stmExecuteOperation',
+            'Executing upgrade for STM'
         );
     });
 
@@ -568,21 +645,21 @@ command
     .option('--gas-price <gasPrice>')
     .option('--nonce <nonce>')
     .option('--l1rpc <l1prc>')
-    .option('--new-governance <newGovernance>')
+    .option('--governance-addr <governanceAddr>')
     .action(async (options) => {
-        if (!options.newGovernance) {
-            // TODO(X): remove old governance functionality from the protocol upgrade tool
-            throw new Error('Old governance is not supported anymore');
+        if (!options.governanceAddr) {
+            throw new Error('Governance address must be provided');
         }
 
-        await proposeUpgrade(
+        await sendPreparedTx(
             options.privateKey,
             options.l1rpc,
-            options.zksyncAddress,
             options.environment,
             options.gasPrice,
             options.nonce,
-            options.newGovernance
+            options.governanceAddr,
+            'scheduleTransparentOperation',
+            'Proposing "upgradeChainFromVersion" upgrade'
         );
     });
 
@@ -594,21 +671,73 @@ command
     .option('--gas-price <gasPrice>')
     .option('--nonce <nonce>')
     .option('--l1rpc <l1prc>')
-    .option('--new-governance <newGovernance>')
+    .option('--governance-addr <governanceAddr>')
     .action(async (options) => {
-        if (!options.newGovernance) {
-            // TODO(X): remove old governance functionality from the protocol upgrade tool
-            throw new Error('Old governance is not supported anymore');
+        if (!options.governanceAddr) {
+            throw new Error('Governance address must be provided');
         }
 
-        await executeUpgrade(
+        await sendPreparedTx(
             options.privateKey,
             options.l1rpc,
-            options.zksyncAddress,
             options.environment,
             options.gasPrice,
             options.nonce,
-            options.newGovernance
+            options.governanceAddr,
+            'executeOperation',
+            'Executing "upgradeChainFromVersion" upgrade'
+        );
+    });
+
+command
+    .command('propose-upgrade-direct')
+    .option('--environment <env>')
+    .option('--private-key <privateKey>')
+    .option('--zksync-address <zksyncAddress>')
+    .option('--gas-price <gasPrice>')
+    .option('--nonce <nonce>')
+    .option('--l1rpc <l1prc>')
+    .option('--governance-addr <governanceAddr>')
+    .action(async (options) => {
+        if (!options.governanceAddr) {
+            throw new Error('Governance address must be provided');
+        }
+
+        await sendPreparedTx(
+            options.privateKey,
+            options.l1rpc,
+            options.environment,
+            options.gasPrice,
+            options.nonce,
+            options.governanceAddr,
+            'stmScheduleOperationDirect',
+            'Executing direct upgrade via STM'
+        );
+    });
+
+command
+    .command('execute-upgrade-direct')
+    .option('--environment <env>')
+    .option('--private-key <privateKey>')
+    .option('--zksync-address <zksyncAddress>')
+    .option('--gas-price <gasPrice>')
+    .option('--nonce <nonce>')
+    .option('--l1rpc <l1prc>')
+    .option('--governance-addr <governanceAddr>')
+    .action(async (options) => {
+        if (!options.governanceAddr) {
+            throw new Error('Governance address must be provided');
+        }
+
+        await sendPreparedTx(
+            options.privateKey,
+            options.l1rpc,
+            options.environment,
+            options.gasPrice,
+            options.nonce,
+            options.governanceAddr,
+            'stmExecuteOperationDirect',
+            'Executing direct upgrade via STM'
         );
     });
 
@@ -621,11 +750,10 @@ command
     .option('--nonce <nonce>')
     .option('--l1rpc <l1prc>')
     .option('--execute')
-    .option('--new-governance <newGovernance>')
+    .option('--governance-addr <governanceAddr>')
     .action(async (options) => {
-        if (!options.newGovernance) {
-            // TODO(X): remove old governance functionality from the protocol upgrade tool
-            throw new Error('Old governance is not supported anymore');
+        if (!options.governanceAddr) {
+            throw new Error('Governance address must be provided');
         }
 
         await cancelUpgrade(
diff --git a/infrastructure/protocol-upgrade/src/utils.ts b/infrastructure/protocol-upgrade/src/utils.ts
index a81ec7895861..f4174c460903 100644
--- a/infrastructure/protocol-upgrade/src/utils.ts
+++ b/infrastructure/protocol-upgrade/src/utils.ts
@@ -62,3 +62,20 @@ export interface VerifierParams {
     recursionLeafLevelVkHash: BytesLike;
     recursionCircuitsSetVksHash: BytesLike;
 }
+
+// Bit shift by 32 does not work in JS, so we have to multiply by 2^32
+export const SEMVER_MINOR_VERSION_MULTIPLIER = 4294967296;
+
+// The major version is always 0 for now
+export function packSemver(major: number, minor: number, patch: number) {
+    if (major !== 0) {
+        throw new Error('Major version must be 0');
+    }
+
+    return minor * SEMVER_MINOR_VERSION_MULTIPLIER + patch;
+}
+
+export function unpackStringSemVer(semver: string): [number, number, number] {
+    const [major, minor, patch] = semver.split('.');
+    return [parseInt(major), parseInt(minor), parseInt(patch)];
+}
diff --git a/infrastructure/zk/package.json b/infrastructure/zk/package.json
index dc6aded093a2..29d47184fa09 100644
--- a/infrastructure/zk/package.json
+++ b/infrastructure/zk/package.json
@@ -31,7 +31,6 @@
         "@types/tabtab": "^3.0.1",
         "hardhat": "=2.22.2",
         "typescript": "^4.3.5",
-        "cspell": "^8.3.2",
         "sql-formatter": "^13.1.0"
     }
 }
diff --git a/infrastructure/zk/src/clean.ts b/infrastructure/zk/src/clean.ts
index 6d86b0daa620..be62de372bac 100644
--- a/infrastructure/zk/src/clean.ts
+++ b/infrastructure/zk/src/clean.ts
@@ -1,7 +1,7 @@
 import { Command } from 'commander';
 import * as fs from 'fs';
 import * as path from 'path';
-import { confirmAction } from './utils';
+import { confirmAction } from 'utils';
 import * as down from './down';
 
 export function clean(path: string) {
diff --git a/infrastructure/zk/src/compiler.ts b/infrastructure/zk/src/compiler.ts
index 271bfdcd0be3..9a90154909ba 100644
--- a/infrastructure/zk/src/compiler.ts
+++ b/infrastructure/zk/src/compiler.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 
 export async function compileTestContracts() {
     await utils.spawn('yarn workspace contracts-test-data build');
diff --git a/infrastructure/zk/src/config.ts b/infrastructure/zk/src/config.ts
index 49bb2cd7cd33..d1ffc5fa3f0c 100644
--- a/infrastructure/zk/src/config.ts
+++ b/infrastructure/zk/src/config.ts
@@ -5,6 +5,7 @@ import deepExtend from 'deep-extend';
 import * as env from './env';
 import path from 'path';
 import dotenv from 'dotenv';
+import { unpackStringSemVer } from 'utils';
 
 function loadConfigFile(configPath: string, stack: string[] = []) {
     if (stack.includes(configPath)) {
@@ -133,7 +134,7 @@ export function pushConfig(environment?: string, diff?: string) {
 
     env.modify('API_WEB3_JSON_RPC_HTTP_URL', `http://127.0.0.1:${3050 + 2 * difference}`, l2InitFile, false);
     env.modify('API_WEB3_JSON_RPC_WS_PORT', `${3050 + 1 + 2 * difference}`, l2InitFile, false);
-    env.modify('API_WEB3_JSON_RPC_WS_URL', `http://127.0.0.1:${3050 + 1 + 2 * difference}`, l2InitFile, false);
+    env.modify('API_WEB3_JSON_RPC_WS_URL', `ws://127.0.0.1:${3050 + 1 + 2 * difference}`, l2InitFile, false);
 
     env.modify('API_EXPLORER_PORT', `${3070 + 2 * difference}`, l2InitFile, false);
     env.modify('API_EXPLORER_URL', `http://127.0.0.1:${3070 + 2 * difference}`, l2InitFile, false);
@@ -180,9 +181,11 @@ export function pushConfig(environment?: string, diff?: string) {
     env.modify('DATABASE_MERKLE_TREE_BACKUP_PATH', `./db/${environment}/backups`, l2InitFile, false);
 
     if (process.env.CONTRACTS_DEV_PROTOCOL_VERSION) {
+        const minor = unpackStringSemVer(process.env.CONTRACTS_DEV_PROTOCOL_VERSION)[1];
+        // Since we are bumping the minor version the patch is reset to 0.
         env.modify(
             'CONTRACTS_GENESIS_PROTOCOL_VERSION',
-            (parseInt(process.env.CONTRACTS_GENESIS_PROTOCOL_VERSION!) + 1).toString(),
+            `0.${minor + 1}.0`, // The major version is always 0 for now
             l1InitFile,
             false
         );
diff --git a/infrastructure/zk/src/contract.ts b/infrastructure/zk/src/contract.ts
index e76a9cf7d4bc..a76da74b01ef 100644
--- a/infrastructure/zk/src/contract.ts
+++ b/infrastructure/zk/src/contract.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 import * as env from './env';
 import fs from 'fs';
 
@@ -78,7 +78,7 @@ export async function deployL2(args: any[] = [], includePaymaster?: boolean): Pr
 
 // for testnet and development purposes it is ok to deploy contracts form L1.
 export async function deployL2ThroughL1({
-    includePaymaster,
+    includePaymaster = true,
     localLegacyBridgeTesting
 }: {
     includePaymaster: boolean;
@@ -224,9 +224,8 @@ export async function registerHyperchain({
     const args = [
         privateKey ? `--private-key ${privateKey}` : '',
         baseTokenName ? `--base-token-name ${baseTokenName}` : '',
-        deploymentMode === DeploymentMode.Validium ? '--validium-mode' : ''
+        deploymentMode == DeploymentMode.Validium ? '--validium-mode' : ''
     ];
-
     await utils.spawn(`yarn l1-contracts register-hyperchain ${args.join(' ')} | tee registerHyperchain.log`);
     const deployLog = fs.readFileSync('registerHyperchain.log').toString();
 
@@ -312,13 +311,15 @@ command
 command
     .command('register-hyperchain')
     .description('register hyperchain')
-    .action(() => {
-        registerHyperchain({});
-    });
+    .option('--base-token-name <base-token-name>', 'base token name')
+    .option('--deployment-mode <deployment-mode>', 'deploy contracts in Validium mode')
+    .action(registerHyperchain);
 command
     .command('deploy-l2-through-l1')
     .description('deploy l2 through l1')
-    .action(() => {
-        deployL2ThroughL1({ includePaymaster: true });
-    });
+    .option(
+        '--local-legacy-bridge-testing',
+        'used to test LegacyBridge compatibility. The chain will have the same id as the era chain id, while eraChainId in L2SharedBridge will be 0'
+    )
+    .action(deployL2ThroughL1);
 command.command('deploy-verifier').description('deploy verifier to l1').action(deployVerifier);
diff --git a/infrastructure/zk/src/contract_verifier.ts b/infrastructure/zk/src/contract_verifier.ts
index 507834866bb3..a70296acc1b8 100644
--- a/infrastructure/zk/src/contract_verifier.ts
+++ b/infrastructure/zk/src/contract_verifier.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 
 export async function contractVerifier() {
     await utils.spawn(`cargo run --bin zksync_contract_verifier --release`);
diff --git a/infrastructure/zk/src/database.ts b/infrastructure/zk/src/database.ts
index 8a1e43af40d6..2d11bca447d2 100644
--- a/infrastructure/zk/src/database.ts
+++ b/infrastructure/zk/src/database.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 
 export async function reset(opts: DbOpts) {
     await utils.confirmAction();
diff --git a/infrastructure/zk/src/docker.ts b/infrastructure/zk/src/docker.ts
index 1985ef7a4604..7f42fca1d022 100644
--- a/infrastructure/zk/src/docker.ts
+++ b/infrastructure/zk/src/docker.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 
 const IMAGES = [
     'server-v2',
@@ -15,7 +15,9 @@ const IMAGES = [
     'witness-vector-generator',
     'prover-fri-gateway',
     'proof-fri-compressor',
-    'snapshots-creator'
+    'proof-fri-gpu-compressor',
+    'snapshots-creator',
+    'verified-sources-fetcher'
 ];
 
 const DOCKER_REGISTRIES = ['us-docker.pkg.dev/matterlabs-infra/matterlabs-docker', 'matterlabs'];
@@ -37,6 +39,8 @@ async function dockerCommand(
         ? process.env.IMAGE_TAG_SUFFIX
         : `${COMMIT_SHORT_SHA.trim()}-${UNIX_TIMESTAMP}`;
 
+    const protocolVersionTag: string = process.env.PROTOCOL_VERSION ? process.env.PROTOCOL_VERSION : '';
+
     // We want an alternative flow for Rust image
     if (image == 'rust') {
         await dockerCommand(command, 'server-v2', platform, customTag, dockerOrg);
@@ -51,7 +55,9 @@ async function dockerCommand(
         image = 'keybase-secret';
     }
 
-    const tagList = customTag ? [customTag] : defaultTagList(image, COMMIT_SHORT_SHA.trim(), imageTagShaTS);
+    const tagList = customTag
+        ? [customTag]
+        : defaultTagList(image, COMMIT_SHORT_SHA.trim(), imageTagShaTS, protocolVersionTag);
 
     // Main build\push flow
     switch (command) {
@@ -64,25 +70,38 @@ async function dockerCommand(
     }
 }
 
-function defaultTagList(image: string, imageTagSha: string, imageTagShaTS: string) {
-    const tagList = [
+function defaultTagList(image: string, imageTagSha: string, imageTagShaTS: string, protocolVersionTag: string) {
+    let tagList = [
         'server-v2',
         'external-node',
-        'prover',
         'contract-verifier',
-        'prover-v2',
-        'circuit-synthesizer',
         'witness-generator',
         'prover-fri',
         'prover-gpu-fri',
         'witness-vector-generator',
         'prover-fri-gateway',
         'proof-fri-compressor',
+        'proof-fri-gpu-compressor',
         'snapshots-creator'
     ].includes(image)
         ? ['latest', 'latest2.0', `2.0-${imageTagSha}`, `${imageTagSha}`, `2.0-${imageTagShaTS}`, `${imageTagShaTS}`]
         : [`latest2.0`, 'latest'];
 
+    if (
+        protocolVersionTag &&
+        [
+            'proof-fri-compressor',
+            'proof-fri-gpu-compressor',
+            'prover-fri',
+            'prover-fri-gateway',
+            'prover-gpu-fri',
+            'witness-generator',
+            'witness-vector-generator'
+        ].includes(image)
+    ) {
+        tagList.push(`2.0-${protocolVersionTag}-${imageTagShaTS}`, `${protocolVersionTag}-${imageTagShaTS}`);
+    }
+
     return tagList;
 }
 
diff --git a/infrastructure/zk/src/down.ts b/infrastructure/zk/src/down.ts
index 24dd98f8d5f5..64b77673395f 100644
--- a/infrastructure/zk/src/down.ts
+++ b/infrastructure/zk/src/down.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 import * as fs from 'fs';
 
 export async function down() {
diff --git a/infrastructure/zk/src/env.ts b/infrastructure/zk/src/env.ts
index 3fecf466f12a..d6852640619e 100644
--- a/infrastructure/zk/src/env.ts
+++ b/infrastructure/zk/src/env.ts
@@ -1,7 +1,7 @@
 import { Command } from 'commander';
 import fs from 'fs';
 import dotenv from 'dotenv';
-import * as utils from './utils';
+import * as utils from 'utils';
 import * as config from './config';
 
 export const getAvailableEnvsFromFiles = () => {
diff --git a/infrastructure/zk/src/fmt.ts b/infrastructure/zk/src/fmt.ts
index f8e040ab11a1..e58cdbc8e547 100644
--- a/infrastructure/zk/src/fmt.ts
+++ b/infrastructure/zk/src/fmt.ts
@@ -1,6 +1,6 @@
 import { Command } from 'commander';
 import { formatSqlxQueries } from './format_sql';
-import * as utils from './utils';
+import * as utils from 'utils';
 
 const EXTENSIONS = ['ts', 'md', 'js'];
 const CONFIG_PATH = 'etc/prettier-config';
@@ -39,16 +39,22 @@ async function prettierContracts(check: boolean) {
 }
 
 export async function rustfmt(check: boolean = false) {
-    process.chdir(process.env.ZKSYNC_HOME as string);
-
     // We rely on a supposedly undocumented bug/feature of `rustfmt` that allows us to use unstable features on stable Rust.
     // Please note that this only works with CLI flags, and if you happened to visit this place after things suddenly stopped working,
     // it is certainly possible that the feature was deemed a bug and was fixed. Then welp.
     const config = '--config imports_granularity=Crate --config group_imports=StdExternalCrate';
     const command = check ? `cargo fmt -- --check ${config}` : `cargo fmt -- ${config}`;
-    await utils.spawn(command);
-    process.chdir('./prover');
-    await utils.spawn(command);
+
+    const dirs = [
+        process.env.ZKSYNC_HOME as string,
+        `${process.env.ZKSYNC_HOME}/prover`,
+        `${process.env.ZKSYNC_HOME}/zk_toolbox`
+    ];
+
+    for (const dir of dirs) {
+        process.chdir(dir);
+        await utils.spawn(command);
+    }
 }
 
 export async function runAllRustFormatters(check: boolean = false) {
diff --git a/infrastructure/zk/src/format_sql.ts b/infrastructure/zk/src/format_sql.ts
index 1e2bd2261c54..7f18d4a46388 100644
--- a/infrastructure/zk/src/format_sql.ts
+++ b/infrastructure/zk/src/format_sql.ts
@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import * as utils from './utils';
+import * as utils from 'utils';
 import { format } from 'sql-formatter';
 
 function formatQuery(query: string) {
@@ -87,6 +87,7 @@ function formatOneLineQuery(line: string): string {
 
     return prefix + '\n' + formattedQuery + '\n' + suffix;
 }
+
 async function formatFile(filePath: string, check: boolean) {
     const content = await fs.promises.readFile(filePath, { encoding: 'utf-8' });
     let linesToQuery = null;
@@ -157,7 +158,9 @@ async function formatFile(filePath: string, check: boolean) {
 
 export async function formatSqlxQueries(check: boolean) {
     process.chdir(`${process.env.ZKSYNC_HOME}`);
-    const { stdout: filesRaw } = await utils.exec('find core/lib/dal -type f -name "*.rs"');
+    const { stdout: filesRaw } = await utils.exec(
+        'find core/lib/dal -type f -name "*.rs" && find prover/prover_dal -type f -name "*.rs"'
+    );
     const files = filesRaw.trim().split('\n');
     const formatResults = await Promise.all(files.map((file) => formatFile(file, check)));
     if (check) {
diff --git a/infrastructure/zk/src/hyperchain_wizard.ts b/infrastructure/zk/src/hyperchain_wizard.ts
index 6fb058120239..ba4c85454563 100644
--- a/infrastructure/zk/src/hyperchain_wizard.ts
+++ b/infrastructure/zk/src/hyperchain_wizard.ts
@@ -13,7 +13,7 @@ import fetch from 'node-fetch';
 import { up } from './up';
 import * as Handlebars from 'handlebars';
 import { ProverType, setupProver } from './prover_setup';
-import { announced } from './utils';
+import { announced } from 'utils';
 import { DeploymentMode } from './contract';
 
 const title = chalk.blueBright;
@@ -49,7 +49,12 @@ export interface BasePromptOptions {
 async function initHyperchain(envName: string, runObservability: boolean, validiumMode: boolean) {
     await announced('Initializing hyperchain creation', setupConfiguration(envName, runObservability));
     let deploymentMode = validiumMode !== undefined ? DeploymentMode.Validium : DeploymentMode.Rollup;
-    await init.initHyperCmdAction({ skipSetupCompletely: false, bumpChainId: true, runObservability, deploymentMode });
+    await init.initHyperCmdAction({
+        skipSetupCompletely: false,
+        bumpChainId: true,
+        runObservability,
+        deploymentMode
+    });
 
     // TODO: EVM:577 fix hyperchain wizard
     env.mergeInitToEnv();
@@ -737,6 +742,7 @@ async function configDemoHyperchain(cmd: Command) {
     await init.initDevCmdAction({
         skipEnvSetup: cmd.skipEnvSetup,
         skipSubmodulesCheckout: false,
+        skipVerifier: false,
         testTokenOptions: { envFile: process.env.CHAIN_ETH_NETWORK! },
         // TODO(EVM-573): support Validium mode
         runObservability: false,
diff --git a/infrastructure/zk/src/index.ts b/infrastructure/zk/src/index.ts
index 1fd05252a591..5aef41cca388 100644
--- a/infrastructure/zk/src/index.ts
+++ b/infrastructure/zk/src/index.ts
@@ -23,7 +23,6 @@ import { command as db } from './database';
 import { command as verifyUpgrade } from './verify-upgrade';
 import { proverCommand } from './prover_setup';
 import { command as status } from './status';
-import { command as spellcheck } from './spellcheck';
 import { command as setupEn } from './setup_en';
 import * as env from './env';
 
@@ -50,7 +49,6 @@ const COMMANDS = [
     proverCommand,
     env.command,
     status,
-    spellcheck,
     setupEn,
     completion(program as Command)
 ];
@@ -60,7 +58,7 @@ async function main() {
     const ZKSYNC_HOME = process.env.ZKSYNC_HOME;
 
     if (!ZKSYNC_HOME) {
-        throw new Error('Please set $ZKSYNC_HOME to the root of zkSync repo!');
+        throw new Error('Please set $ZKSYNC_HOME to the root of ZKsync repo!');
     } else {
         process.chdir(ZKSYNC_HOME);
     }
diff --git a/infrastructure/zk/src/init.ts b/infrastructure/zk/src/init.ts
index ba8d575f6123..9ed6e178e51e 100644
--- a/infrastructure/zk/src/init.ts
+++ b/infrastructure/zk/src/init.ts
@@ -1,7 +1,7 @@
 import { Command } from 'commander';
 
-import * as utils from './utils';
-import { announced } from './utils';
+import * as utils from 'utils';
+import { announced } from 'utils';
 
 import { clean } from './clean';
 import * as compiler from './compiler';
@@ -72,17 +72,15 @@ const initSetup = async ({
     ]);
 };
 
-// Sets up the database, deploys the verifier (if set) and runs server genesis
-type InitDatabaseOptions = { skipVerifierDeployment: boolean };
-const initDatabase = async ({ skipVerifierDeployment }: InitDatabaseOptions): Promise<void> => {
+const initDatabase = async (): Promise<void> => {
     await announced('Drop postgres db', db.drop({ core: true, prover: true }));
     await announced('Setup postgres db', db.setup({ core: true, prover: true }));
     await announced('Clean rocksdb', clean(`db/${process.env.ZKSYNC_ENV!}`));
     await announced('Clean backups', clean(`backups/${process.env.ZKSYNC_ENV!}`));
+};
 
-    if (!skipVerifierDeployment) {
-        await announced('Deploying L1 verifier', contract.deployVerifier());
-    }
+const deployVerifier = async (): Promise<void> => {
+    await announced('Deploying L1 verifier', contract.deployVerifier());
 };
 
 // Deploys ERC20 and WETH tokens to localhost
@@ -96,7 +94,6 @@ const deployTestTokens = async (options?: DeployTestTokensOptions) => {
 
 // Deploys and verifies L1 contracts and initializes governance
 const initBridgehubStateTransition = async () => {
-    await announced('Running server genesis setup', server.genesisFromSources());
     await announced('Deploying L1 contracts', contract.deployL1());
     await announced('Verifying L1 contracts', contract.verifyL1Contracts());
     await announced('Initializing governance', contract.initializeGovernance());
@@ -133,9 +130,17 @@ const makeEraChainIdSameAsCurrent = async () => {
     env.reload();
 };
 
+const makeEraAddressSameAsCurrent = async () => {
+    console.log('Making era address same as current address');
+    const initEnv = `etc/env/l1-inits/${process.env.L1_ENV_NAME ? process.env.L1_ENV_NAME : '.init'}.env`;
+    env.modify('CONTRACTS_ERA_DIAMOND_PROXY_ADDR', process.env.CONTRACTS_DIAMOND_PROXY_ADDR!, initEnv, false);
+    env.reload();
+};
+
 // ########################### Command Actions ###########################
 type InitDevCmdActionOptions = InitSetupOptions & {
     skipTestTokenDeployment?: boolean;
+    skipVerifier?: boolean;
     testTokenOptions?: DeployTestTokensOptions;
     baseTokenName?: string;
     validiumMode?: boolean;
@@ -144,6 +149,7 @@ type InitDevCmdActionOptions = InitSetupOptions & {
 export const initDevCmdAction = async ({
     skipEnvSetup,
     skipSubmodulesCheckout,
+    skipVerifier,
     skipTestTokenDeployment,
     testTokenOptions,
     baseTokenName,
@@ -155,14 +161,29 @@ export const initDevCmdAction = async ({
         await makeEraChainIdSameAsCurrent();
     }
     let deploymentMode = validiumMode !== undefined ? contract.DeploymentMode.Validium : contract.DeploymentMode.Rollup;
-    await initSetup({ skipEnvSetup, skipSubmodulesCheckout, runObservability, deploymentMode });
-    await initDatabase({ skipVerifierDeployment: false });
+    await initSetup({
+        skipEnvSetup,
+        skipSubmodulesCheckout,
+        runObservability,
+        deploymentMode
+    });
+    if (!skipVerifier) {
+        await deployVerifier();
+    }
     if (!skipTestTokenDeployment) {
         await deployTestTokens(testTokenOptions);
     }
     await initBridgehubStateTransition();
-    await initDatabase({ skipVerifierDeployment: true });
-    await initHyperchain({ includePaymaster: true, baseTokenName, localLegacyBridgeTesting, deploymentMode });
+    await initDatabase();
+    await initHyperchain({
+        includePaymaster: true,
+        baseTokenName,
+        localLegacyBridgeTesting,
+        deploymentMode
+    });
+    if (localLegacyBridgeTesting) {
+        await makeEraAddressSameAsCurrent();
+    }
 };
 
 const lightweightInitCmdAction = async (): Promise<void> => {
@@ -180,7 +201,8 @@ const lightweightInitCmdAction = async (): Promise<void> => {
 type InitSharedBridgeCmdActionOptions = InitSetupOptions;
 const initSharedBridgeCmdAction = async (options: InitSharedBridgeCmdActionOptions): Promise<void> => {
     await initSetup(options);
-    await initDatabase({ skipVerifierDeployment: false });
+    await deployVerifier();
+    await initDatabase();
     await initBridgehubStateTransition();
 };
 
@@ -202,16 +224,26 @@ export const initHyperCmdAction = async ({
         config.bumpChainId();
     }
     if (!skipSetupCompletely) {
-        await initSetup({ skipEnvSetup: false, skipSubmodulesCheckout: false, runObservability, deploymentMode });
+        await initSetup({
+            skipEnvSetup: false,
+            skipSubmodulesCheckout: false,
+            runObservability,
+            deploymentMode
+        });
     }
-    await initDatabase({ skipVerifierDeployment: true });
-    await initHyperchain({ includePaymaster: true, baseTokenName, deploymentMode });
+    await initDatabase();
+    await initHyperchain({
+        includePaymaster: true,
+        baseTokenName,
+        deploymentMode
+    });
 };
 
 // ########################### Command Definitions ###########################
 export const initCommand = new Command('init')
     .option('--skip-submodules-checkout')
     .option('--skip-env-setup')
+    .option('--skip-test-token-deployment')
     .option('--base-token-name <base-token-name>', 'base token name')
     .option('--validium-mode', 'deploy contracts in Validium mode')
     .option('--run-observability', 'run observability suite')
diff --git a/infrastructure/zk/src/lint.ts b/infrastructure/zk/src/lint.ts
index 4b7ed461dc48..84c2c4535c59 100644
--- a/infrastructure/zk/src/lint.ts
+++ b/infrastructure/zk/src/lint.ts
@@ -1,18 +1,18 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 
 // Note that `rust` is not noted here, as clippy isn't run via `yarn`.
 // `rust` option is still supported though.
-const LINT_COMMANDS: Record<string, string> = {
+const LINT_COMMANDS = {
     md: 'markdownlint',
     sol: 'solhint',
     js: 'eslint',
     ts: 'eslint --ext ts'
 };
-const EXTENSIONS = Object.keys(LINT_COMMANDS);
+const EXTENSIONS = Object.keys(LINT_COMMANDS) as (keyof typeof LINT_COMMANDS)[];
 const CONFIG_PATH = 'etc/lint-config';
 
-export async function lint(extension: string, check: boolean = false) {
+export async function lint(extension: keyof typeof LINT_COMMANDS, check: boolean = false) {
     if (!EXTENSIONS.includes(extension)) {
         throw new Error('Unsupported extension');
     }
@@ -34,17 +34,22 @@ async function clippy() {
 }
 
 async function proverClippy() {
-    process.chdir(process.env.ZKSYNC_HOME! + '/prover');
+    process.chdir(`${process.env.ZKSYNC_HOME}/prover`);
     await utils.spawn('cargo clippy --tests --locked -- -D warnings -A incomplete_features');
 }
 
-const ARGS = [...EXTENSIONS, 'rust', 'prover', 'contracts'];
+async function toolboxClippy() {
+    process.chdir(`${process.env.ZKSYNC_HOME}/zk_toolbox`);
+    await utils.spawn('cargo clippy --tests --locked -- -D warnings');
+}
+
+const ARGS = [...EXTENSIONS, 'rust', 'prover', 'contracts', 'toolbox'] as const;
 
 export const command = new Command('lint')
     .description('lint code')
     .option('--check')
     .arguments(`[extension] ${ARGS.join('|')}`)
-    .action(async (extension: string | null, cmd: Command) => {
+    .action(async (extension: (typeof ARGS)[number] | null, cmd: Command) => {
         if (extension) {
             switch (extension) {
                 case 'rust':
@@ -56,6 +61,9 @@ export const command = new Command('lint')
                 case 'contracts':
                     await lintContracts(cmd.check);
                     break;
+                case 'toolbox':
+                    await toolboxClippy();
+                    break;
                 default:
                     await lint(extension, cmd.check);
             }
@@ -63,6 +71,8 @@ export const command = new Command('lint')
             const promises = EXTENSIONS.map((ext) => lint(ext, cmd.check));
             promises.push(lintContracts(cmd.check));
             promises.push(clippy());
+            promises.push(proverClippy());
+            promises.push(toolboxClippy());
             await Promise.all(promises);
         }
     });
diff --git a/infrastructure/zk/src/prover_setup.ts b/infrastructure/zk/src/prover_setup.ts
index 586844856a7c..5a17c9683742 100644
--- a/infrastructure/zk/src/prover_setup.ts
+++ b/infrastructure/zk/src/prover_setup.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 import fs from 'fs';
 import enquirer from 'enquirer';
 import { BasePromptOptions } from './hyperchain_wizard';
@@ -23,7 +23,6 @@ export async function setupProver(proverType: ProverType) {
     if (proverType == ProverType.GPU || proverType == ProverType.CPU) {
         env.modify('PROVER_TYPE', proverType, process.env.ENV_FILE!);
         env.modify('ETH_SENDER_SENDER_PROOF_SENDING_MODE', 'OnlyRealProofs', process.env.ENV_FILE!);
-        env.modify('ETH_SENDER_SENDER_PROOF_LOADING_MODE', 'FriProofFromGcs', process.env.ENV_FILE!);
         env.modify('FRI_PROVER_GATEWAY_API_POLL_DURATION_SECS', '120', process.env.ENV_FILE!);
         await setupArtifactsMode();
         if (!process.env.CI) {
diff --git a/infrastructure/zk/src/reinit.ts b/infrastructure/zk/src/reinit.ts
index 5e59d82e865d..65f0b73d6540 100644
--- a/infrastructure/zk/src/reinit.ts
+++ b/infrastructure/zk/src/reinit.ts
@@ -1,7 +1,7 @@
 import { Command } from 'commander';
 
 import { up } from './up';
-import { announced } from './utils';
+import { announced } from 'utils';
 import { initDevCmdAction, initHyperCmdAction } from './init';
 import { DeploymentMode } from './contract';
 
@@ -12,6 +12,7 @@ const reinitDevCmdAction = async (): Promise<void> => {
     await initDevCmdAction({
         skipEnvSetup: true,
         skipSubmodulesCheckout: true,
+        skipVerifier: true,
         skipTestTokenDeployment: true,
         // TODO(EVM-573): support Validium mode
         runObservability: true,
@@ -19,7 +20,10 @@ const reinitDevCmdAction = async (): Promise<void> => {
     });
 };
 
-type ReinitHyperCmdActionOptions = { baseTokenName?: string; validiumMode: boolean };
+type ReinitHyperCmdActionOptions = {
+    baseTokenName?: string;
+    validiumMode: boolean;
+};
 const reinitHyperCmdAction = async ({ baseTokenName, validiumMode }: ReinitHyperCmdActionOptions): Promise<void> => {
     // skipSetupCompletely, because we only want to compile
     // bumpChainId, because we want to reinitialize hyperchain with a new chain id
diff --git a/infrastructure/zk/src/run.ts b/infrastructure/zk/src/run.ts
index 73cf9bb1bfdd..02e3a15e3c46 100644
--- a/infrastructure/zk/src/run.ts
+++ b/infrastructure/zk/src/run.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 import { Wallet } from 'ethers';
 import fs from 'fs';
 import * as path from 'path';
@@ -56,7 +56,7 @@ export async function tokenInfo(address: string) {
 
 // installs all dependencies
 export async function yarn() {
-    await utils.spawn('yarn install --frozen-lockfile');
+    await utils.spawn('run_retried yarn install --frozen-lockfile');
 }
 
 export async function revertReason(txHash: string, web3url?: string) {
diff --git a/infrastructure/zk/src/server.ts b/infrastructure/zk/src/server.ts
index 896cb97fe340..2ed74deca98e 100644
--- a/infrastructure/zk/src/server.ts
+++ b/infrastructure/zk/src/server.ts
@@ -1,17 +1,17 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 import { clean } from './clean';
 import fs from 'fs';
 import * as path from 'path';
 import * as db from './database';
 import * as env from './env';
 
-export async function server(rebuildTree: boolean, uring: boolean, components?: string) {
+export async function server(rebuildTree: boolean, uring: boolean, components?: string, useNodeFramework?: boolean) {
     let options = '';
     if (uring) {
         options += '--features=rocksdb/io-uring';
     }
-    if (rebuildTree || components) {
+    if (rebuildTree || components || useNodeFramework) {
         options += ' --';
     }
     if (rebuildTree) {
@@ -84,7 +84,7 @@ export const serverCommand = new Command('server')
         if (cmd.genesis) {
             await genesisFromSources();
         } else {
-            await server(cmd.rebuildTree, cmd.uring, cmd.components);
+            await server(cmd.rebuildTree, cmd.uring, cmd.components, cmd.useNodeFramework);
         }
     });
 
diff --git a/infrastructure/zk/src/setup_en.ts b/infrastructure/zk/src/setup_en.ts
index 81185ad0cc6b..3d92b326251f 100644
--- a/infrastructure/zk/src/setup_en.ts
+++ b/infrastructure/zk/src/setup_en.ts
@@ -6,7 +6,7 @@ import fs from 'fs';
 import path from 'path';
 import { set as setEnv } from './env';
 import { setup as setupDb } from './database';
-import * as utils from './utils';
+import * as utils from 'utils';
 
 enum Environment {
     Mainnet = 'mainnet',
diff --git a/infrastructure/zk/src/spellcheck.ts b/infrastructure/zk/src/spellcheck.ts
deleted file mode 100644
index 4f6553e2c654..000000000000
--- a/infrastructure/zk/src/spellcheck.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Command } from 'commander';
-import * as utils from './utils';
-
-export async function runSpellCheck(pattern: string, useCargo: boolean, useCSpell: boolean) {
-    // Default commands for cSpell and cargo spellcheck
-    const cSpellCommand = `cspell "${pattern}" --config=./checks-config/cspell.json`;
-    const cargoCommand = `cargo spellcheck --cfg=./checks-config/era.cfg --code 1`;
-    // Necessary to run cargo spellcheck in the prover directory explicitly as
-    // it is not included in the root cargo.toml file
-    const cargoCommandForProver = `cargo spellcheck --cfg=../checks-config/era.cfg --code 1`;
-
-    try {
-        let results = [];
-
-        // Run cspell over all **/*.md files
-        if (useCSpell || (!useCargo && !useCSpell)) {
-            results.push(await utils.spawn(cSpellCommand));
-        }
-
-        // Run cargo spellcheck in core and prover directories
-        if (useCargo || (!useCargo && !useCSpell)) {
-            results.push(await utils.spawn(cargoCommand));
-            results.push(await utils.spawn('cd prover && ' + cargoCommandForProver));
-        }
-
-        // Check results and exit with error code if any command failed
-        if (results.some((code) => code !== 0)) {
-            console.error('Spell check failed');
-            process.exit(1);
-        }
-    } catch (error) {
-        console.error('Error occurred during spell checking:', error);
-        process.exit(1);
-    }
-}
-
-export const command = new Command('spellcheck')
-    .option('--pattern <pattern>', 'Glob pattern for files to check', '**/*.md')
-    .option('--use-cargo', 'Use cargo spellcheck')
-    .option('--use-cspell', 'Use cspell')
-    .description('Run spell check on specified files')
-    .action((cmd) => {
-        runSpellCheck(cmd.pattern, cmd.useCargo, cmd.useCSpell);
-    });
diff --git a/infrastructure/zk/src/status.ts b/infrastructure/zk/src/status.ts
index 1ad437b85540..d2f1ca08f71f 100644
--- a/infrastructure/zk/src/status.ts
+++ b/infrastructure/zk/src/status.ts
@@ -190,11 +190,6 @@ export async function statusProver() {
     main_pool = new Pool({ connectionString: process.env.DATABASE_URL });
     prover_pool = new Pool({ connectionString: process.env.DATABASE_PROVER_URL });
 
-    if (process.env.ETH_SENDER_SENDER_PROOF_LOADING_MODE != 'FriProofFromGcs') {
-        console.log(`${redStart}Can only show status for FRI provers.${resetColor}`);
-        return;
-    }
-
     // Fetch the first and most recent sealed batch numbers
     const stateKeeperStatus = (
         await queryAndReturnRows(main_pool, 'select min(number), max(number) from l1_batches')
diff --git a/infrastructure/zk/src/test/integration.ts b/infrastructure/zk/src/test/integration.ts
index 08582a553c79..386ffbef6304 100644
--- a/infrastructure/zk/src/test/integration.ts
+++ b/infrastructure/zk/src/test/integration.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import * as utils from '../utils';
+import * as utils from 'utils';
 import * as config from '../config';
 import deepExtend from 'deep-extend';
 
diff --git a/infrastructure/zk/src/test/test.ts b/infrastructure/zk/src/test/test.ts
index 2aa6fa971d47..2e3202051917 100644
--- a/infrastructure/zk/src/test/test.ts
+++ b/infrastructure/zk/src/test/test.ts
@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import { Command } from 'commander';
-import * as utils from '../utils';
+import * as utils from 'utils';
 
 import * as integration from './integration';
 import * as db from '../database';
diff --git a/infrastructure/zk/src/up.ts b/infrastructure/zk/src/up.ts
index 2e917b3bea26..6f49dd7d05e1 100644
--- a/infrastructure/zk/src/up.ts
+++ b/infrastructure/zk/src/up.ts
@@ -1,11 +1,15 @@
 import { Command } from 'commander';
-import * as utils from './utils';
+import * as utils from 'utils';
 import fs from 'fs';
 
 // Make sure that the volumes exists before starting the containers.
 export function createVolumes() {
-    fs.mkdirSync(`${process.env.ZKSYNC_HOME}/volumes/reth/data`, { recursive: true });
-    fs.mkdirSync(`${process.env.ZKSYNC_HOME}/volumes/postgres`, { recursive: true });
+    fs.mkdirSync(`${process.env.ZKSYNC_HOME}/volumes/reth/data`, {
+        recursive: true
+    });
+    fs.mkdirSync(`${process.env.ZKSYNC_HOME}/volumes/postgres`, {
+        recursive: true
+    });
 }
 
 export async function up(runObservability: boolean, composeFile?: string) {
diff --git a/package.json b/package.json
index 9124900ca6dc..af745160c30d 100644
--- a/package.json
+++ b/package.json
@@ -11,10 +11,11 @@
       "contracts/system-contracts",
       "etc/contracts-test-data",
       "etc/ERC20",
+      "etc/utils",
       "infrastructure/zk",
       "infrastructure/local-setup-preparation",
       "core/tests/revert-test",
-      "core/tests/snapshot-recovery-test",
+      "core/tests/recovery-test",
       "core/tests/upgrade-test",
       "core/tests/ts-integration",
       "infrastructure/protocol-upgrade"
@@ -30,23 +31,22 @@
     "l2-contracts": "yarn workspace l2-contracts",
     "revert-test": "yarn workspace revert-test",
     "upgrade-test": "yarn workspace upgrade-test",
-    "snapshot-recovery-test": "yarn workspace snapshot-recovery-test",
+    "recovery-test": "yarn workspace recovery-test",
     "ts-integration": "yarn workspace ts-integration",
+    "utils": "yarn workspace utils",
     "zk": "yarn workspace zk"
   },
   "devDependencies": {
-    "@ethersproject/bignumber": "~5.5.0",
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^4.10.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^7.16.0",
     "eslint-config-alloy": "^3.8.2",
+    "eslint": "^7.16.0",
     "markdownlint-cli": "^0.24.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.2",
     "prettier-plugin-solidity": "=1.0.0-dev.22",
+    "prettier": "^2.3.2",
     "solhint": "^3.3.2",
-    "sql-formatter": "^13.1.0",
-    "zksync-ethers": "https://github.com/zksync-sdk/zksync-ethers#sb-old-sdk"
+    "sql-formatter": "^13.1.0"
   }
 }
diff --git a/prover/CHANGELOG.md b/prover/CHANGELOG.md
index 0513a61b9f8e..ea16d1cfa453 100644
--- a/prover/CHANGELOG.md
+++ b/prover/CHANGELOG.md
@@ -1,5 +1,131 @@
 # Changelog
 
+## [15.0.0](https://github.com/matter-labs/zksync-era/compare/prover-v14.5.0...prover-v15.0.0) (2024-06-14)
+
+
+### ⚠ BREAKING CHANGES
+
+* updated boojum and nightly rust compiler ([#2126](https://github.com/matter-labs/zksync-era/issues/2126))
+
+### Features
+
+* added debug_proof to prover_cli ([#2052](https://github.com/matter-labs/zksync-era/issues/2052)) ([b1ad01b](https://github.com/matter-labs/zksync-era/commit/b1ad01b50392a0ee241c2263ac22bb3258fae2d7))
+* faster & cleaner VK generation ([#2084](https://github.com/matter-labs/zksync-era/issues/2084)) ([89c8cac](https://github.com/matter-labs/zksync-era/commit/89c8cac6a747b3e05529218091b90ceb8e520c7a))
+* **node:** Move some stuff around ([#2151](https://github.com/matter-labs/zksync-era/issues/2151)) ([bad5a6c](https://github.com/matter-labs/zksync-era/commit/bad5a6c0ec2e166235418a2796b6ccf6f8b3b05f))
+* **object-store:** Allow caching object store objects locally ([#2153](https://github.com/matter-labs/zksync-era/issues/2153)) ([6c6e65c](https://github.com/matter-labs/zksync-era/commit/6c6e65ce646bcb4ed9ba8b2dd6be676bb6e66324))
+* **proof_data_handler:** add new endpoints to the TEE prover interface API ([#1993](https://github.com/matter-labs/zksync-era/issues/1993)) ([eca98cc](https://github.com/matter-labs/zksync-era/commit/eca98cceeb74a979040279caaf1d05d1fdf1b90c))
+* **prover:** Add file based config for fri prover gateway ([#2150](https://github.com/matter-labs/zksync-era/issues/2150)) ([81ffc6a](https://github.com/matter-labs/zksync-era/commit/81ffc6a753fb72747c01ddc8a37211bf6a8a1a27))
+* **prover:** file based configs for witness generator ([#2161](https://github.com/matter-labs/zksync-era/issues/2161)) ([24b8f93](https://github.com/matter-labs/zksync-era/commit/24b8f93fbcc537792a7615f34bce8b6702a55ccd))
+* support debugging of recursive circuits in prover_cli ([#2217](https://github.com/matter-labs/zksync-era/issues/2217)) ([7d2e12d](https://github.com/matter-labs/zksync-era/commit/7d2e12d80db072be1952102183648b95a48834c6))
+* updated boojum and nightly rust compiler ([#2126](https://github.com/matter-labs/zksync-era/issues/2126)) ([9e39f13](https://github.com/matter-labs/zksync-era/commit/9e39f13c29788e66645ea57f623555c4b36b8aff))
+* verification of L1Batch witness (BFT-471) - attempt 2 ([#2232](https://github.com/matter-labs/zksync-era/issues/2232)) ([dbcf3c6](https://github.com/matter-labs/zksync-era/commit/dbcf3c6d02a6bfb9197bf4278f296632b0fd7d66))
+* verification of L1Batch witness (BFT-471) ([#2019](https://github.com/matter-labs/zksync-era/issues/2019)) ([6cc5455](https://github.com/matter-labs/zksync-era/commit/6cc54555972804be4cd2ca118f0e425c490fbfca))
+
+
+### Bug Fixes
+
+* **config:** Split object stores ([#2187](https://github.com/matter-labs/zksync-era/issues/2187)) ([9bcdabc](https://github.com/matter-labs/zksync-era/commit/9bcdabcaa8462ae19da1688052a7a78fa4108298))
+* **prover_cli:** Fix delete command ([#2119](https://github.com/matter-labs/zksync-era/issues/2119)) ([214f981](https://github.com/matter-labs/zksync-era/commit/214f981880ca1ea879e805f8fc392f5c422be08d))
+* **prover_cli:** Fix the issues with `home` path ([#2104](https://github.com/matter-labs/zksync-era/issues/2104)) ([1e18af2](https://github.com/matter-labs/zksync-era/commit/1e18af20d082065f269c6cad65bee99363e2d770))
+* **prover:** config ([#2165](https://github.com/matter-labs/zksync-era/issues/2165)) ([e5daf8e](https://github.com/matter-labs/zksync-era/commit/e5daf8e8358eff65963d6a1b2294d0bd1fccab89))
+* **prover:** Disallow state changes from successful ([#2233](https://github.com/matter-labs/zksync-era/issues/2233)) ([2488a76](https://github.com/matter-labs/zksync-era/commit/2488a767a362ea3b40a348ae9822bed77d4b8de9))
+* Treat 502s and 503s as transient for GCS OS ([#2202](https://github.com/matter-labs/zksync-era/issues/2202)) ([0a12c52](https://github.com/matter-labs/zksync-era/commit/0a12c5224b0b6b6d937311e6d6d81c26b03b1d9d))
+
+
+### Reverts
+
+* verification of L1Batch witness (BFT-471) ([#2230](https://github.com/matter-labs/zksync-era/issues/2230)) ([227e101](https://github.com/matter-labs/zksync-era/commit/227e10180396fbb54a2e99cab775f13bc93745f3))
+
+## [14.5.0](https://github.com/matter-labs/zksync-era/compare/prover-v14.4.0...prover-v14.5.0) (2024-06-04)
+
+
+### Features
+
+* update VKs and bump cargo.lock ([#2112](https://github.com/matter-labs/zksync-era/issues/2112)) ([6510317](https://github.com/matter-labs/zksync-era/commit/65103173085a0b500a626cb8179fad77ee97fadd))
+* use semver for metrics, move constants to prover workspace ([#2098](https://github.com/matter-labs/zksync-era/issues/2098)) ([7a50a9f](https://github.com/matter-labs/zksync-era/commit/7a50a9f79e516ec150d1f30b9f1c781a5523375b))
+
+
+### Bug Fixes
+
+* **block-reverter:** Fix reverting snapshot files ([#2064](https://github.com/matter-labs/zksync-era/issues/2064)) ([17a7e78](https://github.com/matter-labs/zksync-era/commit/17a7e782d9e35eaf38acf920c2326d4037c7781e))
+* **house-keeper:** Fix queue size queries ([#2106](https://github.com/matter-labs/zksync-era/issues/2106)) ([183502a](https://github.com/matter-labs/zksync-era/commit/183502a17eb47a747f50b6a9d38ab78de984f80e))
+
+## [14.4.0](https://github.com/matter-labs/zksync-era/compare/prover-v14.3.0...prover-v14.4.0) (2024-05-30)
+
+
+### Features
+
+* Make house keeper emit correct protocol version ([#2062](https://github.com/matter-labs/zksync-era/issues/2062)) ([a58a7e8](https://github.com/matter-labs/zksync-era/commit/a58a7e8ec8599eb957e5693308b789e7ace5c126))
+* **pli:** add support for persistent config ([#1907](https://github.com/matter-labs/zksync-era/issues/1907)) ([9d5631c](https://github.com/matter-labs/zksync-era/commit/9d5631cdd330a288335db11a71ecad89ee32a0f4))
+* Protocol semantic version ([#2059](https://github.com/matter-labs/zksync-era/issues/2059)) ([3984dcf](https://github.com/matter-labs/zksync-era/commit/3984dcfbdd890f0862c9c0f3e7757fb8b0c8184a))
+* **prover:** Add `prover_version` binary. ([#2089](https://github.com/matter-labs/zksync-era/issues/2089)) ([e1822f6](https://github.com/matter-labs/zksync-era/commit/e1822f6ad150a28df75b06b97b9ff01d671b83b6))
+
+
+### Bug Fixes
+
+* fix null protocol version error ([#2094](https://github.com/matter-labs/zksync-era/issues/2094)) ([aab3a7f](https://github.com/matter-labs/zksync-era/commit/aab3a7ff97870aea155fbc542c4c0f55ee816341))
+* fix query for proof compressor metrics ([#2103](https://github.com/matter-labs/zksync-era/issues/2103)) ([d23d24e](https://github.com/matter-labs/zksync-era/commit/d23d24e9e13af052612be81e913da89bc160de4d))
+* **prover_dal:** fix `save_prover_protocol_version` query ([#2096](https://github.com/matter-labs/zksync-era/issues/2096)) ([d8dd1ae](https://github.com/matter-labs/zksync-era/commit/d8dd1aedd7b67b09b6d5c0f29ba90069e0c80b4e))
+
+## [14.3.0](https://github.com/matter-labs/zksync-era/compare/prover-v14.2.0...prover-v14.3.0) (2024-05-23)
+
+
+### Features
+
+* **config:** remove zksync home ([#2022](https://github.com/matter-labs/zksync-era/issues/2022)) ([d08fe81](https://github.com/matter-labs/zksync-era/commit/d08fe81f4ec6c3aaeb5ad98351e44a63e5b100be))
+* **prover_cli:** add general status for batch command ([#1953](https://github.com/matter-labs/zksync-era/issues/1953)) ([7b0df3b](https://github.com/matter-labs/zksync-era/commit/7b0df3b22f04f1fdead308ec30572f565b34dd5c))
+* **prover:** add GPU feature for compressor ([#1838](https://github.com/matter-labs/zksync-era/issues/1838)) ([e9a2213](https://github.com/matter-labs/zksync-era/commit/e9a2213985928cd3804a3855ccfde6a7d99da238))
+
+
+### Bug Fixes
+
+* **prover:** Fix path to vk_setup_data_generator_server_fri ([#2025](https://github.com/matter-labs/zksync-era/issues/2025)) ([dbe4d6f](https://github.com/matter-labs/zksync-era/commit/dbe4d6f1724a458e61ab56cd94d17e1ecfa4c207))
+
+## [14.2.0](https://github.com/matter-labs/zksync-era/compare/prover-v14.1.1...prover-v14.2.0) (2024-05-17)
+
+
+### Features
+
+* Added support for making EN a (non-leader) consensus validator (BFT-426) ([#1905](https://github.com/matter-labs/zksync-era/issues/1905)) ([9973629](https://github.com/matter-labs/zksync-era/commit/9973629e35cec9af9eac81452631a2526dd336a8))
+* **configs:** Extract secrets to an additional config  ([#1956](https://github.com/matter-labs/zksync-era/issues/1956)) ([bab4d65](https://github.com/matter-labs/zksync-era/commit/bab4d6579828e484453c84df417550bbaf1013b6))
+* **eth-client:** Generalize RPC client ([#1898](https://github.com/matter-labs/zksync-era/issues/1898)) ([a4e099f](https://github.com/matter-labs/zksync-era/commit/a4e099fe961f329ff2d604d657862819732446b4))
+* **Prover CLI:** `delete` cmd ([#1802](https://github.com/matter-labs/zksync-era/issues/1802)) ([6e4a92e](https://github.com/matter-labs/zksync-era/commit/6e4a92eb93aacec8641770e15fc6faf6a78faafa))
+* **Prover CLI:** `requeue` cmd ([#1719](https://github.com/matter-labs/zksync-era/issues/1719)) ([f722df7](https://github.com/matter-labs/zksync-era/commit/f722df7c0ae429f43d047ff79e24bca39f81230c))
+* **Prover CLI:** `status batch --verbose` ([#1899](https://github.com/matter-labs/zksync-era/issues/1899)) ([cf80184](https://github.com/matter-labs/zksync-era/commit/cf80184941a1fc62c3a755b99571d370949d8566))
+* **state-keeper:** Parallel l2 block sealing ([#1801](https://github.com/matter-labs/zksync-era/issues/1801)) ([9b06dd8](https://github.com/matter-labs/zksync-era/commit/9b06dd848e85e20f2e94d2a0e858c3f207da5f47))
+* tee_verifier_input_producer ([#1860](https://github.com/matter-labs/zksync-era/issues/1860)) ([fea7f16](https://github.com/matter-labs/zksync-era/commit/fea7f165cfb96bf673353ef562fb5c06f3e49736))
+
+
+### Bug Fixes
+
+* **Prover CLI:** `status batch` bugs ([#1865](https://github.com/matter-labs/zksync-era/issues/1865)) ([09682f2](https://github.com/matter-labs/zksync-era/commit/09682f2951f5f62fa0942057e96f855d78bf67c8))
+* **prover:** Bump Cargo.lock and update VKs ([#1959](https://github.com/matter-labs/zksync-era/issues/1959)) ([367baad](https://github.com/matter-labs/zksync-era/commit/367baad77466769e7ad5e517cc78836f1e3c23d3))
+
+## [14.1.1](https://github.com/matter-labs/zksync-era/compare/prover-v14.1.0...prover-v14.1.1) (2024-05-14)
+
+
+### Bug Fixes
+
+* **core/prover:** Changes to support Validium ([#1910](https://github.com/matter-labs/zksync-era/issues/1910)) ([1cb0dc5](https://github.com/matter-labs/zksync-era/commit/1cb0dc5504d226c55217accca87f2fd75addc917))
+
+## [14.1.0](https://github.com/matter-labs/zksync-era/compare/prover-v14.0.0...prover-v14.1.0) (2024-05-11)
+
+
+### Features
+
+* **en:** Brush up EN observability config ([#1897](https://github.com/matter-labs/zksync-era/issues/1897)) ([086f768](https://github.com/matter-labs/zksync-era/commit/086f7683307b2b9c6a43cb8cf2c1a8a8874277a7))
+* Extract several crates from zksync_core ([#1859](https://github.com/matter-labs/zksync-era/issues/1859)) ([7dcf796](https://github.com/matter-labs/zksync-era/commit/7dcf79606e0f37b468c82b6bdcb374149bc30f34))
+* **Prover CLI:** Configuration (with flag) ([#1861](https://github.com/matter-labs/zksync-era/issues/1861)) ([620c880](https://github.com/matter-labs/zksync-era/commit/620c88020363cfc534fe8f6889cb2ed8bba89cdd))
+* **Prover CLI:** Initial Docs ([#1862](https://github.com/matter-labs/zksync-era/issues/1862)) ([8b094aa](https://github.com/matter-labs/zksync-era/commit/8b094aa91b89f713fd6f0f5ce0412a340a059650))
+* **Prover CLI:** status l1 command ([#1706](https://github.com/matter-labs/zksync-era/issues/1706)) ([8ddd039](https://github.com/matter-labs/zksync-era/commit/8ddd0397bd12742e7784c71dedaa08b075d39cda))
+* prover components versioning ([#1660](https://github.com/matter-labs/zksync-era/issues/1660)) ([29a4ffc](https://github.com/matter-labs/zksync-era/commit/29a4ffc6b9420590f32a9e1d1585ebffb95eeb6c))
+
+
+### Bug Fixes
+
+* 1.5.0 + validium (contracts only) patches ([#1911](https://github.com/matter-labs/zksync-era/issues/1911)) ([bf439f4](https://github.com/matter-labs/zksync-era/commit/bf439f4b382e7fd396ce8f035de8e2a5640f8151))
+* Update prover cargo lock ([#1896](https://github.com/matter-labs/zksync-era/issues/1896)) ([2ca01f5](https://github.com/matter-labs/zksync-era/commit/2ca01f5f00459570c210890d85c11345271bbed0))
+
 ## [14.0.0](https://github.com/matter-labs/zksync-era/compare/prover-v13.0.0...prover-v14.0.0) (2024-05-06)
 
 
diff --git a/prover/Cargo.lock b/prover/Cargo.lock
index 58e24aa8da71..6f544e4c6c84 100644
--- a/prover/Cargo.lock
+++ b/prover/Cargo.lock
@@ -15,9 +15,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.8"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if 1.0.0",
  "getrandom",
@@ -54,18 +54,18 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "android-tzdata"
@@ -93,47 +93,48 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -141,9 +142,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "arr_macro"
@@ -162,7 +163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1"
 dependencies = [
  "proc-macro-hack",
- "quote 1.0.35",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -193,17 +194,6 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
-[[package]]
-name = "async-lock"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
-dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy",
- "pin-project-lite",
-]
-
 [[package]]
 name = "async-stream"
 version = "0.3.5"
@@ -221,20 +211,20 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.77"
+version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -247,14 +237,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "atomic-write-file"
-version = "0.1.2"
+name = "atomic-waker"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436"
-dependencies = [
- "nix",
- "rand 0.8.5",
-]
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "atty"
@@ -269,9 +255,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "axum"
@@ -284,9 +270,9 @@ dependencies = [
  "bitflags 1.3.2",
  "bytes",
  "futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.29",
  "itoa",
  "matchit",
  "memchr",
@@ -295,7 +281,7 @@ dependencies = [
  "pin-project-lite",
  "rustversion",
  "serde",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
  "tower",
  "tower-layer",
  "tower-service",
@@ -310,19 +296,31 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http",
- "http-body",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "mime",
  "rustversion",
  "tower-layer",
  "tower-service",
 ]
 
+[[package]]
+name = "backon"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "pin-project",
+ "tokio",
+]
+
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
 dependencies = [
  "addr2line",
  "cc",
@@ -430,7 +428,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
 dependencies = [
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-integer",
  "num-traits",
 ]
@@ -444,6 +442,29 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.59.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8"
+dependencies = [
+ "bitflags 1.3.2",
+ "cexpr",
+ "clang-sys",
+ "clap 2.34.0",
+ "env_logger 0.9.3",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "regex",
+ "rustc-hash",
+ "shlex",
+ "which",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.65.1"
@@ -457,12 +478,12 @@ dependencies = [
  "lazycell",
  "peeking_take_while",
  "prettyplease",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.48",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -471,7 +492,7 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -479,12 +500,12 @@ dependencies = [
  "lazycell",
  "log",
  "prettyplease",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.48",
+ "syn 2.0.66",
  "which",
 ]
 
@@ -514,9 +535,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 dependencies = [
  "serde",
 ]
@@ -630,9 +651,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "blst"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b"
+checksum = "62dc83a094a71d43eeadd254b1ec2d24cb6a0bb6cadce00df51f0db594711a32"
 dependencies = [
  "cc",
  "glob",
@@ -643,7 +664,7 @@ dependencies = [
 [[package]]
 name = "boojum"
 version = "0.2.0"
-source = "git+https://github.com/matter-labs/era-boojum?branch=main#19988079852ea22576da6b09e39365e6cdc1368f"
+source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#4bcb11f0610302110ae8109af01d5b652191b2f6"
 dependencies = [
  "arrayvec 0.7.4",
  "bincode",
@@ -652,7 +673,7 @@ dependencies = [
  "convert_case",
  "crossbeam 0.8.4",
  "crypto-bigint 0.5.5",
- "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum?branch=main)",
+ "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum.git?branch=main)",
  "derivative",
  "ethereum-types",
  "firestorm",
@@ -660,7 +681,6 @@ dependencies = [
  "lazy_static",
  "num-modular",
  "num_cpus",
- "packed_simd",
  "pairing_ce 0.28.5 (git+https://github.com/matter-labs/pairing.git)",
  "rand 0.8.5",
  "rayon",
@@ -675,7 +695,7 @@ dependencies = [
 [[package]]
 name = "boojum-cuda"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#11f4a68362e4d7a4b41dbbc7690515a9aeed44cf"
+source = "git+https://github.com/matter-labs/era-boojum-cuda?branch=main#edf04233ea0edb6febe2f7b8cb2c8607ebf8ec96"
 dependencies = [
  "boojum",
  "cmake",
@@ -687,9 +707,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.3.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667"
+checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028"
 dependencies = [
  "borsh-derive",
  "cfg_aliases",
@@ -697,23 +717,23 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.3.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd"
+checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0"
 dependencies = [
  "once_cell",
- "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro-crate 2.0.0",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
  "syn_derive",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byte-slice-cast"
@@ -738,16 +758,16 @@ version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "bytecount"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205"
+checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
 
 [[package]]
 name = "byteorder"
@@ -757,9 +777,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "bzip2-sys"
@@ -774,18 +794,18 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
+checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
 dependencies = [
  "serde",
 ]
@@ -805,14 +825,21 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
 dependencies = [
  "jobserver",
  "libc",
+ "once_cell",
 ]
 
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
 [[package]]
 name = "cexpr"
 version = "0.6.0"
@@ -842,9 +869,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -852,13 +879,27 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "circuit_definitions"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness?branch=gpu-wrapper#ea0d54f6d5d7d3302a4a6594150a2ca809e6677b"
+dependencies = [
+ "crossbeam 0.8.4",
+ "derivative",
+ "seq-macro",
+ "serde",
+ "snark_wrapper",
+ "zk_evm 1.4.0",
+ "zkevm_circuits 1.4.0 (git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=main)",
 ]
 
 [[package]]
 name = "circuit_definitions"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#ecb08797ced36fcc7d3696ffd2ec6a2d534b9395"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#5d6a06c37f4656d26a4170d22f2298cd7716c070"
 dependencies = [
  "circuit_encodings 0.1.50",
  "crossbeam 0.8.4",
@@ -866,8 +907,6 @@ dependencies = [
  "seq-macro",
  "serde",
  "snark_wrapper",
- "zk_evm 1.5.0",
- "zkevm_circuits 1.5.0",
 ]
 
 [[package]]
@@ -878,7 +917,7 @@ dependencies = [
  "derivative",
  "serde",
  "zk_evm 1.4.0",
- "zkevm_circuits 1.4.0",
+ "zkevm_circuits 1.4.0 (git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=v1.4.0)",
 ]
 
 [[package]]
@@ -895,7 +934,7 @@ dependencies = [
 [[package]]
 name = "circuit_encodings"
 version = "0.1.42"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.2#012dcc678990c695f97e5dd1f136dfa8fe376c16"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.2#3149a162a729581005fbad6dbcef027a3ee1b214"
 dependencies = [
  "derivative",
  "serde",
@@ -906,7 +945,7 @@ dependencies = [
 [[package]]
 name = "circuit_encodings"
 version = "0.1.50"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#ecb08797ced36fcc7d3696ffd2ec6a2d534b9395"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#5d6a06c37f4656d26a4170d22f2298cd7716c070"
 dependencies = [
  "derivative",
  "serde",
@@ -955,7 +994,7 @@ dependencies = [
 [[package]]
 name = "circuit_sequencer_api"
 version = "0.1.42"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.2#012dcc678990c695f97e5dd1f136dfa8fe376c16"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.4.2#3149a162a729581005fbad6dbcef027a3ee1b214"
 dependencies = [
  "bellman_ce 0.3.2 (git+https://github.com/matter-labs/bellman?branch=dev)",
  "circuit_encodings 0.1.42",
@@ -968,14 +1007,13 @@ dependencies = [
 [[package]]
 name = "circuit_sequencer_api"
 version = "0.1.50"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#ecb08797ced36fcc7d3696ffd2ec6a2d534b9395"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#5d6a06c37f4656d26a4170d22f2298cd7716c070"
 dependencies = [
  "bellman_ce 0.3.2 (git+https://github.com/matter-labs/bellman?branch=dev)",
  "circuit_encodings 0.1.50",
  "derivative",
  "rayon",
  "serde",
- "zk_evm 1.5.0",
 ]
 
 [[package]]
@@ -988,9 +1026,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -1014,9 +1052,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.6"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1024,33 +1062,33 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.6"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.10.0",
+ "strsim 0.11.1",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.4.2"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
 dependencies = [
- "heck 0.4.1",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "heck 0.5.0",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.5.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "cmake"
@@ -1072,9 +1110,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "colored"
@@ -1088,9 +1126,9 @@ dependencies = [
 
 [[package]]
 name = "combine"
-version = "4.6.6"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
  "memchr",
@@ -1103,12 +1141,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bed69047ed42e52c7e38d6421eeb8ceefb4f2a2b52eed59137f7bad7908f6800"
 
 [[package]]
-name = "concurrent-queue"
-version = "2.5.0"
+name = "console"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
- "crossbeam-utils 0.8.19",
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1138,8 +1180,8 @@ version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "unicode-xid 0.2.4",
 ]
 
@@ -1151,9 +1193,12 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
 name = "convert_case"
-version = "0.4.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
 
 [[package]]
 name = "core-foundation"
@@ -1182,9 +1227,9 @@ dependencies = [
 
 [[package]]
 name = "crc"
-version = "3.0.1"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
 dependencies = [
  "crc-catalog",
 ]
@@ -1197,9 +1242,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1224,11 +1269,11 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
 dependencies = [
- "crossbeam-channel 0.5.11",
+ "crossbeam-channel 0.5.13",
  "crossbeam-deque 0.8.5",
  "crossbeam-epoch 0.9.18",
  "crossbeam-queue 0.3.11",
- "crossbeam-utils 0.8.19",
+ "crossbeam-utils 0.8.20",
 ]
 
 [[package]]
@@ -1243,11 +1288,11 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.11"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
- "crossbeam-utils 0.8.19",
+ "crossbeam-utils 0.8.20",
 ]
 
 [[package]]
@@ -1268,7 +1313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
  "crossbeam-epoch 0.9.18",
- "crossbeam-utils 0.8.19",
+ "crossbeam-utils 0.8.20",
 ]
 
 [[package]]
@@ -1292,7 +1337,7 @@ version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "crossbeam-utils 0.8.19",
+ "crossbeam-utils 0.8.20",
 ]
 
 [[package]]
@@ -1312,7 +1357,7 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
 dependencies = [
- "crossbeam-utils 0.8.19",
+ "crossbeam-utils 0.8.20",
 ]
 
 [[package]]
@@ -1328,9 +1373,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crunchy"
@@ -1385,11 +1430,11 @@ dependencies = [
 [[package]]
 name = "cs_derive"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-boojum?branch=main#19988079852ea22576da6b09e39365e6cdc1368f"
+source = "git+https://github.com/matter-labs/era-boojum.git?branch=main#4bcb11f0610302110ae8109af01d5b652191b2f6"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -1399,17 +1444,17 @@ version = "0.1.0"
 source = "git+https://github.com/matter-labs/era-sync_vm.git?branch=v1.3.3#ed8ab8984cae05d00d9d62196753c8d40df47c7d"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "serde",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "ctrlc"
-version = "3.4.2"
+version = "3.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b"
+checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345"
 dependencies = [
  "nix",
  "windows-sys 0.52.0",
@@ -1420,7 +1465,7 @@ name = "cudart"
 version = "0.1.0"
 source = "git+https://github.com/matter-labs/era-cuda?branch=main#3ef61d56b84c1f877fe8aab6ec2b1d14a96cd671"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cudart-sys",
  "paste",
 ]
@@ -1466,16 +1511,15 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.1"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if 1.0.0",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "platforms",
  "rustc_version",
  "subtle",
  "zeroize",
@@ -1487,9 +1531,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -1510,8 +1554,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "strsim 0.10.0",
  "syn 1.0.109",
 ]
@@ -1523,7 +1567,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
  "darling_core",
- "quote 1.0.35",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -1534,7 +1578,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if 1.0.0",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
  "parking_lot_core",
@@ -1562,9 +1606,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1587,8 +1631,8 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -1607,12 +1651,25 @@ version = "1.0.0-beta.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
  "unicode-xid 0.2.4",
 ]
 
+[[package]]
+name = "dialoguer"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de"
+dependencies = [
+ "console",
+ "shell-words",
+ "tempfile",
+ "thiserror",
+ "zeroize",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -1664,7 +1721,7 @@ version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der 0.7.8",
+ "der 0.7.9",
  "digest 0.10.7",
  "elliptic-curve 0.13.8",
  "rfc6979 0.4.0",
@@ -1684,9 +1741,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-dalek"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
@@ -1699,9 +1756,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 dependencies = [
  "serde",
 ]
@@ -1755,11 +1812,17 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1789,18 +1852,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d"
+checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1826,9 +1880,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1904,32 +1958,11 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
-[[package]]
-name = "event-listener"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
-dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
 [[package]]
 name = "fastrand"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "ff"
@@ -1970,20 +2003,20 @@ version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b96fbccd88dbb1fac4ee4a07c2fcc4ca719a74ffbd9d2b9d41d8c8eb073d8b20"
 dependencies = [
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-integer",
  "num-traits",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "serde",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.6"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "findshlibs"
@@ -1997,12 +2030,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "finl_unicode"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
-
 [[package]]
 name = "firestorm"
 version = "0.5.1"
@@ -2029,9 +2056,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2095,7 +2122,7 @@ dependencies = [
  "indexmap 1.9.3",
  "itertools 0.10.5",
  "lazy_static",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-derive 0.2.5",
  "num-integer",
  "num-traits",
@@ -2127,7 +2154,7 @@ dependencies = [
  "indexmap 1.9.3",
  "itertools 0.10.5",
  "lazy_static",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-derive 0.2.5",
  "num-integer",
  "num-traits",
@@ -2218,15 +2245,26 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
+[[package]]
+name = "futures-locks"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06"
+dependencies = [
+ "futures-channel",
+ "futures-task",
+ "tokio",
+]
+
 [[package]]
 name = "futures-macro"
 version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -2283,20 +2321,22 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if 1.0.0",
+ "js-sys",
  "libc",
  "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "glob"
@@ -2314,7 +2354,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "gloo-utils",
- "http",
+ "http 0.2.12",
  "js-sys",
  "pin-project",
  "serde",
@@ -2352,9 +2392,9 @@ dependencies = [
 
 [[package]]
 name = "google-cloud-auth"
-version = "0.13.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af1087f1fbd2dd3f58c17c7574ddd99cd61cbbbc2c4dc81114b8687209b196cb"
+checksum = "1112c453c2e155b3e683204ffff52bcc6d6495d04b68d9e90cd24161270c5058"
 dependencies = [
  "async-trait",
  "base64 0.21.7",
@@ -2362,7 +2402,7 @@ dependencies = [
  "google-cloud-token",
  "home",
  "jsonwebtoken",
- "reqwest",
+ "reqwest 0.12.5",
  "serde",
  "serde_json",
  "thiserror",
@@ -2374,21 +2414,22 @@ dependencies = [
 
 [[package]]
 name = "google-cloud-metadata"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc279bfb50487d7bcd900e8688406475fc750fe474a835b2ab9ade9eb1fc90e2"
+checksum = "04f945a208886a13d07636f38fb978da371d0abc3e34bad338124b9f8c135a8f"
 dependencies = [
- "reqwest",
+ "reqwest 0.12.5",
  "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "google-cloud-storage"
-version = "0.15.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac04b29849ebdeb9fb008988cc1c4d1f0c9d121b4c7f1ddeb8061df124580e93"
+checksum = "cc0c5b7469142d91bd77959e69375bede324a5def07c7f29aa0d582586cba305"
 dependencies = [
+ "anyhow",
  "async-stream",
  "async-trait",
  "base64 0.21.7",
@@ -2402,8 +2443,9 @@ dependencies = [
  "percent-encoding",
  "pkcs8 0.10.2",
  "regex",
- "reqwest",
- "ring 0.17.7",
+ "reqwest 0.12.5",
+ "reqwest-middleware",
+ "ring",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -2423,6 +2465,35 @@ dependencies = [
  "async-trait",
 ]
 
+[[package]]
+name = "gpu-ffi"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/era-heavy-ops-service.git?rev=3d33e06#3d33e069d9d263f3a9626d235ac6dc6c49179965"
+dependencies = [
+ "bindgen 0.59.2",
+ "crossbeam 0.8.4",
+ "derivative",
+ "futures 0.3.30",
+ "futures-locks",
+ "num_cpus",
+]
+
+[[package]]
+name = "gpu-prover"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/era-heavy-ops-service.git?rev=3d33e06#3d33e069d9d263f3a9626d235ac6dc6c49179965"
+dependencies = [
+ "bit-vec",
+ "cfg-if 1.0.0",
+ "crossbeam 0.8.4",
+ "franklin-crypto 0.0.5 (git+https://github.com/matter-labs/franklin-crypto?branch=snark_wrapper)",
+ "gpu-ffi",
+ "itertools 0.13.0",
+ "num_cpus",
+ "rand 0.4.6",
+ "serde",
+]
+
 [[package]]
 name = "group"
 version = "0.12.1"
@@ -2447,17 +2518,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
- "indexmap 2.2.3",
+ "http 0.2.12",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
@@ -2465,30 +2536,40 @@ dependencies = [
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.12.3"
+name = "h2"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
 dependencies = [
- "ahash 0.7.8",
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
+ "indexmap 2.2.6",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.13.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.7.8",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
  "allocator-api2",
 ]
 
@@ -2498,7 +2579,7 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -2536,9 +2617,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.6"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -2573,29 +2654,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "hoot"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df22a4d90f1b0e65fe3e0d6ee6a4608cc4d81f4b2eb3e670f44bb6bde711e452"
-dependencies = [
- "httparse",
- "log",
-]
-
-[[package]]
-name = "hootbin"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "354e60868e49ea1a39c44b9562ad207c4259dc6eabf9863bf3b0f058c55cfdb2"
-dependencies = [
- "fastrand",
- "hoot",
- "serde",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "hostname"
 version = "0.3.1"
@@ -2609,9 +2667,20 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -2625,17 +2694,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http",
+ "http 0.2.12",
  "pin-project-lite",
 ]
 
 [[package]]
-name = "httparse"
-version = "1.8.0"
+name = "http-body"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.1.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
 name = "httpdate"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2649,17 +2741,17 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
@@ -2671,20 +2763,42 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
 [[package]]
 name = "hyper-rustls"
-version = "0.24.2"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155"
 dependencies = [
  "futures-util",
- "http",
- "hyper",
+ "http 1.1.0",
+ "hyper 1.3.1",
+ "hyper-util",
  "log",
- "rustls 0.21.12",
- "rustls-native-certs 0.6.3",
+ "rustls",
+ "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.24.1",
+ "tokio-rustls",
+ "tower-service",
 ]
 
 [[package]]
@@ -2693,7 +2807,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper",
+ "hyper 0.14.29",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -2706,10 +2820,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper",
+ "hyper 0.14.29",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-util",
  "native-tls",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "hyper 1.3.1",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -2784,8 +2934,8 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -2801,12 +2951,24 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.3"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
+dependencies = [
+ "console",
+ "lazy_static",
+ "number_prefix",
+ "regex",
 ]
 
 [[package]]
@@ -2824,6 +2986,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -2835,27 +3003,27 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jemalloc-sys"
@@ -2877,29 +3045,49 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "jni"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+dependencies = [
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "jsonrpsee"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9579d0ca9fb30da026bac2f0f7d9576ec93489aeb7cd4971dd5b4617d82c79b2"
+checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -2913,41 +3101,44 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9f9ed46590a8d5681975f126e22531698211b926129a40a2db47cbca429220"
+checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432"
 dependencies = [
+ "base64 0.22.1",
  "futures-channel",
  "futures-util",
  "gloo-net",
- "http",
+ "http 1.1.0",
  "jsonrpsee-core",
  "pin-project",
- "rustls-native-certs 0.7.0",
+ "rustls",
  "rustls-pki-types",
+ "rustls-platform-verifier",
  "soketto",
  "thiserror",
  "tokio",
- "tokio-rustls 0.25.0",
+ "tokio-rustls",
  "tokio-util",
  "tracing",
  "url",
- "webpki-roots",
 ]
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "776d009e2f591b78c038e0d053a796f94575d66ca4e77dd84bfc5e81419e436c"
+checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b"
 dependencies = [
  "anyhow",
- "async-lock",
  "async-trait",
  "beef",
+ "bytes",
  "futures-timer",
  "futures-util",
- "hyper",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
  "jsonrpsee-types",
  "pin-project",
  "rustc-hash",
@@ -2962,15 +3153,20 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572"
+checksum = "2d90064e04fb9d7282b1c71044ea94d0bbc6eff5621c66f1a0bce9e9de7cf3ac"
 dependencies = [
  "async-trait",
- "hyper",
+ "base64 0.22.1",
+ "http-body 1.0.0",
+ "hyper 1.3.1",
  "hyper-rustls",
+ "hyper-util",
  "jsonrpsee-core",
  "jsonrpsee-types",
+ "rustls",
+ "rustls-platform-verifier",
  "serde",
  "serde_json",
  "thiserror",
@@ -2982,25 +3178,25 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d94b7505034e2737e688e1153bf81e6f93ad296695c43958d6da2e4321f0a990"
+checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4"
 dependencies = [
- "heck 0.4.1",
- "proc-macro-crate 2.0.0",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.109",
+ "heck 0.5.0",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3266dfb045c9174b24c77c2dfe0084914bb23a6b2597d70c9dc6018392e1cd1b"
+checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af"
 dependencies = [
- "anyhow",
  "beef",
+ "http 1.1.0",
  "serde",
  "serde_json",
  "thiserror",
@@ -3008,9 +3204,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-wasm-client"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30f36d27503d0efc0355c1630b74ecfb367050847bf7241a0ed75fab6dfa96c0"
+checksum = "4727ac037f834c6f04c0912cada7532dbddb54e92fbc64e33d6cb8c24af313c9"
 dependencies = [
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
@@ -3019,11 +3215,11 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.21.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "073c077471e89c4b511fa88b3df9a0f0abdf4a0a2e6683dd2ab36893af87bb2d"
+checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e"
 dependencies = [
- "http",
+ "http 1.1.0",
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -3032,13 +3228,14 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "8.3.0"
+version = "9.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
+checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
 dependencies = [
  "base64 0.21.7",
+ "js-sys",
  "pem",
- "ring 0.16.20",
+ "ring",
  "serde",
  "serde_json",
  "simple_asn1",
@@ -3082,13 +3279,16 @@ dependencies = [
 [[package]]
 name = "kzg"
 version = "0.1.50"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#ecb08797ced36fcc7d3696ffd2ec6a2d534b9395"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#5d6a06c37f4656d26a4170d22f2298cd7716c070"
 dependencies = [
  "boojum",
  "derivative",
+ "hex",
+ "once_cell",
  "rayon",
  "serde",
  "serde_json",
+ "serde_with",
  "zkevm_circuits 1.5.0",
 ]
 
@@ -3107,20 +3307,26 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
+[[package]]
+name = "leb128"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
+
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libloading"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
 dependencies = [
  "cfg-if 1.0.0",
- "windows-sys 0.48.0",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -3158,9 +3364,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.15"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
+checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
 dependencies = [
  "cc",
  "libc",
@@ -3170,29 +3376,29 @@ dependencies = [
 
 [[package]]
 name = "linkme"
-version = "0.3.22"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b53ad6a33de58864705954edb5ad5d571a010f9e296865ed43dc72a5621b430"
+checksum = "ccb76662d78edc9f9bf56360d6919bdacc8b7761227727e5082f128eeb90bbf5"
 dependencies = [
  "linkme-impl",
 ]
 
 [[package]]
 name = "linkme-impl"
-version = "0.3.22"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e542a18c94a9b6fcc7adb090fa3ba6b79ee220a16404f325672729f32a66ff"
+checksum = "f8dccda732e04fa3baf2e17cf835bfe2601c7c2edafd64417c627dabae3a8cda"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "local-ip-address"
@@ -3208,9 +3414,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -3218,9 +3424,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "logos"
@@ -3239,10 +3445,10 @@ checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68"
 dependencies = [
  "beef",
  "fnv",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "regex-syntax 0.6.29",
- "syn 2.0.48",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3264,15 +3470,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "mach2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -3318,9 +3515,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "memoffset"
@@ -3331,61 +3528,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "metrics"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5"
-dependencies = [
- "ahash 0.8.8",
- "metrics-macros",
- "portable-atomic",
-]
-
-[[package]]
-name = "metrics-exporter-prometheus"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950"
-dependencies = [
- "base64 0.21.7",
- "hyper",
- "indexmap 1.9.3",
- "ipnet",
- "metrics",
- "metrics-util",
- "quanta",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "metrics-macros"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "metrics-util"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e"
-dependencies = [
- "crossbeam-epoch 0.9.18",
- "crossbeam-utils 0.8.19",
- "hashbrown 0.13.1",
- "metrics",
- "num_cpus",
- "quanta",
- "sketches-ddsketch",
-]
-
 [[package]]
 name = "miette"
 version = "5.10.0"
@@ -3404,9 +3546,9 @@ version = "5.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3431,8 +3573,8 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803"
 dependencies = [
- "crossbeam-channel 0.5.11",
- "crossbeam-utils 0.8.19",
+ "crossbeam-channel 0.5.13",
+ "crossbeam-utils 0.8.20",
  "dashmap",
  "skeptic",
  "smallvec",
@@ -3448,18 +3590,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi",
@@ -3468,45 +3610,16 @@ dependencies = [
 
 [[package]]
 name = "multimap"
-version = "0.8.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-
-[[package]]
-name = "multivm"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "circuit_sequencer_api 0.1.0",
- "circuit_sequencer_api 0.1.40",
- "circuit_sequencer_api 0.1.41",
- "circuit_sequencer_api 0.1.42",
- "circuit_sequencer_api 0.1.50",
- "hex",
- "itertools 0.10.5",
- "once_cell",
- "thiserror",
- "tracing",
- "vise",
- "zk_evm 1.3.1",
- "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)",
- "zk_evm 1.4.0",
- "zk_evm 1.4.1",
- "zk_evm 1.5.0",
- "zksync_contracts",
- "zksync_state",
- "zksync_system_constants",
- "zksync_types",
- "zksync_utils",
-]
+checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -3537,20 +3650,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c168194d373b1e134786274020dae7fc5513d565ea2ebb9bc9ff17ffb69106d4"
 dependencies = [
  "either",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "serde",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "nix"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cfg-if 1.0.0",
+ "cfg_aliases",
  "libc",
 ]
 
@@ -3582,11 +3696,11 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-complex",
  "num-integer",
  "num-iter",
@@ -3607,11 +3721,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
  "serde",
@@ -3636,9 +3749,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
  "serde",
@@ -3667,8 +3780,8 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -3683,9 +3796,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -3704,12 +3817,11 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-integer",
  "num-traits",
  "serde",
@@ -3717,9 +3829,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
@@ -3731,7 +3843,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.6",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
@@ -3760,9 +3872,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
  "proc-macro-crate 1.3.1",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3771,17 +3883,23 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 3.1.0",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro-crate 1.3.1",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
 dependencies = [
  "memchr",
 ]
@@ -3794,17 +3912,17 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "openssl"
-version = "0.10.63"
+version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
@@ -3819,9 +3937,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3832,9 +3950,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.99"
+version = "0.9.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
 dependencies = [
  "cc",
  "libc",
@@ -3860,9 +3978,9 @@ checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b"
 dependencies = [
  "async-trait",
  "bytes",
- "http",
+ "http 0.2.12",
  "opentelemetry_api",
- "reqwest",
+ "reqwest 0.11.27",
 ]
 
 [[package]]
@@ -3873,14 +3991,14 @@ checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275"
 dependencies = [
  "async-trait",
  "futures-core",
- "http",
+ "http 0.2.12",
  "opentelemetry-http",
  "opentelemetry-proto",
  "opentelemetry-semantic-conventions",
  "opentelemetry_api",
  "opentelemetry_sdk",
  "prost 0.11.9",
- "reqwest",
+ "reqwest 0.11.27",
  "thiserror",
  "tokio",
  "tonic",
@@ -3930,7 +4048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026"
 dependencies = [
  "async-trait",
- "crossbeam-channel 0.5.11",
+ "crossbeam-channel 0.5.13",
  "futures-channel",
  "futures-executor",
  "futures-util",
@@ -3966,13 +4084,13 @@ dependencies = [
 
 [[package]]
 name = "os_info"
-version = "3.7.0"
+version = "3.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
+checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
 dependencies = [
  "log",
  "serde",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3993,16 +4111,6 @@ dependencies = [
  "sha2 0.10.8",
 ]
 
-[[package]]
-name = "packed_simd"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d"
-dependencies = [
- "cfg-if 1.0.0",
- "num-traits",
-]
-
 [[package]]
 name = "pairing_ce"
 version = "0.28.5"
@@ -4042,9 +4150,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.6.9"
+version = "3.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe"
+checksum = "a1b5927e4a9ae8d6cdb6a69e4e04a0ec73381a358e21b8a576f44769f34e7c24"
 dependencies = [
  "arrayvec 0.7.4",
  "bitvec",
@@ -4061,22 +4169,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
 dependencies = [
  "proc-macro-crate 2.0.0",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -4084,22 +4186,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.1",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "peeking_take_while"
@@ -4109,11 +4211,12 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pem"
-version = "1.1.1"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+checksum = "8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
+ "serde",
 ]
 
 [[package]]
@@ -4133,39 +4236,39 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.3",
+ "indexmap 2.2.6",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -4179,7 +4282,7 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
 dependencies = [
- "der 0.7.8",
+ "der 0.7.9",
  "pkcs8 0.10.2",
  "spki 0.7.3",
 ]
@@ -4200,7 +4303,7 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der 0.7.8",
+ "der 0.7.9",
  "spki 0.7.3",
 ]
 
@@ -4210,18 +4313,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
-[[package]]
-name = "platforms"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
-
-[[package]]
-name = "portable-atomic"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -4236,12 +4327,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.16"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
+checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
- "proc-macro2 1.0.78",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4282,7 +4373,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
 dependencies = [
- "toml_edit 0.20.7",
+ "toml_edit 0.20.2",
 ]
 
 [[package]]
@@ -4301,8 +4392,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
  "version_check",
 ]
@@ -4313,8 +4404,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "version_check",
 ]
 
@@ -4335,9 +4426,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
 dependencies = [
  "unicode-ident",
 ]
@@ -4360,21 +4451,9 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "prometheus_exporter"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "metrics",
- "metrics-exporter-prometheus",
- "tokio",
- "vise",
- "vise-exporter",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4385,13 +4464,13 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "lazy_static",
  "num-traits",
  "rand 0.8.5",
  "rand_chacha",
  "rand_xorshift",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -4409,34 +4488,33 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
 dependencies = [
  "bytes",
- "prost-derive 0.12.3",
+ "prost-derive 0.12.6",
 ]
 
 [[package]]
 name = "prost-build"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
+checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
  "bytes",
- "heck 0.4.1",
- "itertools 0.11.0",
+ "heck 0.5.0",
+ "itertools 0.12.1",
  "log",
  "multimap",
  "once_cell",
  "petgraph",
  "prettyplease",
- "prost 0.12.3",
+ "prost 0.12.6",
  "prost-types",
  "regex",
- "syn 2.0.48",
+ "syn 2.0.66",
  "tempfile",
- "which",
 ]
 
 [[package]]
@@ -4447,22 +4525,22 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
  "itertools 0.10.5",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.11.0",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "itertools 0.12.1",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4475,7 +4553,7 @@ dependencies = [
  "logos",
  "miette",
  "once_cell",
- "prost 0.12.3",
+ "prost 0.12.6",
  "prost-types",
  "serde",
  "serde-value",
@@ -4483,11 +4561,11 @@ dependencies = [
 
 [[package]]
 name = "prost-types"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
 dependencies = [
- "prost 0.12.3",
+ "prost 0.12.6",
 ]
 
 [[package]]
@@ -4498,7 +4576,7 @@ checksum = "00bb76c5f6221de491fe2c8f39b106330bbd9762c6511119c07940e10eb9ff11"
 dependencies = [
  "bytes",
  "miette",
- "prost 0.12.3",
+ "prost 0.12.6",
  "prost-reflect",
  "prost-types",
  "protox-parse",
@@ -4523,15 +4601,19 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bincode",
- "clap 4.4.6",
+ "chrono",
+ "circuit_definitions 1.5.0",
+ "clap 4.5.4",
  "colored",
+ "dialoguer",
  "hex",
- "prover_dal",
+ "serde_json",
  "sqlx",
  "strum",
  "tokio",
  "tracing",
  "tracing-subscriber",
+ "zkevm_test_harness 1.5.0",
  "zksync_basic_types",
  "zksync_config",
  "zksync_contracts",
@@ -4539,19 +4621,18 @@ dependencies = [
  "zksync_db_connection",
  "zksync_env_config",
  "zksync_eth_client",
+ "zksync_prover_dal",
  "zksync_prover_fri_types",
  "zksync_prover_interface",
  "zksync_types",
+ "zksync_utils",
 ]
 
 [[package]]
-name = "prover_dal"
+name = "prover_version"
 version = "0.1.0"
 dependencies = [
- "sqlx",
- "strum",
- "zksync_basic_types",
- "zksync_db_connection",
+ "zksync_prover_fri_types",
 ]
 
 [[package]]
@@ -4569,8 +4650,8 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -4580,27 +4661,11 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "memchr",
  "unicase",
 ]
 
-[[package]]
-name = "quanta"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
-dependencies = [
- "crossbeam-utils 0.8.19",
- "libc",
- "mach2",
- "once_cell",
- "raw-cpuid",
- "wasi",
- "web-sys",
- "winapi",
-]
-
 [[package]]
 name = "queues"
 version = "1.1.0"
@@ -4633,11 +4698,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
- "proc-macro2 1.0.78",
+ "proc-macro2 1.0.85",
 ]
 
 [[package]]
@@ -4713,20 +4778,11 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "raw-cpuid"
-version = "10.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "rayon"
-version = "1.8.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -4739,7 +4795,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque 0.8.5",
- "crossbeam-utils 0.8.19",
+ "crossbeam-utils 0.8.20",
 ]
 
 [[package]]
@@ -4760,16 +4816,25 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.5",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -4783,13 +4848,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -4800,9 +4865,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "rend"
@@ -4815,25 +4880,24 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.11.24"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.29",
+ "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "mime_guess",
  "native-tls",
  "once_cell",
  "percent-encoding",
@@ -4842,7 +4906,52 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 0.1.2",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg 0.50.0",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-rustls",
+ "hyper-tls 0.6.0",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "mime_guess",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile 2.1.2",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.1",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
@@ -4853,7 +4962,22 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "winreg",
+ "winreg 0.52.0",
+]
+
+[[package]]
+name = "reqwest-middleware"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "http 1.1.0",
+ "reqwest 0.12.5",
+ "serde",
+ "thiserror",
+ "tower-service",
 ]
 
 [[package]]
@@ -4923,31 +5047,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin 0.5.2",
- "untrusted 0.7.1",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if 1.0.0",
  "getrandom",
  "libc",
  "spin 0.9.8",
- "untrusted 0.9.0",
- "windows-sys 0.48.0",
+ "untrusted",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4974,8 +5084,8 @@ version = "0.7.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -5021,9 +5131,9 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.34.3"
+version = "1.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df"
+checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
 dependencies = [
  "arrayvec 0.7.4",
  "borsh",
@@ -5037,9 +5147,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -5064,11 +5174,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.31"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -5077,42 +5187,19 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
-dependencies = [
- "log",
- "ring 0.17.7",
- "rustls-webpki 0.101.7",
- "sct",
-]
-
-[[package]]
-name = "rustls"
-version = "0.22.4"
+version = "0.23.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402"
 dependencies = [
  "log",
- "ring 0.17.7",
+ "once_cell",
+ "ring",
  "rustls-pki-types",
- "rustls-webpki 0.102.3",
+ "rustls-webpki",
  "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 1.0.4",
- "schannel",
- "security-framework",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.7.0"
@@ -5152,31 +5239,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
 
 [[package]]
-name = "rustls-webpki"
-version = "0.101.7"
+name = "rustls-platform-verifier"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+checksum = "3e3beb939bcd33c269f4bf946cc829fcd336370267c4a927ac0399c84a3151a1"
 dependencies = [
- "ring 0.17.7",
- "untrusted 0.9.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-roots",
+ "winapi",
 ]
 
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84e217e7fdc8466b5b35d30f8c0a30febd29173df4a3a0c2115d306b9c4117ad"
+
 [[package]]
 name = "rustls-webpki"
-version = "0.102.3"
+version = "0.102.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf"
+checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
 dependencies = [
- "ring 0.17.7",
+ "ring",
  "rustls-pki-types",
- "untrusted 0.9.0",
+ "untrusted",
 ]
 
 [[package]]
 name = "rustversion"
-version = "1.0.14"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "rusty-fork"
@@ -5192,9 +5296,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -5220,16 +5324,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "sct"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
-dependencies = [
- "ring 0.17.7",
- "untrusted 0.9.0",
-]
-
 [[package]]
 name = "seahash"
 version = "4.1.0"
@@ -5257,7 +5351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct 0.2.0",
- "der 0.7.8",
+ "der 0.7.9",
  "generic-array",
  "pkcs8 0.10.2",
  "subtle",
@@ -5282,24 +5376,34 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secrecy"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
+ "num-bigint 0.4.5",
  "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5307,9 +5411,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 dependencies = [
  "serde",
 ]
@@ -5328,7 +5432,7 @@ checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
 dependencies = [
  "httpdate",
  "native-tls",
- "reqwest",
+ "reqwest 0.11.27",
  "sentry-backtrace",
  "sentry-contexts",
  "sentry-core",
@@ -5436,9 +5540,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
@@ -5455,20 +5559,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
  "ryu",
@@ -5494,6 +5598,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
 dependencies = [
  "base64 0.13.1",
+ "hex",
  "serde",
  "serde_with_macros",
 ]
@@ -5505,8 +5610,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
 dependencies = [
  "darling",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -5516,26 +5621,13 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.2.3",
+ "indexmap 2.2.6",
  "itoa",
  "ryu",
  "serde",
  "unsafe-libyaml",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -5621,6 +5713,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
 [[package]]
 name = "shivini"
 version = "0.2.0"
@@ -5630,7 +5728,7 @@ dependencies = [
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "boojum",
  "boojum-cuda",
- "circuit_definitions",
+ "circuit_definitions 1.5.0",
  "cudart",
  "cudart-sys",
  "derivative",
@@ -5649,9 +5747,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -5688,7 +5786,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
 dependencies = [
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-traits",
  "thiserror",
  "time",
@@ -5709,12 +5807,6 @@ dependencies = [
  "walkdir",
 ]
 
-[[package]]
-name = "sketches-ddsketch"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
-
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -5726,9 +5818,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 dependencies = [
  "serde",
 ]
@@ -5745,27 +5837,27 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "soketto"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
+checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
  "bytes",
  "futures 0.3.30",
  "httparse",
  "log",
  "rand 0.8.5",
- "sha-1",
+ "sha1",
 ]
 
 [[package]]
@@ -5800,7 +5892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
- "der 0.7.8",
+ "der 0.7.9",
 ]
 
 [[package]]
@@ -5822,9 +5914,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf"
+checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa"
 dependencies = [
  "sqlx-core",
  "sqlx-macros",
@@ -5835,11 +5927,11 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd"
+checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6"
 dependencies = [
- "ahash 0.8.8",
+ "ahash 0.8.11",
  "atoi",
  "bigdecimal",
  "byteorder",
@@ -5847,9 +5939,8 @@ dependencies = [
  "chrono",
  "crc",
  "crossbeam-queue 0.3.11",
- "dotenvy",
  "either",
- "event-listener 2.5.3",
+ "event-listener",
  "futures-channel",
  "futures-core",
  "futures-intrusive",
@@ -5857,7 +5948,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.2.3",
+ "indexmap 2.2.6",
  "ipnetwork",
  "log",
  "memchr",
@@ -5880,12 +5971,12 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5"
+checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "sqlx-core",
  "sqlx-macros-core",
  "syn 1.0.109",
@@ -5893,18 +5984,17 @@ dependencies = [
 
 [[package]]
 name = "sqlx-macros-core"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841"
+checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8"
 dependencies = [
- "atomic-write-file",
  "dotenvy",
  "either",
  "heck 0.4.1",
  "hex",
  "once_cell",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -5920,14 +6010,14 @@ dependencies = [
 
 [[package]]
 name = "sqlx-mysql"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4"
+checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418"
 dependencies = [
  "atoi",
  "base64 0.21.7",
  "bigdecimal",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "byteorder",
  "bytes",
  "chrono",
@@ -5965,14 +6055,14 @@ dependencies = [
 
 [[package]]
 name = "sqlx-postgres"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24"
+checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e"
 dependencies = [
  "atoi",
  "base64 0.21.7",
  "bigdecimal",
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "byteorder",
  "chrono",
  "crc",
@@ -5991,13 +6081,12 @@ dependencies = [
  "log",
  "md-5",
  "memchr",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "once_cell",
  "rand 0.8.5",
  "rust_decimal",
  "serde",
  "serde_json",
- "sha1",
  "sha2 0.10.8",
  "smallvec",
  "sqlx-core",
@@ -6009,9 +6098,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-sqlite"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490"
+checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa"
 dependencies = [
  "atoi",
  "chrono",
@@ -6045,13 +6134,13 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "stringprep"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
 dependencies = [
- "finl_unicode",
  "unicode-bidi",
  "unicode-normalization",
+ "unicode-properties",
 ]
 
 [[package]]
@@ -6066,6 +6155,12 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "structopt"
 version = "0.3.26"
@@ -6085,8 +6180,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
 dependencies = [
  "heck 0.3.3",
  "proc-macro-error",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -6106,8 +6201,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "rustversion",
  "syn 1.0.109",
 ]
@@ -6135,19 +6230,19 @@ version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
  "unicode-ident",
 ]
 
@@ -6158,9 +6253,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
 dependencies = [
  "proc-macro-error",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6174,7 +6269,7 @@ dependencies = [
  "franklin-crypto 0.0.5 (git+https://github.com/matter-labs/franklin-crypto?branch=dev)",
  "hex",
  "itertools 0.10.5",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-derive 0.3.3",
  "num-integer",
  "num-traits",
@@ -6192,6 +6287,12 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -6227,9 +6328,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.10.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if 1.0.0",
  "fastrand",
@@ -6248,23 +6349,24 @@ dependencies = [
 
 [[package]]
 name = "test-log"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6159ab4116165c99fc88cce31f99fa2c9dbe08d3691cb38da02fc3b45f357d2b"
+checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
 dependencies = [
- "env_logger 0.10.2",
+ "env_logger 0.11.3",
  "test-log-macros",
+ "tracing-subscriber",
 ]
 
 [[package]]
 name = "test-log-macros"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba277e77219e9eea169e8508942db1bf5d8a41ff2db9b20aab5a5aadc9fa25d"
+checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6278,29 +6380,29 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if 1.0.0",
  "once_cell",
@@ -6317,9 +6419,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.34"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
@@ -6338,9 +6440,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
  "num-conv",
  "time-core",
@@ -6381,9 +6483,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -6410,13 +6512,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6431,30 +6533,20 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.12",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.22.4",
+ "rustls",
  "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -6463,9 +6555,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6473,14 +6565,13 @@ dependencies = [
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 
 [[package]]
 name = "toml_edit"
@@ -6499,18 +6590,18 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.3",
+ "indexmap 2.2.6",
  "toml_datetime",
  "winnow",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.20.7"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.2.3",
+ "indexmap 2.2.6",
  "toml_datetime",
  "winnow",
 ]
@@ -6521,7 +6612,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.2.3",
+ "indexmap 2.2.6",
  "toml_datetime",
  "winnow",
 ]
@@ -6538,10 +6629,10 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.29",
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
@@ -6604,9 +6695,9 @@ version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6691,9 +6782,9 @@ dependencies = [
 
 [[package]]
 name = "triomphe"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3"
+checksum = "1b2cb4fbb9995eeb36ac86fadf24031ccd58f99d6b4b2d7b911db70bddb80d90"
 
 [[package]]
 name = "try-lock"
@@ -6763,13 +6854,19 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
+[[package]]
+name = "unicode-properties"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"
@@ -6778,9 +6875,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
@@ -6806,7 +6903,7 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ad948c1cb799b1a70f836077721a92a35ac177d4daddf4c20a633786d4cf618"
 dependencies = [
- "quote 1.0.35",
+ "quote 1.0.36",
  "syn 1.0.109",
 ]
 
@@ -6816,12 +6913,6 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -6830,12 +6921,11 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.9.5"
+version = "2.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b52731d03d6bb2fd18289d4028aee361d6c28d44977846793b994b13cdcc64d"
+checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd"
 dependencies = [
- "base64 0.21.7",
- "hootbin",
+ "base64 0.22.1",
  "log",
  "native-tls",
  "once_cell",
@@ -6868,9 +6958,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
  "serde",
 ]
@@ -6917,8 +7007,7 @@ name = "vise-exporter"
 version = "0.1.0"
 source = "git+https://github.com/matter-labs/vise.git?rev=a5bb80c9ce7168663114ee30e794d6dc32159ee4#a5bb80c9ce7168663114ee30e794d6dc32159ee4"
 dependencies = [
- "hyper",
- "metrics-exporter-prometheus",
+ "hyper 0.14.29",
  "once_cell",
  "tokio",
  "tracing",
@@ -6930,9 +7019,9 @@ name = "vise-macros"
 version = "0.1.0"
 source = "git+https://github.com/matter-labs/vise.git?rev=a5bb80c9ce7168663114ee30e794d6dc32159ee4#a5bb80c9ce7168663114ee30e794d6dc32159ee4"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6941,9 +7030,10 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bincode",
- "circuit_definitions",
- "clap 4.4.6",
+ "circuit_definitions 1.5.0",
+ "clap 4.5.4",
  "hex",
+ "indicatif",
  "itertools 0.10.5",
  "md5",
  "once_cell",
@@ -6957,27 +7047,13 @@ dependencies = [
  "toml_edit 0.14.4",
  "tracing",
  "tracing-subscriber",
- "vlog",
  "zkevm_test_harness 1.5.0",
  "zksync_config",
  "zksync_env_config",
  "zksync_prover_fri_types",
  "zksync_types",
-]
-
-[[package]]
-name = "vlog"
-version = "0.1.0"
-dependencies = [
- "chrono",
- "opentelemetry",
- "opentelemetry-otlp",
- "opentelemetry-semantic-conventions",
- "sentry",
- "serde_json",
- "tracing",
- "tracing-opentelemetry",
- "tracing-subscriber",
+ "zksync_utils",
+ "zksync_vlog",
 ]
 
 [[package]]
@@ -6991,9 +7067,9 @@ dependencies = [
 
 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -7014,11 +7090,17 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -7026,24 +7108,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -7053,32 +7135,32 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
- "quote 1.0.35",
+ "quote 1.0.36",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-streams"
@@ -7095,9 +7177,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -7105,9 +7187,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009"
+checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -7126,9 +7208,13 @@ dependencies = [
 
 [[package]]
 name = "whoami"
-version = "1.4.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
+checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
+dependencies = [
+ "redox_syscall 0.4.1",
+ "wasite",
+]
 
 [[package]]
 name = "winapi"
@@ -7148,11 +7234,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7167,7 +7253,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -7185,7 +7271,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -7205,17 +7291,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
@@ -7226,9 +7313,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -7238,9 +7325,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -7250,9 +7337,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -7262,9 +7355,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -7274,9 +7367,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -7286,9 +7379,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -7298,9 +7391,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
@@ -7321,6 +7414,26 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if 1.0.0",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wrapper-prover"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/era-heavy-ops-service.git?rev=3d33e06#3d33e069d9d263f3a9626d235ac6dc6c49179965"
+dependencies = [
+ "circuit_definitions 0.1.0",
+ "gpu-prover",
+ "zkevm_test_harness 1.4.0",
+]
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -7332,29 +7445,29 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
@@ -7365,9 +7478,9 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.85",
+ "quote 1.0.36",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -7450,7 +7563,7 @@ dependencies = [
 [[package]]
 name = "zk_evm"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.5.0#0448e26ffd8e2f1935ff8cd3303fe5a504cd5d7b"
+source = "git+https://github.com/matter-labs/era-zk_evm.git?branch=v1.5.0#0c5cdca00cca4fa0a8c49147a11048c24f8a4b12"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -7507,7 +7620,7 @@ dependencies = [
  "lazy_static",
  "log",
  "nom",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-traits",
  "sha3 0.10.8",
  "smallvec",
@@ -7519,14 +7632,14 @@ dependencies = [
 [[package]]
 name = "zkevm-assembly"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?branch=v1.5.0#2faea98303377cad71f4c7d8dacb9c6546874602"
+source = "git+https://github.com/matter-labs/era-zkEVM-assembly.git?branch=v1.5.0#48303aa435810adb12e277494e5dae3764313330"
 dependencies = [
  "env_logger 0.9.3",
  "hex",
  "lazy_static",
  "log",
  "nom",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-traits",
  "sha3 0.10.8",
  "smallvec",
@@ -7535,6 +7648,27 @@ dependencies = [
  "zkevm_opcode_defs 1.5.0",
 ]
 
+[[package]]
+name = "zkevm_circuits"
+version = "1.4.0"
+source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=main#fb3e2574b5c890342518fc930c145443f039a105"
+dependencies = [
+ "arrayvec 0.7.4",
+ "bincode",
+ "boojum",
+ "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum.git?branch=main)",
+ "derivative",
+ "hex",
+ "itertools 0.10.5",
+ "rand 0.4.6",
+ "rand 0.8.5",
+ "seq-macro",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "zkevm_opcode_defs 1.3.2",
+]
+
 [[package]]
 name = "zkevm_circuits"
 version = "1.4.0"
@@ -7543,7 +7677,7 @@ dependencies = [
  "arrayvec 0.7.4",
  "bincode",
  "boojum",
- "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum?branch=main)",
+ "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum.git?branch=main)",
  "derivative",
  "hex",
  "itertools 0.10.5",
@@ -7564,7 +7698,7 @@ dependencies = [
  "arrayvec 0.7.4",
  "bincode",
  "boojum",
- "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum?branch=main)",
+ "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum.git?branch=main)",
  "derivative",
  "hex",
  "itertools 0.10.5",
@@ -7580,11 +7714,11 @@ dependencies = [
 [[package]]
 name = "zkevm_circuits"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=v1.5.0#861f81029bf3a916dae55afa5bd7f82b2eaca98b"
+source = "git+https://github.com/matter-labs/era-zkevm_circuits.git?branch=v1.5.0#b7a86c739e8a8f88e788e90893c6e7496f6d7dfc"
 dependencies = [
  "arrayvec 0.7.4",
  "boojum",
- "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum?branch=main)",
+ "cs_derive 0.1.0 (git+https://github.com/matter-labs/era-boojum.git?branch=main)",
  "derivative",
  "hex",
  "itertools 0.10.5",
@@ -7612,7 +7746,7 @@ name = "zkevm_opcode_defs"
 version = "1.3.2"
 source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.2#dffacadeccdfdbff4bc124d44c595c4a6eae5013"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "blake2 0.10.6 (git+https://github.com/RustCrypto/hashes.git?rev=1f727ce37ff40fa0cce84eb8543a45bdd3ca4a4e)",
  "ethereum-types",
  "k256 0.11.6",
@@ -7626,7 +7760,7 @@ name = "zkevm_opcode_defs"
 version = "1.4.1"
 source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.4.1#ba8228ff0582d21f64d6a319d50d0aec48e9e7b6"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethereum-types",
  "k256 0.13.3",
@@ -7638,9 +7772,9 @@ dependencies = [
 [[package]]
 name = "zkevm_opcode_defs"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.5.0#109d9f734804a8b9dc0531c0b576e2a0f55a40de"
+source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.5.0#28d2edabf902ea9b08f6a26a4506831fd89346b9"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethereum-types",
  "k256 0.13.3",
@@ -7662,9 +7796,9 @@ dependencies = [
  "codegen",
  "crossbeam 0.8.4",
  "derivative",
- "env_logger 0.11.2",
+ "env_logger 0.11.3",
  "hex",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.5",
  "num-integer",
  "num-traits",
  "rayon",
@@ -7679,25 +7813,49 @@ dependencies = [
  "zkevm-assembly 1.3.2",
 ]
 
+[[package]]
+name = "zkevm_test_harness"
+version = "1.4.0"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness?branch=gpu-wrapper#ea0d54f6d5d7d3302a4a6594150a2ca809e6677b"
+dependencies = [
+ "bincode",
+ "circuit_definitions 0.1.0",
+ "codegen",
+ "crossbeam 0.8.4",
+ "derivative",
+ "env_logger 0.11.3",
+ "hex",
+ "rand 0.4.6",
+ "rayon",
+ "serde",
+ "serde_json",
+ "smallvec",
+ "structopt",
+ "test-log",
+ "tracing",
+ "zkevm-assembly 1.3.2",
+]
+
 [[package]]
 name = "zkevm_test_harness"
 version = "1.5.0"
-source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#ecb08797ced36fcc7d3696ffd2ec6a2d534b9395"
+source = "git+https://github.com/matter-labs/era-zkevm_test_harness.git?branch=v1.5.0#5d6a06c37f4656d26a4170d22f2298cd7716c070"
 dependencies = [
  "bincode",
- "circuit_definitions",
+ "circuit_definitions 1.5.0",
  "circuit_sequencer_api 0.1.50",
  "codegen",
  "crossbeam 0.8.4",
  "curl",
  "derivative",
- "env_logger 0.11.2",
+ "env_logger 0.11.3",
  "hex",
  "kzg",
  "lazy_static",
  "rand 0.4.6",
  "rayon",
- "reqwest",
+ "regex",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "smallvec",
@@ -7719,6 +7877,7 @@ dependencies = [
  "num_enum 0.7.2",
  "serde",
  "serde_json",
+ "serde_with",
  "strum",
  "thiserror",
  "tiny-keccak 2.0.2",
@@ -7728,7 +7887,7 @@ dependencies = [
 [[package]]
 name = "zksync_concurrency"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "once_cell",
@@ -7749,9 +7908,10 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "rand 0.8.5",
+ "secrecy",
  "serde",
- "url",
  "zksync_basic_types",
+ "zksync_concurrency",
  "zksync_consensus_utils",
  "zksync_crypto_primitives",
 ]
@@ -7759,14 +7919,16 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_crypto"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "blst",
  "ed25519-dalek",
+ "elliptic-curve 0.13.8",
  "ff_ce",
  "hex",
- "num-bigint 0.4.4",
+ "k256 0.13.3",
+ "num-bigint 0.4.5",
  "num-traits",
  "pairing_ce 0.28.5 (git+https://github.com/matter-labs/pairing.git?rev=d24f2c5871089c4cd4f54c0ca266bb9fef6115eb)",
  "rand 0.4.6",
@@ -7780,13 +7942,13 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_roles"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "bit-vec",
  "hex",
- "num-bigint 0.4.4",
- "prost 0.12.3",
+ "num-bigint 0.4.5",
+ "prost 0.12.6",
  "rand 0.8.5",
  "serde",
  "thiserror",
@@ -7801,11 +7963,11 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_storage"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "async-trait",
- "prost 0.12.3",
+ "prost 0.12.6",
  "rand 0.8.5",
  "thiserror",
  "tracing",
@@ -7819,8 +7981,9 @@ dependencies = [
 [[package]]
 name = "zksync_consensus_utils"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
+ "anyhow",
  "rand 0.8.5",
  "thiserror",
  "zksync_concurrency",
@@ -7839,6 +8002,20 @@ dependencies = [
  "zksync_utils",
 ]
 
+[[package]]
+name = "zksync_core_leftovers"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "ctrlc",
+ "serde_yaml",
+ "tokio",
+ "zksync_config",
+ "zksync_dal",
+ "zksync_node_genesis",
+ "zksync_protobuf",
+]
+
 [[package]]
 name = "zksync_crypto"
 version = "0.1.0"
@@ -7877,7 +8054,7 @@ dependencies = [
  "chrono",
  "hex",
  "itertools 0.10.5",
- "prost 0.12.3",
+ "prost 0.12.6",
  "rand 0.8.5",
  "serde",
  "serde_json",
@@ -7940,6 +8117,7 @@ dependencies = [
  "zksync_contracts",
  "zksync_eth_signer",
  "zksync_types",
+ "zksync_web3_decl",
 ]
 
 [[package]]
@@ -7966,6 +8144,25 @@ dependencies = [
  "vise",
 ]
 
+[[package]]
+name = "zksync_merkle_tree"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "leb128",
+ "once_cell",
+ "rayon",
+ "thiserror",
+ "thread_local",
+ "tracing",
+ "vise",
+ "zksync_crypto",
+ "zksync_prover_interface",
+ "zksync_storage",
+ "zksync_types",
+ "zksync_utils",
+]
+
 [[package]]
 name = "zksync_mini_merkle_tree"
 version = "0.1.0"
@@ -7975,6 +8172,56 @@ dependencies = [
  "zksync_crypto",
 ]
 
+[[package]]
+name = "zksync_multivm"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "circuit_sequencer_api 0.1.0",
+ "circuit_sequencer_api 0.1.40",
+ "circuit_sequencer_api 0.1.41",
+ "circuit_sequencer_api 0.1.42",
+ "circuit_sequencer_api 0.1.50",
+ "hex",
+ "itertools 0.10.5",
+ "once_cell",
+ "serde",
+ "thiserror",
+ "tracing",
+ "vise",
+ "zk_evm 1.3.1",
+ "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)",
+ "zk_evm 1.4.0",
+ "zk_evm 1.4.1",
+ "zk_evm 1.5.0",
+ "zksync_contracts",
+ "zksync_state",
+ "zksync_system_constants",
+ "zksync_types",
+ "zksync_utils",
+]
+
+[[package]]
+name = "zksync_node_genesis"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "vise",
+ "zksync_config",
+ "zksync_contracts",
+ "zksync_dal",
+ "zksync_eth_client",
+ "zksync_merkle_tree",
+ "zksync_multivm",
+ "zksync_system_constants",
+ "zksync_types",
+ "zksync_utils",
+]
+
 [[package]]
 name = "zksync_object_store"
 version = "0.1.0"
@@ -7985,8 +8232,10 @@ dependencies = [
  "flate2",
  "google-cloud-auth",
  "google-cloud-storage",
- "http",
- "prost 0.12.3",
+ "http 1.1.0",
+ "prost 0.12.6",
+ "rand 0.8.5",
+ "reqwest 0.12.5",
  "serde_json",
  "tokio",
  "tracing",
@@ -8004,11 +8253,10 @@ dependencies = [
  "async-trait",
  "bincode",
  "circuit_sequencer_api 0.1.50",
+ "clap 4.5.4",
  "ctrlc",
  "futures 0.3.30",
- "prometheus_exporter",
- "prover_dal",
- "reqwest",
+ "reqwest 0.12.5",
  "serde",
  "serde_json",
  "structopt",
@@ -8016,28 +8264,31 @@ dependencies = [
  "tracing",
  "vise",
  "vk_setup_data_generator_server_fri",
- "vlog",
+ "wrapper-prover",
  "zkevm_test_harness 1.3.3",
  "zkevm_test_harness 1.5.0",
  "zksync_config",
  "zksync_env_config",
  "zksync_object_store",
+ "zksync_prover_config",
+ "zksync_prover_dal",
  "zksync_prover_fri_types",
  "zksync_prover_interface",
  "zksync_queued_job_processor",
  "zksync_types",
  "zksync_utils",
+ "zksync_vlog",
 ]
 
 [[package]]
 name = "zksync_protobuf"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "bit-vec",
  "once_cell",
- "prost 0.12.3",
+ "prost 0.12.6",
  "prost-reflect",
  "quick-protobuf",
  "rand 0.8.5",
@@ -8052,17 +8303,56 @@ dependencies = [
 [[package]]
 name = "zksync_protobuf_build"
 version = "0.1.0"
-source = "git+https://github.com/matter-labs/era-consensus.git?rev=92ecb2d5d65e3bc4a883dacd18d0640e86576c8c#92ecb2d5d65e3bc4a883dacd18d0640e86576c8c"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
  "prettyplease",
- "proc-macro2 1.0.78",
+ "proc-macro2 1.0.85",
  "prost-build",
  "prost-reflect",
  "protox",
- "quote 1.0.35",
- "syn 2.0.48",
+ "quote 1.0.36",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "zksync_protobuf_config"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "hex",
+ "prost 0.12.6",
+ "rand 0.8.5",
+ "secrecy",
+ "serde_json",
+ "serde_yaml",
+ "zksync_basic_types",
+ "zksync_config",
+ "zksync_protobuf",
+ "zksync_protobuf_build",
+ "zksync_types",
+]
+
+[[package]]
+name = "zksync_prover_config"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "zksync_config",
+ "zksync_core_leftovers",
+ "zksync_env_config",
+ "zksync_protobuf_config",
+]
+
+[[package]]
+name = "zksync_prover_dal"
+version = "0.1.0"
+dependencies = [
+ "sqlx",
+ "strum",
+ "zksync_basic_types",
+ "zksync_db_connection",
 ]
 
 [[package]]
@@ -8071,30 +8361,31 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "circuit_definitions",
+ "circuit_definitions 1.5.0",
+ "clap 4.5.4",
  "ctrlc",
  "futures 0.3.30",
  "local-ip-address",
- "prometheus_exporter",
- "prover_dal",
  "regex",
- "reqwest",
+ "reqwest 0.12.5",
  "serde",
  "shivini",
  "tokio",
  "tracing",
  "vise",
  "vk_setup_data_generator_server_fri",
- "vlog",
  "zkevm_test_harness 1.5.0",
  "zksync_config",
  "zksync_env_config",
  "zksync_object_store",
+ "zksync_prover_config",
+ "zksync_prover_dal",
  "zksync_prover_fri_types",
  "zksync_prover_fri_utils",
  "zksync_queued_job_processor",
  "zksync_types",
  "zksync_utils",
+ "zksync_vlog",
 ]
 
 [[package]]
@@ -8103,30 +8394,31 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
+ "clap 4.5.4",
  "ctrlc",
  "futures 0.3.30",
  "log",
- "prometheus_exporter",
- "prover_dal",
- "reqwest",
+ "reqwest 0.12.5",
  "serde",
  "tokio",
  "tracing",
  "vise",
- "vlog",
  "zksync_config",
  "zksync_env_config",
  "zksync_object_store",
+ "zksync_prover_config",
+ "zksync_prover_dal",
  "zksync_prover_interface",
  "zksync_types",
  "zksync_utils",
+ "zksync_vlog",
 ]
 
 [[package]]
 name = "zksync_prover_fri_types"
 version = "0.1.0"
 dependencies = [
- "circuit_definitions",
+ "circuit_definitions 1.5.0",
  "serde",
  "zksync_object_store",
  "zksync_types",
@@ -8137,14 +8429,14 @@ name = "zksync_prover_fri_utils"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "prover_dal",
  "regex",
- "reqwest",
+ "reqwest 0.12.5",
  "serde",
  "tracing",
  "vise",
  "zksync_config",
  "zksync_object_store",
+ "zksync_prover_dal",
  "zksync_prover_fri_types",
  "zksync_types",
  "zksync_utils",
@@ -8159,6 +8451,7 @@ dependencies = [
  "serde",
  "serde_with",
  "strum",
+ "zksync_multivm",
  "zksync_object_store",
  "zksync_types",
 ]
@@ -8179,6 +8472,8 @@ dependencies = [
 name = "zksync_shared_metrics"
 version = "0.1.0"
 dependencies = [
+ "rustc_version",
+ "tracing",
  "vise",
  "zksync_dal",
  "zksync_types",
@@ -8190,6 +8485,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
+ "backon",
  "chrono",
  "itertools 0.10.5",
  "mini-moka",
@@ -8230,6 +8526,7 @@ name = "zksync_types"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "bigdecimal",
  "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono",
  "derive_more",
@@ -8238,13 +8535,14 @@ dependencies = [
  "num",
  "num_enum 0.7.2",
  "once_cell",
- "prost 0.12.3",
+ "prost 0.12.6",
  "rlp",
  "secp256k1",
  "serde",
  "serde_json",
  "strum",
  "thiserror",
+ "tracing",
  "zksync_basic_types",
  "zksync_config",
  "zksync_contracts",
@@ -8266,14 +8564,56 @@ dependencies = [
  "hex",
  "itertools 0.10.5",
  "num",
- "reqwest",
+ "once_cell",
+ "reqwest 0.12.5",
  "serde",
+ "serde_json",
  "thiserror",
  "tokio",
  "tracing",
- "vlog",
  "zk_evm 1.3.3 (git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2)",
  "zksync_basic_types",
+ "zksync_vlog",
+]
+
+[[package]]
+name = "zksync_vlog"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "opentelemetry",
+ "opentelemetry-otlp",
+ "opentelemetry-semantic-conventions",
+ "sentry",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing",
+ "tracing-opentelemetry",
+ "tracing-subscriber",
+ "vise",
+ "vise-exporter",
+]
+
+[[package]]
+name = "zksync_web3_decl"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "futures 0.3.30",
+ "jsonrpsee",
+ "pin-project-lite",
+ "rlp",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "vise",
+ "zksync_config",
+ "zksync_types",
 ]
 
 [[package]]
@@ -8283,15 +8623,12 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bincode",
- "circuit_definitions",
+ "circuit_definitions 1.5.0",
  "const-decoder",
  "ctrlc",
  "futures 0.3.30",
  "jemallocator",
- "multivm",
  "once_cell",
- "prometheus_exporter",
- "prover_dal",
  "rand 0.8.5",
  "serde",
  "structopt",
@@ -8300,13 +8637,17 @@ dependencies = [
  "tracing",
  "vise",
  "vk_setup_data_generator_server_fri",
- "vlog",
  "zk_evm 1.4.1",
  "zkevm_test_harness 1.5.0",
  "zksync_config",
+ "zksync_core_leftovers",
  "zksync_dal",
  "zksync_env_config",
+ "zksync_multivm",
  "zksync_object_store",
+ "zksync_protobuf_config",
+ "zksync_prover_config",
+ "zksync_prover_dal",
  "zksync_prover_fri_types",
  "zksync_prover_fri_utils",
  "zksync_prover_interface",
@@ -8315,6 +8656,7 @@ dependencies = [
  "zksync_system_constants",
  "zksync_types",
  "zksync_utils",
+ "zksync_vlog",
 ]
 
 [[package]]
@@ -8324,10 +8666,9 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bincode",
+ "clap 4.5.4",
  "ctrlc",
  "futures 0.3.30",
- "prometheus_exporter",
- "prover_dal",
  "queues",
  "serde",
  "structopt",
@@ -8335,22 +8676,24 @@ dependencies = [
  "tracing",
  "vise",
  "vk_setup_data_generator_server_fri",
- "vlog",
  "zksync_config",
  "zksync_env_config",
  "zksync_object_store",
+ "zksync_prover_config",
+ "zksync_prover_dal",
  "zksync_prover_fri_types",
  "zksync_prover_fri_utils",
  "zksync_queued_job_processor",
  "zksync_types",
  "zksync_utils",
+ "zksync_vlog",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.9+zstd.1.5.5"
+version = "2.0.10+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
+checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
index c13ee192e746..1d01ea176bee 100644
--- a/prover/Cargo.toml
+++ b/prover/Cargo.toml
@@ -4,7 +4,6 @@ members = [
     "prover_fri_utils",
     "prover_fri_types",
     "prover_dal",
-
     # binaries
     "witness_generator",
     "vk_setup_data_generator_server_fri",
@@ -13,6 +12,8 @@ members = [
     "prover_fri_gateway",
     "proof_fri_compressor",
     "prover_cli",
+    "prover_version",
+    "config",
 ]
 
 resolver = "2"
@@ -31,28 +32,29 @@ categories = ["cryptography"]
 anyhow = "1.0"
 async-trait = "0.1"
 bincode = "1"
+chrono = "0.4.38"
 circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.5.0" }
 circuit_sequencer_api = { package = "circuit_sequencer_api", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.5.0" }
 clap = "4.4.6"
 colored = "2.0"
 const-decoder = "0.3.0"
 ctrlc = "3.1"
+dialoguer = "0.11"
 futures = "0.3"
 hex = "0.4"
 itertools = "0.10.5"
+indicatif = "0.16"
 jemallocator = "0.5"
 local-ip-address = "0.5.0"
 log = "0.4.20"
 md5 = "0.7.0"
-multivm = { path = "../core/lib/multivm", version = "0.1.0" }
 once_cell = "1.18"
-prometheus_exporter = { path = "../core/lib/prometheus_exporter" }
 proptest = "1.2.0"
-prover_dal = { path = "prover_dal" }
+zksync_prover_dal = { path = "prover_dal" }
 queues = "1.1.0"
 rand = "0.8"
-regex = "1.7.2"
-reqwest = "0.11"
+regex = "1.10.4"
+reqwest = "0.12"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
@@ -68,7 +70,9 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3" }
 vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "a5bb80c9ce7168663114ee30e794d6dc32159ee4" }
 vk_setup_data_generator_server_fri = { path = "vk_setup_data_generator_server_fri" }
-vlog = { path = "../core/lib/vlog" }
+zksync_prover_config = { path = "config" }
+zksync_multivm = { path = "../core/lib/multivm", version = "0.1.0" }
+zksync_vlog = { path = "../core/lib/vlog" }
 zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.4.1" }
 zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.5.0" }
 zksync_basic_types = { path = "../core/lib/basic_types" }
@@ -87,6 +91,11 @@ zksync_types = { path = "../core/lib/types" }
 zksync_utils = { path = "../core/lib/utils" }
 zksync_eth_client = { path = "../core/lib/eth_client" }
 zksync_contracts = { path = "../core/lib/contracts" }
+zksync_core_leftovers = { path = "../core/lib/zksync_core_leftovers" }
+zksync_protobuf_config = { path = "../core/lib/protobuf_config" }
+
+wrapper_prover = { package = "wrapper-prover", git = "https://github.com/matter-labs/era-heavy-ops-service.git", rev = "3d33e06" }
+
 
 # for `perf` profiling
 [profile.perf]
diff --git a/prover/config/Cargo.toml b/prover/config/Cargo.toml
new file mode 100644
index 000000000000..ef5612d81e8a
--- /dev/null
+++ b/prover/config/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "zksync_prover_config"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
+
+[dependencies]
+zksync_config.workspace = true
+zksync_env_config.workspace = true
+zksync_core_leftovers.workspace = true
+zksync_protobuf_config.workspace = true
+anyhow.workspace = true
diff --git a/prover/config/src/lib.rs b/prover/config/src/lib.rs
new file mode 100644
index 000000000000..9b6ee308b62c
--- /dev/null
+++ b/prover/config/src/lib.rs
@@ -0,0 +1,84 @@
+use anyhow::Context;
+use zksync_config::{
+    configs::{
+        api::{HealthCheckConfig, MerkleTreeApiConfig, Web3JsonRpcConfig},
+        chain::{
+            CircuitBreakerConfig, MempoolConfig, NetworkConfig, OperationsManagerConfig,
+            StateKeeperConfig,
+        },
+        fri_prover_group::FriProverGroupConfig,
+        house_keeper::HouseKeeperConfig,
+        BaseTokenAdjusterConfig, DADispatcherConfig, DatabaseSecrets, FriProofCompressorConfig,
+        FriProverConfig, FriProverGatewayConfig, FriWitnessGeneratorConfig,
+        FriWitnessVectorGeneratorConfig, GeneralConfig, ObjectStoreConfig, ObservabilityConfig,
+        PrometheusConfig, ProofDataHandlerConfig, ProtectiveReadsWriterConfig,
+    },
+    ApiConfig, ContractVerifierConfig, DBConfig, EthConfig, EthWatchConfig, GasAdjusterConfig,
+    PostgresConfig, SnapshotsCreatorConfig,
+};
+use zksync_core_leftovers::temp_config_store::{decode_yaml_repr, TempConfigStore};
+use zksync_env_config::FromEnv;
+use zksync_protobuf_config::proto::secrets::Secrets;
+
+fn load_env_config() -> anyhow::Result<TempConfigStore> {
+    Ok(TempConfigStore {
+        postgres_config: PostgresConfig::from_env().ok(),
+        health_check_config: HealthCheckConfig::from_env().ok(),
+        merkle_tree_api_config: MerkleTreeApiConfig::from_env().ok(),
+        web3_json_rpc_config: Web3JsonRpcConfig::from_env().ok(),
+        circuit_breaker_config: CircuitBreakerConfig::from_env().ok(),
+        mempool_config: MempoolConfig::from_env().ok(),
+        network_config: NetworkConfig::from_env().ok(),
+        contract_verifier: ContractVerifierConfig::from_env().ok(),
+        operations_manager_config: OperationsManagerConfig::from_env().ok(),
+        state_keeper_config: StateKeeperConfig::from_env().ok(),
+        house_keeper_config: HouseKeeperConfig::from_env().ok(),
+        fri_proof_compressor_config: FriProofCompressorConfig::from_env().ok(),
+        fri_prover_config: FriProverConfig::from_env().ok(),
+        fri_prover_group_config: FriProverGroupConfig::from_env().ok(),
+        fri_prover_gateway_config: FriProverGatewayConfig::from_env().ok(),
+        fri_witness_vector_generator: FriWitnessVectorGeneratorConfig::from_env().ok(),
+        fri_witness_generator_config: FriWitnessGeneratorConfig::from_env().ok(),
+        prometheus_config: PrometheusConfig::from_env().ok(),
+        proof_data_handler_config: ProofDataHandlerConfig::from_env().ok(),
+        api_config: ApiConfig::from_env().ok(),
+        db_config: DBConfig::from_env().ok(),
+        eth_sender_config: EthConfig::from_env().ok(),
+        eth_watch_config: EthWatchConfig::from_env().ok(),
+        gas_adjuster_config: GasAdjusterConfig::from_env().ok(),
+        observability: ObservabilityConfig::from_env().ok(),
+        snapshot_creator: SnapshotsCreatorConfig::from_env().ok(),
+        da_dispatcher_config: DADispatcherConfig::from_env().ok(),
+        protective_reads_writer_config: ProtectiveReadsWriterConfig::from_env().ok(),
+        core_object_store: ObjectStoreConfig::from_env().ok(),
+        base_token_adjuster_config: BaseTokenAdjusterConfig::from_env().ok(),
+        commitment_generator: None,
+        pruning: None,
+        snapshot_recovery: None,
+    })
+}
+
+pub fn load_general_config(path: Option<std::path::PathBuf>) -> anyhow::Result<GeneralConfig> {
+    match path {
+        Some(path) => {
+            let yaml = std::fs::read_to_string(path).context("Failed to read general config")?;
+            decode_yaml_repr::<zksync_protobuf_config::proto::general::GeneralConfig>(&yaml)
+        }
+        None => Ok(load_env_config()
+            .context("general config from env")?
+            .general()),
+    }
+}
+
+pub fn load_database_secrets(path: Option<std::path::PathBuf>) -> anyhow::Result<DatabaseSecrets> {
+    match path {
+        Some(path) => {
+            let yaml = std::fs::read_to_string(path).context("Failed to read secrets")?;
+            let secrets = decode_yaml_repr::<Secrets>(&yaml).context("Failed to parse secrets")?;
+            Ok(secrets
+                .database
+                .context("failed to parse database secrets")?)
+        }
+        None => DatabaseSecrets::from_env(),
+    }
+}
diff --git a/prover/proof_fri_compressor/Cargo.toml b/prover/proof_fri_compressor/Cargo.toml
index a21167f8f112..ff0eec6170a8 100644
--- a/prover/proof_fri_compressor/Cargo.toml
+++ b/prover/proof_fri_compressor/Cargo.toml
@@ -12,17 +12,17 @@ categories.workspace = true
 [dependencies]
 vise.workspace = true
 zksync_types.workspace = true
-prover_dal.workspace = true
+zksync_prover_dal.workspace = true
 zksync_config.workspace = true
 zksync_env_config.workspace = true
 zksync_object_store.workspace = true
 zksync_prover_interface.workspace = true
 zksync_utils.workspace = true
-prometheus_exporter.workspace = true
+zksync_prover_config.workspace = true
 zksync_prover_fri_types.workspace = true
 zksync_queued_job_processor.workspace = true
 vk_setup_data_generator_server_fri.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 
 circuit_sequencer_api.workspace = true
 zkevm_test_harness.workspace = true
@@ -33,8 +33,14 @@ structopt.workspace = true
 tokio = { workspace = true, features = ["time", "macros"] }
 futures = { workspace = true, features = ["compat"] }
 ctrlc = { workspace = true, features = ["termination"] }
+clap = { workspace = true, features = ["derive"] }
 async-trait.workspace = true
 bincode.workspace = true
 reqwest = { workspace = true, features = ["blocking"] }
 serde_json.workspace = true
 serde = { workspace = true, features = ["derive"] }
+wrapper_prover = { workspace = true, optional = true }
+
+[features]
+gpu = ["wrapper_prover"]
+
diff --git a/prover/proof_fri_compressor/README.md b/prover/proof_fri_compressor/README.md
index 3da29b08e7cd..097a59e5d09b 100644
--- a/prover/proof_fri_compressor/README.md
+++ b/prover/proof_fri_compressor/README.md
@@ -4,4 +4,4 @@ Used to compress FRI proof to Bellman proof that gets sent to L1.
 
 ## running
 
-`zk f cargo +nightly-2023-08-21 run --release --bin zksync_proof_fri_compressor`
+`zk f cargo +nightly-2024-05-07 run --release --bin zksync_proof_fri_compressor`
diff --git a/prover/proof_fri_compressor/src/compressor.rs b/prover/proof_fri_compressor/src/compressor.rs
index 9f337f39b461..d9c23ae10343 100644
--- a/prover/proof_fri_compressor/src/compressor.rs
+++ b/prover/proof_fri_compressor/src/compressor.rs
@@ -3,10 +3,26 @@ use std::{sync::Arc, time::Instant};
 use anyhow::Context as _;
 use async_trait::async_trait;
 use circuit_sequencer_api::proof::FinalProof;
-use prover_dal::{ConnectionPool, Prover, ProverDal};
 use tokio::task::JoinHandle;
-use zkevm_test_harness::proof_wrapper_utils::{wrap_proof, WrapperConfig};
+#[cfg(feature = "gpu")]
+use wrapper_prover::{Bn256, GPUWrapperConfigs, WrapperProver, DEFAULT_WRAPPER_CONFIG};
+#[cfg(not(feature = "gpu"))]
+use zkevm_test_harness::proof_wrapper_utils::WrapperConfig;
+#[allow(unused_imports)]
+use zkevm_test_harness::proof_wrapper_utils::{get_trusted_setup, wrap_proof};
+#[cfg(not(feature = "gpu"))]
+use zkevm_test_harness_1_3_3::bellman::bn256::Bn256;
+use zkevm_test_harness_1_3_3::{
+    abstract_zksync_circuit::concrete_circuits::{
+        ZkSyncCircuit, ZkSyncProof, ZkSyncVerificationKey,
+    },
+    bellman::plonk::better_better_cs::{
+        proof::Proof, setup::VerificationKey as SnarkVerificationKey,
+    },
+    witness::oracle::VmWitnessOracle,
+};
 use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{ConnectionPool, Prover, ProverDal};
 use zksync_prover_fri_types::{
     circuit_definitions::{
         boojum::field::goldilocks::GoldilocksField,
@@ -19,7 +35,7 @@ use zksync_prover_fri_types::{
 };
 use zksync_prover_interface::outputs::L1BatchProofForL1;
 use zksync_queued_job_processor::JobProcessor;
-use zksync_types::{L1BatchNumber, ProtocolVersionId};
+use zksync_types::{protocol_version::ProtocolSemanticVersion, L1BatchNumber};
 use zksync_vk_setup_data_server_fri::keystore::Keystore;
 
 use crate::metrics::METRICS;
@@ -29,7 +45,7 @@ pub struct ProofCompressor {
     pool: ConnectionPool<Prover>,
     compression_mode: u8,
     max_attempts: u32,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
 }
 
 impl ProofCompressor {
@@ -38,7 +54,7 @@ impl ProofCompressor {
         pool: ConnectionPool<Prover>,
         compression_mode: u8,
         max_attempts: u32,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Self {
         Self {
             blob_store,
@@ -49,9 +65,31 @@ impl ProofCompressor {
         }
     }
 
+    fn verify_proof(keystore: Keystore, serialized_proof: Vec<u8>) -> anyhow::Result<()> {
+        let proof: Proof<Bn256, ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>> =
+            bincode::deserialize(&serialized_proof)
+                .expect("Failed to deserialize proof with ZkSyncCircuit");
+        // We're fetching the key as String and deserializing it here
+        // as we don't want to include the old version of prover in the main libraries.
+        let existing_vk_serialized = keystore
+            .load_snark_verification_key()
+            .context("get_snark_vk()")?;
+        let existing_vk = serde_json::from_str::<
+            SnarkVerificationKey<Bn256, ZkSyncCircuit<Bn256, VmWitnessOracle<Bn256>>>,
+        >(&existing_vk_serialized)?;
+
+        let vk = ZkSyncVerificationKey::from_verification_key_and_numeric_type(0, existing_vk);
+        let scheduler_proof = ZkSyncProof::from_proof_and_numeric_type(0, proof.clone());
+        match vk.verify_proof(&scheduler_proof) {
+            true => tracing::info!("Compressed proof verified successfully"),
+            false => anyhow::bail!("Compressed proof verification failed "),
+        }
+        Ok(())
+    }
     pub fn compress_proof(
         proof: ZkSyncRecursionLayerProof,
         compression_mode: u8,
+        verify_wrapper_proof: bool,
     ) -> anyhow::Result<FinalProof> {
         let keystore = Keystore::default();
         let scheduler_vk = keystore
@@ -59,12 +97,30 @@ impl ProofCompressor {
                 ZkSyncRecursionLayerStorageType::SchedulerCircuit as u8,
             )
             .context("get_recursiver_layer_vk_for_circuit_type()")?;
-        let config = WrapperConfig::new(compression_mode);
 
-        let (wrapper_proof, _) = wrap_proof(proof, scheduler_vk, config);
-        let inner = wrapper_proof.into_inner();
+        #[cfg(feature = "gpu")]
+        let wrapper_proof = {
+            let crs = get_trusted_setup();
+            let wrapper_config = DEFAULT_WRAPPER_CONFIG;
+            let mut prover = WrapperProver::<GPUWrapperConfigs>::new(&crs, wrapper_config).unwrap();
+
+            prover
+                .generate_setup_data(scheduler_vk.into_inner())
+                .unwrap();
+            prover.generate_proofs(proof.into_inner()).unwrap();
+
+            prover.get_wrapper_proof().unwrap()
+        };
+        #[cfg(not(feature = "gpu"))]
+        let wrapper_proof = {
+            let config = WrapperConfig::new(compression_mode);
+
+            let (wrapper_proof, _) = wrap_proof(proof, scheduler_vk, config);
+            wrapper_proof.into_inner()
+        };
+
         // (Re)serialization should always succeed.
-        let serialized = bincode::serialize(&inner)
+        let serialized = bincode::serialize(&wrapper_proof)
             .expect("Failed to serialize proof with ZkSyncSnarkWrapperCircuit");
 
         // For sending to L1, we can use the `FinalProof` type, that has a generic circuit inside, that is not used for serialization.
@@ -101,7 +157,7 @@ impl JobProcessor for ProofCompressor {
         let pod_name = get_current_pod_name();
         let Some(l1_batch_number) = conn
             .fri_proof_compressor_dal()
-            .get_next_proof_compression_job(&pod_name, &self.protocol_version)
+            .get_next_proof_compression_job(&pod_name, self.protocol_version)
             .await
         else {
             return Ok(None);
@@ -177,11 +233,12 @@ impl JobProcessor for ProofCompressor {
         let l1_batch_proof = L1BatchProofForL1 {
             aggregation_result_coords,
             scheduler_proof: artifacts,
+            protocol_version: self.protocol_version,
         };
         let blob_save_started_at = Instant::now();
         let blob_url = self
             .blob_store
-            .put(job_id, &l1_batch_proof)
+            .put((job_id, self.protocol_version), &l1_batch_proof)
             .await
             .context("Failed to save converted l1_batch_proof")?;
         METRICS
diff --git a/prover/proof_fri_compressor/src/main.rs b/prover/proof_fri_compressor/src/main.rs
index 6af8f03ae310..7be7f5fead10 100644
--- a/prover/proof_fri_compressor/src/main.rs
+++ b/prover/proof_fri_compressor/src/main.rs
@@ -1,16 +1,18 @@
+#![feature(generic_const_exprs)]
+
 use std::{env, time::Duration};
 
 use anyhow::Context as _;
-use prometheus_exporter::PrometheusExporterConfig;
-use prover_dal::{ConnectionPool, Prover};
-use structopt::StructOpt;
+use clap::Parser;
 use tokio::sync::{oneshot, watch};
-use zksync_config::configs::{FriProofCompressorConfig, ObservabilityConfig, PostgresConfig};
-use zksync_env_config::{object_store::ProverObjectStoreConfig, FromEnv};
+use zksync_env_config::object_store::ProverObjectStoreConfig;
 use zksync_object_store::ObjectStoreFactory;
+use zksync_prover_config::{load_database_secrets, load_general_config};
+use zksync_prover_dal::{ConnectionPool, Prover};
+use zksync_prover_fri_types::PROVER_PROTOCOL_SEMANTIC_VERSION;
 use zksync_queued_job_processor::JobProcessor;
-use zksync_types::ProtocolVersionId;
 use zksync_utils::wait_for_tasks::ManagedTasks;
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 use crate::{
     compressor::ProofCompressor, initial_setup_keys::download_initial_setup_keys_if_not_present,
@@ -20,27 +22,36 @@ mod compressor;
 mod initial_setup_keys;
 mod metrics;
 
-#[derive(Debug, StructOpt)]
-#[structopt(
-    name = "zksync_proof_fri_compressor",
-    about = "Tool for compressing FRI proofs to old bellman proof"
-)]
-struct Opt {
+#[derive(Debug, Parser)]
+#[command(author = "Matter Labs", version)]
+struct Cli {
     /// Number of times proof fri compressor should be run.
-    #[structopt(short = "n", long = "n_iterations")]
+    #[arg(long = "n_iterations")]
+    #[arg(short)]
     number_of_iterations: Option<usize>,
+    #[arg(long)]
+    pub(crate) config_path: Option<std::path::PathBuf>,
+    #[arg(long)]
+    pub(crate) secrets_path: Option<std::path::PathBuf>,
 }
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let observability_config =
-        ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let opt = Cli::parse();
+
+    let general_config = load_general_config(opt.config_path).context("general config")?;
+    let database_secrets = load_database_secrets(opt.secrets_path).context("database secrets")?;
+
+    let observability_config = general_config
+        .observability
+        .expect("observability config")
+        .clone();
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
 
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(sentry_url) = &observability_config.sentry_url {
         builder = builder
             .with_sentry_url(sentry_url)
@@ -58,20 +69,25 @@ async fn main() -> anyhow::Result<()> {
     }
     let _guard = builder.build();
 
-    let opt = Opt::from_args();
-    let config = FriProofCompressorConfig::from_env().context("FriProofCompressorConfig")?;
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
-    let pool = ConnectionPool::<Prover>::singleton(postgres_config.prover_url()?)
+    let config = general_config
+        .proof_compressor_config
+        .context("FriProofCompressorConfig")?;
+    let pool = ConnectionPool::<Prover>::singleton(database_secrets.prover_url()?)
         .build()
         .await
         .context("failed to build a connection pool")?;
-    let object_store_config =
-        ProverObjectStoreConfig::from_env().context("ProverObjectStoreConfig::from_env()")?;
+    let object_store_config = ProverObjectStoreConfig(
+        general_config
+            .prover_config
+            .expect("ProverConfig")
+            .prover_object_store
+            .context("ProverObjectStoreConfig")?,
+    );
     let blob_store = ObjectStoreFactory::new(object_store_config.0)
         .create_store()
-        .await;
+        .await?;
 
-    let protocol_version = ProtocolVersionId::current_prover_version();
+    let protocol_version = PROVER_PROTOCOL_SEMANTIC_VERSION;
 
     let proof_compressor = ProofCompressor::new(
         blob_store,
diff --git a/prover/prover_cli/Cargo.toml b/prover/prover_cli/Cargo.toml
index f8045f0b0a5d..f91cd47e0945 100644
--- a/prover/prover_cli/Cargo.toml
+++ b/prover/prover_cli/Cargo.toml
@@ -10,8 +10,9 @@ keywords.workspace = true
 categories.workspace = true
 
 [dependencies]
+dialoguer.workspace = true
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
-clap = { workspace = true, features = ["derive"] }
+clap = { workspace = true, features = ["derive", "env"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tracing.workspace = true
 bincode.workspace = true
@@ -24,10 +25,19 @@ zksync_basic_types.workspace = true
 zksync_types.workspace = true
 zksync_prover_fri_types.workspace = true
 zksync_prover_interface.workspace = true
-prover_dal.workspace = true
+zksync_prover_dal.workspace = true
 zksync_eth_client.workspace = true
 zksync_contracts.workspace = true
 zksync_dal.workspace = true
+zksync_utils.workspace = true
 strum.workspace = true
 colored.workspace = true
 sqlx.workspace = true
+circuit_definitions.workspace = true
+serde_json.workspace = true
+zkevm_test_harness = { workspace = true, optional = true, features = ["verbose_circuits"] }
+chrono.workspace = true
+
+[features]
+# enable verbose circuits, if you want to use debug_circuit command (as it is quite heavy dependency).
+verbose_circuits = ["zkevm_test_harness"]
diff --git a/prover/prover_cli/README.md b/prover/prover_cli/README.md
index d4da450fccad..053744914b97 100644
--- a/prover/prover_cli/README.md
+++ b/prover/prover_cli/README.md
@@ -1,6 +1,6 @@
 # Prover CLI
 
-CLI tool for performing maintenance of a zkSync Prover
+CLI tool for performing maintenance of a ZKsync Prover
 
 ## Installation
 
@@ -161,6 +161,36 @@ TODO
 
 TODO
 
+### `prover_cli debug-proof`
+
+Debug proof is an advanced feature that can be used to debug failing circuit proofs. It will re-run the proving circuit
+for a given proof file - and print detailed debug logs.
+
+**WARNING** - it does require compilation with `--release --features verbose_circuits` enabled (which includes all the
+necessary dependencies).
+
+Example output
+
+```
+cargo run --release --features verbose_circuits -- debug-proof --file ~/prover_jobs_23_05.bin
+
+[call_ret_impl/far_call.rs:1012:13] max_passable.witness_hook(&*cs)().unwrap() = 535437
+[call_ret_impl/far_call.rs:1024:13] leftover.witness_hook(&*cs)().unwrap() = 8518
+[call_ret_impl/far_call.rs:1025:13] ergs_to_pass.witness_hook(&*cs)().unwrap() = 544211
+[call_ret_impl/far_call.rs:1036:13] remaining_from_max_passable.witness_hook(&*cs)().unwrap() = 4294958522
+[call_ret_impl/far_call.rs:1037:13] leftover_and_remaining_if_no_uf.witness_hook(&*cs)().unwrap() = 4294967040
+[call_ret_impl/far_call.rs:1047:13] ergs_to_pass.witness_hook(&*cs)().unwrap() = 535437
+[call_ret_impl/far_call.rs:1048:13] remaining_for_this_context.witness_hook(&*cs)().unwrap() = 8518
+[call_ret_impl/far_call.rs:1049:13] extra_ergs_from_caller_to_callee.witness_hook(&*cs)().unwrap() = 0
+[call_ret_impl/far_call.rs:1050:13] callee_stipend.witness_hook(&*cs)().unwrap() = 0
+New frame as a result of FAR CALL: Some(ExecutionContextRecordWitness { this: 0x263eb3945d7cee723110c69da5fabc3c6d5a802f, caller: 0x973a7a18f29699b5b976a5026d795f5169cb3348, code_address: 0x0000000000000000000000000000000000000000, code_page: 2416, base_page: 3075968, heap_upper_bound: 4096, aux_heap_upper_bound: 4096, reverted_queue_head: [0x1d06f395ca74bd80, 0x3c3099adfd7d31cb, 0x119db3dd58b4aca6, 0xb8d2f7bd2c1b5e48], reverted_queue_tail: [0x1d06f395ca74bd80, 0x3c3099adfd7d31cb, 0x119db3dd58b4aca6, 0xb8d2f7bd2c1b5e48], reverted_queue_segment_len: 0, pc: 0, sp: 0, exception_handler_loc: 176, ergs_remaining: 535437, is_static_execution: false, is_kernel_mode: false, this_shard_id: 0, caller_shard_id: 0, code_shard_id: 0, context_u128_value_composite: [0, 0, 0, 0], is_local_call: false, total_pubdata_spent: 0, stipend: 0 })
+thread 'main' panicked at circuit_definitions/src/aux_definitions/witness_oracle.rs:506:13:
+assertion `left == right` failed
+  left: 2097152
+ right: 4096
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+```
+
 ## Development Status
 
 | **Command** | **Subcommand** | **Flags**                         | **Status** |
diff --git a/prover/prover_cli/src/cli.rs b/prover/prover_cli/src/cli.rs
index 64ec98426bad..7174830f44d1 100644
--- a/prover/prover_cli/src/cli.rs
+++ b/prover/prover_cli/src/cli.rs
@@ -1,12 +1,12 @@
 use clap::{command, Args, Parser, Subcommand};
 use zksync_types::url::SensitiveUrl;
 
-use crate::commands::{self, get_file_info};
+use crate::commands::{self, config, debug_proof, delete, get_file_info, requeue, restart, stats};
 
 pub const VERSION_STRING: &str = env!("CARGO_PKG_VERSION");
 
 #[derive(Parser)]
-#[command(name="prover-cli", version=VERSION_STRING, about, long_about = None)]
+#[command(name = "prover-cli", version = VERSION_STRING, about, long_about = None)]
 struct ProverCLI {
     #[command(subcommand)]
     command: ProverCommand,
@@ -14,30 +14,42 @@ struct ProverCLI {
     config: ProverCLIConfig,
 }
 
-// Note: This is a temporary solution for the configuration of the CLI. In the
-// future, we should have an `config` command to set the configuration in a
-// `.config` file.
+// Note: this is set via the `config` command. Values are taken from the file pointed
+// by the env var `PLI__CONFIG` or from `$ZKSYNC_HOME/etc/pliconfig` if unset.
 #[derive(Args)]
 pub struct ProverCLIConfig {
     #[clap(
-        long,
-        default_value = "postgres://postgres:notsecurepassword@localhost/prover_local"
+        default_value = "postgres://postgres:notsecurepassword@localhost/prover_local",
+        env("PLI__DB_URL")
     )]
     pub db_url: SensitiveUrl,
 }
 
 #[derive(Subcommand)]
 enum ProverCommand {
+    DebugProof(debug_proof::Args),
     FileInfo(get_file_info::Args),
+    Config(ProverCLIConfig),
+    Delete(delete::Args),
     #[command(subcommand)]
     Status(commands::StatusCommand),
+    Requeue(requeue::Args),
+    Restart(restart::Args),
+    #[command(about = "Displays L1 Batch proving stats for a given period")]
+    Stats(stats::Options),
 }
 
 pub async fn start() -> anyhow::Result<()> {
     let ProverCLI { command, config } = ProverCLI::parse();
     match command {
         ProverCommand::FileInfo(args) => get_file_info::run(args).await?,
+        ProverCommand::Config(cfg) => config::run(cfg).await?,
+        ProverCommand::Delete(args) => delete::run(args, config).await?,
         ProverCommand::Status(cmd) => cmd.run(config).await?,
+        ProverCommand::Requeue(args) => requeue::run(args, config).await?,
+        ProverCommand::Restart(args) => restart::run(args).await?,
+        ProverCommand::DebugProof(args) => debug_proof::run(args).await?,
+        ProverCommand::Stats(args) => stats::run(args, config).await?,
     };
 
     Ok(())
diff --git a/prover/prover_cli/src/commands/config.rs b/prover/prover_cli/src/commands/config.rs
new file mode 100644
index 000000000000..4b5f2421c7a4
--- /dev/null
+++ b/prover/prover_cli/src/commands/config.rs
@@ -0,0 +1,7 @@
+use crate::{cli::ProverCLIConfig, config};
+
+pub async fn run(cfg: ProverCLIConfig) -> anyhow::Result<()> {
+    let envfile = config::get_envfile()?;
+    config::update_envfile(&envfile, "PLI__DB_URL", cfg.db_url.expose_str())?;
+    Ok(())
+}
diff --git a/prover/prover_cli/src/commands/debug_proof.rs b/prover/prover_cli/src/commands/debug_proof.rs
new file mode 100644
index 000000000000..7875554ae920
--- /dev/null
+++ b/prover/prover_cli/src/commands/debug_proof.rs
@@ -0,0 +1,19 @@
+use clap::Args as ClapArgs;
+
+#[derive(ClapArgs)]
+pub(crate) struct Args {
+    /// File with the basic proof.
+    #[clap(short, long)]
+    file: String,
+}
+
+pub(crate) async fn run(_args: Args) -> anyhow::Result<()> {
+    #[cfg(not(feature = "verbose_circuits"))]
+    anyhow::bail!("Please compile with verbose_circuits feature");
+    #[cfg(feature = "verbose_circuits")]
+    {
+        let buffer = std::fs::read(_args.file).unwrap();
+        zkevm_test_harness::debug::debug_circuit(&buffer);
+        Ok(())
+    }
+}
diff --git a/prover/prover_cli/src/commands/delete.rs b/prover/prover_cli/src/commands/delete.rs
new file mode 100644
index 000000000000..436bb10e10cb
--- /dev/null
+++ b/prover/prover_cli/src/commands/delete.rs
@@ -0,0 +1,92 @@
+use anyhow::Context;
+use clap::Args as ClapArgs;
+use dialoguer::{theme::ColorfulTheme, Input};
+use zksync_prover_dal::{Connection, ConnectionPool, Prover, ProverDal};
+use zksync_types::L1BatchNumber;
+
+use crate::cli::ProverCLIConfig;
+
+#[derive(ClapArgs)]
+pub(crate) struct Args {
+    /// Delete data from all batches
+    #[clap(
+        short,
+        long,
+        required_unless_present = "batch",
+        conflicts_with = "batch",
+        default_value_t = false
+    )]
+    all: bool,
+    /// Batch number to delete
+    #[clap(short, long, required_unless_present = "all", conflicts_with = "all", default_value_t = L1BatchNumber(0))]
+    batch: L1BatchNumber,
+}
+
+pub(crate) async fn run(args: Args, config: ProverCLIConfig) -> anyhow::Result<()> {
+    let confirmation = Input::<String>::with_theme(&ColorfulTheme::default())
+        .with_prompt("Are you sure you want to delete the data?")
+        .default("no".to_owned())
+        .interact_text()?;
+
+    if confirmation != "yes" {
+        println!("Aborted");
+        return Ok(());
+    }
+
+    let prover_connection_pool = ConnectionPool::<Prover>::singleton(config.db_url)
+        .build()
+        .await
+        .context("failed to build a prover_connection_pool")?;
+    let conn = prover_connection_pool.connection().await.unwrap();
+
+    if args.all {
+        delete_prover_db(conn).await?;
+    } else {
+        delete_batch_data(conn, args.batch).await?;
+    }
+
+    Ok(())
+}
+
+async fn delete_prover_db(mut conn: Connection<'_, Prover>) -> anyhow::Result<()> {
+    conn.fri_gpu_prover_queue_dal()
+        .delete()
+        .await
+        .context("failed to delete gpu prover queue")?;
+    conn.fri_prover_jobs_dal()
+        .delete()
+        .await
+        .context("failed to delete prover jobs")?;
+    conn.fri_protocol_versions_dal()
+        .delete()
+        .await
+        .context("failed to delete protocol versions")?;
+    conn.fri_proof_compressor_dal()
+        .delete()
+        .await
+        .context("failed to delete proof compressor")?;
+    conn.fri_witness_generator_dal()
+        .delete()
+        .await
+        .context("failed to delete witness generator")?;
+    Ok(())
+}
+
+async fn delete_batch_data(
+    mut conn: Connection<'_, Prover>,
+    block_number: L1BatchNumber,
+) -> anyhow::Result<()> {
+    conn.fri_proof_compressor_dal()
+        .delete_batch_data(block_number)
+        .await
+        .context("failed to delete proof compressor data")?;
+    conn.fri_prover_jobs_dal()
+        .delete_batch_data(block_number)
+        .await
+        .context("failed to delete prover jobs data")?;
+    conn.fri_witness_generator_dal()
+        .delete_batch_data(block_number)
+        .await
+        .context("failed to delete witness generator data")?;
+    Ok(())
+}
diff --git a/prover/prover_cli/src/commands/mod.rs b/prover/prover_cli/src/commands/mod.rs
index e02f4bfb1bae..4bc8b2eb392a 100644
--- a/prover/prover_cli/src/commands/mod.rs
+++ b/prover/prover_cli/src/commands/mod.rs
@@ -1,4 +1,9 @@
+pub(crate) use status::StatusCommand;
+pub(crate) mod config;
+pub(crate) mod debug_proof;
+pub(crate) mod delete;
 pub(crate) mod get_file_info;
+pub(crate) mod requeue;
+pub(crate) mod restart;
+pub(crate) mod stats;
 pub(crate) mod status;
-
-pub(crate) use status::StatusCommand;
diff --git a/prover/prover_cli/src/commands/requeue.rs b/prover/prover_cli/src/commands/requeue.rs
new file mode 100644
index 000000000000..a9d967be5ba9
--- /dev/null
+++ b/prover/prover_cli/src/commands/requeue.rs
@@ -0,0 +1,87 @@
+use anyhow::Context;
+use clap::Args as ClapArgs;
+use zksync_prover_dal::{ConnectionPool, Prover, ProverDal};
+use zksync_types::{basic_fri_types::AggregationRound, prover_dal::StuckJobs, L1BatchNumber};
+
+use crate::cli::ProverCLIConfig;
+
+#[derive(ClapArgs)]
+pub struct Args {
+    #[clap(short, long)]
+    batch: L1BatchNumber,
+    /// Maximum number of attempts to re-queue a job.
+    /// Default value is 10.
+    /// NOTE: this argument is temporary and will be deprecated once the `config` command is implemented.
+    #[clap(long, default_value_t = 10)]
+    max_attempts: u32,
+}
+
+pub async fn run(args: Args, config: ProverCLIConfig) -> anyhow::Result<()> {
+    let pool = ConnectionPool::<Prover>::singleton(config.db_url)
+        .build()
+        .await
+        .context("failed to build a prover_connection_pool")?;
+
+    let mut conn = pool
+        .connection()
+        .await
+        .context("failed to acquire a connection")?;
+
+    let mut fri_witness_generator_dal = conn.fri_witness_generator_dal();
+
+    let stuck_witness_input_jobs = fri_witness_generator_dal
+        .requeue_stuck_witness_inputs_jobs_for_batch(args.batch, args.max_attempts)
+        .await;
+    display_requeued_stuck_jobs(stuck_witness_input_jobs, AggregationRound::BasicCircuits);
+
+    let stuck_leaf_aggregations_stuck_jobs = fri_witness_generator_dal
+        .requeue_stuck_leaf_aggregation_jobs_for_batch(args.batch, args.max_attempts)
+        .await;
+    display_requeued_stuck_jobs(
+        stuck_leaf_aggregations_stuck_jobs,
+        AggregationRound::LeafAggregation,
+    );
+
+    let stuck_node_aggregations_jobs = fri_witness_generator_dal
+        .requeue_stuck_node_aggregation_jobs_for_batch(args.batch, args.max_attempts)
+        .await;
+    display_requeued_stuck_jobs(
+        stuck_node_aggregations_jobs,
+        AggregationRound::NodeAggregation,
+    );
+
+    let stuck_recursion_tip_job = fri_witness_generator_dal
+        .requeue_stuck_recursion_tip_jobs_for_batch(args.batch, args.max_attempts)
+        .await;
+    display_requeued_stuck_jobs(stuck_recursion_tip_job, AggregationRound::RecursionTip);
+
+    let stuck_scheduler_jobs = fri_witness_generator_dal
+        .requeue_stuck_scheduler_jobs_for_batch(args.batch, args.max_attempts)
+        .await;
+    display_requeued_stuck_jobs(stuck_scheduler_jobs, AggregationRound::Scheduler);
+
+    let stuck_proof_compressor_jobs = conn
+        .fri_proof_compressor_dal()
+        .requeue_stuck_jobs_for_batch(args.batch, args.max_attempts)
+        .await;
+    for stuck_job in stuck_proof_compressor_jobs {
+        println!("Re-queuing proof compressor job {stuck_job:?} 🔁",);
+    }
+
+    let stuck_prover_jobs = conn
+        .fri_prover_jobs_dal()
+        .requeue_stuck_jobs_for_batch(args.batch, args.max_attempts)
+        .await;
+
+    for stuck_job in stuck_prover_jobs {
+        println!("Re-queuing prover job {stuck_job:?} 🔁",);
+    }
+
+    Ok(())
+}
+
+fn display_requeued_stuck_jobs(stuck_jobs: Vec<StuckJobs>, aggregation_round: AggregationRound) {
+    for stuck_job in stuck_jobs {
+        println!("Re-queuing {aggregation_round} stuck job {stuck_job:?} 🔁",);
+    }
+}
diff --git a/prover/prover_cli/src/commands/restart.rs b/prover/prover_cli/src/commands/restart.rs
new file mode 100644
index 000000000000..75beafd7100c
--- /dev/null
+++ b/prover/prover_cli/src/commands/restart.rs
@@ -0,0 +1,78 @@
+use anyhow::Context;
+use clap::Args as ClapArgs;
+use zksync_config::configs::DatabaseSecrets;
+use zksync_env_config::FromEnv;
+use zksync_prover_dal::{
+    fri_witness_generator_dal::FriWitnessJobStatus, Connection, ConnectionPool, Prover, ProverDal,
+};
+use zksync_types::{basic_fri_types::AggregationRound, L1BatchNumber};
+
+#[derive(ClapArgs)]
+pub(crate) struct Args {
+    /// Batch number to restart
+    #[clap(
+        short,
+        long,
+        required_unless_present = "prover_job",
+        conflicts_with = "prover_job"
+    )]
+    batch: Option<L1BatchNumber>,
+    /// Prover job to restart
+    #[clap(short, long, required_unless_present = "batch")]
+    prover_job: Option<u32>,
+}
+
+pub(crate) async fn run(args: Args) -> anyhow::Result<()> {
+    let config = DatabaseSecrets::from_env()?;
+    let prover_connection_pool = ConnectionPool::<Prover>::singleton(config.prover_url()?)
+        .build()
+        .await
+        .context("failed to build a prover_connection_pool")?;
+    let mut conn = prover_connection_pool.connection().await.unwrap();
+
+    if let Some(batch_number) = args.batch {
+        restart_batch(batch_number, &mut conn).await?;
+    } else if let Some(id) = args.prover_job {
+        restart_prover_job(id, &mut conn).await;
+    }
+
+    Ok(())
+}
+
+async fn restart_batch(
+    batch_number: L1BatchNumber,
+    conn: &mut Connection<'_, Prover>,
+) -> anyhow::Result<()> {
+    conn.fri_proof_compressor_dal()
+        .delete_batch_data(batch_number)
+        .await
+        .context("failed to delete proof compression job for batch")?;
+    conn.fri_prover_jobs_dal()
+        .delete_batch_data(batch_number)
+        .await
+        .context("failed to delete prover jobs for batch")?;
+    conn.fri_witness_generator_dal()
+        .delete_witness_generator_data_for_batch(batch_number, AggregationRound::LeafAggregation)
+        .await
+        .context("failed to restart batch: fri_witness_generator_dal()")?;
+    conn.fri_witness_generator_dal()
+        .delete_witness_generator_data_for_batch(batch_number, AggregationRound::NodeAggregation)
+        .await
+        .context("failed to restart batch: fri_witness_generator_dal()")?;
+    conn.fri_witness_generator_dal()
+        .delete_witness_generator_data_for_batch(batch_number, AggregationRound::RecursionTip)
+        .await
+        .context("failed to restart batch: fri_witness_generator_dal()")?;
+    conn.fri_witness_generator_dal()
+        .delete_witness_generator_data_for_batch(batch_number, AggregationRound::Scheduler)
+        .await
+        .context("failed to restart batch: fri_witness_generator_dal()")?;
+    conn.fri_witness_generator_dal()
+        .mark_witness_job(FriWitnessJobStatus::Queued, batch_number)
+        .await;
+    Ok(())
+}
+
+async fn restart_prover_job(id: u32, conn: &mut Connection<'_, Prover>) {
+    conn.fri_prover_jobs_dal().update_status(id, "queued").await;
+}
diff --git a/prover/prover_cli/src/commands/stats.rs b/prover/prover_cli/src/commands/stats.rs
new file mode 100644
index 000000000000..307775fa27d3
--- /dev/null
+++ b/prover/prover_cli/src/commands/stats.rs
@@ -0,0 +1,63 @@
+use anyhow::Context;
+use chrono::{self, NaiveTime};
+use clap::{Args, ValueEnum};
+use zksync_basic_types::prover_dal::ProofGenerationTime;
+use zksync_db_connection::connection_pool::ConnectionPool;
+use zksync_prover_dal::{Prover, ProverDal};
+
+use crate::cli::ProverCLIConfig;
+
+#[derive(ValueEnum, Clone)]
+enum StatsPeriod {
+    Day,
+    Week,
+}
+
+#[derive(Args)]
+pub(crate) struct Options {
+    #[clap(
+        short = 'p',
+        long = "period",
+        help = "Specify the time frame to look for stats",
+        default_value = "day"
+    )]
+    period: StatsPeriod,
+}
+
+pub(crate) async fn run(opts: Options, config: ProverCLIConfig) -> anyhow::Result<()> {
+    let prover_connection_pool = ConnectionPool::<Prover>::singleton(config.db_url)
+        .build()
+        .await
+        .context("failed to build a prover_connection_pool")?;
+    let mut conn = prover_connection_pool
+        .connection()
+        .await
+        .context("failed to get connection from pool")?;
+
+    let start_date = match opts.period {
+        StatsPeriod::Day => chrono::offset::Local::now().date_naive(),
+        StatsPeriod::Week => {
+            (chrono::offset::Local::now() - chrono::Duration::days(7)).date_naive()
+        }
+    };
+    let start_date =
+        start_date.and_time(NaiveTime::from_num_seconds_from_midnight_opt(0, 0).unwrap());
+    let proof_generation_times = conn
+        .fri_witness_generator_dal()
+        .get_proof_generation_times_for_time_frame(start_date)
+        .await?;
+    display_proof_generation_time(proof_generation_times);
+    Ok(())
+}
+
+fn display_proof_generation_time(proof_generation_times: Vec<ProofGenerationTime>) {
+    println!("Batch\tTime Taken\t\tCreated At");
+    for proof_generation_time in proof_generation_times {
+        println!(
+            "{}\t{:?}\t\t{}",
+            proof_generation_time.l1_batch_number,
+            proof_generation_time.time_taken,
+            proof_generation_time.created_at
+        );
+    }
+}
diff --git a/prover/prover_cli/src/commands/status/batch.rs b/prover/prover_cli/src/commands/status/batch.rs
index b20078747f71..84a8e7184a65 100644
--- a/prover/prover_cli/src/commands/status/batch.rs
+++ b/prover/prover_cli/src/commands/status/batch.rs
@@ -1,32 +1,61 @@
-use anyhow::{ensure, Context as _};
+use std::collections::BTreeMap;
+
+use anyhow::Context as _;
+use circuit_definitions::zkevm_circuits::scheduler::aux::BaseLayerCircuitType;
 use clap::Args as ClapArgs;
-use prover_dal::{Connection, ConnectionPool, Prover, ProverDal};
+use colored::*;
+use zksync_prover_dal::{Connection, ConnectionPool, Prover, ProverDal};
 use zksync_types::{
-    basic_fri_types::AggregationRound, prover_dal::WitnessJobStatus, url::SensitiveUrl,
+    basic_fri_types::AggregationRound,
+    prover_dal::{
+        BasicWitnessGeneratorJobInfo, ExtendedJobCountStatistics, LeafWitnessGeneratorJobInfo,
+        NodeWitnessGeneratorJobInfo, ProofCompressionJobInfo, ProverJobFriInfo, ProverJobStatus,
+        RecursionTipWitnessGeneratorJobInfo, SchedulerWitnessGeneratorJobInfo,
+    },
+    url::SensitiveUrl,
     L1BatchNumber,
 };
 
-use super::utils::{AggregationRoundInfo, BatchData, Task, TaskStatus};
+use super::utils::{BatchData, StageInfo, Status};
 use crate::cli::ProverCLIConfig;
 
 #[derive(ClapArgs)]
 pub struct Args {
-    #[clap(short = 'n', num_args = 1..)]
+    #[clap(short = 'n', num_args = 1.., required = true)]
     batches: Vec<L1BatchNumber>,
     #[clap(short, long, default_value("false"))]
     verbose: bool,
 }
 
 pub(crate) async fn run(args: Args, config: ProverCLIConfig) -> anyhow::Result<()> {
-    ensure!(
-        !args.batches.is_empty(),
-        "At least one batch number should be provided"
-    );
-
     let batches_data = get_batches_data(args.batches, config.db_url).await?;
 
     for batch_data in batches_data {
-        println!("{batch_data:?}");
+        println!(
+            "== {} ==",
+            format!("Batch {} Status", batch_data.batch_number).bold()
+        );
+
+        if let Status::Custom(msg) = batch_data.compressor.witness_generator_jobs_status() {
+            if msg.contains("Sent to server") {
+                println!("> Proof sent to server ✅");
+                continue;
+            }
+        }
+
+        let basic_witness_generator_status = batch_data
+            .basic_witness_generator
+            .witness_generator_jobs_status();
+        if matches!(basic_witness_generator_status, Status::JobsNotFound) {
+            println!("> No batch found. 🚫");
+            continue;
+        }
+
+        if !args.verbose {
+            display_batch_status(batch_data);
+        } else {
+            display_batch_info(batch_data);
+        }
     }
 
     Ok(())
@@ -50,47 +79,51 @@ async fn get_batches_data(
     for batch in batches {
         let current_batch_data = BatchData {
             batch_number: batch,
-            basic_witness_generator: Task::BasicWitnessGenerator {
-                status: get_proof_basic_witness_generator_status_for_batch(batch, &mut conn).await,
-                aggregation_round_info: get_aggregation_round_info_for_batch(
+            basic_witness_generator: StageInfo::BasicWitnessGenerator {
+                witness_generator_job_info: get_proof_basic_witness_generator_into_for_batch(
+                    batch, &mut conn,
+                )
+                .await,
+                prover_jobs_info: get_prover_jobs_info_for_batch(
                     batch,
                     AggregationRound::BasicCircuits,
                     &mut conn,
                 )
                 .await,
             },
-            leaf_witness_generator: Task::LeafWitnessGenerator {
-                status: get_proof_leaf_witness_generator_status_for_batch(batch, &mut conn).await,
-                aggregation_round_info: get_aggregation_round_info_for_batch(
+            leaf_witness_generator: StageInfo::LeafWitnessGenerator {
+                witness_generator_jobs_info: get_proof_leaf_witness_generator_info_for_batch(
+                    batch, &mut conn,
+                )
+                .await,
+                prover_jobs_info: get_prover_jobs_info_for_batch(
                     batch,
                     AggregationRound::LeafAggregation,
                     &mut conn,
                 )
                 .await,
             },
-            node_witness_generator: Task::NodeWitnessGenerator {
-                status: get_proof_node_witness_generator_status_for_batch(batch, &mut conn).await,
-                aggregation_round_info: get_aggregation_round_info_for_batch(
-                    batch,
-                    AggregationRound::NodeAggregation,
-                    &mut conn,
+            node_witness_generator: StageInfo::NodeWitnessGenerator {
+                witness_generator_jobs_info: get_proof_node_witness_generator_info_for_batch(
+                    batch, &mut conn,
                 )
                 .await,
-            },
-            scheduler_witness_generator: Task::SchedulerWitnessGenerator {
-                status: get_proof_scheduler_witness_generator_status_for_batch(batch, &mut conn)
-                    .await,
-                aggregation_round_info: get_aggregation_round_info_for_batch(
+                prover_jobs_info: get_prover_jobs_info_for_batch(
                     batch,
-                    AggregationRound::Scheduler,
+                    AggregationRound::NodeAggregation,
                     &mut conn,
                 )
                 .await,
             },
-            compressor: Task::Compressor(
-                get_proof_compression_job_status_for_batch(batch, &mut conn).await,
+            recursion_tip_witness_generator: StageInfo::RecursionTipWitnessGenerator(
+                get_proof_recursion_tip_witness_generator_info_for_batch(batch, &mut conn).await,
+            ),
+            scheduler_witness_generator: StageInfo::SchedulerWitnessGenerator(
+                get_proof_scheduler_witness_generator_info_for_batch(batch, &mut conn).await,
+            ),
+            compressor: StageInfo::Compressor(
+                get_proof_compression_job_info_for_batch(batch, &mut conn).await,
             ),
-            ..Default::default()
         };
         batches_data.push(current_batch_data);
     }
@@ -98,80 +131,282 @@ async fn get_batches_data(
     Ok(batches_data)
 }
 
-async fn get_aggregation_round_info_for_batch<'a>(
+async fn get_prover_jobs_info_for_batch<'a>(
     batch_number: L1BatchNumber,
     aggregation_round: AggregationRound,
     conn: &mut Connection<'a, Prover>,
-) -> AggregationRoundInfo {
-    let status: TaskStatus = conn
-        .fri_prover_jobs_dal()
+) -> Vec<ProverJobFriInfo> {
+    conn.fri_prover_jobs_dal()
         .get_prover_jobs_stats_for_batch(batch_number, aggregation_round)
         .await
-        .into();
-
-    AggregationRoundInfo {
-        round: aggregation_round,
-        prover_jobs_status: status,
-    }
 }
 
-async fn get_proof_basic_witness_generator_status_for_batch<'a>(
+async fn get_proof_basic_witness_generator_into_for_batch<'a>(
     batch_number: L1BatchNumber,
     conn: &mut Connection<'a, Prover>,
-) -> TaskStatus {
+) -> Option<BasicWitnessGeneratorJobInfo> {
     conn.fri_witness_generator_dal()
         .get_basic_witness_generator_job_for_batch(batch_number)
         .await
-        .map(|job| TaskStatus::from(job.status))
-        .unwrap_or_default()
 }
 
-async fn get_proof_leaf_witness_generator_status_for_batch<'a>(
+async fn get_proof_leaf_witness_generator_info_for_batch<'a>(
     batch_number: L1BatchNumber,
     conn: &mut Connection<'a, Prover>,
-) -> TaskStatus {
+) -> Vec<LeafWitnessGeneratorJobInfo> {
     conn.fri_witness_generator_dal()
         .get_leaf_witness_generator_jobs_for_batch(batch_number)
         .await
-        .iter()
-        .map(|s| s.status.clone())
-        .collect::<Vec<WitnessJobStatus>>()
-        .into()
 }
 
-async fn get_proof_node_witness_generator_status_for_batch<'a>(
+async fn get_proof_node_witness_generator_info_for_batch<'a>(
     batch_number: L1BatchNumber,
     conn: &mut Connection<'a, Prover>,
-) -> TaskStatus {
+) -> Vec<NodeWitnessGeneratorJobInfo> {
     conn.fri_witness_generator_dal()
         .get_node_witness_generator_jobs_for_batch(batch_number)
         .await
-        .iter()
-        .map(|s| s.status.clone())
-        .collect::<Vec<WitnessJobStatus>>()
-        .into()
 }
 
-async fn get_proof_scheduler_witness_generator_status_for_batch<'a>(
+async fn get_proof_recursion_tip_witness_generator_info_for_batch<'a>(
+    batch_number: L1BatchNumber,
+    conn: &mut Connection<'a, Prover>,
+) -> Option<RecursionTipWitnessGeneratorJobInfo> {
+    conn.fri_witness_generator_dal()
+        .get_recursion_tip_witness_generator_jobs_for_batch(batch_number)
+        .await
+}
+
+async fn get_proof_scheduler_witness_generator_info_for_batch<'a>(
     batch_number: L1BatchNumber,
     conn: &mut Connection<'a, Prover>,
-) -> TaskStatus {
+) -> Option<SchedulerWitnessGeneratorJobInfo> {
     conn.fri_witness_generator_dal()
         .get_scheduler_witness_generator_jobs_for_batch(batch_number)
         .await
-        .iter()
-        .map(|s| s.status.clone())
-        .collect::<Vec<WitnessJobStatus>>()
-        .into()
 }
 
-async fn get_proof_compression_job_status_for_batch<'a>(
+async fn get_proof_compression_job_info_for_batch<'a>(
     batch_number: L1BatchNumber,
     conn: &mut Connection<'a, Prover>,
-) -> TaskStatus {
+) -> Option<ProofCompressionJobInfo> {
     conn.fri_proof_compressor_dal()
         .get_proof_compression_job_for_batch(batch_number)
         .await
-        .map(|job| TaskStatus::from(job.status))
-        .unwrap_or_default()
+}
+
+fn display_batch_status(batch_data: BatchData) {
+    display_status_for_stage(batch_data.basic_witness_generator);
+    display_status_for_stage(batch_data.leaf_witness_generator);
+    display_status_for_stage(batch_data.node_witness_generator);
+    display_status_for_stage(batch_data.recursion_tip_witness_generator);
+    display_status_for_stage(batch_data.scheduler_witness_generator);
+    display_status_for_stage(batch_data.compressor);
+}
+
+fn display_status_for_stage(stage_info: StageInfo) {
+    display_aggregation_round(&stage_info);
+    match stage_info.witness_generator_jobs_status() {
+        Status::Custom(msg) => {
+            println!("{}: {} \n", stage_info.to_string().bold(), msg);
+        }
+        Status::Queued | Status::WaitingForProofs | Status::Stuck | Status::JobsNotFound => {
+            println!(
+                "{}: {}",
+                stage_info.to_string().bold(),
+                stage_info.witness_generator_jobs_status()
+            )
+        }
+        Status::InProgress | Status::Successful => {
+            println!(
+                "{}: {}",
+                stage_info.to_string().bold(),
+                stage_info.witness_generator_jobs_status()
+            );
+            if let Some(job_status) = stage_info.prover_jobs_status() {
+                println!("> {}: {}", "Prover Jobs".to_owned().bold(), job_status);
+            }
+        }
+    }
+}
+
+fn display_batch_info(batch_data: BatchData) {
+    display_info_for_stage(batch_data.basic_witness_generator);
+    display_info_for_stage(batch_data.leaf_witness_generator);
+    display_info_for_stage(batch_data.node_witness_generator);
+    display_info_for_stage(batch_data.recursion_tip_witness_generator);
+    display_info_for_stage(batch_data.scheduler_witness_generator);
+    display_info_for_stage(batch_data.compressor);
+}
+
+fn display_info_for_stage(stage_info: StageInfo) {
+    display_aggregation_round(&stage_info);
+    match stage_info.witness_generator_jobs_status() {
+        Status::Custom(msg) => {
+            println!("{}: {}", stage_info.to_string().bold(), msg);
+        }
+        Status::Queued | Status::WaitingForProofs | Status::Stuck | Status::JobsNotFound => {
+            println!(
+                " > {}: {}",
+                stage_info.to_string().bold(),
+                stage_info.witness_generator_jobs_status()
+            )
+        }
+        Status::InProgress => {
+            println!(
+                "v {}: {}",
+                stage_info.to_string().bold(),
+                stage_info.witness_generator_jobs_status()
+            );
+            match stage_info {
+                StageInfo::BasicWitnessGenerator {
+                    prover_jobs_info, ..
+                } => {
+                    display_prover_jobs_info(prover_jobs_info);
+                }
+                StageInfo::LeafWitnessGenerator {
+                    witness_generator_jobs_info,
+                    prover_jobs_info,
+                } => {
+                    display_leaf_witness_generator_jobs_info(witness_generator_jobs_info);
+                    display_prover_jobs_info(prover_jobs_info);
+                }
+                StageInfo::NodeWitnessGenerator {
+                    witness_generator_jobs_info,
+                    prover_jobs_info,
+                } => {
+                    display_node_witness_generator_jobs_info(witness_generator_jobs_info);
+                    display_prover_jobs_info(prover_jobs_info);
+                }
+                _ => (),
+            }
+        }
+        Status::Successful => {
+            println!(
+                "> {}: {}",
+                stage_info.to_string().bold(),
+                stage_info.witness_generator_jobs_status()
+            );
+            match stage_info {
+                StageInfo::BasicWitnessGenerator {
+                    prover_jobs_info, ..
+                }
+                | StageInfo::LeafWitnessGenerator {
+                    prover_jobs_info, ..
+                }
+                | StageInfo::NodeWitnessGenerator {
+                    prover_jobs_info, ..
+                } => display_prover_jobs_info(prover_jobs_info),
+                _ => (),
+            }
+        }
+    }
+}
+
+fn display_leaf_witness_generator_jobs_info(
+    mut leaf_witness_generators_jobs_info: Vec<LeafWitnessGeneratorJobInfo>,
+) {
+    leaf_witness_generators_jobs_info.sort_by_key(|job| job.circuit_id);
+
+    leaf_witness_generators_jobs_info.iter().for_each(|job| {
+        println!(
+            "   > {}: {}",
+            format!(
+                "{:?}",
+                BaseLayerCircuitType::from_numeric_value(job.circuit_id as u8)
+            )
+            .bold(),
+            Status::from(job.status.clone())
+        )
+    });
+}
+
+fn display_node_witness_generator_jobs_info(
+    mut node_witness_generators_jobs_info: Vec<NodeWitnessGeneratorJobInfo>,
+) {
+    node_witness_generators_jobs_info.sort_by_key(|job| job.circuit_id);
+
+    node_witness_generators_jobs_info.iter().for_each(|job| {
+        println!(
+            "   > {}: {}",
+            format!(
+                "{:?}",
+                BaseLayerCircuitType::from_numeric_value(job.circuit_id as u8)
+            )
+            .bold(),
+            Status::from(job.status.clone())
+        )
+    });
+}
+
+fn display_prover_jobs_info(prover_jobs_info: Vec<ProverJobFriInfo>) {
+    let prover_jobs_status = Status::from(prover_jobs_info.clone());
+
+    if matches!(prover_jobs_status, Status::Successful)
+        || matches!(prover_jobs_status, Status::JobsNotFound)
+    {
+        println!(
+            "> {}: {prover_jobs_status}",
+            "Prover Jobs".to_owned().bold()
+        );
+        return;
+    }
+
+    println!(
+        "v {}: {prover_jobs_status}",
+        "Prover Jobs".to_owned().bold()
+    );
+
+    let mut jobs_by_circuit_id: BTreeMap<u32, Vec<ProverJobFriInfo>> = BTreeMap::new();
+    prover_jobs_info.iter().for_each(|job| {
+        jobs_by_circuit_id
+            .entry(job.circuit_id)
+            .or_default()
+            .push(job.clone())
+    });
+
+    for (circuit_id, prover_jobs_info) in jobs_by_circuit_id {
+        let status = Status::from(prover_jobs_info.clone());
+        println!(
+            "   > {}: {}",
+            format!(
+                "{:?}",
+                BaseLayerCircuitType::from_numeric_value(circuit_id as u8)
+            )
+            .bold(),
+            status
+        );
+        if matches!(status, Status::InProgress) {
+            display_job_status_count(prover_jobs_info);
+        }
+    }
+}
+
+fn display_job_status_count(jobs: Vec<ProverJobFriInfo>) {
+    let mut jobs_counts = ExtendedJobCountStatistics::default();
+    let total_jobs = jobs.len();
+    jobs.iter().for_each(|job| match job.status {
+        ProverJobStatus::Queued => jobs_counts.queued += 1,
+        ProverJobStatus::InProgress(_) => jobs_counts.in_progress += 1,
+        ProverJobStatus::Successful(_) => jobs_counts.successful += 1,
+        ProverJobStatus::Failed(_) => jobs_counts.failed += 1,
+        ProverJobStatus::Skipped | ProverJobStatus::Ignored | ProverJobStatus::InGPUProof => (),
+    });
+
+    println!("     - Total jobs: {}", total_jobs);
+    println!("     - Successful: {}", jobs_counts.successful);
+    println!("     - In Progress: {}", jobs_counts.in_progress);
+    println!("     - Queued: {}", jobs_counts.queued);
+    println!("     - Failed: {}", jobs_counts.failed);
+}
+
+fn display_aggregation_round(stage_info: &StageInfo) {
+    if let Some(aggregation_round) = stage_info.aggregation_round() {
+        println!(
+            "\n-- {} --",
+            format!("Aggregation Round {}", aggregation_round as u8).bold()
+        );
+    } else {
+        println!("\n-- {} --", "Proof Compression".to_owned().bold());
+    };
 }
diff --git a/prover/prover_cli/src/commands/status/l1.rs b/prover/prover_cli/src/commands/status/l1.rs
index 19e5c3c4fa1c..128005c309c6 100644
--- a/prover/prover_cli/src/commands/status/l1.rs
+++ b/prover/prover_cli/src/commands/status/l1.rs
@@ -1,25 +1,35 @@
 use anyhow::Context;
-use prover_dal::{Prover, ProverDal};
 use zksync_basic_types::{
     protocol_version::{L1VerifierConfig, VerifierParams},
     L1BatchNumber, H256, U256,
 };
-use zksync_config::{ContractsConfig, EthConfig, PostgresConfig};
+use zksync_config::{
+    configs::{DatabaseSecrets, L1Secrets},
+    ContractsConfig, PostgresConfig,
+};
 use zksync_dal::{ConnectionPool, Core, CoreDal};
 use zksync_env_config::FromEnv;
-use zksync_eth_client::{clients::QueryClient, CallFunctionArgs};
+use zksync_eth_client::{
+    clients::{Client, L1},
+    CallFunctionArgs,
+};
+use zksync_prover_dal::{Prover, ProverDal};
+
+use crate::helper;
 
 pub(crate) async fn run() -> anyhow::Result<()> {
     println!(" ====== L1 Status ====== ");
     let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env")?;
     let contracts_config = ContractsConfig::from_env().context("ContractsConfig::from_env()")?;
-    let eth_config = EthConfig::from_env().context("EthConfig::from_env")?;
-    let query_client = QueryClient::new(eth_config.web3_url)?;
+
+    let database_secrets = DatabaseSecrets::from_env().context("DatabaseSecrets::from_env()")?;
+    let l1_secrets = L1Secrets::from_env().context("L1Secrets::from_env()")?;
+    let query_client = Client::<L1>::http(l1_secrets.l1_rpc_url)?.build();
 
     let total_batches_committed: U256 = CallFunctionArgs::new("getTotalBatchesCommitted", ())
         .for_contract(
             contracts_config.diamond_proxy_addr,
-            &zksync_contracts::hyperchain_contract(),
+            &helper::hyperchain_contract(),
         )
         .call(&query_client)
         .await?;
@@ -27,13 +37,13 @@ pub(crate) async fn run() -> anyhow::Result<()> {
     let total_batches_verified: U256 = CallFunctionArgs::new("getTotalBatchesVerified", ())
         .for_contract(
             contracts_config.diamond_proxy_addr,
-            &zksync_contracts::hyperchain_contract(),
+            &helper::hyperchain_contract(),
         )
         .call(&query_client)
         .await?;
 
     let connection_pool = ConnectionPool::<Core>::builder(
-        postgres_config
+        database_secrets
             .replica_url()
             .context("postgres_config.replica_url()")?,
         postgres_config
@@ -66,17 +76,14 @@ pub(crate) async fn run() -> anyhow::Result<()> {
     );
 
     let node_verification_key_hash: H256 = CallFunctionArgs::new("verificationKeyHash", ())
-        .for_contract(
-            contracts_config.verifier_addr,
-            &zksync_contracts::verifier_contract(),
-        )
+        .for_contract(contracts_config.verifier_addr, &helper::verifier_contract())
         .call(&query_client)
         .await?;
 
     let node_verifier_params: VerifierParams = CallFunctionArgs::new("getVerifierParams", ())
         .for_contract(
             contracts_config.diamond_proxy_addr,
-            &zksync_contracts::hyperchain_contract(),
+            &helper::hyperchain_contract(),
         )
         .call(&query_client)
         .await?;
@@ -87,7 +94,7 @@ pub(crate) async fn run() -> anyhow::Result<()> {
     };
 
     let prover_connection_pool = ConnectionPool::<Prover>::builder(
-        postgres_config
+        database_secrets
             .prover_url()
             .context("postgres_config.replica_url()")?,
         postgres_config
diff --git a/prover/prover_cli/src/commands/status/utils.rs b/prover/prover_cli/src/commands/status/utils.rs
index 3312149359b6..31726e749209 100644
--- a/prover/prover_cli/src/commands/status/utils.rs
+++ b/prover/prover_cli/src/commands/status/utils.rs
@@ -1,10 +1,13 @@
 use std::fmt::Debug;
 
-use colored::*;
 use strum::{Display, EnumString};
 use zksync_types::{
     basic_fri_types::AggregationRound,
-    prover_dal::{ProofCompressionJobStatus, ProverJobFriInfo, ProverJobStatus, WitnessJobStatus},
+    prover_dal::{
+        BasicWitnessGeneratorJobInfo, LeafWitnessGeneratorJobInfo, NodeWitnessGeneratorJobInfo,
+        ProofCompressionJobInfo, ProofCompressionJobStatus, ProverJobFriInfo, ProverJobStatus,
+        RecursionTipWitnessGeneratorJobInfo, SchedulerWitnessGeneratorJobInfo, WitnessJobStatus,
+    },
     L1BatchNumber,
 };
 
@@ -13,83 +16,21 @@ pub struct BatchData {
     /// The number of the batch.
     pub batch_number: L1BatchNumber,
     /// The basic witness generator data.
-    pub basic_witness_generator: Task,
+    pub basic_witness_generator: StageInfo,
     /// The leaf witness generator data.
-    pub leaf_witness_generator: Task,
+    pub leaf_witness_generator: StageInfo,
     /// The node witness generator data.
-    pub node_witness_generator: Task,
+    pub node_witness_generator: StageInfo,
     /// The recursion tip data.
-    pub recursion_tip: Task,
+    pub recursion_tip_witness_generator: StageInfo,
     /// The scheduler data.
-    pub scheduler_witness_generator: Task,
+    pub scheduler_witness_generator: StageInfo,
     /// The compressor data.
-    pub compressor: Task,
-}
-
-impl Debug for BatchData {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        writeln!(
-            f,
-            "== {} ==",
-            format!("Batch {} Status", self.batch_number).bold()
-        )?;
-        writeln!(f)?;
-        writeln!(f, "= {} =", "Proving Stages".to_owned().bold())?;
-        writeln!(f, "{:?}", self.basic_witness_generator)?;
-        writeln!(f, "{:?}", self.leaf_witness_generator)?;
-        writeln!(f, "{:?}", self.node_witness_generator)?;
-        writeln!(f, "{:?}", self.recursion_tip)?;
-        writeln!(f, "{:?}", self.scheduler_witness_generator)?;
-        writeln!(f, "{:?}", self.compressor)
-    }
-}
-
-impl Default for BatchData {
-    fn default() -> Self {
-        BatchData {
-            batch_number: L1BatchNumber::default(),
-            basic_witness_generator: Task::BasicWitnessGenerator {
-                status: TaskStatus::default(),
-                aggregation_round_info: AggregationRoundInfo {
-                    round: AggregationRound::BasicCircuits,
-                    prover_jobs_status: TaskStatus::default(),
-                },
-            },
-            leaf_witness_generator: Task::LeafWitnessGenerator {
-                status: TaskStatus::default(),
-                aggregation_round_info: AggregationRoundInfo {
-                    round: AggregationRound::LeafAggregation,
-                    prover_jobs_status: TaskStatus::default(),
-                },
-            },
-            node_witness_generator: Task::NodeWitnessGenerator {
-                status: TaskStatus::default(),
-                aggregation_round_info: AggregationRoundInfo {
-                    round: AggregationRound::NodeAggregation,
-                    prover_jobs_status: TaskStatus::default(),
-                },
-            },
-            recursion_tip: Task::RecursionTip {
-                status: TaskStatus::default(),
-                aggregation_round_info: AggregationRoundInfo {
-                    round: AggregationRound::Scheduler,
-                    prover_jobs_status: TaskStatus::default(),
-                },
-            },
-            scheduler_witness_generator: Task::SchedulerWitnessGenerator {
-                status: TaskStatus::default(),
-                aggregation_round_info: AggregationRoundInfo {
-                    round: AggregationRound::Scheduler,
-                    prover_jobs_status: TaskStatus::default(),
-                },
-            },
-            compressor: Task::Compressor(TaskStatus::JobsNotFound),
-        }
-    }
+    pub compressor: StageInfo,
 }
 
 #[derive(Default, Debug, EnumString, Clone, Display)]
-pub enum TaskStatus {
+pub enum Status {
     /// A custom status that can be set manually.
     /// Mostly used when a task has singular status.
     Custom(String),
@@ -114,230 +55,207 @@ pub enum TaskStatus {
     JobsNotFound,
 }
 
-// This implementation will change to From<Vec<ProverJobFriInfo>> for `AggregationRoundInfo`
-// once the --verbose flag is implemented.
-impl From<Vec<ProverJobFriInfo>> for TaskStatus {
-    fn from(jobs_vector: Vec<ProverJobFriInfo>) -> Self {
-        if jobs_vector.is_empty() {
-            TaskStatus::JobsNotFound
-        } else if jobs_vector
+impl From<WitnessJobStatus> for Status {
+    fn from(status: WitnessJobStatus) -> Self {
+        match status {
+            WitnessJobStatus::Queued => Status::Queued,
+            WitnessJobStatus::InProgress => Status::InProgress,
+            WitnessJobStatus::Successful(_) => Status::Successful,
+            WitnessJobStatus::Failed(_) => Status::InProgress,
+            WitnessJobStatus::WaitingForArtifacts => {
+                Status::Custom("Waiting for Artifacts ⏱️".to_owned())
+            }
+            WitnessJobStatus::Skipped => Status::Custom("Skipped ⏩".to_owned()),
+            WitnessJobStatus::WaitingForProofs => Status::WaitingForProofs,
+        }
+    }
+}
+
+impl From<Vec<WitnessJobStatus>> for Status {
+    fn from(status_vector: Vec<WitnessJobStatus>) -> Self {
+        if status_vector.is_empty() {
+            Status::JobsNotFound
+        } else if status_vector
             .iter()
-            .all(|job| matches!(job.status, ProverJobStatus::Queued))
+            .all(|job| matches!(job, WitnessJobStatus::WaitingForProofs))
         {
-            TaskStatus::Queued
-        } else if jobs_vector
+            Status::WaitingForProofs
+        } else if status_vector.iter().all(|job| {
+            matches!(job, WitnessJobStatus::Queued)
+                || matches!(job, WitnessJobStatus::WaitingForProofs)
+        }) {
+            Status::Queued
+        } else if status_vector
             .iter()
-            .all(|job| matches!(job.status, ProverJobStatus::InProgress(_)))
+            .all(|job| matches!(job, WitnessJobStatus::Successful(_)))
         {
-            TaskStatus::Successful
+            Status::Successful
         } else {
-            TaskStatus::InProgress
+            Status::InProgress
         }
     }
 }
 
-impl From<ProofCompressionJobStatus> for TaskStatus {
+impl From<Vec<LeafWitnessGeneratorJobInfo>> for Status {
+    fn from(leaf_info_vector: Vec<LeafWitnessGeneratorJobInfo>) -> Self {
+        leaf_info_vector
+            .iter()
+            .map(|s| s.status.clone())
+            .collect::<Vec<WitnessJobStatus>>()
+            .into()
+    }
+}
+
+impl From<Vec<NodeWitnessGeneratorJobInfo>> for Status {
+    fn from(node_info_vector: Vec<NodeWitnessGeneratorJobInfo>) -> Self {
+        node_info_vector
+            .iter()
+            .map(|s| s.status.clone())
+            .collect::<Vec<WitnessJobStatus>>()
+            .into()
+    }
+}
+
+impl From<Vec<RecursionTipWitnessGeneratorJobInfo>> for Status {
+    fn from(scheduler_info_vector: Vec<RecursionTipWitnessGeneratorJobInfo>) -> Self {
+        scheduler_info_vector
+            .iter()
+            .map(|s| s.status.clone())
+            .collect::<Vec<WitnessJobStatus>>()
+            .into()
+    }
+}
+
+impl From<Vec<SchedulerWitnessGeneratorJobInfo>> for Status {
+    fn from(scheduler_info_vector: Vec<SchedulerWitnessGeneratorJobInfo>) -> Self {
+        scheduler_info_vector
+            .iter()
+            .map(|s| s.status.clone())
+            .collect::<Vec<WitnessJobStatus>>()
+            .into()
+    }
+}
+
+impl From<ProofCompressionJobStatus> for Status {
     fn from(status: ProofCompressionJobStatus) -> Self {
         match status {
-            ProofCompressionJobStatus::Queued => TaskStatus::Queued,
-            ProofCompressionJobStatus::InProgress => TaskStatus::InProgress,
-            ProofCompressionJobStatus::Successful => TaskStatus::Successful,
-            ProofCompressionJobStatus::Failed => TaskStatus::InProgress,
+            ProofCompressionJobStatus::Queued => Status::Queued,
+            ProofCompressionJobStatus::InProgress => Status::InProgress,
+            ProofCompressionJobStatus::Successful => Status::Successful,
+            ProofCompressionJobStatus::Failed => Status::InProgress,
             ProofCompressionJobStatus::SentToServer => {
-                TaskStatus::Custom("Sent to server 📤".to_owned())
+                Status::Custom("Sent to server 📤".to_owned())
             }
-            ProofCompressionJobStatus::Skipped => TaskStatus::Custom("Skipped ⏩".to_owned()),
+            ProofCompressionJobStatus::Skipped => Status::Custom("Skipped ⏩".to_owned()),
         }
     }
 }
 
-impl From<Vec<WitnessJobStatus>> for TaskStatus {
-    fn from(status_vector: Vec<WitnessJobStatus>) -> Self {
-        if status_vector.is_empty() {
-            TaskStatus::JobsNotFound
-        } else if status_vector
+impl From<Vec<ProverJobFriInfo>> for Status {
+    fn from(jobs_vector: Vec<ProverJobFriInfo>) -> Self {
+        if jobs_vector.is_empty() {
+            Status::JobsNotFound
+        } else if jobs_vector
             .iter()
-            .all(|job| matches!(job, WitnessJobStatus::Queued))
+            .all(|job| matches!(job.status, ProverJobStatus::InGPUProof))
         {
-            TaskStatus::Queued
-        } else if status_vector
+            Status::Custom("In GPU Proof ⚡️".to_owned())
+        } else if jobs_vector
             .iter()
-            .all(|job| matches!(job, WitnessJobStatus::WaitingForProofs))
+            .all(|job| matches!(job.status, ProverJobStatus::Queued))
         {
-            TaskStatus::WaitingForProofs
-        } else if status_vector
+            Status::Queued
+        } else if jobs_vector
             .iter()
-            .all(|job| matches!(job, WitnessJobStatus::InProgress))
+            .all(|job| matches!(job.status, ProverJobStatus::Successful(_)))
         {
-            TaskStatus::Successful
+            Status::Successful
         } else {
-            TaskStatus::InProgress
+            Status::InProgress
         }
     }
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(EnumString, Clone, Display)]
-pub enum Task {
-    /// Represents the basic witness generator task and its status.
+pub enum StageInfo {
     #[strum(to_string = "Basic Witness Generator")]
     BasicWitnessGenerator {
-        status: TaskStatus,
-        aggregation_round_info: AggregationRoundInfo,
+        witness_generator_job_info: Option<BasicWitnessGeneratorJobInfo>,
+        prover_jobs_info: Vec<ProverJobFriInfo>,
     },
-    /// Represents the leaf witness generator task, its status and the aggregation round 0 prover jobs data.
     #[strum(to_string = "Leaf Witness Generator")]
     LeafWitnessGenerator {
-        status: TaskStatus,
-        aggregation_round_info: AggregationRoundInfo,
+        witness_generator_jobs_info: Vec<LeafWitnessGeneratorJobInfo>,
+        prover_jobs_info: Vec<ProverJobFriInfo>,
     },
-    /// Represents the node witness generator task, its status and the aggregation round 1 prover jobs data.
     #[strum(to_string = "Node Witness Generator")]
     NodeWitnessGenerator {
-        status: TaskStatus,
-        aggregation_round_info: AggregationRoundInfo,
+        witness_generator_jobs_info: Vec<NodeWitnessGeneratorJobInfo>,
+        prover_jobs_info: Vec<ProverJobFriInfo>,
     },
-    /// Represents the recursion tip task, its status and the aggregation round 2 prover jobs data.
     #[strum(to_string = "Recursion Tip")]
-    RecursionTip {
-        status: TaskStatus,
-        aggregation_round_info: AggregationRoundInfo,
-    },
-    /// Represents the scheduler task and its status.
+    RecursionTipWitnessGenerator(Option<RecursionTipWitnessGeneratorJobInfo>),
     #[strum(to_string = "Scheduler")]
-    SchedulerWitnessGenerator {
-        status: TaskStatus,
-        aggregation_round_info: AggregationRoundInfo,
-    },
-    /// Represents the compressor task and its status.
+    SchedulerWitnessGenerator(Option<SchedulerWitnessGeneratorJobInfo>),
     #[strum(to_string = "Compressor")]
-    Compressor(TaskStatus),
+    Compressor(Option<ProofCompressionJobInfo>),
 }
 
-impl Task {
-    fn status(&self) -> TaskStatus {
-        match self {
-            Task::BasicWitnessGenerator { status, .. }
-            | Task::LeafWitnessGenerator { status, .. }
-            | Task::NodeWitnessGenerator { status, .. }
-            | Task::RecursionTip { status, .. }
-            | Task::SchedulerWitnessGenerator { status, .. }
-            | Task::Compressor(status) => status.clone(),
-        }
-    }
-
-    fn aggregation_round(&self) -> Option<AggregationRound> {
-        match self {
-            Task::BasicWitnessGenerator {
-                aggregation_round_info,
-                ..
-            }
-            | Task::LeafWitnessGenerator {
-                aggregation_round_info,
-                ..
-            }
-            | Task::NodeWitnessGenerator {
-                aggregation_round_info,
-                ..
-            }
-            | Task::RecursionTip {
-                aggregation_round_info,
-                ..
-            }
-            | Task::SchedulerWitnessGenerator {
-                aggregation_round_info,
-                ..
-            } => Some(aggregation_round_info.round),
-            Task::Compressor(_) => None,
-        }
-    }
-
-    /// Returns the status of the prover jobs.
-    /// If the task is not in progress or successful, returns None.
-    /// Otherwise, returns the status of the prover jobs if the task
-    /// has prover jobs.
-    fn prover_jobs_status(&self) -> Option<TaskStatus> {
+impl StageInfo {
+    pub fn aggregation_round(&self) -> Option<AggregationRound> {
         match self {
-            Task::BasicWitnessGenerator {
-                status,
-                aggregation_round_info,
-            }
-            | Task::LeafWitnessGenerator {
-                status,
-                aggregation_round_info,
-            }
-            | Task::NodeWitnessGenerator {
-                status,
-                aggregation_round_info,
-            }
-            | Task::RecursionTip {
-                status,
-                aggregation_round_info,
-            }
-            | Task::SchedulerWitnessGenerator {
-                status,
-                aggregation_round_info,
-            } => match status {
-                TaskStatus::InProgress | TaskStatus::Successful => {
-                    Some(aggregation_round_info.prover_jobs_status.clone())
-                }
-                _ => None,
-            },
-            Task::Compressor(_) => None,
+            StageInfo::BasicWitnessGenerator { .. } => Some(AggregationRound::BasicCircuits),
+            StageInfo::LeafWitnessGenerator { .. } => Some(AggregationRound::LeafAggregation),
+            StageInfo::NodeWitnessGenerator { .. } => Some(AggregationRound::NodeAggregation),
+            StageInfo::RecursionTipWitnessGenerator { .. } => Some(AggregationRound::RecursionTip),
+            StageInfo::SchedulerWitnessGenerator { .. } => Some(AggregationRound::Scheduler),
+            StageInfo::Compressor(_) => None,
         }
     }
-}
 
-impl Debug for Task {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        if let Some(aggregation_round_number) = self.aggregation_round() {
-            writeln!(
-                f,
-                "-- {} --",
-                format!("Aggregation Round {}", aggregation_round_number as u8).bold()
-            )?;
-            if let TaskStatus::Custom(msg) = self.status() {
-                writeln!(f, "{}: {}", self.to_string().bold(), msg)?;
-            } else {
-                writeln!(f, "{}: {}", self.to_string().bold(), self.status())?;
+    pub fn prover_jobs_status(&self) -> Option<Status> {
+        match self.clone() {
+            StageInfo::BasicWitnessGenerator {
+                prover_jobs_info, ..
             }
-            if let Some(prover_jobs_status) = self.prover_jobs_status() {
-                writeln!(f, "> Prover Jobs: {prover_jobs_status}")?;
+            | StageInfo::LeafWitnessGenerator {
+                prover_jobs_info, ..
             }
-        } else {
-            writeln!(f, "-- {} --", self.to_string().bold())?;
-            writeln!(f, "{}", self.status())?;
+            | StageInfo::NodeWitnessGenerator {
+                prover_jobs_info, ..
+            } => Some(Status::from(prover_jobs_info)),
+            StageInfo::RecursionTipWitnessGenerator(_)
+            | StageInfo::SchedulerWitnessGenerator(_)
+            | StageInfo::Compressor(_) => None,
         }
-        Ok(())
     }
-}
 
-impl From<WitnessJobStatus> for TaskStatus {
-    fn from(status: WitnessJobStatus) -> Self {
-        match status {
-            WitnessJobStatus::Queued => TaskStatus::Queued,
-            WitnessJobStatus::InProgress => TaskStatus::InProgress,
-            WitnessJobStatus::Successful(_) => TaskStatus::Successful,
-            WitnessJobStatus::Failed(_) => TaskStatus::InProgress,
-            WitnessJobStatus::WaitingForArtifacts => {
-                TaskStatus::Custom("Waiting for Artifacts ⏱️".to_owned())
-            }
-            WitnessJobStatus::Skipped => TaskStatus::Custom("Skipped ⏩".to_owned()),
-            WitnessJobStatus::WaitingForProofs => TaskStatus::WaitingForProofs,
-        }
-    }
-}
-
-#[derive(Clone)]
-pub struct AggregationRoundInfo {
-    pub round: AggregationRound,
-    pub prover_jobs_status: TaskStatus,
-}
-
-impl Default for AggregationRoundInfo {
-    fn default() -> Self {
-        AggregationRoundInfo {
-            round: AggregationRound::BasicCircuits,
-            prover_jobs_status: TaskStatus::default(),
+    pub fn witness_generator_jobs_status(&self) -> Status {
+        match self.clone() {
+            StageInfo::BasicWitnessGenerator {
+                witness_generator_job_info,
+                ..
+            } => witness_generator_job_info
+                .map(|witness_generator_job_info| Status::from(witness_generator_job_info.status))
+                .unwrap_or_default(),
+            StageInfo::LeafWitnessGenerator {
+                witness_generator_jobs_info,
+                ..
+            } => Status::from(witness_generator_jobs_info),
+            StageInfo::NodeWitnessGenerator {
+                witness_generator_jobs_info,
+                ..
+            } => Status::from(witness_generator_jobs_info),
+            StageInfo::RecursionTipWitnessGenerator(status) => status
+                .map(|job| Status::from(job.status))
+                .unwrap_or_default(),
+            StageInfo::SchedulerWitnessGenerator(status) => status
+                .map(|job| Status::from(job.status))
+                .unwrap_or_default(),
+            StageInfo::Compressor(status) => status
+                .map(|job| Status::from(job.status))
+                .unwrap_or_default(),
         }
     }
 }
diff --git a/prover/prover_cli/src/config/mod.rs b/prover/prover_cli/src/config/mod.rs
new file mode 100644
index 000000000000..3d99f2be3b2c
--- /dev/null
+++ b/prover/prover_cli/src/config/mod.rs
@@ -0,0 +1,51 @@
+use std::{io::Write, path::PathBuf};
+
+use crate::helper::core_workspace_dir_or_current_dir;
+
+pub fn get_envfile() -> anyhow::Result<PathBuf> {
+    if let Ok(envfile) = std::env::var("PLI__CONFIG") {
+        return Ok(envfile.into());
+    }
+    Ok(core_workspace_dir_or_current_dir().join("etc/pliconfig"))
+}
+
+pub fn load_envfile(path: impl AsRef<std::path::Path>) -> anyhow::Result<()> {
+    std::fs::read_to_string(path)?
+        .lines()
+        .filter(|l| !l.starts_with('#'))
+        .filter_map(|l| l.split_once('='))
+        .for_each(|(k, v)| std::env::set_var(k, v));
+    Ok(())
+}
+
+pub fn update_envfile(
+    path: impl AsRef<std::path::Path> + std::marker::Copy,
+    key: impl AsRef<str>,
+    value: impl AsRef<str>,
+) -> anyhow::Result<()> {
+    let prefix = format!("{}=", key.as_ref());
+    let kv = format!("{}={}", key.as_ref(), value.as_ref());
+    let swapfile = path.as_ref().with_extension(".swp");
+    let mut out = std::io::BufWriter::new(std::fs::File::create(&swapfile)?);
+    let mut found = false;
+
+    std::fs::read_to_string(path)
+        .unwrap_or_default()
+        .lines()
+        .map(|l| {
+            if l.starts_with(&prefix) {
+                found = true;
+                kv.clone()
+            } else {
+                l.to_string()
+            }
+        })
+        .try_for_each(|l| writeln!(&mut out, "{}", l))?;
+    if !found {
+        writeln!(&mut out, "{}", kv)?;
+    }
+    out.flush()?;
+    std::fs::rename(swapfile, path)?;
+
+    Ok(())
+}
diff --git a/prover/prover_cli/src/examples/pliconfig b/prover/prover_cli/src/examples/pliconfig
new file mode 100644
index 000000000000..5a870cd031d7
--- /dev/null
+++ b/prover/prover_cli/src/examples/pliconfig
@@ -0,0 +1,2 @@
+### PLI__DB_URL: full URL for connecting to the prover DB
+PLI__DB_URL=postgres://postgres:notsecurepassword@localhost/prover_local_default_from_env
diff --git a/prover/prover_cli/src/helper.rs b/prover/prover_cli/src/helper.rs
new file mode 100644
index 000000000000..352a789baed7
--- /dev/null
+++ b/prover/prover_cli/src/helper.rs
@@ -0,0 +1,47 @@
+use std::{
+    fs::File,
+    path::{Path, PathBuf},
+};
+
+use zksync_types::ethabi::Contract;
+use zksync_utils::locate_workspace;
+
+const ZKSYNC_HYPERCHAIN_CONTRACT_FILE: &str =
+    "contracts/l1-contracts/artifacts/contracts/state-transition/chain-interfaces/IZkSyncHyperchain.sol/IZkSyncHyperchain.json";
+const VERIFIER_CONTRACT_FILE: &str =
+    "contracts/l1-contracts/artifacts/contracts/state-transition/Verifier.sol/Verifier.json";
+
+pub fn hyperchain_contract() -> Contract {
+    load_contract_if_present(ZKSYNC_HYPERCHAIN_CONTRACT_FILE)
+}
+
+pub fn verifier_contract() -> Contract {
+    load_contract_if_present(VERIFIER_CONTRACT_FILE)
+}
+
+fn read_file_to_json_value(path: &PathBuf) -> serde_json::Value {
+    serde_json::from_reader(
+        File::open(path).unwrap_or_else(|e| panic!("Failed to open file {:?}: {}", path, e)),
+    )
+    .unwrap_or_else(|e| panic!("Failed to parse file {:?}: {}", path, e))
+}
+
+fn load_contract_if_present(path: &str) -> Contract {
+    let home = core_workspace_dir_or_current_dir();
+    let path = Path::new(&home).join(path);
+    path.exists()
+        .then(|| {
+            serde_json::from_value(read_file_to_json_value(&path)["abi"].take()).unwrap_or_else(
+                |e| panic!("Failed to parse contract abi from file {:?}: {}", path, e),
+            )
+        })
+        .unwrap_or_else(|| {
+            panic!("Failed to load contract from {:?}", path);
+        })
+}
+
+pub fn core_workspace_dir_or_current_dir() -> PathBuf {
+    locate_workspace()
+        .map(|a| a.join(".."))
+        .unwrap_or_else(|| PathBuf::from("."))
+}
diff --git a/prover/prover_cli/src/lib.rs b/prover/prover_cli/src/lib.rs
index 3ef8b313f0c2..7c1df326d396 100644
--- a/prover/prover_cli/src/lib.rs
+++ b/prover/prover_cli/src/lib.rs
@@ -1,2 +1,4 @@
 pub mod cli;
-mod commands;
+pub mod commands;
+pub mod config;
+pub mod helper;
diff --git a/prover/prover_cli/src/main.rs b/prover/prover_cli/src/main.rs
index 4bc0908a4f83..b393fad6a31b 100644
--- a/prover/prover_cli/src/main.rs
+++ b/prover/prover_cli/src/main.rs
@@ -1,10 +1,19 @@
-use prover_cli::cli;
+use prover_cli::{cli, config};
 
 #[tokio::main]
 async fn main() {
     tracing_subscriber::fmt()
         .with_max_level(tracing::Level::ERROR)
         .init();
+
+    config::get_envfile()
+        .and_then(config::load_envfile)
+        .inspect_err(|err| {
+            tracing::error!("{err:?}");
+            std::process::exit(1);
+        })
+        .unwrap();
+
     match cli::start().await {
         Ok(_) => {}
         Err(err) => {
diff --git a/prover/prover_dal/.sqlx/query-48070aa2fe226a63fd4b0f6c21967cbce0215b4a2eeeb41f92c300080934d018.json b/prover/prover_dal/.sqlx/query-02f2010c60dfa5b93d3f2ee7594579b23540815afa1c6a8d4c36bba951861fe7.json
similarity index 82%
rename from prover/prover_dal/.sqlx/query-48070aa2fe226a63fd4b0f6c21967cbce0215b4a2eeeb41f92c300080934d018.json
rename to prover/prover_dal/.sqlx/query-02f2010c60dfa5b93d3f2ee7594579b23540815afa1c6a8d4c36bba951861fe7.json
index 6e86a76d7341..b076553ff34e 100644
--- a/prover/prover_dal/.sqlx/query-48070aa2fe226a63fd4b0f6c21967cbce0215b4a2eeeb41f92c300080934d018.json
+++ b/prover/prover_dal/.sqlx/query-02f2010c60dfa5b93d3f2ee7594579b23540815afa1c6a8d4c36bba951861fe7.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                circuit_id,\n                id\n            FROM\n                prover_jobs_fri\n            WHERE\n                l1_batch_number = $1\n                AND is_node_final_proof = true\n                AND status = 'successful'\n            ORDER BY\n                circuit_id ASC\n            ",
+  "query": "\n            SELECT\n                circuit_id,\n                id\n            FROM\n                prover_jobs_fri\n            WHERE\n                l1_batch_number = $1\n                AND is_node_final_proof = TRUE\n                AND status = 'successful'\n            ORDER BY\n                circuit_id ASC\n            ",
   "describe": {
     "columns": [
       {
@@ -24,5 +24,5 @@
       false
     ]
   },
-  "hash": "48070aa2fe226a63fd4b0f6c21967cbce0215b4a2eeeb41f92c300080934d018"
+  "hash": "02f2010c60dfa5b93d3f2ee7594579b23540815afa1c6a8d4c36bba951861fe7"
 }
diff --git a/prover/prover_dal/.sqlx/query-d7b6196cfc17182b5280d0a13f873281bc865cc67b824af6ca3a76ae6065f151.json b/prover/prover_dal/.sqlx/query-069f04bdfafbe2e3628ac3ded93dab9b63eee7f21c450a723e4ba011edc8e2bb.json
similarity index 67%
rename from prover/prover_dal/.sqlx/query-d7b6196cfc17182b5280d0a13f873281bc865cc67b824af6ca3a76ae6065f151.json
rename to prover/prover_dal/.sqlx/query-069f04bdfafbe2e3628ac3ded93dab9b63eee7f21c450a723e4ba011edc8e2bb.json
index d0e366aee009..cdb38168b8a1 100644
--- a/prover/prover_dal/.sqlx/query-d7b6196cfc17182b5280d0a13f873281bc865cc67b824af6ca3a76ae6065f151.json
+++ b/prover/prover_dal/.sqlx/query-069f04bdfafbe2e3628ac3ded93dab9b63eee7f21c450a723e4ba011edc8e2bb.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            WITH deleted AS (\n                DELETE FROM gpu_prover_queue_fri\n                WHERE\n                    instance_status = 'dead'\n                        AND updated_at < NOW() - $1::INTERVAL\n                RETURNING id,\n                    instance_host,\n                    instance_port,\n                    instance_status,\n                    specialized_prover_group_id,\n                    zone,\n                    created_at,\n                    updated_at,\n                    processing_started_at,\n                    NOW() as archived_at,\n                    protocol_version\n            ),\n            inserted_count AS (\n                INSERT INTO gpu_prover_queue_fri_archive\n                SELECT * FROM deleted\n            )\n            SELECT COUNT(*) FROM deleted\n            ",
+  "query": "\n            WITH deleted AS (\n                DELETE FROM gpu_prover_queue_fri\n                WHERE\n                    instance_status = 'dead'\n                        AND updated_at < NOW() - $1::INTERVAL\n                RETURNING id,\n                    instance_host,\n                    instance_port,\n                    instance_status,\n                    specialized_prover_group_id,\n                    zone,\n                    created_at,\n                    updated_at,\n                    processing_started_at,\n                    NOW() as archived_at,\n                    protocol_version,\n                    protocol_version_patch\n            ),\n            inserted_count AS (\n                INSERT INTO gpu_prover_queue_fri_archive\n                SELECT * FROM deleted\n            )\n            SELECT COUNT(*) FROM deleted\n            ",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       null
     ]
   },
-  "hash": "d7b6196cfc17182b5280d0a13f873281bc865cc67b824af6ca3a76ae6065f151"
+  "hash": "069f04bdfafbe2e3628ac3ded93dab9b63eee7f21c450a723e4ba011edc8e2bb"
 }
diff --git a/prover/prover_dal/.sqlx/query-081e2b928f0816c41d6645c1dedbb3402044d201e85e114ff4582394c32bd2bf.json b/prover/prover_dal/.sqlx/query-081e2b928f0816c41d6645c1dedbb3402044d201e85e114ff4582394c32bd2bf.json
new file mode 100644
index 000000000000..918fb2817d26
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-081e2b928f0816c41d6645c1dedbb3402044d201e85e114ff4582394c32bd2bf.json
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                comp.l1_batch_number,\n                (comp.updated_at - wit.created_at) AS time_taken,\n                wit.created_at\n            FROM\n                proof_compression_jobs_fri AS comp\n                JOIN witness_inputs_fri AS wit ON comp.l1_batch_number = wit.l1_batch_number\n            WHERE\n                wit.created_at > $1\n            ORDER BY\n                time_taken DESC;\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "time_taken",
+        "type_info": "Interval"
+      },
+      {
+        "ordinal": 2,
+        "name": "created_at",
+        "type_info": "Timestamp"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Timestamp"
+      ]
+    },
+    "nullable": [
+      false,
+      null,
+      false
+    ]
+  },
+  "hash": "081e2b928f0816c41d6645c1dedbb3402044d201e85e114ff4582394c32bd2bf"
+}
diff --git a/prover/prover_dal/.sqlx/query-b23ddb16513d69331056b94d466663a9c5ea62ea7c99a77941eb8f05d4454125.json b/prover/prover_dal/.sqlx/query-0a1ec4690d6b4a67d6ad16badcbf113a19feb73c4cf9876855523499998b99c0.json
similarity index 57%
rename from prover/prover_dal/.sqlx/query-b23ddb16513d69331056b94d466663a9c5ea62ea7c99a77941eb8f05d4454125.json
rename to prover/prover_dal/.sqlx/query-0a1ec4690d6b4a67d6ad16badcbf113a19feb73c4cf9876855523499998b99c0.json
index fd8600d59aaf..b05230e1be44 100644
--- a/prover/prover_dal/.sqlx/query-b23ddb16513d69331056b94d466663a9c5ea62ea7c99a77941eb8f05d4454125.json
+++ b/prover/prover_dal/.sqlx/query-0a1ec4690d6b4a67d6ad16badcbf113a19feb73c4cf9876855523499998b99c0.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    INSERT INTO\n                        leaf_aggregation_witness_jobs_fri (\n                            l1_batch_number,\n                            circuit_id,\n                            closed_form_inputs_blob_url,\n                            number_of_basic_circuits,\n                            protocol_version,\n                            status,\n                            created_at,\n                            updated_at\n                        )\n                    VALUES\n                        ($1, $2, $3, $4, $5, 'waiting_for_proofs', NOW(), NOW())\n                    ON CONFLICT (l1_batch_number, circuit_id) DO\n                    UPDATE\n                    SET\n                        updated_at = NOW()\n                    ",
+  "query": "\n                    INSERT INTO\n                        leaf_aggregation_witness_jobs_fri (\n                            l1_batch_number,\n                            circuit_id,\n                            closed_form_inputs_blob_url,\n                            number_of_basic_circuits,\n                            protocol_version,\n                            status,\n                            created_at,\n                            updated_at,\n                            protocol_version_patch\n                        )\n                    VALUES\n                        ($1, $2, $3, $4, $5, 'waiting_for_proofs', NOW(), NOW(), $6)\n                    ON CONFLICT (l1_batch_number, circuit_id) DO\n                    UPDATE\n                    SET\n                        updated_at = NOW()\n                    ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -9,10 +9,11 @@
         "Int2",
         "Text",
         "Int4",
+        "Int4",
         "Int4"
       ]
     },
     "nullable": []
   },
-  "hash": "b23ddb16513d69331056b94d466663a9c5ea62ea7c99a77941eb8f05d4454125"
+  "hash": "0a1ec4690d6b4a67d6ad16badcbf113a19feb73c4cf9876855523499998b99c0"
 }
diff --git a/prover/prover_dal/.sqlx/query-5e4d784a3436335e9995a11f4c761ffb42bb2b325ba9206abbffe0dc74664566.json b/prover/prover_dal/.sqlx/query-0b70c98c2edd8370ad09ac553c18dbc21cccb9a95e3db1c93da239845a5e9036.json
similarity index 65%
rename from prover/prover_dal/.sqlx/query-5e4d784a3436335e9995a11f4c761ffb42bb2b325ba9206abbffe0dc74664566.json
rename to prover/prover_dal/.sqlx/query-0b70c98c2edd8370ad09ac553c18dbc21cccb9a95e3db1c93da239845a5e9036.json
index 6f8252d9998f..8b49fa11e63b 100644
--- a/prover/prover_dal/.sqlx/query-5e4d784a3436335e9995a11f4c761ffb42bb2b325ba9206abbffe0dc74664566.json
+++ b/prover/prover_dal/.sqlx/query-0b70c98c2edd8370ad09ac553c18dbc21cccb9a95e3db1c93da239845a5e9036.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE proof_compression_jobs_fri\n            SET\n                status = $1,\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        proof_compression_jobs_fri\n                    WHERE\n                        status = $2\n                        AND protocol_version = $4\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                proof_compression_jobs_fri.l1_batch_number\n            ",
+  "query": "\n            UPDATE proof_compression_jobs_fri\n            SET\n                status = $1,\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        proof_compression_jobs_fri\n                    WHERE\n                        status = $2\n                        AND protocol_version = $4\n                        AND protocol_version_patch = $5\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                proof_compression_jobs_fri.l1_batch_number\n            ",
   "describe": {
     "columns": [
       {
@@ -14,6 +14,7 @@
         "Text",
         "Text",
         "Text",
+        "Int4",
         "Int4"
       ]
     },
@@ -21,5 +22,5 @@
       false
     ]
   },
-  "hash": "5e4d784a3436335e9995a11f4c761ffb42bb2b325ba9206abbffe0dc74664566"
+  "hash": "0b70c98c2edd8370ad09ac553c18dbc21cccb9a95e3db1c93da239845a5e9036"
 }
diff --git a/prover/prover_dal/.sqlx/query-15858168fea6808c6d59d0e6d8f28a20420763a3a22899ad0e5f4b953b615a9e.json b/prover/prover_dal/.sqlx/query-15858168fea6808c6d59d0e6d8f28a20420763a3a22899ad0e5f4b953b615a9e.json
deleted file mode 100644
index ac0e433a9195..000000000000
--- a/prover/prover_dal/.sqlx/query-15858168fea6808c6d59d0e6d8f28a20420763a3a22899ad0e5f4b953b615a9e.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                id\n            FROM\n                prover_fri_protocol_versions\n            WHERE\n                recursion_circuits_set_vks_hash = $1\n                AND recursion_leaf_level_vk_hash = $2\n                AND recursion_node_level_vk_hash = $3\n                AND recursion_scheduler_level_vk_hash = $4\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Bytea",
-        "Bytea",
-        "Bytea",
-        "Bytea"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "15858168fea6808c6d59d0e6d8f28a20420763a3a22899ad0e5f4b953b615a9e"
-}
diff --git a/prover/prover_dal/.sqlx/query-12ab208f416e2875f89e558f0d4aff3a06b7a9c1866132d62e4449fa9436c7c4.json b/prover/prover_dal/.sqlx/query-16548daf69e9ff0528904be2e142254a457665179d9cf0a3c0b18c3fe09e4838.json
similarity index 67%
rename from prover/prover_dal/.sqlx/query-12ab208f416e2875f89e558f0d4aff3a06b7a9c1866132d62e4449fa9436c7c4.json
rename to prover/prover_dal/.sqlx/query-16548daf69e9ff0528904be2e142254a457665179d9cf0a3c0b18c3fe09e4838.json
index 5441bce3e016..5fe5032746e9 100644
--- a/prover/prover_dal/.sqlx/query-12ab208f416e2875f89e558f0d4aff3a06b7a9c1866132d62e4449fa9436c7c4.json
+++ b/prover/prover_dal/.sqlx/query-16548daf69e9ff0528904be2e142254a457665179d9cf0a3c0b18c3fe09e4838.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                id = $2\n            ",
+  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                id = $2\n                AND status != 'successful'\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "12ab208f416e2875f89e558f0d4aff3a06b7a9c1866132d62e4449fa9436c7c4"
+  "hash": "16548daf69e9ff0528904be2e142254a457665179d9cf0a3c0b18c3fe09e4838"
 }
diff --git a/prover/prover_dal/.sqlx/query-1849cfa3167eed2809e7724a63198f5e2450cc4faee2f80b37fbd5626324dbeb.json b/prover/prover_dal/.sqlx/query-1849cfa3167eed2809e7724a63198f5e2450cc4faee2f80b37fbd5626324dbeb.json
new file mode 100644
index 000000000000..38db4847ddde
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-1849cfa3167eed2809e7724a63198f5e2450cc4faee2f80b37fbd5626324dbeb.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            DELETE FROM gpu_prover_queue_fri\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "1849cfa3167eed2809e7724a63198f5e2450cc4faee2f80b37fbd5626324dbeb"
+}
diff --git a/prover/prover_dal/.sqlx/query-21621153e545859d71188e2421f5d2832571464e74b5fed92cf54617573c84ec.json b/prover/prover_dal/.sqlx/query-21621153e545859d71188e2421f5d2832571464e74b5fed92cf54617573c84ec.json
index 9e750348decb..e24d2c979a35 100644
--- a/prover/prover_dal/.sqlx/query-21621153e545859d71188e2421f5d2832571464e74b5fed92cf54617573c84ec.json
+++ b/prover/prover_dal/.sqlx/query-21621153e545859d71188e2421f5d2832571464e74b5fed92cf54617573c84ec.json
@@ -77,6 +77,11 @@
         "ordinal": 14,
         "name": "picked_by",
         "type_info": "Text"
+      },
+      {
+        "ordinal": 15,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
@@ -99,7 +104,8 @@
       true,
       true,
       true,
-      true
+      true,
+      false
     ]
   },
   "hash": "21621153e545859d71188e2421f5d2832571464e74b5fed92cf54617573c84ec"
diff --git a/prover/prover_dal/.sqlx/query-285d0ff850fa5c9af36564fcb14dd8547a1ad20492ec37c3c0be5639e5d49952.json b/prover/prover_dal/.sqlx/query-285d0ff850fa5c9af36564fcb14dd8547a1ad20492ec37c3c0be5639e5d49952.json
index 415b3e31c798..98a2aed31dfb 100644
--- a/prover/prover_dal/.sqlx/query-285d0ff850fa5c9af36564fcb14dd8547a1ad20492ec37c3c0be5639e5d49952.json
+++ b/prover/prover_dal/.sqlx/query-285d0ff850fa5c9af36564fcb14dd8547a1ad20492ec37c3c0be5639e5d49952.json
@@ -57,6 +57,11 @@
         "ordinal": 10,
         "name": "picked_by",
         "type_info": "Text"
+      },
+      {
+        "ordinal": 11,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
@@ -75,7 +80,8 @@
       false,
       false,
       true,
-      true
+      true,
+      false
     ]
   },
   "hash": "285d0ff850fa5c9af36564fcb14dd8547a1ad20492ec37c3c0be5639e5d49952"
diff --git a/prover/prover_dal/.sqlx/query-058ecac4aa3d2109606738de4bdba2cff712010267460dd28339472b9a7d8c9d.json b/prover/prover_dal/.sqlx/query-28f03acf565c4b50fe86f606c18a8b699386b3c5b4e02d5ce046f0f2e0ddc388.json
similarity index 76%
rename from prover/prover_dal/.sqlx/query-058ecac4aa3d2109606738de4bdba2cff712010267460dd28339472b9a7d8c9d.json
rename to prover/prover_dal/.sqlx/query-28f03acf565c4b50fe86f606c18a8b699386b3c5b4e02d5ce046f0f2e0ddc388.json
index a74d698ff207..89e159989ae6 100644
--- a/prover/prover_dal/.sqlx/query-058ecac4aa3d2109606738de4bdba2cff712010267460dd28339472b9a7d8c9d.json
+++ b/prover/prover_dal/.sqlx/query-28f03acf565c4b50fe86f606c18a8b699386b3c5b4e02d5ce046f0f2e0ddc388.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        scheduler_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                scheduler_witness_jobs_fri.*\n            ",
+  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        scheduler_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $3\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                scheduler_witness_jobs_fri.*\n            ",
   "describe": {
     "columns": [
       {
@@ -57,12 +57,18 @@
         "ordinal": 10,
         "name": "picked_by",
         "type_info": "Text"
+      },
+      {
+        "ordinal": 11,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
       "Left": [
         "Int4",
-        "Text"
+        "Text",
+        "Int4"
       ]
     },
     "nullable": [
@@ -76,8 +82,9 @@
       false,
       false,
       true,
-      true
+      true,
+      false
     ]
   },
-  "hash": "058ecac4aa3d2109606738de4bdba2cff712010267460dd28339472b9a7d8c9d"
+  "hash": "28f03acf565c4b50fe86f606c18a8b699386b3c5b4e02d5ce046f0f2e0ddc388"
 }
diff --git a/prover/prover_dal/.sqlx/query-29ff260b02f7b955f9fe0b657b87def3a97275b66ad33d214054dc9048ddf584.json b/prover/prover_dal/.sqlx/query-29ff260b02f7b955f9fe0b657b87def3a97275b66ad33d214054dc9048ddf584.json
new file mode 100644
index 000000000000..85e66ed78248
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-29ff260b02f7b955f9fe0b657b87def3a97275b66ad33d214054dc9048ddf584.json
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                proof_compression_jobs_fri (\n                    l1_batch_number,\n                    fri_proof_blob_url,\n                    status,\n                    created_at,\n                    updated_at,\n                    protocol_version,\n                    protocol_version_patch\n                )\n            VALUES\n                ($1, $2, $3, NOW(), NOW(), $4, $5)\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text",
+        "Text",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "29ff260b02f7b955f9fe0b657b87def3a97275b66ad33d214054dc9048ddf584"
+}
diff --git a/prover/prover_dal/.sqlx/query-2ab2f83b273c5aa88c1eefc8f70a8ea23052f714cd74c1d28ae1203ce8f0eaa9.json b/prover/prover_dal/.sqlx/query-2ab2f83b273c5aa88c1eefc8f70a8ea23052f714cd74c1d28ae1203ce8f0eaa9.json
index 529709763eb9..7fcd13280279 100644
--- a/prover/prover_dal/.sqlx/query-2ab2f83b273c5aa88c1eefc8f70a8ea23052f714cd74c1d28ae1203ce8f0eaa9.json
+++ b/prover/prover_dal/.sqlx/query-2ab2f83b273c5aa88c1eefc8f70a8ea23052f714cd74c1d28ae1203ce8f0eaa9.json
@@ -62,6 +62,11 @@
         "ordinal": 11,
         "name": "protocol_version",
         "type_info": "Int4"
+      },
+      {
+        "ordinal": 12,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
@@ -81,7 +86,8 @@
       true,
       true,
       true,
-      true
+      true,
+      false
     ]
   },
   "hash": "2ab2f83b273c5aa88c1eefc8f70a8ea23052f714cd74c1d28ae1203ce8f0eaa9"
diff --git a/prover/prover_dal/.sqlx/query-7dd14c5f887d6716a8f98414bddd562e556a712ba041237e4cb3dea27e89314e.json b/prover/prover_dal/.sqlx/query-2dc6b7bf08cced8791354fc47e319d03f894f40d2ec528382b5643c3d51ec8e7.json
similarity index 68%
rename from prover/prover_dal/.sqlx/query-7dd14c5f887d6716a8f98414bddd562e556a712ba041237e4cb3dea27e89314e.json
rename to prover/prover_dal/.sqlx/query-2dc6b7bf08cced8791354fc47e319d03f894f40d2ec528382b5643c3d51ec8e7.json
index eb7984cc8e2b..0ad6413e1ec1 100644
--- a/prover/prover_dal/.sqlx/query-7dd14c5f887d6716a8f98414bddd562e556a712ba041237e4cb3dea27e89314e.json
+++ b/prover/prover_dal/.sqlx/query-2dc6b7bf08cced8791354fc47e319d03f894f40d2ec528382b5643c3d51ec8e7.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE gpu_prover_queue_fri\n            SET\n                instance_status = 'reserved',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                id IN (\n                    SELECT\n                        id\n                    FROM\n                        gpu_prover_queue_fri\n                    WHERE\n                        specialized_prover_group_id = $2\n                        AND zone = $3\n                        AND protocol_version = $4\n                        AND (\n                            instance_status = 'available'\n                            OR (\n                                instance_status = 'reserved'\n                                AND processing_started_at < NOW() - $1::INTERVAL\n                            )\n                        )\n                    ORDER BY\n                        updated_at ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                gpu_prover_queue_fri.*\n            ",
+  "query": "\n            UPDATE gpu_prover_queue_fri\n            SET\n                instance_status = 'reserved',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                id IN (\n                    SELECT\n                        id\n                    FROM\n                        gpu_prover_queue_fri\n                    WHERE\n                        specialized_prover_group_id = $2\n                        AND zone = $3\n                        AND protocol_version = $4\n                        AND protocol_version_patch = $5\n                        AND (\n                            instance_status = 'available'\n                            OR (\n                                instance_status = 'reserved'\n                                AND processing_started_at < NOW() - $1::INTERVAL\n                            )\n                        )\n                    ORDER BY\n                        updated_at ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                gpu_prover_queue_fri.*\n            ",
   "describe": {
     "columns": [
       {
@@ -52,6 +52,11 @@
         "ordinal": 9,
         "name": "protocol_version",
         "type_info": "Int4"
+      },
+      {
+        "ordinal": 10,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
@@ -59,6 +64,7 @@
         "Interval",
         "Int2",
         "Text",
+        "Int4",
         "Int4"
       ]
     },
@@ -72,8 +78,9 @@
       false,
       false,
       true,
-      true
+      true,
+      false
     ]
   },
-  "hash": "7dd14c5f887d6716a8f98414bddd562e556a712ba041237e4cb3dea27e89314e"
+  "hash": "2dc6b7bf08cced8791354fc47e319d03f894f40d2ec528382b5643c3d51ec8e7"
 }
diff --git a/prover/prover_dal/.sqlx/query-2df88abaae97b6f916b104375bd7249ec09c0daf4368021788207370213a6d94.json b/prover/prover_dal/.sqlx/query-2df88abaae97b6f916b104375bd7249ec09c0daf4368021788207370213a6d94.json
new file mode 100644
index 000000000000..967f02586d7b
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-2df88abaae97b6f916b104375bd7249ec09c0daf4368021788207370213a6d94.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            DELETE FROM proof_compression_jobs_fri\n            WHERE\n                l1_batch_number = $1\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "2df88abaae97b6f916b104375bd7249ec09c0daf4368021788207370213a6d94"
+}
diff --git a/prover/prover_dal/.sqlx/query-2e6e2b68efc28114f44616b68fcf1d4d9a4b83a8b42846d8373ea13b96d612cf.json b/prover/prover_dal/.sqlx/query-2e6e2b68efc28114f44616b68fcf1d4d9a4b83a8b42846d8373ea13b96d612cf.json
new file mode 100644
index 000000000000..41428e91feeb
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-2e6e2b68efc28114f44616b68fcf1d4d9a4b83a8b42846d8373ea13b96d612cf.json
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                gpu_prover_queue_fri (\n                    instance_host,\n                    instance_port,\n                    instance_status,\n                    specialized_prover_group_id,\n                    zone,\n                    created_at,\n                    updated_at,\n                    protocol_version,\n                    protocol_version_patch\n                )\n            VALUES\n                (CAST($1::TEXT AS inet), $2, 'available', $3, $4, NOW(), NOW(), $5, $6)\n            ON CONFLICT (instance_host, instance_port, zone) DO\n            UPDATE\n            SET\n                instance_status = 'available',\n                specialized_prover_group_id = $3,\n                zone = $4,\n                updated_at = NOW(),\n                protocol_version = $5,\n                protocol_version_patch = $6\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Int4",
+        "Int2",
+        "Text",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "2e6e2b68efc28114f44616b68fcf1d4d9a4b83a8b42846d8373ea13b96d612cf"
+}
diff --git a/prover/prover_dal/.sqlx/query-33d6be45b246523ad76f9ae512322ff6372f63ecadb504a329499b02e7d3550e.json b/prover/prover_dal/.sqlx/query-33d6be45b246523ad76f9ae512322ff6372f63ecadb504a329499b02e7d3550e.json
deleted file mode 100644
index 76483cd73d31..000000000000
--- a/prover/prover_dal/.sqlx/query-33d6be45b246523ad76f9ae512322ff6372f63ecadb504a329499b02e7d3550e.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                UPDATE leaf_aggregation_witness_jobs_fri\n                SET\n                    status = 'queued'\n                WHERE\n                    (l1_batch_number, circuit_id) IN (\n                        SELECT\n                            prover_jobs_fri.l1_batch_number,\n                            prover_jobs_fri.circuit_id\n                        FROM\n                            prover_jobs_fri\n                            JOIN leaf_aggregation_witness_jobs_fri lawj ON prover_jobs_fri.l1_batch_number = lawj.l1_batch_number\n                            AND prover_jobs_fri.circuit_id = lawj.circuit_id\n                        WHERE\n                            lawj.status = 'waiting_for_proofs'\n                            AND prover_jobs_fri.status = 'successful'\n                            AND prover_jobs_fri.aggregation_round = 0\n                        GROUP BY\n                            prover_jobs_fri.l1_batch_number,\n                            prover_jobs_fri.circuit_id,\n                            lawj.number_of_basic_circuits\n                        HAVING\n                            COUNT(*) = lawj.number_of_basic_circuits\n                    )\n                RETURNING\n                    l1_batch_number,\n                    circuit_id;\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "circuit_id",
-        "type_info": "Int2"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "33d6be45b246523ad76f9ae512322ff6372f63ecadb504a329499b02e7d3550e"
-}
diff --git a/prover/prover_dal/.sqlx/query-3902f6a8e09cd5ad560d23fe0269fd5b3d210a117bb0027d58c6cb4debd63f33.json b/prover/prover_dal/.sqlx/query-3902f6a8e09cd5ad560d23fe0269fd5b3d210a117bb0027d58c6cb4debd63f33.json
new file mode 100644
index 000000000000..fdbe0f989850
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-3902f6a8e09cd5ad560d23fe0269fd5b3d210a117bb0027d58c6cb4debd63f33.json
@@ -0,0 +1,28 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                protocol_version,\n                protocol_version_patch\n            FROM\n                witness_inputs_fri\n            WHERE\n                l1_batch_number = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "protocol_version",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true,
+      false
+    ]
+  },
+  "hash": "3902f6a8e09cd5ad560d23fe0269fd5b3d210a117bb0027d58c6cb4debd63f33"
+}
diff --git a/prover/prover_dal/.sqlx/query-3941da180ee62a7c5d4e392ff4fe2d3a6ebb3657862b91e3ece34119f098fc2d.json b/prover/prover_dal/.sqlx/query-3941da180ee62a7c5d4e392ff4fe2d3a6ebb3657862b91e3ece34119f098fc2d.json
new file mode 100644
index 000000000000..d0dd5f6976b5
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-3941da180ee62a7c5d4e392ff4fe2d3a6ebb3657862b91e3ece34119f098fc2d.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                (l1_batch_number, circuit_id, depth) IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth\n                    FROM\n                        prover_jobs_fri\n                        JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number\n                        AND prover_jobs_fri.circuit_id = nawj.circuit_id\n                        AND prover_jobs_fri.depth = nawj.depth\n                    WHERE\n                        nawj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = 2\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth,\n                        nawj.number_of_dependent_jobs\n                    HAVING\n                        COUNT(*) = nawj.number_of_dependent_jobs\n                )\n            RETURNING\n                l1_batch_number,\n                circuit_id,\n                depth;\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "circuit_id",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 2,
+        "name": "depth",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "3941da180ee62a7c5d4e392ff4fe2d3a6ebb3657862b91e3ece34119f098fc2d"
+}
diff --git a/prover/prover_dal/.sqlx/query-384e70c7f7b302b90a9ce69752fb7f87115848d883ace09ead493637a303cbb2.json b/prover/prover_dal/.sqlx/query-3e0a1ebc684810c09ff83784bdd0ad195b0dd2a8ce56b1a9eb531103130b5e3e.json
similarity index 60%
rename from prover/prover_dal/.sqlx/query-384e70c7f7b302b90a9ce69752fb7f87115848d883ace09ead493637a303cbb2.json
rename to prover/prover_dal/.sqlx/query-3e0a1ebc684810c09ff83784bdd0ad195b0dd2a8ce56b1a9eb531103130b5e3e.json
index b7c222927cd7..7646c87b847e 100644
--- a/prover/prover_dal/.sqlx/query-384e70c7f7b302b90a9ce69752fb7f87115848d883ace09ead493637a303cbb2.json
+++ b/prover/prover_dal/.sqlx/query-3e0a1ebc684810c09ff83784bdd0ad195b0dd2a8ce56b1a9eb531103130b5e3e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                processing_started_at = NOW(),\n                updated_at = NOW(),\n                picked_by = $4\n            WHERE\n                id = (\n                    SELECT\n                        pj.id\n                    FROM\n                        (\n                            SELECT\n                                *\n                            FROM\n                                UNNEST($1::SMALLINT[], $2::SMALLINT[])\n                        ) AS tuple (circuit_id, ROUND)\n                        JOIN LATERAL (\n                            SELECT\n                                *\n                            FROM\n                                prover_jobs_fri AS pj\n                            WHERE\n                                pj.status = 'queued'\n                                AND pj.protocol_version = $3\n                                AND pj.circuit_id = tuple.circuit_id\n                                AND pj.aggregation_round = tuple.round\n                            ORDER BY\n                                pj.l1_batch_number ASC,\n                                pj.id ASC\n                            LIMIT\n                                1\n                        ) AS pj ON TRUE\n                    ORDER BY\n                        pj.l1_batch_number ASC,\n                        pj.aggregation_round DESC,\n                        pj.id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                prover_jobs_fri.id,\n                prover_jobs_fri.l1_batch_number,\n                prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round,\n                prover_jobs_fri.sequence_number,\n                prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n            ",
+  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                processing_started_at = NOW(),\n                updated_at = NOW(),\n                picked_by = $5\n            WHERE\n                id = (\n                    SELECT\n                        pj.id\n                    FROM\n                        (\n                            SELECT\n                                *\n                            FROM\n                                UNNEST($1::SMALLINT[], $2::SMALLINT[])\n                        ) AS tuple (circuit_id, ROUND)\n                        JOIN LATERAL (\n                            SELECT\n                                *\n                            FROM\n                                prover_jobs_fri AS pj\n                            WHERE\n                                pj.status = 'queued'\n                                AND pj.protocol_version = $3\n                                AND pj.protocol_version_patch = $4\n                                AND pj.circuit_id = tuple.circuit_id\n                                AND pj.aggregation_round = tuple.round\n                            ORDER BY\n                                pj.l1_batch_number ASC,\n                                pj.id ASC\n                            LIMIT\n                                1\n                        ) AS pj ON TRUE\n                    ORDER BY\n                        pj.l1_batch_number ASC,\n                        pj.aggregation_round DESC,\n                        pj.id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                prover_jobs_fri.id,\n                prover_jobs_fri.l1_batch_number,\n                prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round,\n                prover_jobs_fri.sequence_number,\n                prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n            ",
   "describe": {
     "columns": [
       {
@@ -44,6 +44,7 @@
         "Int2Array",
         "Int2Array",
         "Int4",
+        "Int4",
         "Text"
       ]
     },
@@ -57,5 +58,5 @@
       false
     ]
   },
-  "hash": "384e70c7f7b302b90a9ce69752fb7f87115848d883ace09ead493637a303cbb2"
+  "hash": "3e0a1ebc684810c09ff83784bdd0ad195b0dd2a8ce56b1a9eb531103130b5e3e"
 }
diff --git a/prover/prover_dal/.sqlx/query-412ef600a2f6025d8c22c2df8a497ed410fa47b268a66f1fc56d469c06ae50af.json b/prover/prover_dal/.sqlx/query-412ef600a2f6025d8c22c2df8a497ed410fa47b268a66f1fc56d469c06ae50af.json
new file mode 100644
index 000000000000..f4d5f62a2615
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-412ef600a2f6025d8c22c2df8a497ed410fa47b268a66f1fc56d469c06ae50af.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            DELETE FROM prover_fri_protocol_versions\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "412ef600a2f6025d8c22c2df8a497ed410fa47b268a66f1fc56d469c06ae50af"
+}
diff --git a/prover/prover_dal/.sqlx/query-41af30620f8a1f20b8a6c46be162601d35fd2881ac1fd070f0f1a8add4bc388d.json b/prover/prover_dal/.sqlx/query-41af30620f8a1f20b8a6c46be162601d35fd2881ac1fd070f0f1a8add4bc388d.json
new file mode 100644
index 000000000000..b65633a904e3
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-41af30620f8a1f20b8a6c46be162601d35fd2881ac1fd070f0f1a8add4bc388d.json
@@ -0,0 +1,30 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        recursion_tip_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                recursion_tip_witness_jobs_fri.l1_batch_number,\n                recursion_tip_witness_jobs_fri.number_of_final_node_jobs\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "number_of_final_node_jobs",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Int4",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "41af30620f8a1f20b8a6c46be162601d35fd2881ac1fd070f0f1a8add4bc388d"
+}
diff --git a/prover/prover_dal/.sqlx/query-495a71634bcd8828bfaad5c4c542a172d47a65601b92f75da8f62ec2b18b9f4f.json b/prover/prover_dal/.sqlx/query-495a71634bcd8828bfaad5c4c542a172d47a65601b92f75da8f62ec2b18b9f4f.json
deleted file mode 100644
index fb16df5866d1..000000000000
--- a/prover/prover_dal/.sqlx/query-495a71634bcd8828bfaad5c4c542a172d47a65601b92f75da8f62ec2b18b9f4f.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                    recursion_tip_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                recursion_tip_witness_jobs_fri.l1_batch_number\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "495a71634bcd8828bfaad5c4c542a172d47a65601b92f75da8f62ec2b18b9f4f"
-}
diff --git a/prover/prover_dal/.sqlx/query-510bfea2346a8c63e74222e1159de366f88c20d00a8d928b6cf4caae0702b333.json b/prover/prover_dal/.sqlx/query-5354ed86960505fe6b159ce859656f870f8bbd15666fec5cc9f398306eeb6136.json
similarity index 60%
rename from prover/prover_dal/.sqlx/query-510bfea2346a8c63e74222e1159de366f88c20d00a8d928b6cf4caae0702b333.json
rename to prover/prover_dal/.sqlx/query-5354ed86960505fe6b159ce859656f870f8bbd15666fec5cc9f398306eeb6136.json
index ef8f865bf983..298f7bb30aa3 100644
--- a/prover/prover_dal/.sqlx/query-510bfea2346a8c63e74222e1159de366f88c20d00a8d928b6cf4caae0702b333.json
+++ b/prover/prover_dal/.sqlx/query-5354ed86960505fe6b159ce859656f870f8bbd15666fec5cc9f398306eeb6136.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                witness_inputs_fri (\n                    l1_batch_number,\n                    merkle_tree_paths_blob_url,\n                    protocol_version,\n                    eip_4844_blobs,\n                    status,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                ($1, $2, $3, $4, 'queued', NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
+  "query": "\n            INSERT INTO\n                witness_inputs_fri (\n                    l1_batch_number,\n                    merkle_tree_paths_blob_url,\n                    protocol_version,\n                    eip_4844_blobs,\n                    status,\n                    created_at,\n                    updated_at,\n                    protocol_version_patch\n                )\n            VALUES\n                ($1, $2, $3, $4, 'queued', NOW(), NOW(), $5)\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -8,10 +8,11 @@
         "Int8",
         "Text",
         "Int4",
-        "Bytea"
+        "Bytea",
+        "Int4"
       ]
     },
     "nullable": []
   },
-  "hash": "510bfea2346a8c63e74222e1159de366f88c20d00a8d928b6cf4caae0702b333"
+  "hash": "5354ed86960505fe6b159ce859656f870f8bbd15666fec5cc9f398306eeb6136"
 }
diff --git a/prover/prover_dal/.sqlx/query-afc541dc4d550db9a2dacc6d65dd4f092115da1d00dc2122efae9cf070fcb266.json b/prover/prover_dal/.sqlx/query-542af2ff4259182310363ac0213592895215e22fd4cf0dfe69b83277f8d05db3.json
similarity index 86%
rename from prover/prover_dal/.sqlx/query-afc541dc4d550db9a2dacc6d65dd4f092115da1d00dc2122efae9cf070fcb266.json
rename to prover/prover_dal/.sqlx/query-542af2ff4259182310363ac0213592895215e22fd4cf0dfe69b83277f8d05db3.json
index c828eb1ca565..4b3c28b9ab71 100644
--- a/prover/prover_dal/.sqlx/query-afc541dc4d550db9a2dacc6d65dd4f092115da1d00dc2122efae9cf070fcb266.json
+++ b/prover/prover_dal/.sqlx/query-542af2ff4259182310363ac0213592895215e22fd4cf0dfe69b83277f8d05db3.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                recursion_scheduler_level_vk_hash,\n                recursion_node_level_vk_hash,\n                recursion_leaf_level_vk_hash,\n                recursion_circuits_set_vks_hash\n            FROM\n                prover_fri_protocol_versions\n            ORDER BY\n                id DESC\n            LIMIT 1\n            ",
+  "query": "\n            SELECT\n                recursion_scheduler_level_vk_hash,\n                recursion_node_level_vk_hash,\n                recursion_leaf_level_vk_hash,\n                recursion_circuits_set_vks_hash\n            FROM\n                prover_fri_protocol_versions\n            ORDER BY\n                id DESC\n            LIMIT\n                1\n            ",
   "describe": {
     "columns": [
       {
@@ -34,5 +34,5 @@
       false
     ]
   },
-  "hash": "afc541dc4d550db9a2dacc6d65dd4f092115da1d00dc2122efae9cf070fcb266"
+  "hash": "542af2ff4259182310363ac0213592895215e22fd4cf0dfe69b83277f8d05db3"
 }
diff --git a/prover/prover_dal/.sqlx/query-9ef2f43e6201cc00a0e1425a666a36532fee1450733849852dfd20e18ded1f03.json b/prover/prover_dal/.sqlx/query-5db868e03dc6901a0afa06f82a37a1a04821495487a80595cc9b523dac6ac8e9.json
similarity index 66%
rename from prover/prover_dal/.sqlx/query-9ef2f43e6201cc00a0e1425a666a36532fee1450733849852dfd20e18ded1f03.json
rename to prover/prover_dal/.sqlx/query-5db868e03dc6901a0afa06f82a37a1a04821495487a80595cc9b523dac6ac8e9.json
index fd770071cf86..94dbaa80a10e 100644
--- a/prover/prover_dal/.sqlx/query-9ef2f43e6201cc00a0e1425a666a36532fee1450733849852dfd20e18ded1f03.json
+++ b/prover/prover_dal/.sqlx/query-5db868e03dc6901a0afa06f82a37a1a04821495487a80595cc9b523dac6ac8e9.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $2\n            ",
+  "query": "\n            UPDATE scheduler_witness_jobs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $2\n                AND status != 'successful'\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "9ef2f43e6201cc00a0e1425a666a36532fee1450733849852dfd20e18ded1f03"
+  "hash": "5db868e03dc6901a0afa06f82a37a1a04821495487a80595cc9b523dac6ac8e9"
 }
diff --git a/prover/prover_dal/.sqlx/query-afc24bd1407dba82cd3dc9e7ee71ac4ab2d73bda6022700aeb0a630a2563a4b4.json b/prover/prover_dal/.sqlx/query-67f5f3a015dc478f02f4f701c90d0fc9ac9a7f3dce2ba48c2d0e6f38b6ba455a.json
similarity index 67%
rename from prover/prover_dal/.sqlx/query-afc24bd1407dba82cd3dc9e7ee71ac4ab2d73bda6022700aeb0a630a2563a4b4.json
rename to prover/prover_dal/.sqlx/query-67f5f3a015dc478f02f4f701c90d0fc9ac9a7f3dce2ba48c2d0e6f38b6ba455a.json
index ede2995ff558..29838881a52c 100644
--- a/prover/prover_dal/.sqlx/query-afc24bd1407dba82cd3dc9e7ee71ac4ab2d73bda6022700aeb0a630a2563a4b4.json
+++ b/prover/prover_dal/.sqlx/query-67f5f3a015dc478f02f4f701c90d0fc9ac9a7f3dce2ba48c2d0e6f38b6ba455a.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                id = $2\n            ",
+  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                id = $2\n                AND status != 'successful'\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "afc24bd1407dba82cd3dc9e7ee71ac4ab2d73bda6022700aeb0a630a2563a4b4"
+  "hash": "67f5f3a015dc478f02f4f701c90d0fc9ac9a7f3dce2ba48c2d0e6f38b6ba455a"
 }
diff --git a/prover/prover_dal/.sqlx/query-e9ca863d6e77edd39a9fc55700a6686e655206601854799139c22c017a214744.json b/prover/prover_dal/.sqlx/query-764693ceeb45f8478a20242b592d419667f11d80036cda021ecbf23b0b5f7f42.json
similarity index 58%
rename from prover/prover_dal/.sqlx/query-e9ca863d6e77edd39a9fc55700a6686e655206601854799139c22c017a214744.json
rename to prover/prover_dal/.sqlx/query-764693ceeb45f8478a20242b592d419667f11d80036cda021ecbf23b0b5f7f42.json
index 0bdcbb99add0..aac0fcd420cd 100644
--- a/prover/prover_dal/.sqlx/query-e9ca863d6e77edd39a9fc55700a6686e655206601854799139c22c017a214744.json
+++ b/prover/prover_dal/.sqlx/query-764693ceeb45f8478a20242b592d419667f11d80036cda021ecbf23b0b5f7f42.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                node_aggregation_witness_jobs_fri (\n                    l1_batch_number,\n                    circuit_id,\n                    depth,\n                    aggregations_url,\n                    number_of_dependent_jobs,\n                    protocol_version,\n                    status,\n                    created_at,\n                    updated_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', NOW(), NOW())\n            ON CONFLICT (l1_batch_number, circuit_id, depth) DO\n            UPDATE\n            SET\n                updated_at = NOW()\n            ",
+  "query": "\n            INSERT INTO\n                node_aggregation_witness_jobs_fri (\n                    l1_batch_number,\n                    circuit_id,\n                    depth,\n                    aggregations_url,\n                    number_of_dependent_jobs,\n                    protocol_version,\n                    status,\n                    created_at,\n                    updated_at,\n                    protocol_version_patch\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', NOW(), NOW(), $7)\n            ON CONFLICT (l1_batch_number, circuit_id, depth) DO\n            UPDATE\n            SET\n                updated_at = NOW()\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,10 +10,11 @@
         "Int4",
         "Text",
         "Int4",
+        "Int4",
         "Int4"
       ]
     },
     "nullable": []
   },
-  "hash": "e9ca863d6e77edd39a9fc55700a6686e655206601854799139c22c017a214744"
+  "hash": "764693ceeb45f8478a20242b592d419667f11d80036cda021ecbf23b0b5f7f42"
 }
diff --git a/prover/prover_dal/.sqlx/query-08dfe2267bf93d164c649e93f5355b403f1438679167ff218489e2c6d0c359a3.json b/prover/prover_dal/.sqlx/query-7effbacbdcc4bd762386351755f4f32042dfead8a37401558f5fd3b03480f2dd.json
similarity index 76%
rename from prover/prover_dal/.sqlx/query-08dfe2267bf93d164c649e93f5355b403f1438679167ff218489e2c6d0c359a3.json
rename to prover/prover_dal/.sqlx/query-7effbacbdcc4bd762386351755f4f32042dfead8a37401558f5fd3b03480f2dd.json
index a464eafa683d..3064489830d9 100644
--- a/prover/prover_dal/.sqlx/query-08dfe2267bf93d164c649e93f5355b403f1438679167ff218489e2c6d0c359a3.json
+++ b/prover/prover_dal/.sqlx/query-7effbacbdcc4bd762386351755f4f32042dfead8a37401558f5fd3b03480f2dd.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        node_aggregation_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                    ORDER BY\n                        l1_batch_number ASC,\n                        depth ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                node_aggregation_witness_jobs_fri.*\n            ",
+  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        node_aggregation_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC,\n                        depth ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                node_aggregation_witness_jobs_fri.*\n            ",
   "describe": {
     "columns": [
       {
@@ -77,10 +77,16 @@
         "ordinal": 14,
         "name": "picked_by",
         "type_info": "Text"
+      },
+      {
+        "ordinal": 15,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
       "Left": [
+        "Int4",
         "Int4",
         "Text"
       ]
@@ -100,8 +106,9 @@
       false,
       true,
       true,
-      true
+      true,
+      false
     ]
   },
-  "hash": "08dfe2267bf93d164c649e93f5355b403f1438679167ff218489e2c6d0c359a3"
+  "hash": "7effbacbdcc4bd762386351755f4f32042dfead8a37401558f5fd3b03480f2dd"
 }
diff --git a/prover/prover_dal/.sqlx/query-8182690d0326b820d23fba49d391578db18c29cdca85b8b6aad86fe2a9bf6bbe.json b/prover/prover_dal/.sqlx/query-8182690d0326b820d23fba49d391578db18c29cdca85b8b6aad86fe2a9bf6bbe.json
deleted file mode 100644
index fac64c1ea3f9..000000000000
--- a/prover/prover_dal/.sqlx/query-8182690d0326b820d23fba49d391578db18c29cdca85b8b6aad86fe2a9bf6bbe.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                UPDATE node_aggregation_witness_jobs_fri\n                SET\n                    status = 'queued'\n                WHERE\n                    (l1_batch_number, circuit_id, depth) IN (\n                        SELECT\n                            prover_jobs_fri.l1_batch_number,\n                            prover_jobs_fri.circuit_id,\n                            prover_jobs_fri.depth\n                        FROM\n                            prover_jobs_fri\n                            JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number\n                            AND prover_jobs_fri.circuit_id = nawj.circuit_id\n                            AND prover_jobs_fri.depth = nawj.depth\n                        WHERE\n                            nawj.status = 'waiting_for_proofs'\n                            AND prover_jobs_fri.status = 'successful'\n                            AND prover_jobs_fri.aggregation_round = 2\n                        GROUP BY\n                            prover_jobs_fri.l1_batch_number,\n                            prover_jobs_fri.circuit_id,\n                            prover_jobs_fri.depth,\n                            nawj.number_of_dependent_jobs\n                        HAVING\n                            COUNT(*) = nawj.number_of_dependent_jobs\n                    )\n                RETURNING\n                    l1_batch_number,\n                    circuit_id,\n                    depth;\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "circuit_id",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 2,
-        "name": "depth",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "8182690d0326b820d23fba49d391578db18c29cdca85b8b6aad86fe2a9bf6bbe"
-}
diff --git a/prover/prover_dal/.sqlx/query-832a1caa2808f49a5572cb782eca5bfec2a8272906eb1ed195f96c2508b9a3ef.json b/prover/prover_dal/.sqlx/query-832a1caa2808f49a5572cb782eca5bfec2a8272906eb1ed195f96c2508b9a3ef.json
deleted file mode 100644
index c5a2a59aa20a..000000000000
--- a/prover/prover_dal/.sqlx/query-832a1caa2808f49a5572cb782eca5bfec2a8272906eb1ed195f96c2508b9a3ef.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                INSERT INTO\n                    proof_compression_jobs_fri (l1_batch_number, fri_proof_blob_url, status, created_at, updated_at, protocol_version)\n                VALUES\n                    ($1, $2, $3, NOW(), NOW(), $4)\n                ON CONFLICT (l1_batch_number) DO NOTHING\n                ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text",
-        "Text",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "832a1caa2808f49a5572cb782eca5bfec2a8272906eb1ed195f96c2508b9a3ef"
-}
diff --git a/prover/prover_dal/.sqlx/query-85a69b433c08847876bf6e7af9bc39ae8a6e053a0e03afd3fb5e02ee17157067.json b/prover/prover_dal/.sqlx/query-85a69b433c08847876bf6e7af9bc39ae8a6e053a0e03afd3fb5e02ee17157067.json
new file mode 100644
index 000000000000..9631bd54d394
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-85a69b433c08847876bf6e7af9bc39ae8a6e053a0e03afd3fb5e02ee17157067.json
@@ -0,0 +1,88 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                *\n            FROM\n                recursion_tip_witness_jobs_fri\n            WHERE\n                l1_batch_number = $1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "status",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "attempts",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 3,
+        "name": "processing_started_at",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 4,
+        "name": "time_taken",
+        "type_info": "Time"
+      },
+      {
+        "ordinal": 5,
+        "name": "error",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "created_at",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 7,
+        "name": "updated_at",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 8,
+        "name": "number_of_final_node_jobs",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 9,
+        "name": "protocol_version",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 10,
+        "name": "picked_by",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 11,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false
+    ]
+  },
+  "hash": "85a69b433c08847876bf6e7af9bc39ae8a6e053a0e03afd3fb5e02ee17157067"
+}
diff --git a/prover/prover_dal/.sqlx/query-860846c9bcad1edd1a2906542c178815e29440592b2bb00adacf02730b526458.json b/prover/prover_dal/.sqlx/query-860846c9bcad1edd1a2906542c178815e29440592b2bb00adacf02730b526458.json
new file mode 100644
index 000000000000..f3ed6e34148d
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-860846c9bcad1edd1a2906542c178815e29440592b2bb00adacf02730b526458.json
@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                UPDATE proof_compression_jobs_fri\n                SET\n                    status = 'queued',\n                    error = 'Manually requeued',\n                    attempts = 2,\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    l1_batch_number = $1\n                    AND attempts >= $2\n                    AND (\n                        status = 'in_progress'\n                        OR status = 'failed'\n                    )\n                RETURNING\n                    status,\n                    attempts\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "status",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "attempts",
+        "type_info": "Int2"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int2"
+      ]
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "860846c9bcad1edd1a2906542c178815e29440592b2bb00adacf02730b526458"
+}
diff --git a/prover/prover_dal/.sqlx/query-b17c71983da060f08616e001b42f8dcbcb014b4f808c6232abd9a83354c995ac.json b/prover/prover_dal/.sqlx/query-8719c090a9ad2488d556e495238cdce6412e2725cf5162ce7a733f6dceaecb11.json
similarity index 79%
rename from prover/prover_dal/.sqlx/query-b17c71983da060f08616e001b42f8dcbcb014b4f808c6232abd9a83354c995ac.json
rename to prover/prover_dal/.sqlx/query-8719c090a9ad2488d556e495238cdce6412e2725cf5162ce7a733f6dceaecb11.json
index 82209e00b65a..6493053b122c 100644
--- a/prover/prover_dal/.sqlx/query-b17c71983da060f08616e001b42f8dcbcb014b4f808c6232abd9a83354c995ac.json
+++ b/prover/prover_dal/.sqlx/query-8719c090a9ad2488d556e495238cdce6412e2725cf5162ce7a733f6dceaecb11.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n                id,\n                status,\n                attempts\n            ",
+  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n                id,\n                status,\n                attempts,\n                circuit_id\n            ",
   "describe": {
     "columns": [
       {
@@ -17,6 +17,11 @@
         "ordinal": 2,
         "name": "attempts",
         "type_info": "Int2"
+      },
+      {
+        "ordinal": 3,
+        "name": "circuit_id",
+        "type_info": "Int2"
       }
     ],
     "parameters": {
@@ -26,10 +31,11 @@
       ]
     },
     "nullable": [
+      false,
       false,
       false,
       false
     ]
   },
-  "hash": "b17c71983da060f08616e001b42f8dcbcb014b4f808c6232abd9a83354c995ac"
+  "hash": "8719c090a9ad2488d556e495238cdce6412e2725cf5162ce7a733f6dceaecb11"
 }
diff --git a/prover/prover_dal/.sqlx/query-0e7f17dd9c10b779d62de504a9cc41d3d4edb2d28d2a1fdf919f234a9ab9c43a.json b/prover/prover_dal/.sqlx/query-8720d411e0c9640afd61e927a89c0b6c018e6a4d279acd24a4ea7d81b5cc5123.json
similarity index 60%
rename from prover/prover_dal/.sqlx/query-0e7f17dd9c10b779d62de504a9cc41d3d4edb2d28d2a1fdf919f234a9ab9c43a.json
rename to prover/prover_dal/.sqlx/query-8720d411e0c9640afd61e927a89c0b6c018e6a4d279acd24a4ea7d81b5cc5123.json
index 6d967c5e79c4..12146fb75a90 100644
--- a/prover/prover_dal/.sqlx/query-0e7f17dd9c10b779d62de504a9cc41d3d4edb2d28d2a1fdf919f234a9ab9c43a.json
+++ b/prover/prover_dal/.sqlx/query-8720d411e0c9640afd61e927a89c0b6c018e6a4d279acd24a4ea7d81b5cc5123.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        prover_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                    ORDER BY\n                        aggregation_round DESC,\n                        l1_batch_number ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                prover_jobs_fri.id,\n                prover_jobs_fri.l1_batch_number,\n                prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round,\n                prover_jobs_fri.sequence_number,\n                prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n            ",
+  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        prover_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        aggregation_round DESC,\n                        l1_batch_number ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                prover_jobs_fri.id,\n                prover_jobs_fri.l1_batch_number,\n                prover_jobs_fri.circuit_id,\n                prover_jobs_fri.aggregation_round,\n                prover_jobs_fri.sequence_number,\n                prover_jobs_fri.depth,\n                prover_jobs_fri.is_node_final_proof\n            ",
   "describe": {
     "columns": [
       {
@@ -41,6 +41,7 @@
     ],
     "parameters": {
       "Left": [
+        "Int4",
         "Int4",
         "Text"
       ]
@@ -55,5 +56,5 @@
       false
     ]
   },
-  "hash": "0e7f17dd9c10b779d62de504a9cc41d3d4edb2d28d2a1fdf919f234a9ab9c43a"
+  "hash": "8720d411e0c9640afd61e927a89c0b6c018e6a4d279acd24a4ea7d81b5cc5123"
 }
diff --git a/prover/prover_dal/.sqlx/query-87a73aa95a85efeb065428f9e56e085ea80cf93c2fd66fd3949aab428bbdc560.json b/prover/prover_dal/.sqlx/query-87a73aa95a85efeb065428f9e56e085ea80cf93c2fd66fd3949aab428bbdc560.json
new file mode 100644
index 000000000000..d95b4f7f6f20
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-87a73aa95a85efeb065428f9e56e085ea80cf93c2fd66fd3949aab428bbdc560.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            DELETE FROM prover_jobs_fri\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "87a73aa95a85efeb065428f9e56e085ea80cf93c2fd66fd3949aab428bbdc560"
+}
diff --git a/prover/prover_dal/.sqlx/query-8f5e89ccadd4ea1da7bfe9793a1cbb724af0f0216433a70f19d784e3f2afbc9f.json b/prover/prover_dal/.sqlx/query-8f5e89ccadd4ea1da7bfe9793a1cbb724af0f0216433a70f19d784e3f2afbc9f.json
deleted file mode 100644
index cf7822e8ec84..000000000000
--- a/prover/prover_dal/.sqlx/query-8f5e89ccadd4ea1da7bfe9793a1cbb724af0f0216433a70f19d784e3f2afbc9f.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                protocol_version\n            FROM\n                witness_inputs_fri\n            WHERE\n                l1_batch_number = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "protocol_version",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "8f5e89ccadd4ea1da7bfe9793a1cbb724af0f0216433a70f19d784e3f2afbc9f"
-}
diff --git a/prover/prover_dal/.sqlx/query-8ffb62f6a17c68af701e790044989daacb88fe5aaf368c5f81a885821522b99c.json b/prover/prover_dal/.sqlx/query-8ffb62f6a17c68af701e790044989daacb88fe5aaf368c5f81a885821522b99c.json
new file mode 100644
index 000000000000..76a2a54a6a1d
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-8ffb62f6a17c68af701e790044989daacb88fe5aaf368c5f81a885821522b99c.json
@@ -0,0 +1,41 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                l1_batch_number,\n                status,\n                protocol_version,\n                protocol_version_patch\n            FROM\n                proof_compression_jobs_fri\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        MIN(l1_batch_number)\n                    FROM\n                        proof_compression_jobs_fri\n                    WHERE\n                        status = $1\n                        OR status = $2\n                )\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "status",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "protocol_version",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 3,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "8ffb62f6a17c68af701e790044989daacb88fe5aaf368c5f81a885821522b99c"
+}
diff --git a/prover/prover_dal/.sqlx/query-f4362a61ab05af3d71a3232d2f017db60405a887f9f7fa0ca60aa7fc879ce630.json b/prover/prover_dal/.sqlx/query-93b9706aa8eb840d574d7c156cc866e8f67a380302762c272bfb27307682d62e.json
similarity index 59%
rename from prover/prover_dal/.sqlx/query-f4362a61ab05af3d71a3232d2f017db60405a887f9f7fa0ca60aa7fc879ce630.json
rename to prover/prover_dal/.sqlx/query-93b9706aa8eb840d574d7c156cc866e8f67a380302762c272bfb27307682d62e.json
index 59c28852a03e..90eface5350b 100644
--- a/prover/prover_dal/.sqlx/query-f4362a61ab05af3d71a3232d2f017db60405a887f9f7fa0ca60aa7fc879ce630.json
+++ b/prover/prover_dal/.sqlx/query-93b9706aa8eb840d574d7c156cc866e8f67a380302762c272bfb27307682d62e.json
@@ -1,16 +1,18 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE proof_compression_jobs_fri\n            SET\n                status = $1,\n                error = $2,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $3\n            ",
+  "query": "\n            UPDATE proof_compression_jobs_fri\n            SET\n                status = $1,\n                error = $2,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $3\n                AND status != $4\n                AND status != $5\n            ",
   "describe": {
     "columns": [],
     "parameters": {
       "Left": [
         "Text",
         "Text",
-        "Int8"
+        "Int8",
+        "Text",
+        "Text"
       ]
     },
     "nullable": []
   },
-  "hash": "f4362a61ab05af3d71a3232d2f017db60405a887f9f7fa0ca60aa7fc879ce630"
+  "hash": "93b9706aa8eb840d574d7c156cc866e8f67a380302762c272bfb27307682d62e"
 }
diff --git a/prover/prover_dal/.sqlx/query-94a75b05ecbab75d6ebf39cca029bfb838c787fc58d7536f9e9976e5e515431a.json b/prover/prover_dal/.sqlx/query-94a75b05ecbab75d6ebf39cca029bfb838c787fc58d7536f9e9976e5e515431a.json
index 896f10a4ca3a..824d74aef48c 100644
--- a/prover/prover_dal/.sqlx/query-94a75b05ecbab75d6ebf39cca029bfb838c787fc58d7536f9e9976e5e515431a.json
+++ b/prover/prover_dal/.sqlx/query-94a75b05ecbab75d6ebf39cca029bfb838c787fc58d7536f9e9976e5e515431a.json
@@ -77,6 +77,11 @@
         "ordinal": 14,
         "name": "picked_by",
         "type_info": "Text"
+      },
+      {
+        "ordinal": 15,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
@@ -99,7 +104,8 @@
       false,
       true,
       true,
-      true
+      true,
+      false
     ]
   },
   "hash": "94a75b05ecbab75d6ebf39cca029bfb838c787fc58d7536f9e9976e5e515431a"
diff --git a/prover/prover_dal/.sqlx/query-8980174300deb4bca5291c6c554c85ebd58e9d071b075cccd4794c3194efa43e.json b/prover/prover_dal/.sqlx/query-9b713312b539b4eefa58346f0070767a2cd4488e670674cd9149f7a332c0198d.json
similarity index 90%
rename from prover/prover_dal/.sqlx/query-8980174300deb4bca5291c6c554c85ebd58e9d071b075cccd4794c3194efa43e.json
rename to prover/prover_dal/.sqlx/query-9b713312b539b4eefa58346f0070767a2cd4488e670674cd9149f7a332c0198d.json
index 2dd3a28386cc..2609a2ee0cfc 100644
--- a/prover/prover_dal/.sqlx/query-8980174300deb4bca5291c6c554c85ebd58e9d071b075cccd4794c3194efa43e.json
+++ b/prover/prover_dal/.sqlx/query-9b713312b539b4eefa58346f0070767a2cd4488e670674cd9149f7a332c0198d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                l1_batch_number IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number\n                    FROM\n                        prover_jobs_fri\n                        JOIN recursion_tip_witness_jobs_fri rtwj ON prover_jobs_fri.l1_batch_number = rtwj.l1_batch_number\n                    WHERE\n                        rtwj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = $1\n                        AND prover_jobs_fri.is_node_final_proof = true\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        rtwj.number_of_final_node_jobs\n                    HAVING\n                        COUNT(*) = rtwj.number_of_final_node_jobs\n                )\n            RETURNING\n                l1_batch_number;\n            ",
+  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                l1_batch_number IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number\n                    FROM\n                        prover_jobs_fri\n                        JOIN recursion_tip_witness_jobs_fri rtwj ON prover_jobs_fri.l1_batch_number = rtwj.l1_batch_number\n                    WHERE\n                        rtwj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = $1\n                        AND prover_jobs_fri.is_node_final_proof = TRUE\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        rtwj.number_of_final_node_jobs\n                    HAVING\n                        COUNT(*) = rtwj.number_of_final_node_jobs\n                )\n            RETURNING\n                l1_batch_number;\n            ",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       false
     ]
   },
-  "hash": "8980174300deb4bca5291c6c554c85ebd58e9d071b075cccd4794c3194efa43e"
+  "hash": "9b713312b539b4eefa58346f0070767a2cd4488e670674cd9149f7a332c0198d"
 }
diff --git a/prover/prover_dal/.sqlx/query-9da0a96bf42ef7b60ec3e39056942cb36fcaf1679bf49d7741305e8bc6e5e318.json b/prover/prover_dal/.sqlx/query-9da0a96bf42ef7b60ec3e39056942cb36fcaf1679bf49d7741305e8bc6e5e318.json
deleted file mode 100644
index 5e2d46033178..000000000000
--- a/prover/prover_dal/.sqlx/query-9da0a96bf42ef7b60ec3e39056942cb36fcaf1679bf49d7741305e8bc6e5e318.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                gpu_prover_queue_fri (\n                    instance_host,\n                    instance_port,\n                    instance_status,\n                    specialized_prover_group_id,\n                    zone,\n                    created_at,\n                    updated_at,\n                    protocol_version\n                )\n            VALUES\n                (CAST($1::TEXT AS inet), $2, 'available', $3, $4, NOW(), NOW(), $5)\n            ON CONFLICT (instance_host, instance_port, zone) DO\n            UPDATE\n            SET\n                instance_status = 'available',\n                specialized_prover_group_id = $3,\n                zone = $4,\n                updated_at = NOW(),\n                protocol_version = $5\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Int4",
-        "Int2",
-        "Text",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "9da0a96bf42ef7b60ec3e39056942cb36fcaf1679bf49d7741305e8bc6e5e318"
-}
diff --git a/prover/prover_dal/.sqlx/query-a94fffdbc1827dc5df908ea1e99ef3ad13840d2c497760e9bd0513f68dc4271c.json b/prover/prover_dal/.sqlx/query-a94fffdbc1827dc5df908ea1e99ef3ad13840d2c497760e9bd0513f68dc4271c.json
new file mode 100644
index 000000000000..20db1e57aeb8
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-a94fffdbc1827dc5df908ea1e99ef3ad13840d2c497760e9bd0513f68dc4271c.json
@@ -0,0 +1,50 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                SELECT\n                    COUNT(*) AS \"count!\",\n                    circuit_id AS \"circuit_id!\",\n                    aggregation_round AS \"aggregation_round!\",\n                    status AS \"status!\",\n                    protocol_version AS \"protocol_version!\",\n                    protocol_version_patch AS \"protocol_version_patch!\"\n                FROM\n                    prover_jobs_fri\n                WHERE\n                    (\n                        status = 'queued'\n                        OR status = 'in_progress'\n                    )\n                    AND protocol_version IS NOT NULL\n                GROUP BY\n                    circuit_id,\n                    aggregation_round,\n                    status,\n                    protocol_version,\n                    protocol_version_patch\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count!",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "circuit_id!",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 2,
+        "name": "aggregation_round!",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 3,
+        "name": "status!",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "protocol_version!",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 5,
+        "name": "protocol_version_patch!",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null,
+      false,
+      false,
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "a94fffdbc1827dc5df908ea1e99ef3ad13840d2c497760e9bd0513f68dc4271c"
+}
diff --git a/prover/prover_dal/.sqlx/query-aa91697157517322b0dbb53dca99f41220c51f58a03c61d6b7789eab0504e320.json b/prover/prover_dal/.sqlx/query-aa91697157517322b0dbb53dca99f41220c51f58a03c61d6b7789eab0504e320.json
deleted file mode 100644
index 27d482317286..000000000000
--- a/prover/prover_dal/.sqlx/query-aa91697157517322b0dbb53dca99f41220c51f58a03c61d6b7789eab0504e320.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                UPDATE node_aggregation_witness_jobs_fri\n                SET\n                    status = 'queued'\n                WHERE\n                    (l1_batch_number, circuit_id, depth) IN (\n                        SELECT\n                            prover_jobs_fri.l1_batch_number,\n                            prover_jobs_fri.circuit_id,\n                            prover_jobs_fri.depth\n                        FROM\n                            prover_jobs_fri\n                            JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number\n                            AND prover_jobs_fri.circuit_id = nawj.circuit_id\n                            AND prover_jobs_fri.depth = nawj.depth\n                        WHERE\n                            nawj.status = 'waiting_for_proofs'\n                            AND prover_jobs_fri.status = 'successful'\n                            AND prover_jobs_fri.aggregation_round = 1\n                            AND prover_jobs_fri.depth = 0\n                        GROUP BY\n                            prover_jobs_fri.l1_batch_number,\n                            prover_jobs_fri.circuit_id,\n                            prover_jobs_fri.depth,\n                            nawj.number_of_dependent_jobs\n                        HAVING\n                            COUNT(*) = nawj.number_of_dependent_jobs\n                    )\n                RETURNING\n                    l1_batch_number,\n                    circuit_id,\n                    depth;\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "circuit_id",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 2,
-        "name": "depth",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "aa91697157517322b0dbb53dca99f41220c51f58a03c61d6b7789eab0504e320"
-}
diff --git a/prover/prover_dal/.sqlx/query-aaf4fb97c95a5290fb1620cd868477dcf21955e0921ba648ba2e751dbfc3cb45.json b/prover/prover_dal/.sqlx/query-aaf4fb97c95a5290fb1620cd868477dcf21955e0921ba648ba2e751dbfc3cb45.json
deleted file mode 100644
index 614b853c6250..000000000000
--- a/prover/prover_dal/.sqlx/query-aaf4fb97c95a5290fb1620cd868477dcf21955e0921ba648ba2e751dbfc3cb45.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT\n                    COUNT(*) AS \"count!\",\n                    circuit_id AS \"circuit_id!\",\n                    aggregation_round AS \"aggregation_round!\",\n                    status AS \"status!\"\n                FROM\n                    prover_jobs_fri\n                WHERE\n                    status <> 'skipped'\n                    AND status <> 'successful'\n                GROUP BY\n                    circuit_id,\n                    aggregation_round,\n                    status\n                ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "count!",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "circuit_id!",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 2,
-        "name": "aggregation_round!",
-        "type_info": "Int2"
-      },
-      {
-        "ordinal": 3,
-        "name": "status!",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      null,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "aaf4fb97c95a5290fb1620cd868477dcf21955e0921ba648ba2e751dbfc3cb45"
-}
diff --git a/prover/prover_dal/.sqlx/query-abc93d27a8673b23e18d050e84c43c868c63c853edb5c4f41e48a3cc6378eca9.json b/prover/prover_dal/.sqlx/query-abc93d27a8673b23e18d050e84c43c868c63c853edb5c4f41e48a3cc6378eca9.json
new file mode 100644
index 000000000000..fae5c1041a5d
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-abc93d27a8673b23e18d050e84c43c868c63c853edb5c4f41e48a3cc6378eca9.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE node_aggregation_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                (l1_batch_number, circuit_id, depth) IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth\n                    FROM\n                        prover_jobs_fri\n                        JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number\n                        AND prover_jobs_fri.circuit_id = nawj.circuit_id\n                        AND prover_jobs_fri.depth = nawj.depth\n                    WHERE\n                        nawj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = 1\n                        AND prover_jobs_fri.depth = 0\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        prover_jobs_fri.depth,\n                        nawj.number_of_dependent_jobs\n                    HAVING\n                        COUNT(*) = nawj.number_of_dependent_jobs\n                )\n            RETURNING\n                l1_batch_number,\n                circuit_id,\n                depth;\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "circuit_id",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 2,
+        "name": "depth",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "abc93d27a8673b23e18d050e84c43c868c63c853edb5c4f41e48a3cc6378eca9"
+}
diff --git a/prover/prover_dal/.sqlx/query-af72fabd90eb43fb315f46d7fe9f724216807ffd481cd6f7f19968e42e52b284.json b/prover/prover_dal/.sqlx/query-af72fabd90eb43fb315f46d7fe9f724216807ffd481cd6f7f19968e42e52b284.json
deleted file mode 100644
index 6674fab59eab..000000000000
--- a/prover/prover_dal/.sqlx/query-af72fabd90eb43fb315f46d7fe9f724216807ffd481cd6f7f19968e42e52b284.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = 'sent_to_server',\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $1\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "af72fabd90eb43fb315f46d7fe9f724216807ffd481cd6f7f19968e42e52b284"
-}
diff --git a/prover/prover_dal/.sqlx/query-5821f1446983260168cec366af26009503182c300877e74a8539f231050e6f85.json b/prover/prover_dal/.sqlx/query-b25c66b9705b3f2fb8a3492f1bd20222e177262292241bd8cb89dbb9c1e74c2d.json
similarity index 72%
rename from prover/prover_dal/.sqlx/query-5821f1446983260168cec366af26009503182c300877e74a8539f231050e6f85.json
rename to prover/prover_dal/.sqlx/query-b25c66b9705b3f2fb8a3492f1bd20222e177262292241bd8cb89dbb9c1e74c2d.json
index 86877a48dd4d..d0c5d31aa3ec 100644
--- a/prover/prover_dal/.sqlx/query-5821f1446983260168cec366af26009503182c300877e74a8539f231050e6f85.json
+++ b/prover/prover_dal/.sqlx/query-b25c66b9705b3f2fb8a3492f1bd20222e177262292241bd8cb89dbb9c1e74c2d.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = $1,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $2\n            ",
+  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = $1,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $2\n                AND status != 'successful'\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "5821f1446983260168cec366af26009503182c300877e74a8539f231050e6f85"
+  "hash": "b25c66b9705b3f2fb8a3492f1bd20222e177262292241bd8cb89dbb9c1e74c2d"
 }
diff --git a/prover/prover_dal/.sqlx/query-b568f9cb9c2bd53b5dcde15f368a9dc31c7d51476f18cffa80cad653298ad252.json b/prover/prover_dal/.sqlx/query-b568f9cb9c2bd53b5dcde15f368a9dc31c7d51476f18cffa80cad653298ad252.json
new file mode 100644
index 000000000000..03d268477904
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-b568f9cb9c2bd53b5dcde15f368a9dc31c7d51476f18cffa80cad653298ad252.json
@@ -0,0 +1,12 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            DELETE FROM proof_compression_jobs_fri\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": []
+  },
+  "hash": "b568f9cb9c2bd53b5dcde15f368a9dc31c7d51476f18cffa80cad653298ad252"
+}
diff --git a/prover/prover_dal/.sqlx/query-06a8b9028125d81f1d83180dbe23fc5acbb7569ef424d98a232f1bfc0bf0a6b1.json b/prover/prover_dal/.sqlx/query-bf06bd08d8ccf67fc00bbc364715263556f258565f79cbb40f5ecc1a4f6402f5.json
similarity index 66%
rename from prover/prover_dal/.sqlx/query-06a8b9028125d81f1d83180dbe23fc5acbb7569ef424d98a232f1bfc0bf0a6b1.json
rename to prover/prover_dal/.sqlx/query-bf06bd08d8ccf67fc00bbc364715263556f258565f79cbb40f5ecc1a4f6402f5.json
index af6d49ba049b..c1f9806625dd 100644
--- a/prover/prover_dal/.sqlx/query-06a8b9028125d81f1d83180dbe23fc5acbb7569ef424d98a232f1bfc0bf0a6b1.json
+++ b/prover/prover_dal/.sqlx/query-bf06bd08d8ccf67fc00bbc364715263556f258565f79cbb40f5ecc1a4f6402f5.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $2\n            ",
+  "query": "\n            UPDATE recursion_tip_witness_jobs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $2\n                AND status != 'successful'\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "06a8b9028125d81f1d83180dbe23fc5acbb7569ef424d98a232f1bfc0bf0a6b1"
+  "hash": "bf06bd08d8ccf67fc00bbc364715263556f258565f79cbb40f5ecc1a4f6402f5"
 }
diff --git a/prover/prover_dal/.sqlx/query-2d31fcce581975a82d6156b52e35fb7a093b73727f75e0cb7db9cea480c95f5c.json b/prover/prover_dal/.sqlx/query-c156004a0e5ad5bcc33d3b894fd69718349ac4fc08b455c7f4265d7443f2ec13.json
similarity index 86%
rename from prover/prover_dal/.sqlx/query-2d31fcce581975a82d6156b52e35fb7a093b73727f75e0cb7db9cea480c95f5c.json
rename to prover/prover_dal/.sqlx/query-c156004a0e5ad5bcc33d3b894fd69718349ac4fc08b455c7f4265d7443f2ec13.json
index c4bcd6ea4915..60f8a0df709a 100644
--- a/prover/prover_dal/.sqlx/query-2d31fcce581975a82d6156b52e35fb7a093b73727f75e0cb7db9cea480c95f5c.json
+++ b/prover/prover_dal/.sqlx/query-c156004a0e5ad5bcc33d3b894fd69718349ac4fc08b455c7f4265d7443f2ec13.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                UPDATE prover_jobs_fri\n                SET\n                    status = 'queued',\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    id IN (\n                        SELECT\n                            id\n                        FROM\n                            prover_jobs_fri\n                        WHERE\n                            (\n                                status = 'in_progress'\n                                AND processing_started_at <= NOW() - $1::INTERVAL\n                                AND attempts < $2\n                            )\n                            OR (\n                                status = 'in_gpu_proof'\n                                AND processing_started_at <= NOW() - $1::INTERVAL\n                                AND attempts < $2\n                            )\n                            OR (\n                                status = 'failed'\n                                AND attempts < $2\n                            )\n                        FOR UPDATE\n                            SKIP LOCKED\n                    )\n                RETURNING\n                    id,\n                    status,\n                    attempts\n                ",
+  "query": "\n                UPDATE prover_jobs_fri\n                SET\n                    status = 'queued',\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    id IN (\n                        SELECT\n                            id\n                        FROM\n                            prover_jobs_fri\n                        WHERE\n                            (\n                                status = 'in_progress'\n                                AND processing_started_at <= NOW() - $1::INTERVAL\n                                AND attempts < $2\n                            )\n                            OR (\n                                status = 'in_gpu_proof'\n                                AND processing_started_at <= NOW() - $1::INTERVAL\n                                AND attempts < $2\n                            )\n                            OR (\n                                status = 'failed'\n                                AND attempts < $2\n                            )\n                        FOR UPDATE\n                            SKIP LOCKED\n                    )\n                RETURNING\n                    id,\n                    status,\n                    attempts,\n                    circuit_id\n                ",
   "describe": {
     "columns": [
       {
@@ -17,6 +17,11 @@
         "ordinal": 2,
         "name": "attempts",
         "type_info": "Int2"
+      },
+      {
+        "ordinal": 3,
+        "name": "circuit_id",
+        "type_info": "Int2"
       }
     ],
     "parameters": {
@@ -26,10 +31,11 @@
       ]
     },
     "nullable": [
+      false,
       false,
       false,
       false
     ]
   },
-  "hash": "2d31fcce581975a82d6156b52e35fb7a093b73727f75e0cb7db9cea480c95f5c"
+  "hash": "c156004a0e5ad5bcc33d3b894fd69718349ac4fc08b455c7f4265d7443f2ec13"
 }
diff --git a/prover/prover_dal/.sqlx/query-83d7409bedec3db527f6179e4baaa1b7d32b51659569fde755218d42da660b2f.json b/prover/prover_dal/.sqlx/query-c173743af526d8150b6091ea52e6997fcfbc7ad688f2eee3dfab1029344d2382.json
similarity index 85%
rename from prover/prover_dal/.sqlx/query-83d7409bedec3db527f6179e4baaa1b7d32b51659569fde755218d42da660b2f.json
rename to prover/prover_dal/.sqlx/query-c173743af526d8150b6091ea52e6997fcfbc7ad688f2eee3dfab1029344d2382.json
index f3a919e3d982..4f0e7a0062c0 100644
--- a/prover/prover_dal/.sqlx/query-83d7409bedec3db527f6179e4baaa1b7d32b51659569fde755218d42da660b2f.json
+++ b/prover/prover_dal/.sqlx/query-c173743af526d8150b6091ea52e6997fcfbc7ad688f2eee3dfab1029344d2382.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                recursion_scheduler_level_vk_hash,\n                recursion_node_level_vk_hash,\n                recursion_leaf_level_vk_hash,\n                recursion_circuits_set_vks_hash\n            FROM\n                prover_fri_protocol_versions\n            WHERE\n                id = $1\n            ",
+  "query": "\n            SELECT\n                recursion_scheduler_level_vk_hash,\n                recursion_node_level_vk_hash,\n                recursion_leaf_level_vk_hash,\n                recursion_circuits_set_vks_hash\n            FROM\n                prover_fri_protocol_versions\n            WHERE\n                id = $1\n                AND protocol_version_patch = $2\n            ",
   "describe": {
     "columns": [
       {
@@ -26,6 +26,7 @@
     ],
     "parameters": {
       "Left": [
+        "Int4",
         "Int4"
       ]
     },
@@ -36,5 +37,5 @@
       false
     ]
   },
-  "hash": "83d7409bedec3db527f6179e4baaa1b7d32b51659569fde755218d42da660b2f"
+  "hash": "c173743af526d8150b6091ea52e6997fcfbc7ad688f2eee3dfab1029344d2382"
 }
diff --git a/prover/prover_dal/.sqlx/query-c2c140d136df5303d7b3a66ccd0d34a5baece02812f8c950fc84d37eeebd33a4.json b/prover/prover_dal/.sqlx/query-c2c140d136df5303d7b3a66ccd0d34a5baece02812f8c950fc84d37eeebd33a4.json
index 7ced88426e4d..007525bceaef 100644
--- a/prover/prover_dal/.sqlx/query-c2c140d136df5303d7b3a66ccd0d34a5baece02812f8c950fc84d37eeebd33a4.json
+++ b/prover/prover_dal/.sqlx/query-c2c140d136df5303d7b3a66ccd0d34a5baece02812f8c950fc84d37eeebd33a4.json
@@ -97,6 +97,11 @@
         "ordinal": 18,
         "name": "picked_by",
         "type_info": "Text"
+      },
+      {
+        "ordinal": 19,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
@@ -124,7 +129,8 @@
       false,
       true,
       true,
-      true
+      true,
+      false
     ]
   },
   "hash": "c2c140d136df5303d7b3a66ccd0d34a5baece02812f8c950fc84d37eeebd33a4"
diff --git a/prover/prover_dal/.sqlx/query-c23d5ff919ade5898c6a912780ae899e360650afccb34f5cc301b5cbac4a3d36.json b/prover/prover_dal/.sqlx/query-c340c043c938bf5f4b63d57a1654775c6f7414c7bed75d33b61de00fdbabc349.json
similarity index 61%
rename from prover/prover_dal/.sqlx/query-c23d5ff919ade5898c6a912780ae899e360650afccb34f5cc301b5cbac4a3d36.json
rename to prover/prover_dal/.sqlx/query-c340c043c938bf5f4b63d57a1654775c6f7414c7bed75d33b61de00fdbabc349.json
index 8922816c7e15..41edb649e7c9 100644
--- a/prover/prover_dal/.sqlx/query-c23d5ff919ade5898c6a912780ae899e360650afccb34f5cc301b5cbac4a3d36.json
+++ b/prover/prover_dal/.sqlx/query-c340c043c938bf5f4b63d57a1654775c6f7414c7bed75d33b61de00fdbabc349.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = $1,\n                updated_at = NOW()\n            WHERE\n                id = $2\n            ",
+  "query": "\n            UPDATE prover_jobs_fri\n            SET\n                status = $1,\n                updated_at = NOW()\n            WHERE\n                id = $2\n                AND status != 'successful'\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "c23d5ff919ade5898c6a912780ae899e360650afccb34f5cc301b5cbac4a3d36"
+  "hash": "c340c043c938bf5f4b63d57a1654775c6f7414c7bed75d33b61de00fdbabc349"
 }
diff --git a/prover/prover_dal/.sqlx/query-c41312e01aa66897552e8be9acc8d43c31ec7441a7f6c5040e120810ebbb72f7.json b/prover/prover_dal/.sqlx/query-c41312e01aa66897552e8be9acc8d43c31ec7441a7f6c5040e120810ebbb72f7.json
deleted file mode 100644
index 4c24afad4f4c..000000000000
--- a/prover/prover_dal/.sqlx/query-c41312e01aa66897552e8be9acc8d43c31ec7441a7f6c5040e120810ebbb72f7.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    INSERT INTO\n                        prover_jobs_fri (\n                            l1_batch_number,\n                            circuit_id,\n                            circuit_blob_url,\n                            aggregation_round,\n                            sequence_number,\n                            depth,\n                            is_node_final_proof,\n                            protocol_version,\n                            status,\n                            created_at,\n                            updated_at\n                        )\n                    VALUES\n                        ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', NOW(), NOW())\n                    ON CONFLICT (l1_batch_number, aggregation_round, circuit_id, depth, sequence_number) DO\n                    UPDATE\n                    SET\n                        updated_at = NOW()\n                    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int2",
-        "Text",
-        "Int2",
-        "Int4",
-        "Int4",
-        "Bool",
-        "Int4"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "c41312e01aa66897552e8be9acc8d43c31ec7441a7f6c5040e120810ebbb72f7"
-}
diff --git a/prover/prover_dal/.sqlx/query-1bc6597117db032b87df33040d61610ffa7f169d560e79e89b99eedf681c6773.json b/prover/prover_dal/.sqlx/query-caff620ae66d7fbe3caff7505173b6da86d1e693be03936730c340121167341f.json
similarity index 53%
rename from prover/prover_dal/.sqlx/query-1bc6597117db032b87df33040d61610ffa7f169d560e79e89b99eedf681c6773.json
rename to prover/prover_dal/.sqlx/query-caff620ae66d7fbe3caff7505173b6da86d1e693be03936730c340121167341f.json
index 0351691c3955..403e34bb91cd 100644
--- a/prover/prover_dal/.sqlx/query-1bc6597117db032b87df33040d61610ffa7f169d560e79e89b99eedf681c6773.json
+++ b/prover/prover_dal/.sqlx/query-caff620ae66d7fbe3caff7505173b6da86d1e693be03936730c340121167341f.json
@@ -1,16 +1,17 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                INSERT INTO\n                    scheduler_witness_jobs_fri (\n                        l1_batch_number,\n                        scheduler_partial_input_blob_url,\n                        protocol_version,\n                        status,\n                        created_at,\n                        updated_at\n                    )\n                VALUES\n                    ($1, $2, $3, 'waiting_for_proofs', NOW(), NOW())\n                ON CONFLICT (l1_batch_number) DO\n                UPDATE\n                SET\n                    updated_at = NOW()\n                ",
+  "query": "\n                INSERT INTO\n                    scheduler_witness_jobs_fri (\n                        l1_batch_number,\n                        scheduler_partial_input_blob_url,\n                        protocol_version,\n                        status,\n                        created_at,\n                        updated_at,\n                        protocol_version_patch\n                    )\n                VALUES\n                    ($1, $2, $3, 'waiting_for_proofs', NOW(), NOW(), $4)\n                ON CONFLICT (l1_batch_number) DO\n                UPDATE\n                SET\n                    updated_at = NOW()\n                ",
   "describe": {
     "columns": [],
     "parameters": {
       "Left": [
         "Int8",
         "Text",
+        "Int4",
         "Int4"
       ]
     },
     "nullable": []
   },
-  "hash": "1bc6597117db032b87df33040d61610ffa7f169d560e79e89b99eedf681c6773"
+  "hash": "caff620ae66d7fbe3caff7505173b6da86d1e693be03936730c340121167341f"
 }
diff --git a/prover/prover_dal/.sqlx/query-4d92a133a36afd682a84fbfd75aafca34d61347e0e2e29fb07ca3d1b8b1f309c.json b/prover/prover_dal/.sqlx/query-d16278c6025eb3a205266fb5273f029e262be45614404159908af1624349700b.json
similarity index 59%
rename from prover/prover_dal/.sqlx/query-4d92a133a36afd682a84fbfd75aafca34d61347e0e2e29fb07ca3d1b8b1f309c.json
rename to prover/prover_dal/.sqlx/query-d16278c6025eb3a205266fb5273f029e262be45614404159908af1624349700b.json
index f7ae37f4b7b3..a8158a9defee 100644
--- a/prover/prover_dal/.sqlx/query-4d92a133a36afd682a84fbfd75aafca34d61347e0e2e29fb07ca3d1b8b1f309c.json
+++ b/prover/prover_dal/.sqlx/query-d16278c6025eb3a205266fb5273f029e262be45614404159908af1624349700b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                prover_fri_protocol_versions (\n                    id,\n                    recursion_scheduler_level_vk_hash,\n                    recursion_node_level_vk_hash,\n                    recursion_leaf_level_vk_hash,\n                    recursion_circuits_set_vks_hash,\n                    created_at\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, NOW())\n            ON CONFLICT (id) DO NOTHING\n            ",
+  "query": "\n            INSERT INTO\n                prover_fri_protocol_versions (\n                    id,\n                    recursion_scheduler_level_vk_hash,\n                    recursion_node_level_vk_hash,\n                    recursion_leaf_level_vk_hash,\n                    recursion_circuits_set_vks_hash,\n                    created_at,\n                    protocol_version_patch\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, NOW(), $6)\n            ON CONFLICT (id, protocol_version_patch) DO NOTHING\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -9,10 +9,11 @@
         "Bytea",
         "Bytea",
         "Bytea",
-        "Bytea"
+        "Bytea",
+        "Int4"
       ]
     },
     "nullable": []
   },
-  "hash": "4d92a133a36afd682a84fbfd75aafca34d61347e0e2e29fb07ca3d1b8b1f309c"
+  "hash": "d16278c6025eb3a205266fb5273f029e262be45614404159908af1624349700b"
 }
diff --git a/prover/prover_dal/.sqlx/query-d286520139c1f5daa90b20efffa515afcaedf541533f218ca6e167bdc7f6ea7f.json b/prover/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json
similarity index 77%
rename from prover/prover_dal/.sqlx/query-d286520139c1f5daa90b20efffa515afcaedf541533f218ca6e167bdc7f6ea7f.json
rename to prover/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json
index 5024a94f4c30..a90da33a3333 100644
--- a/prover/prover_dal/.sqlx/query-d286520139c1f5daa90b20efffa515afcaedf541533f218ca6e167bdc7f6ea7f.json
+++ b/prover/prover_dal/.sqlx/query-d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $2\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        leaf_aggregation_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                    ORDER BY\n                        l1_batch_number ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                leaf_aggregation_witness_jobs_fri.*\n            ",
+  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                id = (\n                    SELECT\n                        id\n                    FROM\n                        leaf_aggregation_witness_jobs_fri\n                    WHERE\n                        status = 'queued'\n                        AND protocol_version = $1\n                        AND protocol_version_patch = $2\n                    ORDER BY\n                        l1_batch_number ASC,\n                        id ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                leaf_aggregation_witness_jobs_fri.*\n            ",
   "describe": {
     "columns": [
       {
@@ -77,10 +77,16 @@
         "ordinal": 14,
         "name": "picked_by",
         "type_info": "Text"
+      },
+      {
+        "ordinal": 15,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
       "Left": [
+        "Int4",
         "Int4",
         "Text"
       ]
@@ -100,8 +106,9 @@
       true,
       true,
       true,
-      true
+      true,
+      false
     ]
   },
-  "hash": "d286520139c1f5daa90b20efffa515afcaedf541533f218ca6e167bdc7f6ea7f"
+  "hash": "d272c91f1209c277189a31c59ee191a43dc8eafc33ee067bd41e20f25f7625f0"
 }
diff --git a/prover/prover_dal/.sqlx/query-a0e2b2c034cc5f668f0b3d43b94d2e2326d7ace079b095def52723a45b65d3f3.json b/prover/prover_dal/.sqlx/query-d4949debfe0dc5112204cd196c68b02c44b099e27e3c45c5c810cd5fcd8884ed.json
similarity index 67%
rename from prover/prover_dal/.sqlx/query-a0e2b2c034cc5f668f0b3d43b94d2e2326d7ace079b095def52723a45b65d3f3.json
rename to prover/prover_dal/.sqlx/query-d4949debfe0dc5112204cd196c68b02c44b099e27e3c45c5c810cd5fcd8884ed.json
index 7dc19564f7fa..9121539b3179 100644
--- a/prover/prover_dal/.sqlx/query-a0e2b2c034cc5f668f0b3d43b94d2e2326d7ace079b095def52723a45b65d3f3.json
+++ b/prover/prover_dal/.sqlx/query-d4949debfe0dc5112204cd196c68b02c44b099e27e3c45c5c810cd5fcd8884ed.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $2\n            ",
+  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'failed',\n                error = $1,\n                updated_at = NOW()\n            WHERE\n                l1_batch_number = $2\n                AND status != 'successful'\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "a0e2b2c034cc5f668f0b3d43b94d2e2326d7ace079b095def52723a45b65d3f3"
+  "hash": "d4949debfe0dc5112204cd196c68b02c44b099e27e3c45c5c810cd5fcd8884ed"
 }
diff --git a/prover/prover_dal/.sqlx/query-d7e8eabd7b43ff62838fbc847e4813d2b2d411bd5faf8306cd48db500532b711.json b/prover/prover_dal/.sqlx/query-d7e8eabd7b43ff62838fbc847e4813d2b2d411bd5faf8306cd48db500532b711.json
deleted file mode 100644
index a049d76c24b7..000000000000
--- a/prover/prover_dal/.sqlx/query-d7e8eabd7b43ff62838fbc847e4813d2b2d411bd5faf8306cd48db500532b711.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT\n                l1_batch_number,\n                status\n            FROM\n                proof_compression_jobs_fri\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        MIN(l1_batch_number)\n                    FROM\n                        proof_compression_jobs_fri\n                    WHERE\n                        status = $1\n                        OR status = $2\n                )\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "l1_batch_number",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "status",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "d7e8eabd7b43ff62838fbc847e4813d2b2d411bd5faf8306cd48db500532b711"
-}
diff --git a/prover/prover_dal/.sqlx/query-e0a6cc885e437aa7ded9def71f3e118cabc67b6e507efefb7b69e102f1b43c58.json b/prover/prover_dal/.sqlx/query-e0a6cc885e437aa7ded9def71f3e118cabc67b6e507efefb7b69e102f1b43c58.json
index a7b8d0dc8542..738a8b54a0b3 100644
--- a/prover/prover_dal/.sqlx/query-e0a6cc885e437aa7ded9def71f3e118cabc67b6e507efefb7b69e102f1b43c58.json
+++ b/prover/prover_dal/.sqlx/query-e0a6cc885e437aa7ded9def71f3e118cabc67b6e507efefb7b69e102f1b43c58.json
@@ -67,6 +67,11 @@
         "ordinal": 12,
         "name": "eip_4844_blobs",
         "type_info": "Bytea"
+      },
+      {
+        "ordinal": 13,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
@@ -87,7 +92,8 @@
       true,
       true,
       true,
-      true
+      true,
+      false
     ]
   },
   "hash": "e0a6cc885e437aa7ded9def71f3e118cabc67b6e507efefb7b69e102f1b43c58"
diff --git a/prover/prover_dal/.sqlx/query-e3194873d24e67f8d0e98bf8bf2d4f9a3b98458746972c9860fb9473947d59ff.json b/prover/prover_dal/.sqlx/query-e3194873d24e67f8d0e98bf8bf2d4f9a3b98458746972c9860fb9473947d59ff.json
new file mode 100644
index 000000000000..0264238ee484
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-e3194873d24e67f8d0e98bf8bf2d4f9a3b98458746972c9860fb9473947d59ff.json
@@ -0,0 +1,41 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                UPDATE prover_jobs_fri\n                SET\n                    status = 'queued',\n                    error = 'Manually requeued',\n                    attempts = 2,\n                    updated_at = NOW(),\n                    processing_started_at = NOW()\n                WHERE\n                    l1_batch_number = $1\n                    AND attempts >= $2\n                    AND (\n                        status = 'in_progress'\n                        OR status = 'failed'\n                    )\n                RETURNING\n                    id,\n                    status,\n                    attempts,\n                    circuit_id\n                ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "status",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "attempts",
+        "type_info": "Int2"
+      },
+      {
+        "ordinal": 3,
+        "name": "circuit_id",
+        "type_info": "Int2"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int2"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "e3194873d24e67f8d0e98bf8bf2d4f9a3b98458746972c9860fb9473947d59ff"
+}
diff --git a/prover/prover_dal/.sqlx/query-d8e3ee346375e4b6a8b2c73a3827e88abd0f8164c2413dc83c91c29665ca645e.json b/prover/prover_dal/.sqlx/query-e32c0d85cb2841efb0b7cea6b049bae42849574731d33539bfdcca21c9b64f4e.json
similarity index 79%
rename from prover/prover_dal/.sqlx/query-d8e3ee346375e4b6a8b2c73a3827e88abd0f8164c2413dc83c91c29665ca645e.json
rename to prover/prover_dal/.sqlx/query-e32c0d85cb2841efb0b7cea6b049bae42849574731d33539bfdcca21c9b64f4e.json
index ae7bcea1882f..3a8362d2866d 100644
--- a/prover/prover_dal/.sqlx/query-d8e3ee346375e4b6a8b2c73a3827e88abd0f8164c2413dc83c91c29665ca645e.json
+++ b/prover/prover_dal/.sqlx/query-e32c0d85cb2841efb0b7cea6b049bae42849574731d33539bfdcca21c9b64f4e.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n                id,\n                status,\n                attempts\n            ",
+  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'queued',\n                updated_at = NOW(),\n                processing_started_at = NOW()\n            WHERE\n                (\n                    status = 'in_progress'\n                    AND processing_started_at <= NOW() - $1::INTERVAL\n                    AND attempts < $2\n                )\n                OR (\n                    status = 'failed'\n                    AND attempts < $2\n                )\n            RETURNING\n                id,\n                status,\n                attempts,\n                circuit_id\n            ",
   "describe": {
     "columns": [
       {
@@ -17,6 +17,11 @@
         "ordinal": 2,
         "name": "attempts",
         "type_info": "Int2"
+      },
+      {
+        "ordinal": 3,
+        "name": "circuit_id",
+        "type_info": "Int2"
       }
     ],
     "parameters": {
@@ -26,10 +31,11 @@
       ]
     },
     "nullable": [
+      false,
       false,
       false,
       false
     ]
   },
-  "hash": "d8e3ee346375e4b6a8b2c73a3827e88abd0f8164c2413dc83c91c29665ca645e"
+  "hash": "e32c0d85cb2841efb0b7cea6b049bae42849574731d33539bfdcca21c9b64f4e"
 }
diff --git a/prover/prover_dal/.sqlx/query-e495b78add1c942d89d806e228093a4eb2ee0284aa89bca1ba958f470a2d6254.json b/prover/prover_dal/.sqlx/query-e495b78add1c942d89d806e228093a4eb2ee0284aa89bca1ba958f470a2d6254.json
new file mode 100644
index 000000000000..6594b6ee76c9
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-e495b78add1c942d89d806e228093a4eb2ee0284aa89bca1ba958f470a2d6254.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            DELETE FROM prover_jobs_fri\n            WHERE\n                l1_batch_number = $1;\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "e495b78add1c942d89d806e228093a4eb2ee0284aa89bca1ba958f470a2d6254"
+}
diff --git a/prover/prover_dal/.sqlx/query-e62407c355594b87c7caee2396f1d14910604ddd7eadc29db3634dc873254569.json b/prover/prover_dal/.sqlx/query-e62407c355594b87c7caee2396f1d14910604ddd7eadc29db3634dc873254569.json
deleted file mode 100644
index acd2e7e9c50c..000000000000
--- a/prover/prover_dal/.sqlx/query-e62407c355594b87c7caee2396f1d14910604ddd7eadc29db3634dc873254569.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT protocol_version\n            FROM prover_jobs_fri\n            WHERE id = $1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "protocol_version",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "e62407c355594b87c7caee2396f1d14910604ddd7eadc29db3634dc873254569"
-}
diff --git a/prover/prover_dal/.sqlx/query-e743af4c18ec91eb46db5a19556fba74ec2cfc3c89c7e4e2ea475c3ce4092849.json b/prover/prover_dal/.sqlx/query-e743af4c18ec91eb46db5a19556fba74ec2cfc3c89c7e4e2ea475c3ce4092849.json
new file mode 100644
index 000000000000..af6210ae91e4
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-e743af4c18ec91eb46db5a19556fba74ec2cfc3c89c7e4e2ea475c3ce4092849.json
@@ -0,0 +1,26 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE leaf_aggregation_witness_jobs_fri\n            SET\n                status = 'queued'\n            WHERE\n                (l1_batch_number, circuit_id) IN (\n                    SELECT\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id\n                    FROM\n                        prover_jobs_fri\n                        JOIN leaf_aggregation_witness_jobs_fri lawj ON prover_jobs_fri.l1_batch_number = lawj.l1_batch_number\n                        AND prover_jobs_fri.circuit_id = lawj.circuit_id\n                    WHERE\n                        lawj.status = 'waiting_for_proofs'\n                        AND prover_jobs_fri.status = 'successful'\n                        AND prover_jobs_fri.aggregation_round = 0\n                    GROUP BY\n                        prover_jobs_fri.l1_batch_number,\n                        prover_jobs_fri.circuit_id,\n                        lawj.number_of_basic_circuits\n                    HAVING\n                        COUNT(*) = lawj.number_of_basic_circuits\n                )\n            RETURNING\n                l1_batch_number,\n                circuit_id;\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "l1_batch_number",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 1,
+        "name": "circuit_id",
+        "type_info": "Int2"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false,
+      false
+    ]
+  },
+  "hash": "e743af4c18ec91eb46db5a19556fba74ec2cfc3c89c7e4e2ea475c3ce4092849"
+}
diff --git a/prover/prover_dal/.sqlx/query-e74a34a59e6afda689b0ec9e19071ababa66e4a443fbefbfffca72b7540b075b.json b/prover/prover_dal/.sqlx/query-e74a34a59e6afda689b0ec9e19071ababa66e4a443fbefbfffca72b7540b075b.json
deleted file mode 100644
index 54ea6b6eb03a..000000000000
--- a/prover/prover_dal/.sqlx/query-e74a34a59e6afda689b0ec9e19071ababa66e4a443fbefbfffca72b7540b075b.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO\n                proof_compression_jobs_fri (l1_batch_number, status, created_at, updated_at)\n            VALUES\n                ($1, $2, NOW(), NOW())\n            ON CONFLICT (l1_batch_number) DO NOTHING\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "e74a34a59e6afda689b0ec9e19071ababa66e4a443fbefbfffca72b7540b075b"
-}
diff --git a/prover/prover_dal/.sqlx/query-35b87a3b7db0af87c6a95e9fe7ef9044ae85b579c7051301b40bd5f94df1f530.json b/prover/prover_dal/.sqlx/query-e8066db420e075306235f728d57567878f347bdaf36294e9b24ee9c0aa1e861b.json
similarity index 76%
rename from prover/prover_dal/.sqlx/query-35b87a3b7db0af87c6a95e9fe7ef9044ae85b579c7051301b40bd5f94df1f530.json
rename to prover/prover_dal/.sqlx/query-e8066db420e075306235f728d57567878f347bdaf36294e9b24ee9c0aa1e861b.json
index a11e154326ec..422036ebb115 100644
--- a/prover/prover_dal/.sqlx/query-35b87a3b7db0af87c6a95e9fe7ef9044ae85b579c7051301b40bd5f94df1f530.json
+++ b/prover/prover_dal/.sqlx/query-e8066db420e075306235f728d57567878f347bdaf36294e9b24ee9c0aa1e861b.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                UPDATE prover_jobs_fri\n                SET\n                    status = 'failed',\n                    error = $1,\n                    updated_at = NOW()\n                WHERE\n                    id = $2\n                ",
+  "query": "\n                UPDATE prover_jobs_fri\n                SET\n                    status = 'failed',\n                    error = $1,\n                    updated_at = NOW()\n                WHERE\n                    id = $2\n                    AND status != 'successful'\n                ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "35b87a3b7db0af87c6a95e9fe7ef9044ae85b579c7051301b40bd5f94df1f530"
+  "hash": "e8066db420e075306235f728d57567878f347bdaf36294e9b24ee9c0aa1e861b"
 }
diff --git a/prover/prover_dal/.sqlx/query-5e9618d3e1aa40639f2d5ad5cf5564eddf84760477518981c7acffc8bc4acf76.json b/prover/prover_dal/.sqlx/query-e8412d5ad1b17269da02f9a5c201ed762158a27449f61d3b1bb80069ca446727.json
similarity index 79%
rename from prover/prover_dal/.sqlx/query-5e9618d3e1aa40639f2d5ad5cf5564eddf84760477518981c7acffc8bc4acf76.json
rename to prover/prover_dal/.sqlx/query-e8412d5ad1b17269da02f9a5c201ed762158a27449f61d3b1bb80069ca446727.json
index ca90e154456d..4ab8c324ff58 100644
--- a/prover/prover_dal/.sqlx/query-5e9618d3e1aa40639f2d5ad5cf5564eddf84760477518981c7acffc8bc4acf76.json
+++ b/prover/prover_dal/.sqlx/query-e8412d5ad1b17269da02f9a5c201ed762158a27449f61d3b1bb80069ca446727.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        witness_inputs_fri\n                    WHERE\n                        l1_batch_number <= $1\n                        AND status = 'queued'\n                        AND protocol_version = $2\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                witness_inputs_fri.*\n            ",
+  "query": "\n            UPDATE witness_inputs_fri\n            SET\n                status = 'in_progress',\n                attempts = attempts + 1,\n                updated_at = NOW(),\n                processing_started_at = NOW(),\n                picked_by = $3\n            WHERE\n                l1_batch_number = (\n                    SELECT\n                        l1_batch_number\n                    FROM\n                        witness_inputs_fri\n                    WHERE\n                        l1_batch_number <= $1\n                        AND status = 'queued'\n                        AND protocol_version = $2\n                        AND protocol_version_patch = $4\n                    ORDER BY\n                        l1_batch_number ASC\n                    LIMIT\n                        1\n                    FOR UPDATE\n                        SKIP LOCKED\n                )\n            RETURNING\n                witness_inputs_fri.*\n            ",
   "describe": {
     "columns": [
       {
@@ -67,13 +67,19 @@
         "ordinal": 12,
         "name": "eip_4844_blobs",
         "type_info": "Bytea"
+      },
+      {
+        "ordinal": 13,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
       }
     ],
     "parameters": {
       "Left": [
         "Int8",
         "Int4",
-        "Text"
+        "Text",
+        "Int4"
       ]
     },
     "nullable": [
@@ -89,8 +95,9 @@
       true,
       true,
       true,
-      true
+      true,
+      false
     ]
   },
-  "hash": "5e9618d3e1aa40639f2d5ad5cf5564eddf84760477518981c7acffc8bc4acf76"
+  "hash": "e8412d5ad1b17269da02f9a5c201ed762158a27449f61d3b1bb80069ca446727"
 }
diff --git a/prover/prover_dal/.sqlx/query-e9c9b69852fa68f463f17b6d63ab99cf505662036f2dd7a9f1807c4c1bad7c7b.json b/prover/prover_dal/.sqlx/query-e9c9b69852fa68f463f17b6d63ab99cf505662036f2dd7a9f1807c4c1bad7c7b.json
new file mode 100644
index 000000000000..160eb31bf953
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-e9c9b69852fa68f463f17b6d63ab99cf505662036f2dd7a9f1807c4c1bad7c7b.json
@@ -0,0 +1,38 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT\n                protocol_version,\n                protocol_version_patch,\n                COUNT(*) FILTER (\n                    WHERE\n                        status = 'queued'\n                ) AS queued,\n                COUNT(*) FILTER (\n                    WHERE\n                        status = 'in_progress'\n                ) AS in_progress\n            FROM\n                proof_compression_jobs_fri\n            WHERE\n                protocol_version IS NOT NULL\n            GROUP BY\n                protocol_version,\n                protocol_version_patch\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "protocol_version",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 1,
+        "name": "protocol_version_patch",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 2,
+        "name": "queued",
+        "type_info": "Int8"
+      },
+      {
+        "ordinal": 3,
+        "name": "in_progress",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      true,
+      false,
+      null,
+      null
+    ]
+  },
+  "hash": "e9c9b69852fa68f463f17b6d63ab99cf505662036f2dd7a9f1807c4c1bad7c7b"
+}
diff --git a/prover/prover_dal/.sqlx/query-8fd6e339bee120a5856c8c49b764624c4778f1ac025c215b043cb7be1ca8890d.json b/prover/prover_dal/.sqlx/query-eef1b56e87eff63fcf6ffb98791583a7526ae38ceb4bf80543cfd3fb60492fb9.json
similarity index 53%
rename from prover/prover_dal/.sqlx/query-8fd6e339bee120a5856c8c49b764624c4778f1ac025c215b043cb7be1ca8890d.json
rename to prover/prover_dal/.sqlx/query-eef1b56e87eff63fcf6ffb98791583a7526ae38ceb4bf80543cfd3fb60492fb9.json
index 1e92960ee5cf..fe481b4e54db 100644
--- a/prover/prover_dal/.sqlx/query-8fd6e339bee120a5856c8c49b764624c4778f1ac025c215b043cb7be1ca8890d.json
+++ b/prover/prover_dal/.sqlx/query-eef1b56e87eff63fcf6ffb98791583a7526ae38ceb4bf80543cfd3fb60492fb9.json
@@ -1,16 +1,17 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                INSERT INTO\n                    recursion_tip_witness_jobs_fri (\n                        l1_batch_number,\n                        status,\n                        number_of_final_node_jobs,\n                        protocol_version,\n                        created_at,\n                        updated_at\n                    )\n                VALUES\n                    ($1, 'waiting_for_proofs', $2, $3, NOW(), NOW())\n                ON CONFLICT (l1_batch_number) DO\n                UPDATE\n                SET\n                    updated_at = NOW()\n                ",
+  "query": "\n                INSERT INTO\n                    recursion_tip_witness_jobs_fri (\n                        l1_batch_number,\n                        status,\n                        number_of_final_node_jobs,\n                        protocol_version,\n                        created_at,\n                        updated_at,\n                        protocol_version_patch\n                    )\n                VALUES\n                    ($1, 'waiting_for_proofs', $2, $3, NOW(), NOW(), $4)\n                ON CONFLICT (l1_batch_number) DO\n                UPDATE\n                SET\n                    updated_at = NOW()\n                ",
   "describe": {
     "columns": [],
     "parameters": {
       "Left": [
         "Int8",
         "Int4",
+        "Int4",
         "Int4"
       ]
     },
     "nullable": []
   },
-  "hash": "8fd6e339bee120a5856c8c49b764624c4778f1ac025c215b043cb7be1ca8890d"
+  "hash": "eef1b56e87eff63fcf6ffb98791583a7526ae38ceb4bf80543cfd3fb60492fb9"
 }
diff --git a/prover/prover_dal/.sqlx/query-f99c34313e2717ec74b4f274e33dae905acac53b46eeaeb059d23e48a71df3b4.json b/prover/prover_dal/.sqlx/query-f99c34313e2717ec74b4f274e33dae905acac53b46eeaeb059d23e48a71df3b4.json
new file mode 100644
index 000000000000..c0c2637fe5ae
--- /dev/null
+++ b/prover/prover_dal/.sqlx/query-f99c34313e2717ec74b4f274e33dae905acac53b46eeaeb059d23e48a71df3b4.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO\n                prover_jobs_fri (\n                    l1_batch_number,\n                    circuit_id,\n                    circuit_blob_url,\n                    aggregation_round,\n                    sequence_number,\n                    depth,\n                    is_node_final_proof,\n                    protocol_version,\n                    status,\n                    created_at,\n                    updated_at,\n                    protocol_version_patch\n                )\n            VALUES\n                ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', NOW(), NOW(), $9)\n            ON CONFLICT (l1_batch_number, aggregation_round, circuit_id, depth, sequence_number) DO\n            UPDATE\n            SET\n                updated_at = NOW()\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int2",
+        "Text",
+        "Int2",
+        "Int4",
+        "Int4",
+        "Bool",
+        "Int4",
+        "Int4"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f99c34313e2717ec74b4f274e33dae905acac53b46eeaeb059d23e48a71df3b4"
+}
diff --git a/prover/prover_dal/Cargo.toml b/prover/prover_dal/Cargo.toml
index bc07ce18393c..7f6b6f0116ce 100644
--- a/prover/prover_dal/Cargo.toml
+++ b/prover/prover_dal/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "prover_dal"
+name = "zksync_prover_dal"
 version.workspace = true
 edition.workspace = true
 authors.workspace = true
diff --git a/prover/prover_dal/migrations/20240524123522_add-patch-columns-for-semver.down.sql b/prover/prover_dal/migrations/20240524123522_add-patch-columns-for-semver.down.sql
new file mode 100644
index 000000000000..2e5e616b70eb
--- /dev/null
+++ b/prover/prover_dal/migrations/20240524123522_add-patch-columns-for-semver.down.sql
@@ -0,0 +1,71 @@
+ALTER TABLE prover_fri_protocol_versions
+    DROP CONSTRAINT prover_fri_protocol_versions_pkey CASCADE;
+
+ALTER TABLE witness_inputs_fri
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE leaf_aggregation_witness_jobs_fri
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE node_aggregation_witness_jobs_fri
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE recursion_tip_witness_jobs_fri
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE scheduler_witness_jobs_fri
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE proof_compression_jobs_fri
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE prover_jobs_fri
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE prover_jobs_fri_archive
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE gpu_prover_queue_fri
+    DROP IF EXISTS protocol_version_patch;
+
+ALTER TABLE gpu_prover_queue_fri_archive
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE prover_fri_protocol_versions
+    DROP COLUMN IF EXISTS protocol_version_patch;
+
+ALTER TABLE prover_fri_protocol_versions
+    ADD CONSTRAINT prover_fri_protocol_versions_pkey PRIMARY KEY (id);
+
+ALTER TABLE witness_inputs_fri
+    ADD CONSTRAINT witness_inputs_fri_protocol_version_fkey
+        FOREIGN KEY (protocol_version)
+            REFERENCES prover_fri_protocol_versions (id);
+
+ALTER TABLE leaf_aggregation_witness_jobs_fri
+    ADD CONSTRAINT leaf_aggregation_witness_jobs_fri_protocol_version_fkey
+        FOREIGN KEY (protocol_version)
+            REFERENCES prover_fri_protocol_versions (id);
+
+ALTER TABLE node_aggregation_witness_jobs_fri
+    ADD CONSTRAINT node_aggregation_witness_jobs_fri_protocol_version_fkey
+        FOREIGN KEY (protocol_version) REFERENCES prover_fri_protocol_versions (id);
+
+ALTER TABLE recursion_tip_witness_jobs_fri
+    ADD CONSTRAINT recursion_tip_witness_jobs_fri_protocol_version_fkey
+        FOREIGN KEY (protocol_version) REFERENCES prover_fri_protocol_versions (id);
+
+ALTER TABLE scheduler_witness_jobs_fri
+    ADD CONSTRAINT scheduler_witness_jobs_fri_protocol_version_fkey
+        FOREIGN KEY (protocol_version)
+            REFERENCES prover_fri_protocol_versions (id);
+
+ALTER TABLE proof_compression_jobs_fri
+    ADD CONSTRAINT proof_compression_jobs_fri_protocol_version_fkey
+        FOREIGN KEY (protocol_version)
+            REFERENCES prover_fri_protocol_versions (id);
+
+ALTER TABLE prover_jobs_fri
+    ADD CONSTRAINT prover_jobs_fri_protocol_version_fkey
+        FOREIGN KEY (protocol_version)
+            REFERENCES prover_fri_protocol_versions (id);
diff --git a/prover/prover_dal/migrations/20240524123522_add-patch-columns-for-semver.up.sql b/prover/prover_dal/migrations/20240524123522_add-patch-columns-for-semver.up.sql
new file mode 100644
index 000000000000..49adf01d99e0
--- /dev/null
+++ b/prover/prover_dal/migrations/20240524123522_add-patch-columns-for-semver.up.sql
@@ -0,0 +1,73 @@
+ALTER TABLE witness_inputs_fri
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE leaf_aggregation_witness_jobs_fri
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE node_aggregation_witness_jobs_fri
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE recursion_tip_witness_jobs_fri
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE scheduler_witness_jobs_fri
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE proof_compression_jobs_fri
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE prover_jobs_fri
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE prover_jobs_fri_archive
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE gpu_prover_queue_fri
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE gpu_prover_queue_fri_archive
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE prover_fri_protocol_versions
+    ADD COLUMN IF NOT EXISTS protocol_version_patch INT NOT NULL DEFAULT 0;
+
+ALTER TABLE prover_fri_protocol_versions
+    DROP CONSTRAINT IF EXISTS prover_fri_protocol_versions_pkey CASCADE;
+
+ALTER TABLE prover_fri_protocol_versions
+    ADD CONSTRAINT prover_fri_protocol_versions_pkey PRIMARY KEY (id, protocol_version_patch);
+
+ALTER TABLE witness_inputs_fri
+    ADD CONSTRAINT protocol_semantic_version_fk
+        FOREIGN KEY (protocol_version, protocol_version_patch)
+            REFERENCES prover_fri_protocol_versions (id, protocol_version_patch);
+
+ALTER TABLE leaf_aggregation_witness_jobs_fri
+    ADD CONSTRAINT protocol_semantic_version_fk
+        FOREIGN KEY (protocol_version, protocol_version_patch)
+            REFERENCES prover_fri_protocol_versions (id, protocol_version_patch);
+
+ALTER TABLE node_aggregation_witness_jobs_fri
+    ADD CONSTRAINT protocol_semantic_version_fk
+        FOREIGN KEY (protocol_version, protocol_version_patch)
+            REFERENCES prover_fri_protocol_versions (id, protocol_version_patch);
+
+ALTER TABLE recursion_tip_witness_jobs_fri
+    ADD CONSTRAINT protocol_semantic_version_fk
+        FOREIGN KEY (protocol_version, protocol_version_patch)
+            REFERENCES prover_fri_protocol_versions (id, protocol_version_patch);
+
+ALTER TABLE scheduler_witness_jobs_fri
+    ADD CONSTRAINT protocol_semantic_version_fk
+        FOREIGN KEY (protocol_version, protocol_version_patch)
+            REFERENCES prover_fri_protocol_versions (id, protocol_version_patch);
+
+ALTER TABLE proof_compression_jobs_fri
+    ADD CONSTRAINT protocol_semantic_version_fk
+        FOREIGN KEY (protocol_version, protocol_version_patch)
+            REFERENCES prover_fri_protocol_versions (id, protocol_version_patch);
+
+ALTER TABLE prover_jobs_fri
+    ADD CONSTRAINT protocol_semantic_version_fk
+        FOREIGN KEY (protocol_version, protocol_version_patch)
+            REFERENCES prover_fri_protocol_versions (id, protocol_version_patch);
diff --git a/prover/prover_dal/migrations/20240613111518_make_number_of_final_node_jobs_mandatory.down.sql b/prover/prover_dal/migrations/20240613111518_make_number_of_final_node_jobs_mandatory.down.sql
new file mode 100644
index 000000000000..2bd4cea7b9ef
--- /dev/null
+++ b/prover/prover_dal/migrations/20240613111518_make_number_of_final_node_jobs_mandatory.down.sql
@@ -0,0 +1 @@
+ALTER TABLE recursion_tip_witness_jobs_fri ALTER COLUMN number_of_final_node_jobs DROP NOT NULL;
diff --git a/prover/prover_dal/migrations/20240613111518_make_number_of_final_node_jobs_mandatory.up.sql b/prover/prover_dal/migrations/20240613111518_make_number_of_final_node_jobs_mandatory.up.sql
new file mode 100644
index 000000000000..ed3a1703b00a
--- /dev/null
+++ b/prover/prover_dal/migrations/20240613111518_make_number_of_final_node_jobs_mandatory.up.sql
@@ -0,0 +1 @@
+ALTER TABLE recursion_tip_witness_jobs_fri ALTER COLUMN number_of_final_node_jobs SET NOT NULL;
diff --git a/prover/prover_dal/src/fri_gpu_prover_queue_dal.rs b/prover/prover_dal/src/fri_gpu_prover_queue_dal.rs
index 7d666baef0fe..753b65b4ef06 100644
--- a/prover/prover_dal/src/fri_gpu_prover_queue_dal.rs
+++ b/prover/prover_dal/src/fri_gpu_prover_queue_dal.rs
@@ -1,7 +1,7 @@
 use std::{str::FromStr, time::Duration};
 
 use zksync_basic_types::{
-    protocol_version::ProtocolVersionId,
+    protocol_version::ProtocolSemanticVersion,
     prover_dal::{GpuProverInstanceStatus, SocketAddress},
 };
 use zksync_db_connection::connection::Connection;
@@ -19,7 +19,7 @@ impl FriGpuProverQueueDal<'_, '_> {
         processing_timeout: Duration,
         specialized_prover_group_id: u8,
         zone: String,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Option<SocketAddress> {
         let processing_timeout = pg_interval_from_duration(processing_timeout);
         let result: Option<SocketAddress> = sqlx::query!(
@@ -39,6 +39,7 @@ impl FriGpuProverQueueDal<'_, '_> {
                         specialized_prover_group_id = $2
                         AND zone = $3
                         AND protocol_version = $4
+                        AND protocol_version_patch = $5
                         AND (
                             instance_status = 'available'
                             OR (
@@ -59,7 +60,8 @@ impl FriGpuProverQueueDal<'_, '_> {
             &processing_timeout,
             i16::from(specialized_prover_group_id),
             zone,
-            protocol_version as i32
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -77,7 +79,7 @@ impl FriGpuProverQueueDal<'_, '_> {
         address: SocketAddress,
         specialized_prover_group_id: u8,
         zone: String,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) {
         sqlx::query!(
             r#"
@@ -90,10 +92,11 @@ impl FriGpuProverQueueDal<'_, '_> {
                     zone,
                     created_at,
                     updated_at,
-                    protocol_version
+                    protocol_version,
+                    protocol_version_patch
                 )
             VALUES
-                (CAST($1::TEXT AS inet), $2, 'available', $3, $4, NOW(), NOW(), $5)
+                (CAST($1::TEXT AS inet), $2, 'available', $3, $4, NOW(), NOW(), $5, $6)
             ON CONFLICT (instance_host, instance_port, zone) DO
             UPDATE
             SET
@@ -101,13 +104,15 @@ impl FriGpuProverQueueDal<'_, '_> {
                 specialized_prover_group_id = $3,
                 zone = $4,
                 updated_at = NOW(),
-                protocol_version = $5
+                protocol_version = $5,
+                protocol_version_patch = $6
             "#,
             address.host.to_string(),
             i32::from(address.port),
             i16::from(specialized_prover_group_id),
             zone,
-            protocol_version as i32
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32
         )
         .execute(self.storage.conn())
         .await
@@ -214,7 +219,8 @@ impl FriGpuProverQueueDal<'_, '_> {
                     updated_at,
                     processing_started_at,
                     NOW() as archived_at,
-                    protocol_version
+                    protocol_version,
+                    protocol_version_patch
             ),
             inserted_count AS (
                 INSERT INTO gpu_prover_queue_fri_archive
@@ -229,4 +235,20 @@ impl FriGpuProverQueueDal<'_, '_> {
         .unwrap()
         .unwrap_or(0) as usize
     }
+
+    pub async fn delete_gpu_prover_queue_fri(
+        &mut self,
+    ) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        sqlx::query!(
+            r#"
+            DELETE FROM gpu_prover_queue_fri
+            "#
+        )
+        .execute(self.storage.conn())
+        .await
+    }
+
+    pub async fn delete(&mut self) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        self.delete_gpu_prover_queue_fri().await
+    }
 }
diff --git a/prover/prover_dal/src/fri_proof_compressor_dal.rs b/prover/prover_dal/src/fri_proof_compressor_dal.rs
index 7971d39acd65..7adc08b680dc 100644
--- a/prover/prover_dal/src/fri_proof_compressor_dal.rs
+++ b/prover/prover_dal/src/fri_proof_compressor_dal.rs
@@ -1,9 +1,8 @@
 #![doc = include_str!("../doc/FriProofCompressorDal.md")]
 use std::{collections::HashMap, str::FromStr, time::Duration};
 
-use sqlx::Row;
 use zksync_basic_types::{
-    protocol_version::ProtocolVersionId,
+    protocol_version::{ProtocolSemanticVersion, ProtocolVersionId, VersionPatch},
     prover_dal::{
         JobCountStatistics, ProofCompressionJobInfo, ProofCompressionJobStatus, StuckJobs,
     },
@@ -23,37 +22,29 @@ impl FriProofCompressorDal<'_, '_> {
         &mut self,
         block_number: L1BatchNumber,
         fri_proof_blob_url: &str,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) {
-        sqlx::query!(
-                r#"
-                INSERT INTO
-                    proof_compression_jobs_fri (l1_batch_number, fri_proof_blob_url, status, created_at, updated_at, protocol_version)
-                VALUES
-                    ($1, $2, $3, NOW(), NOW(), $4)
-                ON CONFLICT (l1_batch_number) DO NOTHING
-                "#,
-                i64::from(block_number.0),
-                fri_proof_blob_url,
-                ProofCompressionJobStatus::Queued.to_string(),
-                protocol_version as i32
-            )
-            .fetch_optional(self.storage.conn())
-            .await
-            .unwrap();
-    }
-
-    pub async fn skip_proof_compression_job(&mut self, block_number: L1BatchNumber) {
         sqlx::query!(
             r#"
             INSERT INTO
-                proof_compression_jobs_fri (l1_batch_number, status, created_at, updated_at)
+                proof_compression_jobs_fri (
+                    l1_batch_number,
+                    fri_proof_blob_url,
+                    status,
+                    created_at,
+                    updated_at,
+                    protocol_version,
+                    protocol_version_patch
+                )
             VALUES
-                ($1, $2, NOW(), NOW())
+                ($1, $2, $3, NOW(), NOW(), $4, $5)
             ON CONFLICT (l1_batch_number) DO NOTHING
             "#,
             i64::from(block_number.0),
-            ProofCompressionJobStatus::Skipped.to_string(),
+            fri_proof_blob_url,
+            ProofCompressionJobStatus::Queued.to_string(),
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -63,7 +54,7 @@ impl FriProofCompressorDal<'_, '_> {
     pub async fn get_next_proof_compression_job(
         &mut self,
         picked_by: &str,
-        protocol_version: &ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Option<L1BatchNumber> {
         sqlx::query!(
             r#"
@@ -83,6 +74,7 @@ impl FriProofCompressorDal<'_, '_> {
                     WHERE
                         status = $2
                         AND protocol_version = $4
+                        AND protocol_version_patch = $5
                     ORDER BY
                         l1_batch_number ASC
                     LIMIT
@@ -96,7 +88,8 @@ impl FriProofCompressorDal<'_, '_> {
             ProofCompressionJobStatus::InProgress.to_string(),
             ProofCompressionJobStatus::Queued.to_string(),
             picked_by,
-            *protocol_version as i32
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -167,24 +160,34 @@ impl FriProofCompressorDal<'_, '_> {
                 updated_at = NOW()
             WHERE
                 l1_batch_number = $3
+                AND status != $4
+                AND status != $5
             "#,
             ProofCompressionJobStatus::Failed.to_string(),
             error,
-            i64::from(block_number.0)
+            i64::from(block_number.0),
+            ProofCompressionJobStatus::Successful.to_string(),
+            ProofCompressionJobStatus::SentToServer.to_string(),
         )
         .execute(self.storage.conn())
         .await
         .unwrap();
     }
 
-    pub async fn get_least_proven_block_number_not_sent_to_server(
+    pub async fn get_least_proven_block_not_sent_to_server(
         &mut self,
-    ) -> Option<(L1BatchNumber, ProofCompressionJobStatus)> {
+    ) -> Option<(
+        L1BatchNumber,
+        ProtocolSemanticVersion,
+        ProofCompressionJobStatus,
+    )> {
         let row = sqlx::query!(
             r#"
             SELECT
                 l1_batch_number,
-                status
+                status,
+                protocol_version,
+                protocol_version_patch
             FROM
                 proof_compression_jobs_fri
             WHERE
@@ -207,6 +210,10 @@ impl FriProofCompressorDal<'_, '_> {
         match row {
             Some(row) => Some((
                 L1BatchNumber(row.l1_batch_number as u32),
+                ProtocolSemanticVersion::new(
+                    ProtocolVersionId::try_from(row.protocol_version.unwrap() as u16).unwrap(),
+                    VersionPatch(row.protocol_version_patch as u32),
+                ),
                 ProofCompressionJobStatus::from_str(&row.status).unwrap(),
             )),
             None => None,
@@ -231,25 +238,45 @@ impl FriProofCompressorDal<'_, '_> {
         .unwrap();
     }
 
-    pub async fn get_jobs_stats(&mut self) -> JobCountStatistics {
-        let mut results: HashMap<String, i64> = sqlx::query(
-            "SELECT COUNT(*) as \"count\", status as \"status\" \
-                 FROM proof_compression_jobs_fri \
-                 GROUP BY status",
+    pub async fn get_jobs_stats(&mut self) -> HashMap<ProtocolSemanticVersion, JobCountStatistics> {
+        sqlx::query!(
+            r#"
+            SELECT
+                protocol_version,
+                protocol_version_patch,
+                COUNT(*) FILTER (
+                    WHERE
+                        status = 'queued'
+                ) AS queued,
+                COUNT(*) FILTER (
+                    WHERE
+                        status = 'in_progress'
+                ) AS in_progress
+            FROM
+                proof_compression_jobs_fri
+            WHERE
+                protocol_version IS NOT NULL
+            GROUP BY
+                protocol_version,
+                protocol_version_patch
+            "#,
         )
         .fetch_all(self.storage.conn())
         .await
         .unwrap()
         .into_iter()
-        .map(|row| (row.get("status"), row.get::<i64, &str>("count")))
-        .collect::<HashMap<String, i64>>();
-
-        JobCountStatistics {
-            queued: results.remove("queued").unwrap_or(0i64) as usize,
-            in_progress: results.remove("in_progress").unwrap_or(0i64) as usize,
-            failed: results.remove("failed").unwrap_or(0i64) as usize,
-            successful: results.remove("successful").unwrap_or(0i64) as usize,
-        }
+        .map(|row| {
+            let key = ProtocolSemanticVersion::new(
+                ProtocolVersionId::try_from(row.protocol_version.unwrap() as u16).unwrap(),
+                VersionPatch(row.protocol_version_patch as u32),
+            );
+            let value = JobCountStatistics {
+                queued: row.queued.unwrap() as usize,
+                in_progress: row.in_progress.unwrap() as usize,
+            };
+            (key, value)
+        })
+        .collect()
     }
 
     pub async fn get_oldest_not_compressed_batch(&mut self) -> Option<L1BatchNumber> {
@@ -315,6 +342,7 @@ impl FriProofCompressorDal<'_, '_> {
                 id: row.l1_batch_number as u64,
                 status: row.status,
                 attempts: row.attempts as u64,
+                circuit_id: None,
             })
             .collect()
         }
@@ -352,4 +380,73 @@ impl FriProofCompressorDal<'_, '_> {
             picked_by: row.picked_by,
         })
     }
+
+    pub async fn delete_batch_data(
+        &mut self,
+        block_number: L1BatchNumber,
+    ) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        sqlx::query!(
+            r#"
+            DELETE FROM proof_compression_jobs_fri
+            WHERE
+                l1_batch_number = $1
+            "#,
+            i64::from(block_number.0)
+        )
+        .execute(self.storage.conn())
+        .await
+    }
+
+    pub async fn delete(&mut self) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        sqlx::query!(
+            r#"
+            DELETE FROM proof_compression_jobs_fri
+            "#
+        )
+        .execute(self.storage.conn())
+        .await
+    }
+
+    pub async fn requeue_stuck_jobs_for_batch(
+        &mut self,
+        block_number: L1BatchNumber,
+        max_attempts: u32,
+    ) -> Vec<StuckJobs> {
+        {
+            sqlx::query!(
+                r#"
+                UPDATE proof_compression_jobs_fri
+                SET
+                    status = 'queued',
+                    error = 'Manually requeued',
+                    attempts = 2,
+                    updated_at = NOW(),
+                    processing_started_at = NOW()
+                WHERE
+                    l1_batch_number = $1
+                    AND attempts >= $2
+                    AND (
+                        status = 'in_progress'
+                        OR status = 'failed'
+                    )
+                RETURNING
+                    status,
+                    attempts
+                "#,
+                i64::from(block_number.0),
+                max_attempts as i32,
+            )
+            .fetch_all(self.storage.conn())
+            .await
+            .unwrap()
+            .into_iter()
+            .map(|row| StuckJobs {
+                id: block_number.0 as u64,
+                status: row.status,
+                attempts: row.attempts as u64,
+                circuit_id: None,
+            })
+            .collect()
+        }
+    }
 }
diff --git a/prover/prover_dal/src/fri_protocol_versions_dal.rs b/prover/prover_dal/src/fri_protocol_versions_dal.rs
index 7afcaef5ee49..e69d36d1c26c 100644
--- a/prover/prover_dal/src/fri_protocol_versions_dal.rs
+++ b/prover/prover_dal/src/fri_protocol_versions_dal.rs
@@ -1,7 +1,5 @@
-use std::convert::TryFrom;
-
 use zksync_basic_types::{
-    protocol_version::{L1VerifierConfig, ProtocolVersionId, VerifierParams},
+    protocol_version::{L1VerifierConfig, ProtocolSemanticVersion, VerifierParams},
     H256,
 };
 use zksync_db_connection::connection::Connection;
@@ -16,7 +14,7 @@ pub struct FriProtocolVersionsDal<'a, 'c> {
 impl FriProtocolVersionsDal<'_, '_> {
     pub async fn save_prover_protocol_version(
         &mut self,
-        id: ProtocolVersionId,
+        id: ProtocolSemanticVersion,
         l1_verifier_config: L1VerifierConfig,
     ) {
         sqlx::query!(
@@ -28,13 +26,14 @@ impl FriProtocolVersionsDal<'_, '_> {
                     recursion_node_level_vk_hash,
                     recursion_leaf_level_vk_hash,
                     recursion_circuits_set_vks_hash,
-                    created_at
+                    created_at,
+                    protocol_version_patch
                 )
             VALUES
-                ($1, $2, $3, $4, $5, NOW())
-            ON CONFLICT (id) DO NOTHING
+                ($1, $2, $3, $4, $5, NOW(), $6)
+            ON CONFLICT (id, protocol_version_patch) DO NOTHING
             "#,
-            id as i32,
+            id.minor as i32,
             l1_verifier_config
                 .recursion_scheduler_level_vk_hash
                 .as_bytes(),
@@ -50,53 +49,16 @@ impl FriProtocolVersionsDal<'_, '_> {
                 .params
                 .recursion_circuits_set_vks_hash
                 .as_bytes(),
+            id.patch.0 as i32
         )
         .execute(self.storage.conn())
         .await
         .unwrap();
     }
 
-    pub async fn protocol_versions_for(
-        &mut self,
-        vk_commitments: &L1VerifierConfig,
-    ) -> Vec<ProtocolVersionId> {
-        sqlx::query!(
-            r#"
-            SELECT
-                id
-            FROM
-                prover_fri_protocol_versions
-            WHERE
-                recursion_circuits_set_vks_hash = $1
-                AND recursion_leaf_level_vk_hash = $2
-                AND recursion_node_level_vk_hash = $3
-                AND recursion_scheduler_level_vk_hash = $4
-            "#,
-            vk_commitments
-                .params
-                .recursion_circuits_set_vks_hash
-                .as_bytes(),
-            vk_commitments
-                .params
-                .recursion_leaf_level_vk_hash
-                .as_bytes(),
-            vk_commitments
-                .params
-                .recursion_node_level_vk_hash
-                .as_bytes(),
-            vk_commitments.recursion_scheduler_level_vk_hash.as_bytes(),
-        )
-        .fetch_all(self.storage.conn())
-        .await
-        .unwrap()
-        .into_iter()
-        .map(|row| ProtocolVersionId::try_from(row.id as u16).unwrap())
-        .collect()
-    }
-
     pub async fn vk_commitments_for(
         &mut self,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Option<L1VerifierConfig> {
         sqlx::query!(
             r#"
@@ -109,8 +71,10 @@ impl FriProtocolVersionsDal<'_, '_> {
                 prover_fri_protocol_versions
             WHERE
                 id = $1
+                AND protocol_version_patch = $2
             "#,
-            protocol_version as i32
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -141,7 +105,8 @@ impl FriProtocolVersionsDal<'_, '_> {
                 prover_fri_protocol_versions
             ORDER BY
                 id DESC
-            LIMIT 1
+            LIMIT
+                1
             "#,
         )
         .fetch_one(self.storage.conn())
@@ -162,4 +127,14 @@ impl FriProtocolVersionsDal<'_, '_> {
             ),
         })
     }
+
+    pub async fn delete(&mut self) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        sqlx::query!(
+            r#"
+            DELETE FROM prover_fri_protocol_versions
+            "#
+        )
+        .execute(self.storage.conn())
+        .await
+    }
 }
diff --git a/prover/prover_dal/src/fri_prover_dal.rs b/prover/prover_dal/src/fri_prover_dal.rs
index d887bd0d5151..419cb635ac53 100644
--- a/prover/prover_dal/src/fri_prover_dal.rs
+++ b/prover/prover_dal/src/fri_prover_dal.rs
@@ -2,8 +2,8 @@
 use std::{collections::HashMap, convert::TryFrom, str::FromStr, time::Duration};
 
 use zksync_basic_types::{
-    basic_fri_types::{AggregationRound, CircuitIdRoundTuple},
-    protocol_version::ProtocolVersionId,
+    basic_fri_types::{AggregationRound, CircuitIdRoundTuple, JobIdentifiers},
+    protocol_version::{ProtocolSemanticVersion, ProtocolVersionId},
     prover_dal::{
         FriProverJobMetadata, JobCountStatistics, ProverJobFriInfo, ProverJobStatus, StuckJobs,
     },
@@ -27,7 +27,7 @@ impl FriProverDal<'_, '_> {
         circuit_ids_and_urls: Vec<(u8, String)>,
         aggregation_round: AggregationRound,
         depth: u16,
-        protocol_version_id: ProtocolVersionId,
+        protocol_version_id: ProtocolSemanticVersion,
     ) {
         let latency = MethodLatency::new("save_fri_prover_jobs");
         for (sequence_number, (circuit_id, circuit_blob_url)) in
@@ -50,7 +50,7 @@ impl FriProverDal<'_, '_> {
 
     pub async fn get_next_job(
         &mut self,
-        protocol_version: &ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
         picked_by: &str,
     ) -> Option<FriProverJobMetadata> {
         sqlx::query!(
@@ -61,7 +61,7 @@ impl FriProverDal<'_, '_> {
                 attempts = attempts + 1,
                 updated_at = NOW(),
                 processing_started_at = NOW(),
-                picked_by = $2
+                picked_by = $3
             WHERE
                 id = (
                     SELECT
@@ -71,6 +71,7 @@ impl FriProverDal<'_, '_> {
                     WHERE
                         status = 'queued'
                         AND protocol_version = $1
+                        AND protocol_version_patch = $2
                     ORDER BY
                         aggregation_round DESC,
                         l1_batch_number ASC,
@@ -89,7 +90,8 @@ impl FriProverDal<'_, '_> {
                 prover_jobs_fri.depth,
                 prover_jobs_fri.is_node_final_proof
             "#,
-            *protocol_version as i32,
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32,
             picked_by,
         )
         .fetch_optional(self.storage.conn())
@@ -110,7 +112,7 @@ impl FriProverDal<'_, '_> {
     pub async fn get_next_job_for_circuit_id_round(
         &mut self,
         circuits_to_pick: &[CircuitIdRoundTuple],
-        protocol_version: &ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
         picked_by: &str,
     ) -> Option<FriProverJobMetadata> {
         let circuit_ids: Vec<_> = circuits_to_pick
@@ -129,7 +131,7 @@ impl FriProverDal<'_, '_> {
                 attempts = attempts + 1,
                 processing_started_at = NOW(),
                 updated_at = NOW(),
-                picked_by = $4
+                picked_by = $5
             WHERE
                 id = (
                     SELECT
@@ -149,6 +151,7 @@ impl FriProverDal<'_, '_> {
                             WHERE
                                 pj.status = 'queued'
                                 AND pj.protocol_version = $3
+                                AND pj.protocol_version_patch = $4
                                 AND pj.circuit_id = tuple.circuit_id
                                 AND pj.aggregation_round = tuple.round
                             ORDER BY
@@ -177,7 +180,8 @@ impl FriProverDal<'_, '_> {
             "#,
             &circuit_ids[..],
             &aggregation_rounds[..],
-            *protocol_version as i32,
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32,
             picked_by,
         )
         .fetch_optional(self.storage.conn())
@@ -206,6 +210,7 @@ impl FriProverDal<'_, '_> {
                     updated_at = NOW()
                 WHERE
                     id = $2
+                    AND status != 'successful'
                 "#,
                 error,
                 i64::from(id)
@@ -324,7 +329,8 @@ impl FriProverDal<'_, '_> {
                 RETURNING
                     id,
                     status,
-                    attempts
+                    attempts,
+                    circuit_id
                 "#,
                 &processing_timeout,
                 max_attempts as i32,
@@ -337,6 +343,7 @@ impl FriProverDal<'_, '_> {
                 id: row.id as u64,
                 status: row.status,
                 attempts: row.attempts as u64,
+                circuit_id: Some(row.circuit_id as u32),
             })
             .collect()
         }
@@ -352,31 +359,32 @@ impl FriProverDal<'_, '_> {
         aggregation_round: AggregationRound,
         circuit_blob_url: &str,
         is_node_final_proof: bool,
-        protocol_version_id: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) {
         sqlx::query!(
-                    r#"
-                    INSERT INTO
-                        prover_jobs_fri (
-                            l1_batch_number,
-                            circuit_id,
-                            circuit_blob_url,
-                            aggregation_round,
-                            sequence_number,
-                            depth,
-                            is_node_final_proof,
-                            protocol_version,
-                            status,
-                            created_at,
-                            updated_at
-                        )
-                    VALUES
-                        ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', NOW(), NOW())
-                    ON CONFLICT (l1_batch_number, aggregation_round, circuit_id, depth, sequence_number) DO
-                    UPDATE
-                    SET
-                        updated_at = NOW()
-                    "#,
+            r#"
+            INSERT INTO
+                prover_jobs_fri (
+                    l1_batch_number,
+                    circuit_id,
+                    circuit_blob_url,
+                    aggregation_round,
+                    sequence_number,
+                    depth,
+                    is_node_final_proof,
+                    protocol_version,
+                    status,
+                    created_at,
+                    updated_at,
+                    protocol_version_patch
+                )
+            VALUES
+                ($1, $2, $3, $4, $5, $6, $7, $8, 'queued', NOW(), NOW(), $9)
+            ON CONFLICT (l1_batch_number, aggregation_round, circuit_id, depth, sequence_number) DO
+            UPDATE
+            SET
+                updated_at = NOW()
+            "#,
             i64::from(l1_batch_number.0),
             i16::from(circuit_id),
             circuit_blob_url,
@@ -384,66 +392,64 @@ impl FriProverDal<'_, '_> {
             sequence_number as i64,
             i32::from(depth),
             is_node_final_proof,
-            protocol_version_id as i32,
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32,
         )
-            .execute(self.storage.conn())
-            .await
-            .unwrap();
+        .execute(self.storage.conn())
+        .await
+        .unwrap();
     }
 
-    pub async fn get_prover_jobs_stats(&mut self) -> HashMap<(u8, u8), JobCountStatistics> {
+    pub async fn get_prover_jobs_stats(&mut self) -> HashMap<JobIdentifiers, JobCountStatistics> {
         {
-            sqlx::query!(
+            let rows = sqlx::query!(
                 r#"
                 SELECT
                     COUNT(*) AS "count!",
                     circuit_id AS "circuit_id!",
                     aggregation_round AS "aggregation_round!",
-                    status AS "status!"
+                    status AS "status!",
+                    protocol_version AS "protocol_version!",
+                    protocol_version_patch AS "protocol_version_patch!"
                 FROM
                     prover_jobs_fri
                 WHERE
-                    status <> 'skipped'
-                    AND status <> 'successful'
+                    (
+                        status = 'queued'
+                        OR status = 'in_progress'
+                    )
+                    AND protocol_version IS NOT NULL
                 GROUP BY
                     circuit_id,
                     aggregation_round,
-                    status
+                    status,
+                    protocol_version,
+                    protocol_version_patch
                 "#
             )
             .fetch_all(self.storage.conn())
             .await
-            .unwrap()
-            .into_iter()
-            .map(|row| {
-                (
-                    row.circuit_id,
-                    row.aggregation_round,
-                    row.status,
-                    row.count as usize,
-                )
-            })
-            .fold(
-                HashMap::new(),
-                |mut acc, (circuit_id, aggregation_round, status, value)| {
-                    let stats = acc
-                        .entry((circuit_id as u8, aggregation_round as u8))
-                        .or_insert(JobCountStatistics {
-                            queued: 0,
-                            in_progress: 0,
-                            failed: 0,
-                            successful: 0,
-                        });
-                    match status.as_ref() {
-                        "queued" => stats.queued = value,
-                        "in_progress" => stats.in_progress = value,
-                        "failed" => stats.failed = value,
-                        "successful" => stats.successful = value,
-                        _ => (),
-                    }
-                    acc
-                },
-            )
+            .unwrap();
+
+            let mut result = HashMap::new();
+
+            for row in &rows {
+                let stats: &mut JobCountStatistics = result
+                    .entry(JobIdentifiers {
+                        circuit_id: row.circuit_id as u8,
+                        aggregation_round: row.aggregation_round as u8,
+                        protocol_version: row.protocol_version as u16,
+                        protocol_version_patch: row.protocol_version_patch as u32,
+                    })
+                    .or_default();
+                match row.status.as_ref() {
+                    "queued" => stats.queued = row.count as usize,
+                    "in_progress" => stats.in_progress = row.count as usize,
+                    _ => (),
+                }
+            }
+
+            result
         }
     }
 
@@ -514,6 +520,7 @@ impl FriProverDal<'_, '_> {
                 updated_at = NOW()
             WHERE
                 id = $2
+                AND status != 'successful'
             "#,
             status,
             i64::from(id)
@@ -523,23 +530,6 @@ impl FriProverDal<'_, '_> {
         .unwrap();
     }
 
-    pub async fn save_successful_sent_proof(&mut self, l1_batch_number: L1BatchNumber) {
-        sqlx::query!(
-            r#"
-            UPDATE prover_jobs_fri
-            SET
-                status = 'sent_to_server',
-                updated_at = NOW()
-            WHERE
-                l1_batch_number = $1
-            "#,
-            i64::from(l1_batch_number.0)
-        )
-        .execute(self.storage.conn())
-        .await
-        .unwrap();
-    }
-
     pub async fn get_scheduler_proof_job_id(
         &mut self,
         l1_batch_number: L1BatchNumber,
@@ -628,7 +618,7 @@ impl FriProverDal<'_, '_> {
                 prover_jobs_fri
             WHERE
                 l1_batch_number = $1
-                AND is_node_final_proof = true
+                AND is_node_final_proof = TRUE
                 AND status = 'successful'
             ORDER BY
                 circuit_id ASC
@@ -691,20 +681,86 @@ impl FriProverDal<'_, '_> {
         .collect()
     }
 
-    pub async fn protocol_version_for_job(&mut self, job_id: u32) -> ProtocolVersionId {
+    pub async fn delete_prover_jobs_fri_batch_data(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
         sqlx::query!(
             r#"
-            SELECT protocol_version
-            FROM prover_jobs_fri
-            WHERE id = $1
+            DELETE FROM prover_jobs_fri
+            WHERE
+                l1_batch_number = $1;
             "#,
-            job_id as i32
+            i64::from(l1_batch_number.0)
         )
-        .fetch_one(self.storage.conn())
+        .execute(self.storage.conn())
         .await
-        .unwrap()
-        .protocol_version
-        .map(|id| ProtocolVersionId::try_from(id as u16).unwrap())
-        .unwrap()
+    }
+
+    pub async fn delete_batch_data(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        self.delete_prover_jobs_fri_batch_data(l1_batch_number)
+            .await
+    }
+
+    pub async fn delete_prover_jobs_fri(&mut self) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        sqlx::query!(
+            r#"
+            DELETE FROM prover_jobs_fri
+            "#
+        )
+        .execute(self.storage.conn())
+        .await
+    }
+
+    pub async fn delete(&mut self) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        self.delete_prover_jobs_fri().await
+    }
+
+    pub async fn requeue_stuck_jobs_for_batch(
+        &mut self,
+        block_number: L1BatchNumber,
+        max_attempts: u32,
+    ) -> Vec<StuckJobs> {
+        {
+            sqlx::query!(
+                r#"
+                UPDATE prover_jobs_fri
+                SET
+                    status = 'queued',
+                    error = 'Manually requeued',
+                    attempts = 2,
+                    updated_at = NOW(),
+                    processing_started_at = NOW()
+                WHERE
+                    l1_batch_number = $1
+                    AND attempts >= $2
+                    AND (
+                        status = 'in_progress'
+                        OR status = 'failed'
+                    )
+                RETURNING
+                    id,
+                    status,
+                    attempts,
+                    circuit_id
+                "#,
+                i64::from(block_number.0),
+                max_attempts as i32,
+            )
+            .fetch_all(self.storage.conn())
+            .await
+            .unwrap()
+            .into_iter()
+            .map(|row| StuckJobs {
+                id: row.id as u64,
+                status: row.status,
+                attempts: row.attempts as u64,
+                circuit_id: Some(row.circuit_id as u32),
+            })
+            .collect()
+        }
     }
 }
diff --git a/prover/prover_dal/src/fri_witness_generator_dal.rs b/prover/prover_dal/src/fri_witness_generator_dal.rs
index fcbba5c5b7cd..d884ce05aa16 100644
--- a/prover/prover_dal/src/fri_witness_generator_dal.rs
+++ b/prover/prover_dal/src/fri_witness_generator_dal.rs
@@ -1,18 +1,22 @@
 #![doc = include_str!("../doc/FriWitnessGeneratorDal.md")]
-use std::{collections::HashMap, convert::TryFrom, str::FromStr, time::Duration};
 
-use sqlx::Row;
+use std::{collections::HashMap, str::FromStr, time::Duration};
+
+use sqlx::{types::chrono::NaiveDateTime, Row};
 use zksync_basic_types::{
     basic_fri_types::{AggregationRound, Eip4844Blobs},
-    protocol_version::ProtocolVersionId,
+    protocol_version::{ProtocolSemanticVersion, ProtocolVersionId, VersionPatch},
     prover_dal::{
         BasicWitnessGeneratorJobInfo, JobCountStatistics, LeafAggregationJobMetadata,
         LeafWitnessGeneratorJobInfo, NodeAggregationJobMetadata, NodeWitnessGeneratorJobInfo,
-        SchedulerWitnessGeneratorJobInfo, StuckJobs, WitnessJobStatus,
+        ProofGenerationTime, RecursionTipWitnessGeneratorJobInfo, SchedulerWitnessGeneratorJobInfo,
+        StuckJobs, WitnessJobStatus,
     },
     L1BatchNumber,
 };
-use zksync_db_connection::{connection::Connection, metrics::MethodLatency};
+use zksync_db_connection::{
+    connection::Connection, metrics::MethodLatency, utils::naive_time_from_pg_interval,
+};
 
 use crate::{duration_to_naive_time, pg_interval_from_duration, Prover};
 
@@ -40,7 +44,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
         &mut self,
         block_number: L1BatchNumber,
         object_key: &str,
-        protocol_version_id: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
         eip_4844_blobs: Eip4844Blobs,
     ) {
         let blobs_raw = eip_4844_blobs.encode();
@@ -54,16 +58,18 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     eip_4844_blobs,
                     status,
                     created_at,
-                    updated_at
+                    updated_at,
+                    protocol_version_patch
                 )
             VALUES
-                ($1, $2, $3, $4, 'queued', NOW(), NOW())
+                ($1, $2, $3, $4, 'queued', NOW(), NOW(), $5)
             ON CONFLICT (l1_batch_number) DO NOTHING
             "#,
             i64::from(block_number.0),
             object_key,
-            protocol_version_id as i32,
+            protocol_version.minor as i32,
             blobs_raw,
+            protocol_version.patch.0 as i32,
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -75,7 +81,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
     pub async fn get_next_basic_circuit_witness_job(
         &mut self,
         last_l1_batch_to_process: u32,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
         picked_by: &str,
     ) -> Option<(L1BatchNumber, Eip4844Blobs)> {
         sqlx::query!(
@@ -97,6 +103,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         l1_batch_number <= $1
                         AND status = 'queued'
                         AND protocol_version = $2
+                        AND protocol_version_patch = $4
                     ORDER BY
                         l1_batch_number ASC
                     LIMIT
@@ -108,23 +115,27 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 witness_inputs_fri.*
             "#,
             i64::from(last_l1_batch_to_process),
-            protocol_version as i32,
+            protocol_version.minor as i32,
             picked_by,
+            protocol_version.patch.0 as i32,
         )
         .fetch_optional(self.storage.conn())
         .await
         .unwrap()
         .map(|row| {
-            (
-                L1BatchNumber(row.l1_batch_number as u32),
+            // Blobs can be `None` if we are using an `off-chain DA`
+            let blobs = if row.eip_4844_blobs.is_none() {
+                Eip4844Blobs::empty()
+            } else {
                 Eip4844Blobs::decode(&row.eip_4844_blobs.unwrap_or_else(|| {
                     panic!(
                         "missing eip 4844 blobs from the database for batch {}",
                         row.l1_batch_number
                     )
                 }))
-                .expect("failed to decode EIP4844 blobs"),
-            )
+                .expect("failed to decode EIP4844 blobs")
+            };
+            (L1BatchNumber(row.l1_batch_number as u32), blobs)
         })
     }
 
@@ -163,6 +174,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 updated_at = NOW()
             WHERE
                 l1_batch_number = $2
+                AND status != 'successful'
             "#,
             status.to_string(),
             i64::from(block_number.0)
@@ -205,6 +217,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 updated_at = NOW()
             WHERE
                 l1_batch_number = $2
+                AND status != 'successful'
             "#,
             error,
             i64::from(block_number.0)
@@ -224,6 +237,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 updated_at = NOW()
             WHERE
                 id = $2
+                AND status != 'successful'
             "#,
             error,
             i64::from(id)
@@ -296,6 +310,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
             id: row.l1_batch_number as u64,
             status: row.status,
             attempts: row.attempts as u64,
+            circuit_id: None,
         })
         .collect()
     }
@@ -314,7 +329,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
         closed_form_inputs_and_urls: &Vec<(u8, String, usize)>,
         scheduler_partial_input_blob_url: &str,
         base_layer_to_recursive_layer_circuit_id: fn(u8) -> u8,
-        protocol_version_id: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) {
         {
             let latency = MethodLatency::new("create_aggregation_jobs_fri");
@@ -332,10 +347,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                             protocol_version,
                             status,
                             created_at,
-                            updated_at
+                            updated_at,
+                            protocol_version_patch
                         )
                     VALUES
-                        ($1, $2, $3, $4, $5, 'waiting_for_proofs', NOW(), NOW())
+                        ($1, $2, $3, $4, $5, 'waiting_for_proofs', NOW(), NOW(), $6)
                     ON CONFLICT (l1_batch_number, circuit_id) DO
                     UPDATE
                     SET
@@ -345,7 +361,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     i16::from(*circuit_id),
                     closed_form_inputs_url,
                     *number_of_basic_circuits as i32,
-                    protocol_version_id as i32,
+                    protocol_version.minor as i32,
+                    protocol_version.patch.0 as i32,
                 )
                 .execute(self.storage.conn())
                 .await
@@ -357,7 +374,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     None,
                     0,
                     "",
-                    protocol_version_id,
+                    protocol_version,
                 )
                 .await;
             }
@@ -371,10 +388,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         number_of_final_node_jobs,
                         protocol_version,
                         created_at,
-                        updated_at
+                        updated_at,
+                        protocol_version_patch
                     )
                 VALUES
-                    ($1, 'waiting_for_proofs', $2, $3, NOW(), NOW())
+                    ($1, 'waiting_for_proofs', $2, $3, NOW(), NOW(), $4)
                 ON CONFLICT (l1_batch_number) DO
                 UPDATE
                 SET
@@ -382,7 +400,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 "#,
                 block_number.0 as i64,
                 closed_form_inputs_and_urls.len() as i32,
-                protocol_version_id as i32,
+                protocol_version.minor as i32,
+                protocol_version.patch.0 as i32,
             )
             .execute(self.storage.conn())
             .await
@@ -397,10 +416,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         protocol_version,
                         status,
                         created_at,
-                        updated_at
+                        updated_at,
+                        protocol_version_patch
                     )
                 VALUES
-                    ($1, $2, $3, 'waiting_for_proofs', NOW(), NOW())
+                    ($1, $2, $3, 'waiting_for_proofs', NOW(), NOW(), $4)
                 ON CONFLICT (l1_batch_number) DO
                 UPDATE
                 SET
@@ -408,7 +428,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 "#,
                 i64::from(block_number.0),
                 scheduler_partial_input_blob_url,
-                protocol_version_id as i32,
+                protocol_version.minor as i32,
+                protocol_version.patch.0 as i32,
             )
             .execute(self.storage.conn())
             .await
@@ -420,7 +441,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
 
     pub async fn get_next_leaf_aggregation_job(
         &mut self,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
         picked_by: &str,
     ) -> Option<LeafAggregationJobMetadata> {
         let row = sqlx::query!(
@@ -431,7 +452,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 attempts = attempts + 1,
                 updated_at = NOW(),
                 processing_started_at = NOW(),
-                picked_by = $2
+                picked_by = $3
             WHERE
                 id = (
                     SELECT
@@ -441,6 +462,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     WHERE
                         status = 'queued'
                         AND protocol_version = $1
+                        AND protocol_version_patch = $2
                     ORDER BY
                         l1_batch_number ASC,
                         id ASC
@@ -452,7 +474,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
             RETURNING
                 leaf_aggregation_witness_jobs_fri.*
             "#,
-            protocol_version as i32,
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32,
             picked_by,
         )
         .fetch_optional(self.storage.conn())
@@ -536,34 +559,34 @@ impl FriWitnessGeneratorDal<'_, '_> {
 
     pub async fn move_leaf_aggregation_jobs_from_waiting_to_queued(&mut self) -> Vec<(i64, u8)> {
         sqlx::query!(
-                r#"
-                UPDATE leaf_aggregation_witness_jobs_fri
-                SET
-                    status = 'queued'
-                WHERE
-                    (l1_batch_number, circuit_id) IN (
-                        SELECT
-                            prover_jobs_fri.l1_batch_number,
-                            prover_jobs_fri.circuit_id
-                        FROM
-                            prover_jobs_fri
-                            JOIN leaf_aggregation_witness_jobs_fri lawj ON prover_jobs_fri.l1_batch_number = lawj.l1_batch_number
-                            AND prover_jobs_fri.circuit_id = lawj.circuit_id
-                        WHERE
-                            lawj.status = 'waiting_for_proofs'
-                            AND prover_jobs_fri.status = 'successful'
-                            AND prover_jobs_fri.aggregation_round = 0
-                        GROUP BY
-                            prover_jobs_fri.l1_batch_number,
-                            prover_jobs_fri.circuit_id,
-                            lawj.number_of_basic_circuits
-                        HAVING
-                            COUNT(*) = lawj.number_of_basic_circuits
-                    )
-                RETURNING
-                    l1_batch_number,
-                    circuit_id;
-                "#,
+            r#"
+            UPDATE leaf_aggregation_witness_jobs_fri
+            SET
+                status = 'queued'
+            WHERE
+                (l1_batch_number, circuit_id) IN (
+                    SELECT
+                        prover_jobs_fri.l1_batch_number,
+                        prover_jobs_fri.circuit_id
+                    FROM
+                        prover_jobs_fri
+                        JOIN leaf_aggregation_witness_jobs_fri lawj ON prover_jobs_fri.l1_batch_number = lawj.l1_batch_number
+                        AND prover_jobs_fri.circuit_id = lawj.circuit_id
+                    WHERE
+                        lawj.status = 'waiting_for_proofs'
+                        AND prover_jobs_fri.status = 'successful'
+                        AND prover_jobs_fri.aggregation_round = 0
+                    GROUP BY
+                        prover_jobs_fri.l1_batch_number,
+                        prover_jobs_fri.circuit_id,
+                        lawj.number_of_basic_circuits
+                    HAVING
+                        COUNT(*) = lawj.number_of_basic_circuits
+                )
+            RETURNING
+                l1_batch_number,
+                circuit_id;
+            "#,
         )
         .fetch_all(self.storage.conn())
         .await
@@ -606,7 +629,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
 
     pub async fn get_next_node_aggregation_job(
         &mut self,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
         picked_by: &str,
     ) -> Option<NodeAggregationJobMetadata> {
         let row = sqlx::query!(
@@ -617,7 +640,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 attempts = attempts + 1,
                 updated_at = NOW(),
                 processing_started_at = NOW(),
-                picked_by = $2
+                picked_by = $3
             WHERE
                 id = (
                     SELECT
@@ -627,6 +650,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     WHERE
                         status = 'queued'
                         AND protocol_version = $1
+                        AND protocol_version_patch = $2
                     ORDER BY
                         l1_batch_number ASC,
                         depth ASC,
@@ -639,7 +663,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
             RETURNING
                 node_aggregation_witness_jobs_fri.*
             "#,
-            protocol_version as i32,
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32,
             picked_by,
         )
         .fetch_optional(self.storage.conn())
@@ -700,6 +725,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 updated_at = NOW()
             WHERE
                 id = $2
+                AND status != 'successful'
             "#,
             error,
             i64::from(id)
@@ -735,7 +761,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
         number_of_dependent_jobs: Option<i32>,
         depth: u16,
         aggregations_url: &str,
-        protocol_version_id: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) {
         sqlx::query!(
             r#"
@@ -749,10 +775,11 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     protocol_version,
                     status,
                     created_at,
-                    updated_at
+                    updated_at,
+                    protocol_version_patch
                 )
             VALUES
-                ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', NOW(), NOW())
+                ($1, $2, $3, $4, $5, $6, 'waiting_for_proofs', NOW(), NOW(), $7)
             ON CONFLICT (l1_batch_number, circuit_id, depth) DO
             UPDATE
             SET
@@ -763,7 +790,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
             i32::from(depth),
             aggregations_url,
             number_of_dependent_jobs,
-            protocol_version_id as i32,
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32,
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -772,39 +800,39 @@ impl FriWitnessGeneratorDal<'_, '_> {
 
     pub async fn move_depth_zero_node_aggregation_jobs(&mut self) -> Vec<(i64, u8, u16)> {
         sqlx::query!(
-                r#"
-                UPDATE node_aggregation_witness_jobs_fri
-                SET
-                    status = 'queued'
-                WHERE
-                    (l1_batch_number, circuit_id, depth) IN (
-                        SELECT
-                            prover_jobs_fri.l1_batch_number,
-                            prover_jobs_fri.circuit_id,
-                            prover_jobs_fri.depth
-                        FROM
-                            prover_jobs_fri
-                            JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number
-                            AND prover_jobs_fri.circuit_id = nawj.circuit_id
-                            AND prover_jobs_fri.depth = nawj.depth
-                        WHERE
-                            nawj.status = 'waiting_for_proofs'
-                            AND prover_jobs_fri.status = 'successful'
-                            AND prover_jobs_fri.aggregation_round = 1
-                            AND prover_jobs_fri.depth = 0
-                        GROUP BY
-                            prover_jobs_fri.l1_batch_number,
-                            prover_jobs_fri.circuit_id,
-                            prover_jobs_fri.depth,
-                            nawj.number_of_dependent_jobs
-                        HAVING
-                            COUNT(*) = nawj.number_of_dependent_jobs
-                    )
-                RETURNING
-                    l1_batch_number,
-                    circuit_id,
-                    depth;
-                "#,
+            r#"
+            UPDATE node_aggregation_witness_jobs_fri
+            SET
+                status = 'queued'
+            WHERE
+                (l1_batch_number, circuit_id, depth) IN (
+                    SELECT
+                        prover_jobs_fri.l1_batch_number,
+                        prover_jobs_fri.circuit_id,
+                        prover_jobs_fri.depth
+                    FROM
+                        prover_jobs_fri
+                        JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number
+                        AND prover_jobs_fri.circuit_id = nawj.circuit_id
+                        AND prover_jobs_fri.depth = nawj.depth
+                    WHERE
+                        nawj.status = 'waiting_for_proofs'
+                        AND prover_jobs_fri.status = 'successful'
+                        AND prover_jobs_fri.aggregation_round = 1
+                        AND prover_jobs_fri.depth = 0
+                    GROUP BY
+                        prover_jobs_fri.l1_batch_number,
+                        prover_jobs_fri.circuit_id,
+                        prover_jobs_fri.depth,
+                        nawj.number_of_dependent_jobs
+                    HAVING
+                        COUNT(*) = nawj.number_of_dependent_jobs
+                )
+            RETURNING
+                l1_batch_number,
+                circuit_id,
+                depth;
+            "#,
         )
         .fetch_all(self.storage.conn())
         .await
@@ -816,38 +844,38 @@ impl FriWitnessGeneratorDal<'_, '_> {
 
     pub async fn move_depth_non_zero_node_aggregation_jobs(&mut self) -> Vec<(i64, u8, u16)> {
         sqlx::query!(
-                r#"
-                UPDATE node_aggregation_witness_jobs_fri
-                SET
-                    status = 'queued'
-                WHERE
-                    (l1_batch_number, circuit_id, depth) IN (
-                        SELECT
-                            prover_jobs_fri.l1_batch_number,
-                            prover_jobs_fri.circuit_id,
-                            prover_jobs_fri.depth
-                        FROM
-                            prover_jobs_fri
-                            JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number
-                            AND prover_jobs_fri.circuit_id = nawj.circuit_id
-                            AND prover_jobs_fri.depth = nawj.depth
-                        WHERE
-                            nawj.status = 'waiting_for_proofs'
-                            AND prover_jobs_fri.status = 'successful'
-                            AND prover_jobs_fri.aggregation_round = 2
-                        GROUP BY
-                            prover_jobs_fri.l1_batch_number,
-                            prover_jobs_fri.circuit_id,
-                            prover_jobs_fri.depth,
-                            nawj.number_of_dependent_jobs
-                        HAVING
-                            COUNT(*) = nawj.number_of_dependent_jobs
-                    )
-                RETURNING
-                    l1_batch_number,
-                    circuit_id,
-                    depth;
-                "#,
+            r#"
+            UPDATE node_aggregation_witness_jobs_fri
+            SET
+                status = 'queued'
+            WHERE
+                (l1_batch_number, circuit_id, depth) IN (
+                    SELECT
+                        prover_jobs_fri.l1_batch_number,
+                        prover_jobs_fri.circuit_id,
+                        prover_jobs_fri.depth
+                    FROM
+                        prover_jobs_fri
+                        JOIN node_aggregation_witness_jobs_fri nawj ON prover_jobs_fri.l1_batch_number = nawj.l1_batch_number
+                        AND prover_jobs_fri.circuit_id = nawj.circuit_id
+                        AND prover_jobs_fri.depth = nawj.depth
+                    WHERE
+                        nawj.status = 'waiting_for_proofs'
+                        AND prover_jobs_fri.status = 'successful'
+                        AND prover_jobs_fri.aggregation_round = 2
+                    GROUP BY
+                        prover_jobs_fri.l1_batch_number,
+                        prover_jobs_fri.circuit_id,
+                        prover_jobs_fri.depth,
+                        nawj.number_of_dependent_jobs
+                    HAVING
+                        COUNT(*) = nawj.number_of_dependent_jobs
+                )
+            RETURNING
+                l1_batch_number,
+                circuit_id,
+                depth;
+            "#,
         )
         .fetch_all(self.storage.conn())
         .await
@@ -874,7 +902,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         rtwj.status = 'waiting_for_proofs'
                         AND prover_jobs_fri.status = 'successful'
                         AND prover_jobs_fri.aggregation_round = $1
-                        AND prover_jobs_fri.is_node_final_proof = true
+                        AND prover_jobs_fri.is_node_final_proof = TRUE
                     GROUP BY
                         prover_jobs_fri.l1_batch_number,
                         rtwj.number_of_final_node_jobs
@@ -885,13 +913,13 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 l1_batch_number;
             "#,
             AggregationRound::NodeAggregation as i64,
-    )
-    .fetch_all(self.storage.conn())
-    .await
-    .unwrap()
-    .into_iter()
-    .map(|row| (row.l1_batch_number as u64))
-    .collect()
+        )
+        .fetch_all(self.storage.conn())
+        .await
+        .unwrap()
+        .into_iter()
+        .map(|row| (row.l1_batch_number as u64))
+        .collect()
     }
 
     pub async fn move_scheduler_jobs_from_waiting_to_queued(&mut self) -> Vec<u64> {
@@ -951,7 +979,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
             RETURNING
                 id,
                 status,
-                attempts
+                attempts,
+                circuit_id
             "#,
             &processing_timeout,
             max_attempts as i32,
@@ -964,6 +993,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
             id: row.id as u64,
             status: row.status,
             attempts: row.attempts as u64,
+            circuit_id: Some(row.circuit_id as u32),
         })
         .collect()
     }
@@ -994,7 +1024,8 @@ impl FriWitnessGeneratorDal<'_, '_> {
             RETURNING
                 id,
                 status,
-                attempts
+                attempts,
+                circuit_id
             "#,
             &processing_timeout,
             max_attempts as i32,
@@ -1007,6 +1038,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
             id: row.id as u64,
             status: row.status,
             attempts: row.attempts as u64,
+            circuit_id: Some(row.circuit_id as u32),
         })
         .collect()
     }
@@ -1050,15 +1082,16 @@ impl FriWitnessGeneratorDal<'_, '_> {
             id: row.l1_batch_number as u64,
             status: row.status,
             attempts: row.attempts as u64,
+            circuit_id: None,
         })
         .collect()
     }
 
     pub async fn get_next_recursion_tip_witness_job(
         &mut self,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
         picked_by: &str,
-    ) -> Option<L1BatchNumber> {
+    ) -> Option<(L1BatchNumber, i32)> {
         sqlx::query!(
             r#"
             UPDATE recursion_tip_witness_jobs_fri
@@ -1067,16 +1100,17 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 attempts = attempts + 1,
                 updated_at = NOW(),
                 processing_started_at = NOW(),
-                picked_by = $2
+                picked_by = $3
             WHERE
                 l1_batch_number = (
                     SELECT
                         l1_batch_number
                     FROM
-                    recursion_tip_witness_jobs_fri
+                        recursion_tip_witness_jobs_fri
                     WHERE
                         status = 'queued'
                         AND protocol_version = $1
+                        AND protocol_version_patch = $2
                     ORDER BY
                         l1_batch_number ASC
                     LIMIT
@@ -1085,15 +1119,22 @@ impl FriWitnessGeneratorDal<'_, '_> {
                         SKIP LOCKED
                 )
             RETURNING
-                recursion_tip_witness_jobs_fri.l1_batch_number
+                recursion_tip_witness_jobs_fri.l1_batch_number,
+                recursion_tip_witness_jobs_fri.number_of_final_node_jobs
             "#,
-            protocol_version as i32,
+            protocol_version.minor as i32,
+            protocol_version.patch.0 as i32,
             picked_by,
         )
         .fetch_optional(self.storage.conn())
         .await
         .unwrap()
-        .map(|row| L1BatchNumber(row.l1_batch_number as u32))
+        .map(|row| {
+            (
+                L1BatchNumber(row.l1_batch_number as u32),
+                row.number_of_final_node_jobs,
+            )
+        })
     }
 
     pub async fn mark_scheduler_jobs_as_queued(&mut self, l1_batch_number: i64) {
@@ -1153,13 +1194,14 @@ impl FriWitnessGeneratorDal<'_, '_> {
             id: row.l1_batch_number as u64,
             status: row.status,
             attempts: row.attempts as u64,
+            circuit_id: None,
         })
         .collect()
     }
 
     pub async fn get_next_scheduler_witness_job(
         &mut self,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
         picked_by: &str,
     ) -> Option<L1BatchNumber> {
         sqlx::query!(
@@ -1180,6 +1222,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                     WHERE
                         status = 'queued'
                         AND protocol_version = $1
+                        AND protocol_version_patch = $3
                     ORDER BY
                         l1_batch_number ASC
                     LIMIT
@@ -1190,8 +1233,9 @@ impl FriWitnessGeneratorDal<'_, '_> {
             RETURNING
                 scheduler_witness_jobs_fri.*
             "#,
-            protocol_version as i32,
+            protocol_version.minor as i32,
             picked_by,
+            protocol_version.patch.0 as i32,
         )
         .fetch_optional(self.storage.conn())
         .await
@@ -1303,6 +1347,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 updated_at = NOW()
             WHERE
                 l1_batch_number = $2
+                AND status != 'successful'
             "#,
             error,
             l1_batch_number.0 as i64
@@ -1322,6 +1367,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
                 updated_at = NOW()
             WHERE
                 l1_batch_number = $2
+                AND status != 'successful'
             "#,
             error,
             i64::from(block_number.0)
@@ -1334,30 +1380,43 @@ impl FriWitnessGeneratorDal<'_, '_> {
     pub async fn get_witness_jobs_stats(
         &mut self,
         aggregation_round: AggregationRound,
-    ) -> JobCountStatistics {
+    ) -> HashMap<(AggregationRound, ProtocolSemanticVersion), JobCountStatistics> {
         let table_name = Self::input_table_name_for(aggregation_round);
         let sql = format!(
             r#"
-                SELECT COUNT(*) as "count", status as "status"
-                FROM {}
-                GROUP BY status
+                SELECT
+                    protocol_version,
+                    protocol_version_patch,
+                    COUNT(*) FILTER (WHERE status = 'queued') as queued,
+                    COUNT(*) FILTER (WHERE status = 'in_progress') as in_progress
+                FROM
+                    {}
+                WHERE protocol_version IS NOT NULL
+                GROUP BY
+                    protocol_version,
+                    protocol_version_patch
                 "#,
-            table_name
+            table_name,
         );
-        let mut results: HashMap<String, i64> = sqlx::query(&sql)
+        sqlx::query(&sql)
             .fetch_all(self.storage.conn())
             .await
             .unwrap()
             .into_iter()
-            .map(|row| (row.get("status"), row.get::<i64, &str>("count")))
-            .collect::<HashMap<String, i64>>();
-
-        JobCountStatistics {
-            queued: results.remove("queued").unwrap_or(0i64) as usize,
-            in_progress: results.remove("in_progress").unwrap_or(0i64) as usize,
-            failed: results.remove("failed").unwrap_or(0i64) as usize,
-            successful: results.remove("successful").unwrap_or(0i64) as usize,
-        }
+            .map(|row| {
+                let protocol_semantic_version = ProtocolSemanticVersion::new(
+                    ProtocolVersionId::try_from(row.get::<i32, &str>("protocol_version") as u16)
+                        .unwrap(),
+                    VersionPatch(row.get::<i32, &str>("protocol_version_patch") as u32),
+                );
+                let key = (aggregation_round, protocol_semantic_version);
+                let value = JobCountStatistics {
+                    queued: row.get::<i64, &str>("queued") as usize,
+                    in_progress: row.get::<i64, &str>("in_progress") as usize,
+                };
+                (key, value)
+            })
+            .collect()
     }
 
     fn input_table_name_for(aggregation_round: AggregationRound) -> &'static str {
@@ -1373,11 +1432,12 @@ impl FriWitnessGeneratorDal<'_, '_> {
     pub async fn protocol_version_for_l1_batch(
         &mut self,
         l1_batch_number: L1BatchNumber,
-    ) -> ProtocolVersionId {
-        sqlx::query!(
+    ) -> ProtocolSemanticVersion {
+        let result = sqlx::query!(
             r#"
             SELECT
-                protocol_version
+                protocol_version,
+                protocol_version_patch
             FROM
                 witness_inputs_fri
             WHERE
@@ -1387,10 +1447,12 @@ impl FriWitnessGeneratorDal<'_, '_> {
         )
         .fetch_one(self.storage.conn())
         .await
-        .unwrap()
-        .protocol_version
-        .map(|id| ProtocolVersionId::try_from(id as u16).unwrap())
-        .unwrap()
+        .unwrap();
+
+        ProtocolSemanticVersion::new(
+            ProtocolVersionId::try_from(result.protocol_version.unwrap() as u16).unwrap(),
+            VersionPatch(result.protocol_version_patch as u32),
+        )
     }
 
     pub async fn get_basic_witness_generator_job_for_batch(
@@ -1415,7 +1477,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
             l1_batch_number,
             merkle_tree_paths_blob_url: row.merkle_tree_paths_blob_url,
             attempts: row.attempts as u32,
-            status: WitnessJobStatus::from_str(&row.status).unwrap(),
+            status: row.status.parse::<WitnessJobStatus>().unwrap(),
             error: row.error,
             created_at: row.created_at,
             updated_at: row.updated_at,
@@ -1514,7 +1576,7 @@ impl FriWitnessGeneratorDal<'_, '_> {
     pub async fn get_scheduler_witness_generator_jobs_for_batch(
         &mut self,
         l1_batch_number: L1BatchNumber,
-    ) -> Vec<SchedulerWitnessGeneratorJobInfo> {
+    ) -> Option<SchedulerWitnessGeneratorJobInfo> {
         sqlx::query!(
             r#"
             SELECT
@@ -1526,10 +1588,9 @@ impl FriWitnessGeneratorDal<'_, '_> {
             "#,
             i64::from(l1_batch_number.0)
         )
-        .fetch_all(self.storage.conn())
+        .fetch_optional(self.storage.conn())
         .await
         .unwrap()
-        .iter()
         .map(|row| SchedulerWitnessGeneratorJobInfo {
             l1_batch_number,
             scheduler_partial_input_blob_url: row.scheduler_partial_input_blob_url.clone(),
@@ -1543,6 +1604,340 @@ impl FriWitnessGeneratorDal<'_, '_> {
             protocol_version: row.protocol_version,
             picked_by: row.picked_by.clone(),
         })
-        .collect()
+    }
+
+    pub async fn get_recursion_tip_witness_generator_jobs_for_batch(
+        &mut self,
+        l1_batch_number: L1BatchNumber,
+    ) -> Option<RecursionTipWitnessGeneratorJobInfo> {
+        sqlx::query!(
+            r#"
+            SELECT
+                *
+            FROM
+                recursion_tip_witness_jobs_fri
+            WHERE
+                l1_batch_number = $1
+            "#,
+            i64::from(l1_batch_number.0)
+        )
+        .fetch_optional(self.storage.conn())
+        .await
+        .unwrap()
+        .map(|row| RecursionTipWitnessGeneratorJobInfo {
+            l1_batch_number,
+            status: WitnessJobStatus::from_str(&row.status).unwrap(),
+            attempts: row.attempts as u32,
+            processing_started_at: row.processing_started_at,
+            time_taken: row.time_taken,
+            error: row.error.clone(),
+            created_at: row.created_at,
+            updated_at: row.updated_at,
+            number_of_final_node_jobs: row.number_of_final_node_jobs,
+            protocol_version: row.protocol_version,
+            picked_by: row.picked_by.clone(),
+        })
+    }
+
+    pub async fn delete_witness_generator_data_for_batch(
+        &mut self,
+        block_number: L1BatchNumber,
+        aggregation_round: AggregationRound,
+    ) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        sqlx::query(
+            format!(
+                r#"
+            DELETE FROM
+                {table}
+            WHERE
+                l1_batch_number = {l1_batch_number}
+            "#,
+                table = Self::input_table_name_for(aggregation_round),
+                l1_batch_number = i64::from(block_number.0),
+            )
+            .as_str(),
+        )
+        .execute(self.storage.conn())
+        .await
+    }
+
+    pub async fn delete_batch_data(
+        &mut self,
+        block_number: L1BatchNumber,
+    ) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        self.delete_witness_generator_data_for_batch(block_number, AggregationRound::BasicCircuits)
+            .await?;
+        self.delete_witness_generator_data_for_batch(
+            block_number,
+            AggregationRound::LeafAggregation,
+        )
+        .await?;
+        self.delete_witness_generator_data_for_batch(
+            block_number,
+            AggregationRound::NodeAggregation,
+        )
+        .await?;
+        self.delete_witness_generator_data(AggregationRound::RecursionTip)
+            .await?;
+        self.delete_witness_generator_data_for_batch(block_number, AggregationRound::Scheduler)
+            .await
+    }
+
+    pub async fn delete_witness_generator_data(
+        &mut self,
+        aggregation_round: AggregationRound,
+    ) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        sqlx::query(
+            format!(
+                r#"
+            DELETE FROM
+                {}
+            "#,
+                Self::input_table_name_for(aggregation_round)
+            )
+            .as_str(),
+        )
+        .execute(self.storage.conn())
+        .await
+    }
+
+    pub async fn delete(&mut self) -> sqlx::Result<sqlx::postgres::PgQueryResult> {
+        self.delete_witness_generator_data(AggregationRound::BasicCircuits)
+            .await?;
+        self.delete_witness_generator_data(AggregationRound::LeafAggregation)
+            .await?;
+        self.delete_witness_generator_data(AggregationRound::NodeAggregation)
+            .await?;
+        self.delete_witness_generator_data(AggregationRound::RecursionTip)
+            .await?;
+        self.delete_witness_generator_data(AggregationRound::Scheduler)
+            .await
+    }
+
+    pub async fn requeue_stuck_witness_inputs_jobs_for_batch(
+        &mut self,
+        block_number: L1BatchNumber,
+        max_attempts: u32,
+    ) -> Vec<StuckJobs> {
+        let query = format!(
+            r#"
+            UPDATE witness_inputs_fri
+            SET
+                status = 'queued',
+                updated_at = NOW(),
+                processing_started_at = NOW()
+            WHERE
+                l1_batch_number = {}
+                AND attempts >= {}
+                AND (status = 'in_progress' OR status = 'failed')
+            RETURNING
+                l1_batch_number,
+                status,
+                attempts
+            "#,
+            i64::from(block_number.0),
+            max_attempts
+        );
+        sqlx::query(&query)
+            .fetch_all(self.storage.conn())
+            .await
+            .unwrap()
+            .into_iter()
+            .map(|row| StuckJobs {
+                id: row.get::<i64, &str>("l1_batch_number") as u64,
+                status: row.get("status"),
+                attempts: row.get::<i16, &str>("attempts") as u64,
+                circuit_id: None,
+            })
+            .collect()
+    }
+
+    pub async fn requeue_stuck_leaf_aggregation_jobs_for_batch(
+        &mut self,
+        block_number: L1BatchNumber,
+        max_attempts: u32,
+    ) -> Vec<StuckJobs> {
+        self.requeue_stuck_jobs_for_batch_in_aggregation_round(
+            AggregationRound::LeafAggregation,
+            block_number,
+            max_attempts,
+        )
+        .await
+    }
+
+    pub async fn requeue_stuck_node_aggregation_jobs_for_batch(
+        &mut self,
+        block_number: L1BatchNumber,
+        max_attempts: u32,
+    ) -> Vec<StuckJobs> {
+        self.requeue_stuck_jobs_for_batch_in_aggregation_round(
+            AggregationRound::NodeAggregation,
+            block_number,
+            max_attempts,
+        )
+        .await
+    }
+
+    pub async fn requeue_stuck_recursion_tip_jobs_for_batch(
+        &mut self,
+        block_number: L1BatchNumber,
+        max_attempts: u32,
+    ) -> Vec<StuckJobs> {
+        let query = format!(
+            r#"
+            UPDATE recursion_tip_witness_jobs_fri
+            SET
+                status = 'queued',
+                updated_at = NOW(),
+                processing_started_at = NOW()
+            WHERE
+                l1_batch_number = {}
+                AND attempts >= {}
+                AND (status = 'in_progress' OR status = 'failed')
+            RETURNING
+                l1_batch_number,
+                status,
+                attempts
+            "#,
+            i64::from(block_number.0),
+            max_attempts
+        );
+        sqlx::query(&query)
+            .fetch_all(self.storage.conn())
+            .await
+            .unwrap()
+            .into_iter()
+            .map(|row| StuckJobs {
+                id: row.get::<i64, &str>("l1_batch_number") as u64,
+                status: row.get("status"),
+                attempts: row.get::<i16, &str>("attempts") as u64,
+                circuit_id: None,
+            })
+            .collect()
+    }
+
+    pub async fn requeue_stuck_scheduler_jobs_for_batch(
+        &mut self,
+        block_number: L1BatchNumber,
+        max_attempts: u32,
+    ) -> Vec<StuckJobs> {
+        let query = format!(
+            r#"
+            UPDATE scheduler_witness_jobs_fri
+            SET
+                status = 'queued',
+                updated_at = NOW(),
+                processing_started_at = NOW()
+            WHERE
+                l1_batch_number = {}
+                AND attempts >= {}
+                AND (status = 'in_progress' OR status = 'failed')
+            RETURNING
+                l1_batch_number,
+                status,
+                attempts
+            "#,
+            i64::from(block_number.0),
+            max_attempts
+        );
+        sqlx::query(&query)
+            .fetch_all(self.storage.conn())
+            .await
+            .unwrap()
+            .into_iter()
+            .map(|row| StuckJobs {
+                id: row.get::<i64, &str>("l1_batch_number") as u64,
+                status: row.get("status"),
+                attempts: row.get::<i16, &str>("attempts") as u64,
+                circuit_id: None,
+            })
+            .collect()
+    }
+
+    async fn requeue_stuck_jobs_for_batch_in_aggregation_round(
+        &mut self,
+        aggregation_round: AggregationRound,
+        block_number: L1BatchNumber,
+        max_attempts: u32,
+    ) -> Vec<StuckJobs> {
+        let table_name = Self::input_table_name_for(aggregation_round);
+        let job_id_table_name = Self::job_id_table_name_for(aggregation_round);
+        let query = format!(
+            r#"
+            UPDATE {}
+            SET
+                status = 'queued',
+                updated_at = NOW(),
+                processing_started_at = NOW()
+            WHERE
+                l1_batch_number = {}
+                AND attempts >= {}
+                AND (status = 'in_progress' OR status = 'failed')
+            RETURNING
+                {},
+                status,
+                attempts,
+                circuit_id
+            "#,
+            table_name,
+            i64::from(block_number.0),
+            max_attempts,
+            job_id_table_name
+        );
+        sqlx::query(&query)
+            .fetch_all(self.storage.conn())
+            .await
+            .unwrap()
+            .into_iter()
+            .map(|row| StuckJobs {
+                id: row.get::<i64, &str>(job_id_table_name) as u64,
+                status: row.get("status"),
+                attempts: row.get::<i16, &str>("attempts") as u64,
+                circuit_id: Some(row.get::<i16, &str>("circuit_id") as u32),
+            })
+            .collect()
+    }
+
+    fn job_id_table_name_for(aggregation_round: AggregationRound) -> &'static str {
+        match aggregation_round {
+            AggregationRound::BasicCircuits
+            | AggregationRound::RecursionTip
+            | AggregationRound::Scheduler => "l1_batch_number",
+            AggregationRound::LeafAggregation | AggregationRound::NodeAggregation => "id",
+        }
+    }
+
+    pub async fn get_proof_generation_times_for_time_frame(
+        &mut self,
+        time_frame: NaiveDateTime,
+    ) -> sqlx::Result<Vec<ProofGenerationTime>> {
+        let proof_generation_times = sqlx::query!(
+            r#"
+            SELECT
+                comp.l1_batch_number,
+                (comp.updated_at - wit.created_at) AS time_taken,
+                wit.created_at
+            FROM
+                proof_compression_jobs_fri AS comp
+                JOIN witness_inputs_fri AS wit ON comp.l1_batch_number = wit.l1_batch_number
+            WHERE
+                wit.created_at > $1
+            ORDER BY
+                time_taken DESC;
+            "#,
+            time_frame.into(),
+        )
+        .fetch_all(self.storage.conn())
+        .await?
+        .into_iter()
+        .map(|row| ProofGenerationTime {
+            l1_batch_number: L1BatchNumber(row.l1_batch_number as u32),
+            time_taken: naive_time_from_pg_interval(
+                row.time_taken.expect("time_taken must be present"),
+            ),
+            created_at: row.created_at,
+        })
+        .collect();
+        Ok(proof_generation_times)
     }
 }
diff --git a/prover/prover_fri/Cargo.toml b/prover/prover_fri/Cargo.toml
index 5b618c928ed4..3c3ea840bad3 100644
--- a/prover/prover_fri/Cargo.toml
+++ b/prover/prover_fri/Cargo.toml
@@ -12,14 +12,14 @@ categories.workspace = true
 [dependencies]
 vise.workspace = true
 zksync_types.workspace = true
-prover_dal.workspace = true
+zksync_prover_dal.workspace = true
 zksync_config.workspace = true
 zksync_env_config.workspace = true
-prometheus_exporter.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 zksync_object_store.workspace = true
 zksync_queued_job_processor.workspace = true
 zksync_prover_fri_utils.workspace = true
+zksync_prover_config.workspace = true
 zksync_prover_fri_types.workspace = true
 zksync_utils.workspace = true
 vk_setup_data_generator_server_fri.workspace = true
@@ -41,6 +41,7 @@ async-trait.workspace = true
 local-ip-address.workspace = true
 reqwest = { workspace = true, features = ["blocking"] }
 regex.workspace = true
+clap = { workspace = true, features = ["derive"] }
 
 [features]
 default = []
diff --git a/prover/prover_fri/README.md b/prover/prover_fri/README.md
index 9ec6cb870c75..5f0a26cfdd49 100644
--- a/prover/prover_fri/README.md
+++ b/prover/prover_fri/README.md
@@ -16,9 +16,9 @@ will pull jobs from the database and do their part of the pipeline, loading inte
 
 ```mermaid
 flowchart LR
-    A["Operator"] --> |Produces block| F[Prover Gateway]
-    F --> |Inserts into DB| B["Postgres DB"]
-    B --> |Retrieves proven block \nafter compression| F
+    A["Operator"] -->|Produces block| F[Prover Gateway]
+    F -->|Inserts into DB| B["Postgres DB"]
+    B -->|Retrieves proven block \nafter compression| F
     B --> C["Witness"]
     C --- C1["Basic Circuits"]
     C --- C2["Leaf Aggregation"]
@@ -27,9 +27,9 @@ flowchart LR
     C --- C5["Scheduler"]
     C --> B
     B --> D["Vector Generator/Prover"]
-    D --> |Proven Block| B
+    D -->|Proven Block| B
     B --> G["Compressor"]
-    G --> |Compressed block| B
+    G -->|Compressed block| B
 ```
 
 ## Prerequisites
@@ -60,9 +60,10 @@ installation as a pre-requisite, alongside these machine specs:
 
    Note that it will produce a first l1 batch that can be proven (should be batch 0).
 
-3. Generate the GPU setup data (no need to regenerate if it's already there). This will consume around 20GB of disk. You
-   need to be in the `prover/` directory (for all commands from here onwards, you need to be in the `prover/` directory)
-   and run:
+3. Generate the GPU setup data (no need to regenerate if it's already there). If you want to use this with the GPU
+   compressors, you need to change the key in the file from `setup_2^26.key` to `setup_2^24.key`. This will consume
+   around 20GB of disk. You need to be in the `prover/` directory (for all commands from here onwards, you need to be in
+   the `prover/` directory) and run:
 
    ```console
    ./setup.sh gpu
@@ -167,6 +168,43 @@ Machine specs:
    zk f cargo run --release --bin zksync_proof_fri_compressor
    ```
 
+## Running GPU compressors
+
+There is an option to run compressors with the GPU, which will significantly improve the performance.
+
+1. The hardware setup should be the same as for GPU prover
+2. Install and compile `era-bellman-cuda` library
+
+   ```console
+   git clone https://github.com/matter-labs/bellman-cuda.git --branch dev bellman-cuda
+   cmake -Bbellman-cuda/build -Sbellman-cuda/ -DCMAKE_BUILD_TYPE=Release
+   cmake --build bellman-cuda/build/
+   ```
+
+3. Set path of library as environmental variable
+
+   ```console
+   export BELLMAN_CUDA_DIR=$PWD/bellman-cuda
+   ```
+
+4. GPU compressor uses `setup_2^24.key`. Download it by using:
+
+   ```console
+   wget https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2^24.key
+   ```
+
+5. Set the env variable with it's path:
+
+   ```console
+   export CRS_FILE=$PWD/setup_2^24.key
+   ```
+
+6. Run the compressor using:
+
+   ```console
+   zk f cargo run ---features "gpu" --release --bin zksync_proof_fri_compressor
+   ```
+
 ## Checking the status of the prover
 
 Once everything is running (either with the CPU or GPU prover), the server should have at least three blocks, and you
diff --git a/prover/prover_fri/src/gpu_prover_availability_checker.rs b/prover/prover_fri/src/gpu_prover_availability_checker.rs
index 027c7a4b07a8..4b51b26e5d38 100644
--- a/prover/prover_fri/src/gpu_prover_availability_checker.rs
+++ b/prover/prover_fri/src/gpu_prover_availability_checker.rs
@@ -2,8 +2,8 @@
 pub mod availability_checker {
     use std::{sync::Arc, time::Duration};
 
-    use prover_dal::{ConnectionPool, Prover, ProverDal};
     use tokio::sync::Notify;
+    use zksync_prover_dal::{ConnectionPool, Prover, ProverDal};
     use zksync_types::prover_dal::{GpuProverInstanceStatus, SocketAddress};
 
     use crate::metrics::{KillingReason, METRICS};
diff --git a/prover/prover_fri/src/gpu_prover_job_processor.rs b/prover/prover_fri/src/gpu_prover_job_processor.rs
index cdd3c060c347..cbd363e9b4f4 100644
--- a/prover/prover_fri/src/gpu_prover_job_processor.rs
+++ b/prover/prover_fri/src/gpu_prover_job_processor.rs
@@ -3,7 +3,6 @@ pub mod gpu_prover {
     use std::{collections::HashMap, sync::Arc, time::Instant};
 
     use anyhow::Context as _;
-    use prover_dal::{ConnectionPool, ProverDal};
     use shivini::{
         gpu_proof_config::GpuProofConfig, gpu_prove_from_external_witness_data, ProverContext,
     };
@@ -11,6 +10,7 @@ pub mod gpu_prover {
     use zksync_config::configs::{fri_prover_group::FriProverGroupConfig, FriProverConfig};
     use zksync_env_config::FromEnv;
     use zksync_object_store::ObjectStore;
+    use zksync_prover_dal::{ConnectionPool, ProverDal};
     use zksync_prover_fri_types::{
         circuit_definitions::{
             base_layer_proof_config,
@@ -30,7 +30,8 @@ pub mod gpu_prover {
     };
     use zksync_queued_job_processor::{async_trait, JobProcessor};
     use zksync_types::{
-        basic_fri_types::CircuitIdRoundTuple, prover_dal::SocketAddress, ProtocolVersionId,
+        basic_fri_types::CircuitIdRoundTuple, protocol_version::ProtocolSemanticVersion,
+        prover_dal::SocketAddress,
     };
     use zksync_vk_setup_data_server_fri::{keystore::Keystore, GoldilocksGpuProverSetupData};
 
@@ -55,7 +56,7 @@ pub mod gpu_prover {
         blob_store: Arc<dyn ObjectStore>,
         public_blob_store: Option<Arc<dyn ObjectStore>>,
         config: Arc<FriProverConfig>,
-        prover_connection_pool: ConnectionPool<prover_dal::Prover>,
+        prover_connection_pool: ConnectionPool<zksync_prover_dal::Prover>,
         setup_load_mode: SetupLoadMode,
         // Only pick jobs for the configured circuit id and aggregation rounds.
         // Empty means all jobs are picked.
@@ -64,7 +65,7 @@ pub mod gpu_prover {
         prover_context: ProverContext,
         address: SocketAddress,
         zone: String,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     }
 
     impl Prover {
@@ -73,13 +74,13 @@ pub mod gpu_prover {
             blob_store: Arc<dyn ObjectStore>,
             public_blob_store: Option<Arc<dyn ObjectStore>>,
             config: FriProverConfig,
-            prover_connection_pool: ConnectionPool<prover_dal::Prover>,
+            prover_connection_pool: ConnectionPool<zksync_prover_dal::Prover>,
             setup_load_mode: SetupLoadMode,
             circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
             witness_vector_queue: SharedWitnessVectorQueue,
             address: SocketAddress,
             zone: String,
-            protocol_version: ProtocolVersionId,
+            protocol_version: ProtocolSemanticVersion,
         ) -> Self {
             Prover {
                 blob_store,
diff --git a/prover/prover_fri/src/main.rs b/prover/prover_fri/src/main.rs
index c90b4ced147b..048eecb05cff 100644
--- a/prover/prover_fri/src/main.rs
+++ b/prover/prover_fri/src/main.rs
@@ -3,29 +3,26 @@
 use std::{future::Future, sync::Arc, time::Duration};
 
 use anyhow::Context as _;
+use clap::Parser;
 use local_ip_address::local_ip;
-use prometheus_exporter::PrometheusExporterConfig;
-use prover_dal::{ConnectionPool, Prover, ProverDal};
 use tokio::{
     sync::{oneshot, watch::Receiver, Notify},
     task::JoinHandle,
 };
-use zksync_config::configs::{
-    fri_prover_group::FriProverGroupConfig, FriProverConfig, ObservabilityConfig, PostgresConfig,
-};
-use zksync_env_config::{
-    object_store::{ProverObjectStoreConfig, PublicObjectStoreConfig},
-    FromEnv,
-};
+use zksync_config::configs::{DatabaseSecrets, FriProverConfig};
+use zksync_env_config::FromEnv;
 use zksync_object_store::{ObjectStore, ObjectStoreFactory};
+use zksync_prover_config::{load_database_secrets, load_general_config};
+use zksync_prover_dal::{ConnectionPool, Prover, ProverDal};
+use zksync_prover_fri_types::PROVER_PROTOCOL_SEMANTIC_VERSION;
 use zksync_prover_fri_utils::{get_all_circuit_id_round_tuples_for, region_fetcher::get_zone};
 use zksync_queued_job_processor::JobProcessor;
 use zksync_types::{
     basic_fri_types::CircuitIdRoundTuple,
     prover_dal::{GpuProverInstanceStatus, SocketAddress},
-    ProtocolVersionId,
 };
 use zksync_utils::wait_for_tasks::ManagedTasks;
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 mod gpu_prover_availability_checker;
 mod gpu_prover_job_processor;
@@ -35,8 +32,8 @@ mod socket_listener;
 mod utils;
 
 async fn graceful_shutdown(port: u16) -> anyhow::Result<impl Future<Output = ()>> {
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
-    let pool = ConnectionPool::<Prover>::singleton(postgres_config.prover_url()?)
+    let database_secrets = DatabaseSecrets::from_env().context("DatabaseSecrets::from_env()")?;
+    let pool = ConnectionPool::<Prover>::singleton(database_secrets.prover_url()?)
         .build()
         .await
         .context("failed to build a connection pool")?;
@@ -58,14 +55,20 @@ async fn graceful_shutdown(port: u16) -> anyhow::Result<impl Future<Output = ()>
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let observability_config =
-        ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let opt = Cli::parse();
+
+    let general_config = load_general_config(opt.config_path).context("general config")?;
+    let database_secrets = load_database_secrets(opt.secrets_path).context("database secrets")?;
+
+    let observability_config = general_config
+        .observability
+        .context("observability config")?;
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
 
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(sentry_url) = &observability_config.sentry_url {
         builder = builder
             .with_sentry_url(sentry_url)
@@ -91,7 +94,7 @@ async fn main() -> anyhow::Result<()> {
         tracing::info!("No sentry URL was provided");
     }
 
-    let prover_config = FriProverConfig::from_env().context("FriProverConfig::from_env()")?;
+    let prover_config = general_config.prover_config.context("fri_prover config")?;
     let exporter_config = PrometheusExporterConfig::pull(prover_config.prometheus_port);
 
     let (stop_signal_sender, stop_signal_receiver) = oneshot::channel();
@@ -104,23 +107,28 @@ async fn main() -> anyhow::Result<()> {
     .context("Error setting Ctrl+C handler")?;
 
     let (stop_sender, stop_receiver) = tokio::sync::watch::channel(false);
-    let object_store_config =
-        ProverObjectStoreConfig::from_env().context("ProverObjectStoreConfig::from_env()")?;
-    let object_store_factory = ObjectStoreFactory::new(object_store_config.0);
-    let public_object_store_config =
-        PublicObjectStoreConfig::from_env().context("PublicObjectStoreConfig::from_env()")?;
+    let prover_object_store_config = prover_config
+        .prover_object_store
+        .clone()
+        .context("prover object store config")?;
+    let object_store_factory = ObjectStoreFactory::new(prover_object_store_config);
+    let public_object_store_config = prover_config
+        .public_object_store
+        .clone()
+        .context("public object store config")?;
     let public_blob_store = match prover_config.shall_save_to_public_bucket {
         false => None,
         true => Some(
-            ObjectStoreFactory::new(public_object_store_config.0)
+            ObjectStoreFactory::new(public_object_store_config)
                 .create_store()
-                .await,
+                .await?,
         ),
     };
     let specialized_group_id = prover_config.specialized_group_id;
 
-    let circuit_ids_for_round_to_be_proven = FriProverGroupConfig::from_env()
-        .context("FriProverGroupConfig::from_env()")?
+    let circuit_ids_for_round_to_be_proven = general_config
+        .prover_group_config
+        .context("prover group config")?
         .get_circuit_ids_for_group_id(specialized_group_id)
         .unwrap_or_default();
     let circuit_ids_for_round_to_be_proven =
@@ -131,14 +139,13 @@ async fn main() -> anyhow::Result<()> {
         specialized_group_id,
         circuit_ids_for_round_to_be_proven.clone()
     );
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
 
     // There are 2 threads using the connection pool:
     // 1. The prover thread, which is used to update the prover job status.
     // 2. The socket listener thread, which is used to update the prover instance status.
     const MAX_POOL_SIZE_FOR_PROVER: u32 = 2;
 
-    let pool = ConnectionPool::builder(postgres_config.prover_url()?, MAX_POOL_SIZE_FOR_PROVER)
+    let pool = ConnectionPool::builder(database_secrets.prover_url()?, MAX_POOL_SIZE_FOR_PROVER)
         .build()
         .await
         .context("failed to build a connection pool")?;
@@ -195,7 +202,7 @@ async fn get_prover_tasks(
 ) -> anyhow::Result<Vec<JoinHandle<anyhow::Result<()>>>> {
     use crate::prover_job_processor::{load_setup_data_cache, Prover};
 
-    let protocol_version = ProtocolVersionId::current_prover_version();
+    let protocol_version = PROVER_PROTOCOL_SEMANTIC_VERSION;
 
     tracing::info!(
         "Starting CPU FRI proof generation for with protocol_version: {:?}",
@@ -205,7 +212,7 @@ async fn get_prover_tasks(
     let setup_load_mode =
         load_setup_data_cache(&prover_config).context("load_setup_data_cache()")?;
     let prover = Prover::new(
-        store_factory.create_store().await,
+        store_factory.create_store().await?,
         public_blob_store,
         prover_config,
         pool,
@@ -247,10 +254,10 @@ async fn get_prover_tasks(
         port: prover_config.witness_vector_receiver_port,
     };
 
-    let protocol_version = ProtocolVersionId::current_prover_version();
+    let protocol_version = PROVER_PROTOCOL_SEMANTIC_VERSION;
 
     let prover = gpu_prover::Prover::new(
-        store_factory.create_store().await,
+        store_factory.create_store().await?,
         public_blob_store,
         prover_config.clone(),
         pool.clone(),
@@ -302,3 +309,12 @@ async fn get_prover_tasks(
 
     Ok(tasks)
 }
+
+#[derive(Debug, Parser)]
+#[command(author = "Matter Labs", version)]
+pub(crate) struct Cli {
+    #[arg(long)]
+    pub(crate) config_path: Option<std::path::PathBuf>,
+    #[arg(long)]
+    pub(crate) secrets_path: Option<std::path::PathBuf>,
+}
diff --git a/prover/prover_fri/src/prover_job_processor.rs b/prover/prover_fri/src/prover_job_processor.rs
index 7805d27f55bb..f06f1bbab939 100644
--- a/prover/prover_fri/src/prover_job_processor.rs
+++ b/prover/prover_fri/src/prover_job_processor.rs
@@ -1,12 +1,12 @@
 use std::{collections::HashMap, sync::Arc, time::Instant};
 
 use anyhow::Context as _;
-use prover_dal::{ConnectionPool, ProverDal};
 use tokio::task::JoinHandle;
 use zkevm_test_harness::prover_utils::{prove_base_layer_circuit, prove_recursion_layer_circuit};
 use zksync_config::configs::{fri_prover_group::FriProverGroupConfig, FriProverConfig};
 use zksync_env_config::FromEnv;
 use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{ConnectionPool, ProverDal};
 use zksync_prover_fri_types::{
     circuit_definitions::{
         base_layer_proof_config,
@@ -21,7 +21,9 @@ use zksync_prover_fri_types::{
 };
 use zksync_prover_fri_utils::fetch_next_circuit;
 use zksync_queued_job_processor::{async_trait, JobProcessor};
-use zksync_types::{basic_fri_types::CircuitIdRoundTuple, ProtocolVersionId};
+use zksync_types::{
+    basic_fri_types::CircuitIdRoundTuple, protocol_version::ProtocolSemanticVersion,
+};
 use zksync_vk_setup_data_server_fri::{keystore::Keystore, GoldilocksProverSetupData};
 
 use crate::{
@@ -41,12 +43,12 @@ pub struct Prover {
     blob_store: Arc<dyn ObjectStore>,
     public_blob_store: Option<Arc<dyn ObjectStore>>,
     config: Arc<FriProverConfig>,
-    prover_connection_pool: ConnectionPool<prover_dal::Prover>,
+    prover_connection_pool: ConnectionPool<zksync_prover_dal::Prover>,
     setup_load_mode: SetupLoadMode,
     // Only pick jobs for the configured circuit id and aggregation rounds.
     // Empty means all jobs are picked.
     circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
 }
 
 impl Prover {
@@ -55,10 +57,10 @@ impl Prover {
         blob_store: Arc<dyn ObjectStore>,
         public_blob_store: Option<Arc<dyn ObjectStore>>,
         config: FriProverConfig,
-        prover_connection_pool: ConnectionPool<prover_dal::Prover>,
+        prover_connection_pool: ConnectionPool<zksync_prover_dal::Prover>,
         setup_load_mode: SetupLoadMode,
         circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Self {
         Prover {
             blob_store,
diff --git a/prover/prover_fri/src/socket_listener.rs b/prover/prover_fri/src/socket_listener.rs
index 44e8236308a3..5e857e651bcf 100644
--- a/prover/prover_fri/src/socket_listener.rs
+++ b/prover/prover_fri/src/socket_listener.rs
@@ -3,17 +3,17 @@ pub mod gpu_socket_listener {
     use std::{net::SocketAddr, sync::Arc, time::Instant};
 
     use anyhow::Context as _;
-    use prover_dal::{ConnectionPool, Prover, ProverDal};
     use tokio::{
         io::copy,
         net::{TcpListener, TcpStream},
         sync::{watch, Notify},
     };
     use zksync_object_store::bincode;
+    use zksync_prover_dal::{ConnectionPool, Prover, ProverDal};
     use zksync_prover_fri_types::WitnessVectorArtifacts;
     use zksync_types::{
+        protocol_version::ProtocolSemanticVersion,
         prover_dal::{GpuProverInstanceStatus, SocketAddress},
-        ProtocolVersionId,
     };
 
     use crate::{
@@ -27,7 +27,7 @@ pub mod gpu_socket_listener {
         pool: ConnectionPool<Prover>,
         specialized_prover_group_id: u8,
         zone: String,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     }
 
     impl SocketListener {
@@ -37,7 +37,7 @@ pub mod gpu_socket_listener {
             pool: ConnectionPool<Prover>,
             specialized_prover_group_id: u8,
             zone: String,
-            protocol_version: ProtocolVersionId,
+            protocol_version: ProtocolSemanticVersion,
         ) -> Self {
             Self {
                 address,
@@ -85,7 +85,7 @@ pub mod gpu_socket_listener {
             let mut now = Instant::now();
             loop {
                 if *stop_receiver.borrow() {
-                    tracing::warn!("Stop signal received, shutting down socket listener");
+                    tracing::info!("Stop signal received, shutting down socket listener");
                     return Ok(());
                 }
                 let stream = listener
diff --git a/prover/prover_fri/src/utils.rs b/prover/prover_fri/src/utils.rs
index 503f22da6d96..15a2a6c18bb2 100644
--- a/prover/prover_fri/src/utils.rs
+++ b/prover/prover_fri/src/utils.rs
@@ -2,10 +2,10 @@
 
 use std::{sync::Arc, time::Instant};
 
-use prover_dal::{Connection, Prover, ProverDal};
 use tokio::sync::Mutex;
 use zkevm_test_harness::prover_utils::{verify_base_layer_proof, verify_recursion_layer_proof};
 use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{Connection, Prover, ProverDal};
 use zksync_prover_fri_types::{
     circuit_definitions::{
         boojum::{
@@ -24,7 +24,8 @@ use zksync_prover_fri_types::{
 };
 use zksync_types::{
     basic_fri_types::{AggregationRound, CircuitIdRoundTuple},
-    L1BatchNumber, ProtocolVersionId,
+    protocol_version::ProtocolSemanticVersion,
+    L1BatchNumber,
 };
 
 use crate::metrics::METRICS;
@@ -64,7 +65,7 @@ pub async fn save_proof(
     public_blob_store: Option<&dyn ObjectStore>,
     shall_save_to_public_bucket: bool,
     connection: &mut Connection<'_, Prover>,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
 ) {
     tracing::info!(
         "Successfully proven job: {}, total time taken: {:?}",
diff --git a/prover/prover_fri/tests/basic_test.rs b/prover/prover_fri/tests/basic_test.rs
index 66103a5e0878..b6d6226e6967 100644
--- a/prover/prover_fri/tests/basic_test.rs
+++ b/prover/prover_fri/tests/basic_test.rs
@@ -31,14 +31,15 @@ async fn prover_and_assert_base_layer(
             file_backed_base_path: "./tests/data/".to_owned(),
         },
         max_retries: 5,
+        local_mirror_path: None,
     };
     let object_store = ObjectStoreFactory::new(object_store_config)
         .create_store()
-        .await;
+        .await?;
     let expected_proof = object_store
         .get(expected_proof_id)
         .await
-        .expect("missing expected proof");
+        .context("missing expected proof")?;
 
     let aggregation_round = AggregationRound::BasicCircuits;
     let blob_key = FriCircuitKey {
@@ -79,6 +80,8 @@ async fn prover_and_assert_base_layer(
 //     prover_and_assert_base_layer(5176866, 1, L1BatchNumber(128623), 1086).await;
 // }
 
+// TODO(PLA-939): Enable this test when the test data is available.
+#[ignore]
 #[tokio::test]
 async fn test_base_layer_sha256_proof_gen() {
     prover_and_assert_base_layer(1293714, 6, L1BatchNumber(114499), 479)
diff --git a/prover/prover_fri_gateway/Cargo.toml b/prover/prover_fri_gateway/Cargo.toml
index ac0c95d83a5d..420a2e35fce8 100644
--- a/prover/prover_fri_gateway/Cargo.toml
+++ b/prover/prover_fri_gateway/Cargo.toml
@@ -12,14 +12,14 @@ categories.workspace = true
 [dependencies]
 vise.workspace = true
 zksync_types.workspace = true
-prover_dal.workspace = true
+zksync_prover_dal.workspace = true
 zksync_config.workspace = true
 zksync_env_config.workspace = true
 zksync_object_store.workspace = true
 zksync_prover_interface.workspace = true
+zksync_prover_config.workspace = true
 zksync_utils.workspace = true
-prometheus_exporter.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 
 anyhow.workspace = true
 tracing.workspace = true
@@ -30,3 +30,4 @@ async-trait.workspace = true
 futures = { workspace = true, features = ["compat"] }
 serde = { workspace = true, features = ["derive"] }
 log.workspace = true
+clap = { workspace = true, features = ["derive"] }
diff --git a/prover/prover_fri_gateway/src/api_data_fetcher.rs b/prover/prover_fri_gateway/src/api_data_fetcher.rs
index 6a95acc0cd0b..f2492588c739 100644
--- a/prover/prover_fri_gateway/src/api_data_fetcher.rs
+++ b/prover/prover_fri_gateway/src/api_data_fetcher.rs
@@ -1,11 +1,11 @@
 use std::{sync::Arc, time::Duration};
 
 use async_trait::async_trait;
-use prover_dal::{ConnectionPool, Prover};
 use reqwest::Client;
 use serde::{de::DeserializeOwned, Serialize};
 use tokio::{sync::watch, time::sleep};
 use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{ConnectionPool, Prover};
 
 use crate::metrics::METRICS;
 
diff --git a/prover/prover_fri_gateway/src/main.rs b/prover/prover_fri_gateway/src/main.rs
index c32fca3e7a73..f818e04c5eaf 100644
--- a/prover/prover_fri_gateway/src/main.rs
+++ b/prover/prover_fri_gateway/src/main.rs
@@ -1,15 +1,16 @@
 use std::time::Duration;
 
 use anyhow::Context as _;
-use prometheus_exporter::PrometheusExporterConfig;
-use prover_dal::{ConnectionPool, Prover};
+use clap::Parser;
 use reqwest::Client;
 use tokio::sync::{oneshot, watch};
-use zksync_config::configs::{FriProverGatewayConfig, ObservabilityConfig, PostgresConfig};
-use zksync_env_config::{object_store::ProverObjectStoreConfig, FromEnv};
+use zksync_env_config::object_store::ProverObjectStoreConfig;
 use zksync_object_store::ObjectStoreFactory;
+use zksync_prover_config::{load_database_secrets, load_general_config};
+use zksync_prover_dal::{ConnectionPool, Prover};
 use zksync_prover_interface::api::{ProofGenerationDataRequest, SubmitProofRequest};
 use zksync_utils::wait_for_tasks::ManagedTasks;
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 use crate::api_data_fetcher::{PeriodicApiStruct, PROOF_GENERATION_DATA_PATH, SUBMIT_PROOF_PATH};
 
@@ -20,14 +21,21 @@ mod proof_submitter;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let observability_config =
-        ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let opt = Cli::parse();
+
+    let general_config = load_general_config(opt.config_path).context("general config")?;
+    let database_secrets = load_database_secrets(opt.secrets_path).context("database secrets")?;
+
+    let observability_config = general_config
+        .observability
+        .context("observability config")?;
+
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
 
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(sentry_url) = &observability_config.sentry_url {
         builder = builder
             .with_sentry_url(sentry_url)
@@ -36,29 +44,36 @@ async fn main() -> anyhow::Result<()> {
     }
     let _guard = builder.build();
 
-    let config =
-        FriProverGatewayConfig::from_env().context("FriProverGatewayConfig::from_env()")?;
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
+    let config = general_config
+        .prover_gateway
+        .context("prover gateway config")?;
+
+    let postgres_config = general_config.postgres_config.context("postgres config")?;
     let pool = ConnectionPool::<Prover>::builder(
-        postgres_config.prover_url()?,
+        database_secrets.prover_url()?,
         postgres_config.max_connections()?,
     )
     .build()
     .await
     .context("failed to build a connection pool")?;
-    let object_store_config =
-        ProverObjectStoreConfig::from_env().context("ProverObjectStoreConfig::from_env()")?;
+    let object_store_config = ProverObjectStoreConfig(
+        general_config
+            .prover_config
+            .context("prover config")?
+            .prover_object_store
+            .context("object store")?,
+    );
     let store_factory = ObjectStoreFactory::new(object_store_config.0);
 
     let proof_submitter = PeriodicApiStruct {
-        blob_store: store_factory.create_store().await,
+        blob_store: store_factory.create_store().await?,
         pool: pool.clone(),
         api_url: format!("{}{SUBMIT_PROOF_PATH}", config.api_url),
         poll_duration: config.api_poll_duration(),
         client: Client::new(),
     };
     let proof_gen_data_fetcher = PeriodicApiStruct {
-        blob_store: store_factory.create_store().await,
+        blob_store: store_factory.create_store().await?,
         pool,
         api_url: format!("{}{PROOF_GENERATION_DATA_PATH}", config.api_url),
         poll_duration: config.api_poll_duration(),
@@ -100,3 +115,12 @@ async fn main() -> anyhow::Result<()> {
     tasks.complete(Duration::from_secs(5)).await;
     Ok(())
 }
+
+#[derive(Debug, Parser)]
+#[command(author = "Matter Labs", version)]
+pub(crate) struct Cli {
+    #[arg(long)]
+    pub(crate) config_path: Option<std::path::PathBuf>,
+    #[arg(long)]
+    pub(crate) secrets_path: Option<std::path::PathBuf>,
+}
diff --git a/prover/prover_fri_gateway/src/proof_gen_data_fetcher.rs b/prover/prover_fri_gateway/src/proof_gen_data_fetcher.rs
index cba3c24d862d..a2e213a4e24a 100644
--- a/prover/prover_fri_gateway/src/proof_gen_data_fetcher.rs
+++ b/prover/prover_fri_gateway/src/proof_gen_data_fetcher.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use prover_dal::ProverDal;
+use zksync_prover_dal::ProverDal;
 use zksync_prover_interface::api::{
     ProofGenerationData, ProofGenerationDataRequest, ProofGenerationDataResponse,
 };
@@ -16,14 +16,14 @@ impl PeriodicApiStruct {
         let mut connection = self.pool.connection().await.unwrap();
         connection
             .fri_protocol_versions_dal()
-            .save_prover_protocol_version(data.protocol_version_id, data.l1_verifier_config)
+            .save_prover_protocol_version(data.protocol_version, data.l1_verifier_config)
             .await;
         connection
             .fri_witness_generator_dal()
             .save_witness_inputs(
                 data.l1_batch_number,
                 &blob_url,
-                data.protocol_version_id,
+                data.protocol_version,
                 data.eip_4844_blobs,
             )
             .await;
diff --git a/prover/prover_fri_gateway/src/proof_submitter.rs b/prover/prover_fri_gateway/src/proof_submitter.rs
index 025d79e2f8c3..8b20ab67b516 100644
--- a/prover/prover_fri_gateway/src/proof_submitter.rs
+++ b/prover/prover_fri_gateway/src/proof_submitter.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use prover_dal::ProverDal;
+use zksync_prover_dal::ProverDal;
 use zksync_prover_interface::api::{SubmitProofRequest, SubmitProofResponse};
 use zksync_types::{prover_dal::ProofCompressionJobStatus, L1BatchNumber};
 
@@ -7,20 +7,20 @@ use crate::api_data_fetcher::{PeriodicApi, PeriodicApiStruct};
 
 impl PeriodicApiStruct {
     async fn next_submit_proof_request(&self) -> Option<(L1BatchNumber, SubmitProofRequest)> {
-        let (l1_batch_number, status) = self
+        let (l1_batch_number, protocol_version, status) = self
             .pool
             .connection()
             .await
             .unwrap()
             .fri_proof_compressor_dal()
-            .get_least_proven_block_number_not_sent_to_server()
+            .get_least_proven_block_not_sent_to_server()
             .await?;
 
         let request = match status {
             ProofCompressionJobStatus::Successful => {
                 let proof = self
                     .blob_store
-                    .get(l1_batch_number)
+                    .get((l1_batch_number, protocol_version))
                     .await
                     .expect("Failed to get compressed snark proof from blob store");
                 SubmitProofRequest::Proof(Box::new(proof))
diff --git a/prover/prover_fri_types/src/lib.rs b/prover/prover_fri_types/src/lib.rs
index 611702cd34f1..425adc418628 100644
--- a/prover/prover_fri_types/src/lib.rs
+++ b/prover/prover_fri_types/src/lib.rs
@@ -14,14 +14,24 @@ use circuit_definitions::{
     },
 };
 use zksync_object_store::{serialize_using_bincode, Bucket, StoredObject};
-use zksync_types::{basic_fri_types::AggregationRound, L1BatchNumber};
+use zksync_types::{
+    basic_fri_types::AggregationRound,
+    protocol_version::{ProtocolSemanticVersion, VersionPatch},
+    L1BatchNumber, ProtocolVersionId,
+};
 
 use crate::keys::FriCircuitKey;
 
 pub mod keys;
 pub mod queue;
 
-pub const EIP_4844_CIRCUIT_ID: u8 = 255;
+// THESE VALUES SHOULD BE UPDATED ON ANY PROTOCOL UPGRADE OF PROVERS
+pub const PROVER_PROTOCOL_VERSION: ProtocolVersionId = ProtocolVersionId::Version24;
+pub const PROVER_PROTOCOL_PATCH: VersionPatch = VersionPatch(1);
+pub const PROVER_PROTOCOL_SEMANTIC_VERSION: ProtocolSemanticVersion = ProtocolSemanticVersion {
+    minor: PROVER_PROTOCOL_VERSION,
+    patch: PROVER_PROTOCOL_PATCH,
+};
 
 #[derive(serde::Serialize, serde::Deserialize, Clone)]
 #[allow(clippy::large_enum_variant)]
diff --git a/prover/prover_fri_utils/Cargo.toml b/prover/prover_fri_utils/Cargo.toml
index c1834c596619..06b3af54cd3b 100644
--- a/prover/prover_fri_utils/Cargo.toml
+++ b/prover/prover_fri_utils/Cargo.toml
@@ -17,7 +17,7 @@ zksync_object_store.workspace = true
 zksync_config.workspace = true
 zksync_types.workspace = true
 zksync_prover_fri_types.workspace = true
-prover_dal.workspace = true
+zksync_prover_dal.workspace = true
 zksync_utils.workspace = true
 
 tracing.workspace = true
diff --git a/prover/prover_fri_utils/src/lib.rs b/prover/prover_fri_utils/src/lib.rs
index 39955fb55973..0873d5056285 100644
--- a/prover/prover_fri_utils/src/lib.rs
+++ b/prover/prover_fri_utils/src/lib.rs
@@ -1,7 +1,7 @@
 use std::time::Instant;
 
-use prover_dal::{Connection, Prover, ProverDal};
 use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{Connection, Prover, ProverDal};
 use zksync_prover_fri_types::{
     circuit_definitions::{
         circuit_definitions::recursion_layer::{
@@ -15,7 +15,7 @@ use zksync_prover_fri_types::{
 };
 use zksync_types::{
     basic_fri_types::{AggregationRound, CircuitIdRoundTuple},
-    ProtocolVersionId,
+    protocol_version::ProtocolSemanticVersion,
 };
 
 use crate::metrics::{CircuitLabels, PROVER_FRI_UTILS_METRICS};
@@ -28,7 +28,7 @@ pub async fn fetch_next_circuit(
     storage: &mut Connection<'_, Prover>,
     blob_store: &dyn ObjectStore,
     circuit_ids_for_round_to_be_proven: &[CircuitIdRoundTuple],
-    protocol_version: &ProtocolVersionId,
+    protocol_version: &ProtocolSemanticVersion,
 ) -> Option<ProverJob> {
     let pod_name = get_current_pod_name();
     let prover_job = match &circuit_ids_for_round_to_be_proven.is_empty() {
@@ -38,7 +38,7 @@ pub async fn fetch_next_circuit(
                 .fri_prover_jobs_dal()
                 .get_next_job_for_circuit_id_round(
                     circuit_ids_for_round_to_be_proven,
-                    protocol_version,
+                    *protocol_version,
                     &pod_name,
                 )
                 .await
@@ -47,7 +47,7 @@ pub async fn fetch_next_circuit(
             // Generalized prover: proving all circuits.
             storage
                 .fri_prover_jobs_dal()
-                .get_next_job(protocol_version, &pod_name)
+                .get_next_job(*protocol_version, &pod_name)
                 .await
         }
     }?;
diff --git a/prover/prover_version/Cargo.toml b/prover/prover_version/Cargo.toml
new file mode 100644
index 000000000000..0275b4169b72
--- /dev/null
+++ b/prover/prover_version/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "prover_version"
+version = "0.1.0"
+edition.workspace = true
+
+[dependencies]
+zksync_prover_fri_types.workspace = true
diff --git a/prover/prover_version/src/main.rs b/prover/prover_version/src/main.rs
new file mode 100644
index 000000000000..f4b52801820a
--- /dev/null
+++ b/prover/prover_version/src/main.rs
@@ -0,0 +1,5 @@
+use zksync_prover_fri_types::PROVER_PROTOCOL_SEMANTIC_VERSION;
+
+fn main() {
+    println!("{}", PROVER_PROTOCOL_SEMANTIC_VERSION);
+}
diff --git a/prover/rust-toolchain b/prover/rust-toolchain
index d7aace133ac0..5aaef38cd79d 100644
--- a/prover/rust-toolchain
+++ b/prover/rust-toolchain
@@ -1 +1 @@
-nightly-2024-02-01
+nightly-2024-05-07
diff --git a/prover/setup-data-gpu-keys.json b/prover/setup-data-gpu-keys.json
index 69bf0bc7e878..4acc51b9add0 100644
--- a/prover/setup-data-gpu-keys.json
+++ b/prover/setup-data-gpu-keys.json
@@ -1,5 +1,5 @@
 {
-  "us": "gs://matterlabs-setup-data-us/e2b0161-gpu/",
-  "europe": "gs://matterlabs-setup-data-europe/e2b0161-gpu/",
-  "asia": "gs://matterlabs-setup-data-asia/e2b0161-gpu/"
+  "us": "gs://matterlabs-setup-data-us/ffc5da2-gpu/",
+  "europe": "gs://matterlabs-setup-data-europe/ffc5da2-gpu/",
+  "asia": "gs://matterlabs-setup-data-asia/ffc5da2-gpu/"
 }
diff --git a/prover/setup.sh b/prover/setup.sh
index e755f5ae433a..2d546c1f8bd6 100755
--- a/prover/setup.sh
+++ b/prover/setup.sh
@@ -14,7 +14,6 @@ if [[ -z "${ZKSYNC_HOME}" ]]; then
 fi
 
 sed -i.backup 's/^proof_sending_mode=.*$/proof_sending_mode="OnlyRealProofs"/' ../etc/env/base/eth_sender.toml
-sed -i.backup 's/^proof_loading_mode=.*$/proof_loading_mode="FriProofFromGcs"/' ../etc/env/base/eth_sender.toml
 rm ../etc/env/base/eth_sender.toml.backup
 sed -i.backup 's/^setup_data_path=.*$/setup_data_path="vk_setup_data_generator_server_fri\/data\/"/' ../etc/env/base/fri_prover.toml
 rm ../etc/env/base/fri_prover.toml.backup
diff --git a/prover/vk_setup_data_generator_server_fri/Cargo.toml b/prover/vk_setup_data_generator_server_fri/Cargo.toml
index c7309ee98f37..edae9764438f 100644
--- a/prover/vk_setup_data_generator_server_fri/Cargo.toml
+++ b/prover/vk_setup_data_generator_server_fri/Cargo.toml
@@ -20,11 +20,12 @@ path = "src/lib.rs"
 
 
 [dependencies]
-vlog.workspace = true
+zksync_vlog.workspace = true
 zksync_types.workspace = true
+zksync_utils.workspace = true
 zksync_prover_fri_types.workspace = true
 zkevm_test_harness.workspace = true
-circuit_definitions = { workspace = true, features = [ "log_tracing" ] }
+circuit_definitions = { workspace = true, features = ["log_tracing"] }
 shivini = { workspace = true, optional = true }
 zksync_config.workspace = true
 zksync_env_config.workspace = true
@@ -44,6 +45,7 @@ toml_edit.workspace = true
 md5.workspace = true
 sha3.workspace = true
 hex.workspace = true
+indicatif.workspace = true
 
 [dev-dependencies]
 proptest.workspace = true
diff --git a/prover/vk_setup_data_generator_server_fri/README.md b/prover/vk_setup_data_generator_server_fri/README.md
index 6cdea0b87f33..d33323dd20bf 100644
--- a/prover/vk_setup_data_generator_server_fri/README.md
+++ b/prover/vk_setup_data_generator_server_fri/README.md
@@ -15,6 +15,9 @@ circuit changes), first please make sure that you have a CRS file (used for SNAR
 CRS_FILE=yyy ZKSYNC_HOME=xxx cargo run --release --bin key_generator generate-vk
 ```
 
+You can also generate multiple keys in parallel (to speed things up), with `--jobs` flag, but you need at least 30 GB of
+ram for each job.
+
 ### CRS FILE
 
 The SNARK VK generation requires the `CRS_FILE` environment variable to be present and point to the correct file. The
diff --git a/prover/vk_setup_data_generator_server_fri/data/commitments.json b/prover/vk_setup_data_generator_server_fri/data/commitments.json
index 1334d6a941a7..086609a5822b 100644
--- a/prover/vk_setup_data_generator_server_fri/data/commitments.json
+++ b/prover/vk_setup_data_generator_server_fri/data/commitments.json
@@ -1,6 +1,6 @@
 {
-  "leaf": "0x435202d277dd06ef3c64ddd99fda043fc27c2bd8b7c66882966840202c27f4f6",
+  "leaf": "0xf9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c6",
   "node": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
-  "scheduler": "0x6f7e6423c7241bb691c2ad291a8a3e8cb505091117ed8a38ade8f4224b8cf58e",
-  "snark_wrapper": "0x1d485be42d712856dfe85b3cf7823f020fa5f83cb41c83f9da307fdc2089beee"
+  "scheduler": "0xe6ba9d6b042440c480fa1c7182be32387db6e90281e82f37398d3f98f63f098a",
+  "snark_wrapper": "0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2"
 }
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin
index b0f524946ebb..b1623bfe3ef1 100644
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin and b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_3.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_3.bin
index 4dcba41fa7e7..5525db5ff390 100644
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_3.bin and b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_3.bin differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_6.bin b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_6.bin
index b8dbb8c2bda0..35060f77e1bf 100644
Binary files a/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_6.bin and b/prover/vk_setup_data_generator_server_fri/data/finalization_hints_basic_6.bin differ
diff --git a/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json b/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json
index ab950921b6cc..acb7e3fe8969 100644
--- a/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json
+++ b/prover/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json
@@ -6,16 +6,16 @@
   "gate_setup_commitments": [
     {
       "x": [
-        13368816467732756588,
-        12631704582998645112,
-        2875950984924293274,
-        3113194142004855172
+        14543631136906534221,
+        11532161447842416044,
+        11114175029926010938,
+        1228896787564295039
       ],
       "y": [
-        3570060617207608740,
-        2032397225743366002,
-        5866786775367305329,
-        1313634009443853971
+        13293602262342424489,
+        8897930584356943159,
+        13256028170406220369,
+        3214939367598363288
       ],
       "infinity": false
     },
@@ -96,16 +96,16 @@
     },
     {
       "x": [
-        13727181310656943815,
-        296737807969282193,
-        6059560013411781327,
-        1793671435315065066
+        9586697317366528906,
+        2325800863365957883,
+        1243781259615311278,
+        3048012003267036960
       ],
       "y": [
-        1522594187298952706,
-        6626811309287846888,
-        8870954808386738181,
-        171006237191164060
+        612821620743617231,
+        1510385666449513894,
+        9368337288452385056,
+        2949736812933507034
       ],
       "infinity": false
     },
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json
index c9e26fb48083..8459e87826ac 100644
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json
+++ b/prover/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json
@@ -19,19 +19,19 @@
       "public_inputs_locations": [
         [
           0,
-          1045271
+          1046957
         ],
         [
           1,
-          1045271
+          1046957
         ],
         [
           2,
-          1045271
+          1046957
         ],
         [
           3,
-          1045271
+          1046957
         ]
       ],
       "extra_constant_polys_for_selectors": 3,
@@ -183,100 +183,100 @@
     },
     "setup_merkle_tree_cap": [
       [
-        13896948611834593423,
-        10739171121598510037,
-        14644834046753564791,
-        4360843539773747427
+        9473487953399898748,
+        16270419805909860203,
+        7335367583540379607,
+        18438161812709418982
       ],
       [
-        8204948453085268400,
-        5108185186411680645,
-        17237345086095082613,
-        15598752761538039070
+        12967681057814187922,
+        15701035168973396898,
+        11259967584839810575,
+        10571912581839654023
       ],
       [
-        2435716904309846305,
-        9180607226658870953,
-        2889966903543001551,
-        12400444599683159672
+        5264981558950918922,
+        7322263530084687711,
+        17011319323793220700,
+        14479065901870485923
       ],
       [
-        8691596138818728983,
-        11698971554099221786,
-        8315617191876448467,
-        6538895242313168552
+        15574099641370951434,
+        17000829784989701584,
+        15964436826107516267,
+        11346203353481465805
       ],
       [
-        3514756029778769795,
-        3213896211356211770,
-        4206721448256756017,
-        10994873081142168370
+        5474255527556252767,
+        16570571942564149566,
+        11428025503403431038,
+        6617585440243326997
       ],
       [
-        9636234821773978855,
-        13423106705198543631,
-        11033759238703862309,
-        3693888045153294219
+        308081994977850819,
+        8729962239283422104,
+        14597407866734738386,
+        14829347258931409833
       ],
       [
-        17154881581580079047,
-        17638958840752522311,
-        11249541935180794823,
-        18306639190673569946
+        9980505926358439430,
+        4909215529832368544,
+        8351461288536129828,
+        1249767629546599012
       ],
       [
-        11697030042291776640,
-        8878944228016563318,
-        4821297323390991202,
-        7984276648782952956
+        1807216890691480940,
+        8617426931824195446,
+        11002408656746191939,
+        2928848780068318198
       ],
       [
-        911508924749467866,
-        3227909688206719884,
-        6228498707672435650,
-        8539337051830444419
+        11541179157141990516,
+        12173830690959139035,
+        2440341332114286947,
+        12109090346106141232
       ],
       [
-        4572358787068684706,
-        15154879951035409056,
-        3646158963885086788,
-        12085983065815184081
+        11418690736500468651,
+        16634379025633469741,
+        15202881082421411217,
+        1933046213639751324
       ],
       [
-        10318506905205877654,
-        17707694135228571707,
-        3525560955795132109,
-        9501758344190815997
+        7447003196248321129,
+        18332700323878037759,
+        9559830827790696535,
+        15476899088175820878
       ],
       [
-        5410481179644088449,
-        9056161267199703092,
-        13465530290682823967,
-        15289674919589521672
+        9516228739964317619,
+        3715247844046085602,
+        3402341140845153636,
+        6208479534561471430
       ],
       [
-        4965356010295770314,
-        17507071322248166319,
-        12076439523053350546,
-        18059347461308005529
+        13129761831635161708,
+        1199200173405945178,
+        2225893329254814674,
+        11792586660360798317
       ],
       [
-        1670681604092504759,
-        597441042450901284,
-        6484678487635716290,
-        2974179381928385844
+        11807698182439073980,
+        7978262413534788419,
+        11140621065717310105,
+        1380069160672719340
       ],
       [
-        18300503545648094088,
-        15364161994855546440,
-        9060954711396886167,
-        6277373194857930821
+        347840206922472862,
+        10448076973761280929,
+        6823062094681347787,
+        15218544951788424466
       ],
       [
-        7043660451869400465,
-        13221681766094587194,
-        17770633076997657669,
-        13192995018654752003
+        13614576575170767970,
+        7218359081103672230,
+        15716723129949529907,
+        15097061601049280170
       ]
     ]
   }
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json
index 2ae1dce0d2e7..a085b79504ec 100644
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json
+++ b/prover/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json
@@ -144,100 +144,100 @@
     },
     "setup_merkle_tree_cap": [
       [
-        12059164550219996047,
-        11105626949359396147,
-        12438953654881820144,
-        5104154953781364870
+        10947270532655187700,
+        2824991572523762771,
+        13615596050473868767,
+        13185513811434901410
       ],
       [
-        2105005144569375250,
-        1211319428263483699,
-        4239781947962897464,
-        14888323984135620168
+        1403066024412470424,
+        7403628415265471880,
+        5231148927787163551,
+        4862317795078250133
       ],
       [
-        9792106735756539890,
-        15469642840338350241,
-        6412488362254915518,
-        11120527522263070899
+        9444723235457698286,
+        6666195607730168525,
+        9540139468463085431,
+        16045569500261234177
       ],
       [
-        6304593188246367505,
-        13076602270154942667,
-        101585091788324701,
-        4865307427175472443
+        17041683534415813271,
+        9868391694892582185,
+        11009172258600308159,
+        1682379016388301111
       ],
       [
-        12831605828224830842,
-        12447441235424234327,
-        209314314232314816,
-        3195084990322310544
+        673575929868179342,
+        1280479814517716172,
+        3255842674330080843,
+        15576113586441062041
       ],
       [
-        4200415229738016165,
-        18023868833508597135,
-        11502597045537335019,
-        12426127690298678881
+        6501405739731783857,
+        6941183609866253948,
+        8323637924965974661,
+        8926663342378816425
       ],
       [
-        2685375449646102647,
-        17916562333104781191,
-        6797786122025721671,
-        8977688957186055616
+        1740635555764945925,
+        12831061716095734959,
+        13099489837942585615,
+        6785891322765618792
       ],
       [
-        14459479520271025251,
-        13837608928074760880,
-        11473879460062836448,
-        16169499404812456035
+        278979376052899040,
+        6862458721425122862,
+        5974109936879260639,
+        1618917119771730901
       ],
       [
-        11001478657283410955,
-        7934346385807058551,
-        337022880254275410,
-        3975761667247654139
+        3790997975893425636,
+        9565261943161534072,
+        11910106713159151135,
+        2348333029997593953
       ],
       [
-        5415001715756697397,
-        9218744596613678757,
-        14530574030068566411,
-        5029568508146526686
+        14422195181597270161,
+        1942766908056717849,
+        3544828563171648231,
+        3526535664690062134
       ],
       [
-        17995126181413879382,
-        7554432877574773963,
-        13623291603541315596,
-        13788214270174172994
+        17474569017414120910,
+        1427009951604714810,
+        839794372935607339,
+        7456670461652412084
       ],
       [
-        12377709188101312589,
-        1231009633868004415,
-        18408353864010093516,
-        10162893474217851227
+        2832143323012590843,
+        2783557137307254012,
+        11305596607970500418,
+        8903832011396430067
       ],
       [
-        2637176301229749389,
-        12696944238133752988,
-        16469954956630844651,
-        4570533793358995511
+        1229141482639469060,
+        13036708860601763713,
+        16189038352859413896,
+        2972971714624929388
       ],
       [
-        5577236847894521726,
-        5131052273988960899,
-        8105548435900180993,
-        13918071856308961737
+        6424394102717311719,
+        13901366742338775541,
+        11499799837818945935,
+        11960613886917250055
       ],
       [
-        7027824334761254437,
-        9759788573923463639,
-        4561369981388569411,
-        14620554023537126503
+        16202577049012830106,
+        9211014225973109582,
+        8846369759594335945,
+        9803309954098852271
       ],
       [
-        9404557864921945682,
-        3443447398219802873,
-        14881831082348597498,
-        17458411383681927208
+        8948966653817264713,
+        14787205102056055830,
+        12272040121420405091,
+        14183953866768246512
       ]
     ]
   }
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_basic_6_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_basic_6_key.json
index 48533211ab0c..0ce3b7e0ad2c 100644
--- a/prover/vk_setup_data_generator_server_fri/data/verification_basic_6_key.json
+++ b/prover/vk_setup_data_generator_server_fri/data/verification_basic_6_key.json
@@ -144,100 +144,100 @@
     },
     "setup_merkle_tree_cap": [
       [
-        7131095197302553268,
-        8153577698865827964,
-        4503618255465567901,
-        14277683095622422701
+        8551824724963469994,
+        3805878161473036328,
+        12287624679112288479,
+        17391807293808565280
       ],
       [
-        17227565432950328258,
-        3812763700819798255,
-        11013754802988076876,
-        6868705666417715458
+        14641308797322970882,
+        14461841141984705270,
+        7069951916111725461,
+        6344046415820809198
       ],
       [
-        6323710131523972374,
-        2634684603167736396,
-        18066615186100844391,
-        12905391948029250777
+        3959655336627577830,
+        14160576559610883307,
+        1654615872780870838,
+        9859258492918189521
       ],
       [
-        3492005229273374536,
-        6055742838160324534,
-        1795486371688618704,
-        13052026771106363342
+        13695996637388369049,
+        17084784733479748546,
+        3283082335329513810,
+        3512812257118968944
       ],
       [
-        10281812076992462791,
-        7165153365649379245,
-        13022274058059396511,
-        13989909544832134378
+        672761378629374990,
+        9044860720646768841,
+        16391996110350906506,
+        10603266852693349340
       ],
       [
-        12027415465257630320,
-        3276226892300848010,
-        8686471638009106913,
-        14892455799109213586
+        9064418935551444184,
+        4675957283674078319,
+        7068701468079564076,
+        2595868425825164314
       ],
       [
-        2589896055307349461,
-        2860115159278340436,
-        16194627146103061118,
-        7076143423549975584
+        3422287541611330393,
+        74447537744169495,
+        2212858865985693947,
+        8454892233786824279
       ],
       [
-        13667404340259521763,
-        6297649363425018745,
-        16167424072873520384,
-        3830963799067739016
+        12648222444378420441,
+        9651432601825335503,
+        5216401195457263092,
+        2794187433145411670
       ],
       [
-        16665883187665722508,
-        314738727176100190,
-        4253386482569091860,
-        1926299543937236525
+        6758738672410384355,
+        10481950526885856767,
+        17239134438512471237,
+        15725744325343831085
       ],
       [
-        7820355437968047327,
-        6794680285466534678,
-        2978730525228113593,
-        3621380956903574094
+        11622168208324357850,
+        3412092698576120542,
+        12104553732480469617,
+        8895237469767592503
       ],
       [
-        4838056840641790939,
-        16842388520310131551,
-        11612178730147038952,
-        2346195292789238934
+        6794091710445203510,
+        5294088036429630617,
+        11676383471860723257,
+        242243803797994924
       ],
       [
-        17810776396991797874,
-        12063662987004325494,
-        17932676844730723250,
-        14283996529720835225
+        15204662695233838380,
+        12860319709234294275,
+        11772590879404282998,
+        1921851587616916093
       ],
       [
-        4982429352434514173,
-        14856186579270143608,
-        4051922516960412257,
-        8367898317160268319
+        11037692172579264419,
+        15978184731486034645,
+        3006427844872258551,
+        2931858903926766395
       ],
       [
-        14584337208407353036,
-        15866593405986269360,
-        11704298830630250400,
-        14576621862375131798
+        6299103500630214151,
+        7558794188571788628,
+        3663895791634305168,
+        10052501694191557791
       ],
       [
-        3101118738129024336,
-        4028118980088627608,
-        9223187088487468736,
-        3845581921289713376
+        4757366744518669470,
+        7444042233140628233,
+        13416740467355068815,
+        8711015473246012573
       ],
       [
-        1013819453591993424,
-        13784105701097110976,
-        9114286772222497781,
-        10710488663310041007
+        1847698388432414514,
+        7490556930780792926,
+        2695937794693785244,
+        3200087500710114960
       ]
     ]
   }
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json
index a0b5f4dc2a1a..a44d59cd38ec 100644
--- a/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json
+++ b/prover/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json
@@ -162,100 +162,100 @@
     },
     "setup_merkle_tree_cap": [
       [
-        16637122201700666904,
-        16096177961445051893,
-        29921369246502916,
-        7081663818518879260
+        17855141276447231405,
+        7822266582101144460,
+        13588292742840523493,
+        6469182181208683317
       ],
       [
-        11594231648532461965,
-        6877842133915984296,
-        12101569804873186328,
-        10378900279152824246
+        4232699233227875249,
+        16903438402968182485,
+        6943950277201482792,
+        2110689468668186473
       ],
       [
-        14934233224062014457,
-        16228390430180690767,
-        11310878226276231404,
-        6294507946458813544
+        7707237321810352304,
+        6515546920961633488,
+        12952446233485170717,
+        15066548759710591627
       ],
       [
-        6892308590843217156,
-        801417349371938391,
-        11699036284028708357,
-        1748927113622089261
+        4639470535288257573,
+        9977204060471305820,
+        13620252730672745323,
+        13906174107064885101
       ],
       [
-        18338355950809952732,
-        11710422318728548532,
-        1196688901957572524,
-        14201102832826626476
+        3380569754818632951,
+        14592200377838954179,
+        4655944779251366596,
+        10461459338163125811
       ],
       [
-        14521967934740400643,
-        16322746494120556445,
-        1423446241659444210,
-        5533258729489882086
+        9505371692898482313,
+        17672643349055132324,
+        10968459678378506342,
+        7203066191514731188
       ],
       [
-        2104668635455499141,
-        9760579668021575508,
-        10792033802860084746,
-        11552335620516497152
+        6361719037117192382,
+        14180108541189529084,
+        6222651441291357456,
+        992683928102460932
       ],
       [
-        6637367361614444475,
-        6222657394665651854,
-        18443242564046402338,
-        43632887580443219
+        533421257849918809,
+        11687478703243746707,
+        17923492118938261966,
+        3240289105687966878
       ],
       [
-        14812768600843029336,
-        16369693338567302782,
-        8482627523265135843,
-        15253760541908921600
+        10537826768508055055,
+        12735025794843706714,
+        12285680957016823071,
+        10987522679748444515
       ],
       [
-        2168516069077541920,
-        8974645013487455356,
-        5195649777527498783,
-        17203080238375957203
+        13934405620933279246,
+        3346346012923536354,
+        13038612823504141140,
+        5021904630472945213
       ],
       [
-        16899871574049500447,
-        12714019117601868121,
-        17644682819012321875,
-        10168589949807903833
+        4317559511773342187,
+        9030560588429997541,
+        4631410576253261376,
+        9787322710458812055
       ],
       [
-        2193645619642803173,
-        5911915843989289398,
-        6702344234375465381,
-        18091726574029827295
+        6546515965342993735,
+        14693131313122528660,
+        17792579751764566634,
+        8313761089615939487
       ],
       [
-        17250593342478506173,
-        3435317197353311732,
-        5779050243213898470,
-        7047517810078155546
+        3974680093533741999,
+        14912060828934556038,
+        1881259422671526373,
+        12651251867986376553
       ],
       [
-        14334215910425020696,
-        9148519970897776727,
-        8757795765764985987,
-        2760081304892134608
+        4700501802410133974,
+        13415065184486663986,
+        2400366378830519355,
+        16672949145027127976
       ],
       [
-        6201482500923461511,
-        496724679826639745,
-        4796426599258811343,
-        1829750598185445210
+        14532304468096502099,
+        8898488667664282945,
+        421877734780369270,
+        18139574494023430530
       ],
       [
-        1247929356222703254,
-        4129145210611160084,
-        14505500221527580660,
-        16833361607460651248
+        2695266391937250139,
+        8565247931723474329,
+        8596490620847451819,
+        2058702883352054572
       ]
     ]
   }
diff --git a/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json b/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json
index b8fca7ef1355..8a52cc244bac 100644
--- a/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json
+++ b/prover/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json
@@ -170,100 +170,100 @@
     },
     "setup_merkle_tree_cap": [
       [
-        1842792708213407024,
-        17768065262719344405,
-        1344987477141188959,
-        18228595046030028662
+        9887208323851505217,
+        1123001217986730435,
+        343259880253311786,
+        2151140818520262118
       ],
       [
-        13803571116566487478,
-        12994119104262096979,
-        10609596029886516698,
-        16172187910044755807
+        12495904531249642919,
+        17232615797756148395,
+        3335544159309667561,
+        6261962261160675850
       ],
       [
-        1572837631405449254,
-        7404337722774102400,
-        17826561203238235300,
-        10837464774980358157
+        3290174806954782361,
+        3957604867997030178,
+        12129129725630125865,
+        1636089896333385634
       ],
       [
-        15448845058492100329,
-        9630467830284678702,
-        590458303761052737,
-        17354522675507966570
+        14645858759272203991,
+        11653487901803110416,
+        2499237237036147984,
+        1841727833267838231
       ],
       [
-        12090432521973519453,
-        11384639319130135828,
-        5744514655315607980,
-        8093729993937930757
+        18193008520821522692,
+        14508611443656176962,
+        15201308762805005611,
+        16051075400380887227
       ],
       [
-        2504031844458294804,
-        5495212980030716715,
-        5040853644541952178,
-        3356806049239678871
+        4504987266706704494,
+        7397695837427186224,
+        10067172051000661467,
+        5044520361343796759
       ],
       [
-        7044158981580509147,
-        13727190978840595365,
-        9255016019459860597,
-        17336487054836554430
+        9408005523417633181,
+        14924548137262927482,
+        8927260223716946348,
+        25087104176919469
       ],
       [
-        15774669166292606120,
-        11506439664948419473,
-        12709680056113934060,
-        4288810858055124347
+        11857324568001808264,
+        5783626311717767938,
+        10769426771780222703,
+        8523712547334248178
       ],
       [
-        11001333916417947837,
-        11007573726737854186,
-        1685317678795931152,
-        2581926991156931577
+        18394924697039022030,
+        3773697459649116941,
+        6013511991919985339,
+        17810626771729638933
       ],
       [
-        1835291101066597053,
-        6355542961732767747,
-        11604064932232122633,
-        17563796470270573469
+        13290121767754155136,
+        11225142773614876536,
+        4764911669339622945,
+        17476639133556434478
       ],
       [
-        16983493011447445991,
-        3016361154565323214,
-        934714292916714150,
-        9439803100164300338
+        11822797557540925718,
+        17521847674855164779,
+        18126641713175128985,
+        3215884914057380988
       ],
       [
-        11203175315803696254,
-        13994255921453573876,
-        9405699922159170614,
-        15312284811164690813
+        15220380051263546850,
+        7948573237324556416,
+        264360501330239312,
+        16455579027557250339
       ],
       [
-        10036928730814846220,
-        1062731098396649538,
-        4406448292106294725,
-        2644270802592737724
+        17738768733790921549,
+        4021891743990340907,
+        17352941271057641152,
+        15584530612705924787
       ],
       [
-        11294536330673152938,
-        6998428121249502994,
-        5542721920531076441,
-        4599048605056963890
+        7157587680183062137,
+        8837818432071888650,
+        16467824236289155049,
+        17557580094049845697
       ],
       [
-        17309904099287583540,
-        15082464639647121529,
-        15926432331705686711,
-        18031462177963993587
+        15526977922222496027,
+        5885713491624121557,
+        8813450728670527813,
+        10234120825800411733
       ],
       [
-        128541500209130357,
-        18067769474931571841,
-        6775975813851700220,
-        14438081036789753590
+        12554317685609787988,
+        4789370247234643566,
+        16370523223191414986,
+        9108687955872827734
       ]
     ]
   }
diff --git a/prover/vk_setup_data_generator_server_fri/historical_data/0.24.0/commitments.json b/prover/vk_setup_data_generator_server_fri/historical_data/0.24.0/commitments.json
new file mode 100644
index 000000000000..9750fedf378b
--- /dev/null
+++ b/prover/vk_setup_data_generator_server_fri/historical_data/0.24.0/commitments.json
@@ -0,0 +1,6 @@
+{
+  "leaf": "0xffb19d007c67b9000b40b372e7a7a55a47d11c92588515598d6cad4052c75ebb",
+  "node": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+  "scheduler": "0x712bb009b5d5dc81c79f827ca0abff87b43506a8efed6028a818911d4b1b521f",
+  "snark_wrapper": "0x1e2d8304351d4667f0e13b0c51b30538f4dc6ece2c457babd03a9f3a1ec523b3"
+}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/historical_data/0.24.0/snark_verification_scheduler_key.json b/prover/vk_setup_data_generator_server_fri/historical_data/0.24.0/snark_verification_scheduler_key.json
new file mode 100644
index 000000000000..0adf6c743636
--- /dev/null
+++ b/prover/vk_setup_data_generator_server_fri/historical_data/0.24.0/snark_verification_scheduler_key.json
@@ -0,0 +1,399 @@
+{
+  "n": 16777215,
+  "num_inputs": 1,
+  "state_width": 4,
+  "num_witness_polys": 0,
+  "gate_setup_commitments": [
+    {
+      "x": [
+        8178243913255437111,
+        9398348572260555091,
+        14657992099509887799,
+        1030823578680699945
+      ],
+      "y": [
+        8062596345722628335,
+        5140058053345046852,
+        9673165209890295067,
+        2913587396604797449
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        11488992528554025682,
+        12016824828223971094,
+        11942004360057333370,
+        316831626296641307
+      ],
+      "y": [
+        304673622018339856,
+        7139037552557818730,
+        12475560967982555143,
+        1055588351918295250
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        2274984630539920017,
+        5398167177582250136,
+        16440396753384808945,
+        1037682586893548769
+      ],
+      "y": [
+        10168660308952593373,
+        16526369642614237721,
+        569062739734175056,
+        155645558476901406
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        14005362797509427677,
+        2662603874351919260,
+        14261489165672308143,
+        1470528288349794782
+      ],
+      "y": [
+        11144229651170108862,
+        11439490264313454962,
+        114993091474760680,
+        1037267173208738614
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        10726125240955612787,
+        1916320162213728495,
+        1058608086768277905,
+        1651114031905829493
+      ],
+      "y": [
+        13237242732587628574,
+        4774776044666137690,
+        14401013098807103799,
+        2514139699916115771
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        14434760601334248377,
+        5316938318287831815,
+        6221098547630910324,
+        980422841280734466
+      ],
+      "y": [
+        9201886393750447942,
+        3840149540273146267,
+        18179910191622136829,
+        1563809864380914603
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        5606078582690972844,
+        9347237689207090072,
+        10709271382733671055,
+        2779756728641347707
+      ],
+      "y": [
+        4702897423318899131,
+        17259910834137606252,
+        13698546488864641154,
+        589739430090735278
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        11830690209042008764,
+        11761396005838073769,
+        18271188400274886574,
+        2896734446482773484
+      ],
+      "y": [
+        1890606551566554401,
+        10220931290312275762,
+        3256711195869515344,
+        2466626485328709457
+      ],
+      "infinity": false
+    }
+  ],
+  "gate_selectors_commitments": [
+    {
+      "x": [
+        10865727529243127085,
+        4083978853392244827,
+        14303622309482785753,
+        2263042021033673595
+      ],
+      "y": [
+        3019601017411802529,
+        880444282195426618,
+        9998743525359587628,
+        2891421025832200233
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        5208608554346323426,
+        8575970970223832576,
+        2966209169082345602,
+        239576408267301488
+      ],
+      "y": [
+        17715084817752316452,
+        2726293100894160682,
+        17920596859559317135,
+        3485576345363305439
+      ],
+      "infinity": false
+    }
+  ],
+  "permutation_commitments": [
+    {
+      "x": [
+        14761045450946573029,
+        17157644513453531531,
+        2555518804134782053,
+        1415819224310783987
+      ],
+      "y": [
+        17265629196749977462,
+        4128711855633066822,
+        8435602817910411328,
+        1408116296902303196
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        3307267823832528482,
+        2406249680085831639,
+        9091964031261402109,
+        2846274000290842933
+      ],
+      "y": [
+        17374905554931807856,
+        6690578002079222163,
+        11809376320193686210,
+        2676076649992974574
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        3159118708748226574,
+        5508845413629697013,
+        13350869305506486049,
+        689297560178790472
+      ],
+      "y": [
+        15696011303896469684,
+        12551611148155235140,
+        14438660833518031207,
+        425021756161657108
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        18349397811516917436,
+        4473982696343317918,
+        13070312540813307819,
+        2109468484629113245
+      ],
+      "y": [
+        13254534552549721008,
+        17388411854346636521,
+        17875890960520499518,
+        1062184221180884481
+      ],
+      "infinity": false
+    }
+  ],
+  "total_lookup_entries_length": 1787472,
+  "lookup_selector_commitment": {
+    "x": [
+      9324906502432882695,
+      14977861238256290580,
+      12538013124354067293,
+      3408438202312564138
+    ],
+    "y": [
+      14942105932194201701,
+      12210090881357612547,
+      14774705021036784261,
+      2531694948512337448
+    ],
+    "infinity": false
+  },
+  "lookup_tables_commitments": [
+    {
+      "x": [
+        10873859091125335643,
+        3906092213625635374,
+        17046157606087980048,
+        3193402705223440293
+      ],
+      "y": [
+        10158946293873382504,
+        2171386304067884865,
+        6918663094168980658,
+        350601565475975409
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        12822112641313049260,
+        3646552465186399021,
+        10324071010773924047,
+        2209084192380614662
+      ],
+      "y": [
+        11045141628975531869,
+        12589678537679955590,
+        3065046617868727674,
+        2099447669854151830
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        11395032673621937545,
+        3000063650268118516,
+        7857619430005721792,
+        805706808484810738
+      ],
+      "y": [
+        6817063666434679427,
+        1646386051225388537,
+        4677946977082722827,
+        1369650305976868514
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        2885179371868476351,
+        159944842081142878,
+        6092294387055034894,
+        213843603626505240
+      ],
+      "y": [
+        11868113133779277990,
+        8509646480531194854,
+        14088068011597639414,
+        707070630614027545
+      ],
+      "infinity": false
+    }
+  ],
+  "lookup_table_type_commitment": {
+    "x": [
+      1732877442096985191,
+      7537030715658833452,
+      14073502080301311448,
+      2178792007727681099
+    ],
+    "y": [
+      8513095304113652904,
+      6581396660744182779,
+      13939755637576387431,
+      2477157044961106453
+    ],
+    "infinity": false
+  },
+  "non_residues": [
+    [
+      5,
+      0,
+      0,
+      0
+    ],
+    [
+      7,
+      0,
+      0,
+      0
+    ],
+    [
+      10,
+      0,
+      0,
+      0
+    ]
+  ],
+  "g2_elements": [
+    {
+      "x": {
+        "c0": [
+          5106727233969649389,
+          7440829307424791261,
+          4785637993704342649,
+          1729627375292849782
+        ],
+        "c1": [
+          10945020018377822914,
+          17413811393473931026,
+          8241798111626485029,
+          1841571559660931130
+        ]
+      },
+      "y": {
+        "c0": [
+          5541340697920699818,
+          16416156555105522555,
+          5380518976772849807,
+          1353435754470862315
+        ],
+        "c1": [
+          6173549831154472795,
+          13567992399387660019,
+          17050234209342075797,
+          650358724130500725
+        ]
+      },
+      "infinity": false
+    },
+    {
+      "x": {
+        "c0": [
+          9089143573911733168,
+          11482283522806384523,
+          13585589533905622862,
+          79029415676722370
+        ],
+        "c1": [
+          5692040832573735873,
+          16884514497384809355,
+          16717166481813659368,
+          2742131088506155463
+        ]
+      },
+      "y": {
+        "c0": [
+          9604638503594647125,
+          1289961608472612514,
+          6217038149984805214,
+          2521661352385209130
+        ],
+        "c1": [
+          17168069778630926308,
+          11309277837895768996,
+          15154989611154567813,
+          359271377050603491
+        ]
+      },
+      "infinity": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/historical_data/0.24.1/commitments.json b/prover/vk_setup_data_generator_server_fri/historical_data/0.24.1/commitments.json
new file mode 100644
index 000000000000..086609a5822b
--- /dev/null
+++ b/prover/vk_setup_data_generator_server_fri/historical_data/0.24.1/commitments.json
@@ -0,0 +1,6 @@
+{
+  "leaf": "0xf9664f4324c1400fa5c3822d667f30e873f53f1b8033180cd15fe41c1e2355c6",
+  "node": "0xf520cd5b37e74e19fdb369c8d676a04dce8a19457497ac6686d2bb95d94109c8",
+  "scheduler": "0xe6ba9d6b042440c480fa1c7182be32387db6e90281e82f37398d3f98f63f098a",
+  "snark_wrapper": "0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2"
+}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/historical_data/0.24.1/snark_verification_scheduler_key.json b/prover/vk_setup_data_generator_server_fri/historical_data/0.24.1/snark_verification_scheduler_key.json
new file mode 100644
index 000000000000..acb7e3fe8969
--- /dev/null
+++ b/prover/vk_setup_data_generator_server_fri/historical_data/0.24.1/snark_verification_scheduler_key.json
@@ -0,0 +1,399 @@
+{
+  "n": 16777215,
+  "num_inputs": 1,
+  "state_width": 4,
+  "num_witness_polys": 0,
+  "gate_setup_commitments": [
+    {
+      "x": [
+        14543631136906534221,
+        11532161447842416044,
+        11114175029926010938,
+        1228896787564295039
+      ],
+      "y": [
+        13293602262342424489,
+        8897930584356943159,
+        13256028170406220369,
+        3214939367598363288
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        11488992528554025682,
+        12016824828223971094,
+        11942004360057333370,
+        316831626296641307
+      ],
+      "y": [
+        304673622018339856,
+        7139037552557818730,
+        12475560967982555143,
+        1055588351918295250
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        2274984630539920017,
+        5398167177582250136,
+        16440396753384808945,
+        1037682586893548769
+      ],
+      "y": [
+        10168660308952593373,
+        16526369642614237721,
+        569062739734175056,
+        155645558476901406
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        14005362797509427677,
+        2662603874351919260,
+        14261489165672308143,
+        1470528288349794782
+      ],
+      "y": [
+        11144229651170108862,
+        11439490264313454962,
+        114993091474760680,
+        1037267173208738614
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        10726125240955612787,
+        1916320162213728495,
+        1058608086768277905,
+        1651114031905829493
+      ],
+      "y": [
+        13237242732587628574,
+        4774776044666137690,
+        14401013098807103799,
+        2514139699916115771
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        14434760601334248377,
+        5316938318287831815,
+        6221098547630910324,
+        980422841280734466
+      ],
+      "y": [
+        9201886393750447942,
+        3840149540273146267,
+        18179910191622136829,
+        1563809864380914603
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        9586697317366528906,
+        2325800863365957883,
+        1243781259615311278,
+        3048012003267036960
+      ],
+      "y": [
+        612821620743617231,
+        1510385666449513894,
+        9368337288452385056,
+        2949736812933507034
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        11830690209042008764,
+        11761396005838073769,
+        18271188400274886574,
+        2896734446482773484
+      ],
+      "y": [
+        1890606551566554401,
+        10220931290312275762,
+        3256711195869515344,
+        2466626485328709457
+      ],
+      "infinity": false
+    }
+  ],
+  "gate_selectors_commitments": [
+    {
+      "x": [
+        10865727529243127085,
+        4083978853392244827,
+        14303622309482785753,
+        2263042021033673595
+      ],
+      "y": [
+        3019601017411802529,
+        880444282195426618,
+        9998743525359587628,
+        2891421025832200233
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        5208608554346323426,
+        8575970970223832576,
+        2966209169082345602,
+        239576408267301488
+      ],
+      "y": [
+        17715084817752316452,
+        2726293100894160682,
+        17920596859559317135,
+        3485576345363305439
+      ],
+      "infinity": false
+    }
+  ],
+  "permutation_commitments": [
+    {
+      "x": [
+        14761045450946573029,
+        17157644513453531531,
+        2555518804134782053,
+        1415819224310783987
+      ],
+      "y": [
+        17265629196749977462,
+        4128711855633066822,
+        8435602817910411328,
+        1408116296902303196
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        3307267823832528482,
+        2406249680085831639,
+        9091964031261402109,
+        2846274000290842933
+      ],
+      "y": [
+        17374905554931807856,
+        6690578002079222163,
+        11809376320193686210,
+        2676076649992974574
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        3159118708748226574,
+        5508845413629697013,
+        13350869305506486049,
+        689297560178790472
+      ],
+      "y": [
+        15696011303896469684,
+        12551611148155235140,
+        14438660833518031207,
+        425021756161657108
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        18349397811516917436,
+        4473982696343317918,
+        13070312540813307819,
+        2109468484629113245
+      ],
+      "y": [
+        13254534552549721008,
+        17388411854346636521,
+        17875890960520499518,
+        1062184221180884481
+      ],
+      "infinity": false
+    }
+  ],
+  "total_lookup_entries_length": 1787472,
+  "lookup_selector_commitment": {
+    "x": [
+      9324906502432882695,
+      14977861238256290580,
+      12538013124354067293,
+      3408438202312564138
+    ],
+    "y": [
+      14942105932194201701,
+      12210090881357612547,
+      14774705021036784261,
+      2531694948512337448
+    ],
+    "infinity": false
+  },
+  "lookup_tables_commitments": [
+    {
+      "x": [
+        10873859091125335643,
+        3906092213625635374,
+        17046157606087980048,
+        3193402705223440293
+      ],
+      "y": [
+        10158946293873382504,
+        2171386304067884865,
+        6918663094168980658,
+        350601565475975409
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        12822112641313049260,
+        3646552465186399021,
+        10324071010773924047,
+        2209084192380614662
+      ],
+      "y": [
+        11045141628975531869,
+        12589678537679955590,
+        3065046617868727674,
+        2099447669854151830
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        11395032673621937545,
+        3000063650268118516,
+        7857619430005721792,
+        805706808484810738
+      ],
+      "y": [
+        6817063666434679427,
+        1646386051225388537,
+        4677946977082722827,
+        1369650305976868514
+      ],
+      "infinity": false
+    },
+    {
+      "x": [
+        2885179371868476351,
+        159944842081142878,
+        6092294387055034894,
+        213843603626505240
+      ],
+      "y": [
+        11868113133779277990,
+        8509646480531194854,
+        14088068011597639414,
+        707070630614027545
+      ],
+      "infinity": false
+    }
+  ],
+  "lookup_table_type_commitment": {
+    "x": [
+      1732877442096985191,
+      7537030715658833452,
+      14073502080301311448,
+      2178792007727681099
+    ],
+    "y": [
+      8513095304113652904,
+      6581396660744182779,
+      13939755637576387431,
+      2477157044961106453
+    ],
+    "infinity": false
+  },
+  "non_residues": [
+    [
+      5,
+      0,
+      0,
+      0
+    ],
+    [
+      7,
+      0,
+      0,
+      0
+    ],
+    [
+      10,
+      0,
+      0,
+      0
+    ]
+  ],
+  "g2_elements": [
+    {
+      "x": {
+        "c0": [
+          5106727233969649389,
+          7440829307424791261,
+          4785637993704342649,
+          1729627375292849782
+        ],
+        "c1": [
+          10945020018377822914,
+          17413811393473931026,
+          8241798111626485029,
+          1841571559660931130
+        ]
+      },
+      "y": {
+        "c0": [
+          5541340697920699818,
+          16416156555105522555,
+          5380518976772849807,
+          1353435754470862315
+        ],
+        "c1": [
+          6173549831154472795,
+          13567992399387660019,
+          17050234209342075797,
+          650358724130500725
+        ]
+      },
+      "infinity": false
+    },
+    {
+      "x": {
+        "c0": [
+          9089143573911733168,
+          11482283522806384523,
+          13585589533905622862,
+          79029415676722370
+        ],
+        "c1": [
+          5692040832573735873,
+          16884514497384809355,
+          16717166481813659368,
+          2742131088506155463
+        ]
+      },
+      "y": {
+        "c0": [
+          9604638503594647125,
+          1289961608472612514,
+          6217038149984805214,
+          2521661352385209130
+        ],
+        "c1": [
+          17168069778630926308,
+          11309277837895768996,
+          15154989611154567813,
+          359271377050603491
+        ]
+      },
+      "infinity": false
+    }
+  ]
+}
\ No newline at end of file
diff --git a/prover/vk_setup_data_generator_server_fri/historical_data/README.md b/prover/vk_setup_data_generator_server_fri/historical_data/README.md
index 8473de8fa6de..22df8acd3384 100644
--- a/prover/vk_setup_data_generator_server_fri/historical_data/README.md
+++ b/prover/vk_setup_data_generator_server_fri/historical_data/README.md
@@ -9,3 +9,6 @@ version.
 - 21 - blobs - 1.4.2
 - 22 - fix - 1.4.2
 - 23 - 16 blobs + AA hashes + shared bridge - 1.5.0
+- 24 - 23 + fixes
+
+And from version 24, we switched to semver (so 0.24.0, 0.24.1 etc).
diff --git a/prover/vk_setup_data_generator_server_fri/src/commitment_utils.rs b/prover/vk_setup_data_generator_server_fri/src/commitment_utils.rs
index 935d06460181..58fd36ab4a59 100644
--- a/prover/vk_setup_data_generator_server_fri/src/commitment_utils.rs
+++ b/prover/vk_setup_data_generator_server_fri/src/commitment_utils.rs
@@ -1,4 +1,4 @@
-use std::str::FromStr;
+use std::{str::FromStr, sync::Mutex};
 
 use anyhow::Context as _;
 use hex::ToHex;
@@ -22,9 +22,14 @@ use crate::{
     VkCommitments,
 };
 
+static KEYSTORE: Lazy<Mutex<Option<Keystore>>> = Lazy::new(|| Mutex::new(None));
+
 lazy_static! {
     // TODO: do not initialize a static const with data read in runtime.
-    static ref COMMITMENTS: Lazy<L1VerifierConfig> = Lazy::new(|| { circuit_commitments(&Keystore::default()).unwrap() });
+    static ref COMMITMENTS: Lazy<L1VerifierConfig> = Lazy::new(|| {
+        let keystore = KEYSTORE.lock().unwrap().clone().unwrap_or_default();
+        circuit_commitments(&keystore).unwrap()
+    });
 }
 
 fn circuit_commitments(keystore: &Keystore) -> anyhow::Result<L1VerifierConfig> {
@@ -97,14 +102,19 @@ pub fn generate_commitments(keystore: &Keystore) -> anyhow::Result<VkCommitments
     Ok(result)
 }
 
-pub fn get_cached_commitments() -> L1VerifierConfig {
+pub fn get_cached_commitments(setup_data_path: Option<String>) -> L1VerifierConfig {
+    if let Some(setup_data_path) = setup_data_path {
+        let keystore = Keystore::new_with_setup_data_path(setup_data_path);
+        let mut keystore_lock = KEYSTORE.lock().unwrap();
+        *keystore_lock = Some(keystore);
+    }
     tracing::info!("Using cached commitments {:?}", **COMMITMENTS);
     **COMMITMENTS
 }
 
 #[test]
 fn test_get_cached_commitments() {
-    let commitments = get_cached_commitments();
+    let commitments = get_cached_commitments(None);
     assert_eq!(
         H256::zero(),
         commitments.params.recursion_circuits_set_vks_hash
diff --git a/prover/vk_setup_data_generator_server_fri/src/keystore.rs b/prover/vk_setup_data_generator_server_fri/src/keystore.rs
index 21ca42ba3a38..70aaff9fc4a4 100644
--- a/prover/vk_setup_data_generator_server_fri/src/keystore.rs
+++ b/prover/vk_setup_data_generator_server_fri/src/keystore.rs
@@ -1,7 +1,7 @@
 use std::{
     fs::{self, File},
     io::Read,
-    path::Path,
+    path::{Path, PathBuf},
 };
 
 use anyhow::Context as _;
@@ -23,7 +23,7 @@ use zksync_types::basic_fri_types::AggregationRound;
 
 #[cfg(feature = "gpu")]
 use crate::GoldilocksGpuProverSetupData;
-use crate::{GoldilocksProverSetupData, VkCommitments};
+use crate::{utils::core_workspace_dir_or_current_dir, GoldilocksProverSetupData, VkCommitments};
 
 pub enum ProverServiceDataType {
     VerificationKey,
@@ -36,25 +36,33 @@ pub enum ProverServiceDataType {
 /// There are 2 types:
 /// - small verification, finalization keys (used only during verification)
 /// - large setup keys, used during proving.
+#[derive(Clone)]
 pub struct Keystore {
     /// Directory to store all the small keys.
-    basedir: String,
+    basedir: PathBuf,
     /// Directory to store large setup keys.
     setup_data_path: Option<String>,
 }
 
-fn get_base_path_from_env() -> String {
-    let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| "/".into());
-    format!(
-        "{}/prover/vk_setup_data_generator_server_fri/data",
-        zksync_home
-    )
+fn get_base_path() -> PathBuf {
+    let path = core_workspace_dir_or_current_dir();
+
+    let new_path = path.join("prover/vk_setup_data_generator_server_fri/data");
+    if new_path.exists() {
+        return new_path;
+    }
+
+    let mut components = path.components();
+    components.next_back().unwrap();
+    components
+        .as_path()
+        .join("prover/vk_setup_data_generator_server_fri/data")
 }
 
 impl Default for Keystore {
     fn default() -> Self {
         Self {
-            basedir: get_base_path_from_env(),
+            basedir: get_base_path(),
             setup_data_path: Some(
                 FriProverConfig::from_env()
                     .expect("FriProverConfig::from_env()")
@@ -67,20 +75,28 @@ impl Default for Keystore {
 impl Keystore {
     /// Base-dir is the location of smaller keys (like verification keys and finalization hints).
     /// Setup data path is used for the large setup keys.
-    pub fn new(basedir: String, setup_data_path: String) -> Self {
+    pub fn new(basedir: PathBuf, setup_data_path: String) -> Self {
         Keystore {
             basedir,
             setup_data_path: Some(setup_data_path),
         }
     }
-    pub fn new_with_optional_setup_path(basedir: String, setup_data_path: Option<String>) -> Self {
+
+    pub fn new_with_optional_setup_path(basedir: PathBuf, setup_data_path: Option<String>) -> Self {
         Keystore {
             basedir,
             setup_data_path,
         }
     }
 
-    pub fn get_base_path(&self) -> &str {
+    pub fn new_with_setup_data_path(setup_data_path: String) -> Self {
+        Keystore {
+            basedir: get_base_path(),
+            setup_data_path: Some(setup_data_path),
+        }
+    }
+
+    pub fn get_base_path(&self) -> &PathBuf {
         &self.basedir
     }
 
@@ -88,43 +104,49 @@ impl Keystore {
         &self,
         key: ProverServiceDataKey,
         service_data_type: ProverServiceDataType,
-    ) -> String {
+    ) -> PathBuf {
         let name = key.name();
         match service_data_type {
             ProverServiceDataType::VerificationKey => {
-                format!("{}/verification_{}_key.json", self.basedir, name)
-            }
-            ProverServiceDataType::SetupData => {
-                format!(
-                    "{}/setup_{}_data.bin",
-                    self.setup_data_path
-                        .as_ref()
-                        .expect("Setup data path not set"),
-                    name
-                )
-            }
-            ProverServiceDataType::FinalizationHints => {
-                format!("{}/finalization_hints_{}.bin", self.basedir, name)
-            }
-            ProverServiceDataType::SnarkVerificationKey => {
-                format!("{}/snark_verification_{}_key.json", self.basedir, name)
+                self.basedir.join(format!("verification_{}_key.json", name))
             }
+            ProverServiceDataType::SetupData => PathBuf::from(format!(
+                "{}/setup_{}_data.bin",
+                self.setup_data_path
+                    .as_ref()
+                    .expect("Setup data path not set"),
+                name
+            )),
+            ProverServiceDataType::FinalizationHints => self
+                .basedir
+                .join(format!("finalization_hints_{}.bin", name)),
+            ProverServiceDataType::SnarkVerificationKey => self
+                .basedir
+                .join(format!("snark_verification_{}_key.json", name)),
         }
     }
 
-    fn load_json_from_file<T: for<'a> Deserialize<'a>>(filepath: String) -> anyhow::Result<T> {
+    fn load_json_from_file<T: for<'a> Deserialize<'a>>(
+        filepath: impl AsRef<Path> + std::fmt::Debug,
+    ) -> anyhow::Result<T> {
         let text = std::fs::read_to_string(&filepath)
-            .with_context(|| format!("Failed reading verification key from path: {filepath}"))?;
-        serde_json::from_str::<T>(&text)
-            .with_context(|| format!("Failed deserializing verification key from path: {filepath}"))
+            .with_context(|| format!("Failed reading verification key from path: {filepath:?}"))?;
+        serde_json::from_str::<T>(&text).with_context(|| {
+            format!("Failed deserializing verification key from path: {filepath:?}")
+        })
     }
-    fn save_json_pretty<T: Serialize>(filepath: String, data: &T) -> anyhow::Result<()> {
+    fn save_json_pretty<T: Serialize>(
+        filepath: impl AsRef<Path> + std::fmt::Debug,
+        data: &T,
+    ) -> anyhow::Result<()> {
         std::fs::write(&filepath, serde_json::to_string_pretty(data).unwrap())
-            .with_context(|| format!("writing to '{filepath}' failed"))
+            .with_context(|| format!("writing to '{filepath:?}' failed"))
     }
 
-    fn load_bincode_from_file<T: for<'a> Deserialize<'a>>(filepath: String) -> anyhow::Result<T> {
-        let mut file = File::open(filepath.clone())
+    fn load_bincode_from_file<T: for<'a> Deserialize<'a>>(
+        filepath: impl AsRef<Path> + std::fmt::Debug,
+    ) -> anyhow::Result<T> {
+        let mut file = File::open(&filepath)
             .with_context(|| format!("Failed reading setup-data from path: {filepath:?}"))?;
         let mut buffer = Vec::new();
         file.read_to_end(&mut buffer).with_context(|| {
@@ -166,7 +188,7 @@ impl Keystore {
             ProverServiceDataKey::new(vk.numeric_circuit_type(), AggregationRound::BasicCircuits),
             ProverServiceDataType::VerificationKey,
         );
-        tracing::info!("saving basic verification key to: {}", filepath);
+        tracing::info!("saving basic verification key to: {:?}", filepath);
         Self::save_json_pretty(filepath, &vk)
     }
 
@@ -178,7 +200,7 @@ impl Keystore {
             ProverServiceDataKey::new_recursive(vk.numeric_circuit_type()),
             ProverServiceDataType::VerificationKey,
         );
-        tracing::info!("saving recursive layer verification key to: {}", filepath);
+        tracing::info!("saving recursive layer verification key to: {:?}", filepath);
         Self::save_json_pretty(filepath, &vk)
     }
 
@@ -193,7 +215,7 @@ impl Keystore {
     ) -> anyhow::Result<()> {
         let filepath = self.get_file_path(key.clone(), ProverServiceDataType::FinalizationHints);
 
-        tracing::info!("saving finalization hints for {:?} to: {}", key, filepath);
+        tracing::info!("saving finalization hints for {:?} to: {:?}", key, filepath);
         let serialized =
             bincode::serialize(&hint).context("Failed to serialize finalization hints")?;
         fs::write(filepath, serialized).context("Failed to write finalization hints to file")
@@ -227,8 +249,9 @@ impl Keystore {
             ProverServiceDataKey::snark(),
             ProverServiceDataType::SnarkVerificationKey,
         );
-        std::fs::read_to_string(&filepath)
-            .with_context(|| format!("Failed reading Snark verification key from path: {filepath}"))
+        std::fs::read_to_string(&filepath).with_context(|| {
+            format!("Failed reading Snark verification key from path: {filepath:?}")
+        })
     }
 
     pub fn save_snark_verification_key(&self, vk: ZkSyncSnarkWrapperVK) -> anyhow::Result<()> {
@@ -236,7 +259,7 @@ impl Keystore {
             ProverServiceDataKey::snark(),
             ProverServiceDataType::SnarkVerificationKey,
         );
-        tracing::info!("saving snark verification key to: {}", filepath);
+        tracing::info!("saving snark verification key to: {:?}", filepath);
         Self::save_json_pretty(filepath, &vk.into_inner())
     }
 
@@ -256,7 +279,7 @@ impl Keystore {
         file.read_to_end(&mut buffer).with_context(|| {
             format!("Failed reading setup-data to buffer from path: {filepath:?}")
         })?;
-        tracing::info!("loading {:?} setup data from path: {}", key, filepath);
+        tracing::info!("loading {:?} setup data from path: {:?}", key, filepath);
         bincode::deserialize::<GoldilocksProverSetupData>(&buffer).with_context(|| {
             format!("Failed deserializing setup-data at path: {filepath:?} for circuit: {key:?}")
         })
@@ -275,7 +298,7 @@ impl Keystore {
         file.read_to_end(&mut buffer).with_context(|| {
             format!("Failed reading setup-data to buffer from path: {filepath:?}")
         })?;
-        tracing::info!("loading {:?} setup data from path: {}", key, filepath);
+        tracing::info!("loading {:?} setup data from path: {:?}", key, filepath);
         bincode::deserialize::<GoldilocksGpuProverSetupData>(&buffer).with_context(|| {
             format!("Failed deserializing setup-data at path: {filepath:?} for circuit: {key:?}")
         })
@@ -291,7 +314,7 @@ impl Keystore {
         serialized_setup_data: &Vec<u8>,
     ) -> anyhow::Result<()> {
         let filepath = self.get_file_path(key.clone(), ProverServiceDataType::SetupData);
-        tracing::info!("saving {:?} setup data to: {}", key, filepath);
+        tracing::info!("saving {:?} setup data to: {:?}", key, filepath);
         std::fs::write(filepath.clone(), serialized_setup_data)
             .with_context(|| format!("Failed saving setup-data at path: {filepath:?}"))
     }
@@ -440,12 +463,9 @@ impl Keystore {
     }
 
     pub fn load_commitments(&self) -> anyhow::Result<VkCommitments> {
-        Self::load_json_from_file(format!("{}/commitments.json", self.get_base_path()))
+        Self::load_json_from_file(self.get_base_path().join("commitments.json"))
     }
     pub fn save_commitments(&self, commitments: &VkCommitments) -> anyhow::Result<()> {
-        Self::save_json_pretty(
-            format!("{}/commitments.json", self.get_base_path()),
-            &commitments,
-        )
+        Self::save_json_pretty(self.get_base_path().join("commitments.json"), &commitments)
     }
 }
diff --git a/prover/vk_setup_data_generator_server_fri/src/main.rs b/prover/vk_setup_data_generator_server_fri/src/main.rs
index ce3a0799baa0..da86f931b1c2 100644
--- a/prover/vk_setup_data_generator_server_fri/src/main.rs
+++ b/prover/vk_setup_data_generator_server_fri/src/main.rs
@@ -6,9 +6,13 @@ use std::collections::HashMap;
 use anyhow::Context as _;
 use clap::{Parser, Subcommand};
 use commitment_generator::read_and_update_contract_toml;
+use indicatif::{ProgressBar, ProgressStyle};
 use tracing::level_filters::LevelFilter;
 use zkevm_test_harness::{
-    compute_setups::{generate_base_layer_vks_and_proofs, generate_recursive_layer_vks_and_proofs},
+    compute_setups::{
+        basic_vk_count, generate_base_layer_vks, generate_recursive_layer_vks,
+        recursive_layer_vk_count,
+    },
     data_source::{in_memory_data_source::InMemoryDataSource, SetupDataSource},
     proof_wrapper_utils::{
         check_trusted_setup_file_existace, get_wrapper_setup_and_vk_from_scheduler_vk,
@@ -30,20 +34,45 @@ mod commitment_generator;
 #[cfg(test)]
 mod tests;
 
-fn generate_vks(keystore: &Keystore) -> anyhow::Result<()> {
+/// Generates new verification keys, and stores them in `keystore`.
+/// Jobs describe how many generators can run in parallel (each one is around 30 GB).
+/// If quiet is true, it doesn't display any progress bar.
+fn generate_vks(keystore: &Keystore, jobs: usize, quiet: bool) -> anyhow::Result<()> {
     // Start by checking the trusted setup existence.
     // This is used at the last step, but we want to fail early if user didn't configure everything
     // correctly.
     check_trusted_setup_file_existace();
 
+    let progress_bar = if quiet {
+        None
+    } else {
+        let count = basic_vk_count() + recursive_layer_vk_count() + 1;
+        let progress_bar = ProgressBar::new(count as u64);
+        progress_bar.set_style(ProgressStyle::default_bar()
+        .template("{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {pos:>7}/{len:7} ({eta})")
+        .progress_chars("#>-"));
+        Some(progress_bar)
+    };
+
+    let pb = std::sync::Arc::new(std::sync::Mutex::new(progress_bar));
+
     let mut in_memory_source = InMemoryDataSource::new();
     tracing::info!("Generating verification keys for Base layer.");
-    generate_base_layer_vks_and_proofs(&mut in_memory_source)
-        .map_err(|err| anyhow::anyhow!("Failed generating base vk's: {err}"))?;
+
+    generate_base_layer_vks(&mut in_memory_source, Some(jobs), || {
+        if let Some(p) = pb.lock().unwrap().as_ref() {
+            p.inc(1)
+        }
+    })
+    .map_err(|err| anyhow::anyhow!("Failed generating base vk's: {err}"))?;
 
     tracing::info!("Generating verification keys for Recursive layer.");
-    generate_recursive_layer_vks_and_proofs(&mut in_memory_source)
-        .map_err(|err| anyhow::anyhow!("Failed generating recursive vk's: {err}"))?;
+    generate_recursive_layer_vks(&mut in_memory_source, Some(jobs), || {
+        if let Some(p) = pb.lock().unwrap().as_ref() {
+            p.inc(1)
+        }
+    })
+    .map_err(|err| anyhow::anyhow!("Failed generating recursive vk's: {err}"))?;
 
     tracing::info!("Saving keys & hints");
 
@@ -63,6 +92,10 @@ fn generate_vks(keystore: &Keystore) -> anyhow::Result<()> {
         .save_snark_verification_key(vk)
         .context("save_snark_vk")?;
 
+    if let Some(p) = pb.lock().unwrap().as_ref() {
+        p.inc(1)
+    }
+
     // Let's also update the commitments file.
     keystore.save_commitments(&generate_commitments(keystore)?)
 }
@@ -121,6 +154,12 @@ enum Command {
     GenerateVerificationKeys {
         #[arg(long)]
         path: Option<String>,
+        /// Number of generators to run in parallel - each one consumes around 30 GB of RAM.
+        #[arg(short, long, default_value_t = 1)]
+        jobs: usize,
+        /// If true - disables progress bar.
+        #[arg(long)]
+        quiet: bool,
     },
     /// Generates setup keys (used by the CPU prover).
     #[command(name = "generate-sk")]
@@ -158,7 +197,7 @@ fn print_stats(digests: HashMap<String, String>) -> anyhow::Result<()> {
 
 fn keystore_from_optional_path(path: Option<String>, setup_path: Option<String>) -> Keystore {
     if let Some(path) = path {
-        return Keystore::new_with_optional_setup_path(path, setup_path);
+        return Keystore::new_with_optional_setup_path(path.into(), setup_path);
     }
     if setup_path.is_some() {
         panic!("--setup_path must not be set when --path is not set");
@@ -208,13 +247,13 @@ fn main() -> anyhow::Result<()> {
     let opt = Cli::parse();
 
     match opt.command {
-        Command::GenerateVerificationKeys { path } => {
+        Command::GenerateVerificationKeys { path, jobs, quiet } => {
             let keystore = keystore_from_optional_path(path, None);
             tracing::info!(
                 "Generating verification keys and storing them inside {:?}",
                 keystore.get_base_path()
             );
-            generate_vks(&keystore).context("generate_vks()")
+            generate_vks(&keystore, jobs, quiet).context("generate_vks()")
         }
         Command::UpdateCommitments { dryrun, path } => {
             let keystore = keystore_from_optional_path(path, None);
diff --git a/prover/vk_setup_data_generator_server_fri/src/tests.rs b/prover/vk_setup_data_generator_server_fri/src/tests.rs
index 41aba88f784c..39b5f7a44fb8 100644
--- a/prover/vk_setup_data_generator_server_fri/src/tests.rs
+++ b/prover/vk_setup_data_generator_server_fri/src/tests.rs
@@ -63,15 +63,6 @@ proptest! {
 
 }
 
-// Test `get_base_path` method
-#[test]
-fn test_get_base_path() {
-    let keystore = Keystore::default();
-
-    let base_path = keystore.get_base_path();
-    assert!(!base_path.is_empty(), "Base path should not be empty");
-}
-
 // Test `ProverServiceDataKey::new` method
 #[test]
 fn test_proverservicedatakey_new() {
diff --git a/prover/vk_setup_data_generator_server_fri/src/utils.rs b/prover/vk_setup_data_generator_server_fri/src/utils.rs
index 555204eb9e2b..6f4946af5b21 100644
--- a/prover/vk_setup_data_generator_server_fri/src/utils.rs
+++ b/prover/vk_setup_data_generator_server_fri/src/utils.rs
@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use anyhow::Context as _;
 use circuit_definitions::{
     circuit_definitions::aux_layer::ZkSyncSnarkWrapperCircuit,
@@ -20,6 +22,7 @@ use zksync_prover_fri_types::circuit_definitions::{
     },
 };
 use zksync_types::H256;
+use zksync_utils::locate_workspace;
 
 use crate::keystore::Keystore;
 
@@ -112,28 +115,40 @@ pub fn calculate_snark_vk_hash(keystore: &Keystore) -> anyhow::Result<H256> {
     Ok(H256::from_slice(&computed_vk_hash))
 }
 
+/// Returns workspace of the core component, we assume that prover is one folder deeper.
+/// Or fallback to current dir
+pub fn core_workspace_dir_or_current_dir() -> PathBuf {
+    locate_workspace()
+        .map(|a| a.join(".."))
+        .unwrap_or_else(|| PathBuf::from("."))
+}
+
 #[cfg(test)]
 mod tests {
-    use std::{env, path::PathBuf, str::FromStr};
+    use std::{path::PathBuf, str::FromStr};
 
     use super::*;
 
     #[test]
     fn test_keyhash_generation() {
-        let mut path_to_input = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+        let mut path_to_input = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap());
         path_to_input.push("historical_data");
 
-        for version in 18..=22 {
-            let basepath = path_to_input.join(format!("{}", version));
-            let keystore = Keystore::new_with_optional_setup_path(
-                basepath.as_os_str().to_str().unwrap().to_string(),
-                None,
-            );
-
-            let expected =
-                H256::from_str(&keystore.load_commitments().unwrap().snark_wrapper).unwrap();
-
-            assert_eq!(expected, calculate_snark_vk_hash(&keystore).unwrap());
+        for entry in std::fs::read_dir(path_to_input.clone()).unwrap().flatten() {
+            if entry.metadata().unwrap().is_dir() {
+                let basepath = path_to_input.join(&entry.file_name().into_string().unwrap());
+                let keystore = Keystore::new_with_optional_setup_path(basepath.clone(), None);
+
+                let expected =
+                    H256::from_str(&keystore.load_commitments().unwrap().snark_wrapper).unwrap();
+
+                assert_eq!(
+                    expected,
+                    calculate_snark_vk_hash(&keystore).unwrap(),
+                    "VK computation failed for {:?}",
+                    basepath
+                );
+            }
         }
     }
 }
diff --git a/prover/vk_setup_data_generator_server_fri/src/vk_commitment_helper.rs b/prover/vk_setup_data_generator_server_fri/src/vk_commitment_helper.rs
index 9a6c074b1d23..bf568e06157b 100644
--- a/prover/vk_setup_data_generator_server_fri/src/vk_commitment_helper.rs
+++ b/prover/vk_setup_data_generator_server_fri/src/vk_commitment_helper.rs
@@ -1,8 +1,10 @@
-use std::fs;
+use std::{fs, path::PathBuf};
 
 use anyhow::Context as _;
 use toml_edit::{Document, Item, Value};
 
+use crate::utils::core_workspace_dir_or_current_dir;
+
 pub fn get_toml_formatted_value(string_value: String) -> Item {
     let mut value = Value::from(string_value);
     value.decor_mut().set_prefix("");
@@ -17,11 +19,10 @@ pub fn write_contract_toml(contract_doc: Document) -> anyhow::Result<()> {
 pub fn read_contract_toml() -> anyhow::Result<Document> {
     let path = get_contract_toml_path();
     let toml_data = std::fs::read_to_string(path.clone())
-        .with_context(|| format!("contract.toml file does not exist on path {path}"))?;
+        .with_context(|| format!("contract.toml file does not exist on path {path:?}"))?;
     toml_data.parse::<Document>().context("invalid config file")
 }
 
-pub fn get_contract_toml_path() -> String {
-    let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| "/".into());
-    format!("{}/etc/env/base/contracts.toml", zksync_home)
+pub fn get_contract_toml_path() -> PathBuf {
+    core_workspace_dir_or_current_dir().join("etc/env/base/contracts.toml")
 }
diff --git a/prover/witness_generator/Cargo.toml b/prover/witness_generator/Cargo.toml
index e22c4eae8067..5c42343f60b9 100644
--- a/prover/witness_generator/Cargo.toml
+++ b/prover/witness_generator/Cargo.toml
@@ -11,16 +11,16 @@ categories.workspace = true
 
 [dependencies]
 vise.workspace = true
-prover_dal.workspace = true
+zksync_prover_dal.workspace = true
 zksync_dal.workspace = true
 zksync_config.workspace = true
 zksync_prover_interface.workspace = true
+zksync_prover_config.workspace = true
 zksync_env_config.workspace = true
 zksync_system_constants.workspace = true
-prometheus_exporter.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 zksync_queued_job_processor.workspace = true
-multivm.workspace = true
+zksync_multivm.workspace = true
 zksync_object_store.workspace = true
 zksync_types.workspace = true
 zksync_state.workspace = true
@@ -28,6 +28,8 @@ zksync_utils.workspace = true
 vk_setup_data_generator_server_fri.workspace = true
 zksync_prover_fri_types.workspace = true
 zksync_prover_fri_utils.workspace = true
+zksync_core_leftovers.workspace = true
+zksync_protobuf_config.workspace = true
 
 zkevm_test_harness = { workspace = true }
 circuit_definitions = { workspace = true, features = [ "log_tracing" ] }
diff --git a/prover/witness_generator/src/basic_circuits.rs b/prover/witness_generator/src/basic_circuits.rs
index a8fe1ab7d130..af21fe909712 100644
--- a/prover/witness_generator/src/basic_circuits.rs
+++ b/prover/witness_generator/src/basic_circuits.rs
@@ -12,15 +12,15 @@ use circuit_definitions::{
     encodings::recursion_request::RecursionQueueSimulator,
     zkevm_circuits::fsm_input_output::ClosedFormInputCompactFormWitness,
 };
-use multivm::vm_latest::{
-    constants::MAX_CYCLES_FOR_TX, HistoryDisabled, StorageOracle as VmStorageOracle,
-};
-use prover_dal::{ConnectionPool, Prover, ProverDal};
 use tracing::Instrument;
 use zkevm_test_harness::geometry_config::get_geometry_config;
 use zksync_config::configs::FriWitnessGeneratorConfig;
 use zksync_dal::{Core, CoreDal};
-use zksync_object_store::{ObjectStore, ObjectStoreFactory};
+use zksync_multivm::vm_latest::{
+    constants::MAX_CYCLES_FOR_TX, HistoryDisabled, StorageOracle as VmStorageOracle,
+};
+use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{ConnectionPool, Prover, ProverDal};
 use zksync_prover_fri_types::{
     circuit_definitions::{
         boojum::{
@@ -42,8 +42,8 @@ use zksync_state::{PostgresStorage, StorageView};
 use zksync_types::{
     basic_fri_types::{AggregationRound, Eip4844Blobs},
     block::StorageOracleInfo,
-    protocol_version::ProtocolVersionId,
-    Address, L1BatchNumber, BOOTLOADER_ADDRESS, H256,
+    protocol_version::ProtocolSemanticVersion,
+    Address, L1BatchNumber, ProtocolVersionId, BOOTLOADER_ADDRESS, H256,
 };
 use zksync_utils::{bytes_to_chunks, h256_to_u256, u256_to_h256};
 
@@ -89,21 +89,21 @@ pub struct BasicWitnessGenerator {
     public_blob_store: Option<Arc<dyn ObjectStore>>,
     connection_pool: ConnectionPool<Core>,
     prover_connection_pool: ConnectionPool<Prover>,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
 }
 
 impl BasicWitnessGenerator {
-    pub async fn new(
+    pub fn new(
         config: FriWitnessGeneratorConfig,
-        store_factory: &ObjectStoreFactory,
+        object_store: Arc<dyn ObjectStore>,
         public_blob_store: Option<Arc<dyn ObjectStore>>,
         connection_pool: ConnectionPool<Core>,
         prover_connection_pool: ConnectionPool<Prover>,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Self {
         Self {
             config: Arc::new(config),
-            object_store: store_factory.create_store().await,
+            object_store,
             public_blob_store,
             connection_pool,
             prover_connection_pool,
@@ -485,14 +485,14 @@ async fn generate_witness(
 
     let bootloader_code_bytes = connection
         .factory_deps_dal()
-        .get_factory_dep(header.base_system_contracts_hashes.bootloader)
+        .get_sealed_factory_dep(header.base_system_contracts_hashes.bootloader)
         .await
         .expect("Failed fetching bootloader bytecode from DB")
         .expect("Bootloader bytecode should exist");
     let bootloader_code = bytes_to_chunks(&bootloader_code_bytes);
     let account_bytecode_bytes = connection
         .factory_deps_dal()
-        .get_factory_dep(header.base_system_contracts_hashes.default_aa)
+        .get_sealed_factory_dep(header.base_system_contracts_hashes.default_aa)
         .await
         .expect("Failed fetching default account bytecode from DB")
         .expect("Default account bytecode should exist");
diff --git a/prover/witness_generator/src/leaf_aggregation.rs b/prover/witness_generator/src/leaf_aggregation.rs
index 181408c2e114..112d07498837 100644
--- a/prover/witness_generator/src/leaf_aggregation.rs
+++ b/prover/witness_generator/src/leaf_aggregation.rs
@@ -3,14 +3,14 @@ use std::{sync::Arc, time::Instant};
 use anyhow::Context as _;
 use async_trait::async_trait;
 use circuit_definitions::circuit_definitions::recursion_layer::base_circuit_type_into_recursive_leaf_circuit_type;
-use prover_dal::{Prover, ProverDal};
 use zkevm_test_harness::{
     witness::recursive_aggregation::{compute_leaf_params, create_leaf_witnesses},
     zkevm_circuits::scheduler::aux::BaseLayerCircuitType,
 };
 use zksync_config::configs::FriWitnessGeneratorConfig;
 use zksync_dal::ConnectionPool;
-use zksync_object_store::{ObjectStore, ObjectStoreFactory};
+use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{Prover, ProverDal};
 use zksync_prover_fri_types::{
     circuit_definitions::{
         boojum::field::goldilocks::GoldilocksField,
@@ -31,7 +31,7 @@ use zksync_prover_fri_types::{
 use zksync_prover_fri_utils::get_recursive_layer_circuit_id_for_base_layer;
 use zksync_queued_job_processor::JobProcessor;
 use zksync_types::{
-    basic_fri_types::AggregationRound, protocol_version::ProtocolVersionId,
+    basic_fri_types::AggregationRound, protocol_version::ProtocolSemanticVersion,
     prover_dal::LeafAggregationJobMetadata, L1BatchNumber,
 };
 use zksync_vk_setup_data_server_fri::keystore::Keystore;
@@ -76,19 +76,19 @@ pub struct LeafAggregationWitnessGenerator {
     config: FriWitnessGeneratorConfig,
     object_store: Arc<dyn ObjectStore>,
     prover_connection_pool: ConnectionPool<Prover>,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
 }
 
 impl LeafAggregationWitnessGenerator {
-    pub async fn new(
+    pub fn new(
         config: FriWitnessGeneratorConfig,
-        store_factory: &ObjectStoreFactory,
+        object_store: Arc<dyn ObjectStore>,
         prover_connection_pool: ConnectionPool<Prover>,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Self {
         Self {
             config,
-            object_store: store_factory.create_store().await,
+            object_store,
             prover_connection_pool,
             protocol_version,
         }
diff --git a/prover/witness_generator/src/main.rs b/prover/witness_generator/src/main.rs
index 2c6cd6583dca..661965b75061 100644
--- a/prover/witness_generator/src/main.rs
+++ b/prover/witness_generator/src/main.rs
@@ -4,20 +4,18 @@ use std::time::{Duration, Instant};
 
 use anyhow::{anyhow, Context as _};
 use futures::{channel::mpsc, executor::block_on, SinkExt, StreamExt};
-use prometheus_exporter::PrometheusExporterConfig;
-use prover_dal::{ConnectionPool, Prover, ProverDal};
 use structopt::StructOpt;
 use tokio::sync::watch;
-use zksync_config::{
-    configs::{FriWitnessGeneratorConfig, ObservabilityConfig, PostgresConfig, PrometheusConfig},
-    ObjectStoreConfig,
-};
+use zksync_config::ObjectStoreConfig;
 use zksync_env_config::{object_store::ProverObjectStoreConfig, FromEnv};
 use zksync_object_store::ObjectStoreFactory;
+use zksync_prover_config::{load_database_secrets, load_general_config};
+use zksync_prover_dal::{ConnectionPool, Prover, ProverDal};
 use zksync_queued_job_processor::JobProcessor;
-use zksync_types::{basic_fri_types::AggregationRound, ProtocolVersionId};
+use zksync_types::basic_fri_types::AggregationRound;
 use zksync_utils::wait_for_tasks::ManagedTasks;
 use zksync_vk_setup_data_server_fri::commitment_utils::get_cached_commitments;
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 use crate::{
     basic_circuits::BasicWitnessGenerator, leaf_aggregation::LeafAggregationWitnessGenerator,
@@ -38,6 +36,7 @@ mod utils;
 #[cfg(not(target_env = "msvc"))]
 use jemallocator::Jemalloc;
 use zksync_dal::Core;
+use zksync_prover_fri_types::PROVER_PROTOCOL_SEMANTIC_VERSION;
 
 #[cfg(not(target_env = "msvc"))]
 #[global_allocator]
@@ -60,18 +59,31 @@ struct Opt {
     /// Start all aggregation rounds for the witness generator.
     #[structopt(short = "a", long = "all_rounds")]
     all_rounds: bool,
+    /// Path to the configuration file.
+    #[structopt(long)]
+    config_path: Option<std::path::PathBuf>,
+    /// Path to the secrets file.
+    #[structopt(long)]
+    secrets_path: Option<std::path::PathBuf>,
 }
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let observability_config =
-        ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let opt = Opt::from_args();
+
+    let general_config = load_general_config(opt.config_path).context("general config")?;
+
+    let database_secrets = load_database_secrets(opt.secrets_path).context("database secrets")?;
+
+    let observability_config = general_config
+        .observability
+        .context("observability config")?;
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
 
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(sentry_url) = &observability_config.sentry_url {
         builder = builder
             .with_sentry_url(sentry_url)
@@ -96,31 +108,39 @@ async fn main() -> anyhow::Result<()> {
         tracing::info!("No sentry URL was provided");
     }
 
-    let opt = Opt::from_args();
     let started_at = Instant::now();
     let use_push_gateway = opt.batch_size.is_some();
 
-    let object_store_config =
-        ProverObjectStoreConfig::from_env().context("ProverObjectStoreConfig::from_env()")?;
+    let prover_config = general_config.prover_config.context("prover config")?;
+    let object_store_config = ProverObjectStoreConfig(
+        prover_config
+            .prover_object_store
+            .context("object store")?
+            .clone(),
+    );
     let store_factory = ObjectStoreFactory::new(object_store_config.0);
-    let config =
-        FriWitnessGeneratorConfig::from_env().context("FriWitnessGeneratorConfig::from_env()")?;
-    let prometheus_config = PrometheusConfig::from_env().context("PrometheusConfig::from_env()")?;
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
+    let config = general_config
+        .witness_generator
+        .context("witness generator config")?;
+    let prometheus_config = general_config
+        .prometheus_config
+        .context("prometheus config")?;
+    let postgres_config = general_config.postgres_config.context("postgres config")?;
     let connection_pool = ConnectionPool::<Core>::builder(
-        postgres_config.master_url()?,
+        database_secrets.master_url()?,
         postgres_config.max_connections()?,
     )
     .build()
     .await
     .context("failed to build a connection_pool")?;
-    let prover_connection_pool = ConnectionPool::<Prover>::singleton(postgres_config.prover_url()?)
-        .build()
-        .await
-        .context("failed to build a prover_connection_pool")?;
+    let prover_connection_pool =
+        ConnectionPool::<Prover>::singleton(database_secrets.prover_url()?)
+            .build()
+            .await
+            .context("failed to build a prover_connection_pool")?;
     let (stop_sender, stop_receiver) = watch::channel(false);
 
-    let protocol_version = ProtocolVersionId::current_prover_version();
+    let protocol_version = PROVER_PROTOCOL_SEMANTIC_VERSION;
     let vk_commitments_in_db = match prover_connection_pool
         .connection()
         .await
@@ -182,7 +202,8 @@ async fn main() -> anyhow::Result<()> {
 
         let witness_generator_task = match round {
             AggregationRound::BasicCircuits => {
-                let vk_commitments = get_cached_commitments();
+                let setup_data_path = prover_config.setup_data_path.clone();
+                let vk_commitments = get_cached_commitments(Some(setup_data_path));
                 assert_eq!(
                     vk_commitments,
                     vk_commitments_in_db,
@@ -197,58 +218,53 @@ async fn main() -> anyhow::Result<()> {
                                 .context("ObjectStoreConfig::from_env()")?,
                         )
                         .create_store()
-                        .await,
+                        .await?,
                     ),
                 };
                 let generator = BasicWitnessGenerator::new(
                     config.clone(),
-                    &store_factory,
+                    store_factory.create_store().await?,
                     public_blob_store,
                     connection_pool.clone(),
                     prover_connection_pool.clone(),
                     protocol_version,
-                )
-                .await;
+                );
                 generator.run(stop_receiver.clone(), opt.batch_size)
             }
             AggregationRound::LeafAggregation => {
                 let generator = LeafAggregationWitnessGenerator::new(
                     config.clone(),
-                    &store_factory,
+                    store_factory.create_store().await?,
                     prover_connection_pool.clone(),
                     protocol_version,
-                )
-                .await;
+                );
                 generator.run(stop_receiver.clone(), opt.batch_size)
             }
             AggregationRound::NodeAggregation => {
                 let generator = NodeAggregationWitnessGenerator::new(
                     config.clone(),
-                    &store_factory,
+                    store_factory.create_store().await?,
                     prover_connection_pool.clone(),
                     protocol_version,
-                )
-                .await;
+                );
                 generator.run(stop_receiver.clone(), opt.batch_size)
             }
             AggregationRound::RecursionTip => {
                 let generator = RecursionTipWitnessGenerator::new(
                     config.clone(),
-                    &store_factory,
+                    store_factory.create_store().await?,
                     prover_connection_pool.clone(),
                     protocol_version,
-                )
-                .await;
+                );
                 generator.run(stop_receiver.clone(), opt.batch_size)
             }
             AggregationRound::Scheduler => {
                 let generator = SchedulerWitnessGenerator::new(
                     config.clone(),
-                    &store_factory,
+                    store_factory.create_store().await?,
                     prover_connection_pool.clone(),
                     protocol_version,
-                )
-                .await;
+                );
                 generator.run(stop_receiver.clone(), opt.batch_size)
             }
         };
diff --git a/prover/witness_generator/src/node_aggregation.rs b/prover/witness_generator/src/node_aggregation.rs
index 95255f79ece6..0af59890504d 100644
--- a/prover/witness_generator/src/node_aggregation.rs
+++ b/prover/witness_generator/src/node_aggregation.rs
@@ -2,13 +2,13 @@ use std::{sync::Arc, time::Instant};
 
 use anyhow::Context as _;
 use async_trait::async_trait;
-use prover_dal::{Prover, ProverDal};
 use zkevm_test_harness::witness::recursive_aggregation::{
     compute_node_vk_commitment, create_node_witnesses,
 };
 use zksync_config::configs::FriWitnessGeneratorConfig;
 use zksync_dal::ConnectionPool;
-use zksync_object_store::{ObjectStore, ObjectStoreFactory};
+use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{Prover, ProverDal};
 use zksync_prover_fri_types::{
     circuit_definitions::{
         boojum::field::goldilocks::GoldilocksField,
@@ -25,7 +25,7 @@ use zksync_prover_fri_types::{
 };
 use zksync_queued_job_processor::JobProcessor;
 use zksync_types::{
-    basic_fri_types::AggregationRound, protocol_version::ProtocolVersionId,
+    basic_fri_types::AggregationRound, protocol_version::ProtocolSemanticVersion,
     prover_dal::NodeAggregationJobMetadata, L1BatchNumber,
 };
 use zksync_vk_setup_data_server_fri::{keystore::Keystore, utils::get_leaf_vk_params};
@@ -76,19 +76,19 @@ pub struct NodeAggregationWitnessGenerator {
     config: FriWitnessGeneratorConfig,
     object_store: Arc<dyn ObjectStore>,
     prover_connection_pool: ConnectionPool<Prover>,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
 }
 
 impl NodeAggregationWitnessGenerator {
-    pub async fn new(
+    pub fn new(
         config: FriWitnessGeneratorConfig,
-        store_factory: &ObjectStoreFactory,
+        object_store: Arc<dyn ObjectStore>,
         prover_connection_pool: ConnectionPool<Prover>,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Self {
         Self {
             config,
-            object_store: store_factory.create_store().await,
+            object_store,
             prover_connection_pool,
             protocol_version,
         }
diff --git a/prover/witness_generator/src/recursion_tip.rs b/prover/witness_generator/src/recursion_tip.rs
index f4681c6e3661..b6c9cd7173dd 100644
--- a/prover/witness_generator/src/recursion_tip.rs
+++ b/prover/witness_generator/src/recursion_tip.rs
@@ -9,7 +9,6 @@ use circuit_definitions::{
     },
     recursion_layer_proof_config,
 };
-use prover_dal::{Prover, ProverDal};
 use zkevm_test_harness::{
     boojum::{
         field::{
@@ -38,14 +37,17 @@ use zkevm_test_harness::{
 };
 use zksync_config::configs::FriWitnessGeneratorConfig;
 use zksync_dal::ConnectionPool;
-use zksync_object_store::{ObjectStore, ObjectStoreFactory};
+use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{Prover, ProverDal};
 use zksync_prover_fri_types::{
     get_current_pod_name,
     keys::{ClosedFormInputKey, FriCircuitKey},
     CircuitWrapper,
 };
 use zksync_queued_job_processor::JobProcessor;
-use zksync_types::{basic_fri_types::AggregationRound, L1BatchNumber, ProtocolVersionId};
+use zksync_types::{
+    basic_fri_types::AggregationRound, protocol_version::ProtocolSemanticVersion, L1BatchNumber,
+};
 use zksync_vk_setup_data_server_fri::{keystore::Keystore, utils::get_leaf_vk_params};
 
 use crate::{
@@ -73,19 +75,19 @@ pub struct RecursionTipWitnessGenerator {
     config: FriWitnessGeneratorConfig,
     object_store: Arc<dyn ObjectStore>,
     prover_connection_pool: ConnectionPool<Prover>,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
 }
 
 impl RecursionTipWitnessGenerator {
-    pub async fn new(
+    pub fn new(
         config: FriWitnessGeneratorConfig,
-        store_factory: &ObjectStoreFactory,
+        object_store: Arc<dyn ObjectStore>,
         prover_connection_pool: ConnectionPool<Prover>,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Self {
         Self {
             config,
-            object_store: store_factory.create_store().await,
+            object_store,
             prover_connection_pool,
             protocol_version,
         }
@@ -141,7 +143,7 @@ impl JobProcessor for RecursionTipWitnessGenerator {
     async fn get_next_job(&self) -> anyhow::Result<Option<(Self::JobId, Self::Job)>> {
         let mut prover_connection = self.prover_connection_pool.connection().await?;
         let pod_name = get_current_pod_name();
-        let Some(l1_batch_number) = prover_connection
+        let Some((l1_batch_number, number_of_final_node_jobs)) = prover_connection
             .fri_witness_generator_dal()
             .get_next_recursion_tip_witness_job(self.protocol_version, &pod_name)
             .await
@@ -154,6 +156,13 @@ impl JobProcessor for RecursionTipWitnessGenerator {
             .get_final_node_proof_job_ids_for(l1_batch_number)
             .await;
 
+        assert_eq!(
+            final_node_proof_job_ids.len(),
+            number_of_final_node_jobs as usize,
+            "recursion tip witness job was scheduled without all final node jobs being completed; expected {}, got {}", 
+            number_of_final_node_jobs, final_node_proof_job_ids.len()
+        );
+
         Ok(Some((
             l1_batch_number,
             prepare_job(
diff --git a/prover/witness_generator/src/scheduler.rs b/prover/witness_generator/src/scheduler.rs
index 946c8cabaca5..a6173c813586 100644
--- a/prover/witness_generator/src/scheduler.rs
+++ b/prover/witness_generator/src/scheduler.rs
@@ -2,13 +2,13 @@ use std::{convert::TryInto, sync::Arc, time::Instant};
 
 use anyhow::Context as _;
 use async_trait::async_trait;
-use prover_dal::{Prover, ProverDal};
 use zkevm_test_harness::zkevm_circuits::recursion::{
     leaf_layer::input::RecursionLeafParametersWitness, NUM_BASE_LAYER_CIRCUITS,
 };
 use zksync_config::configs::FriWitnessGeneratorConfig;
 use zksync_dal::ConnectionPool;
-use zksync_object_store::{ObjectStore, ObjectStoreFactory};
+use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{Prover, ProverDal};
 use zksync_prover_fri_types::{
     circuit_definitions::{
         boojum::{
@@ -28,7 +28,7 @@ use zksync_prover_fri_types::{
 };
 use zksync_queued_job_processor::JobProcessor;
 use zksync_types::{
-    basic_fri_types::AggregationRound, protocol_version::ProtocolVersionId, L1BatchNumber,
+    basic_fri_types::AggregationRound, protocol_version::ProtocolSemanticVersion, L1BatchNumber,
 };
 use zksync_vk_setup_data_server_fri::{keystore::Keystore, utils::get_leaf_vk_params};
 
@@ -57,19 +57,19 @@ pub struct SchedulerWitnessGenerator {
     config: FriWitnessGeneratorConfig,
     object_store: Arc<dyn ObjectStore>,
     prover_connection_pool: ConnectionPool<Prover>,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
 }
 
 impl SchedulerWitnessGenerator {
-    pub async fn new(
+    pub fn new(
         config: FriWitnessGeneratorConfig,
-        store_factory: &ObjectStoreFactory,
+        object_store: Arc<dyn ObjectStore>,
         prover_connection_pool: ConnectionPool<Prover>,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
     ) -> Self {
         Self {
             config,
-            object_store: store_factory.create_store().await,
+            object_store,
             prover_connection_pool,
             protocol_version,
         }
diff --git a/prover/witness_generator/src/utils.rs b/prover/witness_generator/src/utils.rs
index ae8a33519806..a1046f258fc1 100644
--- a/prover/witness_generator/src/utils.rs
+++ b/prover/witness_generator/src/utils.rs
@@ -7,12 +7,12 @@ use circuit_definitions::circuit_definitions::{
     base_layer::ZkSyncBaseLayerCircuit,
     recursion_layer::{ZkSyncRecursionLayerStorageType, ZkSyncRecursionProof},
 };
-use multivm::utils::get_used_bootloader_memory_bytes;
 use once_cell::sync::Lazy;
 use zkevm_test_harness::{
     boojum::field::goldilocks::GoldilocksField, empty_node_proof,
     zkevm_circuits::scheduler::aux::BaseLayerCircuitType,
 };
+use zksync_multivm::utils::get_used_bootloader_memory_bytes;
 use zksync_object_store::{serialize_using_bincode, Bucket, ObjectStore, StoredObject};
 use zksync_prover_fri_types::{
     circuit_definitions::{
diff --git a/prover/witness_generator/tests/basic_test.rs b/prover/witness_generator/tests/basic_test.rs
index 2cb19d34890d..7f5356858902 100644
--- a/prover/witness_generator/tests/basic_test.rs
+++ b/prover/witness_generator/tests/basic_test.rs
@@ -30,10 +30,12 @@ async fn test_leaf_witness_gen() {
             file_backed_base_path: "./tests/data/leaf/".to_owned(),
         },
         max_retries: 5,
+        local_mirror_path: None,
     };
     let object_store = ObjectStoreFactory::new(object_store_config)
         .create_store()
-        .await;
+        .await
+        .unwrap();
 
     let circuit_id = 4;
     let block_number = L1BatchNumber(125010);
@@ -70,10 +72,12 @@ async fn test_node_witness_gen() {
             file_backed_base_path: "./tests/data/node/".to_owned(),
         },
         max_retries: 5,
+        local_mirror_path: None,
     };
     let object_store = ObjectStoreFactory::new(object_store_config)
         .create_store()
-        .await;
+        .await
+        .unwrap();
 
     let circuit_id = 8;
     let block_number = L1BatchNumber(127856);
diff --git a/prover/witness_vector_generator/Cargo.toml b/prover/witness_vector_generator/Cargo.toml
index 0bd23270cf6e..cf218ed8ae30 100644
--- a/prover/witness_vector_generator/Cargo.toml
+++ b/prover/witness_vector_generator/Cargo.toml
@@ -12,17 +12,17 @@ categories.workspace = true
 [dependencies]
 vise.workspace = true
 zksync_types.workspace = true
-prover_dal.workspace = true
+zksync_prover_dal.workspace = true
 zksync_config.workspace = true
 zksync_env_config.workspace = true
 zksync_object_store.workspace = true
 zksync_prover_fri_utils.workspace = true
 zksync_utils.workspace = true
-prometheus_exporter.workspace = true
 zksync_prover_fri_types.workspace = true
+zksync_prover_config.workspace = true
 zksync_queued_job_processor.workspace = true
 vk_setup_data_generator_server_fri.workspace = true
-vlog.workspace = true
+zksync_vlog.workspace = true
 
 anyhow.workspace = true
 tracing.workspace = true
@@ -31,6 +31,7 @@ tokio = { workspace = true, features = ["time", "macros"] }
 futures = { workspace = true, features = ["compat"] }
 ctrlc = { workspace = true, features = ["termination"] }
 serde = { workspace = true, features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
 async-trait.workspace = true
 queues.workspace = true
 bincode.workspace = true
diff --git a/prover/witness_vector_generator/README.md b/prover/witness_vector_generator/README.md
index e287e4d53b27..dde192533db3 100644
--- a/prover/witness_vector_generator/README.md
+++ b/prover/witness_vector_generator/README.md
@@ -4,4 +4,4 @@ Used to generate witness vectors using circuit and sending them to prover over T
 
 ## running
 
-`zk f cargo +nightly-2023-08-21 run --release --bin zksync_witness_vector_generator`
+`zk f cargo +nightly-2024-05-07 run --release --bin zksync_witness_vector_generator`
diff --git a/prover/witness_vector_generator/src/generator.rs b/prover/witness_vector_generator/src/generator.rs
index 60d0df587940..b7b9dcd9f763 100644
--- a/prover/witness_vector_generator/src/generator.rs
+++ b/prover/witness_vector_generator/src/generator.rs
@@ -6,10 +6,10 @@ use std::{
 
 use anyhow::Context as _;
 use async_trait::async_trait;
-use prover_dal::{ConnectionPool, Prover, ProverDal};
 use tokio::{task::JoinHandle, time::sleep};
 use zksync_config::configs::FriWitnessVectorGeneratorConfig;
 use zksync_object_store::ObjectStore;
+use zksync_prover_dal::{ConnectionPool, Prover, ProverDal};
 use zksync_prover_fri_types::{
     circuit_definitions::boojum::field::goldilocks::GoldilocksField, CircuitWrapper, ProverJob,
     WitnessVectorArtifacts,
@@ -19,34 +19,35 @@ use zksync_prover_fri_utils::{
 };
 use zksync_queued_job_processor::JobProcessor;
 use zksync_types::{
-    basic_fri_types::CircuitIdRoundTuple, prover_dal::GpuProverInstanceStatus, ProtocolVersionId,
+    basic_fri_types::CircuitIdRoundTuple, protocol_version::ProtocolSemanticVersion,
+    prover_dal::GpuProverInstanceStatus,
 };
 use zksync_vk_setup_data_server_fri::keystore::Keystore;
 
 use crate::metrics::METRICS;
 
 pub struct WitnessVectorGenerator {
-    blob_store: Arc<dyn ObjectStore>,
+    object_store: Arc<dyn ObjectStore>,
     pool: ConnectionPool<Prover>,
     circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
     zone: String,
     config: FriWitnessVectorGeneratorConfig,
-    protocol_version: ProtocolVersionId,
+    protocol_version: ProtocolSemanticVersion,
     max_attempts: u32,
 }
 
 impl WitnessVectorGenerator {
     pub fn new(
-        blob_store: Arc<dyn ObjectStore>,
+        object_store: Arc<dyn ObjectStore>,
         prover_connection_pool: ConnectionPool<Prover>,
         circuit_ids_for_round_to_be_proven: Vec<CircuitIdRoundTuple>,
         zone: String,
         config: FriWitnessVectorGeneratorConfig,
-        protocol_version: ProtocolVersionId,
+        protocol_version: ProtocolSemanticVersion,
         max_attempts: u32,
     ) -> Self {
         Self {
-            blob_store,
+            object_store,
             pool: prover_connection_pool,
             circuit_ids_for_round_to_be_proven,
             zone,
@@ -88,7 +89,7 @@ impl JobProcessor for WitnessVectorGenerator {
         let mut storage = self.pool.connection().await.unwrap();
         let Some(job) = fetch_next_circuit(
             &mut storage,
-            &*self.blob_store,
+            &*self.object_store,
             &self.circuit_ids_for_round_to_be_proven,
             &self.protocol_version,
         )
diff --git a/prover/witness_vector_generator/src/main.rs b/prover/witness_vector_generator/src/main.rs
index 2260648d3f1c..1649c8e82acd 100644
--- a/prover/witness_vector_generator/src/main.rs
+++ b/prover/witness_vector_generator/src/main.rs
@@ -3,47 +3,52 @@
 use std::time::Duration;
 
 use anyhow::Context as _;
-use prometheus_exporter::PrometheusExporterConfig;
-use prover_dal::ConnectionPool;
-use structopt::StructOpt;
+use clap::Parser;
 use tokio::sync::{oneshot, watch};
-use zksync_config::configs::{
-    fri_prover_group::FriProverGroupConfig, FriProverConfig, FriWitnessVectorGeneratorConfig,
-    ObservabilityConfig, PostgresConfig,
-};
-use zksync_env_config::{object_store::ProverObjectStoreConfig, FromEnv};
+use zksync_env_config::object_store::ProverObjectStoreConfig;
 use zksync_object_store::ObjectStoreFactory;
+use zksync_prover_config::{load_database_secrets, load_general_config};
+use zksync_prover_dal::ConnectionPool;
+use zksync_prover_fri_types::PROVER_PROTOCOL_SEMANTIC_VERSION;
 use zksync_prover_fri_utils::{get_all_circuit_id_round_tuples_for, region_fetcher::get_zone};
 use zksync_queued_job_processor::JobProcessor;
-use zksync_types::ProtocolVersionId;
 use zksync_utils::wait_for_tasks::ManagedTasks;
+use zksync_vlog::prometheus::PrometheusExporterConfig;
 
 use crate::generator::WitnessVectorGenerator;
 
 mod generator;
 mod metrics;
 
-#[derive(Debug, StructOpt)]
-#[structopt(
-    name = "zksync_witness_vector_generator",
-    about = "Tool for generating witness vectors for circuits"
-)]
-struct Opt {
+#[derive(Debug, Parser)]
+#[command(author = "Matter Labs", version)]
+struct Cli {
     /// Number of times `witness_vector_generator` should be run.
-    #[structopt(short = "n", long = "n_iterations")]
-    number_of_iterations: Option<usize>,
+    #[arg(long)]
+    #[arg(short)]
+    n_iterations: Option<usize>,
+    #[arg(long)]
+    pub(crate) config_path: Option<std::path::PathBuf>,
+    #[arg(long)]
+    pub(crate) secrets_path: Option<std::path::PathBuf>,
 }
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    let observability_config =
-        ObservabilityConfig::from_env().context("ObservabilityConfig::from_env()")?;
-    let log_format: vlog::LogFormat = observability_config
+    let opt = Cli::parse();
+
+    let general_config = load_general_config(opt.config_path).context("general config")?;
+    let database_secrets = load_database_secrets(opt.secrets_path).context("database secrets")?;
+
+    let observability_config = general_config
+        .observability
+        .context("observability config")?;
+    let log_format: zksync_vlog::LogFormat = observability_config
         .log_format
         .parse()
         .context("Invalid log format")?;
 
-    let mut builder = vlog::ObservabilityBuilder::new().with_log_format(log_format);
+    let mut builder = zksync_vlog::ObservabilityBuilder::new().with_log_format(log_format);
     if let Some(sentry_url) = &observability_config.sentry_url {
         builder = builder
             .with_sentry_url(sentry_url)
@@ -61,36 +66,42 @@ async fn main() -> anyhow::Result<()> {
     }
     let _guard = builder.build();
 
-    let opt = Opt::from_args();
-    let config = FriWitnessVectorGeneratorConfig::from_env()
-        .context("FriWitnessVectorGeneratorConfig::from_env()")?;
+    let config = general_config
+        .witness_vector_generator
+        .context("witness vector generator config")?;
     let specialized_group_id = config.specialized_group_id;
     let exporter_config = PrometheusExporterConfig::pull(config.prometheus_listener_port);
 
-    let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
-    let pool = ConnectionPool::singleton(postgres_config.prover_url()?)
+    let pool = ConnectionPool::singleton(database_secrets.prover_url()?)
         .build()
         .await
         .context("failed to build a connection pool")?;
-    let object_store_config =
-        ProverObjectStoreConfig::from_env().context("ProverObjectStoreConfig::from_env()")?;
-    let blob_store = ObjectStoreFactory::new(object_store_config.0)
+    let object_store_config = ProverObjectStoreConfig(
+        general_config
+            .prover_config
+            .clone()
+            .context("prover config")?
+            .prover_object_store
+            .context("object store")?,
+    );
+    let object_store = ObjectStoreFactory::new(object_store_config.0)
         .create_store()
-        .await;
-    let circuit_ids_for_round_to_be_proven = FriProverGroupConfig::from_env()
-        .context("FriProverGroupConfig::from_env()")?
+        .await?;
+    let circuit_ids_for_round_to_be_proven = general_config
+        .prover_group_config
+        .expect("prover_group_config")
         .get_circuit_ids_for_group_id(specialized_group_id)
         .unwrap_or_default();
     let circuit_ids_for_round_to_be_proven =
         get_all_circuit_id_round_tuples_for(circuit_ids_for_round_to_be_proven);
-    let fri_prover_config = FriProverConfig::from_env().context("FriProverConfig::from_env()")?;
+    let fri_prover_config = general_config.prover_config.context("prover config")?;
     let zone_url = &fri_prover_config.zone_read_url;
     let zone = get_zone(zone_url).await.context("get_zone()")?;
 
-    let protocol_version = ProtocolVersionId::current_prover_version();
+    let protocol_version = PROVER_PROTOCOL_SEMANTIC_VERSION;
 
     let witness_vector_generator = WitnessVectorGenerator::new(
-        blob_store,
+        object_store,
         pool,
         circuit_ids_for_round_to_be_proven.clone(),
         zone.clone(),
@@ -114,7 +125,7 @@ async fn main() -> anyhow::Result<()> {
 
     let tasks = vec![
         tokio::spawn(exporter_config.run(stop_receiver.clone())),
-        tokio::spawn(witness_vector_generator.run(stop_receiver, opt.number_of_iterations)),
+        tokio::spawn(witness_vector_generator.run(stop_receiver, opt.n_iterations)),
     ];
 
     let mut tasks = ManagedTasks::new(tasks);
diff --git a/rust-toolchain b/rust-toolchain
index 9a87fb21ccf9..5aaef38cd79d 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2023-08-21
+nightly-2024-05-07
diff --git a/yarn.lock b/yarn.lock
index 786eb127d99d..173a06e631f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,6 +7,11 @@
   resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
+"@adraffy/ens-normalize@1.10.1":
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz#63430d04bd8c5e74f8d7d049338f1cd9d4f02069"
+  integrity sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==
+
 "@ampproject/remapping@^2.2.0":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
@@ -30,6 +35,14 @@
     "@babel/highlight" "^7.24.2"
     picocolors "^1.0.0"
 
+"@babel/code-frame@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.6.tgz#ab88da19344445c3d8889af2216606d3329f3ef2"
+  integrity sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==
+  dependencies:
+    "@babel/highlight" "^7.24.6"
+    picocolors "^1.0.0"
+
 "@babel/compat-data@^7.23.5":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
@@ -66,6 +79,16 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.6.tgz#dfac82a228582a9d30c959fe50ad28951d4737a7"
+  integrity sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==
+  dependencies:
+    "@babel/types" "^7.24.6"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^2.5.1"
+
 "@babel/helper-compilation-targets@^7.23.6":
   version "7.23.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
@@ -82,6 +105,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
+"@babel/helper-environment-visitor@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz#ac7ad5517821641550f6698dd5468f8cef78620d"
+  integrity sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==
+
 "@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
@@ -90,6 +118,14 @@
     "@babel/template" "^7.22.15"
     "@babel/types" "^7.23.0"
 
+"@babel/helper-function-name@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz#cebdd063386fdb95d511d84b117e51fc68fec0c8"
+  integrity sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==
+  dependencies:
+    "@babel/template" "^7.24.6"
+    "@babel/types" "^7.24.6"
+
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
@@ -97,6 +133,13 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-hoist-variables@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz#8a7ece8c26756826b6ffcdd0e3cf65de275af7f9"
+  integrity sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==
+  dependencies:
+    "@babel/types" "^7.24.6"
+
 "@babel/helper-module-imports@^7.22.15":
   version "7.24.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
@@ -134,16 +177,33 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-split-export-declaration@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz#e830068f7ba8861c53b7421c284da30ae656d7a3"
+  integrity sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==
+  dependencies:
+    "@babel/types" "^7.24.6"
+
 "@babel/helper-string-parser@^7.23.4":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
   integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
+"@babel/helper-string-parser@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz#28583c28b15f2a3339cfafafeaad42f9a0e828df"
+  integrity sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==
+
 "@babel/helper-validator-identifier@^7.22.20":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
   integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
 
+"@babel/helper-validator-identifier@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz#08bb6612b11bdec78f3feed3db196da682454a5e"
+  integrity sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==
+
 "@babel/helper-validator-option@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
@@ -168,11 +228,26 @@
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4", "@babel/parser@^7.7.0":
+"@babel/highlight@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.6.tgz#6d610c1ebd2c6e061cade0153bf69b0590b7b3df"
+  integrity sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.24.6"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4":
   version "7.24.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
   integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
 
+"@babel/parser@^7.24.6", "@babel/parser@^7.7.0":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.6.tgz#5e030f440c3c6c78d195528c3b688b101a365328"
+  integrity sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==
+
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -280,7 +355,16 @@
     "@babel/parser" "^7.24.0"
     "@babel/types" "^7.24.0"
 
-"@babel/traverse@^7.24.1", "@babel/traverse@^7.7.0":
+"@babel/template@^7.24.6":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.6.tgz#048c347b2787a6072b24c723664c8d02b67a44f9"
+  integrity sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==
+  dependencies:
+    "@babel/code-frame" "^7.24.6"
+    "@babel/parser" "^7.24.6"
+    "@babel/types" "^7.24.6"
+
+"@babel/traverse@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
   integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
@@ -296,7 +380,23 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3", "@babel/types@^7.7.0":
+"@babel/traverse@^7.7.0":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.6.tgz#0941ec50cdeaeacad0911eb67ae227a4f8424edc"
+  integrity sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==
+  dependencies:
+    "@babel/code-frame" "^7.24.6"
+    "@babel/generator" "^7.24.6"
+    "@babel/helper-environment-visitor" "^7.24.6"
+    "@babel/helper-function-name" "^7.24.6"
+    "@babel/helper-hoist-variables" "^7.24.6"
+    "@babel/helper-split-export-declaration" "^7.24.6"
+    "@babel/parser" "^7.24.6"
+    "@babel/types" "^7.24.6"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
   integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
@@ -305,6 +405,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.24.6", "@babel/types@^7.7.0":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.6.tgz#ba4e1f59870c10dc2fa95a274ac4feec23b21912"
+  integrity sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==
+  dependencies:
+    "@babel/helper-string-parser" "^7.24.6"
+    "@babel/helper-validator-identifier" "^7.24.6"
+    to-fast-properties "^2.0.0"
+
 "@balena/dockerignore@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@balena/dockerignore/-/dockerignore-1.0.2.tgz#9ffe4726915251e8eb69f44ef3547e0da2c03e0d"
@@ -333,360 +442,6 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@cspell/cspell-bundled-dicts@8.6.1":
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.6.1.tgz#127b11ac24885aa4b725ab4ea6c0a0a18927e513"
-  integrity sha512-s6Av1xIgctYLuUiazKZjQ2WRUXc9dU38BOZXwM/lb7y8grQMEuTjST1c+8MOkZkppx48/sO7GHIF3k9rEzD3fg==
-  dependencies:
-    "@cspell/dict-ada" "^4.0.2"
-    "@cspell/dict-aws" "^4.0.1"
-    "@cspell/dict-bash" "^4.1.3"
-    "@cspell/dict-companies" "^3.0.31"
-    "@cspell/dict-cpp" "^5.1.3"
-    "@cspell/dict-cryptocurrencies" "^5.0.0"
-    "@cspell/dict-csharp" "^4.0.2"
-    "@cspell/dict-css" "^4.0.12"
-    "@cspell/dict-dart" "^2.0.3"
-    "@cspell/dict-django" "^4.1.0"
-    "@cspell/dict-docker" "^1.1.7"
-    "@cspell/dict-dotnet" "^5.0.0"
-    "@cspell/dict-elixir" "^4.0.3"
-    "@cspell/dict-en-common-misspellings" "^2.0.0"
-    "@cspell/dict-en-gb" "1.1.33"
-    "@cspell/dict-en_us" "^4.3.17"
-    "@cspell/dict-filetypes" "^3.0.3"
-    "@cspell/dict-fonts" "^4.0.0"
-    "@cspell/dict-fsharp" "^1.0.1"
-    "@cspell/dict-fullstack" "^3.1.5"
-    "@cspell/dict-gaming-terms" "^1.0.5"
-    "@cspell/dict-git" "^3.0.0"
-    "@cspell/dict-golang" "^6.0.5"
-    "@cspell/dict-haskell" "^4.0.1"
-    "@cspell/dict-html" "^4.0.5"
-    "@cspell/dict-html-symbol-entities" "^4.0.0"
-    "@cspell/dict-java" "^5.0.6"
-    "@cspell/dict-julia" "^1.0.1"
-    "@cspell/dict-k8s" "^1.0.2"
-    "@cspell/dict-latex" "^4.0.0"
-    "@cspell/dict-lorem-ipsum" "^4.0.0"
-    "@cspell/dict-lua" "^4.0.3"
-    "@cspell/dict-makefile" "^1.0.0"
-    "@cspell/dict-node" "^4.0.3"
-    "@cspell/dict-npm" "^5.0.15"
-    "@cspell/dict-php" "^4.0.6"
-    "@cspell/dict-powershell" "^5.0.3"
-    "@cspell/dict-public-licenses" "^2.0.6"
-    "@cspell/dict-python" "^4.1.11"
-    "@cspell/dict-r" "^2.0.1"
-    "@cspell/dict-ruby" "^5.0.2"
-    "@cspell/dict-rust" "^4.0.2"
-    "@cspell/dict-scala" "^5.0.0"
-    "@cspell/dict-software-terms" "^3.3.18"
-    "@cspell/dict-sql" "^2.1.3"
-    "@cspell/dict-svelte" "^1.0.2"
-    "@cspell/dict-swift" "^2.0.1"
-    "@cspell/dict-terraform" "^1.0.0"
-    "@cspell/dict-typescript" "^3.1.2"
-    "@cspell/dict-vue" "^3.0.0"
-
-"@cspell/cspell-json-reporter@8.6.1":
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.6.1.tgz#d92e86a196d9f560cde49bd37139f7a9d8cc5ec3"
-  integrity sha512-75cmJgU9iQgrDnLFIUyvgybySJJi29BPw71z+8ZO9WhNofufxoSjaWepZeYV2nK0nHXM+MbdQG5Mmj/Lv6J1FA==
-  dependencies:
-    "@cspell/cspell-types" "8.6.1"
-
-"@cspell/cspell-pipe@8.6.1":
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-8.6.1.tgz#b4ae588a331b0751be1e7e11211bcc3b54358233"
-  integrity sha512-guIlGhhOLQwfqevBSgp26b+SX4I1hCH+puAksWAk93bybKkcGtGpcavAQSN9qvamox4zcHnvGutEPF+UcXuceQ==
-
-"@cspell/cspell-resolver@8.6.1":
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-resolver/-/cspell-resolver-8.6.1.tgz#0da1b57340cadf414b7416a065d1d166b4c521cc"
-  integrity sha512-ZUbYcvEhfokHG9qfUlIylUqEobG84PiDozCkE8U4h/rTSmYkf/nAD+M6yg+jQ0F2aTFGNbvpKKGFlfXFXveX7A==
-  dependencies:
-    global-directory "^4.0.1"
-
-"@cspell/cspell-service-bus@8.6.1":
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-service-bus/-/cspell-service-bus-8.6.1.tgz#ea0b1f257de6de750ef3a4075aa0fbbfbdf92bce"
-  integrity sha512-WpI3fSW8t00UMetfd6tS8f9+xE3+ElIUO/bQ1YKK95TMIRdEUcH+QDxcHM66pJXEm4WiaN3H/MfWk1fIhGlJ8g==
-
-"@cspell/cspell-types@8.6.1":
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-8.6.1.tgz#a1cfaa0f1412662733f75015992a97072b6d65ef"
-  integrity sha512-MXa9v6sXbbwyiNno7v7vczNph6AsMNWnpMRCcW3h/siXNQYRuMssdxqT5sQJ8Kurh3M/Wo7DlKX4n74elKL3iQ==
-
-"@cspell/dict-ada@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-ada/-/dict-ada-4.0.2.tgz#8da2216660aeb831a0d9055399a364a01db5805a"
-  integrity sha512-0kENOWQeHjUlfyId/aCM/mKXtkEgV0Zu2RhUXCBr4hHo9F9vph+Uu8Ww2b0i5a4ZixoIkudGA+eJvyxrG1jUpA==
-
-"@cspell/dict-aws@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-aws/-/dict-aws-4.0.1.tgz#a0e758531ae81792b928a3f406618296291a658a"
-  integrity sha512-NXO+kTPQGqaaJKa4kO92NAXoqS+i99dQzf3/L1BxxWVSBS3/k1f3uhmqIh7Crb/n22W793lOm0D9x952BFga3Q==
-
-"@cspell/dict-bash@^4.1.3":
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-bash/-/dict-bash-4.1.3.tgz#25fba40825ac10083676ab2c777e471c3f71b36e"
-  integrity sha512-tOdI3QVJDbQSwPjUkOiQFhYcu2eedmX/PtEpVWg0aFps/r6AyjUQINtTgpqMYnYuq8O1QUIQqnpx21aovcgZCw==
-
-"@cspell/dict-companies@^3.0.31":
-  version "3.0.31"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-companies/-/dict-companies-3.0.31.tgz#f0dacabc5308096c0f12db8a8b802ece604d6bf7"
-  integrity sha512-hKVpV/lcGKP4/DpEPS8P4osPvFH/YVLJaDn9cBIOH6/HSmL5LbFgJNKpMGaYRbhm2FEX56MKE3yn/MNeNYuesQ==
-
-"@cspell/dict-cpp@^5.1.3":
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-cpp/-/dict-cpp-5.1.3.tgz#c0c34ccdecc3ff954877a56dbbf07a7bf53b218e"
-  integrity sha512-sqnriXRAInZH9W75C+APBh6dtben9filPqVbIsiRMUXGg+s02ekz0z6LbS7kXeJ5mD2qXoMLBrv13qH2eIwutQ==
-
-"@cspell/dict-cryptocurrencies@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-5.0.0.tgz#19fbc7bdbec76ce64daf7d53a6d0f3cfff7d0038"
-  integrity sha512-Z4ARIw5+bvmShL+4ZrhDzGhnc9znaAGHOEMaB/GURdS/jdoreEDY34wdN0NtdLHDO5KO7GduZnZyqGdRoiSmYA==
-
-"@cspell/dict-csharp@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-csharp/-/dict-csharp-4.0.2.tgz#e55659dbe594e744d86b1baf0f3397fe57b1e283"
-  integrity sha512-1JMofhLK+4p4KairF75D3A924m5ERMgd1GvzhwK2geuYgd2ZKuGW72gvXpIV7aGf52E3Uu1kDXxxGAiZ5uVG7g==
-
-"@cspell/dict-css@^4.0.12":
-  version "4.0.12"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-css/-/dict-css-4.0.12.tgz#59abf3512ae729835c933c38f64a3d8a5f09ce3d"
-  integrity sha512-vGBgPM92MkHQF5/2jsWcnaahOZ+C6OE/fPvd5ScBP72oFY9tn5GLuomcyO0z8vWCr2e0nUSX1OGimPtcQAlvSw==
-
-"@cspell/dict-dart@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-dart/-/dict-dart-2.0.3.tgz#75e7ffe47d5889c2c831af35acdd92ebdbd4cf12"
-  integrity sha512-cLkwo1KT5CJY5N5RJVHks2genFkNCl/WLfj+0fFjqNR+tk3tBI1LY7ldr9piCtSFSm4x9pO1x6IV3kRUY1lLiw==
-
-"@cspell/dict-data-science@^1.0.11":
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-data-science/-/dict-data-science-1.0.11.tgz#4eabba75c21d27253c1114b4fbbade0ead739ffc"
-  integrity sha512-TaHAZRVe0Zlcc3C23StZqqbzC0NrodRwoSAc8dis+5qLeLLnOCtagYQeROQvDlcDg3X/VVEO9Whh4W/z4PAmYQ==
-
-"@cspell/dict-django@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-django/-/dict-django-4.1.0.tgz#2d4b765daf3c83e733ef3e06887ea34403a4de7a"
-  integrity sha512-bKJ4gPyrf+1c78Z0Oc4trEB9MuhcB+Yg+uTTWsvhY6O2ncFYbB/LbEZfqhfmmuK/XJJixXfI1laF2zicyf+l0w==
-
-"@cspell/dict-docker@^1.1.7":
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-docker/-/dict-docker-1.1.7.tgz#bcf933283fbdfef19c71a642e7e8c38baf9014f2"
-  integrity sha512-XlXHAr822euV36GGsl2J1CkBIVg3fZ6879ZOg5dxTIssuhUOCiV2BuzKZmt6aIFmcdPmR14+9i9Xq+3zuxeX0A==
-
-"@cspell/dict-dotnet@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-dotnet/-/dict-dotnet-5.0.0.tgz#13690aafe14b240ad17a30225ac1ec29a5a6a510"
-  integrity sha512-EOwGd533v47aP5QYV8GlSSKkmM9Eq8P3G/eBzSpH3Nl2+IneDOYOBLEUraHuiCtnOkNsz0xtZHArYhAB2bHWAw==
-
-"@cspell/dict-elixir@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-elixir/-/dict-elixir-4.0.3.tgz#57c25843e46cf3463f97da72d9ef8e37c818296f"
-  integrity sha512-g+uKLWvOp9IEZvrIvBPTr/oaO6619uH/wyqypqvwpmnmpjcfi8+/hqZH8YNKt15oviK8k4CkINIqNhyndG9d9Q==
-
-"@cspell/dict-en-common-misspellings@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.0.0.tgz#708f424d75dc65237a6fcb8d253bc1e7ab641380"
-  integrity sha512-NOg8dlv37/YqLkCfBs5OXeJm/Wcfb/CzeOmOZJ2ZXRuxwsNuolb4TREUce0yAXRqMhawahY5TSDRJJBgKjBOdw==
-
-"@cspell/dict-en-gb@1.1.33":
-  version "1.1.33"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-en-gb/-/dict-en-gb-1.1.33.tgz#7f1fd90fc364a5cb77111b5438fc9fcf9cc6da0e"
-  integrity sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g==
-
-"@cspell/dict-en_us@^4.3.17":
-  version "4.3.17"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-en_us/-/dict-en_us-4.3.17.tgz#a39546b9ec4cc4fb1e9607575b2682b1155dda07"
-  integrity sha512-CS0Tb2f2YwQZ4VZ6+WLAO5uOzb0iO/iYSRl34kX4enq6quXxLYzwdfGAwv85wSYHPdga8tGiZFP+p8GPsi2JEg==
-
-"@cspell/dict-filetypes@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-filetypes/-/dict-filetypes-3.0.3.tgz#ab0723ca2f4d3d5674e9c9745efc9f144e49c905"
-  integrity sha512-J9UP+qwwBLfOQ8Qg9tAsKtSY/WWmjj21uj6zXTI9hRLD1eG1uUOLcfVovAmtmVqUWziPSKMr87F6SXI3xmJXgw==
-
-"@cspell/dict-fonts@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-fonts/-/dict-fonts-4.0.0.tgz#9bc8beb2a7b068b4fdb45cb994b36fd184316327"
-  integrity sha512-t9V4GeN/m517UZn63kZPUYP3OQg5f0OBLSd3Md5CU3eH1IFogSvTzHHnz4Wqqbv8NNRiBZ3HfdY/pqREZ6br3Q==
-
-"@cspell/dict-fsharp@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-fsharp/-/dict-fsharp-1.0.1.tgz#d62c699550a39174f182f23c8c1330a795ab5f53"
-  integrity sha512-23xyPcD+j+NnqOjRHgW3IU7Li912SX9wmeefcY0QxukbAxJ/vAN4rBpjSwwYZeQPAn3fxdfdNZs03fg+UM+4yQ==
-
-"@cspell/dict-fullstack@^3.1.5":
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-fullstack/-/dict-fullstack-3.1.5.tgz#35d18678161f214575cc613dd95564e05422a19c"
-  integrity sha512-6ppvo1dkXUZ3fbYn/wwzERxCa76RtDDl5Afzv2lijLoijGGUw5yYdLBKJnx8PJBGNLh829X352ftE7BElG4leA==
-
-"@cspell/dict-gaming-terms@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.0.5.tgz#d6ca40eb34a4c99847fd58a7354cd2c651065156"
-  integrity sha512-C3riccZDD3d9caJQQs1+MPfrUrQ+0KHdlj9iUR1QD92FgTOF6UxoBpvHUUZ9YSezslcmpFQK4xQQ5FUGS7uWfw==
-
-"@cspell/dict-git@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-git/-/dict-git-3.0.0.tgz#c275af86041a2b59a7facce37525e2af05653b95"
-  integrity sha512-simGS/lIiXbEaqJu9E2VPoYW1OTC2xrwPPXNXFMa2uo/50av56qOuaxDrZ5eH1LidFXwoc8HROCHYeKoNrDLSw==
-
-"@cspell/dict-golang@^6.0.5":
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-golang/-/dict-golang-6.0.5.tgz#4dd2e2fda419730a21fb77ade3b90241ad4a5bcc"
-  integrity sha512-w4mEqGz4/wV+BBljLxduFNkMrd3rstBNDXmoX5kD4UTzIb4Sy0QybWCtg2iVT+R0KWiRRA56QKOvBsgXiddksA==
-
-"@cspell/dict-haskell@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-haskell/-/dict-haskell-4.0.1.tgz#e9fca7c452411ff11926e23ffed2b50bb9b95e47"
-  integrity sha512-uRrl65mGrOmwT7NxspB4xKXFUenNC7IikmpRZW8Uzqbqcu7ZRCUfstuVH7T1rmjRgRkjcIjE4PC11luDou4wEQ==
-
-"@cspell/dict-html-symbol-entities@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-4.0.0.tgz#4d86ac18a4a11fdb61dfb6f5929acd768a52564f"
-  integrity sha512-HGRu+48ErJjoweR5IbcixxETRewrBb0uxQBd6xFGcxbEYCX8CnQFTAmKI5xNaIt2PKaZiJH3ijodGSqbKdsxhw==
-
-"@cspell/dict-html@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-html/-/dict-html-4.0.5.tgz#03a5182148d80e6c25f71339dbb2b7c5b9894ef8"
-  integrity sha512-p0brEnRybzSSWi8sGbuVEf7jSTDmXPx7XhQUb5bgG6b54uj+Z0Qf0V2n8b/LWwIPJNd1GygaO9l8k3HTCy1h4w==
-
-"@cspell/dict-java@^5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-java/-/dict-java-5.0.6.tgz#2462d6fc15f79ec15eb88ecf875b6ad2a7bf7a6a"
-  integrity sha512-kdE4AHHHrixyZ5p6zyms1SLoYpaJarPxrz8Tveo6gddszBVVwIUZ+JkQE1bWNLK740GWzIXdkznpUfw1hP9nXw==
-
-"@cspell/dict-julia@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-julia/-/dict-julia-1.0.1.tgz#900001417f1c4ea689530adfcc034c848458a0aa"
-  integrity sha512-4JsCLCRhhLMLiaHpmR7zHFjj1qOauzDI5ZzCNQS31TUMfsOo26jAKDfo0jljFAKgw5M2fEG7sKr8IlPpQAYrmQ==
-
-"@cspell/dict-k8s@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-k8s/-/dict-k8s-1.0.2.tgz#b19e66f4ac8a4264c0f3981ac6e23e88a60f1c91"
-  integrity sha512-tLT7gZpNPnGa+IIFvK9SP1LrSpPpJ94a/DulzAPOb1Q2UBFwdpFd82UWhio0RNShduvKG/WiMZf/wGl98pn+VQ==
-
-"@cspell/dict-latex@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-latex/-/dict-latex-4.0.0.tgz#85054903db834ea867174795d162e2a8f0e9c51e"
-  integrity sha512-LPY4y6D5oI7D3d+5JMJHK/wxYTQa2lJMSNxps2JtuF8hbAnBQb3igoWEjEbIbRRH1XBM0X8dQqemnjQNCiAtxQ==
-
-"@cspell/dict-lorem-ipsum@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-4.0.0.tgz#2793a5dbfde474a546b0caecc40c38fdf076306e"
-  integrity sha512-1l3yjfNvMzZPibW8A7mQU4kTozwVZVw0AvFEdy+NcqtbxH+TvbSkNMqROOFWrkD2PjnKG0+Ea0tHI2Pi6Gchnw==
-
-"@cspell/dict-lua@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-lua/-/dict-lua-4.0.3.tgz#2d23c8f7e74b4e62000678d80e7d1ebb10b003e0"
-  integrity sha512-lDHKjsrrbqPaea13+G9s0rtXjMO06gPXPYRjRYawbNmo4E/e3XFfVzeci3OQDQNDmf2cPOwt9Ef5lu2lDmwfJg==
-
-"@cspell/dict-makefile@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-makefile/-/dict-makefile-1.0.0.tgz#5afb2910873ebbc01ab8d9c38661c4c93d0e5a40"
-  integrity sha512-3W9tHPcSbJa6s0bcqWo6VisEDTSN5zOtDbnPabF7rbyjRpNo0uHXHRJQF8gAbFzoTzBBhgkTmrfSiuyQm7vBUQ==
-
-"@cspell/dict-node@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-node/-/dict-node-4.0.3.tgz#5ae0222d72871e82978049f8e11ea627ca42fca3"
-  integrity sha512-sFlUNI5kOogy49KtPg8SMQYirDGIAoKBO3+cDLIwD4MLdsWy1q0upc7pzGht3mrjuyMiPRUV14Bb0rkVLrxOhg==
-
-"@cspell/dict-npm@^5.0.15":
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-npm/-/dict-npm-5.0.15.tgz#c1d1646011fd0eb8ee119b481818a92223c459d1"
-  integrity sha512-sX0X5YWNW54F4baW7b5JJB6705OCBIZtUqjOghlJNORS5No7QY1IX1zc5FxNNu4gsaCZITAmfMi4ityXEsEThA==
-
-"@cspell/dict-php@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-php/-/dict-php-4.0.6.tgz#fcdee4d850f279b2757eb55c4f69a3a221ac1f7e"
-  integrity sha512-ySAXisf7twoVFZqBV2o/DKiCLIDTHNqfnj0EfH9OoOUR7HL3rb6zJkm0viLUFDO2G/8SyIi6YrN/6KX+Scjjjg==
-
-"@cspell/dict-powershell@^5.0.3":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-powershell/-/dict-powershell-5.0.3.tgz#7bceb4e7db39f87479a6d2af3a033ce26796ae49"
-  integrity sha512-lEdzrcyau6mgzu1ie98GjOEegwVHvoaWtzQnm1ie4DyZgMr+N6D0Iyj1lzvtmt0snvsDFa5F2bsYzf3IMKcpcA==
-
-"@cspell/dict-public-licenses@^2.0.6":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.6.tgz#e6ac8e5cb3b0ef8503d67da14435ae86a875b6cc"
-  integrity sha512-bHqpSpJvLCUcWxj1ov/Ki8WjmESpYwRpQlqfdchekOTc93Huhvjm/RXVN1R4fVf4Hspyem1QVkCGqAmjJMj6sw==
-
-"@cspell/dict-python@^4.1.11":
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-python/-/dict-python-4.1.11.tgz#4e339def01bf468b32d459c46ecb6894970b7eb8"
-  integrity sha512-XG+v3PumfzUW38huSbfT15Vqt3ihNb462ulfXifpQllPok5OWynhszCLCRQjQReV+dgz784ST4ggRxW452/kVg==
-  dependencies:
-    "@cspell/dict-data-science" "^1.0.11"
-
-"@cspell/dict-r@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-r/-/dict-r-2.0.1.tgz#73474fb7cce45deb9094ebf61083fbf5913f440a"
-  integrity sha512-KCmKaeYMLm2Ip79mlYPc8p+B2uzwBp4KMkzeLd5E6jUlCL93Y5Nvq68wV5fRLDRTf7N1LvofkVFWfDcednFOgA==
-
-"@cspell/dict-ruby@^5.0.2":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-ruby/-/dict-ruby-5.0.2.tgz#cf1a71380c633dec0857143d3270cb503b10679a"
-  integrity sha512-cIh8KTjpldzFzKGgrqUX4bFyav5lC52hXDKo4LbRuMVncs3zg4hcSf4HtURY+f2AfEZzN6ZKzXafQpThq3dl2g==
-
-"@cspell/dict-rust@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-rust/-/dict-rust-4.0.2.tgz#e9111f0105ee6d836a1be8314f47347fd9f8fc3a"
-  integrity sha512-RhziKDrklzOntxAbY3AvNR58wnFGIo3YS8+dNeLY36GFuWOvXDHFStYw5Pod4f/VXbO/+1tXtywCC4zWfB2p1w==
-
-"@cspell/dict-scala@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-scala/-/dict-scala-5.0.0.tgz#b64365ad559110a36d44ccd90edf7151ea648022"
-  integrity sha512-ph0twaRoV+ylui022clEO1dZ35QbeEQaKTaV2sPOsdwIokABPIiK09oWwGK9qg7jRGQwVaRPEq0Vp+IG1GpqSQ==
-
-"@cspell/dict-software-terms@^3.3.18":
-  version "3.3.18"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-3.3.18.tgz#f25863c316eea195d74b170d41711e2c7402e9ca"
-  integrity sha512-LJZGGMGqS8KzgXJrSMs3T+6GoqHG9z8Bc+rqLzLzbtoR3FbsMasE9U8oP2PmS3q7jJLFjQkzmg508DrcuZuo2g==
-
-"@cspell/dict-sql@^2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-sql/-/dict-sql-2.1.3.tgz#8d9666a82e35b310d0be4064032c0d891fbd2702"
-  integrity sha512-SEyTNKJrjqD6PAzZ9WpdSu6P7wgdNtGV2RV8Kpuw1x6bV+YsSptuClYG+JSdRExBTE6LwIe1bTklejUp3ZP8TQ==
-
-"@cspell/dict-svelte@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-svelte/-/dict-svelte-1.0.2.tgz#0c866b08a7a6b33bbc1a3bdbe6a1b484ca15cdaa"
-  integrity sha512-rPJmnn/GsDs0btNvrRBciOhngKV98yZ9SHmg8qI6HLS8hZKvcXc0LMsf9LLuMK1TmS2+WQFAan6qeqg6bBxL2Q==
-
-"@cspell/dict-swift@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-swift/-/dict-swift-2.0.1.tgz#06ec86e52e9630c441d3c19605657457e33d7bb6"
-  integrity sha512-gxrCMUOndOk7xZFmXNtkCEeroZRnS2VbeaIPiymGRHj5H+qfTAzAKxtv7jJbVA3YYvEzWcVE2oKDP4wcbhIERw==
-
-"@cspell/dict-terraform@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-terraform/-/dict-terraform-1.0.0.tgz#c7b073bb3a03683f64cc70ccaa55ce9742c46086"
-  integrity sha512-Ak+vy4HP/bOgzf06BAMC30+ZvL9mzv21xLM2XtfnBLTDJGdxlk/nK0U6QT8VfFLqJ0ZZSpyOxGsUebWDCTr/zQ==
-
-"@cspell/dict-typescript@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-typescript/-/dict-typescript-3.1.2.tgz#14d05f54db2984feaa24ea133b583d19c04cc104"
-  integrity sha512-lcNOYWjLUvDZdLa0UMNd/LwfVdxhE9rKA+agZBGjL3lTA3uNvH7IUqSJM/IXhJoBpLLMVEOk8v1N9xi+vDuCdA==
-
-"@cspell/dict-vue@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-vue/-/dict-vue-3.0.0.tgz#68ccb432ad93fcb0fd665352d075ae9a64ea9250"
-  integrity sha512-niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A==
-
-"@cspell/dynamic-import@8.6.1":
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dynamic-import/-/dynamic-import-8.6.1.tgz#bc627779db48b39feb1536741534901c57e0a277"
-  integrity sha512-Fjvkcb5umIAcHfw/iiciYWgO2mXVuRZzQAWPSub6UFCxxcJlRz39YPXa+3O/m3lnXCeo8ChoaEN8qnuV4ogk6g==
-  dependencies:
-    import-meta-resolve "^4.0.0"
-
-"@cspell/strong-weak-map@8.6.1":
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/@cspell/strong-weak-map/-/strong-weak-map-8.6.1.tgz#33c58f0d799624981399751dfb0c67328f0efdec"
-  integrity sha512-X6/7cy+GGVJFXsfrZapxVKn5mtehNTr7hTlg0bVj3iFoNYEPW9zq9l6WIcI4psmaU8G4DSrNsBK7pp87W3u16A==
-
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
@@ -1012,7 +767,7 @@
     "@ethersproject/bytes" "^5.7.0"
     "@ethersproject/properties" "^5.7.0"
 
-"@ethersproject/bignumber@5.5.0", "@ethersproject/bignumber@~5.5.0":
+"@ethersproject/bignumber@5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.5.0.tgz#875b143f04a216f4f8b96245bde942d42d279527"
   integrity sha512-6Xytlwvy6Rn3U3gKEc1vP7nR92frHkv6wtVr95LFR3jREXiCPzdWxKQ1cx4JGQBXxcguAwjA8murlYN2TSiEbg==
@@ -1669,6 +1424,18 @@
   resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
   integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1936,6 +1703,21 @@
     chalk "4.1.2"
     ts-morph "^19.0.0"
 
+"@matterlabs/hardhat-zksync-deploy@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-deploy/-/hardhat-zksync-deploy-1.3.0.tgz#5c2b723318ddf6c4d3929ec225401864ff54557a"
+  integrity sha512-4UHOgOwIBC4JA3W8DE9GHqbAuBhCPAjtM+Oew1aiYYGkIsPUAMYsH35+4I2FzJsYyE6mD6ATmoS/HfZweQHTlQ==
+  dependencies:
+    "@matterlabs/hardhat-zksync-solc" "^1.0.4"
+    chai "^4.3.6"
+    chalk "4.1.2"
+    fs-extra "^11.2.0"
+    glob "^10.3.10"
+    lodash "^4.17.21"
+    sinon "^17.0.1"
+    sinon-chai "^3.7.0"
+    ts-morph "^21.0.1"
+
 "@matterlabs/hardhat-zksync-node@^0.0.1-beta.7":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-node/-/hardhat-zksync-node-0.0.1.tgz#d44bda3c0069b149e2a67c9697eb81166b169ea6"
@@ -1978,7 +1760,7 @@
     chalk "4.1.2"
     dockerode "^3.3.4"
 
-"@matterlabs/hardhat-zksync-solc@^1.0.5", "@matterlabs/hardhat-zksync-solc@^1.1.4":
+"@matterlabs/hardhat-zksync-solc@^1.0.4", "@matterlabs/hardhat-zksync-solc@^1.0.5", "@matterlabs/hardhat-zksync-solc@^1.1.4":
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-solc/-/hardhat-zksync-solc-1.1.4.tgz#04a2fad6fb6b6944c64ad969080ee65b9af3f617"
   integrity sha512-4/usbogh9neewR2/v8Dn2OzqVblZMUuT/iH2MyPZgPRZYQlL4SlZtMvokU9UQjZT6iSoaKCbbdWESHDHSzfUjA==
@@ -1995,6 +1777,23 @@
     sinon-chai "^3.7.0"
     undici "^5.14.0"
 
+"@matterlabs/hardhat-zksync-solc@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-solc/-/hardhat-zksync-solc-1.2.0.tgz#c1ccd1eca0381840196f220b339da08320ad9583"
+  integrity sha512-zM3LY6jeCVfFe2MZfiK/6k8GUcxk9BcCBiNs1Ywh4PZ4OaabYOP3HuFFmVo89BFisIRROnQ+IyT9fayKKVbFCg==
+  dependencies:
+    "@nomiclabs/hardhat-docker" "^2.0.2"
+    chai "^4.3.4"
+    chalk "^4.1.2"
+    debug "^4.3.5"
+    dockerode "^4.0.2"
+    fs-extra "^11.2.0"
+    proper-lockfile "^4.1.2"
+    semver "^7.6.2"
+    sinon "^18.0.0"
+    sinon-chai "^3.7.0"
+    undici "^6.18.2"
+
 "@matterlabs/hardhat-zksync-verify@^0.2.0":
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-verify/-/hardhat-zksync-verify-0.2.2.tgz#daa34bc4404096ed0f44461ee366c1cb0e5a4f2f"
@@ -2006,7 +1805,26 @@
     chalk "4.1.2"
     dockerode "^3.3.4"
 
-"@matterlabs/hardhat-zksync-vyper@^1.0.0":
+"@matterlabs/hardhat-zksync-verify@^1.4.3":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-verify/-/hardhat-zksync-verify-1.5.0.tgz#a04ef9aed6fee1c4571aa7f9ba15ea452d49dd1c"
+  integrity sha512-dHprx+QNfGgoWYpSMHinXIjGyrC31TgiYlYxfnKmRLzfG4/ge3uirS0N2BDmo2Cl+S0SqzMrc4BJoDfnkA6tKw==
+  dependencies:
+    "@ethersproject/abi" "^5.7.0"
+    "@ethersproject/address" "5.7.0"
+    "@matterlabs/hardhat-zksync-solc" "^1.2.0"
+    "@nomicfoundation/hardhat-verify" "^2.0.8"
+    axios "^1.7.2"
+    cbor "^9.0.2"
+    chai "^4.3.4"
+    chalk "^4.1.2"
+    debug "^4.3.5"
+    hardhat "^2.22.5"
+    semver "^7.6.2"
+    sinon "^18.0.0"
+    sinon-chai "^3.7.0"
+
+"@matterlabs/hardhat-zksync-vyper@^1.0.8":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-vyper/-/hardhat-zksync-vyper-1.0.8.tgz#d5bd496715a1e322b0bf3926b4146b4e18ab64ff"
   integrity sha512-XR7rbfDuBG5/LZWYfhQTP9gD+U24hSJHDuZ9U55wgIfiQTOxPoztFwEbQNiC39vjT5MjP/Nv8/IDrlEBkaVCgw==
@@ -2037,6 +1855,13 @@
     tweetnacl "^1.0.3"
     tweetnacl-util "^0.15.1"
 
+"@noble/curves@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.2.0.tgz#92d7e12e4e49b23105a2555c6984d41733d65c35"
+  integrity sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==
+  dependencies:
+    "@noble/hashes" "1.3.2"
+
 "@noble/curves@1.3.0", "@noble/curves@~1.3.0":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.3.0.tgz#01be46da4fd195822dab821e72f71bf4aeec635e"
@@ -2049,6 +1874,11 @@
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.2.0.tgz#a3150eeb09cc7ab207ebf6d7b9ad311a9bdbed12"
   integrity sha512-FZfhjEDbT5GRswV3C6uvLPHMiVD6lQBmpoX5+eSiPaMTXte/IKqI5dykDxzZB/WBeK/CDuQRBWarPdi3FNY2zQ==
 
+"@noble/hashes@1.3.2":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.2.tgz#6f26dbc8fbc7205873ce3cee2f690eba0d421b39"
+  integrity sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==
+
 "@noble/hashes@1.3.3", "@noble/hashes@~1.3.2":
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.3.3.tgz#39908da56a4adc270147bb07968bf3b16cfe1699"
@@ -2090,31 +1920,61 @@
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.3.4.tgz#e5aac2b7726f44cffe120bdd7e25e1f120471591"
   integrity sha512-tjavrUFLWnkn0PI+jk0D83hP2jjbmeXT1QLd5NtIleyGrJ00ZWVl+sfuA2Lle3kzfOceoI2VTR0n1pZB4KJGbQ==
 
+"@nomicfoundation/edr-darwin-arm64@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.4.0.tgz#bbb43f0e01f40839b0bd38c2c443cb6910ae955f"
+  integrity sha512-7+rraFk9tCqvfemv9Ita5vTlSBAeO/S5aDKOgGRgYt0JEKZlrX161nDW6UfzMPxWl9GOLEDUzCEaYuNmXseUlg==
+
 "@nomicfoundation/edr-darwin-x64@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.3.4.tgz#cbcc0a2dcda0a7c0a900a74efc6918cff134dc23"
   integrity sha512-dXO0vlIoBosp8gf5/ah3dESMymjwit0Daef1E4Ew3gZ8q3LAdku0RC+YEQJi9f0I3QNfdgIrBTzibRZUoP+kVA==
 
+"@nomicfoundation/edr-darwin-x64@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.4.0.tgz#b1ffcd9142418fd8498de34a7336b3f977907c86"
+  integrity sha512-+Hrc0mP9L6vhICJSfyGo/2taOToy1AIzVZawO3lU8Lf7oDQXfhQ4UkZnkWAs9SVu1eUwHUGGGE0qB8644piYgg==
+
 "@nomicfoundation/edr-linux-arm64-gnu@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.3.4.tgz#12073f97d310176bb24ad7d48c25128ea8eff093"
   integrity sha512-dv38qmFUaqkkeeA9S0JjerqruytTfHav7gbPLpZUAEXPlJGo49R0+HQxd45I0msbm6NAXbkmKEchTLApp1ohaA==
 
+"@nomicfoundation/edr-linux-arm64-gnu@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.4.0.tgz#8173d16d4f6f2b3e82ba7096d2a1ea3619d8bfa7"
+  integrity sha512-4HUDMchNClQrVRfVTqBeSX92hM/3khCgpZkXP52qrnJPqgbdCxosOehlQYZ65wu0b/kaaZSyvACgvCLSQ5oSzQ==
+
 "@nomicfoundation/edr-linux-arm64-musl@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.3.4.tgz#c9bc685d4d14bf21d9c3e326edd44e009e24492d"
   integrity sha512-CfEsb6gdCMVIlRSpWYTxoongEKHB60V6alE/y8mkfjIo7tA95wyiuvCtyo3fpiia3wQV7XoMYgIJHObHiKLKtA==
 
+"@nomicfoundation/edr-linux-arm64-musl@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.4.0.tgz#b1ce293a7c3e0d9f70391e1aef1a82b83b997567"
+  integrity sha512-D4J935ZRL8xfnP3zIFlCI9jXInJ0loDUkCTLeCEbOf2uuDumWDghKNQlF1itUS+EHaR1pFVBbuwqq8hVK0dASg==
+
 "@nomicfoundation/edr-linux-x64-gnu@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.3.4.tgz#37486cbe317b8caf7961e500fc0150c45c895a56"
   integrity sha512-V0CpJA2lYWulgTR+zP11ftBAEwkpMAAki/AuMu3vd7HoPfjwIDzWDQR5KFU17qFmqAVz0ICRxsxDlvvBZ/PUxA==
 
+"@nomicfoundation/edr-linux-x64-gnu@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.4.0.tgz#4c12c4e4bfd3d837f5663ad7cbf7cb6d5634ef83"
+  integrity sha512-6x7HPy+uN5Cb9N77e2XMmT6+QSJ+7mRbHnhkGJ8jm4cZvWuj2Io7npOaeHQ3YHK+TiQpTnlbkjoOIpEwpY3XZA==
+
 "@nomicfoundation/edr-linux-x64-musl@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.3.4.tgz#399278807100a1833f6c8a39c17d5beaaf7a9223"
   integrity sha512-0sgTrwZajarukerU/QSb+oRdlQLnJdd7of8OlXq2wtpeTNTqemgCOwY2l2qImbWboMpVrYgcmGbINXNVPCmuJw==
 
+"@nomicfoundation/edr-linux-x64-musl@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.4.0.tgz#8842004aa1a47c504f10863687da28b65dca7baa"
+  integrity sha512-3HFIJSXgyubOiaN4MWGXx2xhTnhwlJk0PiSYNf9+L/fjBtcRkb2nM910ZJHTvqCb6OT98cUnaKuAYdXIW2amgw==
+
 "@nomicfoundation/edr-win32-arm64-msvc@0.3.4":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-win32-arm64-msvc/-/edr-win32-arm64-msvc-0.3.4.tgz#879028e2708538fd54efc349c1a4de107a15abb4"
@@ -2130,6 +1990,11 @@
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.3.4.tgz#abfc447eb6bd1a9be868bec5c9d14546398ab609"
   integrity sha512-fResvsL/fSucep1K5W6iOs8lqqKKovHLsAmigMzAYVovqkyZKgCGVS/D8IVxA0nxuGCOlNxFnVmwWtph3pbKWA==
 
+"@nomicfoundation/edr-win32-x64-msvc@0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.4.0.tgz#29d8bbb2edf9912a95f5453855cf17cdcb269957"
+  integrity sha512-CP4GsllEfXEz+lidcGYxKe5rDJ60TM5/blB5z/04ELVvw6/CK9eLcYeku7HV0jvV7VE6dADYKSdQyUkvd0El+A==
+
 "@nomicfoundation/edr@^0.3.1":
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/edr/-/edr-0.3.4.tgz#e8eaf41963460139c47b0785f1a6a2a1c1b24ae0"
@@ -2145,6 +2010,19 @@
     "@nomicfoundation/edr-win32-ia32-msvc" "0.3.4"
     "@nomicfoundation/edr-win32-x64-msvc" "0.3.4"
 
+"@nomicfoundation/edr@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/edr/-/edr-0.4.0.tgz#4895ecb6ef321136db837458949c37cce4a29459"
+  integrity sha512-T96DMSogO8TCdbKKctvxfsDljbhFOUKWc9fHJhSeUh71EEho2qR4951LKQF7t7UWEzguVYh/idQr5L/E3QeaMw==
+  dependencies:
+    "@nomicfoundation/edr-darwin-arm64" "0.4.0"
+    "@nomicfoundation/edr-darwin-x64" "0.4.0"
+    "@nomicfoundation/edr-linux-arm64-gnu" "0.4.0"
+    "@nomicfoundation/edr-linux-arm64-musl" "0.4.0"
+    "@nomicfoundation/edr-linux-x64-gnu" "0.4.0"
+    "@nomicfoundation/edr-linux-x64-musl" "0.4.0"
+    "@nomicfoundation/edr-win32-x64-msvc" "0.4.0"
+
 "@nomicfoundation/ethereumjs-common@4.0.4":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.4.tgz#9901f513af2d4802da87c66d6f255b510bef5acb"
@@ -2209,6 +2087,21 @@
     table "^6.8.0"
     undici "^5.14.0"
 
+"@nomicfoundation/hardhat-verify@^2.0.8":
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/@nomicfoundation/hardhat-verify/-/hardhat-verify-2.0.8.tgz#6a77dc03de990a1a3aa8e6dc073c393263dbf258"
+  integrity sha512-x/OYya7A2Kcz+3W/J78dyDHxr0ezU23DKTrRKfy5wDPCnePqnr79vm8EXqX3gYps6IjPBYyGPZ9K6E5BnrWx5Q==
+  dependencies:
+    "@ethersproject/abi" "^5.1.2"
+    "@ethersproject/address" "^5.0.2"
+    cbor "^8.1.0"
+    chalk "^2.4.2"
+    debug "^4.1.1"
+    lodash.clonedeep "^4.5.0"
+    semver "^6.3.0"
+    table "^6.8.0"
+    undici "^5.14.0"
+
 "@nomicfoundation/solidity-analyzer-darwin-arm64@0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@nomicfoundation/solidity-analyzer-darwin-arm64/-/solidity-analyzer-darwin-arm64-0.1.1.tgz#4c858096b1c17fe58a474fe81b46815f93645c15"
@@ -2275,7 +2168,7 @@
     "@nomicfoundation/solidity-analyzer-win32-ia32-msvc" "0.1.1"
     "@nomicfoundation/solidity-analyzer-win32-x64-msvc" "0.1.1"
 
-"@nomiclabs/hardhat-docker@^2.0.0":
+"@nomiclabs/hardhat-docker@^2.0.0", "@nomiclabs/hardhat-docker@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-docker/-/hardhat-docker-2.0.2.tgz#ae964be17951275a55859ff7358e9e7c77448846"
   integrity sha512-XgGEpRT3wlA1VslyB57zyAHV+oll8KnV1TjwnxxC1tpAL04/lbdwpdO5KxInVN8irMSepqFpsiSkqlcnvbE7Ng==
@@ -2305,10 +2198,10 @@
     table "^6.8.0"
     undici "^5.14.0"
 
-"@nomiclabs/hardhat-vyper@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-vyper/-/hardhat-vyper-3.0.5.tgz#44594b8a27e9c627534013fdebe6a485275f846e"
-  integrity sha512-i/Q771sr4vnSTaNTMGe3kX4Nl2on7hiXHHcz1MrW0+MKAJfi3A4sEloXX3aim6TylCPFq0M1/esDX+Y0WPmfbQ==
+"@nomiclabs/hardhat-vyper@^3.0.6":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-vyper/-/hardhat-vyper-3.0.6.tgz#ffad8028e4e002a92029cc4ba5c098b796ad74fb"
+  integrity sha512-htemsSSF8JYIemL/HI7fTPZfby0uo+5Ue4K9sG42jMdK+wT4wiOxnO4ZFGQAEJTICiDtu2MCfMq0qmCCmrT7ww==
   dependencies:
     debug "^4.1.1"
     fs-extra "^7.0.1"
@@ -2336,6 +2229,11 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.6.tgz#2a880a24eb19b4f8b25adc2a5095f2aa27f39677"
   integrity sha512-xSmezSupL+y9VkHZJGDoCBpmnB2ogM13ccaYDWqJTfS3dbuHkgjuwDFUmaFauBCboQMGB/S5UqUl2y54X99BmA==
 
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
 "@pkgr/core@^0.1.0":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
@@ -2550,7 +2448,7 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/commons@^3.0.0":
+"@sinonjs/commons@^3.0.0", "@sinonjs/commons@^3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
   integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
@@ -2633,6 +2531,16 @@
     mkdirp "^2.1.6"
     path-browserify "^1.0.1"
 
+"@ts-morph/common@~0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.22.0.tgz#8951d451622a26472fbc3a227d6c3a90e687a683"
+  integrity sha512-HqNBuV/oIlMKdkLshXd1zKBqNQCsuPEsgQOkfFQ/eUKjRlwndXW1AjN9LVkBEIukm00gGXSRmfkl0Wv5VXLnlw==
+  dependencies:
+    fast-glob "^3.3.2"
+    minimatch "^9.0.3"
+    mkdirp "^3.0.1"
+    path-browserify "^1.0.1"
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
@@ -2888,6 +2796,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a"
   integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ==
 
+"@types/node@18.15.13":
+  version "18.15.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.13.tgz#f64277c341150c979e42b00e4ac289290c9df469"
+  integrity sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==
+
 "@types/node@^10.0.3":
   version "10.17.60"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
@@ -3206,6 +3119,11 @@ aes-js@3.0.0:
   resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-3.0.0.tgz#e21df10ad6c2053295bcbb8dab40b09dbea87e4d"
   integrity sha512-H7wUZRn8WpTq9jocdxQ2c8x2sKo9ZVmzfRE13GiNJXfp7NcKYEdvl3vspKjXox6RIG2VtaRe4JFvxG4rqp2Zuw==
 
+aes-js@4.0.0-beta.5:
+  version "4.0.0-beta.5"
+  resolved "https://registry.yarnpkg.com/aes-js/-/aes-js-4.0.0-beta.5.tgz#8d2452c52adedebc3a3e28465d858c11ca315873"
+  integrity sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==
+
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -3314,6 +3232,11 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 antlr4@^4.11.0:
   version "4.13.1"
   resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.13.1.tgz#1e0a1830a08faeb86217cb2e6c34716004e4253d"
@@ -3393,11 +3316,6 @@ array-includes@^3.1.7:
     get-intrinsic "^1.2.4"
     is-string "^1.0.7"
 
-array-timsort@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-timsort/-/array-timsort-1.0.3.tgz#3c9e4199e54fb2b9c3fe5976396a21614ef0d926"
-  integrity sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -3543,6 +3461,15 @@ axios@^1.4.0, axios@^1.5.1:
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
+axios@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
+  integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
+  dependencies:
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 babel-eslint@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
@@ -3896,7 +3823,7 @@ call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
     get-intrinsic "^1.2.4"
     set-function-length "^1.2.1"
 
-callsites@^3.0.0, callsites@^3.1.0:
+callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
@@ -3933,6 +3860,13 @@ cbor@^8.1.0:
   dependencies:
     nofilter "^3.1.0"
 
+cbor@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/cbor/-/cbor-9.0.2.tgz#536b4f2d544411e70ec2b19a2453f10f83cd9fdb"
+  integrity sha512-JPypkxsB10s9QOWwa6zwPzqE1Md3vqpPc+cai4sAecuCsRyAtAl/pMyhPlMbT/xtPnm2dznJZYRLui57qiRhaQ==
+  dependencies:
+    nofilter "^3.1.0"
+
 chai-as-promised@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
@@ -3953,13 +3887,6 @@ chai@^4.3.10, chai@^4.3.4, chai@^4.3.6:
     pathval "^1.1.1"
     type-detect "^4.0.8"
 
-chalk-template@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/chalk-template/-/chalk-template-1.1.0.tgz#ffc55db6dd745e9394b85327c8ac8466edb7a7b1"
-  integrity sha512-T2VJbcDuZQ0Tb2EWwSotMPJjgpy1/tGee1BTpUNsGZ/qgNjV2t7Mvu+d4600U564nbLesN1x2dPL+xii174Ekg==
-  dependencies:
-    chalk "^5.2.0"
-
 chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
@@ -3977,11 +3904,6 @@ chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^5.2.0, chalk@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
-  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
-
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
@@ -4067,14 +3989,6 @@ clean-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-clear-module@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/clear-module/-/clear-module-4.1.2.tgz#5a58a5c9f8dccf363545ad7284cad3c887352a80"
-  integrity sha512-LWAxzHqdHsAZlPlEyJ2Poz6AIs384mPeqLVCru2p0BrP9G/kVGuhNyZYClLO6cXlnuJjzC8xtsJIuMjKqLXoAw==
-  dependencies:
-    parent-module "^2.0.0"
-    resolve-from "^5.0.0"
-
 cli-boxes@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
@@ -4231,11 +4145,6 @@ commander@^10.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
   integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
-commander@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-12.0.0.tgz#b929db6df8546080adfd004ab215ed48cf6f2592"
-  integrity sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==
-
 commander@^2.19.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -4268,17 +4177,6 @@ commander@~9.4.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
   integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
 
-comment-json@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.3.tgz#50b487ebbf43abe44431f575ebda07d30d015365"
-  integrity sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==
-  dependencies:
-    array-timsort "^1.0.3"
-    core-util-is "^1.0.3"
-    esprima "^4.0.1"
-    has-own-prop "^2.0.0"
-    repeat-string "^1.6.1"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -4294,17 +4192,6 @@ concat-stream@^1.6.0, concat-stream@^1.6.2, concat-stream@~1.6.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-configstore@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-6.0.0.tgz#49eca2ebc80983f77e09394a1a56e0aca8235566"
-  integrity sha512-cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA==
-  dependencies:
-    dot-prop "^6.0.1"
-    graceful-fs "^4.2.6"
-    unique-string "^3.0.0"
-    write-file-atomic "^3.0.3"
-    xdg-basedir "^5.0.1"
-
 convert-source-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
@@ -4330,7 +4217,7 @@ core-util-is@1.0.2:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
-core-util-is@^1.0.3, core-util-is@~1.0.0:
+core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
@@ -4410,7 +4297,7 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -4429,123 +4316,6 @@ crypto-js@^4.2.0:
   resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
   integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
 
-crypto-random-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-4.0.0.tgz#5a3cc53d7dd86183df5da0312816ceeeb5bb1fc2"
-  integrity sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==
-  dependencies:
-    type-fest "^1.0.1"
-
-cspell-config-lib@8.6.1:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/cspell-config-lib/-/cspell-config-lib-8.6.1.tgz#951052d985756e684c540f92f8c6c4df25869519"
-  integrity sha512-I6LatgXJb8mxKFzIywO81TlUD/qWnUDrhB6yTUPdP90bwZcXMmGoCsZxhd2Rvl9fz5fWne0T839I1coShfm86g==
-  dependencies:
-    "@cspell/cspell-types" "8.6.1"
-    comment-json "^4.2.3"
-    yaml "^2.4.1"
-
-cspell-dictionary@8.6.1:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/cspell-dictionary/-/cspell-dictionary-8.6.1.tgz#c39a86ddd2ec5d31783414ff963db65c838177bc"
-  integrity sha512-0SfKPi1QoWbGpZ/rWMR7Jn0+GaQT9PAMLWjVOu66PUNUXI5f4oCTHpnZE1Xts+5VX8shZC3TAMHEgtgKuQn4RQ==
-  dependencies:
-    "@cspell/cspell-pipe" "8.6.1"
-    "@cspell/cspell-types" "8.6.1"
-    cspell-trie-lib "8.6.1"
-    fast-equals "^5.0.1"
-    gensequence "^7.0.0"
-
-cspell-gitignore@8.6.1:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-8.6.1.tgz#abb25f15ef25377cf0f071dba958635bd9ded4e8"
-  integrity sha512-3gtt351sSDfN826aMXTqGHVLz2lz9ZHr8uemImUc24Q+676sXkJM9lXzqP8PUqwGhLyt5qSf+9pt0ieNwQy/cA==
-  dependencies:
-    cspell-glob "8.6.1"
-    find-up-simple "^1.0.0"
-
-cspell-glob@8.6.1:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-8.6.1.tgz#6d80f703e9df15d0f63d3b36dcd5bc07ca908325"
-  integrity sha512-QjtngIR0XsUQLmHHDO86hps/JR5sRxSBwCvcsNCEmSdpdofLFc8cuxi3o33JWge7UAPBCQOLGfpA7/Wx31srmw==
-  dependencies:
-    micromatch "^4.0.5"
-
-cspell-grammar@8.6.1:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/cspell-grammar/-/cspell-grammar-8.6.1.tgz#d623475a0752b662769fc2a4de4745c25f7c0cbd"
-  integrity sha512-MaG0e/F0b2FnIRULCZ61JxEiJgTP/6rsbUoR5nG9X+WmJYItYmxC1F/FPPrVeTu+jJr/8O4pdnslE20pimHaCw==
-  dependencies:
-    "@cspell/cspell-pipe" "8.6.1"
-    "@cspell/cspell-types" "8.6.1"
-
-cspell-io@8.6.1:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-8.6.1.tgz#3b0fc769a609df8b027d3f189272f59ec3c0f642"
-  integrity sha512-ofxBB8QtUPvh/bOwKLYsqU1hwQCet8E98jkn/5f4jtG+/x5Zd80I0Ez+tlbjiBmrrQfOKh+i8ipfzHD8JtoreQ==
-  dependencies:
-    "@cspell/cspell-service-bus" "8.6.1"
-
-cspell-lib@8.6.1:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-8.6.1.tgz#691b1fc80c128eea3c4a24b59d20b1de95a912e2"
-  integrity sha512-kGeDUypRtThFT81IdUK7yU8eUwO5MYWj8pGQ0N8WFsqbCahJrUdcocceVSpnCX48W3CXu12DkqYG9kv5Umn7Xw==
-  dependencies:
-    "@cspell/cspell-bundled-dicts" "8.6.1"
-    "@cspell/cspell-pipe" "8.6.1"
-    "@cspell/cspell-resolver" "8.6.1"
-    "@cspell/cspell-types" "8.6.1"
-    "@cspell/dynamic-import" "8.6.1"
-    "@cspell/strong-weak-map" "8.6.1"
-    clear-module "^4.1.2"
-    comment-json "^4.2.3"
-    configstore "^6.0.0"
-    cspell-config-lib "8.6.1"
-    cspell-dictionary "8.6.1"
-    cspell-glob "8.6.1"
-    cspell-grammar "8.6.1"
-    cspell-io "8.6.1"
-    cspell-trie-lib "8.6.1"
-    fast-equals "^5.0.1"
-    gensequence "^7.0.0"
-    import-fresh "^3.3.0"
-    resolve-from "^5.0.0"
-    vscode-languageserver-textdocument "^1.0.11"
-    vscode-uri "^3.0.8"
-
-cspell-trie-lib@8.6.1:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-8.6.1.tgz#7ff0e5992602808aa50d292bccd2b2e9484f5c28"
-  integrity sha512-iuJuAyWoqTH/TpFAR/ISJGQQoW3oiw54GyvXIucPoCJt/jgQONDuzqPW+skiLvcgcTbXCN9dutZTb2gImIkmpw==
-  dependencies:
-    "@cspell/cspell-pipe" "8.6.1"
-    "@cspell/cspell-types" "8.6.1"
-    gensequence "^7.0.0"
-
-cspell@^8.3.2:
-  version "8.6.1"
-  resolved "https://registry.yarnpkg.com/cspell/-/cspell-8.6.1.tgz#b3fd935c2bcbec64b47377a4de5b569ab50daa47"
-  integrity sha512-/Qle15v4IQe7tViSWX0+RCZJ2HJ4HUCZV9Z4uOVasNUz+DWCrxysNR+pfCRYuLX/6lQdqCM9QCR9GZc7a2KIVA==
-  dependencies:
-    "@cspell/cspell-json-reporter" "8.6.1"
-    "@cspell/cspell-pipe" "8.6.1"
-    "@cspell/cspell-types" "8.6.1"
-    "@cspell/dynamic-import" "8.6.1"
-    chalk "^5.3.0"
-    chalk-template "^1.1.0"
-    commander "^12.0.0"
-    cspell-gitignore "8.6.1"
-    cspell-glob "8.6.1"
-    cspell-io "8.6.1"
-    cspell-lib "8.6.1"
-    fast-glob "^3.3.2"
-    fast-json-stable-stringify "^2.1.0"
-    file-entry-cache "^8.0.0"
-    get-stdin "^9.0.0"
-    semver "^7.6.0"
-    strip-ansi "^7.1.0"
-    vscode-uri "^3.0.8"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -4613,6 +4383,13 @@ debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
+  dependencies:
+    ms "2.1.2"
+
 decamelize@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
@@ -4706,7 +4483,7 @@ diff@^4.0.1:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
-diff@^5.1.0:
+diff@^5.1.0, diff@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531"
   integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==
@@ -4801,13 +4578,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dot-prop@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083"
-  integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==
-  dependencies:
-    is-obj "^2.0.0"
-
 dotenv@^16.0.3:
   version "16.4.5"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
@@ -4818,6 +4588,11 @@ dotenv@^8.2.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -4884,6 +4659,11 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
 encoding-down@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/encoding-down/-/encoding-down-6.3.0.tgz#b1c4eb0e1728c146ecaef8e32963c549e76d082b"
@@ -5295,7 +5075,7 @@ esprima@2.7.x, esprima@^2.7.1:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
   integrity sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==
 
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -5492,6 +5272,19 @@ ethers@^5.0.2, ethers@^5.7.0, ethers@^5.7.2, ethers@~5.7.0:
     "@ethersproject/web" "5.7.1"
     "@ethersproject/wordlists" "5.7.0"
 
+ethers@^6.7.1:
+  version "6.12.1"
+  resolved "https://registry.yarnpkg.com/ethers/-/ethers-6.12.1.tgz#517ff6d66d4fd5433e38e903051da3e57c87ff37"
+  integrity sha512-j6wcVoZf06nqEcBbDWkKg8Fp895SS96dSnTCjiXT+8vt2o02raTn4Lo9ERUuIVU5bAjoPYeA+7ytQFexFmLuVw==
+  dependencies:
+    "@adraffy/ens-normalize" "1.10.1"
+    "@noble/curves" "1.2.0"
+    "@noble/hashes" "1.3.2"
+    "@types/node" "18.15.13"
+    aes-js "4.0.0-beta.5"
+    tslib "2.4.0"
+    ws "8.5.0"
+
 ethers@~5.5.0:
   version "5.5.4"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.5.4.tgz#e1155b73376a2f5da448e4a33351b57a885f4352"
@@ -5716,11 +5509,6 @@ fast-diff@^1.1.2, fast-diff@^1.2.0:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
   integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-equals@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-5.0.1.tgz#a4eefe3c5d1c0d021aeed0bc10ba5e0c12ee405d"
-  integrity sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==
-
 fast-glob@^3.0.3, fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.1, fast-glob@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
@@ -5770,13 +5558,6 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-file-entry-cache@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f"
-  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==
-  dependencies:
-    flat-cache "^4.0.0"
-
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -5799,11 +5580,6 @@ find-replace@^3.0.0:
   dependencies:
     array-back "^3.0.1"
 
-find-up-simple@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-up-simple/-/find-up-simple-1.0.0.tgz#21d035fde9fdbd56c8f4d2f63f32fd93a1cfc368"
-  integrity sha512-q7Us7kcjj2VMePAa02hDAF6d+MzsdsAWEwYyOpwUtlerRBkOEPBCRZrAV4XfcSN8fHAgaD0hP7miwoay6DCprw==
-
 find-up@5.0.0, find-up@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -5836,14 +5612,6 @@ flat-cache@^3.0.4:
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flat-cache@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c"
-  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==
-  dependencies:
-    flatted "^3.2.9"
-    keyv "^4.5.4"
-
 flat@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
@@ -5866,6 +5634,14 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -5924,7 +5700,7 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^11.1.1:
+fs-extra@^11.1.1, fs-extra@^11.2.0:
   version "11.2.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
   integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
@@ -6013,11 +5789,6 @@ ganache@7.4.3:
     bufferutil "4.0.5"
     utf-8-validate "5.0.7"
 
-gensequence@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/gensequence/-/gensequence-7.0.0.tgz#bb6aedec8ff665e3a6c42f92823121e3a6ea7718"
-  integrity sha512-47Frx13aZh01afHJTB3zTtKIlFI6vWY+MYCN9Qpew6i52rfKjnhCF/l1YlC8UmEMvvntZZ6z4PiCcmyuedR2aQ==
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -6059,16 +5830,16 @@ get-stdin@=8.0.0:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
   integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
-get-stdin@^9.0.0, get-stdin@~9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
-  integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==
-
 get-stdin@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
   integrity sha512-jZV7n6jGE3Gt7fgSTJoz91Ak5MuTLwMwkoYdjxuJ/AmjIsE1UC03y/IWkZCQGEvVNS9qoRNwy5BCqxImv0FVeA==
 
+get-stdin@~9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
+  integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==
+
 get-stream@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
@@ -6154,6 +5925,17 @@ glob@8.1.0, glob@^8.0.3:
     minimatch "^5.0.1"
     once "^1.3.0"
 
+glob@^10.3.10:
+  version "10.3.16"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.16.tgz#bf6679d5d51279c8cfae4febe0d051d2a4bf4c6f"
+  integrity sha512-JDKXl1DiuuHJ6fVS2FXjownaavciiHNUU4mOvV/B793RLh05vZL1rcPnCSaOgv1hDT6RDlY7AB7ZUvFYAtPgAw==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.1"
+    minipass "^7.0.4"
+    path-scurry "^1.11.0"
+
 glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -6188,13 +5970,6 @@ glob@~8.0.3:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-global-directory@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/global-directory/-/global-directory-4.0.1.tgz#4d7ac7cfd2cb73f304c53b8810891748df5e361e"
-  integrity sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==
-  dependencies:
-    ini "4.1.1"
-
 global-modules@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
@@ -6263,7 +6038,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -6331,7 +6106,7 @@ hardhat-typechain@^0.3.3:
   resolved "https://registry.yarnpkg.com/hardhat-typechain/-/hardhat-typechain-0.3.5.tgz#8e50616a9da348b33bd001168c8fda9c66b7b4af"
   integrity sha512-w9lm8sxqTJACY+V7vijiH+NkPExnmtiQEjsV9JKD1KgMdVk2q8y+RhvU/c4B7+7b1+HylRUCxpOIvFuB3rE4+w==
 
-hardhat@=2.22.2, hardhat@^2.18.3:
+hardhat@=2.22.2:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.22.2.tgz#0cadd7ec93bf39bab09f81603e75bc5e92acea3d"
   integrity sha512-0xZ7MdCZ5sJem4MrvpQWLR3R3zGDoHw5lsR+pBFimqwagimIOn3bWuZv69KA+veXClwI1s/zpqgwPwiFrd4Dxw==
@@ -6380,6 +6155,55 @@ hardhat@=2.22.2, hardhat@^2.18.3:
     uuid "^8.3.2"
     ws "^7.4.6"
 
+hardhat@^2.22.5:
+  version "2.22.5"
+  resolved "https://registry.yarnpkg.com/hardhat/-/hardhat-2.22.5.tgz#7e1a4311fa9e34a1cfe337784eae06706f6469a5"
+  integrity sha512-9Zq+HonbXCSy6/a13GY1cgHglQRfh4qkzmj1tpPlhxJDwNVnhxlReV6K7hCWFKlOrV13EQwsdcD0rjcaQKWRZw==
+  dependencies:
+    "@ethersproject/abi" "^5.1.2"
+    "@metamask/eth-sig-util" "^4.0.0"
+    "@nomicfoundation/edr" "^0.4.0"
+    "@nomicfoundation/ethereumjs-common" "4.0.4"
+    "@nomicfoundation/ethereumjs-tx" "5.0.4"
+    "@nomicfoundation/ethereumjs-util" "9.0.4"
+    "@nomicfoundation/solidity-analyzer" "^0.1.0"
+    "@sentry/node" "^5.18.1"
+    "@types/bn.js" "^5.1.0"
+    "@types/lru-cache" "^5.1.0"
+    adm-zip "^0.4.16"
+    aggregate-error "^3.0.0"
+    ansi-escapes "^4.3.0"
+    boxen "^5.1.2"
+    chalk "^2.4.2"
+    chokidar "^3.4.0"
+    ci-info "^2.0.0"
+    debug "^4.1.1"
+    enquirer "^2.3.0"
+    env-paths "^2.2.0"
+    ethereum-cryptography "^1.0.3"
+    ethereumjs-abi "^0.6.8"
+    find-up "^2.1.0"
+    fp-ts "1.19.3"
+    fs-extra "^7.0.1"
+    glob "7.2.0"
+    immutable "^4.0.0-rc.12"
+    io-ts "1.10.4"
+    keccak "^3.0.2"
+    lodash "^4.17.11"
+    mnemonist "^0.38.0"
+    mocha "^10.0.0"
+    p-map "^4.0.0"
+    raw-body "^2.4.1"
+    resolve "1.17.0"
+    semver "^6.3.0"
+    solc "0.7.3"
+    source-map-support "^0.5.13"
+    stacktrace-parser "^0.1.10"
+    tsort "0.0.1"
+    undici "^5.14.0"
+    uuid "^8.3.2"
+    ws "^7.4.6"
+
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
@@ -6400,11 +6224,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-own-prop@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-own-prop/-/has-own-prop-2.0.0.tgz#f0f95d58f65804f5d218db32563bb85b8e0417af"
-  integrity sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==
-
 has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
@@ -6595,11 +6414,6 @@ import-local@^3.0.2:
     pkg-dir "^4.2.0"
     resolve-cwd "^3.0.0"
 
-import-meta-resolve@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz#0b1195915689f60ab00f830af0f15cc841e8919e"
-  integrity sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -6628,11 +6442,6 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-ini@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
-  integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
-
 ini@^1.3.5, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -6803,11 +6612,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
-  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
-
 is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -6859,7 +6663,7 @@ is-typed-array@^1.1.13:
   dependencies:
     which-typed-array "^1.1.14"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
@@ -6959,6 +6763,15 @@ istanbul-reports@^3.1.3:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
+jackspeak@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.1.2.tgz#eada67ea949c6b71de50f1b09c92a961897b90ab"
+  integrity sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jest-changed-files@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
@@ -7541,7 +7354,7 @@ keccak@^3.0.0, keccak@^3.0.2:
     node-gyp-build "^4.2.0"
     readable-stream "^3.6.0"
 
-keyv@^4.5.3, keyv@^4.5.4:
+keyv@^4.5.3:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
@@ -7845,6 +7658,11 @@ loupe@^2.3.6:
   dependencies:
     get-func-name "^2.0.1"
 
+lru-cache@^10.2.0:
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878"
+  integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==
+
 lru-cache@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
@@ -8043,7 +7861,7 @@ micro-ftch@^0.3.1:
   resolved "https://registry.yarnpkg.com/micro-ftch/-/micro-ftch-0.3.1.tgz#6cb83388de4c1f279a034fb0cf96dfc050853c5f"
   integrity sha512-/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==
 
-micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -8133,6 +7951,13 @@ minimatch@^7.4.3:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^9.0.1, minimatch@^9.0.3:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51"
+  integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@~3.0.4:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
@@ -8145,6 +7970,11 @@ minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8, minimist@~1.
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.1.tgz#f7f85aff59aa22f110b20e27692465cf3bf89481"
+  integrity sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==
+
 mkdirp-classic@^0.5.2:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
@@ -8167,6 +7997,11 @@ mkdirp@^2.1.6:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19"
   integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
 
+mkdirp@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
+  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
+
 mnemonist@^0.38.0:
   version "0.38.5"
   resolved "https://registry.yarnpkg.com/mnemonist/-/mnemonist-0.38.5.tgz#4adc7f4200491237fe0fa689ac0b86539685cade"
@@ -8311,6 +8146,17 @@ nise@^5.1.5:
     just-extend "^6.2.0"
     path-to-regexp "^6.2.1"
 
+nise@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-6.0.0.tgz#ae56fccb5d912037363c3b3f29ebbfa28bde8b48"
+  integrity sha512-K8ePqo9BFvN31HXwEtTNGzgrPpmvgciDsFz8aztFjt4LqKO/JeFD8tBOeuDiCMXrIl/m1YvfH8auSpxfaD09wg==
+  dependencies:
+    "@sinonjs/commons" "^3.0.0"
+    "@sinonjs/fake-timers" "^11.2.2"
+    "@sinonjs/text-encoding" "^0.7.2"
+    just-extend "^6.2.0"
+    path-to-regexp "^6.2.1"
+
 node-addon-api@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32"
@@ -8608,13 +8454,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parent-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-2.0.0.tgz#fa71f88ff1a50c27e15d8ff74e0e3a9523bf8708"
-  integrity sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==
-  dependencies:
-    callsites "^3.1.0"
-
 parse-cache-control@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parse-cache-control/-/parse-cache-control-1.0.1.tgz#8eeab3e54fa56920fe16ba38f77fa21aacc2d74e"
@@ -8673,6 +8512,14 @@ path-parse@^1.0.6, path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-scurry@^1.11.0:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+  dependencies:
+    lru-cache "^10.2.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
 path-to-regexp@^6.2.1:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.2.tgz#324377a83e5049cbecadc5554d6a63a9a4866b36"
@@ -9223,11 +9070,6 @@ regexpp@^3.1.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
-
 req-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/req-cwd/-/req-cwd-2.0.0.tgz#d4082b4d44598036640fb73ddea01ed53db49ebc"
@@ -9512,13 +9354,18 @@ semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.1, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0:
+semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.1, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4:
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
   integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.6.2:
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
+  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
+
 serialize-javascript@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
@@ -9632,6 +9479,11 @@ signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
 sinon-chai@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-3.7.0.tgz#cfb7dec1c50990ed18c153f1840721cf13139783"
@@ -9649,6 +9501,18 @@ sinon@^17.0.1:
     nise "^5.1.5"
     supports-color "^7.2.0"
 
+sinon@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-18.0.0.tgz#69ca293dbc3e82590a8b0d46c97f63ebc1e5fc01"
+  integrity sha512-+dXDXzD1sBO6HlmZDd7mXZCR/y5ECiEiGCBSGuFD/kZ0bDTofPYc6JaeGmPSF+1j1MejGUWkORbYOLDyvqCWpA==
+  dependencies:
+    "@sinonjs/commons" "^3.0.1"
+    "@sinonjs/fake-timers" "^11.2.2"
+    "@sinonjs/samsam" "^8.0.0"
+    diff "^5.2.0"
+    nise "^6.0.0"
+    supports-color "^7"
+
 sisteransi@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
@@ -9912,6 +9776,15 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
@@ -9920,14 +9793,14 @@ string-width@^2.1.0, string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
   dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
 
 string.prototype.padend@^3.0.0:
   version "3.1.6"
@@ -9986,6 +9859,13 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
@@ -10000,14 +9880,7 @@ strip-ansi@^5.1.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^7.1.0:
+strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
   integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
@@ -10067,7 +9940,7 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.1.0, supports-color@^7.2.0:
+supports-color@^7, supports-color@^7.1.0, supports-color@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
@@ -10108,13 +9981,14 @@ synckit@^0.8.6:
   dependencies:
     "@matterlabs/hardhat-zksync-deploy" "^0.6.5"
     "@matterlabs/hardhat-zksync-solc" "^1.1.4"
+    "@matterlabs/hardhat-zksync-verify" "^1.4.3"
     commander "^9.4.1"
     eslint "^8.51.0"
     eslint-plugin-import "^2.29.0"
     eslint-plugin-prettier "^5.0.1"
     ethers "^5.7.0"
     fast-glob "^3.3.2"
-    hardhat "^2.18.3"
+    hardhat "=2.22.2"
     preprocess "^3.2.0"
     zksync-ethers "https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub"
 
@@ -10368,6 +10242,14 @@ ts-morph@^19.0.0:
     "@ts-morph/common" "~0.20.0"
     code-block-writer "^12.0.0"
 
+ts-morph@^21.0.1:
+  version "21.0.1"
+  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-21.0.1.tgz#712302a0f6e9dbf1aa8d9cf33a4386c4b18c2006"
+  integrity sha512-dbDtVdEAncKctzrVZ+Nr7kHpHkv+0JDJb2MjjpBaj8bFeCkePU9rHfMklmhuLFnpeq/EJZk2IhStY6NzqgjOkg==
+  dependencies:
+    "@ts-morph/common" "~0.22.0"
+    code-block-writer "^12.0.0"
+
 ts-node@^10.1.0, ts-node@^10.7.0:
   version "10.9.2"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
@@ -10397,6 +10279,11 @@ tsconfig-paths@^3.15.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
+tslib@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+
 tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -10475,11 +10362,6 @@ type-fest@^0.7.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48"
   integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==
 
-type-fest@^1.0.1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
-  integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
-
 typechain@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/typechain/-/typechain-4.0.3.tgz#e8fcd6c984676858c64eeeb155ea783a10b73779"
@@ -10553,13 +10435,6 @@ typed-array-length@^1.0.6:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -10622,12 +10497,10 @@ undici@^5.14.0:
   dependencies:
     "@fastify/busboy" "^2.0.0"
 
-unique-string@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-3.0.0.tgz#84a1c377aff5fd7a8bc6b55d8244b2bd90d75b9a"
-  integrity sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==
-  dependencies:
-    crypto-random-string "^4.0.0"
+undici@^6.18.2:
+  version "6.19.2"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-6.19.2.tgz#231bc5de78d0dafb6260cf454b294576c2f3cd31"
+  integrity sha512-JfjKqIauur3Q6biAtHJ564e3bWa8VvT+7cSiOJHFbX4Erv6CLGDpg8z+Fmg/1OI/47RA+GI2QZaF48SSaLvyBA==
 
 universalify@^0.1.0:
   version "0.1.2"
@@ -10742,16 +10615,6 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vscode-languageserver-textdocument@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
-
-vscode-uri@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
-
 walker@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
@@ -10862,7 +10725,7 @@ workerpool@6.2.1:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
   integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
 
-wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -10871,21 +10734,20 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
 write-file-atomic@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
@@ -10899,16 +10761,16 @@ ws@7.4.6:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
+ws@8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+
 ws@^7.4.6:
   version "7.5.9"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
   integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
-xdg-basedir@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-5.1.0.tgz#1efba19425e73be1bc6f2a6ceb52a3d2c884c0c9"
-  integrity sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==
-
 xhr2@0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.3.tgz#cbfc4759a69b4a888e78cf4f20b051038757bd11"
@@ -10939,10 +10801,10 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed"
-  integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==
+yaml@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.2.tgz#7a2b30f2243a5fc299e1f14ca58d475ed4bc5362"
+  integrity sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==
 
 yargs-parser@20.2.4:
   version "20.2.4"
@@ -11010,19 +10872,25 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
-"zksync-ethers@https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub":
-  version "5.1.0"
-  resolved "https://github.com/zksync-sdk/zksync-ethers#28ccbe7d67b170c202b17475e06a82002e6e3acc"
+zksync-ethers@5.8.0-beta.5:
+  version "5.8.0-beta.5"
+  resolved "https://registry.yarnpkg.com/zksync-ethers/-/zksync-ethers-5.8.0-beta.5.tgz#4f70193a86bd1e41b25b0aa5aa32f6d41d52f7c6"
+  integrity sha512-saT/3OwLgifqzrBG7OujvUMapzXnshAaLzAZMycUtdV20eLSSVkyLIARVwh1M6hMQIUvX2htV0JN82QRMyM3Ig==
   dependencies:
     ethers "~5.7.0"
 
-"zksync-ethers@https://github.com/zksync-sdk/zksync-ethers#sb-old-sdk":
+zksync-ethers@^6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/zksync-ethers/-/zksync-ethers-6.9.0.tgz#efaff1d59e2cff837eeda84c4ba59fdca4972a91"
+  integrity sha512-2CppwvLHtz689L7E9EhevbFtsqVukKC/lVicwdeUS2yqV46ET4iBR11rYdEfGW2oEo1h6yJuuwIBDFm2SybkIA==
+
+"zksync-ethers@https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub":
   version "5.1.0"
-  resolved "https://github.com/zksync-sdk/zksync-ethers#7e5e8edc57c848aabdb4b018de8270addc82aa6e"
+  resolved "https://github.com/zksync-sdk/zksync-ethers#28ccbe7d67b170c202b17475e06a82002e6e3acc"
   dependencies:
     ethers "~5.7.0"
 
-zksync-web3@^0.15.4, zksync-web3@^0.15.5:
+zksync-web3@^0.15.4:
   version "0.15.5"
   resolved "https://registry.yarnpkg.com/zksync-web3/-/zksync-web3-0.15.5.tgz#aabe379464963ab573e15948660a709f409b5316"
   integrity sha512-97gB7OKJL4spegl8fGO54g6cvTd/75G6yFWZWEa2J09zhjTrfqabbwE/GwiUJkFQ5BbzoH4JaTlVz1hoYZI+DQ==
diff --git a/zk_toolbox/Cargo.lock b/zk_toolbox/Cargo.lock
new file mode 100644
index 000000000000..62501a944bb9
--- /dev/null
+++ b/zk_toolbox/Cargo.lock
@@ -0,0 +1,6608 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "ascii-canvas"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
+dependencies = [
+ "term",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "async_io_stream"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
+dependencies = [
+ "futures",
+ "pharos",
+ "rustc_version",
+]
+
+[[package]]
+name = "atoi"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "auto_impl"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "axum"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-util",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base16ct"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
+
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bech32"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
+
+[[package]]
+name = "beef"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
+
+[[package]]
+name = "bigdecimal"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "git+https://github.com/RustCrypto/hashes.git?rev=1f727ce37ff40fa0cce84eb8543a45bdd3ca4a4e#1f727ce37ff40fa0cce84eb8543a45bdd3ca4a4e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bs58"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+dependencies = [
+ "sha2 0.10.8",
+ "tinyvec",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b"
+
+[[package]]
+name = "byte-slice-cast"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bzip2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
+dependencies = [
+ "bzip2-sys",
+ "libc",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.11+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "camino"
+version = "1.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.88"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-targets 0.52.3",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim 0.11.0",
+ "terminal_size",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+
+[[package]]
+name = "cliclack"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4febf49beeedc40528e4956995631f1bbdb4d8804ef940b44351f393a996c739"
+dependencies = [
+ "console",
+ "indicatif",
+ "once_cell",
+ "textwrap",
+ "zeroize",
+]
+
+[[package]]
+name = "coins-bip32"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b6be4a5df2098cd811f3194f64ddb96c267606bffd9689ac7b0160097b01ad3"
+dependencies = [
+ "bs58",
+ "coins-core",
+ "digest",
+ "hmac",
+ "k256 0.13.1",
+ "serde",
+ "sha2 0.10.8",
+ "thiserror",
+]
+
+[[package]]
+name = "coins-bip39"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528"
+dependencies = [
+ "bitvec",
+ "coins-bip32",
+ "hmac",
+ "once_cell",
+ "pbkdf2 0.12.2",
+ "rand",
+ "sha2 0.10.8",
+ "thiserror",
+]
+
+[[package]]
+name = "coins-core"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979"
+dependencies = [
+ "base64 0.21.7",
+ "bech32",
+ "bs58",
+ "digest",
+ "generic-array",
+ "hex",
+ "ripemd",
+ "serde",
+ "serde_derive",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "thiserror",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "common"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "cliclack",
+ "console",
+ "ethers",
+ "futures",
+ "once_cell",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "sqlx",
+ "strum_macros 0.26.2",
+ "thiserror",
+ "tokio",
+ "toml",
+ "url",
+ "xshell",
+]
+
+[[package]]
+name = "compile-fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bed69047ed42e52c7e38d6421eeb8ceefb4f2a2b52eed59137f7bad7908f6800"
+
+[[package]]
+name = "config"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "common",
+ "ethers",
+ "path-absolutize",
+ "rand",
+ "serde",
+ "serde_json",
+ "strum 0.26.2",
+ "strum_macros 0.26.2",
+ "thiserror",
+ "types",
+ "url",
+ "xshell",
+ "zksync_config",
+ "zksync_protobuf_config",
+]
+
+[[package]]
+name = "console"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "const-hex"
+version = "1.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ba00838774b4ab0233e355d26710fbfc8327a05c017f6dc4873f876d1f79f78"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "hex",
+ "proptest",
+ "serde",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "constant_time_eq"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crc32fast"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "darling"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.10.0",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+
+[[package]]
+name = "debugid"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
+dependencies = [
+ "serde",
+ "uuid 1.8.0",
+]
+
+[[package]]
+name = "der"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_more"
+version = "1.0.0-beta.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7abbfc297053be59290e3152f8cbcd52c8642e0728b69ee187d991d4c1af08d"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0-beta.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bba3e9872d7c58ce7ef0fcf1844fcc3e23ef2a58377b50df35dd98e42a5726e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+ "unicode-xid",
+]
+
+[[package]]
+name = "deunicode"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
+
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+dependencies = [
+ "cfg-if",
+ "dirs-sys-next",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "dirs-sys-next"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
+[[package]]
+name = "dtoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
+
+[[package]]
+name = "dunce"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+
+[[package]]
+name = "ecdsa"
+version = "0.14.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
+dependencies = [
+ "der 0.6.1",
+ "elliptic-curve 0.12.3",
+ "rfc6979 0.3.1",
+ "signature 1.6.4",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
+dependencies = [
+ "der 0.7.8",
+ "digest",
+ "elliptic-curve 0.13.8",
+ "rfc6979 0.4.0",
+ "signature 2.2.0",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "either"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
+dependencies = [
+ "base16ct 0.1.1",
+ "crypto-bigint 0.4.9",
+ "der 0.6.1",
+ "digest",
+ "ff 0.12.1",
+ "generic-array",
+ "group 0.12.1",
+ "pkcs8 0.9.0",
+ "rand_core",
+ "sec1 0.3.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
+dependencies = [
+ "base16ct 0.2.0",
+ "crypto-bigint 0.5.5",
+ "digest",
+ "ff 0.13.0",
+ "generic-array",
+ "group 0.13.0",
+ "pkcs8 0.10.2",
+ "rand_core",
+ "sec1 0.7.3",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "elsa"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d98e71ae4df57d214182a2e5cb90230c0192c6ddfcaa05c36453d46a54713e10"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "ena"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "enr"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe81b5c06ecfdbc71dd845216f225f53b62a10cb8a16c946836a3467f701d05b"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "hex",
+ "k256 0.13.1",
+ "log",
+ "rand",
+ "rlp",
+ "serde",
+ "sha3 0.10.8",
+ "zeroize",
+]
+
+[[package]]
+name = "envy"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f47e0157f2cb54f5ae1bd371b30a2ae4311e1c028f575cd4e81de7353215965"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "etcetera"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+dependencies = [
+ "cfg-if",
+ "home",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "eth-keystore"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fda3bf123be441da5260717e0661c25a2fd9cb2b2c1d20bf2e05580047158ab"
+dependencies = [
+ "aes",
+ "ctr",
+ "digest",
+ "hex",
+ "hmac",
+ "pbkdf2 0.11.0",
+ "rand",
+ "scrypt",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "thiserror",
+ "uuid 0.8.2",
+]
+
+[[package]]
+name = "ethabi"
+version = "18.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7413c5f74cc903ea37386a8965a936cbeb334bd270862fdece542c1b2dcbc898"
+dependencies = [
+ "ethereum-types",
+ "hex",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_json",
+ "sha3 0.10.8",
+ "thiserror",
+ "uint",
+]
+
+[[package]]
+name = "ethbloom"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
+dependencies = [
+ "crunchy",
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "scale-info",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "ethereum-types"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
+dependencies = [
+ "ethbloom",
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "primitive-types",
+ "scale-info",
+ "uint",
+]
+
+[[package]]
+name = "ethers"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c7cd562832e2ff584fa844cd2f6e5d4f35bbe11b28c7c9b8df957b2e1d0c701"
+dependencies = [
+ "ethers-addressbook",
+ "ethers-contract",
+ "ethers-core",
+ "ethers-etherscan",
+ "ethers-middleware",
+ "ethers-providers",
+ "ethers-signers",
+ "ethers-solc",
+]
+
+[[package]]
+name = "ethers-addressbook"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35dc9a249c066d17e8947ff52a4116406163cf92c7f0763cb8c001760b26403f"
+dependencies = [
+ "ethers-core",
+ "once_cell",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "ethers-contract"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43304317c7f776876e47f2f637859f6d0701c1ec7930a150f169d5fbe7d76f5a"
+dependencies = [
+ "const-hex",
+ "ethers-contract-abigen",
+ "ethers-contract-derive",
+ "ethers-core",
+ "ethers-providers",
+ "futures-util",
+ "once_cell",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "ethers-contract-abigen"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9f96502317bf34f6d71a3e3d270defaa9485d754d789e15a8e04a84161c95eb"
+dependencies = [
+ "Inflector",
+ "const-hex",
+ "dunce",
+ "ethers-core",
+ "ethers-etherscan",
+ "eyre",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "reqwest 0.11.24",
+ "serde",
+ "serde_json",
+ "syn 2.0.51",
+ "toml",
+ "walkdir",
+]
+
+[[package]]
+name = "ethers-contract-derive"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "452ff6b0a64507ce8d67ffd48b1da3b42f03680dcf5382244e9c93822cbbf5de"
+dependencies = [
+ "Inflector",
+ "const-hex",
+ "ethers-contract-abigen",
+ "ethers-core",
+ "proc-macro2",
+ "quote",
+ "serde_json",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "ethers-core"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aab3cef6cc1c9fd7f787043c81ad3052eff2b96a3878ef1526aa446311bdbfc9"
+dependencies = [
+ "arrayvec",
+ "bytes",
+ "cargo_metadata",
+ "chrono",
+ "const-hex",
+ "elliptic-curve 0.13.8",
+ "ethabi",
+ "generic-array",
+ "k256 0.13.1",
+ "num_enum 0.7.2",
+ "once_cell",
+ "open-fastrlp",
+ "rand",
+ "rlp",
+ "serde",
+ "serde_json",
+ "strum 0.25.0",
+ "syn 2.0.51",
+ "tempfile",
+ "thiserror",
+ "tiny-keccak",
+ "unicode-xid",
+]
+
+[[package]]
+name = "ethers-etherscan"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d45b981f5fa769e1d0343ebc2a44cfa88c9bc312eb681b676318b40cef6fb1"
+dependencies = [
+ "chrono",
+ "ethers-core",
+ "reqwest 0.11.24",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "ethers-middleware"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "145211f34342487ef83a597c1e69f0d3e01512217a7c72cc8a25931854c7dca0"
+dependencies = [
+ "async-trait",
+ "auto_impl",
+ "ethers-contract",
+ "ethers-core",
+ "ethers-etherscan",
+ "ethers-providers",
+ "ethers-signers",
+ "futures-channel",
+ "futures-locks",
+ "futures-util",
+ "instant",
+ "reqwest 0.11.24",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "tracing-futures",
+ "url",
+]
+
+[[package]]
+name = "ethers-providers"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb6b15393996e3b8a78ef1332d6483c11d839042c17be58decc92fa8b1c3508a"
+dependencies = [
+ "async-trait",
+ "auto_impl",
+ "base64 0.21.7",
+ "bytes",
+ "const-hex",
+ "enr",
+ "ethers-core",
+ "futures-core",
+ "futures-timer",
+ "futures-util",
+ "hashers",
+ "http 0.2.11",
+ "instant",
+ "jsonwebtoken",
+ "once_cell",
+ "pin-project",
+ "reqwest 0.11.24",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-tungstenite",
+ "tracing",
+ "tracing-futures",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "ws_stream_wasm",
+]
+
+[[package]]
+name = "ethers-signers"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3b125a103b56aef008af5d5fb48191984aa326b50bfd2557d231dc499833de3"
+dependencies = [
+ "async-trait",
+ "coins-bip32",
+ "coins-bip39",
+ "const-hex",
+ "elliptic-curve 0.13.8",
+ "eth-keystore",
+ "ethers-core",
+ "rand",
+ "sha2 0.10.8",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "ethers-solc"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d21df08582e0a43005018a858cc9b465c5fff9cf4056651be64f844e57d1f55f"
+dependencies = [
+ "cfg-if",
+ "const-hex",
+ "dirs",
+ "dunce",
+ "ethers-core",
+ "glob",
+ "home",
+ "md-5",
+ "num_cpus",
+ "once_cell",
+ "path-slash",
+ "rayon",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "solang-parser",
+ "svm-rs",
+ "thiserror",
+ "tiny-keccak",
+ "tokio",
+ "tracing",
+ "walkdir",
+ "yansi",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
+[[package]]
+name = "ff"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
+dependencies = [
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "findshlibs"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64"
+dependencies = [
+ "cc",
+ "lazy_static",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "finl_unicode"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
+
+[[package]]
+name = "fixed-hash"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
+dependencies = [
+ "byteorder",
+ "rand",
+ "rustc-hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
+[[package]]
+name = "flate2"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "flume"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "spin 0.9.8",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-intrusive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+
+[[package]]
+name = "futures-locks"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45ec6fe3675af967e67c5536c0b9d44e34e6c52f86bedc4ea49c5317b8e94d06"
+dependencies = [
+ "futures-channel",
+ "futures-task",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+
+[[package]]
+name = "futures-task"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+
+[[package]]
+name = "futures-timer"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+dependencies = [
+ "gloo-timers",
+ "send_wrapper 0.4.0",
+]
+
+[[package]]
+name = "futures-util"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
+[[package]]
+name = "gloo-timers"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "group"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
+dependencies = [
+ "ff 0.12.1",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff 0.13.0",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 0.2.11",
+ "indexmap 2.2.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
+ "indexmap 2.2.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hashers"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2bca93b15ea5a746f220e56587f71e73c6165eab783df9e26590069953e3c30"
+dependencies = [
+ "fxhash",
+]
+
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.3",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "379dada1584ad501b383485dd706b8afb7a70fcbc7f4da7d780638a5a6124a60"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "hostname"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi",
+]
+
+[[package]]
+name = "http"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http 0.2.11",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.1.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "human-panic"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "backtrace",
+ "os_info",
+ "serde",
+ "serde_derive",
+ "toml",
+ "uuid 1.8.0",
+]
+
+[[package]]
+name = "hyper"
+version = "0.14.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2 0.3.26",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4fe55fb7a772d59a5ff1dfbff4fe0258d19b89fec4b233e75d35d5d2316badc"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+dependencies = [
+ "futures-util",
+ "http 0.2.11",
+ "hyper 0.14.28",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper 0.14.28",
+ "pin-project-lite",
+ "tokio",
+ "tokio-io-timeout",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper 0.14.28",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper 1.4.0",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "hyper 1.4.0",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "impl-codec"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
+dependencies = [
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "impl-rlp"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808"
+dependencies = [
+ "rlp",
+]
+
+[[package]]
+name = "impl-serde"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
+dependencies = [
+ "console",
+ "instant",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jsonwebtoken"
+version = "8.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
+dependencies = [
+ "base64 0.21.7",
+ "pem",
+ "ring 0.16.20",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
+[[package]]
+name = "k256"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72c1e0b51e7ec0a97369623508396067a486bd0cbed95a2659a4b863d28cfc8b"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.14.8",
+ "elliptic-curve 0.12.3",
+ "sha2 0.10.8",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+dependencies = [
+ "cfg-if",
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
+ "once_cell",
+ "sha2 0.10.8",
+ "signature 2.2.0",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lalrpop"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da4081d44f4611b66c6dd725e6de3169f9f63905421e8626fcb86b6a898998b8"
+dependencies = [
+ "ascii-canvas",
+ "bit-set",
+ "diff",
+ "ena",
+ "is-terminal",
+ "itertools 0.10.5",
+ "lalrpop-util",
+ "petgraph",
+ "regex",
+ "regex-syntax 0.7.5",
+ "string_cache",
+ "term",
+ "tiny-keccak",
+ "unicode-xid",
+]
+
+[[package]]
+name = "lalrpop-util"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+dependencies = [
+ "spin 0.5.2",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.2",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linkme"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccb76662d78edc9f9bf56360d6919bdacc8b7761227727e5082f128eeb90bbf5"
+dependencies = [
+ "linkme-impl",
+]
+
+[[package]]
+name = "linkme-impl"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dccda732e04fa3baf2e17cf835bfe2601c7c2edafd64417c627dabae3a8cda"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "logos"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c000ca4d908ff18ac99b93a062cb8958d331c3220719c52e77cb19cc6ac5d2c1"
+dependencies = [
+ "logos-derive",
+]
+
+[[package]]
+name = "logos-codegen"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68"
+dependencies = [
+ "beef",
+ "fnv",
+ "proc-macro2",
+ "quote",
+ "regex-syntax 0.6.29",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "logos-derive"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbfc0d229f1f42d790440136d941afd806bc9e949e2bcb8faa813b0f00d1267e"
+dependencies = [
+ "logos-codegen",
+]
+
+[[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "multimap"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+
+[[package]]
+name = "nanoid"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8"
+dependencies = [
+ "rand",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+ "serde",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+ "serde",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "serde",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+dependencies = [
+ "num_enum_derive 0.6.1",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+dependencies = [
+ "num_enum_derive 0.7.2",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+dependencies = [
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "open-fastrlp"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce"
+dependencies = [
+ "arrayvec",
+ "auto_impl",
+ "bytes",
+ "ethereum-types",
+ "open-fastrlp-derive",
+]
+
+[[package]]
+name = "open-fastrlp-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c"
+dependencies = [
+ "bytes",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "openssl"
+version = "0.10.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.102"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "opentelemetry"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54"
+dependencies = [
+ "opentelemetry_api",
+ "opentelemetry_sdk",
+]
+
+[[package]]
+name = "opentelemetry-http"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "http 0.2.11",
+ "opentelemetry_api",
+ "reqwest 0.11.24",
+]
+
+[[package]]
+name = "opentelemetry-otlp"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275"
+dependencies = [
+ "async-trait",
+ "futures-core",
+ "http 0.2.11",
+ "opentelemetry-http",
+ "opentelemetry-proto",
+ "opentelemetry-semantic-conventions",
+ "opentelemetry_api",
+ "opentelemetry_sdk",
+ "prost 0.11.9",
+ "reqwest 0.11.24",
+ "thiserror",
+ "tokio",
+ "tonic",
+]
+
+[[package]]
+name = "opentelemetry-proto"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1e3f814aa9f8c905d0ee4bde026afd3b2577a97c10e1699912e3e44f0c4cbeb"
+dependencies = [
+ "opentelemetry_api",
+ "opentelemetry_sdk",
+ "prost 0.11.9",
+ "tonic",
+]
+
+[[package]]
+name = "opentelemetry-semantic-conventions"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73c9f9340ad135068800e7f1b24e9e09ed9e7143f5bf8518ded3d3ec69789269"
+dependencies = [
+ "opentelemetry",
+]
+
+[[package]]
+name = "opentelemetry_api"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b"
+dependencies = [
+ "futures-channel",
+ "futures-util",
+ "indexmap 1.9.3",
+ "js-sys",
+ "once_cell",
+ "pin-project-lite",
+ "thiserror",
+ "urlencoding",
+]
+
+[[package]]
+name = "opentelemetry_sdk"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026"
+dependencies = [
+ "async-trait",
+ "crossbeam-channel",
+ "futures-channel",
+ "futures-executor",
+ "futures-util",
+ "once_cell",
+ "opentelemetry_api",
+ "ordered-float 3.9.2",
+ "percent-encoding",
+ "rand",
+ "regex",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+]
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-float"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "ordered-float"
+version = "3.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "os_info"
+version = "3.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
+dependencies = [
+ "log",
+ "serde",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "parity-scale-codec"
+version = "3.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe"
+dependencies = [
+ "arrayvec",
+ "bitvec",
+ "byte-slice-cast",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive",
+ "serde",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "3.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
+dependencies = [
+ "proc-macro-crate 2.0.0",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "password-hash"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
+dependencies = [
+ "base64ct",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "path-absolutize"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5"
+dependencies = [
+ "path-dedot",
+]
+
+[[package]]
+name = "path-dedot"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "path-slash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
+
+[[package]]
+name = "pbkdf2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+dependencies = [
+ "digest",
+ "hmac",
+ "password-hash",
+ "sha2 0.10.8",
+]
+
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest",
+ "hmac",
+]
+
+[[package]]
+name = "pem"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+dependencies = [
+ "base64 0.13.1",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "petgraph"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.2.3",
+]
+
+[[package]]
+name = "pharos"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
+dependencies = [
+ "futures",
+ "rustc_version",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared 0.11.2",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared 0.11.2",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared 0.11.2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der 0.7.8",
+ "pkcs8 0.10.2",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
+dependencies = [
+ "der 0.6.1",
+ "spki 0.6.0",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der 0.7.8",
+ "spki 0.7.3",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "prettyplease"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "primitive-types"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
+dependencies = [
+ "fixed-hash",
+ "impl-codec",
+ "impl-rlp",
+ "impl-serde",
+ "scale-info",
+ "uint",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+dependencies = [
+ "toml_edit 0.20.7",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prometheus-client"
+version = "0.22.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa"
+dependencies = [
+ "dtoa",
+ "itoa",
+ "parking_lot",
+ "prometheus-client-derive-encode",
+]
+
+[[package]]
+name = "prometheus-client-derive-encode"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "proptest"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
+dependencies = [
+ "bitflags 2.4.2",
+ "lazy_static",
+ "num-traits",
+ "rand",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax 0.8.2",
+ "unarray",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+dependencies = [
+ "bytes",
+ "prost-derive 0.11.9",
+]
+
+[[package]]
+name = "prost"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+dependencies = [
+ "bytes",
+ "prost-derive 0.12.6",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
+dependencies = [
+ "bytes",
+ "heck 0.5.0",
+ "itertools 0.12.1",
+ "log",
+ "multimap",
+ "once_cell",
+ "petgraph",
+ "prettyplease",
+ "prost 0.12.6",
+ "prost-types",
+ "regex",
+ "syn 2.0.51",
+ "tempfile",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+dependencies = [
+ "anyhow",
+ "itertools 0.12.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "prost-reflect"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "057237efdb71cf4b3f9396302a3d6599a92fa94063ba537b66130980ea9909f3"
+dependencies = [
+ "base64 0.21.7",
+ "logos",
+ "miette",
+ "once_cell",
+ "prost 0.12.6",
+ "prost-types",
+ "serde",
+ "serde-value",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
+dependencies = [
+ "prost 0.12.6",
+]
+
+[[package]]
+name = "protox"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00bb76c5f6221de491fe2c8f39b106330bbd9762c6511119c07940e10eb9ff11"
+dependencies = [
+ "bytes",
+ "miette",
+ "prost 0.12.6",
+ "prost-reflect",
+ "prost-types",
+ "protox-parse",
+ "thiserror",
+]
+
+[[package]]
+name = "protox-parse"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4581f441c58863525a3e6bec7b8de98188cf75239a56c725a3e7288450a33f"
+dependencies = [
+ "logos",
+ "miette",
+ "prost-types",
+ "thiserror",
+]
+
+[[package]]
+name = "quick-protobuf"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rayon"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.5",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "reqwest"
+version = "0.11.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2 0.3.26",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
+ "hyper-rustls",
+ "hyper-tls 0.5.0",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls",
+ "rustls-pemfile 1.0.4",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-rustls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "webpki-roots",
+ "winreg 0.50.0",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.4.0",
+ "hyper-tls 0.6.0",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile 2.1.2",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg 0.52.0",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
+dependencies = [
+ "crypto-bigint 0.4.9",
+ "hmac",
+ "zeroize",
+]
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "rlp"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
+dependencies = [
+ "bytes",
+ "rlp-derive",
+ "rustc-hex",
+]
+
+[[package]]
+name = "rlp-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
+dependencies = [
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8 0.10.2",
+ "rand_core",
+ "signature 2.2.0",
+ "spki 0.7.3",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustc-hex"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+dependencies = [
+ "bitflags 2.4.2",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.21.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
+dependencies = [
+ "log",
+ "ring 0.17.8",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+dependencies = [
+ "base64 0.22.1",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring 0.17.8",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "ryu"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+
+[[package]]
+name = "salsa20"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scale-info"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
+dependencies = [
+ "cfg-if",
+ "derive_more 0.99.17",
+ "parity-scale-codec",
+ "scale-info-derive",
+]
+
+[[package]]
+name = "scale-info-derive"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "schannel"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "scrypt"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d"
+dependencies = [
+ "hmac",
+ "pbkdf2 0.11.0",
+ "salsa20",
+ "sha2 0.10.8",
+]
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring 0.17.8",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "sec1"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
+dependencies = [
+ "base16ct 0.1.1",
+ "der 0.6.1",
+ "generic-array",
+ "pkcs8 0.9.0",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct 0.2.0",
+ "der 0.7.8",
+ "generic-array",
+ "pkcs8 0.10.2",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
+dependencies = [
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "secrecy"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "send_wrapper"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
+
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
+[[package]]
+name = "sentry"
+version = "0.31.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
+dependencies = [
+ "httpdate",
+ "native-tls",
+ "reqwest 0.11.24",
+ "sentry-backtrace",
+ "sentry-contexts",
+ "sentry-core",
+ "sentry-debug-images",
+ "sentry-panic",
+ "sentry-tracing",
+ "tokio",
+ "ureq",
+]
+
+[[package]]
+name = "sentry-backtrace"
+version = "0.31.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e"
+dependencies = [
+ "backtrace",
+ "once_cell",
+ "regex",
+ "sentry-core",
+]
+
+[[package]]
+name = "sentry-contexts"
+version = "0.31.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
+dependencies = [
+ "hostname",
+ "libc",
+ "os_info",
+ "rustc_version",
+ "sentry-core",
+ "uname",
+]
+
+[[package]]
+name = "sentry-core"
+version = "0.31.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
+dependencies = [
+ "once_cell",
+ "rand",
+ "sentry-types",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "sentry-debug-images"
+version = "0.31.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328"
+dependencies = [
+ "findshlibs",
+ "once_cell",
+ "sentry-core",
+]
+
+[[package]]
+name = "sentry-panic"
+version = "0.31.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99"
+dependencies = [
+ "sentry-backtrace",
+ "sentry-core",
+]
+
+[[package]]
+name = "sentry-tracing"
+version = "0.31.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
+dependencies = [
+ "sentry-backtrace",
+ "sentry-core",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "sentry-types"
+version = "0.31.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82"
+dependencies = [
+ "debugid",
+ "hex",
+ "rand",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "time",
+ "url",
+ "uuid 1.8.0",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.197"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-value"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
+dependencies = [
+ "ordered-float 2.10.1",
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.197"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
+dependencies = [
+ "serde",
+ "serde_with_macros",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap 2.2.3",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.6"
+source = "git+https://github.com/RustCrypto/hashes.git?rev=1731ced4a116d61ba9dc6ee6d0f38fb8102e357a#1731ced4a116d61ba9dc6ee6d0f38fb8102e357a"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha3"
+version = "0.10.6"
+source = "git+https://github.com/RustCrypto/hashes.git?rev=7a187e934c1f6c68e4b4e5cf37541b7a0d64d303#7a187e934c1f6c68e4b4e5cf37541b7a0d64d303"
+dependencies = [
+ "digest",
+ "keccak",
+]
+
+[[package]]
+name = "sha3"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+dependencies = [
+ "digest",
+ "keccak",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
+[[package]]
+name = "simple_asn1"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "thiserror",
+ "time",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "slugify-rs"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c88cdb6ea794da1dde6f267c3a363b2373ce24386b136828d66402a97ebdbff3"
+dependencies = [
+ "deunicode",
+ "nanoid",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
+[[package]]
+name = "smawk"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
+
+[[package]]
+name = "socket2"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "solang-parser"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c425ce1c59f4b154717592f0bdf4715c3a1d55058883622d3157e1f0908a5b26"
+dependencies = [
+ "itertools 0.11.0",
+ "lalrpop",
+ "lalrpop-util",
+ "phf",
+ "thiserror",
+ "unicode-xid",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "spki"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
+dependencies = [
+ "base64ct",
+ "der 0.6.1",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der 0.7.8",
+]
+
+[[package]]
+name = "sqlformat"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
+dependencies = [
+ "itertools 0.12.1",
+ "nom",
+ "unicode_categories",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6"
+dependencies = [
+ "ahash",
+ "atoi",
+ "byteorder",
+ "bytes",
+ "crc",
+ "crossbeam-queue",
+ "either",
+ "event-listener",
+ "futures-channel",
+ "futures-core",
+ "futures-intrusive",
+ "futures-io",
+ "futures-util",
+ "hashlink",
+ "hex",
+ "indexmap 2.2.3",
+ "log",
+ "memchr",
+ "once_cell",
+ "paste",
+ "percent-encoding",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "smallvec",
+ "sqlformat",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8"
+dependencies = [
+ "dotenvy",
+ "either",
+ "heck 0.4.1",
+ "hex",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "sqlx-core",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+ "syn 1.0.109",
+ "tempfile",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "sqlx-mysql"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418"
+dependencies = [
+ "atoi",
+ "base64 0.21.7",
+ "bitflags 2.4.2",
+ "byteorder",
+ "bytes",
+ "crc",
+ "digest",
+ "dotenvy",
+ "either",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "generic-array",
+ "hex",
+ "hkdf",
+ "hmac",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "percent-encoding",
+ "rand",
+ "rsa",
+ "serde",
+ "sha1",
+ "sha2 0.10.8",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-postgres"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e"
+dependencies = [
+ "atoi",
+ "base64 0.21.7",
+ "bitflags 2.4.2",
+ "byteorder",
+ "crc",
+ "dotenvy",
+ "etcetera",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "hex",
+ "hkdf",
+ "hmac",
+ "home",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "rand",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-sqlite"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa"
+dependencies = [
+ "atoi",
+ "flume",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "libsqlite3-sys",
+ "log",
+ "percent-encoding",
+ "serde",
+ "sqlx-core",
+ "tracing",
+ "url",
+ "urlencoding",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "string_cache"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot",
+ "phf_shared 0.10.0",
+ "precomputed-hash",
+]
+
+[[package]]
+name = "stringprep"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
+dependencies = [
+ "finl_unicode",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+
+[[package]]
+name = "strum"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+dependencies = [
+ "strum_macros 0.24.3",
+]
+
+[[package]]
+name = "strum"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+dependencies = [
+ "strum_macros 0.25.3",
+]
+
+[[package]]
+name = "strum"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+
+[[package]]
+name = "strum_macros"
+version = "0.24.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "subtle"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+[[package]]
+name = "svm-rs"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11297baafe5fa0c99d5722458eac6a5e25c01eb1b8e5cd137f54079093daa7a4"
+dependencies = [
+ "dirs",
+ "fs2",
+ "hex",
+ "once_cell",
+ "reqwest 0.11.24",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "thiserror",
+ "url",
+ "zip",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "term"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
+dependencies = [
+ "dirs-next",
+ "rustversion",
+ "winapi",
+]
+
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+dependencies = [
+ "smawk",
+ "unicode-linebreak",
+ "unicode-width",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.3.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-io-timeout"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
+dependencies = [
+ "futures-util",
+ "log",
+ "rustls",
+ "tokio",
+ "tokio-rustls",
+ "tungstenite",
+ "webpki-roots",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.22.9",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.2.3",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+dependencies = [
+ "indexmap 2.2.3",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap 2.2.3",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
+dependencies = [
+ "indexmap 2.2.3",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow 0.6.2",
+]
+
+[[package]]
+name = "tonic"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
+dependencies = [
+ "async-trait",
+ "axum",
+ "base64 0.21.7",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "h2 0.3.26",
+ "http 0.2.11",
+ "http-body 0.4.6",
+ "hyper 0.14.28",
+ "hyper-timeout",
+ "percent-encoding",
+ "pin-project",
+ "prost 0.11.9",
+ "tokio",
+ "tokio-stream",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap 1.9.3",
+ "pin-project",
+ "pin-project-lite",
+ "rand",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+dependencies = [
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-futures"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
+dependencies = [
+ "pin-project",
+ "tracing",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-opentelemetry"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8"
+dependencies = [
+ "once_cell",
+ "opentelemetry",
+ "opentelemetry_sdk",
+ "smallvec",
+ "tracing",
+ "tracing-core",
+ "tracing-log 0.1.4",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-serde"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
+dependencies = [
+ "serde",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+dependencies = [
+ "matchers",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "serde",
+ "serde_json",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "time",
+ "tracing",
+ "tracing-core",
+ "tracing-log 0.2.0",
+ "tracing-serde",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 0.2.11",
+ "httparse",
+ "log",
+ "rand",
+ "rustls",
+ "sha1",
+ "thiserror",
+ "url",
+ "utf-8",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "types"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "ethers",
+ "serde",
+ "strum 0.26.2",
+ "strum_macros 0.26.2",
+ "thiserror",
+]
+
+[[package]]
+name = "uint"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "uname"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+
+[[package]]
+name = "unicode_categories"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "2.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd"
+dependencies = [
+ "base64 0.22.1",
+ "log",
+ "native-tls",
+ "once_cell",
+ "url",
+]
+
+[[package]]
+name = "url"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "urlencoding"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
+
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "uuid"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+dependencies = [
+ "getrandom",
+ "serde",
+]
+
+[[package]]
+name = "uuid"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+dependencies = [
+ "getrandom",
+ "serde",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "vise"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/vise.git?rev=a5bb80c9ce7168663114ee30e794d6dc32159ee4#a5bb80c9ce7168663114ee30e794d6dc32159ee4"
+dependencies = [
+ "compile-fmt",
+ "elsa",
+ "linkme",
+ "once_cell",
+ "prometheus-client",
+ "vise-macros",
+]
+
+[[package]]
+name = "vise-exporter"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/vise.git?rev=a5bb80c9ce7168663114ee30e794d6dc32159ee4#a5bb80c9ce7168663114ee30e794d6dc32159ee4"
+dependencies = [
+ "hyper 0.14.28",
+ "once_cell",
+ "tokio",
+ "tracing",
+ "vise",
+]
+
+[[package]]
+name = "vise-macros"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/vise.git?rev=a5bb80c9ce7168663114ee30e794d6dc32159ee4#a5bb80c9ce7168663114ee30e794d6dc32159ee4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+
+[[package]]
+name = "web-sys"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
+[[package]]
+name = "whoami"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
+dependencies = [
+ "redox_syscall",
+ "wasite",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.3",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.3",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.3",
+ "windows_aarch64_msvc 0.52.3",
+ "windows_i686_gnu 0.52.3",
+ "windows_i686_msvc 0.52.3",
+ "windows_x86_64_gnu 0.52.3",
+ "windows_x86_64_gnullvm 0.52.3",
+ "windows_x86_64_msvc 0.52.3",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "ws_stream_wasm"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5"
+dependencies = [
+ "async_io_stream",
+ "futures",
+ "js-sys",
+ "log",
+ "pharos",
+ "rustc_version",
+ "send_wrapper 0.6.0",
+ "thiserror",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xshell"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db0ab86eae739efd1b054a8d3d16041914030ac4e01cd1dca0cf252fd8b6437"
+dependencies = [
+ "xshell-macros",
+]
+
+[[package]]
+name = "xshell-macros"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d422e8e38ec76e2f06ee439ccc765e9c6a9638b9e7c9f2e8255e4d41e8bd852"
+
+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "aes",
+ "byteorder",
+ "bzip2",
+ "constant_time_eq",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+ "hmac",
+ "pbkdf2 0.11.0",
+ "sha1",
+ "time",
+ "zstd",
+]
+
+[[package]]
+name = "zk_evm"
+version = "1.3.3"
+source = "git+https://github.com/matter-labs/era-zk_evm.git?tag=v1.3.3-rc2#fbee20f5bac7d6ca3e22ae69b2077c510a07de4e"
+dependencies = [
+ "anyhow",
+ "lazy_static",
+ "num",
+ "serde",
+ "serde_json",
+ "static_assertions",
+ "zk_evm_abstractions",
+ "zkevm_opcode_defs",
+]
+
+[[package]]
+name = "zk_evm_abstractions"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/era-zk_evm_abstractions.git#32dd320953841aa78579d9da08abbc70bcaed175"
+dependencies = [
+ "anyhow",
+ "num_enum 0.6.1",
+ "serde",
+ "static_assertions",
+ "zkevm_opcode_defs",
+]
+
+[[package]]
+name = "zk_inception"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "cliclack",
+ "common",
+ "config",
+ "console",
+ "ethers",
+ "human-panic",
+ "lazy_static",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "slugify-rs",
+ "strum 0.26.2",
+ "strum_macros 0.26.2",
+ "thiserror",
+ "tokio",
+ "toml",
+ "types",
+ "url",
+ "xshell",
+ "zksync_config",
+]
+
+[[package]]
+name = "zk_supervisor"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "common",
+ "config",
+ "human-panic",
+ "serde",
+ "strum 0.26.2",
+ "strum_macros 0.26.2",
+ "tokio",
+ "url",
+ "xshell",
+]
+
+[[package]]
+name = "zkevm_opcode_defs"
+version = "1.3.2"
+source = "git+https://github.com/matter-labs/era-zkevm_opcode_defs.git?branch=v1.3.2#dffacadeccdfdbff4bc124d44c595c4a6eae5013"
+dependencies = [
+ "bitflags 2.4.2",
+ "blake2 0.10.6 (git+https://github.com/RustCrypto/hashes.git?rev=1f727ce37ff40fa0cce84eb8543a45bdd3ca4a4e)",
+ "ethereum-types",
+ "k256 0.11.6",
+ "lazy_static",
+ "sha2 0.10.6",
+ "sha3 0.10.6",
+]
+
+[[package]]
+name = "zksync_basic_types"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "ethabi",
+ "hex",
+ "num_enum 0.7.2",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "strum 0.24.1",
+ "thiserror",
+ "tiny-keccak",
+ "url",
+]
+
+[[package]]
+name = "zksync_concurrency"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
+dependencies = [
+ "anyhow",
+ "once_cell",
+ "pin-project",
+ "rand",
+ "sha3 0.10.8",
+ "thiserror",
+ "time",
+ "tokio",
+ "tracing",
+ "tracing-subscriber",
+ "vise",
+]
+
+[[package]]
+name = "zksync_config"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "rand",
+ "secrecy",
+ "serde",
+ "zksync_basic_types",
+ "zksync_concurrency",
+ "zksync_consensus_utils",
+ "zksync_crypto_primitives",
+]
+
+[[package]]
+name = "zksync_consensus_utils"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
+dependencies = [
+ "anyhow",
+ "rand",
+ "thiserror",
+ "zksync_concurrency",
+]
+
+[[package]]
+name = "zksync_contracts"
+version = "0.1.0"
+dependencies = [
+ "envy",
+ "ethabi",
+ "hex",
+ "once_cell",
+ "serde",
+ "serde_json",
+ "zksync_utils",
+]
+
+[[package]]
+name = "zksync_crypto"
+version = "0.1.0"
+dependencies = [
+ "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex",
+ "once_cell",
+ "serde",
+ "sha2 0.10.8",
+ "thiserror",
+ "zksync_basic_types",
+]
+
+[[package]]
+name = "zksync_crypto_primitives"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "hex",
+ "rand",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "zksync_basic_types",
+ "zksync_utils",
+]
+
+[[package]]
+name = "zksync_mini_merkle_tree"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "zksync_basic_types",
+ "zksync_crypto",
+]
+
+[[package]]
+name = "zksync_protobuf"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
+dependencies = [
+ "anyhow",
+ "bit-vec",
+ "once_cell",
+ "prost 0.12.6",
+ "prost-reflect",
+ "quick-protobuf",
+ "rand",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "zksync_concurrency",
+ "zksync_consensus_utils",
+ "zksync_protobuf_build",
+]
+
+[[package]]
+name = "zksync_protobuf_build"
+version = "0.1.0"
+source = "git+https://github.com/matter-labs/era-consensus.git?rev=ba7b171456e7362eada685234a91c20907b6a097#ba7b171456e7362eada685234a91c20907b6a097"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "prettyplease",
+ "proc-macro2",
+ "prost-build",
+ "prost-reflect",
+ "protox",
+ "quote",
+ "syn 2.0.51",
+]
+
+[[package]]
+name = "zksync_protobuf_config"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "hex",
+ "prost 0.12.6",
+ "rand",
+ "secrecy",
+ "serde_json",
+ "serde_yaml",
+ "zksync_basic_types",
+ "zksync_config",
+ "zksync_protobuf",
+ "zksync_protobuf_build",
+ "zksync_types",
+]
+
+[[package]]
+name = "zksync_system_constants"
+version = "0.1.0"
+dependencies = [
+ "once_cell",
+ "zksync_basic_types",
+ "zksync_utils",
+]
+
+[[package]]
+name = "zksync_types"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bigdecimal",
+ "blake2 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono",
+ "derive_more 1.0.0-beta.6",
+ "hex",
+ "itertools 0.10.5",
+ "num",
+ "num_enum 0.7.2",
+ "once_cell",
+ "prost 0.12.6",
+ "rlp",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "strum 0.24.1",
+ "thiserror",
+ "tracing",
+ "zksync_basic_types",
+ "zksync_config",
+ "zksync_contracts",
+ "zksync_crypto_primitives",
+ "zksync_mini_merkle_tree",
+ "zksync_protobuf",
+ "zksync_protobuf_build",
+ "zksync_system_constants",
+ "zksync_utils",
+]
+
+[[package]]
+name = "zksync_utils"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bigdecimal",
+ "futures",
+ "hex",
+ "itertools 0.10.5",
+ "num",
+ "once_cell",
+ "reqwest 0.12.4",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "zk_evm",
+ "zksync_basic_types",
+ "zksync_vlog",
+]
+
+[[package]]
+name = "zksync_vlog"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "opentelemetry",
+ "opentelemetry-otlp",
+ "opentelemetry-semantic-conventions",
+ "sentry",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tracing",
+ "tracing-opentelemetry",
+ "tracing-subscriber",
+ "vise",
+ "vise-exporter",
+]
+
+[[package]]
+name = "zstd"
+version = "0.11.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "5.0.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.9+zstd.1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/zk_toolbox/Cargo.toml b/zk_toolbox/Cargo.toml
new file mode 100644
index 000000000000..0473aecf2195
--- /dev/null
+++ b/zk_toolbox/Cargo.toml
@@ -0,0 +1,54 @@
+[workspace]
+members = [
+    "crates/common",
+    "crates/config",
+    "crates/types",
+    "crates/zk_inception",
+    "crates/zk_supervisor",
+]
+resolver = "2"
+
+[workspace.package]
+version = "0.1.0"
+edition = "2021"
+homepage = "https://zksync.io/"
+license = "MIT OR Apache-2.0"
+authors = ["The Matter Labs Team <hello@matterlabs.dev>"]
+exclude = ["./github"]
+repository = "https://github.com/matter-labs/zk_toolbox/"
+description = "ZK Toolbox is a set of tools for working with zk stack."
+keywords = ["zk", "cryptography", "blockchain", "ZKStack", "ZKsync"]
+
+
+[workspace.dependencies]
+# Local dependencies
+common = { path = "crates/common" }
+config = { path = "crates/config" }
+types = { path = "crates/types" }
+zksync_config = { path = "../core/lib/config" }
+zksync_protobuf_config = { path = "../core/lib/protobuf_config" }
+
+# External dependencies
+anyhow = "1.0.82"
+clap = { version = "4.4", features = ["derive", "wrap_help"] }
+slugify-rs = "0.0.3"
+cliclack = "0.2.5"
+console = "0.15.8"
+ethers = "2.0"
+futures = "0.3.30"
+human-panic = "2.0"
+lazy_static = "1.4.0"
+once_cell = "1.19.0"
+path-absolutize = "3.1.1"
+rand = "0.8.5"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_yaml = "0.9"
+sqlx = { version = "0.7.4", features = ["runtime-tokio", "migrate", "postgres"] }
+strum = "0.26.2"
+strum_macros = "0.26.2"
+thiserror = "1.0.57"
+tokio = { version = "1.37", features = ["full"] }
+toml = "0.8.12"
+url = { version = "2.5.0", features = ["serde"] }
+xshell = "0.2.6"
diff --git a/zk_toolbox/README.md b/zk_toolbox/README.md
new file mode 100644
index 000000000000..aed5fc15cbc9
--- /dev/null
+++ b/zk_toolbox/README.md
@@ -0,0 +1,108 @@
+# zk_toolbox
+
+Toolkit for creating and managing ZK Stack chains.
+
+## ZK Inception
+
+ZK Inception facilitates the creation and management of ZK Stacks. All commands are interactive, but you can also pass
+all necessary arguments via the command line.
+
+### Dependencies
+
+Ensure you have followed
+[these instructions](https://github.com/matter-labs/zksync-era/blob/main/docs/guides/setup-dev.md) to set up
+dependencies on your machine (don't worry about the Environment section for now).
+
+### Installation
+
+Install zk_inception from git:
+
+```bash
+cargo install --git https://github.com/matter-labs/zksync-era/ --locked zk_inception --force
+```
+
+Manually building from a local copy of the [ZkSync](https://github.com/matter-labs/zksync-era/) repository:
+
+```bash
+cd zk_toolbox
+cargo install --path ./crates/zk_inception --force --locked
+```
+
+### Foundry Integration
+
+Foundry is utilized for deploying smart contracts. For commands related to deployment, you can pass flags for Foundry
+integration.
+
+### Ecosystem
+
+ZK Stack allows you to either create a new ecosystem or connect to an existing one. An ecosystem includes the components
+that connects all ZK chains, like the BridgeHub, the shared bridges, and state transition managers.
+[Learn more](https://docs.zksync.io/zk-stack/components/shared-bridges.html).
+
+To create a ZK Stack project, you must first create an ecosystem:
+
+```bash
+zk_inception ecosystem create
+```
+
+If you chose to not start database & L1 containers after creating the ecosystem, you can later run
+`zk_inception containers`
+
+All subsequent commands should be executed from within the ecosystem folder you created:
+
+```bash
+cd `path/to/ecosystem/name`
+```
+
+If the ecosystem has never been deployed before, initialization is required:
+
+```bash
+zk_inception ecosystem init
+```
+
+This command also initializes the first ZK chain. Note that the very first chain becomes the default one, but you can
+override it with another by using the `--chain <name>` flag.
+
+To change the default ZK chain, use:
+
+```bash
+zk_inception ecosystem change-default-chain
+```
+
+IMPORTANT: It is not yet possible to use an existing ecosystem and register a chain to it. this feature will be added in
+the future.
+
+### ZK Chain
+
+Upon ecosystem creation, the first ZK chain is automatically generated. However, you can create additional chains and
+switch between them:
+
+```bash
+zk_inception chain create
+```
+
+Once created, contracts for the ZK chain must be deployed:
+
+```bash
+zk_inception chain init
+```
+
+Initialization utilizes the ecosystem's governance to register it in the BridgeHub.
+
+If contracts were deployed by a third party (e.g., MatterLabs), you may need to run the genesis process locally:
+
+```bash
+zk_inception chain genesis
+```
+
+This ensures proper initialization of the server.
+
+### Zk Server
+
+For running the chain:
+
+```bash
+zk_inception server
+```
+
+You can specify the chain you are running by providing `--chain <chain_name>` argument
diff --git a/zk_toolbox/crates/common/Cargo.toml b/zk_toolbox/crates/common/Cargo.toml
new file mode 100644
index 000000000000..6b362905160f
--- /dev/null
+++ b/zk_toolbox/crates/common/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "common"
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+authors.workspace = true
+exclude.workspace = true
+repository.workspace = true
+description.workspace = true
+keywords.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+cliclack.workspace = true
+console.workspace = true
+ethers.workspace = true
+futures.workspace = true
+once_cell.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+serde_yaml.workspace = true
+sqlx.workspace = true
+strum_macros.workspace = true
+tokio.workspace = true
+toml.workspace = true
+url.workspace = true
+xshell.workspace = true
+thiserror = "1.0.57"
diff --git a/zk_toolbox/crates/common/src/cmd.rs b/zk_toolbox/crates/common/src/cmd.rs
new file mode 100644
index 000000000000..0a0d936b90e7
--- /dev/null
+++ b/zk_toolbox/crates/common/src/cmd.rs
@@ -0,0 +1,219 @@
+use std::{
+    ffi::OsStr,
+    io,
+    process::{Command, Output, Stdio},
+    string::FromUtf8Error,
+};
+
+use console::style;
+
+use crate::{
+    config::global_config,
+    logger::{self},
+};
+
+/// A wrapper around [`xshell::Cmd`] that allows for improved error handling,
+/// and verbose logging.
+#[derive(Debug)]
+pub struct Cmd<'a> {
+    inner: xshell::Cmd<'a>,
+    force_run: bool,
+}
+
+#[derive(thiserror::Error, Debug)]
+#[error("Cmd error: {source} {stderr:?}")]
+pub struct CmdError {
+    stderr: Option<String>,
+    source: anyhow::Error,
+}
+
+impl From<xshell::Error> for CmdError {
+    fn from(value: xshell::Error) -> Self {
+        Self {
+            stderr: None,
+            source: value.into(),
+        }
+    }
+}
+
+impl From<io::Error> for CmdError {
+    fn from(value: io::Error) -> Self {
+        Self {
+            stderr: None,
+            source: value.into(),
+        }
+    }
+}
+
+impl From<FromUtf8Error> for CmdError {
+    fn from(value: FromUtf8Error) -> Self {
+        Self {
+            stderr: None,
+            source: value.into(),
+        }
+    }
+}
+
+pub type CmdResult<T> = Result<T, CmdError>;
+
+impl<'a> Cmd<'a> {
+    /// Create a new `Cmd` instance.
+    pub fn new(cmd: xshell::Cmd<'a>) -> Self {
+        Self {
+            inner: cmd,
+            force_run: false,
+        }
+    }
+
+    /// Run the command printing the output to the console.
+    pub fn with_force_run(mut self) -> Self {
+        self.force_run = true;
+        self
+    }
+
+    /// Set env variables for the command.
+    pub fn env<K: AsRef<OsStr>, V: AsRef<OsStr>>(mut self, key: K, value: V) -> Self {
+        self.inner = self.inner.env(key, value);
+        self
+    }
+
+    /// Run the command without capturing its output.
+    pub fn run(mut self) -> CmdResult<()> {
+        let command_txt = self.inner.to_string();
+        let output = if global_config().verbose || self.force_run {
+            logger::debug(format!("Running: {}", self.inner));
+            logger::new_empty_line();
+            run_low_level_process_command(self.inner.into())?
+        } else {
+            // Command will be logged manually.
+            self.inner.set_quiet(true);
+            // Error will be handled manually.
+            self.inner.set_ignore_status(true);
+            self.inner.output()?
+        };
+
+        check_output_status(&command_txt, &output)?;
+        if global_config().verbose {
+            logger::debug(format!("Command completed: {}", command_txt));
+        }
+
+        Ok(())
+    }
+
+    /// Run the command and return its output.
+    pub fn run_with_output(&mut self) -> CmdResult<std::process::Output> {
+        if global_config().verbose || self.force_run {
+            logger::debug(format!("Running: {}", self.inner));
+            logger::new_empty_line();
+        }
+
+        self.inner.set_ignore_status(true);
+        let output = self.inner.output()?;
+
+        if global_config().verbose || self.force_run {
+            logger::raw(log_output(&output));
+            logger::new_empty_line();
+            logger::new_line();
+        }
+
+        Ok(output)
+    }
+}
+
+fn check_output_status(command_text: &str, output: &std::process::Output) -> CmdResult<()> {
+    if !output.status.success() {
+        logger::new_line();
+        logger::error_note(
+            &format!("Command failed to run: {}", command_text),
+            &log_output(output),
+        );
+        return Err(CmdError {
+            stderr: Some(String::from_utf8(output.stderr.clone())?),
+            source: anyhow::anyhow!("Command failed to run: {}", command_text),
+        });
+    }
+
+    Ok(())
+}
+
+fn run_low_level_process_command(mut command: Command) -> io::Result<Output> {
+    command.stdout(Stdio::inherit());
+    command.stderr(Stdio::piped());
+    let child = command.spawn()?;
+    child.wait_with_output()
+}
+
+fn log_output(output: &std::process::Output) -> String {
+    let (status, stdout, stderr) = get_indented_output(output, 4, 120);
+    log_output_int(status, Some(stdout), Some(stderr))
+}
+
+fn log_output_int(status: String, stdout: Option<String>, stderr: Option<String>) -> String {
+    let status_header = style("  Status:").bold();
+    let stdout = if let Some(stdout) = stdout {
+        let stdout_header = style("  Stdout:").bold();
+        format!("{stdout_header}\n{stdout}\n")
+    } else {
+        String::new()
+    };
+
+    let stderr = if let Some(stderr) = stderr {
+        let stderr_header = style("  Stderr:").bold();
+        format!("{stderr_header}\n{stderr}\n")
+    } else {
+        String::new()
+    };
+
+    format!("{status_header}\n{status}\n{stdout}\n{stderr}")
+}
+
+// Indent output and wrap text.
+fn get_indented_output(
+    output: &std::process::Output,
+    indentation: usize,
+    wrap: usize,
+) -> (String, String, String) {
+    let status = output.status.to_string();
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    let stderr = String::from_utf8_lossy(&output.stderr);
+
+    let indent = |s: &str| {
+        s.lines()
+            .map(|l| format!("{:indent$}{}", "", l, indent = indentation))
+            .collect::<Vec<_>>()
+            .join("\n")
+    };
+    let wrap_text_to_len = |s: &str| {
+        let mut result = String::new();
+
+        for original_line in s.split('\n') {
+            if original_line.trim().is_empty() {
+                result.push('\n');
+                continue;
+            }
+
+            let mut line = String::new();
+            for word in original_line.split_whitespace() {
+                if line.len() + word.len() + 1 > wrap {
+                    result.push_str(&line);
+                    result.push('\n');
+                    line.clear();
+                }
+                if !line.is_empty() {
+                    line.push(' ');
+                }
+                line.push_str(word);
+            }
+            result.push_str(&line);
+            result.push('\n');
+        }
+
+        result
+    };
+
+    (
+        indent(&wrap_text_to_len(&status)),
+        indent(&wrap_text_to_len(&stdout)),
+        indent(&wrap_text_to_len(&stderr)),
+    )
+}
diff --git a/zk_toolbox/crates/common/src/config.rs b/zk_toolbox/crates/common/src/config.rs
new file mode 100644
index 000000000000..2cad7b361029
--- /dev/null
+++ b/zk_toolbox/crates/common/src/config.rs
@@ -0,0 +1,20 @@
+use once_cell::sync::OnceCell;
+
+static CONFIG: OnceCell<GlobalConfig> = OnceCell::new();
+
+pub fn init_global_config(config: GlobalConfig) {
+    CONFIG
+        .set(config)
+        .expect("GlobalConfig already initialized");
+}
+
+pub fn global_config() -> &'static GlobalConfig {
+    CONFIG.get().expect("GlobalConfig not initialized")
+}
+
+#[derive(Debug)]
+pub struct GlobalConfig {
+    pub verbose: bool,
+    pub chain_name: Option<String>,
+    pub ignore_prerequisites: bool,
+}
diff --git a/zk_toolbox/crates/common/src/db.rs b/zk_toolbox/crates/common/src/db.rs
new file mode 100644
index 000000000000..c0a681bc74c0
--- /dev/null
+++ b/zk_toolbox/crates/common/src/db.rs
@@ -0,0 +1,161 @@
+use std::{collections::HashMap, path::PathBuf};
+
+use anyhow::anyhow;
+use serde::{Deserialize, Serialize};
+use sqlx::{
+    migrate::{Migrate, MigrateError, Migrator},
+    Connection, PgConnection,
+};
+use url::Url;
+use xshell::Shell;
+
+use crate::{config::global_config, logger};
+
+/// Database configuration.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DatabaseConfig {
+    /// Database URL.
+    pub url: Url,
+    /// Database name.
+    pub name: String,
+}
+
+impl DatabaseConfig {
+    /// Create a new `Db` instance.
+    pub fn new(url: Url, name: String) -> Self {
+        Self { url, name }
+    }
+
+    /// Create a new `Db` instance from a URL.
+    pub fn from_url(url: Url) -> anyhow::Result<Self> {
+        let name = url
+            .path_segments()
+            .ok_or(anyhow!("Failed to parse database name from URL"))?
+            .last()
+            .ok_or(anyhow!("Failed to parse database name from URL"))?;
+        let url_without_db_name = {
+            let mut url = url.clone();
+            url.set_path("");
+            url
+        };
+        Ok(Self {
+            url: url_without_db_name,
+            name: name.to_string(),
+        })
+    }
+
+    /// Get the full URL of the database.
+    pub fn full_url(&self) -> Url {
+        let mut url = self.url.clone();
+        url.set_path(&self.name);
+        url
+    }
+}
+
+pub async fn init_db(db: &DatabaseConfig) -> anyhow::Result<()> {
+    // Connect to the database.
+    let mut connection = PgConnection::connect(db.url.as_str()).await?;
+
+    let query = format!("CREATE DATABASE {}", db.name);
+    // Create DB.
+    sqlx::query(&query).execute(&mut connection).await?;
+
+    Ok(())
+}
+
+pub async fn drop_db_if_exists(db: &DatabaseConfig) -> anyhow::Result<()> {
+    // Connect to the database.
+    let mut connection = PgConnection::connect(db.url.as_str()).await?;
+
+    let query = format!("DROP DATABASE IF EXISTS {}", db.name);
+    // DROP DB.
+    sqlx::query(&query).execute(&mut connection).await?;
+
+    Ok(())
+}
+
+pub async fn migrate_db(
+    shell: &Shell,
+    migrations_folder: PathBuf,
+    db_url: &Url,
+) -> anyhow::Result<()> {
+    // Most of this file is copy-pasted from SQLx CLI:
+    // https://github.com/launchbadge/sqlx/blob/main/sqlx-cli/src/migrate.rs
+    // Warrants a refactoring if this tool makes it to production.
+
+    if !shell.path_exists(&migrations_folder) {
+        anyhow::bail!("Migrations folder {migrations_folder:?} doesn't exist");
+    }
+    let migrator = Migrator::new(migrations_folder).await?;
+
+    let mut conn = PgConnection::connect(db_url.as_str()).await?;
+    conn.ensure_migrations_table().await?;
+
+    let version = conn.dirty_version().await?;
+    if let Some(version) = version {
+        anyhow::bail!(MigrateError::Dirty(version));
+    }
+
+    let applied_migrations: HashMap<_, _> = conn
+        .list_applied_migrations()
+        .await?
+        .into_iter()
+        .map(|m| (m.version, m))
+        .collect();
+
+    if global_config().verbose {
+        logger::debug("Migrations result:")
+    }
+
+    for migration in migrator.iter() {
+        if migration.migration_type.is_down_migration() {
+            // Skipping down migrations
+            continue;
+        }
+
+        match applied_migrations.get(&migration.version) {
+            Some(applied_migration) => {
+                if migration.checksum != applied_migration.checksum {
+                    anyhow::bail!(MigrateError::VersionMismatch(migration.version));
+                }
+            }
+            None => {
+                let skip = false;
+
+                let elapsed = conn.apply(migration).await?;
+                let text = if skip { "Skipped" } else { "Applied" };
+
+                if global_config().verbose {
+                    logger::step(&format!(
+                        "    {} {}/{} {} ({elapsed:?})",
+                        text,
+                        migration.version,
+                        migration.migration_type.label(),
+                        migration.description,
+                    ));
+                }
+            }
+        }
+    }
+
+    // Close the connection before exiting:
+    // * For MySQL and Postgres this should ensure timely cleanup on the server side,
+    //   including decrementing the open connection count.
+    // * For SQLite this should checkpoint and delete the WAL file to ensure the migrations
+    //   were actually applied to the database file and aren't just sitting in the WAL file.
+    let _ = conn.close().await;
+
+    Ok(())
+}
+
+pub async fn wait_for_db(db_url: &Url, tries: u32) -> anyhow::Result<()> {
+    for i in 0..tries {
+        if PgConnection::connect(db_url.as_str()).await.is_ok() {
+            return Ok(());
+        }
+        if i < tries - 1 {
+            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+        }
+    }
+    anyhow::bail!("Unable to connect to Postgres, connection cannot be established");
+}
diff --git a/zk_toolbox/crates/common/src/docker.rs b/zk_toolbox/crates/common/src/docker.rs
new file mode 100644
index 000000000000..f01a7955aead
--- /dev/null
+++ b/zk_toolbox/crates/common/src/docker.rs
@@ -0,0 +1,11 @@
+use xshell::{cmd, Shell};
+
+use crate::cmd::Cmd;
+
+pub fn up(shell: &Shell, docker_compose_file: &str) -> anyhow::Result<()> {
+    Ok(Cmd::new(cmd!(shell, "docker compose -f {docker_compose_file} up -d")).run()?)
+}
+
+pub fn down(shell: &Shell, docker_compose_file: &str) -> anyhow::Result<()> {
+    Ok(Cmd::new(cmd!(shell, "docker compose -f {docker_compose_file} down")).run()?)
+}
diff --git a/zk_toolbox/crates/common/src/ethereum.rs b/zk_toolbox/crates/common/src/ethereum.rs
new file mode 100644
index 000000000000..451bc311145f
--- /dev/null
+++ b/zk_toolbox/crates/common/src/ethereum.rs
@@ -0,0 +1,55 @@
+use std::{ops::Add, time::Duration};
+
+use ethers::{
+    core::k256::ecdsa::SigningKey,
+    middleware::MiddlewareBuilder,
+    prelude::{Http, LocalWallet, Provider, Signer, SignerMiddleware},
+    providers::Middleware,
+    types::{Address, TransactionRequest, H256},
+};
+
+use crate::wallets::Wallet;
+
+pub fn create_ethers_client(
+    private_key: H256,
+    l1_rpc: String,
+    chain_id: Option<u32>,
+) -> anyhow::Result<SignerMiddleware<Provider<Http>, ethers::prelude::Wallet<SigningKey>>> {
+    let mut wallet = LocalWallet::from_bytes(private_key.as_bytes())?;
+    if let Some(chain_id) = chain_id {
+        wallet = wallet.with_chain_id(chain_id);
+    }
+    let client = Provider::<Http>::try_from(l1_rpc)?.with_signer(wallet);
+    Ok(client)
+}
+
+pub async fn distribute_eth(
+    main_wallet: Wallet,
+    addresses: Vec<Address>,
+    l1_rpc: String,
+    chain_id: u32,
+    amount: u128,
+) -> anyhow::Result<()> {
+    let client = create_ethers_client(main_wallet.private_key.unwrap(), l1_rpc, Some(chain_id))?;
+    let mut pending_txs = vec![];
+    let mut nonce = client.get_transaction_count(client.address(), None).await?;
+    for address in addresses {
+        let tx = TransactionRequest::new()
+            .to(address)
+            .value(amount)
+            .nonce(nonce)
+            .chain_id(chain_id);
+        nonce = nonce.add(1);
+        pending_txs.push(
+            client
+                .send_transaction(tx, None)
+                .await?
+                // It's safe to set such low number of confirmations and low interval for localhost
+                .confirmations(1)
+                .interval(Duration::from_millis(30)),
+        );
+    }
+
+    futures::future::join_all(pending_txs).await;
+    Ok(())
+}
diff --git a/zk_toolbox/crates/common/src/files.rs b/zk_toolbox/crates/common/src/files.rs
new file mode 100644
index 000000000000..8db8eb7f33c3
--- /dev/null
+++ b/zk_toolbox/crates/common/src/files.rs
@@ -0,0 +1,67 @@
+use std::path::Path;
+
+use serde::{de::DeserializeOwned, Serialize};
+use xshell::Shell;
+
+pub fn read_yaml_file<T>(shell: &Shell, file_path: impl AsRef<Path>) -> anyhow::Result<T>
+where
+    T: DeserializeOwned,
+{
+    let content = shell.read_file(file_path)?;
+    let yaml = serde_yaml::from_str(&content)?;
+    Ok(yaml)
+}
+
+pub fn read_toml_file<T>(shell: &Shell, file_path: impl AsRef<Path>) -> anyhow::Result<T>
+where
+    T: DeserializeOwned,
+{
+    let content = shell.read_file(file_path)?;
+    let toml = toml::from_str(&content)?;
+    Ok(toml)
+}
+
+pub fn read_json_file<T>(shell: &Shell, file_path: impl AsRef<Path>) -> anyhow::Result<T>
+where
+    T: DeserializeOwned,
+{
+    let content = shell.read_file(file_path)?;
+    let json = serde_json::from_str(&content)?;
+    Ok(json)
+}
+
+pub fn save_yaml_file(
+    shell: &Shell,
+    file_path: impl AsRef<Path>,
+    content: impl Serialize,
+    comment: impl ToString,
+) -> anyhow::Result<()> {
+    let data = format!(
+        "{}{}",
+        comment.to_string(),
+        serde_yaml::to_string(&content)?
+    );
+    shell.write_file(file_path, data)?;
+    Ok(())
+}
+
+pub fn save_toml_file(
+    shell: &Shell,
+    file_path: impl AsRef<Path>,
+    content: impl Serialize,
+    comment: impl ToString,
+) -> anyhow::Result<()> {
+    let data = format!("{}{}", comment.to_string(), toml::to_string(&content)?);
+    shell.write_file(file_path, data)?;
+    Ok(())
+}
+
+pub fn save_json_file(
+    shell: &Shell,
+    file_path: impl AsRef<Path>,
+    content: impl Serialize,
+) -> anyhow::Result<()> {
+    let data = serde_json::to_string_pretty(&content)?;
+    shell.write_file(file_path, data)?;
+    Ok(())
+}
diff --git a/zk_toolbox/crates/common/src/forge.rs b/zk_toolbox/crates/common/src/forge.rs
new file mode 100644
index 000000000000..a858333cd2c0
--- /dev/null
+++ b/zk_toolbox/crates/common/src/forge.rs
@@ -0,0 +1,350 @@
+use std::{
+    path::{Path, PathBuf},
+    str::FromStr,
+};
+
+use clap::{Parser, ValueEnum};
+use ethers::{
+    middleware::Middleware,
+    prelude::{LocalWallet, Signer},
+    types::{Address, H256, U256},
+    utils::hex::ToHex,
+};
+use serde::{Deserialize, Serialize};
+use strum_macros::Display;
+use xshell::{cmd, Shell};
+
+use crate::{cmd::Cmd, ethereum::create_ethers_client};
+
+/// Forge is a wrapper around the forge binary.
+pub struct Forge {
+    path: PathBuf,
+}
+
+impl Forge {
+    /// Create a new Forge instance.
+    pub fn new(path: &Path) -> Self {
+        Forge {
+            path: path.to_path_buf(),
+        }
+    }
+
+    /// Create a new ForgeScript instance.
+    ///
+    /// The script path can be passed as a relative path to the base path
+    /// or as an absolute path.
+    pub fn script(&self, path: &Path, args: ForgeScriptArgs) -> ForgeScript {
+        ForgeScript {
+            base_path: self.path.clone(),
+            script_path: path.to_path_buf(),
+            args,
+        }
+    }
+}
+
+/// ForgeScript is a wrapper around the forge script command.
+pub struct ForgeScript {
+    base_path: PathBuf,
+    script_path: PathBuf,
+    args: ForgeScriptArgs,
+}
+
+impl ForgeScript {
+    /// Run the forge script command.
+    pub fn run(mut self, shell: &Shell) -> anyhow::Result<()> {
+        let _dir_guard = shell.push_dir(&self.base_path);
+        let script_path = self.script_path.as_os_str();
+        let args = self.args.build();
+        Ok(Cmd::new(cmd!(shell, "forge script {script_path} --legacy {args...}")).run()?)
+    }
+
+    pub fn wallet_args_passed(&self) -> bool {
+        self.args.wallet_args_passed()
+    }
+
+    /// Add the ffi flag to the forge script command.
+    pub fn with_ffi(mut self) -> Self {
+        self.args.add_arg(ForgeScriptArg::Ffi);
+        self
+    }
+
+    /// Add the rpc-url flag to the forge script command.
+    pub fn with_rpc_url(mut self, rpc_url: String) -> Self {
+        self.args.add_arg(ForgeScriptArg::RpcUrl { url: rpc_url });
+        self
+    }
+
+    /// Add the broadcast flag to the forge script command.
+    pub fn with_broadcast(mut self) -> Self {
+        self.args.add_arg(ForgeScriptArg::Broadcast);
+        self
+    }
+
+    pub fn with_signature(mut self, signature: &str) -> Self {
+        self.args.add_arg(ForgeScriptArg::Sig {
+            sig: signature.to_string(),
+        });
+        self
+    }
+
+    /// Makes sure a transaction is sent, only after its previous one has been confirmed and succeeded.
+    pub fn with_slow(mut self) -> Self {
+        self.args.add_arg(ForgeScriptArg::Slow);
+        self
+    }
+
+    /// Adds the private key of the deployer account.
+    pub fn with_private_key(mut self, private_key: H256) -> Self {
+        self.args.add_arg(ForgeScriptArg::PrivateKey {
+            private_key: private_key.encode_hex(),
+        });
+        self
+    }
+    // Do not start the script if balance is not enough
+    pub fn private_key(&self) -> Option<H256> {
+        self.args.args.iter().find_map(|a| {
+            if let ForgeScriptArg::PrivateKey { private_key } = a {
+                Some(H256::from_str(private_key).unwrap())
+            } else {
+                None
+            }
+        })
+    }
+
+    pub fn rpc_url(&self) -> Option<String> {
+        self.args.args.iter().find_map(|a| {
+            if let ForgeScriptArg::RpcUrl { url } = a {
+                Some(url.clone())
+            } else {
+                None
+            }
+        })
+    }
+
+    pub fn address(&self) -> Option<Address> {
+        self.private_key().and_then(|a| {
+            LocalWallet::from_bytes(a.as_bytes())
+                .ok()
+                .map(|a| Address::from_slice(a.address().as_bytes()))
+        })
+    }
+
+    pub async fn get_the_balance(&self) -> anyhow::Result<Option<U256>> {
+        let Some(rpc_url) = self.rpc_url() else {
+            return Ok(None);
+        };
+        let Some(private_key) = self.private_key() else {
+            return Ok(None);
+        };
+        let client = create_ethers_client(private_key, rpc_url, None)?;
+        let balance = client.get_balance(client.address(), None).await?;
+        Ok(Some(balance))
+    }
+}
+
+const PROHIBITED_ARGS: [&str; 10] = [
+    "--contracts",
+    "--root",
+    "--lib-paths",
+    "--out",
+    "--sig",
+    "--target-contract",
+    "--chain-id",
+    "-C",
+    "-O",
+    "-s",
+];
+
+const WALLET_ARGS: [&str; 18] = [
+    "-a",
+    "--froms",
+    "-i",
+    "--private-keys",
+    "--private-key",
+    "--mnemonics",
+    "--mnenomic-passphrases",
+    "--mnemonic-derivation-paths",
+    "--mnemonic-indexes",
+    "--keystore",
+    "--account",
+    "--password",
+    "--password-file",
+    "-l",
+    "--ledger",
+    "-t",
+    "--trezor",
+    "--aws",
+];
+
+/// Set of known forge script arguments necessary for execution.
+#[derive(Display, Debug, Serialize, Deserialize, Clone, PartialEq)]
+#[strum(serialize_all = "kebab-case", prefix = "--")]
+pub enum ForgeScriptArg {
+    Broadcast,
+    #[strum(to_string = "etherscan-api-key={api_key}")]
+    EtherscanApiKey {
+        api_key: String,
+    },
+    Ffi,
+    #[strum(to_string = "private-key={private_key}")]
+    PrivateKey {
+        private_key: String,
+    },
+    #[strum(to_string = "rpc-url={url}")]
+    RpcUrl {
+        url: String,
+    },
+    #[strum(to_string = "sig={sig}")]
+    Sig {
+        sig: String,
+    },
+    Slow,
+    #[strum(to_string = "verifier={verifier}")]
+    Verifier {
+        verifier: String,
+    },
+    #[strum(to_string = "verifier-url={url}")]
+    VerifierUrl {
+        url: String,
+    },
+    Verify,
+}
+
+/// ForgeScriptArgs is a set of arguments that can be passed to the forge script command.
+#[derive(Default, Debug, Serialize, Deserialize, Parser, Clone)]
+#[clap(next_help_heading = "Forge options")]
+pub struct ForgeScriptArgs {
+    /// List of known forge script arguments.
+    #[clap(skip)]
+    args: Vec<ForgeScriptArg>,
+    /// Verify deployed contracts
+    #[clap(long, default_missing_value = "true", num_args = 0..=1)]
+    pub verify: Option<bool>,
+    /// Verifier to use
+    #[clap(long, default_value_t = ForgeVerifier::Etherscan)]
+    pub verifier: ForgeVerifier,
+    /// Verifier URL, if using a custom provider
+    #[clap(long)]
+    pub verifier_url: Option<String>,
+    /// Verifier API key
+    #[clap(long)]
+    pub verifier_api_key: Option<String>,
+    /// List of additional arguments that can be passed through the CLI.
+    ///
+    /// e.g.: `zk_inception init -a --private-key=<PRIVATE_KEY>`
+    #[clap(long, short)]
+    #[arg(trailing_var_arg = true, allow_hyphen_values = true, hide = false)]
+    additional_args: Vec<String>,
+}
+
+impl ForgeScriptArgs {
+    /// Build the forge script command arguments.
+    pub fn build(&mut self) -> Vec<String> {
+        self.add_verify_args();
+        self.cleanup_contract_args();
+        self.args
+            .iter()
+            .map(|arg| arg.to_string())
+            .chain(self.additional_args.clone())
+            .collect()
+    }
+
+    /// Adds verify arguments to the forge script command.
+    fn add_verify_args(&mut self) {
+        if !self.verify.is_some_and(|v| v) {
+            return;
+        }
+
+        self.add_arg(ForgeScriptArg::Verify);
+        if let Some(url) = &self.verifier_url {
+            self.add_arg(ForgeScriptArg::VerifierUrl { url: url.clone() });
+        }
+        if let Some(api_key) = &self.verifier_api_key {
+            self.add_arg(ForgeScriptArg::EtherscanApiKey {
+                api_key: api_key.clone(),
+            });
+        }
+        self.add_arg(ForgeScriptArg::Verifier {
+            verifier: self.verifier.to_string(),
+        });
+    }
+
+    /// Cleanup the contract arguments which are not allowed to be passed through the CLI.
+    fn cleanup_contract_args(&mut self) {
+        let mut skip_next = false;
+        let mut cleaned_args = vec![];
+        let mut forbidden_args = vec![];
+
+        let prohibited_with_spacing: Vec<String> = PROHIBITED_ARGS
+            .iter()
+            .flat_map(|arg| vec![format!("{arg} "), format!("{arg}\t")])
+            .collect();
+
+        let prohibited_with_equals: Vec<String> = PROHIBITED_ARGS
+            .iter()
+            .map(|arg| format!("{arg}="))
+            .collect();
+
+        for arg in self.additional_args.iter() {
+            if skip_next {
+                skip_next = false;
+                continue;
+            }
+
+            if prohibited_with_spacing
+                .iter()
+                .any(|prohibited_arg| arg.starts_with(prohibited_arg))
+            {
+                skip_next = true;
+                forbidden_args.push(arg.clone());
+                continue;
+            }
+
+            if prohibited_with_equals
+                .iter()
+                .any(|prohibited_arg| arg.starts_with(prohibited_arg))
+            {
+                skip_next = false;
+                forbidden_args.push(arg.clone());
+                continue;
+            }
+
+            cleaned_args.push(arg.clone());
+        }
+
+        if !forbidden_args.is_empty() {
+            println!(
+                "Warning: the following arguments are not allowed to be passed through the CLI and were skipped: {:?}",
+                forbidden_args
+            );
+        }
+
+        self.additional_args = cleaned_args;
+    }
+
+    /// Add additional arguments to the forge script command.
+    /// If the argument already exists, a warning will be printed.
+    pub fn add_arg(&mut self, arg: ForgeScriptArg) {
+        if self.args.contains(&arg) {
+            println!("Warning: argument {arg:?} already exists");
+            return;
+        }
+        self.args.push(arg);
+    }
+
+    pub fn wallet_args_passed(&self) -> bool {
+        self.additional_args
+            .iter()
+            .any(|arg| WALLET_ARGS.contains(&arg.as_ref()))
+    }
+}
+
+#[derive(Debug, Clone, ValueEnum, Display, Serialize, Deserialize, Default)]
+#[strum(serialize_all = "snake_case")]
+pub enum ForgeVerifier {
+    #[default]
+    Etherscan,
+    Sourcify,
+    Blockscout,
+    Oklink,
+}
diff --git a/zk_toolbox/crates/common/src/lib.rs b/zk_toolbox/crates/common/src/lib.rs
new file mode 100644
index 000000000000..022f8df7052e
--- /dev/null
+++ b/zk_toolbox/crates/common/src/lib.rs
@@ -0,0 +1,17 @@
+mod prerequisites;
+mod prompt;
+mod term;
+
+pub mod cmd;
+pub mod config;
+pub mod db;
+pub mod docker;
+pub mod ethereum;
+pub mod files;
+pub mod forge;
+pub mod server;
+pub mod wallets;
+
+pub use prerequisites::{check_general_prerequisites, check_prover_prequisites};
+pub use prompt::{init_prompt_theme, Prompt, PromptConfirm, PromptSelect};
+pub use term::{error, logger, spinner};
diff --git a/zk_toolbox/crates/common/src/prerequisites.rs b/zk_toolbox/crates/common/src/prerequisites.rs
new file mode 100644
index 000000000000..717635a1a18f
--- /dev/null
+++ b/zk_toolbox/crates/common/src/prerequisites.rs
@@ -0,0 +1,89 @@
+use xshell::{cmd, Shell};
+
+use crate::{cmd::Cmd, logger};
+
+const PREREQUISITES: [Prerequisite; 5] = [
+    Prerequisite {
+        name: "git",
+        download_link: "https://git-scm.com/book/en/v2/Getting-Started-Installing-Git",
+    },
+    Prerequisite {
+        name: "docker",
+        download_link: "https://docs.docker.com/get-docker/",
+    },
+    Prerequisite {
+        name: "forge",
+        download_link: "https://book.getfoundry.sh/getting-started/installation",
+    },
+    Prerequisite {
+        name: "cargo",
+        download_link: "https://doc.rust-lang.org/cargo/getting-started/installation.html",
+    },
+    Prerequisite {
+        name: "yarn",
+        download_link: "https://yarnpkg.com/getting-started/install",
+    },
+];
+
+const DOCKER_COMPOSE_PREREQUISITE: Prerequisite = Prerequisite {
+    name: "docker compose",
+    download_link: "https://docs.docker.com/compose/install/",
+};
+
+const PROVER_PREREQUISITES: [Prerequisite; 1] = [Prerequisite {
+    name: "gcloud",
+    download_link: "https://cloud.google.com/sdk/docs/install",
+}];
+
+struct Prerequisite {
+    name: &'static str,
+    download_link: &'static str,
+}
+
+pub fn check_general_prerequisites(shell: &Shell) {
+    check_prerequisites(shell, &PREREQUISITES, true);
+}
+
+pub fn check_prover_prequisites(shell: &Shell) {
+    check_prerequisites(shell, &PROVER_PREREQUISITES, false);
+}
+
+fn check_prerequisites(shell: &Shell, prerequisites: &[Prerequisite], check_compose: bool) {
+    let mut missing_prerequisites = vec![];
+
+    for prerequisite in prerequisites {
+        if !check_prerequisite(shell, prerequisite.name) {
+            missing_prerequisites.push(prerequisite);
+        }
+    }
+
+    if check_compose && !check_docker_compose_prerequisite(shell) {
+        missing_prerequisites.push(&DOCKER_COMPOSE_PREREQUISITE);
+    }
+
+    if !missing_prerequisites.is_empty() {
+        logger::error("Prerequisite check has failed");
+        logger::error_note(
+            "The following prerequisites are missing",
+            &missing_prerequisites
+                .iter()
+                .map(|prerequisite| {
+                    format!("- {} ({})", prerequisite.name, prerequisite.download_link)
+                })
+                .collect::<Vec<_>>()
+                .join("\n"),
+        );
+        logger::outro("Failed");
+        std::process::exit(1);
+    }
+}
+
+fn check_prerequisite(shell: &Shell, name: &str) -> bool {
+    Cmd::new(cmd!(shell, "which {name}")).run().is_ok()
+}
+
+fn check_docker_compose_prerequisite(shell: &Shell) -> bool {
+    Cmd::new(cmd!(shell, "docker compose version"))
+        .run()
+        .is_ok()
+}
diff --git a/zk_toolbox/crates/common/src/prompt/confirm.rs b/zk_toolbox/crates/common/src/prompt/confirm.rs
new file mode 100644
index 000000000000..79d6e8de91b0
--- /dev/null
+++ b/zk_toolbox/crates/common/src/prompt/confirm.rs
@@ -0,0 +1,25 @@
+use std::fmt::Display;
+
+use cliclack::Confirm;
+
+pub struct PromptConfirm {
+    inner: Confirm,
+}
+
+impl PromptConfirm {
+    pub fn new(question: impl Display) -> Self {
+        Self {
+            inner: Confirm::new(question),
+        }
+    }
+
+    pub fn default(self, default: bool) -> Self {
+        Self {
+            inner: self.inner.initial_value(default),
+        }
+    }
+
+    pub fn ask(mut self) -> bool {
+        self.inner.interact().unwrap()
+    }
+}
diff --git a/zk_toolbox/crates/common/src/prompt/input.rs b/zk_toolbox/crates/common/src/prompt/input.rs
new file mode 100644
index 000000000000..a936b4e9e635
--- /dev/null
+++ b/zk_toolbox/crates/common/src/prompt/input.rs
@@ -0,0 +1,41 @@
+use std::str::FromStr;
+
+use cliclack::{Input, Validate};
+
+pub struct Prompt {
+    inner: Input,
+}
+
+impl Prompt {
+    pub fn new(question: &str) -> Self {
+        Self {
+            inner: Input::new(question),
+        }
+    }
+
+    pub fn allow_empty(mut self) -> Self {
+        self.inner = self.inner.required(false);
+        self
+    }
+
+    pub fn default(mut self, default: &str) -> Self {
+        self.inner = self.inner.default_input(default);
+        self
+    }
+
+    pub fn validate_with<F>(mut self, f: F) -> Self
+    where
+        F: Validate<String> + 'static,
+        F::Err: ToString,
+    {
+        self.inner = self.inner.validate(f);
+        self
+    }
+
+    pub fn ask<T>(mut self) -> T
+    where
+        T: FromStr,
+    {
+        self.inner.interact().unwrap()
+    }
+}
diff --git a/zk_toolbox/crates/common/src/prompt/mod.rs b/zk_toolbox/crates/common/src/prompt/mod.rs
new file mode 100644
index 000000000000..cd642302c06c
--- /dev/null
+++ b/zk_toolbox/crates/common/src/prompt/mod.rs
@@ -0,0 +1,25 @@
+mod confirm;
+mod input;
+mod select;
+
+use cliclack::{Theme, ThemeState};
+pub use confirm::PromptConfirm;
+use console::Style;
+pub use input::Prompt;
+pub use select::PromptSelect;
+
+pub struct CliclackTheme;
+
+impl Theme for CliclackTheme {
+    fn bar_color(&self, state: &ThemeState) -> Style {
+        match state {
+            ThemeState::Active => Style::new().cyan(),
+            ThemeState::Error(_) => Style::new().yellow(),
+            _ => Style::new().cyan().dim(),
+        }
+    }
+}
+
+pub fn init_prompt_theme() {
+    cliclack::set_theme(CliclackTheme);
+}
diff --git a/zk_toolbox/crates/common/src/prompt/select.rs b/zk_toolbox/crates/common/src/prompt/select.rs
new file mode 100644
index 000000000000..5908cf0a8fee
--- /dev/null
+++ b/zk_toolbox/crates/common/src/prompt/select.rs
@@ -0,0 +1,32 @@
+use cliclack::Select;
+
+pub struct PromptSelect<T> {
+    inner: Select<T>,
+}
+
+impl<T> PromptSelect<T>
+where
+    T: Clone + Eq,
+{
+    pub fn new<I>(question: &str, items: I) -> Self
+    where
+        T: ToString + Clone,
+        I: IntoIterator<Item = T>,
+    {
+        let items = items
+            .into_iter()
+            .map(|item| {
+                let label = item.to_string();
+                let hint = "";
+                (item, label, hint)
+            })
+            .collect::<Vec<_>>();
+        Self {
+            inner: Select::new(question).items(&items),
+        }
+    }
+
+    pub fn ask(mut self) -> T {
+        self.inner.interact().unwrap()
+    }
+}
diff --git a/zk_toolbox/crates/common/src/server.rs b/zk_toolbox/crates/common/src/server.rs
new file mode 100644
index 000000000000..c65c8d4c13e2
--- /dev/null
+++ b/zk_toolbox/crates/common/src/server.rs
@@ -0,0 +1,97 @@
+use std::{ffi::OsStr, path::PathBuf};
+
+use xshell::{cmd, Shell};
+
+use crate::cmd::Cmd;
+
+/// Allows to perform server operations.
+#[derive(Debug)]
+pub struct Server {
+    components: Option<Vec<String>>,
+    code_path: PathBuf,
+}
+
+/// Possible server modes.
+#[derive(Debug)]
+pub enum ServerMode {
+    Normal,
+    Genesis,
+}
+
+impl Server {
+    /// Creates a new instance of the server.
+    pub fn new(components: Option<Vec<String>>, code_path: PathBuf) -> Self {
+        Self {
+            components,
+            code_path,
+        }
+    }
+
+    /// Runs the server.
+    #[allow(clippy::too_many_arguments)]
+    pub fn run<P>(
+        &self,
+        shell: &Shell,
+        server_mode: ServerMode,
+        genesis_path: P,
+        wallets_path: P,
+        general_path: P,
+        secrets_path: P,
+        contracts_path: P,
+        mut additional_args: Vec<String>,
+    ) -> anyhow::Result<()>
+    where
+        P: AsRef<OsStr>,
+    {
+        let _dir_guard = shell.push_dir(&self.code_path);
+
+        if let Some(components) = self.components() {
+            additional_args.push(format!("--components={}", components))
+        }
+        if let ServerMode::Genesis = server_mode {
+            additional_args.push("--genesis".to_string());
+        }
+
+        let mut cmd = Cmd::new(
+            cmd!(
+                shell,
+                "cargo run --release --bin zksync_server --
+                --genesis-path {genesis_path}
+                --wallets-path {wallets_path}
+                --config-path {general_path}
+                --secrets-path {secrets_path}
+                --contracts-config-path {contracts_path}
+                "
+            )
+            .args(additional_args)
+            .env_remove("RUSTUP_TOOLCHAIN"),
+        );
+
+        // If we are running server in normal mode
+        // we need to get the output to the console
+        if let ServerMode::Normal = server_mode {
+            cmd = cmd.with_force_run();
+        }
+
+        cmd.run()?;
+
+        Ok(())
+    }
+
+    /// Builds the server.
+    pub fn build(&self, shell: &Shell) -> anyhow::Result<()> {
+        let _dir_guard = shell.push_dir(&self.code_path);
+        Cmd::new(cmd!(shell, "cargo build --release --bin zksync_server")).run()?;
+        Ok(())
+    }
+
+    /// Returns the components as a comma-separated string.
+    fn components(&self) -> Option<String> {
+        self.components.as_ref().and_then(|components| {
+            if components.is_empty() {
+                return None;
+            }
+            Some(components.join(","))
+        })
+    }
+}
diff --git a/zk_toolbox/crates/common/src/term/error.rs b/zk_toolbox/crates/common/src/term/error.rs
new file mode 100644
index 000000000000..462b4c4f8bb2
--- /dev/null
+++ b/zk_toolbox/crates/common/src/term/error.rs
@@ -0,0 +1,20 @@
+use crate::logger;
+
+pub fn log_error(error: anyhow::Error) {
+    logger::error(error.to_string());
+
+    if error.chain().count() > 1 {
+        logger::warn(
+            // "Caused by:",
+            error
+                .chain()
+                .skip(1)
+                .enumerate()
+                .map(|(i, cause)| format!("  {i}: {}", cause))
+                .collect::<Vec<_>>()
+                .join("\n"),
+        );
+    }
+
+    logger::outro("Failed to run command");
+}
diff --git a/zk_toolbox/crates/common/src/term/logger.rs b/zk_toolbox/crates/common/src/term/logger.rs
new file mode 100644
index 000000000000..33a88bd961e2
--- /dev/null
+++ b/zk_toolbox/crates/common/src/term/logger.rs
@@ -0,0 +1,118 @@
+use std::fmt::Display;
+
+use cliclack::{intro as cliclak_intro, log, outro as cliclak_outro, Theme, ThemeState};
+use console::{style, Emoji, Term};
+use serde::Serialize;
+
+use crate::prompt::CliclackTheme;
+
+const S_BAR: Emoji = Emoji("│", "|");
+
+fn term_write(msg: impl Display) {
+    let msg = &format!("{}", msg);
+    Term::stderr().write_str(msg).unwrap();
+}
+
+pub fn intro() {
+    cliclak_intro(style(" ZKsync toolbox ").on_cyan().black()).unwrap();
+}
+
+pub fn outro(msg: impl Display) {
+    cliclak_outro(msg).unwrap();
+}
+
+pub fn info(msg: impl Display) {
+    log::info(msg).unwrap();
+}
+
+pub fn debug(msg: impl Display) {
+    let msg = &format!("{}", msg);
+    let log = CliclackTheme.format_log(msg, style("⚙").dim().to_string().as_str());
+    Term::stderr().write_str(&log).unwrap();
+}
+
+pub fn warn(msg: impl Display) {
+    log::warning(msg).unwrap();
+}
+
+pub fn error(msg: impl Display) {
+    log::error(style(msg).red()).unwrap();
+}
+
+pub fn success(msg: impl Display) {
+    log::success(msg).unwrap();
+}
+
+pub fn step(msg: impl Display) {
+    log::step(msg).unwrap();
+}
+
+pub fn raw(msg: impl Display) {
+    term_write(msg);
+}
+
+pub fn note(msg: impl Display, content: impl Display) {
+    cliclack::note(msg, content).unwrap();
+}
+
+pub fn error_note(msg: &str, content: &str) {
+    let symbol = CliclackTheme.state_symbol(&ThemeState::Submit);
+    let note = CliclackTheme
+        .format_note(msg, content)
+        .replace(&symbol, &CliclackTheme.error_symbol());
+    term_write(note);
+}
+
+pub fn object_to_string(obj: impl Serialize) -> String {
+    let json = serde_json::to_value(obj).unwrap();
+
+    fn print_object(key: &str, value: &str, indentation: usize) -> String {
+        format!(
+            "{:indent$}∙ {} {}\n",
+            "",
+            style(format!("{key}:")).bold(),
+            style(value),
+            indent = indentation
+        )
+    }
+
+    fn print_header(header: &str, indentation: usize) -> String {
+        format!(
+            "{:indent$}∙ {}\n",
+            "",
+            style(format!("{header}:")).bold(),
+            indent = indentation
+        )
+    }
+
+    fn traverse_json(json: &serde_json::Value, indent: usize) -> String {
+        let mut values = String::new();
+
+        if let serde_json::Value::Object(obj) = json {
+            for (key, value) in obj {
+                match value {
+                    serde_json::Value::Object(_) => {
+                        values.push_str(&print_header(key, indent));
+                        values.push_str(&traverse_json(value, indent + 2));
+                    }
+                    _ => values.push_str(&print_object(key, &value.to_string(), indent)),
+                }
+            }
+        }
+
+        values
+    }
+
+    traverse_json(&json, 2)
+}
+
+pub fn new_empty_line() {
+    term_write("\n");
+}
+
+pub fn new_line() {
+    term_write(format!(
+        "{}\n",
+        CliclackTheme.bar_color(&ThemeState::Submit).apply_to(S_BAR)
+    ))
+}
diff --git a/zk_toolbox/crates/common/src/term/mod.rs b/zk_toolbox/crates/common/src/term/mod.rs
new file mode 100644
index 000000000000..9c4bbfca2486
--- /dev/null
+++ b/zk_toolbox/crates/common/src/term/mod.rs
@@ -0,0 +1,3 @@
+pub mod error;
+pub mod logger;
+pub mod spinner;
diff --git a/zk_toolbox/crates/common/src/term/spinner.rs b/zk_toolbox/crates/common/src/term/spinner.rs
new file mode 100644
index 000000000000..b97ba075ac45
--- /dev/null
+++ b/zk_toolbox/crates/common/src/term/spinner.rs
@@ -0,0 +1,51 @@
+use std::time::Instant;
+
+use cliclack::{spinner, ProgressBar};
+
+use crate::config::global_config;
+
+/// Spinner is a helper struct to show a spinner while some operation is running.
+pub struct Spinner {
+    msg: String,
+    pb: ProgressBar,
+    time: Instant,
+}
+
+impl Spinner {
+    /// Create a new spinner with a message.
+    pub fn new(msg: &str) -> Self {
+        let pb = spinner();
+        pb.start(msg);
+        if global_config().verbose {
+            pb.stop(msg);
+        }
+        Spinner {
+            msg: msg.to_owned(),
+            pb,
+            time: Instant::now(),
+        }
+    }
+
+    /// Manually finish the spinner.
+    pub fn finish(self) {
+        self.pb.stop(format!(
+            "{} done in {} secs",
+            self.msg,
+            self.time.elapsed().as_secs_f64()
+        ));
+    }
+
+    /// Interrupt the spinner with a failed message.
+    pub fn fail(self) {
+        self.pb.error(format!(
+            "{} failed in {} secs",
+            self.msg,
+            self.time.elapsed().as_secs_f64()
+        ));
+    }
+
+    /// Freeze the spinner with current message.
+    pub fn freeze(self) {
+        self.pb.stop(self.msg);
+    }
+}
diff --git a/zk_toolbox/crates/common/src/wallets.rs b/zk_toolbox/crates/common/src/wallets.rs
new file mode 100644
index 000000000000..ed5e11b3261a
--- /dev/null
+++ b/zk_toolbox/crates/common/src/wallets.rs
@@ -0,0 +1,64 @@
+use ethers::{
+    core::rand::Rng,
+    signers::{coins_bip39::English, LocalWallet, MnemonicBuilder, Signer},
+    types::{Address, H256},
+};
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Wallet {
+    pub address: Address,
+    pub private_key: Option<H256>,
+}
+
+impl Wallet {
+    pub fn random(rng: &mut impl Rng) -> Self {
+        let private_key = H256::random_using(rng);
+        let local_wallet = LocalWallet::from_bytes(private_key.as_bytes()).unwrap();
+
+        Self {
+            address: Address::from_slice(local_wallet.address().as_bytes()),
+            private_key: Some(private_key),
+        }
+    }
+
+    pub fn new_with_key(private_key: H256) -> Self {
+        let local_wallet = LocalWallet::from_bytes(private_key.as_bytes()).unwrap();
+        Self {
+            address: Address::from_slice(local_wallet.address().as_bytes()),
+            private_key: Some(private_key),
+        }
+    }
+
+    pub fn from_mnemonic(mnemonic: &str, base_path: &str, index: u32) -> anyhow::Result<Self> {
+        let wallet = MnemonicBuilder::<English>::default()
+            .phrase(mnemonic)
+            .derivation_path(&format!("{}/{}", base_path, index))?
+            .build()?;
+        let private_key = H256::from_slice(&wallet.signer().to_bytes());
+        Ok(Self::new_with_key(private_key))
+    }
+
+    pub fn empty() -> Self {
+        Self {
+            address: Address::zero(),
+            private_key: Some(H256::zero()),
+        }
+    }
+}
+
+#[test]
+fn test_load_localhost_wallets() {
+    let wallet = Wallet::from_mnemonic(
+        "stuff slice staff easily soup parent arm payment cotton trade scatter struggle",
+        "m/44'/60'/0'/0",
+        1,
+    )
+    .unwrap();
+    assert_eq!(
+        wallet.address,
+        Address::from_slice(
+            &ethers::utils::hex::decode("0xa61464658AfeAf65CccaaFD3a512b69A83B77618").unwrap()
+        )
+    );
+}
diff --git a/zk_toolbox/crates/config/Cargo.toml b/zk_toolbox/crates/config/Cargo.toml
new file mode 100644
index 000000000000..a6c525e5d9a2
--- /dev/null
+++ b/zk_toolbox/crates/config/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "config"
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+authors.workspace = true
+exclude.workspace = true
+repository.workspace = true
+description.workspace = true
+keywords.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+common.workspace = true
+ethers.workspace = true
+path-absolutize.workspace = true
+rand.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+thiserror.workspace = true
+types.workspace = true
+url.workspace = true
+xshell.workspace = true
+zksync_config.workspace = true
+zksync_protobuf_config.workspace = true
diff --git a/zk_toolbox/crates/config/src/chain.rs b/zk_toolbox/crates/config/src/chain.rs
new file mode 100644
index 000000000000..367c1ab1157f
--- /dev/null
+++ b/zk_toolbox/crates/config/src/chain.rs
@@ -0,0 +1,154 @@
+use std::{
+    cell::OnceCell,
+    path::{Path, PathBuf},
+};
+
+use serde::{Deserialize, Serialize, Serializer};
+use types::{
+    BaseToken, ChainId, L1BatchCommitDataGeneratorMode, L1Network, ProverMode, WalletCreation,
+};
+use xshell::Shell;
+use zksync_config::configs::GeneralConfig as ZkSyncGeneralConfig;
+use zksync_protobuf_config::{decode_yaml_repr, encode_yaml_repr};
+
+use crate::{
+    consts::{
+        CONFIG_NAME, CONTRACTS_FILE, GENERAL_FILE, GENESIS_FILE, L1_CONTRACTS_FOUNDRY,
+        SECRETS_FILE, WALLETS_FILE,
+    },
+    create_localhost_wallets,
+    traits::{FileConfigWithDefaultName, ReadConfig, SaveConfig, SaveConfigWithBasePath},
+    ContractsConfig, GeneralConfig, GenesisConfig, SecretsConfig, WalletsConfig,
+};
+
+/// Chain configuration file. This file is created in the chain
+/// directory before network initialization.
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct ChainConfigInternal {
+    // The id of chain on this machine allows to easily setup multiple chains,
+    // needs for local setups only
+    pub id: u32,
+    pub name: String,
+    pub chain_id: ChainId,
+    pub prover_version: ProverMode,
+    pub configs: PathBuf,
+    pub rocks_db_path: PathBuf,
+    pub external_node_config_path: Option<PathBuf>,
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+    pub base_token: BaseToken,
+    pub wallet_creation: WalletCreation,
+}
+
+/// Chain configuration file. This file is created in the chain
+/// directory before network initialization.
+#[derive(Debug)]
+pub struct ChainConfig {
+    pub id: u32,
+    pub name: String,
+    pub chain_id: ChainId,
+    pub prover_version: ProverMode,
+    pub l1_network: L1Network,
+    pub link_to_code: PathBuf,
+    pub rocks_db_path: PathBuf,
+    pub configs: PathBuf,
+    pub external_node_config_path: Option<PathBuf>,
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+    pub base_token: BaseToken,
+    pub wallet_creation: WalletCreation,
+    pub shell: OnceCell<Shell>,
+}
+
+impl Serialize for ChainConfig {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.get_internal().serialize(serializer)
+    }
+}
+
+impl ChainConfig {
+    pub(crate) fn get_shell(&self) -> &Shell {
+        self.shell.get().expect("Not initialized")
+    }
+
+    pub fn get_genesis_config(&self) -> anyhow::Result<GenesisConfig> {
+        GenesisConfig::read(self.get_shell(), self.configs.join(GENESIS_FILE))
+    }
+
+    pub fn get_general_config(&self) -> anyhow::Result<GeneralConfig> {
+        GeneralConfig::read(self.get_shell(), self.configs.join(GENERAL_FILE))
+    }
+
+    pub fn get_wallets_config(&self) -> anyhow::Result<WalletsConfig> {
+        let path = self.configs.join(WALLETS_FILE);
+        if let Ok(wallets) = WalletsConfig::read(self.get_shell(), &path) {
+            return Ok(wallets);
+        }
+        if self.wallet_creation == WalletCreation::Localhost {
+            let wallets = create_localhost_wallets(self.get_shell(), &self.link_to_code, self.id)?;
+            wallets.save(self.get_shell(), &path)?;
+            return Ok(wallets);
+        }
+        anyhow::bail!("Wallets configs has not been found");
+    }
+    pub fn get_contracts_config(&self) -> anyhow::Result<ContractsConfig> {
+        ContractsConfig::read(self.get_shell(), self.configs.join(CONTRACTS_FILE))
+    }
+
+    pub fn get_secrets_config(&self) -> anyhow::Result<SecretsConfig> {
+        SecretsConfig::read(self.get_shell(), self.configs.join(SECRETS_FILE))
+    }
+
+    pub fn get_zksync_general_config(&self) -> anyhow::Result<ZkSyncGeneralConfig> {
+        decode_yaml_repr::<zksync_protobuf_config::proto::general::GeneralConfig>(
+            &self.configs.join(GENERAL_FILE),
+            false,
+        )
+    }
+
+    pub fn save_zksync_general_config(
+        &self,
+        general_config: &ZkSyncGeneralConfig,
+    ) -> anyhow::Result<()> {
+        let path = self.configs.join(GENERAL_FILE);
+        let bytes = encode_yaml_repr::<zksync_protobuf_config::proto::general::GeneralConfig>(
+            general_config,
+        )?;
+        self.get_shell().write_file(path, bytes)?;
+        Ok(())
+    }
+
+    pub fn path_to_foundry(&self) -> PathBuf {
+        self.link_to_code.join(L1_CONTRACTS_FOUNDRY)
+    }
+
+    pub fn save(&self, shell: &Shell, path: impl AsRef<Path>) -> anyhow::Result<()> {
+        let config = self.get_internal();
+        config.save(shell, path)
+    }
+
+    pub fn save_with_base_path(self, shell: &Shell, path: impl AsRef<Path>) -> anyhow::Result<()> {
+        let config = self.get_internal();
+        config.save_with_base_path(shell, path)
+    }
+
+    fn get_internal(&self) -> ChainConfigInternal {
+        ChainConfigInternal {
+            id: self.id,
+            name: self.name.clone(),
+            chain_id: self.chain_id,
+            prover_version: self.prover_version,
+            configs: self.configs.clone(),
+            rocks_db_path: self.rocks_db_path.clone(),
+            external_node_config_path: self.external_node_config_path.clone(),
+            l1_batch_commit_data_generator_mode: self.l1_batch_commit_data_generator_mode,
+            base_token: self.base_token.clone(),
+            wallet_creation: self.wallet_creation,
+        }
+    }
+}
+
+impl FileConfigWithDefaultName for ChainConfigInternal {
+    const FILE_NAME: &'static str = CONFIG_NAME;
+}
diff --git a/zk_toolbox/crates/config/src/consts.rs b/zk_toolbox/crates/config/src/consts.rs
new file mode 100644
index 000000000000..a00274fb35f3
--- /dev/null
+++ b/zk_toolbox/crates/config/src/consts.rs
@@ -0,0 +1,41 @@
+use types::ChainId;
+
+/// Name of the main configuration file
+pub(crate) const CONFIG_NAME: &str = "ZkStack.yaml";
+/// Name of the wallets file
+pub(crate) const WALLETS_FILE: &str = "wallets.yaml";
+/// Name of the secrets config file
+pub(crate) const SECRETS_FILE: &str = "secrets.yaml";
+/// Name of the general config file
+pub(crate) const GENERAL_FILE: &str = "general.yaml";
+/// Name of the genesis config file
+pub(crate) const GENESIS_FILE: &str = "genesis.yaml";
+
+// Name of external node specific config
+pub(crate) const EN_CONFIG_FILE: &str = "external_node.yaml";
+pub(crate) const ERC20_CONFIGS_FILE: &str = "erc20.yaml";
+/// Name of the initial deployments config file
+pub(crate) const INITIAL_DEPLOYMENT_FILE: &str = "initial_deployments.yaml";
+/// Name of the erc20 deployments config file
+pub(crate) const ERC20_DEPLOYMENT_FILE: &str = "erc20_deployments.yaml";
+/// Name of the contracts file
+pub(crate) const CONTRACTS_FILE: &str = "contracts.yaml";
+/// Main repository for the ZKsync project
+pub const ZKSYNC_ERA_GIT_REPO: &str = "https://github.com/matter-labs/zksync-era";
+/// Name of the docker-compose file inside zksync repository
+pub const DOCKER_COMPOSE_FILE: &str = "docker-compose.yml";
+/// Path to the config file with mnemonic for localhost wallets
+pub(crate) const CONFIGS_PATH: &str = "etc/env/file_based";
+pub(crate) const LOCAL_CONFIGS_PATH: &str = "configs/";
+pub(crate) const LOCAL_DB_PATH: &str = "db/";
+
+/// Path to ecosystem contacts
+pub(crate) const ECOSYSTEM_PATH: &str = "etc/ecosystem";
+
+/// Path to l1 contracts foundry folder inside zksync-era
+pub(crate) const L1_CONTRACTS_FOUNDRY: &str = "contracts/l1-contracts";
+
+pub(crate) const ERA_CHAIN_ID: ChainId = ChainId(270);
+
+pub(crate) const TEST_CONFIG_PATH: &str = "etc/test_config/constant/eth.json";
+pub(crate) const BASE_PATH: &str = "m/44'/60'/0'";
diff --git a/zk_toolbox/crates/config/src/contracts.rs b/zk_toolbox/crates/config/src/contracts.rs
new file mode 100644
index 000000000000..a847c8a4cc93
--- /dev/null
+++ b/zk_toolbox/crates/config/src/contracts.rs
@@ -0,0 +1,129 @@
+use ethers::types::{Address, H256};
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    consts::CONTRACTS_FILE,
+    forge_interface::{
+        deploy_ecosystem::output::DeployL1Output,
+        initialize_bridges::output::InitializeBridgeOutput,
+        register_chain::output::RegisterChainOutput,
+    },
+    traits::{FileConfig, FileConfigWithDefaultName},
+};
+
+#[derive(Debug, Deserialize, Serialize, Clone, Default)]
+pub struct ContractsConfig {
+    pub create2_factory_addr: Address,
+    pub create2_factory_salt: H256,
+    pub ecosystem_contracts: EcosystemContracts,
+    pub bridges: BridgesContracts,
+    pub l1: L1Contracts,
+    pub l2: L2Contracts,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+impl ContractsConfig {
+    pub fn update_from_l1_output(&mut self, deploy_l1_output: &DeployL1Output) {
+        self.create2_factory_addr = deploy_l1_output.create2_factory_addr;
+        self.create2_factory_salt = deploy_l1_output.create2_factory_salt;
+        self.bridges.erc20.l1_address = deploy_l1_output
+            .deployed_addresses
+            .bridges
+            .erc20_bridge_proxy_addr;
+        self.bridges.shared.l1_address = deploy_l1_output
+            .deployed_addresses
+            .bridges
+            .shared_bridge_proxy_addr;
+        self.ecosystem_contracts.bridgehub_proxy_addr = deploy_l1_output
+            .deployed_addresses
+            .bridgehub
+            .bridgehub_proxy_addr;
+        self.ecosystem_contracts.state_transition_proxy_addr = deploy_l1_output
+            .deployed_addresses
+            .state_transition
+            .state_transition_proxy_addr;
+        self.ecosystem_contracts.transparent_proxy_admin_addr = deploy_l1_output
+            .deployed_addresses
+            .transparent_proxy_admin_addr;
+        self.l1.default_upgrade_addr = deploy_l1_output
+            .deployed_addresses
+            .state_transition
+            .default_upgrade_addr;
+        self.l1.diamond_proxy_addr = deploy_l1_output
+            .deployed_addresses
+            .state_transition
+            .diamond_proxy_addr;
+        self.l1.governance_addr = deploy_l1_output.deployed_addresses.governance_addr;
+        self.l1.multicall3_addr = deploy_l1_output.multicall3_addr;
+        self.ecosystem_contracts.validator_timelock_addr =
+            deploy_l1_output.deployed_addresses.validator_timelock_addr;
+        self.l1.verifier_addr = deploy_l1_output
+            .deployed_addresses
+            .state_transition
+            .verifier_addr;
+        self.l1.validator_timelock_addr =
+            deploy_l1_output.deployed_addresses.validator_timelock_addr;
+        self.ecosystem_contracts
+            .diamond_cut_data
+            .clone_from(&deploy_l1_output.contracts_config.diamond_cut_data);
+    }
+
+    pub fn set_chain_contracts(&mut self, register_chain_output: &RegisterChainOutput) {
+        self.l1.diamond_proxy_addr = register_chain_output.diamond_proxy_addr;
+        self.l1.governance_addr = register_chain_output.governance_addr;
+    }
+
+    pub fn set_l2_shared_bridge(
+        &mut self,
+        initialize_bridges_output: &InitializeBridgeOutput,
+    ) -> anyhow::Result<()> {
+        self.bridges.shared.l2_address = Some(initialize_bridges_output.l2_shared_bridge_proxy);
+        self.bridges.erc20.l2_address = Some(initialize_bridges_output.l2_shared_bridge_proxy);
+        Ok(())
+    }
+}
+
+impl FileConfigWithDefaultName for ContractsConfig {
+    const FILE_NAME: &'static str = CONTRACTS_FILE;
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
+pub struct EcosystemContracts {
+    pub bridgehub_proxy_addr: Address,
+    pub state_transition_proxy_addr: Address,
+    pub transparent_proxy_admin_addr: Address,
+    pub validator_timelock_addr: Address,
+    pub diamond_cut_data: String,
+}
+
+impl FileConfig for EcosystemContracts {}
+
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
+pub struct BridgesContracts {
+    pub erc20: BridgeContractsDefinition,
+    pub shared: BridgeContractsDefinition,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
+pub struct BridgeContractsDefinition {
+    pub l1_address: Address,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub l2_address: Option<Address>,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
+pub struct L1Contracts {
+    pub default_upgrade_addr: Address,
+    pub diamond_proxy_addr: Address,
+    pub governance_addr: Address,
+    pub multicall3_addr: Address,
+    pub verifier_addr: Address,
+    pub validator_timelock_addr: Address,
+    pub base_token_addr: Address,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
+pub struct L2Contracts {
+    pub testnet_paymaster_addr: Address,
+}
diff --git a/zk_toolbox/crates/config/src/ecosystem.rs b/zk_toolbox/crates/config/src/ecosystem.rs
new file mode 100644
index 000000000000..08708ebb0b61
--- /dev/null
+++ b/zk_toolbox/crates/config/src/ecosystem.rs
@@ -0,0 +1,226 @@
+use std::{cell::OnceCell, path::PathBuf};
+
+use path_absolutize::Absolutize;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use thiserror::Error;
+use types::{ChainId, L1Network, ProverMode, WalletCreation};
+use xshell::Shell;
+
+use crate::{
+    consts::{
+        CONFIGS_PATH, CONFIG_NAME, CONTRACTS_FILE, ECOSYSTEM_PATH, ERA_CHAIN_ID,
+        ERC20_DEPLOYMENT_FILE, INITIAL_DEPLOYMENT_FILE, L1_CONTRACTS_FOUNDRY, LOCAL_DB_PATH,
+        WALLETS_FILE,
+    },
+    create_localhost_wallets,
+    forge_interface::deploy_ecosystem::input::{Erc20DeploymentConfig, InitialDeploymentConfig},
+    traits::{FileConfigWithDefaultName, ReadConfig, SaveConfig},
+    ChainConfig, ChainConfigInternal, ContractsConfig, WalletsConfig,
+};
+
+/// Ecosystem configuration file. This file is created in the chain
+/// directory before network initialization.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+struct EcosystemConfigInternal {
+    pub name: String,
+    pub l1_network: L1Network,
+    pub link_to_code: PathBuf,
+    pub chains: PathBuf,
+    pub config: PathBuf,
+    pub default_chain: String,
+    pub era_chain_id: ChainId,
+    pub prover_version: ProverMode,
+    pub wallet_creation: WalletCreation,
+}
+
+/// Ecosystem configuration file. This file is created in the chain
+/// directory before network initialization.
+#[derive(Debug, Clone)]
+pub struct EcosystemConfig {
+    pub name: String,
+    pub l1_network: L1Network,
+    pub link_to_code: PathBuf,
+    pub chains: PathBuf,
+    pub config: PathBuf,
+    pub default_chain: String,
+    pub era_chain_id: ChainId,
+    pub prover_version: ProverMode,
+    pub wallet_creation: WalletCreation,
+    pub shell: OnceCell<Shell>,
+}
+
+impl Serialize for EcosystemConfig {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.get_internal().serialize(serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for EcosystemConfig {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let config: EcosystemConfigInternal = Deserialize::deserialize(deserializer)?;
+        Ok(EcosystemConfig {
+            name: config.name.clone(),
+            l1_network: config.l1_network,
+            link_to_code: config
+                .link_to_code
+                .absolutize()
+                .expect("Failed to parse zksync-era path")
+                .to_path_buf(),
+            chains: config.chains.clone(),
+            config: config.config.clone(),
+            default_chain: config.default_chain.clone(),
+            era_chain_id: config.era_chain_id,
+            prover_version: config.prover_version,
+            wallet_creation: config.wallet_creation,
+            shell: Default::default(),
+        })
+    }
+}
+
+impl FileConfigWithDefaultName for EcosystemConfig {
+    const FILE_NAME: &'static str = CONFIG_NAME;
+}
+
+impl EcosystemConfig {
+    fn get_shell(&self) -> &Shell {
+        self.shell.get().expect("Must be initialized")
+    }
+
+    pub fn from_file(shell: &Shell) -> Result<Self, EcosystemConfigFromFileError> {
+        let path = PathBuf::from(CONFIG_NAME);
+        if !shell.path_exists(path) {
+            return Err(EcosystemConfigFromFileError::NotExists);
+        }
+
+        let mut config = EcosystemConfig::read(shell, CONFIG_NAME)
+            .map_err(|e| EcosystemConfigFromFileError::InvalidConfig { source: e })?;
+        config.shell = shell.clone().into();
+
+        Ok(config)
+    }
+
+    pub fn load_chain(&self, name: Option<String>) -> Option<ChainConfig> {
+        let name = name.unwrap_or(self.default_chain.clone());
+        self.load_chain_inner(&name)
+    }
+
+    fn load_chain_inner(&self, name: &str) -> Option<ChainConfig> {
+        let path = self.chains.join(name).join(CONFIG_NAME);
+        let config = ChainConfigInternal::read(self.get_shell(), path).ok()?;
+
+        Some(ChainConfig {
+            id: config.id,
+            name: config.name,
+            chain_id: config.chain_id,
+            prover_version: config.prover_version,
+            configs: config.configs,
+            external_node_config_path: config.external_node_config_path,
+            l1_batch_commit_data_generator_mode: config.l1_batch_commit_data_generator_mode,
+            l1_network: self.l1_network,
+            link_to_code: self
+                .link_to_code
+                .absolutize()
+                .expect("Failed to parse zksync-era path")
+                .into(),
+            base_token: config.base_token,
+            rocks_db_path: config.rocks_db_path,
+            wallet_creation: config.wallet_creation,
+            shell: self.get_shell().clone().into(),
+        })
+    }
+
+    pub fn get_initial_deployment_config(&self) -> anyhow::Result<InitialDeploymentConfig> {
+        InitialDeploymentConfig::read(self.get_shell(), self.config.join(INITIAL_DEPLOYMENT_FILE))
+    }
+
+    pub fn get_erc20_deployment_config(&self) -> anyhow::Result<Erc20DeploymentConfig> {
+        Erc20DeploymentConfig::read(self.get_shell(), self.config.join(ERC20_DEPLOYMENT_FILE))
+    }
+
+    pub fn get_wallets(&self) -> anyhow::Result<WalletsConfig> {
+        let path = self.config.join(WALLETS_FILE);
+        if let Ok(wallets) = WalletsConfig::read(self.get_shell(), &path) {
+            return Ok(wallets);
+        }
+        if self.wallet_creation == WalletCreation::Localhost {
+            // Use 0 id for ecosystem  wallets
+            let wallets = create_localhost_wallets(self.get_shell(), &self.link_to_code, 0)?;
+            wallets.save(self.get_shell(), &path)?;
+            return Ok(wallets);
+        }
+        anyhow::bail!("Wallets configs has not been found");
+    }
+
+    pub fn get_contracts_config(&self) -> anyhow::Result<ContractsConfig> {
+        ContractsConfig::read(self.get_shell(), self.config.join(CONTRACTS_FILE))
+    }
+
+    pub fn path_to_foundry(&self) -> PathBuf {
+        self.link_to_code.join(L1_CONTRACTS_FOUNDRY)
+    }
+
+    pub fn list_of_chains(&self) -> Vec<String> {
+        self.get_shell()
+            .read_dir(&self.chains)
+            .unwrap()
+            .iter()
+            .filter_map(|file| {
+                if file.is_dir() {
+                    file.file_name().map(|a| a.to_str().unwrap().to_string())
+                } else {
+                    None
+                }
+            })
+            .collect()
+    }
+
+    pub fn get_default_configs_path(&self) -> PathBuf {
+        self.link_to_code.join(CONFIGS_PATH)
+    }
+
+    /// Path to the predefined ecosystem configs
+    pub fn get_preexisting_configs_path(&self) -> PathBuf {
+        self.link_to_code.join(ECOSYSTEM_PATH)
+    }
+
+    pub fn get_chain_rocks_db_path(&self, chain_name: &str) -> PathBuf {
+        self.chains.join(chain_name).join(LOCAL_DB_PATH)
+    }
+
+    fn get_internal(&self) -> EcosystemConfigInternal {
+        EcosystemConfigInternal {
+            name: self.name.clone(),
+            l1_network: self.l1_network,
+            link_to_code: self
+                .link_to_code
+                .absolutize()
+                .expect("Failed to parse zksync-era path")
+                .into(),
+            chains: self.chains.clone(),
+            config: self.config.clone(),
+            default_chain: self.default_chain.clone(),
+            era_chain_id: self.era_chain_id,
+            prover_version: self.prover_version,
+            wallet_creation: self.wallet_creation,
+        }
+    }
+}
+
+/// Result of checking if the ecosystem exists.
+#[derive(Error, Debug)]
+pub enum EcosystemConfigFromFileError {
+    #[error("Ecosystem configuration not found")]
+    NotExists,
+    #[error("Invalid ecosystem configuration")]
+    InvalidConfig { source: anyhow::Error },
+}
+
+pub fn get_default_era_chain_id() -> ChainId {
+    ERA_CHAIN_ID
+}
diff --git a/zk_toolbox/crates/config/src/external_node.rs b/zk_toolbox/crates/config/src/external_node.rs
new file mode 100644
index 000000000000..87acb15e4d8c
--- /dev/null
+++ b/zk_toolbox/crates/config/src/external_node.rs
@@ -0,0 +1,23 @@
+use std::num::NonZeroUsize;
+
+use serde::{Deserialize, Serialize};
+use types::{ChainId, L1BatchCommitDataGeneratorMode};
+
+use crate::{consts::EN_CONFIG_FILE, traits::FileConfigWithDefaultName};
+
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
+pub struct ENConfig {
+    // Genesis
+    pub l2_chain_id: ChainId,
+    pub l1_chain_id: u32,
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+
+    // Main node configuration
+    pub main_node_url: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub main_node_rate_limit_rps: Option<NonZeroUsize>,
+}
+
+impl FileConfigWithDefaultName for ENConfig {
+    const FILE_NAME: &'static str = EN_CONFIG_FILE;
+}
diff --git a/zk_toolbox/crates/config/src/file_config.rs b/zk_toolbox/crates/config/src/file_config.rs
new file mode 100644
index 000000000000..ec3a733227f6
--- /dev/null
+++ b/zk_toolbox/crates/config/src/file_config.rs
@@ -0,0 +1,12 @@
+use std::path::{Path, PathBuf};
+
+use xshell::Shell;
+
+use crate::consts::LOCAL_CONFIGS_PATH;
+
+pub fn create_local_configs_dir(
+    shell: &Shell,
+    base_path: impl AsRef<Path>,
+) -> xshell::Result<PathBuf> {
+    shell.create_dir(base_path.as_ref().join(LOCAL_CONFIGS_PATH))
+}
diff --git a/zk_toolbox/crates/config/src/forge_interface/accept_ownership/mod.rs b/zk_toolbox/crates/config/src/forge_interface/accept_ownership/mod.rs
new file mode 100644
index 000000000000..58b5aa1f9d49
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/accept_ownership/mod.rs
@@ -0,0 +1,12 @@
+use ethers::types::Address;
+use serde::{Deserialize, Serialize};
+
+use crate::traits::FileConfig;
+
+impl FileConfig for AcceptOwnershipInput {}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct AcceptOwnershipInput {
+    pub target_addr: Address,
+    pub governor: Address,
+}
diff --git a/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/input.rs b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/input.rs
new file mode 100644
index 000000000000..e0ad2ac70cdc
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/input.rs
@@ -0,0 +1,252 @@
+use std::{collections::HashMap, str::FromStr};
+
+use ethers::{
+    prelude::U256,
+    types::{Address, H256},
+};
+use rand::Rng;
+use serde::{Deserialize, Serialize};
+use types::ChainId;
+
+use crate::{
+    consts::INITIAL_DEPLOYMENT_FILE,
+    traits::{FileConfig, FileConfigWithDefaultName},
+    ContractsConfig, GenesisConfig, WalletsConfig,
+};
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct InitialDeploymentConfig {
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub create2_factory_addr: Option<Address>,
+    pub create2_factory_salt: H256,
+    pub governance_min_delay: u64,
+    pub max_number_of_chains: u64,
+    pub diamond_init_batch_overhead_l1_gas: u64,
+    pub diamond_init_max_l2_gas_per_batch: u64,
+    pub diamond_init_max_pubdata_per_batch: u64,
+    pub diamond_init_minimal_l2_gas_price: u64,
+    pub diamond_init_priority_tx_max_pubdata: u64,
+    pub diamond_init_pubdata_pricing_mode: u64,
+    pub priority_tx_max_gas_limit: u64,
+    pub validator_timelock_execution_delay: u64,
+    pub token_weth_address: Address,
+    pub bridgehub_create_new_chain_salt: u64,
+}
+
+impl Default for InitialDeploymentConfig {
+    fn default() -> Self {
+        Self {
+            create2_factory_addr: None,
+            create2_factory_salt: H256::random(),
+            governance_min_delay: 0,
+            max_number_of_chains: 100,
+            diamond_init_batch_overhead_l1_gas: 1000000,
+            diamond_init_max_l2_gas_per_batch: 80000000,
+            diamond_init_max_pubdata_per_batch: 120000,
+            diamond_init_minimal_l2_gas_price: 250000000,
+            diamond_init_priority_tx_max_pubdata: 99000,
+            diamond_init_pubdata_pricing_mode: 0,
+            priority_tx_max_gas_limit: 72000000,
+            validator_timelock_execution_delay: 0,
+            token_weth_address: Address::from_str("0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2")
+                .unwrap(),
+            // toml crate u64 support is backed by i64 implementation
+            // https://github.com/toml-rs/toml/issues/705
+            bridgehub_create_new_chain_salt: rand::thread_rng().gen_range(0..=i64::MAX) as u64,
+        }
+    }
+}
+
+impl FileConfigWithDefaultName for InitialDeploymentConfig {
+    const FILE_NAME: &'static str = INITIAL_DEPLOYMENT_FILE;
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct Erc20DeploymentConfig {
+    pub tokens: Vec<Erc20DeploymentTokensConfig>,
+}
+
+impl FileConfigWithDefaultName for Erc20DeploymentConfig {
+    const FILE_NAME: &'static str = INITIAL_DEPLOYMENT_FILE;
+}
+
+impl Default for Erc20DeploymentConfig {
+    fn default() -> Self {
+        Self {
+            tokens: vec![
+                Erc20DeploymentTokensConfig {
+                    name: String::from("DAI"),
+                    symbol: String::from("DAI"),
+                    decimals: 18,
+                    implementation: String::from("TestnetERC20Token.sol"),
+                    mint: U256::from_str("9000000000000000000000").unwrap(),
+                },
+                Erc20DeploymentTokensConfig {
+                    name: String::from("WBTC"),
+                    symbol: String::from("WBTC"),
+                    decimals: 8,
+                    implementation: String::from("TestnetERC20Token.sol"),
+                    mint: U256::from_str("9000000000000000000000").unwrap(),
+                },
+                Erc20DeploymentTokensConfig {
+                    name: String::from("Wrapped Ether"),
+                    symbol: String::from("WETH"),
+                    decimals: 18,
+                    implementation: String::from("WETH9.sol"),
+                    mint: U256::zero(),
+                },
+            ],
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct Erc20DeploymentTokensConfig {
+    pub name: String,
+    pub symbol: String,
+    pub decimals: u64,
+    pub implementation: String,
+    pub mint: U256,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct DeployL1Config {
+    pub era_chain_id: ChainId,
+    pub owner_address: Address,
+    pub testnet_verifier: bool,
+    pub contracts: ContractsDeployL1Config,
+    pub tokens: TokensDeployL1Config,
+}
+
+impl FileConfig for DeployL1Config {}
+
+impl DeployL1Config {
+    pub fn new(
+        genesis_config: &GenesisConfig,
+        wallets_config: &WalletsConfig,
+        initial_deployment_config: &InitialDeploymentConfig,
+        era_chain_id: ChainId,
+        testnet_verifier: bool,
+    ) -> Self {
+        Self {
+            era_chain_id,
+            testnet_verifier,
+            owner_address: wallets_config.governor.address,
+            contracts: ContractsDeployL1Config {
+                create2_factory_addr: initial_deployment_config.create2_factory_addr,
+                create2_factory_salt: initial_deployment_config.create2_factory_salt,
+                // TODO verify correctnesss
+                governance_security_council_address: wallets_config.governor.address,
+                governance_min_delay: initial_deployment_config.governance_min_delay,
+                max_number_of_chains: initial_deployment_config.max_number_of_chains,
+                diamond_init_batch_overhead_l1_gas: initial_deployment_config
+                    .diamond_init_batch_overhead_l1_gas,
+                diamond_init_max_l2_gas_per_batch: initial_deployment_config
+                    .diamond_init_max_l2_gas_per_batch,
+                diamond_init_max_pubdata_per_batch: initial_deployment_config
+                    .diamond_init_max_pubdata_per_batch,
+                diamond_init_minimal_l2_gas_price: initial_deployment_config
+                    .diamond_init_minimal_l2_gas_price,
+                bootloader_hash: genesis_config.bootloader_hash,
+                default_aa_hash: genesis_config.default_aa_hash,
+                diamond_init_priority_tx_max_pubdata: initial_deployment_config
+                    .diamond_init_priority_tx_max_pubdata,
+                diamond_init_pubdata_pricing_mode: initial_deployment_config
+                    .diamond_init_pubdata_pricing_mode,
+                genesis_batch_commitment: genesis_config.genesis_batch_commitment,
+                genesis_rollup_leaf_index: genesis_config.genesis_rollup_leaf_index,
+                genesis_root: genesis_config.genesis_root,
+                latest_protocol_version: genesis_config.genesis_protocol_semantic_version.pack(),
+                recursion_circuits_set_vks_hash: H256::zero(),
+                recursion_leaf_level_vk_hash: H256::zero(),
+                recursion_node_level_vk_hash: H256::zero(),
+                priority_tx_max_gas_limit: initial_deployment_config.priority_tx_max_gas_limit,
+                validator_timelock_execution_delay: initial_deployment_config
+                    .validator_timelock_execution_delay,
+            },
+            tokens: TokensDeployL1Config {
+                token_weth_address: initial_deployment_config.token_weth_address,
+            },
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct ContractsDeployL1Config {
+    pub governance_security_council_address: Address,
+    pub governance_min_delay: u64,
+    pub max_number_of_chains: u64,
+    pub create2_factory_salt: H256,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub create2_factory_addr: Option<Address>,
+    pub validator_timelock_execution_delay: u64,
+    pub genesis_root: H256,
+    pub genesis_rollup_leaf_index: u32,
+    pub genesis_batch_commitment: H256,
+    pub latest_protocol_version: U256,
+    pub recursion_node_level_vk_hash: H256,
+    pub recursion_leaf_level_vk_hash: H256,
+    pub recursion_circuits_set_vks_hash: H256,
+    pub priority_tx_max_gas_limit: u64,
+    pub diamond_init_pubdata_pricing_mode: u64,
+    pub diamond_init_batch_overhead_l1_gas: u64,
+    pub diamond_init_max_pubdata_per_batch: u64,
+    pub diamond_init_max_l2_gas_per_batch: u64,
+    pub diamond_init_priority_tx_max_pubdata: u64,
+    pub diamond_init_minimal_l2_gas_price: u64,
+    pub bootloader_hash: H256,
+    pub default_aa_hash: H256,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct TokensDeployL1Config {
+    pub token_weth_address: Address,
+}
+
+// TODO check for ability to resuse Erc20DeploymentConfig
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct DeployErc20Config {
+    pub create2_factory_salt: H256,
+    pub create2_factory_addr: Address,
+    pub tokens: HashMap<String, TokenDeployErc20Config>,
+    pub additional_addresses_for_minting: Vec<Address>,
+}
+
+impl FileConfig for DeployErc20Config {}
+
+impl DeployErc20Config {
+    pub fn new(
+        erc20_deployment_config: &Erc20DeploymentConfig,
+        contracts_config: &ContractsConfig,
+        additional_addresses_for_minting: Vec<Address>,
+    ) -> Self {
+        let mut tokens = HashMap::new();
+        for token in &erc20_deployment_config.tokens {
+            tokens.insert(
+                token.symbol.clone(),
+                TokenDeployErc20Config {
+                    name: token.name.clone(),
+                    symbol: token.symbol.clone(),
+                    decimals: token.decimals,
+                    implementation: token.implementation.clone(),
+                    mint: token.mint,
+                },
+            );
+        }
+        Self {
+            create2_factory_addr: contracts_config.create2_factory_addr,
+            create2_factory_salt: contracts_config.create2_factory_salt,
+            tokens,
+            additional_addresses_for_minting,
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct TokenDeployErc20Config {
+    pub name: String,
+    pub symbol: String,
+    pub decimals: u64,
+    pub implementation: String,
+    pub mint: U256,
+}
diff --git a/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/mod.rs b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/mod.rs
new file mode 100644
index 000000000000..7d1a54844d0c
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/mod.rs
@@ -0,0 +1,2 @@
+pub mod input;
+pub mod output;
diff --git a/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/output.rs b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/output.rs
new file mode 100644
index 000000000000..874414ccc1a4
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/deploy_ecosystem/output.rs
@@ -0,0 +1,98 @@
+use std::collections::HashMap;
+
+use ethers::types::{Address, H256, U256};
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    consts::ERC20_CONFIGS_FILE,
+    traits::{FileConfig, FileConfigWithDefaultName},
+};
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct DeployL1Output {
+    pub create2_factory_addr: Address,
+    pub create2_factory_salt: H256,
+    pub deployer_addr: Address,
+    pub era_chain_id: u32,
+    pub l1_chain_id: u32,
+    pub multicall3_addr: Address,
+    pub owner_addr: Address,
+    pub contracts_config: DeployL1ContractsConfigOutput,
+    pub deployed_addresses: DeployL1DeployedAddressesOutput,
+}
+
+impl FileConfig for DeployL1Output {}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct DeployL1ContractsConfigOutput {
+    pub diamond_init_max_l2_gas_per_batch: u64,
+    pub diamond_init_batch_overhead_l1_gas: u64,
+    pub diamond_init_max_pubdata_per_batch: u64,
+    pub diamond_init_minimal_l2_gas_price: u64,
+    pub diamond_init_priority_tx_max_pubdata: u64,
+    pub diamond_init_pubdata_pricing_mode: u64,
+    pub priority_tx_max_gas_limit: u64,
+    pub recursion_circuits_set_vks_hash: H256,
+    pub recursion_leaf_level_vk_hash: H256,
+    pub recursion_node_level_vk_hash: H256,
+    pub diamond_cut_data: String,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct DeployL1DeployedAddressesOutput {
+    pub blob_versioned_hash_retriever_addr: Address,
+    pub governance_addr: Address,
+    pub transparent_proxy_admin_addr: Address,
+    pub validator_timelock_addr: Address,
+    pub bridgehub: L1BridgehubOutput,
+    pub bridges: L1BridgesOutput,
+    pub state_transition: L1StateTransitionOutput,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct L1BridgehubOutput {
+    pub bridgehub_implementation_addr: Address,
+    pub bridgehub_proxy_addr: Address,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct L1BridgesOutput {
+    pub erc20_bridge_implementation_addr: Address,
+    pub erc20_bridge_proxy_addr: Address,
+    pub shared_bridge_implementation_addr: Address,
+    pub shared_bridge_proxy_addr: Address,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct L1StateTransitionOutput {
+    pub admin_facet_addr: Address,
+    pub default_upgrade_addr: Address,
+    pub diamond_init_addr: Address,
+    pub diamond_proxy_addr: Address,
+    pub executor_facet_addr: Address,
+    pub genesis_upgrade_addr: Address,
+    pub getters_facet_addr: Address,
+    pub mailbox_facet_addr: Address,
+    pub state_transition_implementation_addr: Address,
+    pub state_transition_proxy_addr: Address,
+    pub verifier_addr: Address,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct TokenDeployErc20Output {
+    pub address: Address,
+    pub name: String,
+    pub symbol: String,
+    pub decimals: u64,
+    pub implementation: String,
+    pub mint: U256,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct DeployErc20Output {
+    pub tokens: HashMap<String, TokenDeployErc20Output>,
+}
+
+impl FileConfigWithDefaultName for DeployErc20Output {
+    const FILE_NAME: &'static str = ERC20_CONFIGS_FILE;
+}
diff --git a/zk_toolbox/crates/config/src/forge_interface/initialize_bridges/input.rs b/zk_toolbox/crates/config/src/forge_interface/initialize_bridges/input.rs
new file mode 100644
index 000000000000..e884c0a3a39e
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/initialize_bridges/input.rs
@@ -0,0 +1,32 @@
+use ethers::types::Address;
+use serde::{Deserialize, Serialize};
+use types::ChainId;
+
+use crate::{traits::FileConfig, ChainConfig};
+
+impl FileConfig for InitializeBridgeInput {}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct InitializeBridgeInput {
+    pub era_chain_id: ChainId,
+    pub chain_id: ChainId,
+    pub l1_shared_bridge: Address,
+    pub bridgehub: Address,
+    pub governance: Address,
+    pub erc20_bridge: Address,
+}
+
+impl InitializeBridgeInput {
+    pub fn new(chain_config: &ChainConfig, era_chain_id: ChainId) -> anyhow::Result<Self> {
+        let contracts = chain_config.get_contracts_config()?;
+        let wallets = chain_config.get_wallets_config()?;
+        Ok(Self {
+            era_chain_id,
+            chain_id: chain_config.chain_id,
+            l1_shared_bridge: contracts.bridges.shared.l1_address,
+            bridgehub: contracts.ecosystem_contracts.bridgehub_proxy_addr,
+            governance: wallets.governor.address,
+            erc20_bridge: contracts.bridges.erc20.l1_address,
+        })
+    }
+}
diff --git a/zk_toolbox/crates/config/src/forge_interface/initialize_bridges/mod.rs b/zk_toolbox/crates/config/src/forge_interface/initialize_bridges/mod.rs
new file mode 100644
index 000000000000..7d1a54844d0c
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/initialize_bridges/mod.rs
@@ -0,0 +1,2 @@
+pub mod input;
+pub mod output;
diff --git a/zk_toolbox/crates/config/src/forge_interface/initialize_bridges/output.rs b/zk_toolbox/crates/config/src/forge_interface/initialize_bridges/output.rs
new file mode 100644
index 000000000000..d03474a6a089
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/initialize_bridges/output.rs
@@ -0,0 +1,12 @@
+use ethers::types::Address;
+use serde::{Deserialize, Serialize};
+
+use crate::traits::FileConfig;
+
+impl FileConfig for InitializeBridgeOutput {}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct InitializeBridgeOutput {
+    pub l2_shared_bridge_implementation: Address,
+    pub l2_shared_bridge_proxy: Address,
+}
diff --git a/zk_toolbox/crates/config/src/forge_interface/mod.rs b/zk_toolbox/crates/config/src/forge_interface/mod.rs
new file mode 100644
index 000000000000..bcf21b7fb087
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/mod.rs
@@ -0,0 +1,6 @@
+pub mod accept_ownership;
+pub mod deploy_ecosystem;
+pub mod initialize_bridges;
+pub mod paymaster;
+pub mod register_chain;
+pub mod script_params;
diff --git a/zk_toolbox/crates/config/src/forge_interface/paymaster/mod.rs b/zk_toolbox/crates/config/src/forge_interface/paymaster/mod.rs
new file mode 100644
index 000000000000..e634f1eb3dab
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/paymaster/mod.rs
@@ -0,0 +1,31 @@
+use ethers::types::Address;
+use serde::{Deserialize, Serialize};
+use types::ChainId;
+
+use crate::{traits::FileConfig, ChainConfig};
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct DeployPaymasterInput {
+    pub chain_id: ChainId,
+    pub l1_shared_bridge: Address,
+    pub bridgehub: Address,
+}
+
+impl DeployPaymasterInput {
+    pub fn new(chain_config: &ChainConfig) -> anyhow::Result<Self> {
+        let contracts = chain_config.get_contracts_config()?;
+        Ok(Self {
+            chain_id: chain_config.chain_id,
+            l1_shared_bridge: contracts.bridges.shared.l1_address,
+            bridgehub: contracts.ecosystem_contracts.bridgehub_proxy_addr,
+        })
+    }
+}
+impl FileConfig for DeployPaymasterInput {}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct DeployPaymasterOutput {
+    pub paymaster: Address,
+}
+
+impl FileConfig for DeployPaymasterOutput {}
diff --git a/zk_toolbox/crates/config/src/forge_interface/register_chain/input.rs b/zk_toolbox/crates/config/src/forge_interface/register_chain/input.rs
new file mode 100644
index 000000000000..3849aa341e2b
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/register_chain/input.rs
@@ -0,0 +1,90 @@
+use ethers::types::Address;
+use rand::Rng;
+use serde::{Deserialize, Serialize};
+use types::{ChainId, L1BatchCommitDataGeneratorMode};
+
+use crate::{traits::FileConfig, ChainConfig, ContractsConfig};
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+struct Bridgehub {
+    bridgehub_proxy_addr: Address,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+struct StateTransition {
+    state_transition_proxy_addr: Address,
+}
+#[derive(Debug, Deserialize, Serialize, Clone)]
+struct DeployedAddresses {
+    state_transition: StateTransition,
+    bridgehub: Bridgehub,
+    validator_timelock_addr: Address,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+struct Contracts {
+    diamond_cut_data: String,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct RegisterChainL1Config {
+    contracts_config: Contracts,
+    deployed_addresses: DeployedAddresses,
+    chain: ChainL1Config,
+    owner_address: Address,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct ChainL1Config {
+    pub chain_chain_id: ChainId,
+    pub base_token_addr: Address,
+    pub bridgehub_create_new_chain_salt: u64,
+    pub validium_mode: bool,
+    pub validator_sender_operator_commit_eth: Address,
+    pub validator_sender_operator_blobs_eth: Address,
+    pub base_token_gas_price_multiplier_nominator: u64,
+    pub base_token_gas_price_multiplier_denominator: u64,
+    pub governance_security_council_address: Address,
+    pub governance_min_delay: u64,
+}
+
+impl FileConfig for RegisterChainL1Config {}
+
+impl RegisterChainL1Config {
+    pub fn new(chain_config: &ChainConfig, contracts: &ContractsConfig) -> anyhow::Result<Self> {
+        let genesis_config = chain_config.get_genesis_config()?;
+        let wallets_config = chain_config.get_wallets_config()?;
+        Ok(Self {
+            contracts_config: Contracts {
+                diamond_cut_data: contracts.ecosystem_contracts.diamond_cut_data.clone(),
+            },
+            deployed_addresses: DeployedAddresses {
+                state_transition: StateTransition {
+                    state_transition_proxy_addr: contracts
+                        .ecosystem_contracts
+                        .state_transition_proxy_addr,
+                },
+                bridgehub: Bridgehub {
+                    bridgehub_proxy_addr: contracts.ecosystem_contracts.bridgehub_proxy_addr,
+                },
+                validator_timelock_addr: contracts.ecosystem_contracts.validator_timelock_addr,
+            },
+            chain: ChainL1Config {
+                chain_chain_id: genesis_config.l2_chain_id,
+                base_token_gas_price_multiplier_nominator: chain_config.base_token.nominator,
+                base_token_gas_price_multiplier_denominator: chain_config.base_token.denominator,
+                base_token_addr: chain_config.base_token.address,
+                // TODO specify
+                governance_security_council_address: Default::default(),
+                governance_min_delay: 0,
+                // TODO verify
+                bridgehub_create_new_chain_salt: rand::thread_rng().gen_range(0..=i64::MAX) as u64,
+                validium_mode: chain_config.l1_batch_commit_data_generator_mode
+                    == L1BatchCommitDataGeneratorMode::Validium,
+                validator_sender_operator_commit_eth: wallets_config.operator.address,
+                validator_sender_operator_blobs_eth: wallets_config.blob_operator.address,
+            },
+            owner_address: wallets_config.governor.address,
+        })
+    }
+}
diff --git a/zk_toolbox/crates/config/src/forge_interface/register_chain/mod.rs b/zk_toolbox/crates/config/src/forge_interface/register_chain/mod.rs
new file mode 100644
index 000000000000..7d1a54844d0c
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/register_chain/mod.rs
@@ -0,0 +1,2 @@
+pub mod input;
+pub mod output;
diff --git a/zk_toolbox/crates/config/src/forge_interface/register_chain/output.rs b/zk_toolbox/crates/config/src/forge_interface/register_chain/output.rs
new file mode 100644
index 000000000000..7d105b578b5b
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/register_chain/output.rs
@@ -0,0 +1,12 @@
+use ethers::types::Address;
+use serde::{Deserialize, Serialize};
+
+use crate::traits::FileConfig;
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct RegisterChainOutput {
+    pub diamond_proxy_addr: Address,
+    pub governance_addr: Address,
+}
+
+impl FileConfig for RegisterChainOutput {}
diff --git a/zk_toolbox/crates/config/src/forge_interface/script_params.rs b/zk_toolbox/crates/config/src/forge_interface/script_params.rs
new file mode 100644
index 000000000000..70ed08ec5651
--- /dev/null
+++ b/zk_toolbox/crates/config/src/forge_interface/script_params.rs
@@ -0,0 +1,63 @@
+use std::path::{Path, PathBuf};
+
+use crate::consts::L1_CONTRACTS_FOUNDRY;
+
+#[derive(PartialEq, Debug, Clone)]
+pub struct ForgeScriptParams {
+    input: &'static str,
+    output: &'static str,
+    script_path: &'static str,
+}
+
+impl ForgeScriptParams {
+    // Path to the input file for forge script
+    pub fn input(&self, link_to_code: &Path) -> PathBuf {
+        link_to_code.join(L1_CONTRACTS_FOUNDRY).join(self.input)
+    }
+
+    // Path to the output file for forge script
+    pub fn output(&self, link_to_code: &Path) -> PathBuf {
+        link_to_code.join(L1_CONTRACTS_FOUNDRY).join(self.output)
+    }
+
+    // Path to the script
+    pub fn script(&self) -> PathBuf {
+        PathBuf::from(self.script_path)
+    }
+}
+
+pub const DEPLOY_ECOSYSTEM_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
+    input: "script-config/config-deploy-l1.toml",
+    output: "script-out/output-deploy-l1.toml",
+    script_path: "deploy-scripts/DeployL1.s.sol",
+};
+
+pub const INITIALIZE_BRIDGES_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
+    input: "script-config/config-initialize-shared-bridges.toml",
+    output: "script-out/output-initialize-shared-bridges.toml",
+    script_path: "deploy-scripts/InitializeSharedBridgeOnL2.sol",
+};
+
+pub const REGISTER_CHAIN_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
+    input: "script-config/register-hyperchain.toml",
+    output: "script-out/output-register-hyperchain.toml",
+    script_path: "deploy-scripts/RegisterHyperchain.s.sol",
+};
+
+pub const DEPLOY_ERC20_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
+    input: "script-config/config-deploy-erc20.toml",
+    output: "script-out/output-deploy-erc20.toml",
+    script_path: "deploy-scripts/DeployErc20.s.sol",
+};
+
+pub const DEPLOY_PAYMASTER_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
+    input: "script-config/config-deploy-paymaster.toml",
+    output: "script-out/output-deploy-paymaster.toml",
+    script_path: "deploy-scripts/DeployPaymaster.s.sol",
+};
+
+pub const ACCEPT_GOVERNANCE_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
+    input: "script-config/config-accept-admin.toml",
+    output: "script-out/output-accept-admin.toml",
+    script_path: "deploy-scripts/AcceptAdmin.s.sol",
+};
diff --git a/zk_toolbox/crates/config/src/general.rs b/zk_toolbox/crates/config/src/general.rs
new file mode 100644
index 000000000000..b97384f26f8c
--- /dev/null
+++ b/zk_toolbox/crates/config/src/general.rs
@@ -0,0 +1,183 @@
+use std::path::PathBuf;
+
+use serde::{Deserialize, Serialize};
+use url::Url;
+
+use crate::{consts::GENERAL_FILE, traits::FileConfigWithDefaultName};
+
+pub struct RocksDbs {
+    pub state_keeper: PathBuf,
+    pub merkle_tree: PathBuf,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct GeneralConfig {
+    pub db: RocksDBConfig,
+    pub eth: EthConfig,
+    pub api: ApiConfig,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+impl GeneralConfig {
+    pub fn set_rocks_db_config(&mut self, rocks_dbs: RocksDbs) -> anyhow::Result<()> {
+        self.db.state_keeper_db_path = rocks_dbs.state_keeper;
+        self.db.merkle_tree.path = rocks_dbs.merkle_tree;
+        Ok(())
+    }
+
+    pub fn ports_config(&self) -> PortsConfig {
+        PortsConfig {
+            web3_json_rpc_http_port: self.api.web3_json_rpc.http_port,
+            web3_json_rpc_ws_port: self.api.web3_json_rpc.ws_port,
+            healthcheck_port: self.api.healthcheck.port,
+            merkle_tree_port: self.api.merkle_tree.port,
+            prometheus_listener_port: self.api.prometheus.listener_port,
+        }
+    }
+
+    pub fn update_ports(&mut self, ports_config: &PortsConfig) -> anyhow::Result<()> {
+        self.api.web3_json_rpc.http_port = ports_config.web3_json_rpc_http_port;
+        update_port_in_url(
+            &mut self.api.web3_json_rpc.http_url,
+            ports_config.web3_json_rpc_http_port,
+        )?;
+        self.api.web3_json_rpc.ws_port = ports_config.web3_json_rpc_ws_port;
+        update_port_in_url(
+            &mut self.api.web3_json_rpc.ws_url,
+            ports_config.web3_json_rpc_ws_port,
+        )?;
+        self.api.healthcheck.port = ports_config.healthcheck_port;
+        self.api.merkle_tree.port = ports_config.merkle_tree_port;
+        self.api.prometheus.listener_port = ports_config.prometheus_listener_port;
+        Ok(())
+    }
+}
+
+fn update_port_in_url(http_url: &mut String, port: u16) -> anyhow::Result<()> {
+    let mut http_url_url = Url::parse(http_url)?;
+    if let Err(()) = http_url_url.set_port(Some(port)) {
+        anyhow::bail!("Wrong url, setting port is impossible");
+    }
+    *http_url = http_url_url.as_str().to_string();
+    Ok(())
+}
+
+impl FileConfigWithDefaultName for GeneralConfig {
+    const FILE_NAME: &'static str = GENERAL_FILE;
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct RocksDBConfig {
+    pub state_keeper_db_path: PathBuf,
+    pub merkle_tree: MerkleTreeDB,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct MerkleTreeDB {
+    pub path: PathBuf,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct EthConfig {
+    pub sender: EthSender,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct EthSender {
+    pub proof_sending_mode: String,
+    pub pubdata_sending_mode: String,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct ApiConfig {
+    /// Configuration options for the Web3 JSON RPC servers.
+    pub web3_json_rpc: Web3JsonRpcConfig,
+    /// Configuration options for the Prometheus exporter.
+    pub prometheus: PrometheusConfig,
+    /// Configuration options for the Health check.
+    pub healthcheck: HealthCheckConfig,
+    /// Configuration options for Merkle tree API.
+    pub merkle_tree: MerkleTreeApiConfig,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct Web3JsonRpcConfig {
+    /// Port to which the HTTP RPC server is listening.
+    pub http_port: u16,
+    /// URL to access HTTP RPC server.
+    pub http_url: String,
+    /// Port to which the WebSocket RPC server is listening.
+    pub ws_port: u16,
+    /// URL to access WebSocket RPC server.
+    pub ws_url: String,
+    /// Max possible limit of entities to be requested once.
+    pub req_entities_limit: Option<u32>,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct PrometheusConfig {
+    /// Port to which the Prometheus exporter server is listening.
+    pub listener_port: u16,
+    /// URL of the push gateway.
+    pub pushgateway_url: String,
+    /// Push interval in ms.
+    pub push_interval_ms: Option<u64>,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct HealthCheckConfig {
+    /// Port to which the REST server is listening.
+    pub port: u16,
+    /// Time limit in milliseconds to mark a health check as slow and log the corresponding warning.
+    /// If not specified, the default value in the health check crate will be used.
+    pub slow_time_limit_ms: Option<u64>,
+    /// Time limit in milliseconds to abort a health check and return "not ready" status for the corresponding component.
+    /// If not specified, the default value in the health check crate will be used.
+    pub hard_time_limit_ms: Option<u64>,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+/// Configuration for the Merkle tree API.
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct MerkleTreeApiConfig {
+    /// Port to bind the Merkle tree API server to.
+    pub port: u16,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+pub struct PortsConfig {
+    pub web3_json_rpc_http_port: u16,
+    pub web3_json_rpc_ws_port: u16,
+    pub healthcheck_port: u16,
+    pub merkle_tree_port: u16,
+    pub prometheus_listener_port: u16,
+}
+
+impl PortsConfig {
+    pub fn next_empty_ports_config(&self) -> PortsConfig {
+        Self {
+            web3_json_rpc_http_port: self.web3_json_rpc_http_port + 100,
+            web3_json_rpc_ws_port: self.web3_json_rpc_ws_port + 100,
+            healthcheck_port: self.healthcheck_port + 100,
+            merkle_tree_port: self.merkle_tree_port + 100,
+            prometheus_listener_port: self.prometheus_listener_port + 100,
+        }
+    }
+}
diff --git a/zk_toolbox/crates/config/src/genesis.rs b/zk_toolbox/crates/config/src/genesis.rs
new file mode 100644
index 000000000000..e666931870a8
--- /dev/null
+++ b/zk_toolbox/crates/config/src/genesis.rs
@@ -0,0 +1,34 @@
+use ethers::types::{Address, H256};
+use serde::{Deserialize, Serialize};
+use types::{ChainId, L1BatchCommitDataGeneratorMode, ProtocolSemanticVersion};
+
+use crate::{consts::GENESIS_FILE, traits::FileConfigWithDefaultName, ChainConfig};
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct GenesisConfig {
+    pub l2_chain_id: ChainId,
+    pub l1_chain_id: u32,
+    pub l1_batch_commit_data_generator_mode: Option<L1BatchCommitDataGeneratorMode>,
+    pub bootloader_hash: H256,
+    pub default_aa_hash: H256,
+    pub fee_account: Address,
+    pub genesis_batch_commitment: H256,
+    pub genesis_rollup_leaf_index: u32,
+    pub genesis_root: H256,
+    pub genesis_protocol_version: u64,
+    pub genesis_protocol_semantic_version: ProtocolSemanticVersion,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+impl GenesisConfig {
+    pub fn update_from_chain_config(&mut self, config: &ChainConfig) {
+        self.l2_chain_id = config.chain_id;
+        self.l1_chain_id = config.l1_network.chain_id();
+        self.l1_batch_commit_data_generator_mode = Some(config.l1_batch_commit_data_generator_mode);
+    }
+}
+
+impl FileConfigWithDefaultName for GenesisConfig {
+    const FILE_NAME: &'static str = GENESIS_FILE;
+}
diff --git a/zk_toolbox/crates/config/src/lib.rs b/zk_toolbox/crates/config/src/lib.rs
new file mode 100644
index 000000000000..a80a2b6fe5de
--- /dev/null
+++ b/zk_toolbox/crates/config/src/lib.rs
@@ -0,0 +1,27 @@
+pub use chain::*;
+pub use consts::{DOCKER_COMPOSE_FILE, ZKSYNC_ERA_GIT_REPO};
+pub use contracts::*;
+pub use ecosystem::*;
+pub use file_config::*;
+pub use general::*;
+pub use genesis::*;
+pub use manipulations::*;
+pub use secrets::*;
+pub use wallet_creation::*;
+pub use wallets::*;
+
+mod chain;
+mod consts;
+mod contracts;
+mod ecosystem;
+mod file_config;
+mod general;
+mod genesis;
+mod manipulations;
+mod secrets;
+mod wallet_creation;
+mod wallets;
+
+pub mod external_node;
+pub mod forge_interface;
+pub mod traits;
diff --git a/zk_toolbox/crates/config/src/manipulations.rs b/zk_toolbox/crates/config/src/manipulations.rs
new file mode 100644
index 000000000000..f0497a5ba671
--- /dev/null
+++ b/zk_toolbox/crates/config/src/manipulations.rs
@@ -0,0 +1,18 @@
+use std::path::Path;
+
+use xshell::Shell;
+
+use crate::consts::{CONFIGS_PATH, WALLETS_FILE};
+
+pub fn copy_configs(shell: &Shell, link_to_code: &Path, target_path: &Path) -> anyhow::Result<()> {
+    let original_configs = link_to_code.join(CONFIGS_PATH);
+    for file in shell.read_dir(original_configs)? {
+        if let Some(name) = file.file_name() {
+            // Do not copy wallets file
+            if name != WALLETS_FILE {
+                shell.copy_file(file, target_path)?;
+            }
+        }
+    }
+    Ok(())
+}
diff --git a/zk_toolbox/crates/config/src/secrets.rs b/zk_toolbox/crates/config/src/secrets.rs
new file mode 100644
index 000000000000..98a9be6ffe61
--- /dev/null
+++ b/zk_toolbox/crates/config/src/secrets.rs
@@ -0,0 +1,48 @@
+use common::db::DatabaseConfig;
+use serde::{Deserialize, Serialize};
+use url::Url;
+
+use crate::{consts::SECRETS_FILE, traits::FileConfigWithDefaultName};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DatabaseSecrets {
+    pub server_url: Url,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub prover_url: Option<Url>,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct L1Secret {
+    pub l1_rpc_url: String,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SecretsConfig {
+    pub database: DatabaseSecrets,
+    pub l1: L1Secret,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+impl SecretsConfig {
+    pub fn set_databases(
+        &mut self,
+        server_db_config: &DatabaseConfig,
+        prover_db_config: &DatabaseConfig,
+    ) {
+        self.database.server_url = server_db_config.full_url();
+        self.database.prover_url = Some(prover_db_config.full_url());
+    }
+
+    pub fn set_l1_rpc_url(&mut self, l1_rpc_url: String) {
+        self.l1.l1_rpc_url = l1_rpc_url;
+    }
+}
+
+impl FileConfigWithDefaultName for SecretsConfig {
+    const FILE_NAME: &'static str = SECRETS_FILE;
+}
diff --git a/zk_toolbox/crates/config/src/traits.rs b/zk_toolbox/crates/config/src/traits.rs
new file mode 100644
index 000000000000..79ae3a187a8b
--- /dev/null
+++ b/zk_toolbox/crates/config/src/traits.rs
@@ -0,0 +1,137 @@
+use std::path::{Path, PathBuf};
+
+use anyhow::{bail, Context};
+use common::files::{
+    read_json_file, read_toml_file, read_yaml_file, save_json_file, save_toml_file, save_yaml_file,
+};
+use serde::{de::DeserializeOwned, Serialize};
+use xshell::Shell;
+
+pub trait FileConfig {}
+
+pub trait FileConfigWithDefaultName {
+    const FILE_NAME: &'static str;
+
+    fn get_path_with_base_path(base_path: impl AsRef<Path>) -> PathBuf {
+        base_path.as_ref().join(Self::FILE_NAME)
+    }
+}
+
+impl<T> FileConfig for T where T: FileConfigWithDefaultName {}
+
+impl<T> ReadConfig for T where T: FileConfig + Clone + DeserializeOwned {}
+
+impl<T> SaveConfig for T where T: FileConfig + Serialize {}
+
+impl<T> SaveConfigWithComment for T where T: FileConfig + Serialize {}
+
+impl<T> ReadConfigWithBasePath for T where T: FileConfigWithDefaultName + Clone + DeserializeOwned {}
+
+impl<T> SaveConfigWithBasePath for T where T: FileConfigWithDefaultName + Serialize {}
+
+impl<T> SaveConfigWithCommentAndBasePath for T where T: FileConfigWithDefaultName + Serialize {}
+
+/// Reads a config file from a given path, correctly parsing file extension.
+/// Supported file extensions are: `yaml`, `yml`, `toml`, `json`.
+pub trait ReadConfig: DeserializeOwned + Clone {
+    fn read(shell: &Shell, path: impl AsRef<Path>) -> anyhow::Result<Self> {
+        let error_context = || format!("Failed to parse config file {:?}.", path.as_ref());
+
+        match path.as_ref().extension().and_then(|ext| ext.to_str()) {
+            Some("yaml") | Some("yml") => read_yaml_file(shell, &path).with_context(error_context),
+            Some("toml") => read_toml_file(shell, &path).with_context(error_context),
+            Some("json") => read_json_file(shell, &path).with_context(error_context),
+            _ => bail!(format!(
+                "Unsupported file extension for config file {:?}.",
+                path.as_ref()
+            )),
+        }
+    }
+}
+
+/// Reads a config file from a base path, correctly parsing file extension.
+/// Supported file extensions are: `yaml`, `yml`, `toml`, `json`.
+pub trait ReadConfigWithBasePath: ReadConfig + FileConfigWithDefaultName {
+    fn read_with_base_path(shell: &Shell, base_path: impl AsRef<Path>) -> anyhow::Result<Self> {
+        <Self as ReadConfig>::read(shell, base_path.as_ref().join(Self::FILE_NAME))
+    }
+}
+
+/// Saves a config file to a given path, correctly parsing file extension.
+/// Supported file extensions are: `yaml`, `yml`, `toml`, `json`.
+pub trait SaveConfig: Serialize + Sized {
+    fn save(&self, shell: &Shell, path: impl AsRef<Path>) -> anyhow::Result<()> {
+        save_with_comment(shell, path, self, "")
+    }
+}
+
+/// Saves a config file from a base path, correctly parsing file extension.
+/// Supported file extensions are: `yaml`, `yml`, `toml`, `json`.
+pub trait SaveConfigWithBasePath: SaveConfig + FileConfigWithDefaultName {
+    fn save_with_base_path(
+        &self,
+        shell: &Shell,
+        base_path: impl AsRef<Path>,
+    ) -> anyhow::Result<()> {
+        <Self as SaveConfig>::save(self, shell, base_path.as_ref().join(Self::FILE_NAME))
+    }
+}
+
+/// Saves a config file to a given path, correctly parsing file extension.
+/// Supported file extensions are: `yaml`, `yml`, `toml`.
+pub trait SaveConfigWithComment: Serialize + Sized {
+    fn save_with_comment(
+        &self,
+        shell: &Shell,
+        path: impl AsRef<Path>,
+        comment: &str,
+    ) -> anyhow::Result<()> {
+        let comment_char = match path.as_ref().extension().and_then(|ext| ext.to_str()) {
+            Some("yaml") | Some("yml") | Some("toml") => "#",
+            _ => bail!("Unsupported file extension for config file."),
+        };
+        let comment_lines = comment
+            .lines()
+            .map(|line| format!("{comment_char} {line}"))
+            .chain(std::iter::once("".to_string())) // Add a newline after the comment
+            .collect::<Vec<_>>()
+            .join("\n");
+
+        save_with_comment(shell, path, self, comment_lines)
+    }
+}
+
+/// Saves a config file from a base path, correctly parsing file extension.
+/// Supported file extensions are: `yaml`, `yml`, `toml`.
+pub trait SaveConfigWithCommentAndBasePath:
+    SaveConfigWithComment + FileConfigWithDefaultName
+{
+    fn save_with_comment_and_base_path(
+        &self,
+        shell: &Shell,
+        base_path: impl AsRef<Path>,
+        comment: &str,
+    ) -> anyhow::Result<()> {
+        <Self as SaveConfigWithComment>::save_with_comment(
+            self,
+            shell,
+            base_path.as_ref().join(Self::FILE_NAME),
+            comment,
+        )
+    }
+}
+
+fn save_with_comment(
+    shell: &Shell,
+    path: impl AsRef<Path>,
+    data: impl Serialize,
+    comment: impl ToString,
+) -> anyhow::Result<()> {
+    match path.as_ref().extension().and_then(|ext| ext.to_str()) {
+        Some("yaml") | Some("yml") => save_yaml_file(shell, path, data, comment)?,
+        Some("toml") => save_toml_file(shell, path, data, comment)?,
+        Some("json") => save_json_file(shell, path, data)?,
+        _ => bail!("Unsupported file extension for config file."),
+    }
+    Ok(())
+}
diff --git a/zk_toolbox/crates/config/src/wallet_creation.rs b/zk_toolbox/crates/config/src/wallet_creation.rs
new file mode 100644
index 000000000000..249d1662a933
--- /dev/null
+++ b/zk_toolbox/crates/config/src/wallet_creation.rs
@@ -0,0 +1,62 @@
+use std::path::{Path, PathBuf};
+
+use common::wallets::Wallet;
+use rand::thread_rng;
+use types::WalletCreation;
+use xshell::Shell;
+
+use crate::{
+    consts::{BASE_PATH, TEST_CONFIG_PATH},
+    traits::{ReadConfig, SaveConfigWithBasePath},
+    EthMnemonicConfig, WalletsConfig,
+};
+
+pub fn create_wallets(
+    shell: &Shell,
+    base_path: &Path,
+    link_to_code: &Path,
+    id: u32,
+    wallet_creation: WalletCreation,
+    initial_wallet_path: Option<PathBuf>,
+) -> anyhow::Result<()> {
+    let wallets = match wallet_creation {
+        WalletCreation::Random => {
+            let rng = &mut thread_rng();
+            WalletsConfig::random(rng)
+        }
+        WalletCreation::Empty => WalletsConfig::empty(),
+        // Use id of chain for creating
+        WalletCreation::Localhost => create_localhost_wallets(shell, link_to_code, id)?,
+        WalletCreation::InFile => {
+            let path = initial_wallet_path.ok_or(anyhow::anyhow!(
+                "Wallet path for in file option is required"
+            ))?;
+            WalletsConfig::read(shell, path)?
+        }
+    };
+
+    wallets.save_with_base_path(shell, base_path)?;
+    Ok(())
+}
+
+// Create wallets based on id
+pub fn create_localhost_wallets(
+    shell: &Shell,
+    link_to_code: &Path,
+    id: u32,
+) -> anyhow::Result<WalletsConfig> {
+    let path = link_to_code.join(TEST_CONFIG_PATH);
+    let eth_mnemonic = EthMnemonicConfig::read(shell, path)?;
+    let base_path = format!("{}/{}", BASE_PATH, id);
+    Ok(WalletsConfig {
+        deployer: Some(Wallet::from_mnemonic(
+            &eth_mnemonic.test_mnemonic,
+            &base_path,
+            0,
+        )?),
+        operator: Wallet::from_mnemonic(&eth_mnemonic.test_mnemonic, &base_path, 1)?,
+        blob_operator: Wallet::from_mnemonic(&eth_mnemonic.test_mnemonic, &base_path, 2)?,
+        fee_account: Wallet::from_mnemonic(&eth_mnemonic.test_mnemonic, &base_path, 3)?,
+        governor: Wallet::from_mnemonic(&eth_mnemonic.test_mnemonic, &base_path, 4)?,
+    })
+}
diff --git a/zk_toolbox/crates/config/src/wallets.rs b/zk_toolbox/crates/config/src/wallets.rs
new file mode 100644
index 000000000000..91958195c232
--- /dev/null
+++ b/zk_toolbox/crates/config/src/wallets.rs
@@ -0,0 +1,63 @@
+use common::wallets::Wallet;
+use ethers::types::H256;
+use rand::Rng;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    consts::WALLETS_FILE,
+    traits::{FileConfig, FileConfigWithDefaultName},
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct WalletsConfig {
+    pub deployer: Option<Wallet>,
+    pub operator: Wallet,
+    pub blob_operator: Wallet,
+    pub fee_account: Wallet,
+    pub governor: Wallet,
+}
+
+impl WalletsConfig {
+    /// Generate random wallets
+    pub fn random(rng: &mut impl Rng) -> Self {
+        Self {
+            deployer: Some(Wallet::random(rng)),
+            operator: Wallet::random(rng),
+            blob_operator: Wallet::random(rng),
+            fee_account: Wallet::random(rng),
+            governor: Wallet::random(rng),
+        }
+    }
+
+    /// Generate placeholder wallets
+    pub fn empty() -> Self {
+        Self {
+            deployer: Some(Wallet::empty()),
+            operator: Wallet::empty(),
+            blob_operator: Wallet::empty(),
+            fee_account: Wallet::empty(),
+            governor: Wallet::empty(),
+        }
+    }
+    pub fn deployer_private_key(&self) -> Option<H256> {
+        self.deployer.as_ref().and_then(|wallet| wallet.private_key)
+    }
+
+    pub fn governor_private_key(&self) -> Option<H256> {
+        self.governor.private_key
+    }
+}
+
+impl FileConfigWithDefaultName for WalletsConfig {
+    const FILE_NAME: &'static str = WALLETS_FILE;
+}
+
+/// ETH config from zkync repository
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub(crate) struct EthMnemonicConfig {
+    pub(crate) test_mnemonic: String,
+    pub(super) mnemonic: String,
+    pub(crate) base_path: String,
+}
+
+impl FileConfig for EthMnemonicConfig {}
diff --git a/zk_toolbox/crates/types/Cargo.toml b/zk_toolbox/crates/types/Cargo.toml
new file mode 100644
index 000000000000..efd8f84d7088
--- /dev/null
+++ b/zk_toolbox/crates/types/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "types"
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+authors.workspace = true
+exclude.workspace = true
+repository.workspace = true
+description.workspace = true
+keywords.workspace = true
+
+[dependencies]
+clap.workspace = true
+ethers.workspace = true
+serde.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+thiserror.workspace = true
diff --git a/zk_toolbox/crates/types/src/base_token.rs b/zk_toolbox/crates/types/src/base_token.rs
new file mode 100644
index 000000000000..f3b01185da63
--- /dev/null
+++ b/zk_toolbox/crates/types/src/base_token.rs
@@ -0,0 +1,20 @@
+use ethers::types::Address;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct BaseToken {
+    pub address: Address,
+    pub nominator: u64,
+    pub denominator: u64,
+}
+
+impl BaseToken {
+    #[must_use]
+    pub fn eth() -> Self {
+        Self {
+            nominator: 1,
+            denominator: 1,
+            address: Address::from_low_u64_be(1),
+        }
+    }
+}
diff --git a/zk_toolbox/crates/types/src/chain_id.rs b/zk_toolbox/crates/types/src/chain_id.rs
new file mode 100644
index 000000000000..258175d3fde5
--- /dev/null
+++ b/zk_toolbox/crates/types/src/chain_id.rs
@@ -0,0 +1,18 @@
+use std::fmt::Display;
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct ChainId(pub u32);
+
+impl Display for ChainId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl From<u32> for ChainId {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
diff --git a/zk_toolbox/crates/types/src/l1_batch_commit_data_generator_mode.rs b/zk_toolbox/crates/types/src/l1_batch_commit_data_generator_mode.rs
new file mode 100644
index 000000000000..cdb8f5919c2d
--- /dev/null
+++ b/zk_toolbox/crates/types/src/l1_batch_commit_data_generator_mode.rs
@@ -0,0 +1,22 @@
+use clap::ValueEnum;
+use serde::{Deserialize, Serialize};
+use strum_macros::EnumIter;
+
+#[derive(
+    Debug,
+    Serialize,
+    Deserialize,
+    Clone,
+    Copy,
+    ValueEnum,
+    EnumIter,
+    strum_macros::Display,
+    Default,
+    PartialEq,
+    Eq,
+)]
+pub enum L1BatchCommitDataGeneratorMode {
+    #[default]
+    Rollup,
+    Validium,
+}
diff --git a/zk_toolbox/crates/types/src/l1_network.rs b/zk_toolbox/crates/types/src/l1_network.rs
new file mode 100644
index 000000000000..f7367673f6c8
--- /dev/null
+++ b/zk_toolbox/crates/types/src/l1_network.rs
@@ -0,0 +1,36 @@
+use clap::ValueEnum;
+use serde::{Deserialize, Serialize};
+use strum_macros::EnumIter;
+
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Default,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Serialize,
+    Deserialize,
+    ValueEnum,
+    EnumIter,
+    strum_macros::Display,
+)]
+pub enum L1Network {
+    #[default]
+    Localhost,
+    Sepolia,
+    Mainnet,
+}
+
+impl L1Network {
+    #[must_use]
+    pub fn chain_id(&self) -> u32 {
+        match self {
+            L1Network::Localhost => 9,
+            L1Network::Sepolia => 11_155_111,
+            L1Network::Mainnet => 1,
+        }
+    }
+}
diff --git a/zk_toolbox/crates/types/src/lib.rs b/zk_toolbox/crates/types/src/lib.rs
new file mode 100644
index 000000000000..c405013990cf
--- /dev/null
+++ b/zk_toolbox/crates/types/src/lib.rs
@@ -0,0 +1,15 @@
+mod base_token;
+mod chain_id;
+mod l1_batch_commit_data_generator_mode;
+mod l1_network;
+mod protocol_version;
+mod prover_mode;
+mod wallet_creation;
+
+pub use base_token::*;
+pub use chain_id::*;
+pub use l1_batch_commit_data_generator_mode::*;
+pub use l1_network::*;
+pub use protocol_version::ProtocolSemanticVersion;
+pub use prover_mode::*;
+pub use wallet_creation::*;
diff --git a/zk_toolbox/crates/types/src/protocol_version.rs b/zk_toolbox/crates/types/src/protocol_version.rs
new file mode 100644
index 000000000000..5b619c883a3e
--- /dev/null
+++ b/zk_toolbox/crates/types/src/protocol_version.rs
@@ -0,0 +1,87 @@
+use std::{fmt, num::ParseIntError, str::FromStr};
+
+use ethers::prelude::U256;
+use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
+
+pub const PACKED_SEMVER_MINOR_OFFSET: u32 = 32;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct ProtocolSemanticVersion {
+    pub minor: u16,
+    pub patch: u16,
+}
+
+impl ProtocolSemanticVersion {
+    const MAJOR_VERSION: u8 = 0;
+
+    pub fn new(minor: u16, patch: u16) -> Self {
+        Self { minor, patch }
+    }
+
+    pub fn pack(&self) -> U256 {
+        (U256::from(self.minor) << U256::from(PACKED_SEMVER_MINOR_OFFSET)) | U256::from(self.patch)
+    }
+}
+
+impl fmt::Display for ProtocolSemanticVersion {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}.{}.{}", Self::MAJOR_VERSION, self.minor, self.patch)
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum ParseProtocolSemanticVersionError {
+    #[error("invalid format")]
+    InvalidFormat,
+    #[error("non zero major version")]
+    NonZeroMajorVersion,
+    #[error("{0}")]
+    ParseIntError(ParseIntError),
+}
+
+impl FromStr for ProtocolSemanticVersion {
+    type Err = ParseProtocolSemanticVersionError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let parts: Vec<&str> = s.split('.').collect();
+        if parts.len() != 3 {
+            return Err(ParseProtocolSemanticVersionError::InvalidFormat);
+        }
+
+        let major = parts[0]
+            .parse::<u16>()
+            .map_err(ParseProtocolSemanticVersionError::ParseIntError)?;
+        if major != 0 {
+            return Err(ParseProtocolSemanticVersionError::NonZeroMajorVersion);
+        }
+
+        let minor = parts[1]
+            .parse::<u16>()
+            .map_err(ParseProtocolSemanticVersionError::ParseIntError)?;
+
+        let patch = parts[2]
+            .parse::<u16>()
+            .map_err(ParseProtocolSemanticVersionError::ParseIntError)?;
+
+        Ok(ProtocolSemanticVersion { minor, patch })
+    }
+}
+
+impl<'de> Deserialize<'de> for ProtocolSemanticVersion {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        ProtocolSemanticVersion::from_str(&s).map_err(D::Error::custom)
+    }
+}
+
+impl Serialize for ProtocolSemanticVersion {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&self.to_string())
+    }
+}
diff --git a/zk_toolbox/crates/types/src/prover_mode.rs b/zk_toolbox/crates/types/src/prover_mode.rs
new file mode 100644
index 000000000000..d9b4fb965e8c
--- /dev/null
+++ b/zk_toolbox/crates/types/src/prover_mode.rs
@@ -0,0 +1,21 @@
+use clap::ValueEnum;
+use serde::{Deserialize, Serialize};
+use strum_macros::EnumIter;
+
+#[derive(
+    Debug,
+    Serialize,
+    Deserialize,
+    Clone,
+    Copy,
+    ValueEnum,
+    EnumIter,
+    strum_macros::Display,
+    PartialEq,
+    Eq,
+)]
+pub enum ProverMode {
+    NoProofs,
+    Gpu,
+    Cpu,
+}
diff --git a/zk_toolbox/crates/types/src/wallet_creation.rs b/zk_toolbox/crates/types/src/wallet_creation.rs
new file mode 100644
index 000000000000..43cb5e969b93
--- /dev/null
+++ b/zk_toolbox/crates/types/src/wallet_creation.rs
@@ -0,0 +1,30 @@
+use clap::ValueEnum;
+use serde::{Deserialize, Serialize};
+use strum_macros::EnumIter;
+
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Default,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Serialize,
+    Deserialize,
+    ValueEnum,
+    EnumIter,
+    strum_macros::Display,
+)]
+pub enum WalletCreation {
+    /// Load wallets from localhost mnemonic, they are funded for localhost env
+    #[default]
+    Localhost,
+    /// Generate random wallets
+    Random,
+    /// Generate placeholder wallets
+    Empty,
+    /// Specify file with wallets
+    InFile,
+}
diff --git a/zk_toolbox/crates/zk_inception/Cargo.toml b/zk_toolbox/crates/zk_inception/Cargo.toml
new file mode 100644
index 000000000000..3a8b57e162f6
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "zk_inception"
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+authors.workspace = true
+exclude.workspace = true
+repository.workspace = true
+description.workspace = true
+keywords.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+cliclack.workspace = true
+config.workspace = true
+console.workspace = true
+human-panic.workspace = true
+lazy_static.workspace = true
+serde_yaml.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+xshell.workspace = true
+ethers.workspace = true
+common.workspace = true
+tokio.workspace = true
+types.workspace = true
+strum_macros.workspace = true
+strum.workspace = true
+toml.workspace = true
+url.workspace = true
+thiserror.workspace = true
+zksync_config.workspace = true
+slugify-rs.workspace = true
diff --git a/zk_toolbox/crates/zk_inception/src/accept_ownership.rs b/zk_toolbox/crates/zk_inception/src/accept_ownership.rs
new file mode 100644
index 000000000000..179cb696ac3d
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/accept_ownership.rs
@@ -0,0 +1,104 @@
+use common::{
+    forge::{Forge, ForgeScript, ForgeScriptArgs},
+    spinner::Spinner,
+};
+use config::{
+    forge_interface::{
+        accept_ownership::AcceptOwnershipInput, script_params::ACCEPT_GOVERNANCE_SCRIPT_PARAMS,
+    },
+    traits::SaveConfig,
+    EcosystemConfig,
+};
+use ethers::types::{Address, H256};
+use xshell::Shell;
+
+use crate::{
+    messages::MSG_ACCEPTING_GOVERNANCE_SPINNER,
+    utils::forge::{check_the_balance, fill_forge_private_key},
+};
+
+pub async fn accept_admin(
+    shell: &Shell,
+    ecosystem_config: &EcosystemConfig,
+    governor_contract: Address,
+    governor: Option<H256>,
+    target_address: Address,
+    forge_args: &ForgeScriptArgs,
+    l1_rpc_url: String,
+) -> anyhow::Result<()> {
+    let foundry_contracts_path = ecosystem_config.path_to_foundry();
+    let forge = Forge::new(&foundry_contracts_path)
+        .script(
+            &ACCEPT_GOVERNANCE_SCRIPT_PARAMS.script(),
+            forge_args.clone(),
+        )
+        .with_ffi()
+        .with_rpc_url(l1_rpc_url)
+        .with_broadcast()
+        .with_signature("acceptAdmin()");
+    accept_ownership(
+        shell,
+        ecosystem_config,
+        governor_contract,
+        governor,
+        target_address,
+        forge,
+    )
+    .await
+}
+
+pub async fn accept_owner(
+    shell: &Shell,
+    ecosystem_config: &EcosystemConfig,
+    governor_contract: Address,
+    governor: Option<H256>,
+    target_address: Address,
+    forge_args: &ForgeScriptArgs,
+    l1_rpc_url: String,
+) -> anyhow::Result<()> {
+    let foundry_contracts_path = ecosystem_config.path_to_foundry();
+    let forge = Forge::new(&foundry_contracts_path)
+        .script(
+            &ACCEPT_GOVERNANCE_SCRIPT_PARAMS.script(),
+            forge_args.clone(),
+        )
+        .with_ffi()
+        .with_rpc_url(l1_rpc_url)
+        .with_broadcast()
+        .with_signature("acceptOwner()");
+    accept_ownership(
+        shell,
+        ecosystem_config,
+        governor_contract,
+        governor,
+        target_address,
+        forge,
+    )
+    .await
+}
+
+async fn accept_ownership(
+    shell: &Shell,
+    ecosystem_config: &EcosystemConfig,
+    governor_contract: Address,
+    governor: Option<H256>,
+    target_address: Address,
+    mut forge: ForgeScript,
+) -> anyhow::Result<()> {
+    let input = AcceptOwnershipInput {
+        target_addr: target_address,
+        governor: governor_contract,
+    };
+    input.save(
+        shell,
+        ACCEPT_GOVERNANCE_SCRIPT_PARAMS.input(&ecosystem_config.link_to_code),
+    )?;
+
+    forge = fill_forge_private_key(forge, governor)?;
+
+    check_the_balance(&forge).await?;
+    let spinner = Spinner::new(MSG_ACCEPTING_GOVERNANCE_SPINNER);
+    forge.run(shell)?;
+    spinner.finish();
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/args/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/args/mod.rs
new file mode 100644
index 000000000000..7b21015691b9
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/args/mod.rs
@@ -0,0 +1,3 @@
+pub use run_server::*;
+
+mod run_server;
diff --git a/zk_toolbox/crates/zk_inception/src/commands/args/run_server.rs b/zk_toolbox/crates/zk_inception/src/commands/args/run_server.rs
new file mode 100644
index 000000000000..1e373319ec73
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/args/run_server.rs
@@ -0,0 +1,20 @@
+use clap::Parser;
+use serde::{Deserialize, Serialize};
+
+use crate::messages::{
+    MSG_SERVER_ADDITIONAL_ARGS_HELP, MSG_SERVER_BUILD_HELP, MSG_SERVER_COMPONENTS_HELP,
+    MSG_SERVER_GENESIS_HELP,
+};
+
+#[derive(Debug, Serialize, Deserialize, Parser)]
+pub struct RunServerArgs {
+    #[clap(long, help = MSG_SERVER_COMPONENTS_HELP)]
+    pub components: Option<Vec<String>>,
+    #[clap(long, help = MSG_SERVER_GENESIS_HELP)]
+    pub genesis: bool,
+    #[clap(long, short)]
+    #[arg(trailing_var_arg = true, allow_hyphen_values = true, hide = false, help = MSG_SERVER_ADDITIONAL_ARGS_HELP)]
+    additional_args: Vec<String>,
+    #[clap(long, help = MSG_SERVER_BUILD_HELP)]
+    pub build: bool,
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/args/create.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/args/create.rs
new file mode 100644
index 000000000000..97a3de69c738
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/args/create.rs
@@ -0,0 +1,166 @@
+use std::{path::PathBuf, str::FromStr};
+
+use clap::Parser;
+use common::{Prompt, PromptConfirm, PromptSelect};
+use serde::{Deserialize, Serialize};
+use slugify_rs::slugify;
+use strum::IntoEnumIterator;
+use strum_macros::{Display, EnumIter};
+use types::{BaseToken, L1BatchCommitDataGeneratorMode, L1Network, ProverMode, WalletCreation};
+
+use crate::{
+    defaults::L2_CHAIN_ID,
+    messages::{
+        MSG_BASE_TOKEN_ADDRESS_HELP, MSG_BASE_TOKEN_ADDRESS_PROMPT,
+        MSG_BASE_TOKEN_PRICE_DENOMINATOR_HELP, MSG_BASE_TOKEN_PRICE_DENOMINATOR_PROMPT,
+        MSG_BASE_TOKEN_PRICE_NOMINATOR_HELP, MSG_BASE_TOKEN_PRICE_NOMINATOR_PROMPT,
+        MSG_BASE_TOKEN_SELECTION_PROMPT, MSG_CHAIN_ID_PROMPT, MSG_CHAIN_NAME_PROMPT,
+        MSG_L1_BATCH_COMMIT_DATA_GENERATOR_MODE_PROMPT, MSG_L1_COMMIT_DATA_GENERATOR_MODE_HELP,
+        MSG_NUMBER_VALIDATOR_GREATHER_THAN_ZERO_ERR, MSG_NUMBER_VALIDATOR_NOT_ZERO_ERR,
+        MSG_PROVER_MODE_HELP, MSG_PROVER_VERSION_PROMPT, MSG_SET_AS_DEFAULT_HELP,
+        MSG_SET_AS_DEFAULT_PROMPT, MSG_WALLET_CREATION_HELP, MSG_WALLET_CREATION_PROMPT,
+        MSG_WALLET_PATH_HELP, MSG_WALLET_PATH_INVALID_ERR, MSG_WALLET_PATH_PROMPT,
+    },
+};
+
+#[derive(Debug, Serialize, Deserialize, Parser)]
+pub struct ChainCreateArgs {
+    #[arg(long)]
+    pub chain_name: Option<String>,
+    #[arg(value_parser = clap::value_parser ! (u32).range(1..))]
+    pub chain_id: Option<u32>,
+    #[clap(long, help = MSG_PROVER_MODE_HELP, value_enum)]
+    pub prover_mode: Option<ProverMode>,
+    #[clap(long, help = MSG_WALLET_CREATION_HELP, value_enum)]
+    pub wallet_creation: Option<WalletCreation>,
+    #[clap(long, help = MSG_WALLET_PATH_HELP)]
+    pub wallet_path: Option<PathBuf>,
+    #[clap(long, help = MSG_L1_COMMIT_DATA_GENERATOR_MODE_HELP)]
+    pub l1_batch_commit_data_generator_mode: Option<L1BatchCommitDataGeneratorMode>,
+    #[clap(long, help = MSG_BASE_TOKEN_ADDRESS_HELP)]
+    pub base_token_address: Option<String>,
+    #[clap(long, help = MSG_BASE_TOKEN_PRICE_NOMINATOR_HELP)]
+    pub base_token_price_nominator: Option<u64>,
+    #[clap(long, help = MSG_BASE_TOKEN_PRICE_DENOMINATOR_HELP)]
+    pub base_token_price_denominator: Option<u64>,
+    #[clap(long, help = MSG_SET_AS_DEFAULT_HELP, default_missing_value = "true", num_args = 0..=1)]
+    pub set_as_default: Option<bool>,
+}
+
+impl ChainCreateArgs {
+    pub fn fill_values_with_prompt(
+        self,
+        number_of_chains: u32,
+        l1_network: &L1Network,
+    ) -> ChainCreateArgsFinal {
+        let mut chain_name = self
+            .chain_name
+            .unwrap_or_else(|| Prompt::new(MSG_CHAIN_NAME_PROMPT).ask());
+        chain_name = slugify!(&chain_name, separator = "_");
+
+        let chain_id = self.chain_id.unwrap_or_else(|| {
+            Prompt::new(MSG_CHAIN_ID_PROMPT)
+                .default(&(L2_CHAIN_ID + number_of_chains).to_string())
+                .ask()
+        });
+
+        let wallet_creation = PromptSelect::new(
+            MSG_WALLET_CREATION_PROMPT,
+            WalletCreation::iter().filter(|wallet| {
+                // Disable localhost wallets for external networks
+                if l1_network == &L1Network::Localhost {
+                    true
+                } else {
+                    wallet != &WalletCreation::Localhost
+                }
+            }),
+        )
+        .ask();
+
+        let prover_version = PromptSelect::new(MSG_PROVER_VERSION_PROMPT, ProverMode::iter()).ask();
+
+        let l1_batch_commit_data_generator_mode = PromptSelect::new(
+            MSG_L1_BATCH_COMMIT_DATA_GENERATOR_MODE_PROMPT,
+            L1BatchCommitDataGeneratorMode::iter(),
+        )
+        .ask();
+
+        let wallet_path: Option<PathBuf> = if self.wallet_creation == Some(WalletCreation::InFile) {
+            Some(self.wallet_path.unwrap_or_else(|| {
+                Prompt::new(MSG_WALLET_PATH_PROMPT)
+                    .validate_with(|val: &String| {
+                        PathBuf::from_str(val)
+                            .map(|_| ())
+                            .map_err(|_| MSG_WALLET_PATH_INVALID_ERR.to_string())
+                    })
+                    .ask()
+            }))
+        } else {
+            None
+        };
+
+        let base_token_selection =
+            PromptSelect::new(MSG_BASE_TOKEN_SELECTION_PROMPT, BaseTokenSelection::iter()).ask();
+        let base_token = match base_token_selection {
+            BaseTokenSelection::Eth => BaseToken::eth(),
+            BaseTokenSelection::Custom => {
+                let number_validator = |val: &String| -> Result<(), String> {
+                    let Ok(val) = val.parse::<u64>() else {
+                        return Err(MSG_NUMBER_VALIDATOR_NOT_ZERO_ERR.to_string());
+                    };
+                    if val == 0 {
+                        return Err(MSG_NUMBER_VALIDATOR_GREATHER_THAN_ZERO_ERR.to_string());
+                    }
+                    Ok(())
+                };
+                let address = Prompt::new(MSG_BASE_TOKEN_ADDRESS_PROMPT).ask();
+                let nominator = Prompt::new(MSG_BASE_TOKEN_PRICE_NOMINATOR_PROMPT)
+                    .validate_with(number_validator)
+                    .ask();
+                let denominator = Prompt::new(MSG_BASE_TOKEN_PRICE_DENOMINATOR_PROMPT)
+                    .validate_with(number_validator)
+                    .ask();
+                BaseToken {
+                    address,
+                    nominator,
+                    denominator,
+                }
+            }
+        };
+
+        let set_as_default = self.set_as_default.unwrap_or_else(|| {
+            PromptConfirm::new(MSG_SET_AS_DEFAULT_PROMPT)
+                .default(true)
+                .ask()
+        });
+
+        ChainCreateArgsFinal {
+            chain_name,
+            chain_id,
+            prover_version,
+            wallet_creation,
+            l1_batch_commit_data_generator_mode,
+            wallet_path,
+            base_token,
+            set_as_default,
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct ChainCreateArgsFinal {
+    pub chain_name: String,
+    pub chain_id: u32,
+    pub prover_version: ProverMode,
+    pub wallet_creation: WalletCreation,
+    pub l1_batch_commit_data_generator_mode: L1BatchCommitDataGeneratorMode,
+    pub wallet_path: Option<PathBuf>,
+    pub base_token: BaseToken,
+    pub set_as_default: bool,
+}
+
+#[derive(Debug, Clone, EnumIter, Display, PartialEq, Eq)]
+enum BaseTokenSelection {
+    Eth,
+    Custom,
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/args/genesis.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/args/genesis.rs
new file mode 100644
index 000000000000..483b78e9b267
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/args/genesis.rs
@@ -0,0 +1,87 @@
+use clap::Parser;
+use common::{db::DatabaseConfig, Prompt};
+use config::ChainConfig;
+use serde::{Deserialize, Serialize};
+use slugify_rs::slugify;
+use url::Url;
+
+use crate::{
+    defaults::{generate_db_names, DBNames, DATABASE_PROVER_URL, DATABASE_SERVER_URL},
+    messages::{
+        msg_prover_db_name_prompt, msg_prover_db_url_prompt, msg_server_db_name_prompt,
+        msg_server_db_url_prompt, MSG_PROVER_DB_NAME_HELP, MSG_PROVER_DB_URL_HELP,
+        MSG_SERVER_DB_NAME_HELP, MSG_SERVER_DB_URL_HELP, MSG_USE_DEFAULT_DATABASES_HELP,
+    },
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser, Default)]
+pub struct GenesisArgs {
+    #[clap(long, help = MSG_SERVER_DB_URL_HELP)]
+    pub server_db_url: Option<Url>,
+    #[clap(long, help = MSG_SERVER_DB_NAME_HELP)]
+    pub server_db_name: Option<String>,
+    #[clap(long, help = MSG_PROVER_DB_URL_HELP)]
+    pub prover_db_url: Option<Url>,
+    #[clap(long, help = MSG_PROVER_DB_NAME_HELP)]
+    pub prover_db_name: Option<String>,
+    #[clap(long, short, help = MSG_USE_DEFAULT_DATABASES_HELP)]
+    pub use_default: bool,
+    #[clap(long, short, action)]
+    pub dont_drop: bool,
+}
+
+impl GenesisArgs {
+    pub fn fill_values_with_prompt(self, config: &ChainConfig) -> GenesisArgsFinal {
+        let DBNames {
+            server_name,
+            prover_name,
+        } = generate_db_names(config);
+        let chain_name = config.name.clone();
+        if self.use_default {
+            GenesisArgsFinal {
+                server_db: DatabaseConfig::new(DATABASE_SERVER_URL.clone(), server_name),
+                prover_db: DatabaseConfig::new(DATABASE_PROVER_URL.clone(), prover_name),
+                dont_drop: self.dont_drop,
+            }
+        } else {
+            let server_db_url = self.server_db_url.unwrap_or_else(|| {
+                Prompt::new(&msg_server_db_url_prompt(&chain_name))
+                    .default(DATABASE_SERVER_URL.as_str())
+                    .ask()
+            });
+            let server_db_name = slugify!(
+                &self.server_db_name.unwrap_or_else(|| {
+                    Prompt::new(&msg_server_db_name_prompt(&chain_name))
+                        .default(&server_name)
+                        .ask()
+                }),
+                separator = "_"
+            );
+            let prover_db_url = self.prover_db_url.unwrap_or_else(|| {
+                Prompt::new(&msg_prover_db_url_prompt(&chain_name))
+                    .default(DATABASE_PROVER_URL.as_str())
+                    .ask()
+            });
+            let prover_db_name = slugify!(
+                &self.prover_db_name.unwrap_or_else(|| {
+                    Prompt::new(&msg_prover_db_name_prompt(&chain_name))
+                        .default(&prover_name)
+                        .ask()
+                }),
+                separator = "_"
+            );
+            GenesisArgsFinal {
+                server_db: DatabaseConfig::new(server_db_url, server_db_name),
+                prover_db: DatabaseConfig::new(prover_db_url, prover_db_name),
+                dont_drop: self.dont_drop,
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct GenesisArgsFinal {
+    pub server_db: DatabaseConfig,
+    pub prover_db: DatabaseConfig,
+    pub dont_drop: bool,
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/args/init.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/args/init.rs
new file mode 100644
index 000000000000..0700c96c76ec
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/args/init.rs
@@ -0,0 +1,70 @@
+use clap::Parser;
+use common::{forge::ForgeScriptArgs, Prompt};
+use config::ChainConfig;
+use serde::{Deserialize, Serialize};
+use types::L1Network;
+use url::Url;
+
+use super::genesis::GenesisArgsFinal;
+use crate::{
+    commands::chain::args::genesis::GenesisArgs,
+    defaults::LOCAL_RPC_URL,
+    messages::{
+        MSG_DEPLOY_PAYMASTER_PROMPT, MSG_GENESIS_ARGS_HELP, MSG_L1_RPC_URL_HELP,
+        MSG_L1_RPC_URL_INVALID_ERR, MSG_L1_RPC_URL_PROMPT,
+    },
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser)]
+pub struct InitArgs {
+    /// All ethereum environment related arguments
+    #[clap(flatten)]
+    #[serde(flatten)]
+    pub forge_args: ForgeScriptArgs,
+    #[clap(flatten, next_help_heading = MSG_GENESIS_ARGS_HELP)]
+    #[serde(flatten)]
+    pub genesis_args: GenesisArgs,
+    #[clap(long, default_missing_value = "true", num_args = 0..=1)]
+    pub deploy_paymaster: Option<bool>,
+    #[clap(long, help = MSG_L1_RPC_URL_HELP)]
+    pub l1_rpc_url: Option<String>,
+}
+
+impl InitArgs {
+    pub fn fill_values_with_prompt(self, config: &ChainConfig) -> InitArgsFinal {
+        let deploy_paymaster = self.deploy_paymaster.unwrap_or_else(|| {
+            common::PromptConfirm::new(MSG_DEPLOY_PAYMASTER_PROMPT)
+                .default(true)
+                .ask()
+        });
+
+        let l1_rpc_url = self.l1_rpc_url.unwrap_or_else(|| {
+            let mut prompt = Prompt::new(MSG_L1_RPC_URL_PROMPT);
+            if config.l1_network == L1Network::Localhost {
+                prompt = prompt.default(LOCAL_RPC_URL);
+            }
+            prompt
+                .validate_with(|val: &String| -> Result<(), String> {
+                    Url::parse(val)
+                        .map(|_| ())
+                        .map_err(|_| MSG_L1_RPC_URL_INVALID_ERR.to_string())
+                })
+                .ask()
+        });
+
+        InitArgsFinal {
+            forge_args: self.forge_args,
+            genesis_args: self.genesis_args.fill_values_with_prompt(config),
+            deploy_paymaster,
+            l1_rpc_url,
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct InitArgsFinal {
+    pub forge_args: ForgeScriptArgs,
+    pub genesis_args: GenesisArgsFinal,
+    pub deploy_paymaster: bool,
+    pub l1_rpc_url: String,
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/args/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/args/mod.rs
new file mode 100644
index 000000000000..08f39a90a843
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/args/mod.rs
@@ -0,0 +1,3 @@
+pub mod create;
+pub mod genesis;
+pub mod init;
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/create.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/create.rs
new file mode 100644
index 000000000000..dc8f408db3b3
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/create.rs
@@ -0,0 +1,89 @@
+use std::cell::OnceCell;
+
+use common::{logger, spinner::Spinner};
+use config::{
+    create_local_configs_dir, create_wallets, traits::SaveConfigWithBasePath, ChainConfig,
+    EcosystemConfig,
+};
+use types::ChainId;
+use xshell::Shell;
+
+use crate::{
+    commands::chain::args::create::{ChainCreateArgs, ChainCreateArgsFinal},
+    messages::{
+        MSG_CHAIN_CREATED, MSG_CREATING_CHAIN, MSG_CREATING_CHAIN_CONFIGURATIONS_SPINNER,
+        MSG_SELECTED_CONFIG,
+    },
+};
+
+pub fn run(args: ChainCreateArgs, shell: &Shell) -> anyhow::Result<()> {
+    let mut ecosystem_config = EcosystemConfig::from_file(shell)?;
+    create(args, &mut ecosystem_config, shell)
+}
+
+fn create(
+    args: ChainCreateArgs,
+    ecosystem_config: &mut EcosystemConfig,
+    shell: &Shell,
+) -> anyhow::Result<()> {
+    let args = args.fill_values_with_prompt(
+        ecosystem_config.list_of_chains().len() as u32,
+        &ecosystem_config.l1_network,
+    );
+
+    logger::note(MSG_SELECTED_CONFIG, logger::object_to_string(&args));
+    logger::info(MSG_CREATING_CHAIN);
+
+    let spinner = Spinner::new(MSG_CREATING_CHAIN_CONFIGURATIONS_SPINNER);
+    let name = args.chain_name.clone();
+    let set_as_default = args.set_as_default;
+    create_chain_inner(args, ecosystem_config, shell)?;
+    if set_as_default {
+        ecosystem_config.default_chain = name;
+        ecosystem_config.save_with_base_path(shell, ".")?;
+    }
+    spinner.finish();
+
+    logger::success(MSG_CHAIN_CREATED);
+
+    Ok(())
+}
+
+pub(crate) fn create_chain_inner(
+    args: ChainCreateArgsFinal,
+    ecosystem_config: &EcosystemConfig,
+    shell: &Shell,
+) -> anyhow::Result<()> {
+    let default_chain_name = args.chain_name.clone();
+    let chain_path = ecosystem_config.chains.join(&default_chain_name);
+    let chain_configs_path = create_local_configs_dir(shell, &chain_path)?;
+    let chain_id = ecosystem_config.list_of_chains().len() as u32;
+
+    let chain_config = ChainConfig {
+        id: chain_id,
+        name: default_chain_name.clone(),
+        chain_id: ChainId::from(args.chain_id),
+        prover_version: args.prover_version,
+        l1_network: ecosystem_config.l1_network,
+        link_to_code: ecosystem_config.link_to_code.clone(),
+        rocks_db_path: ecosystem_config.get_chain_rocks_db_path(&default_chain_name),
+        configs: chain_configs_path.clone(),
+        external_node_config_path: None,
+        l1_batch_commit_data_generator_mode: args.l1_batch_commit_data_generator_mode,
+        base_token: args.base_token,
+        wallet_creation: args.wallet_creation,
+        shell: OnceCell::from(shell.clone()),
+    };
+
+    create_wallets(
+        shell,
+        &chain_config.configs,
+        &ecosystem_config.link_to_code,
+        chain_id,
+        args.wallet_creation,
+        args.wallet_path,
+    )?;
+
+    chain_config.save_with_base_path(shell, chain_path)?;
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_paymaster.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_paymaster.rs
new file mode 100644
index 000000000000..4f82a92c2edc
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/deploy_paymaster.rs
@@ -0,0 +1,70 @@
+use anyhow::Context;
+use common::{
+    config::global_config,
+    forge::{Forge, ForgeScriptArgs},
+    spinner::Spinner,
+};
+use config::{
+    forge_interface::{
+        paymaster::{DeployPaymasterInput, DeployPaymasterOutput},
+        script_params::DEPLOY_PAYMASTER_SCRIPT_PARAMS,
+    },
+    traits::{ReadConfig, SaveConfig, SaveConfigWithBasePath},
+    ChainConfig, ContractsConfig, EcosystemConfig,
+};
+use xshell::Shell;
+
+use crate::{
+    messages::{MSG_CHAIN_NOT_INITIALIZED, MSG_DEPLOYING_PAYMASTER},
+    utils::forge::{check_the_balance, fill_forge_private_key},
+};
+
+pub async fn run(args: ForgeScriptArgs, shell: &Shell) -> anyhow::Result<()> {
+    let chain_name = global_config().chain_name.clone();
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    let chain_config = ecosystem_config
+        .load_chain(chain_name)
+        .context(MSG_CHAIN_NOT_INITIALIZED)?;
+    let mut contracts = chain_config.get_contracts_config()?;
+    deploy_paymaster(shell, &chain_config, &mut contracts, args).await?;
+    contracts.save_with_base_path(shell, chain_config.configs)
+}
+
+pub async fn deploy_paymaster(
+    shell: &Shell,
+    chain_config: &ChainConfig,
+    contracts_config: &mut ContractsConfig,
+    forge_args: ForgeScriptArgs,
+) -> anyhow::Result<()> {
+    let input = DeployPaymasterInput::new(chain_config)?;
+    let foundry_contracts_path = chain_config.path_to_foundry();
+    input.save(
+        shell,
+        DEPLOY_PAYMASTER_SCRIPT_PARAMS.input(&chain_config.link_to_code),
+    )?;
+    let secrets = chain_config.get_secrets_config()?;
+
+    let mut forge = Forge::new(&foundry_contracts_path)
+        .script(&DEPLOY_PAYMASTER_SCRIPT_PARAMS.script(), forge_args.clone())
+        .with_ffi()
+        .with_rpc_url(secrets.l1.l1_rpc_url.clone())
+        .with_broadcast();
+
+    forge = fill_forge_private_key(
+        forge,
+        chain_config.get_wallets_config()?.governor_private_key(),
+    )?;
+
+    let spinner = Spinner::new(MSG_DEPLOYING_PAYMASTER);
+    check_the_balance(&forge).await?;
+    forge.run(shell)?;
+    spinner.finish();
+
+    let output = DeployPaymasterOutput::read(
+        shell,
+        DEPLOY_PAYMASTER_SCRIPT_PARAMS.output(&chain_config.link_to_code),
+    )?;
+
+    contracts_config.l2.testnet_paymaster_addr = output.paymaster;
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/genesis.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/genesis.rs
new file mode 100644
index 000000000000..b42a1138229d
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/genesis.rs
@@ -0,0 +1,155 @@
+use std::path::PathBuf;
+
+use anyhow::Context;
+use common::{
+    config::global_config,
+    db::{drop_db_if_exists, init_db, migrate_db, DatabaseConfig},
+    logger,
+    server::{Server, ServerMode},
+    spinner::Spinner,
+};
+use config::{
+    traits::{FileConfigWithDefaultName, SaveConfigWithBasePath},
+    ChainConfig, ContractsConfig, EcosystemConfig, GeneralConfig, GenesisConfig, SecretsConfig,
+    WalletsConfig,
+};
+use types::ProverMode;
+use xshell::Shell;
+
+use super::args::genesis::GenesisArgsFinal;
+use crate::{
+    commands::chain::args::genesis::GenesisArgs,
+    consts::{PROVER_MIGRATIONS, SERVER_MIGRATIONS},
+    messages::{
+        MSG_CHAIN_NOT_INITIALIZED, MSG_FAILED_TO_DROP_PROVER_DATABASE_ERR,
+        MSG_FAILED_TO_DROP_SERVER_DATABASE_ERR, MSG_FAILED_TO_RUN_SERVER_ERR,
+        MSG_GENESIS_COMPLETED, MSG_INITIALIZING_DATABASES_SPINNER,
+        MSG_INITIALIZING_PROVER_DATABASE, MSG_INITIALIZING_SERVER_DATABASE,
+        MSG_RECREATE_ROCKS_DB_ERRROR, MSG_SELECTED_CONFIG, MSG_STARTING_GENESIS,
+        MSG_STARTING_GENESIS_SPINNER,
+    },
+    utils::rocks_db::{recreate_rocksdb_dirs, RocksDBDirOption},
+};
+
+pub async fn run(args: GenesisArgs, shell: &Shell) -> anyhow::Result<()> {
+    let chain_name = global_config().chain_name.clone();
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    let chain_config = ecosystem_config
+        .load_chain(chain_name)
+        .context(MSG_CHAIN_NOT_INITIALIZED)?;
+    let args = args.fill_values_with_prompt(&chain_config);
+
+    genesis(args, shell, &chain_config).await?;
+    logger::outro(MSG_GENESIS_COMPLETED);
+
+    Ok(())
+}
+
+pub async fn genesis(
+    args: GenesisArgsFinal,
+    shell: &Shell,
+    config: &ChainConfig,
+) -> anyhow::Result<()> {
+    shell.create_dir(&config.rocks_db_path)?;
+
+    let rocks_db = recreate_rocksdb_dirs(shell, &config.rocks_db_path, RocksDBDirOption::Main)
+        .context(MSG_RECREATE_ROCKS_DB_ERRROR)?;
+    let mut general = config.get_general_config()?;
+    general.set_rocks_db_config(rocks_db)?;
+    if config.prover_version != ProverMode::NoProofs {
+        general.eth.sender.proof_sending_mode = "ONLY_REAL_PROOFS".to_string();
+    }
+    general.save_with_base_path(shell, &config.configs)?;
+
+    let mut secrets = config.get_secrets_config()?;
+    secrets.set_databases(&args.server_db, &args.prover_db);
+    secrets.save_with_base_path(shell, &config.configs)?;
+
+    logger::note(
+        MSG_SELECTED_CONFIG,
+        logger::object_to_string(serde_json::json!({
+            "chain_config": config,
+            "server_db_config": args.server_db,
+            "prover_db_config": args.prover_db,
+        })),
+    );
+    logger::info(MSG_STARTING_GENESIS);
+
+    let spinner = Spinner::new(MSG_INITIALIZING_DATABASES_SPINNER);
+    initialize_databases(
+        shell,
+        &args.server_db,
+        &args.prover_db,
+        config.link_to_code.clone(),
+        args.dont_drop,
+    )
+    .await?;
+    spinner.finish();
+
+    let spinner = Spinner::new(MSG_STARTING_GENESIS_SPINNER);
+    run_server_genesis(config, shell)?;
+    spinner.finish();
+
+    Ok(())
+}
+
+async fn initialize_databases(
+    shell: &Shell,
+    server_db_config: &DatabaseConfig,
+    prover_db_config: &DatabaseConfig,
+    link_to_code: PathBuf,
+    dont_drop: bool,
+) -> anyhow::Result<()> {
+    let path_to_server_migration = link_to_code.join(SERVER_MIGRATIONS);
+
+    if global_config().verbose {
+        logger::debug(MSG_INITIALIZING_SERVER_DATABASE)
+    }
+    if !dont_drop {
+        drop_db_if_exists(server_db_config)
+            .await
+            .context(MSG_FAILED_TO_DROP_SERVER_DATABASE_ERR)?;
+        init_db(server_db_config).await?;
+    }
+    migrate_db(
+        shell,
+        path_to_server_migration,
+        &server_db_config.full_url(),
+    )
+    .await?;
+
+    if global_config().verbose {
+        logger::debug(MSG_INITIALIZING_PROVER_DATABASE)
+    }
+    if !dont_drop {
+        drop_db_if_exists(prover_db_config)
+            .await
+            .context(MSG_FAILED_TO_DROP_PROVER_DATABASE_ERR)?;
+        init_db(prover_db_config).await?;
+    }
+    let path_to_prover_migration = link_to_code.join(PROVER_MIGRATIONS);
+    migrate_db(
+        shell,
+        path_to_prover_migration,
+        &prover_db_config.full_url(),
+    )
+    .await?;
+
+    Ok(())
+}
+
+fn run_server_genesis(chain_config: &ChainConfig, shell: &Shell) -> anyhow::Result<()> {
+    let server = Server::new(None, chain_config.link_to_code.clone());
+    server
+        .run(
+            shell,
+            ServerMode::Genesis,
+            GenesisConfig::get_path_with_base_path(&chain_config.configs),
+            WalletsConfig::get_path_with_base_path(&chain_config.configs),
+            GeneralConfig::get_path_with_base_path(&chain_config.configs),
+            SecretsConfig::get_path_with_base_path(&chain_config.configs),
+            ContractsConfig::get_path_with_base_path(&chain_config.configs),
+            vec![],
+        )
+        .context(MSG_FAILED_TO_RUN_SERVER_ERR)
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/init.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/init.rs
new file mode 100644
index 000000000000..b30b20227d90
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/init.rs
@@ -0,0 +1,171 @@
+use anyhow::Context;
+use common::{
+    cmd::Cmd,
+    config::global_config,
+    forge::{Forge, ForgeScriptArgs},
+    logger,
+    spinner::Spinner,
+};
+use config::{
+    copy_configs,
+    forge_interface::{
+        register_chain::{input::RegisterChainL1Config, output::RegisterChainOutput},
+        script_params::REGISTER_CHAIN_SCRIPT_PARAMS,
+    },
+    traits::{ReadConfig, SaveConfig, SaveConfigWithBasePath},
+    ChainConfig, ContractsConfig, EcosystemConfig,
+};
+use xshell::{cmd, Shell};
+
+use crate::{
+    accept_ownership::accept_admin,
+    commands::chain::{
+        args::init::{InitArgs, InitArgsFinal},
+        deploy_paymaster,
+        genesis::genesis,
+        initialize_bridges,
+    },
+    messages::{
+        msg_initializing_chain, MSG_ACCEPTING_ADMIN_SPINNER, MSG_BUILDING_L1_CONTRACTS,
+        MSG_CHAIN_INITIALIZED, MSG_CHAIN_NOT_FOUND_ERR, MSG_GENESIS_DATABASE_ERR,
+        MSG_REGISTERING_CHAIN_SPINNER, MSG_SELECTED_CONFIG,
+    },
+    utils::forge::{check_the_balance, fill_forge_private_key},
+};
+
+pub(crate) async fn run(args: InitArgs, shell: &Shell) -> anyhow::Result<()> {
+    let chain_name = global_config().chain_name.clone();
+    let config = EcosystemConfig::from_file(shell)?;
+    let chain_config = config
+        .load_chain(chain_name)
+        .context(MSG_CHAIN_NOT_FOUND_ERR)?;
+    let mut args = args.fill_values_with_prompt(&chain_config);
+
+    logger::note(MSG_SELECTED_CONFIG, logger::object_to_string(&chain_config));
+    logger::info(msg_initializing_chain(""));
+
+    init(&mut args, shell, &config, &chain_config).await?;
+
+    logger::success(MSG_CHAIN_INITIALIZED);
+    Ok(())
+}
+
+pub async fn init(
+    init_args: &mut InitArgsFinal,
+    shell: &Shell,
+    ecosystem_config: &EcosystemConfig,
+    chain_config: &ChainConfig,
+) -> anyhow::Result<()> {
+    copy_configs(shell, &ecosystem_config.link_to_code, &chain_config.configs)?;
+    build_l1_contracts(shell, ecosystem_config)?;
+
+    let mut genesis_config = chain_config.get_genesis_config()?;
+    genesis_config.update_from_chain_config(chain_config);
+    genesis_config.save_with_base_path(shell, &chain_config.configs)?;
+
+    // Copy ecosystem contracts
+    let mut contracts_config = ecosystem_config.get_contracts_config()?;
+    contracts_config.l1.base_token_addr = chain_config.base_token.address;
+    contracts_config.save_with_base_path(shell, &chain_config.configs)?;
+
+    crate::commands::ecosystem::init::distribute_eth(
+        ecosystem_config,
+        chain_config,
+        init_args.l1_rpc_url.clone(),
+    )
+    .await?;
+    let mut secrets = chain_config.get_secrets_config()?;
+    secrets.set_l1_rpc_url(init_args.l1_rpc_url.clone());
+    secrets.save_with_base_path(shell, &chain_config.configs)?;
+
+    let spinner = Spinner::new(MSG_REGISTERING_CHAIN_SPINNER);
+    register_chain(
+        shell,
+        init_args.forge_args.clone(),
+        ecosystem_config,
+        chain_config,
+        &mut contracts_config,
+        init_args.l1_rpc_url.clone(),
+    )
+    .await?;
+    contracts_config.save_with_base_path(shell, &chain_config.configs)?;
+    spinner.finish();
+    let spinner = Spinner::new(MSG_ACCEPTING_ADMIN_SPINNER);
+    accept_admin(
+        shell,
+        ecosystem_config,
+        contracts_config.l1.governance_addr,
+        chain_config.get_wallets_config()?.governor_private_key(),
+        contracts_config.l1.diamond_proxy_addr,
+        &init_args.forge_args.clone(),
+        init_args.l1_rpc_url.clone(),
+    )
+    .await?;
+    spinner.finish();
+
+    initialize_bridges::initialize_bridges(
+        shell,
+        chain_config,
+        ecosystem_config,
+        &mut contracts_config,
+        init_args.forge_args.clone(),
+    )
+    .await?;
+    contracts_config.save_with_base_path(shell, &chain_config.configs)?;
+
+    if init_args.deploy_paymaster {
+        deploy_paymaster::deploy_paymaster(
+            shell,
+            chain_config,
+            &mut contracts_config,
+            init_args.forge_args.clone(),
+        )
+        .await?;
+        contracts_config.save_with_base_path(shell, &chain_config.configs)?;
+    }
+
+    genesis(init_args.genesis_args.clone(), shell, chain_config)
+        .await
+        .context(MSG_GENESIS_DATABASE_ERR)?;
+
+    Ok(())
+}
+
+async fn register_chain(
+    shell: &Shell,
+    forge_args: ForgeScriptArgs,
+    config: &EcosystemConfig,
+    chain_config: &ChainConfig,
+    contracts: &mut ContractsConfig,
+    l1_rpc_url: String,
+) -> anyhow::Result<()> {
+    let deploy_config_path = REGISTER_CHAIN_SCRIPT_PARAMS.input(&config.link_to_code);
+
+    let deploy_config = RegisterChainL1Config::new(chain_config, contracts)?;
+    deploy_config.save(shell, deploy_config_path)?;
+
+    let mut forge = Forge::new(&config.path_to_foundry())
+        .script(&REGISTER_CHAIN_SCRIPT_PARAMS.script(), forge_args.clone())
+        .with_ffi()
+        .with_rpc_url(l1_rpc_url)
+        .with_broadcast();
+
+    forge = fill_forge_private_key(forge, config.get_wallets()?.governor_private_key())?;
+    check_the_balance(&forge).await?;
+    forge.run(shell)?;
+
+    let register_chain_output = RegisterChainOutput::read(
+        shell,
+        REGISTER_CHAIN_SCRIPT_PARAMS.output(&chain_config.link_to_code),
+    )?;
+    contracts.set_chain_contracts(&register_chain_output);
+    Ok(())
+}
+
+fn build_l1_contracts(shell: &Shell, ecosystem_config: &EcosystemConfig) -> anyhow::Result<()> {
+    let _dir_guard = shell.push_dir(ecosystem_config.path_to_foundry());
+    let spinner = Spinner::new(MSG_BUILDING_L1_CONTRACTS);
+    Cmd::new(cmd!(shell, "yarn build")).run()?;
+    spinner.finish();
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/initialize_bridges.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/initialize_bridges.rs
new file mode 100644
index 000000000000..e81971eba7cb
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/initialize_bridges.rs
@@ -0,0 +1,93 @@
+use std::path::Path;
+
+use anyhow::Context;
+use common::{
+    cmd::Cmd,
+    config::global_config,
+    forge::{Forge, ForgeScriptArgs},
+    spinner::Spinner,
+};
+use config::{
+    forge_interface::{
+        initialize_bridges::{input::InitializeBridgeInput, output::InitializeBridgeOutput},
+        script_params::INITIALIZE_BRIDGES_SCRIPT_PARAMS,
+    },
+    traits::{ReadConfig, SaveConfig, SaveConfigWithBasePath},
+    ChainConfig, ContractsConfig, EcosystemConfig,
+};
+use xshell::{cmd, Shell};
+
+use crate::{
+    messages::{MSG_CHAIN_NOT_INITIALIZED, MSG_INITIALIZING_BRIDGES_SPINNER},
+    utils::forge::{check_the_balance, fill_forge_private_key},
+};
+
+pub async fn run(args: ForgeScriptArgs, shell: &Shell) -> anyhow::Result<()> {
+    let chain_name = global_config().chain_name.clone();
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    let chain_config = ecosystem_config
+        .load_chain(chain_name)
+        .context(MSG_CHAIN_NOT_INITIALIZED)?;
+
+    let mut contracts = chain_config.get_contracts_config()?;
+    let spinner = Spinner::new(MSG_INITIALIZING_BRIDGES_SPINNER);
+    initialize_bridges(
+        shell,
+        &chain_config,
+        &ecosystem_config,
+        &mut contracts,
+        args,
+    )
+    .await?;
+    contracts.save_with_base_path(shell, &chain_config.configs)?;
+    spinner.finish();
+
+    Ok(())
+}
+
+pub async fn initialize_bridges(
+    shell: &Shell,
+    chain_config: &ChainConfig,
+    ecosystem_config: &EcosystemConfig,
+    contracts_config: &mut ContractsConfig,
+    forge_args: ForgeScriptArgs,
+) -> anyhow::Result<()> {
+    build_l2_contracts(shell, &ecosystem_config.link_to_code)?;
+    let input = InitializeBridgeInput::new(chain_config, ecosystem_config.era_chain_id)?;
+    let foundry_contracts_path = chain_config.path_to_foundry();
+    let secrets = chain_config.get_secrets_config()?;
+    input.save(
+        shell,
+        INITIALIZE_BRIDGES_SCRIPT_PARAMS.input(&chain_config.link_to_code),
+    )?;
+
+    let mut forge = Forge::new(&foundry_contracts_path)
+        .script(
+            &INITIALIZE_BRIDGES_SCRIPT_PARAMS.script(),
+            forge_args.clone(),
+        )
+        .with_ffi()
+        .with_rpc_url(secrets.l1.l1_rpc_url.clone())
+        .with_broadcast();
+
+    forge = fill_forge_private_key(
+        forge,
+        ecosystem_config.get_wallets()?.governor_private_key(),
+    )?;
+
+    check_the_balance(&forge).await?;
+    forge.run(shell)?;
+
+    let output = InitializeBridgeOutput::read(
+        shell,
+        INITIALIZE_BRIDGES_SCRIPT_PARAMS.output(&chain_config.link_to_code),
+    )?;
+
+    contracts_config.set_l2_shared_bridge(&output)?;
+    Ok(())
+}
+
+fn build_l2_contracts(shell: &Shell, link_to_code: &Path) -> anyhow::Result<()> {
+    let _dir_guard = shell.push_dir(link_to_code.join("contracts"));
+    Ok(Cmd::new(cmd!(shell, "yarn l2 build")).run()?)
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/chain/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/chain/mod.rs
new file mode 100644
index 000000000000..aabb0d714c53
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/chain/mod.rs
@@ -0,0 +1,38 @@
+pub(crate) use args::create::ChainCreateArgsFinal;
+use clap::Subcommand;
+use common::forge::ForgeScriptArgs;
+pub(crate) use create::create_chain_inner;
+use xshell::Shell;
+
+use crate::commands::chain::args::{create::ChainCreateArgs, genesis::GenesisArgs, init::InitArgs};
+
+pub(crate) mod args;
+mod create;
+pub mod deploy_paymaster;
+pub mod genesis;
+pub(crate) mod init;
+mod initialize_bridges;
+
+#[derive(Subcommand, Debug)]
+pub enum ChainCommands {
+    /// Create a new chain, setting the necessary configurations for later initialization
+    Create(ChainCreateArgs),
+    /// Initialize chain, deploying necessary contracts and performing on-chain operations
+    Init(InitArgs),
+    /// Run server genesis
+    Genesis(GenesisArgs),
+    /// Initialize bridges on l2
+    InitializeBridges(ForgeScriptArgs),
+    /// Initialize bridges on l2
+    DeployPaymaster(ForgeScriptArgs),
+}
+
+pub(crate) async fn run(shell: &Shell, args: ChainCommands) -> anyhow::Result<()> {
+    match args {
+        ChainCommands::Create(args) => create::run(args, shell),
+        ChainCommands::Init(args) => init::run(args, shell).await,
+        ChainCommands::Genesis(args) => genesis::run(args, shell).await,
+        ChainCommands::InitializeBridges(args) => initialize_bridges::run(args, shell).await,
+        ChainCommands::DeployPaymaster(args) => deploy_paymaster::run(args, shell).await,
+    }
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/containers.rs b/zk_toolbox/crates/zk_inception/src/commands/containers.rs
new file mode 100644
index 000000000000..bba19fb89f94
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/containers.rs
@@ -0,0 +1,78 @@
+use std::path::PathBuf;
+
+use anyhow::{anyhow, Context};
+use common::{docker, logger, spinner::Spinner};
+use config::{EcosystemConfig, DOCKER_COMPOSE_FILE};
+use xshell::Shell;
+
+use crate::messages::{
+    MSG_CONTAINERS_STARTED, MSG_FAILED_TO_FIND_ECOSYSTEM_ERR, MSG_RETRY_START_CONTAINERS_PROMPT,
+    MSG_STARTING_CONTAINERS, MSG_STARTING_DOCKER_CONTAINERS_SPINNER,
+};
+
+pub fn run(shell: &Shell) -> anyhow::Result<()> {
+    let ecosystem = EcosystemConfig::from_file(shell).context(MSG_FAILED_TO_FIND_ECOSYSTEM_ERR)?;
+
+    initialize_docker(shell, &ecosystem)?;
+
+    logger::info(MSG_STARTING_CONTAINERS);
+
+    let spinner = Spinner::new(MSG_STARTING_DOCKER_CONTAINERS_SPINNER);
+    start_containers(shell)?;
+    spinner.finish();
+
+    logger::outro(MSG_CONTAINERS_STARTED);
+    Ok(())
+}
+
+pub fn initialize_docker(shell: &Shell, ecosystem: &EcosystemConfig) -> anyhow::Result<()> {
+    if !shell.path_exists("volumes") {
+        create_docker_folders(shell)?;
+    };
+
+    if !shell.path_exists(DOCKER_COMPOSE_FILE) {
+        copy_dockerfile(shell, ecosystem.link_to_code.clone())?;
+    };
+
+    Ok(())
+}
+
+pub fn start_containers(shell: &Shell) -> anyhow::Result<()> {
+    while let Err(err) = docker::up(shell, DOCKER_COMPOSE_FILE) {
+        logger::error(err.to_string());
+        if !common::PromptConfirm::new(MSG_RETRY_START_CONTAINERS_PROMPT)
+            .default(true)
+            .ask()
+        {
+            return Err(err);
+        }
+    }
+    Ok(())
+}
+
+fn create_docker_folders(shell: &Shell) -> anyhow::Result<()> {
+    shell.create_dir("volumes")?;
+    shell.create_dir("volumes/postgres")?;
+    shell.create_dir("volumes/reth")?;
+    shell.create_dir("volumes/reth/data")?;
+    Ok(())
+}
+
+fn copy_dockerfile(shell: &Shell, link_to_code: PathBuf) -> anyhow::Result<()> {
+    let docker_compose_file = link_to_code.join(DOCKER_COMPOSE_FILE);
+
+    let docker_compose_text = shell.read_file(&docker_compose_file).map_err(|err| {
+        anyhow!(
+            "Failed to read docker compose file from {:?}: {}",
+            &docker_compose_file,
+            err
+        )
+    })?;
+    let original_source = "./etc/reth/chaindata";
+    let new_source = link_to_code.join(original_source);
+    let new_source = new_source.to_str().unwrap();
+
+    let data = docker_compose_text.replace(original_source, new_source);
+    shell.write_file(DOCKER_COMPOSE_FILE, data)?;
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/change_default.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/change_default.rs
new file mode 100644
index 000000000000..041e6a2eb40a
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/change_default.rs
@@ -0,0 +1,7 @@
+use clap::Parser;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser)]
+pub struct ChangeDefaultChain {
+    pub name: Option<String>,
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/create.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/create.rs
new file mode 100644
index 000000000000..f005a98f6b64
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/create.rs
@@ -0,0 +1,107 @@
+use std::path::PathBuf;
+
+use clap::Parser;
+use common::{Prompt, PromptConfirm, PromptSelect};
+use serde::{Deserialize, Serialize};
+use slugify_rs::slugify;
+use strum::IntoEnumIterator;
+use strum_macros::EnumIter;
+use types::{L1Network, WalletCreation};
+
+use crate::{
+    commands::chain::{args::create::ChainCreateArgs, ChainCreateArgsFinal},
+    messages::{
+        MSG_ECOSYSTEM_NAME_PROMPT, MSG_L1_NETWORK_HELP, MSG_L1_NETWORK_PROMPT,
+        MSG_LINK_TO_CODE_HELP, MSG_LINK_TO_CODE_PROMPT, MSG_LINK_TO_CODE_SELECTION_CLONE,
+        MSG_LINK_TO_CODE_SELECTION_PATH, MSG_REPOSITORY_ORIGIN_PROMPT, MSG_START_CONTAINERS_HELP,
+        MSG_START_CONTAINERS_PROMPT,
+    },
+};
+
+#[derive(Debug, Serialize, Deserialize, Parser)]
+pub struct EcosystemCreateArgs {
+    #[arg(long)]
+    pub ecosystem_name: Option<String>,
+    #[clap(long, help = MSG_L1_NETWORK_HELP, value_enum)]
+    pub l1_network: Option<L1Network>,
+    #[clap(long, help = MSG_LINK_TO_CODE_HELP)]
+    pub link_to_code: Option<String>,
+    #[clap(flatten)]
+    #[serde(flatten)]
+    pub chain: ChainCreateArgs,
+    #[clap(long, help = MSG_START_CONTAINERS_HELP, default_missing_value = "true", num_args = 0..=1)]
+    pub start_containers: Option<bool>,
+}
+
+impl EcosystemCreateArgs {
+    pub fn fill_values_with_prompt(mut self) -> EcosystemCreateArgsFinal {
+        let mut ecosystem_name = self
+            .ecosystem_name
+            .unwrap_or_else(|| Prompt::new(MSG_ECOSYSTEM_NAME_PROMPT).ask());
+        ecosystem_name = slugify!(&ecosystem_name, separator = "_");
+
+        let link_to_code = self.link_to_code.unwrap_or_else(|| {
+            let link_to_code_selection =
+                PromptSelect::new(MSG_REPOSITORY_ORIGIN_PROMPT, LinkToCodeSelection::iter()).ask();
+            match link_to_code_selection {
+                LinkToCodeSelection::Clone => "".to_string(),
+                LinkToCodeSelection::Path => Prompt::new(MSG_LINK_TO_CODE_PROMPT).ask(),
+            }
+        });
+
+        let l1_network = PromptSelect::new(MSG_L1_NETWORK_PROMPT, L1Network::iter()).ask();
+
+        // Make the only chain as a default one
+        self.chain.set_as_default = Some(true);
+
+        let chain = self.chain.fill_values_with_prompt(0, &l1_network);
+
+        let start_containers = self.start_containers.unwrap_or_else(|| {
+            PromptConfirm::new(MSG_START_CONTAINERS_PROMPT)
+                .default(true)
+                .ask()
+        });
+
+        EcosystemCreateArgsFinal {
+            ecosystem_name,
+            l1_network,
+            link_to_code,
+            wallet_creation: chain.wallet_creation,
+            wallet_path: chain.wallet_path.clone(),
+            chain_args: chain,
+            start_containers,
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct EcosystemCreateArgsFinal {
+    pub ecosystem_name: String,
+    pub l1_network: L1Network,
+    pub link_to_code: String,
+    pub wallet_creation: WalletCreation,
+    pub wallet_path: Option<PathBuf>,
+    pub chain_args: ChainCreateArgsFinal,
+    pub start_containers: bool,
+}
+
+impl EcosystemCreateArgsFinal {
+    pub fn chain_config(&self) -> ChainCreateArgsFinal {
+        self.chain_args.clone()
+    }
+}
+
+#[derive(Debug, Clone, EnumIter, PartialEq, Eq)]
+enum LinkToCodeSelection {
+    Clone,
+    Path,
+}
+
+impl std::fmt::Display for LinkToCodeSelection {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            LinkToCodeSelection::Clone => write!(f, "{MSG_LINK_TO_CODE_SELECTION_CLONE}"),
+            LinkToCodeSelection::Path => write!(f, "{MSG_LINK_TO_CODE_SELECTION_PATH}"),
+        }
+    }
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/init.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/init.rs
new file mode 100644
index 000000000000..3e5e7b06dcfb
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/init.rs
@@ -0,0 +1,131 @@
+use std::path::PathBuf;
+
+use clap::Parser;
+use common::{forge::ForgeScriptArgs, Prompt, PromptConfirm};
+use serde::{Deserialize, Serialize};
+use types::L1Network;
+use url::Url;
+
+use crate::{
+    commands::chain::args::genesis::GenesisArgs,
+    defaults::LOCAL_RPC_URL,
+    messages::{
+        MSG_DEPLOY_ECOSYSTEM_PROMPT, MSG_DEPLOY_ERC20_PROMPT, MSG_DEPLOY_PAYMASTER_PROMPT,
+        MSG_DEV_ARG_HELP, MSG_GENESIS_ARGS_HELP, MSG_L1_RPC_URL_HELP, MSG_L1_RPC_URL_INVALID_ERR,
+        MSG_L1_RPC_URL_PROMPT,
+    },
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser)]
+pub struct EcosystemArgs {
+    /// Deploy ecosystem contracts
+    #[clap(long, default_missing_value = "true", num_args = 0..=1)]
+    pub deploy_ecosystem: Option<bool>,
+    /// Path to ecosystem contracts
+    #[clap(long)]
+    pub ecosystem_contracts_path: Option<PathBuf>,
+    #[clap(long, help = MSG_L1_RPC_URL_HELP)]
+    pub l1_rpc_url: Option<String>,
+}
+
+impl EcosystemArgs {
+    pub fn fill_values_with_prompt(self, l1_network: L1Network, dev: bool) -> EcosystemArgsFinal {
+        let deploy_ecosystem = self.deploy_ecosystem.unwrap_or_else(|| {
+            if dev {
+                true
+            } else {
+                PromptConfirm::new(MSG_DEPLOY_ECOSYSTEM_PROMPT)
+                    .default(true)
+                    .ask()
+            }
+        });
+
+        let l1_rpc_url = self.l1_rpc_url.unwrap_or_else(|| {
+            let mut prompt = Prompt::new(MSG_L1_RPC_URL_PROMPT);
+            if dev {
+                return LOCAL_RPC_URL.to_string();
+            }
+            if l1_network == L1Network::Localhost {
+                prompt = prompt.default(LOCAL_RPC_URL);
+            }
+            prompt
+                .validate_with(|val: &String| -> Result<(), String> {
+                    Url::parse(val)
+                        .map(|_| ())
+                        .map_err(|_| MSG_L1_RPC_URL_INVALID_ERR.to_string())
+                })
+                .ask()
+        });
+        EcosystemArgsFinal {
+            deploy_ecosystem,
+            ecosystem_contracts_path: self.ecosystem_contracts_path,
+            l1_rpc_url,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct EcosystemArgsFinal {
+    pub deploy_ecosystem: bool,
+    pub ecosystem_contracts_path: Option<PathBuf>,
+    pub l1_rpc_url: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser)]
+pub struct EcosystemInitArgs {
+    /// Deploy Paymaster contract
+    #[clap(long, default_missing_value = "true", num_args = 0..=1)]
+    pub deploy_paymaster: Option<bool>,
+    /// Deploy ERC20 contracts
+    #[clap(long, default_missing_value = "true", num_args = 0..=1)]
+    pub deploy_erc20: Option<bool>,
+    #[clap(flatten)]
+    #[serde(flatten)]
+    pub ecosystem: EcosystemArgs,
+    #[clap(flatten)]
+    #[serde(flatten)]
+    pub forge_args: ForgeScriptArgs,
+    #[clap(flatten, next_help_heading = MSG_GENESIS_ARGS_HELP)]
+    #[serde(flatten)]
+    pub genesis_args: GenesisArgs,
+    #[clap(long, help = MSG_DEV_ARG_HELP)]
+    pub dev: bool,
+}
+
+impl EcosystemInitArgs {
+    pub fn fill_values_with_prompt(self, l1_network: L1Network) -> EcosystemInitArgsFinal {
+        let (deploy_paymaster, deploy_erc20) = if self.dev {
+            (true, true)
+        } else {
+            let deploy_paymaster = self.deploy_paymaster.unwrap_or_else(|| {
+                PromptConfirm::new(MSG_DEPLOY_PAYMASTER_PROMPT)
+                    .default(true)
+                    .ask()
+            });
+            let deploy_erc20 = self.deploy_erc20.unwrap_or_else(|| {
+                PromptConfirm::new(MSG_DEPLOY_ERC20_PROMPT)
+                    .default(true)
+                    .ask()
+            });
+            (deploy_paymaster, deploy_erc20)
+        };
+        let ecosystem = self.ecosystem.fill_values_with_prompt(l1_network, self.dev);
+
+        EcosystemInitArgsFinal {
+            deploy_paymaster,
+            deploy_erc20,
+            ecosystem,
+            forge_args: self.forge_args.clone(),
+            dev: self.dev,
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct EcosystemInitArgsFinal {
+    pub deploy_paymaster: bool,
+    pub deploy_erc20: bool,
+    pub ecosystem: EcosystemArgsFinal,
+    pub forge_args: ForgeScriptArgs,
+    pub dev: bool,
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/mod.rs
new file mode 100644
index 000000000000..8a6048a8643b
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/args/mod.rs
@@ -0,0 +1,3 @@
+pub mod change_default;
+pub mod create;
+pub mod init;
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/change_default.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/change_default.rs
new file mode 100644
index 000000000000..3bd392c0558d
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/change_default.rs
@@ -0,0 +1,25 @@
+use common::PromptSelect;
+use config::{traits::SaveConfigWithBasePath, EcosystemConfig};
+use xshell::Shell;
+
+use crate::{
+    commands::ecosystem::args::change_default::ChangeDefaultChain,
+    messages::{msg_chain_doesnt_exist_err, MSG_DEFAULT_CHAIN_PROMPT},
+};
+
+pub fn run(args: ChangeDefaultChain, shell: &Shell) -> anyhow::Result<()> {
+    let mut ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    let chains = ecosystem_config.list_of_chains();
+    let chain_name = args.name.unwrap_or_else(|| {
+        PromptSelect::new(MSG_DEFAULT_CHAIN_PROMPT, &chains)
+            .ask()
+            .to_string()
+    });
+
+    if !chains.contains(&chain_name) {
+        anyhow::bail!(msg_chain_doesnt_exist_err(&chain_name, &chains));
+    }
+    ecosystem_config.default_chain = chain_name;
+    ecosystem_config.save_with_base_path(shell, ".")
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/create.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/create.rs
new file mode 100644
index 000000000000..4daab36c56b8
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/create.rs
@@ -0,0 +1,133 @@
+use std::{
+    path::{Path, PathBuf},
+    str::FromStr,
+};
+
+use anyhow::bail;
+use common::{cmd::Cmd, logger, spinner::Spinner};
+use config::{
+    create_local_configs_dir, create_wallets, get_default_era_chain_id,
+    traits::SaveConfigWithBasePath, EcosystemConfig, EcosystemConfigFromFileError,
+    ZKSYNC_ERA_GIT_REPO,
+};
+use xshell::{cmd, Shell};
+
+use crate::{
+    commands::{
+        chain::create_chain_inner,
+        containers::{initialize_docker, start_containers},
+        ecosystem::{
+            args::create::EcosystemCreateArgs,
+            create_configs::{create_erc20_deployment_config, create_initial_deployments_config},
+        },
+    },
+    messages::{
+        MSG_CLONING_ERA_REPO_SPINNER, MSG_CREATED_ECOSYSTEM, MSG_CREATING_DEFAULT_CHAIN_SPINNER,
+        MSG_CREATING_ECOSYSTEM, MSG_CREATING_INITIAL_CONFIGURATIONS_SPINNER,
+        MSG_ECOSYSTEM_ALREADY_EXISTS_ERR, MSG_ECOSYSTEM_CONFIG_INVALID_ERR, MSG_SELECTED_CONFIG,
+        MSG_STARTING_CONTAINERS_SPINNER,
+    },
+};
+
+pub fn run(args: EcosystemCreateArgs, shell: &Shell) -> anyhow::Result<()> {
+    match EcosystemConfig::from_file(shell) {
+        Ok(_) => bail!(MSG_ECOSYSTEM_ALREADY_EXISTS_ERR),
+        Err(EcosystemConfigFromFileError::InvalidConfig { .. }) => {
+            bail!(MSG_ECOSYSTEM_CONFIG_INVALID_ERR)
+        }
+        Err(EcosystemConfigFromFileError::NotExists) => create(args, shell)?,
+    };
+
+    Ok(())
+}
+
+fn create(args: EcosystemCreateArgs, shell: &Shell) -> anyhow::Result<()> {
+    let args = args.fill_values_with_prompt();
+
+    logger::note(MSG_SELECTED_CONFIG, logger::object_to_string(&args));
+    logger::info(MSG_CREATING_ECOSYSTEM);
+
+    let ecosystem_name = &args.ecosystem_name;
+    shell.create_dir(ecosystem_name)?;
+    shell.change_dir(ecosystem_name);
+
+    let configs_path = create_local_configs_dir(shell, ".")?;
+
+    let link_to_code = if args.link_to_code.is_empty() {
+        let spinner = Spinner::new(MSG_CLONING_ERA_REPO_SPINNER);
+        let link_to_code = clone_era_repo(shell)?;
+        spinner.finish();
+        link_to_code
+    } else {
+        let path = PathBuf::from_str(&args.link_to_code)?;
+        update_submodules_recursive(shell, &path)?;
+        path
+    };
+
+    let spinner = Spinner::new(MSG_CREATING_INITIAL_CONFIGURATIONS_SPINNER);
+    let chain_config = args.chain_config();
+    let chains_path = shell.create_dir("chains")?;
+    let default_chain_name = args.chain_args.chain_name.clone();
+
+    create_initial_deployments_config(shell, &configs_path)?;
+    create_erc20_deployment_config(shell, &configs_path)?;
+
+    let ecosystem_config = EcosystemConfig {
+        name: ecosystem_name.clone(),
+        l1_network: args.l1_network,
+        link_to_code: link_to_code.clone(),
+        chains: chains_path.clone(),
+        config: configs_path,
+        era_chain_id: get_default_era_chain_id(),
+        default_chain: default_chain_name.clone(),
+        prover_version: chain_config.prover_version,
+        wallet_creation: args.wallet_creation,
+        shell: shell.clone().into(),
+    };
+
+    // Use 0 id for ecosystem  wallets
+    create_wallets(
+        shell,
+        &ecosystem_config.config,
+        &ecosystem_config.link_to_code,
+        0,
+        args.wallet_creation,
+        args.wallet_path,
+    )?;
+    ecosystem_config.save_with_base_path(shell, ".")?;
+    spinner.finish();
+
+    let spinner = Spinner::new(MSG_CREATING_DEFAULT_CHAIN_SPINNER);
+    create_chain_inner(chain_config, &ecosystem_config, shell)?;
+    spinner.finish();
+
+    if args.start_containers {
+        let spinner = Spinner::new(MSG_STARTING_CONTAINERS_SPINNER);
+        initialize_docker(shell, &ecosystem_config)?;
+        start_containers(shell)?;
+        spinner.finish();
+    }
+
+    logger::outro(MSG_CREATED_ECOSYSTEM);
+    Ok(())
+}
+
+fn clone_era_repo(shell: &Shell) -> anyhow::Result<PathBuf> {
+    Cmd::new(cmd!(
+        shell,
+        "git clone --recurse-submodules {ZKSYNC_ERA_GIT_REPO}"
+    ))
+    .run()?;
+    Ok(shell.current_dir().join("zksync-era"))
+}
+
+fn update_submodules_recursive(shell: &Shell, link_to_code: &Path) -> anyhow::Result<()> {
+    let _dir_guard = shell.push_dir(link_to_code);
+    Cmd::new(cmd!(
+        shell,
+        "git submodule update --init --recursive
+"
+    ))
+    .run()?;
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/create_configs.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/create_configs.rs
new file mode 100644
index 000000000000..b4f42313e3d0
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/create_configs.rs
@@ -0,0 +1,35 @@
+use std::path::Path;
+
+use config::{
+    forge_interface::deploy_ecosystem::input::{Erc20DeploymentConfig, InitialDeploymentConfig},
+    traits::SaveConfigWithCommentAndBasePath,
+};
+use xshell::Shell;
+
+use crate::messages::{MSG_SAVE_ERC20_CONFIG_ATTENTION, MSG_SAVE_INITIAL_CONFIG_ATTENTION};
+
+pub fn create_initial_deployments_config(
+    shell: &Shell,
+    ecosystem_configs_path: &Path,
+) -> anyhow::Result<InitialDeploymentConfig> {
+    let config = InitialDeploymentConfig::default();
+    config.save_with_comment_and_base_path(
+        shell,
+        ecosystem_configs_path,
+        MSG_SAVE_INITIAL_CONFIG_ATTENTION,
+    )?;
+    Ok(config)
+}
+
+pub fn create_erc20_deployment_config(
+    shell: &Shell,
+    ecosystem_configs_path: &Path,
+) -> anyhow::Result<Erc20DeploymentConfig> {
+    let config = Erc20DeploymentConfig::default();
+    config.save_with_comment_and_base_path(
+        shell,
+        ecosystem_configs_path,
+        MSG_SAVE_ERC20_CONFIG_ATTENTION,
+    )?;
+    Ok(config)
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs
new file mode 100644
index 000000000000..7579a4ac6231
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs
@@ -0,0 +1,363 @@
+use std::{
+    path::{Path, PathBuf},
+    str::FromStr,
+};
+
+use anyhow::Context;
+use common::{
+    cmd::Cmd,
+    config::global_config,
+    forge::{Forge, ForgeScriptArgs},
+    logger,
+    spinner::Spinner,
+    Prompt,
+};
+use config::{
+    forge_interface::{
+        deploy_ecosystem::{
+            input::{
+                DeployErc20Config, DeployL1Config, Erc20DeploymentConfig, InitialDeploymentConfig,
+            },
+            output::{DeployErc20Output, DeployL1Output},
+        },
+        script_params::{DEPLOY_ECOSYSTEM_SCRIPT_PARAMS, DEPLOY_ERC20_SCRIPT_PARAMS},
+    },
+    traits::{
+        FileConfigWithDefaultName, ReadConfig, ReadConfigWithBasePath, SaveConfig,
+        SaveConfigWithBasePath,
+    },
+    ChainConfig, ContractsConfig, EcosystemConfig, GenesisConfig,
+};
+use types::{L1Network, ProverMode, WalletCreation};
+use xshell::{cmd, Shell};
+
+use super::args::init::{EcosystemArgsFinal, EcosystemInitArgs, EcosystemInitArgsFinal};
+use crate::{
+    accept_ownership::accept_owner,
+    commands::{
+        chain,
+        ecosystem::create_configs::{
+            create_erc20_deployment_config, create_initial_deployments_config,
+        },
+    },
+    consts::AMOUNT_FOR_DISTRIBUTION_TO_WALLETS,
+    messages::{
+        msg_ecosystem_initialized, msg_initializing_chain, MSG_CHAIN_NOT_INITIALIZED,
+        MSG_DEPLOYING_ECOSYSTEM_CONTRACTS_SPINNER, MSG_DEPLOYING_ERC20,
+        MSG_DEPLOYING_ERC20_SPINNER, MSG_DISTRIBUTING_ETH_SPINNER,
+        MSG_ECOSYSTEM_CONTRACTS_PATH_INVALID_ERR, MSG_ECOSYSTEM_CONTRACTS_PATH_PROMPT,
+        MSG_INITIALIZING_ECOSYSTEM, MSG_INTALLING_DEPS_SPINNER,
+    },
+    utils::forge::{check_the_balance, fill_forge_private_key},
+};
+
+pub async fn run(args: EcosystemInitArgs, shell: &Shell) -> anyhow::Result<()> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    let initial_deployment_config = match ecosystem_config.get_initial_deployment_config() {
+        Ok(config) => config,
+        Err(_) => create_initial_deployments_config(shell, &ecosystem_config.config)?,
+    };
+
+    let mut genesis_args = args.genesis_args.clone();
+    if args.dev {
+        genesis_args.use_default = true;
+    }
+    let mut final_ecosystem_args = args.fill_values_with_prompt(ecosystem_config.l1_network);
+
+    logger::info(MSG_INITIALIZING_ECOSYSTEM);
+
+    let contracts_config = init(
+        &mut final_ecosystem_args,
+        shell,
+        &ecosystem_config,
+        &initial_deployment_config,
+    )
+    .await?;
+
+    if final_ecosystem_args.deploy_erc20 {
+        logger::info(MSG_DEPLOYING_ERC20);
+        let erc20_deployment_config = match ecosystem_config.get_erc20_deployment_config() {
+            Ok(config) => config,
+            Err(_) => create_erc20_deployment_config(shell, &ecosystem_config.config)?,
+        };
+        deploy_erc20(
+            shell,
+            &erc20_deployment_config,
+            &ecosystem_config,
+            &contracts_config,
+            final_ecosystem_args.forge_args.clone(),
+            final_ecosystem_args.ecosystem.l1_rpc_url.clone(),
+        )
+        .await?;
+    }
+
+    // If the name of chain passed then we deploy exactly this chain otherwise deploy all chains
+    let list_of_chains = if let Some(name) = global_config().chain_name.clone() {
+        vec![name]
+    } else {
+        ecosystem_config.list_of_chains()
+    };
+
+    for chain_name in &list_of_chains {
+        logger::info(msg_initializing_chain(chain_name));
+        let chain_config = ecosystem_config
+            .load_chain(Some(chain_name.clone()))
+            .context(MSG_CHAIN_NOT_INITIALIZED)?;
+
+        let mut chain_init_args = chain::args::init::InitArgsFinal {
+            forge_args: final_ecosystem_args.forge_args.clone(),
+            genesis_args: genesis_args.clone().fill_values_with_prompt(&chain_config),
+            deploy_paymaster: final_ecosystem_args.deploy_paymaster,
+            l1_rpc_url: final_ecosystem_args.ecosystem.l1_rpc_url.clone(),
+        };
+
+        chain::init::init(
+            &mut chain_init_args,
+            shell,
+            &ecosystem_config,
+            &chain_config,
+        )
+        .await?;
+    }
+
+    logger::outro(msg_ecosystem_initialized(&list_of_chains.join(",")));
+
+    Ok(())
+}
+
+// Distribute eth to the chain wallets for localhost environment
+pub async fn distribute_eth(
+    ecosystem_config: &EcosystemConfig,
+    chain_config: &ChainConfig,
+    l1_rpc_url: String,
+) -> anyhow::Result<()> {
+    if chain_config.wallet_creation == WalletCreation::Localhost
+        && ecosystem_config.l1_network == L1Network::Localhost
+    {
+        let spinner = Spinner::new(MSG_DISTRIBUTING_ETH_SPINNER);
+        let wallets = ecosystem_config.get_wallets()?;
+        let chain_wallets = chain_config.get_wallets_config()?;
+        let mut addresses = vec![
+            chain_wallets.operator.address,
+            chain_wallets.blob_operator.address,
+            chain_wallets.governor.address,
+        ];
+        if let Some(deployer) = chain_wallets.deployer {
+            addresses.push(deployer.address)
+        }
+        common::ethereum::distribute_eth(
+            wallets.operator,
+            addresses,
+            l1_rpc_url,
+            ecosystem_config.l1_network.chain_id(),
+            AMOUNT_FOR_DISTRIBUTION_TO_WALLETS,
+        )
+        .await?;
+        spinner.finish();
+    }
+    Ok(())
+}
+
+async fn init(
+    init_args: &mut EcosystemInitArgsFinal,
+    shell: &Shell,
+    ecosystem_config: &EcosystemConfig,
+    initial_deployment_config: &InitialDeploymentConfig,
+) -> anyhow::Result<ContractsConfig> {
+    let spinner = Spinner::new(MSG_INTALLING_DEPS_SPINNER);
+    install_yarn_dependencies(shell, &ecosystem_config.link_to_code)?;
+    build_system_contracts(shell, &ecosystem_config.link_to_code)?;
+    spinner.finish();
+
+    let contracts = deploy_ecosystem(
+        shell,
+        &mut init_args.ecosystem,
+        init_args.forge_args.clone(),
+        ecosystem_config,
+        initial_deployment_config,
+    )
+    .await?;
+    contracts.save_with_base_path(shell, &ecosystem_config.config)?;
+    Ok(contracts)
+}
+
+async fn deploy_erc20(
+    shell: &Shell,
+    erc20_deployment_config: &Erc20DeploymentConfig,
+    ecosystem_config: &EcosystemConfig,
+    contracts_config: &ContractsConfig,
+    forge_args: ForgeScriptArgs,
+    l1_rpc_url: String,
+) -> anyhow::Result<DeployErc20Output> {
+    let deploy_config_path = DEPLOY_ERC20_SCRIPT_PARAMS.input(&ecosystem_config.link_to_code);
+    let wallets = ecosystem_config.get_wallets()?;
+    DeployErc20Config::new(
+        erc20_deployment_config,
+        contracts_config,
+        vec![
+            wallets.governor.address,
+            wallets.operator.address,
+            wallets.blob_operator.address,
+        ],
+    )
+    .save(shell, deploy_config_path)?;
+
+    let mut forge = Forge::new(&ecosystem_config.path_to_foundry())
+        .script(&DEPLOY_ERC20_SCRIPT_PARAMS.script(), forge_args.clone())
+        .with_ffi()
+        .with_rpc_url(l1_rpc_url)
+        .with_broadcast();
+
+    forge = fill_forge_private_key(
+        forge,
+        ecosystem_config.get_wallets()?.deployer_private_key(),
+    )?;
+
+    let spinner = Spinner::new(MSG_DEPLOYING_ERC20_SPINNER);
+    check_the_balance(&forge).await?;
+    forge.run(shell)?;
+    spinner.finish();
+
+    let result = DeployErc20Output::read(
+        shell,
+        DEPLOY_ERC20_SCRIPT_PARAMS.output(&ecosystem_config.link_to_code),
+    )?;
+    result.save_with_base_path(shell, &ecosystem_config.config)?;
+    Ok(result)
+}
+
+async fn deploy_ecosystem(
+    shell: &Shell,
+    ecosystem: &mut EcosystemArgsFinal,
+    forge_args: ForgeScriptArgs,
+    ecosystem_config: &EcosystemConfig,
+    initial_deployment_config: &InitialDeploymentConfig,
+) -> anyhow::Result<ContractsConfig> {
+    if ecosystem.deploy_ecosystem {
+        return deploy_ecosystem_inner(
+            shell,
+            forge_args,
+            ecosystem_config,
+            initial_deployment_config,
+            ecosystem.l1_rpc_url.clone(),
+        )
+        .await;
+    }
+
+    let ecosystem_contracts_path = match &ecosystem.ecosystem_contracts_path {
+        Some(path) => Some(path.clone()),
+        None => {
+            let input_path: String = Prompt::new(MSG_ECOSYSTEM_CONTRACTS_PATH_PROMPT)
+                .allow_empty()
+                .validate_with(|val: &String| {
+                    if val.is_empty() {
+                        return Ok(());
+                    }
+                    PathBuf::from_str(val)
+                        .map(|_| ())
+                        .map_err(|_| MSG_ECOSYSTEM_CONTRACTS_PATH_INVALID_ERR.to_string())
+                })
+                .ask();
+            if input_path.is_empty() {
+                None
+            } else {
+                Some(input_path.into())
+            }
+        }
+    };
+
+    let ecosystem_contracts_path =
+        ecosystem_contracts_path.unwrap_or_else(|| match ecosystem_config.l1_network {
+            L1Network::Localhost => {
+                ContractsConfig::get_path_with_base_path(&ecosystem_config.config)
+            }
+            L1Network::Sepolia | L1Network::Mainnet => ecosystem_config
+                .get_preexisting_configs_path()
+                .join(ecosystem_config.l1_network.to_string().to_lowercase()),
+        });
+
+    ContractsConfig::read(shell, ecosystem_contracts_path)
+}
+
+async fn deploy_ecosystem_inner(
+    shell: &Shell,
+    forge_args: ForgeScriptArgs,
+    config: &EcosystemConfig,
+    initial_deployment_config: &InitialDeploymentConfig,
+    l1_rpc_url: String,
+) -> anyhow::Result<ContractsConfig> {
+    let deploy_config_path = DEPLOY_ECOSYSTEM_SCRIPT_PARAMS.input(&config.link_to_code);
+
+    let default_genesis_config =
+        GenesisConfig::read_with_base_path(shell, config.get_default_configs_path())
+            .context("Context")?;
+
+    let wallets_config = config.get_wallets()?;
+    // For deploying ecosystem we only need genesis batch params
+    let deploy_config = DeployL1Config::new(
+        &default_genesis_config,
+        &wallets_config,
+        initial_deployment_config,
+        config.era_chain_id,
+        config.prover_version == ProverMode::NoProofs,
+    );
+    deploy_config.save(shell, deploy_config_path)?;
+
+    let mut forge = Forge::new(&config.path_to_foundry())
+        .script(&DEPLOY_ECOSYSTEM_SCRIPT_PARAMS.script(), forge_args.clone())
+        .with_ffi()
+        .with_rpc_url(l1_rpc_url.clone())
+        .with_broadcast();
+
+    if config.l1_network == L1Network::Localhost {
+        // It's a kludge for reth, just because it doesn't behave properly with large amount of txs
+        forge = forge.with_slow();
+    }
+
+    forge = fill_forge_private_key(forge, wallets_config.deployer_private_key())?;
+
+    let spinner = Spinner::new(MSG_DEPLOYING_ECOSYSTEM_CONTRACTS_SPINNER);
+    check_the_balance(&forge).await?;
+    forge.run(shell)?;
+    spinner.finish();
+
+    let script_output = DeployL1Output::read(
+        shell,
+        DEPLOY_ECOSYSTEM_SCRIPT_PARAMS.output(&config.link_to_code),
+    )?;
+    let mut contracts_config = ContractsConfig::default();
+    contracts_config.update_from_l1_output(&script_output);
+    accept_owner(
+        shell,
+        config,
+        contracts_config.l1.governance_addr,
+        config.get_wallets()?.governor_private_key(),
+        contracts_config.ecosystem_contracts.bridgehub_proxy_addr,
+        &forge_args,
+        l1_rpc_url.clone(),
+    )
+    .await?;
+
+    accept_owner(
+        shell,
+        config,
+        contracts_config.l1.governance_addr,
+        config.get_wallets()?.governor_private_key(),
+        contracts_config.bridges.shared.l1_address,
+        &forge_args,
+        l1_rpc_url.clone(),
+    )
+    .await?;
+    Ok(contracts_config)
+}
+
+fn install_yarn_dependencies(shell: &Shell, link_to_code: &Path) -> anyhow::Result<()> {
+    let _dir_guard = shell.push_dir(link_to_code);
+    Ok(Cmd::new(cmd!(shell, "yarn install")).run()?)
+}
+
+fn build_system_contracts(shell: &Shell, link_to_code: &Path) -> anyhow::Result<()> {
+    let _dir_guard = shell.push_dir(link_to_code.join("contracts"));
+    Ok(Cmd::new(cmd!(shell, "yarn sc build")).run()?)
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/mod.rs
new file mode 100644
index 000000000000..e4074ed3070b
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/mod.rs
@@ -0,0 +1,33 @@
+use clap::Subcommand;
+use xshell::Shell;
+
+use crate::commands::ecosystem::args::{
+    change_default::ChangeDefaultChain, create::EcosystemCreateArgs, init::EcosystemInitArgs,
+};
+
+mod args;
+mod change_default;
+mod create;
+pub mod create_configs;
+pub(crate) mod init;
+
+#[derive(Subcommand, Debug)]
+#[allow(clippy::large_enum_variant)]
+pub enum EcosystemCommands {
+    /// Create a new ecosystem and chain,
+    /// setting necessary configurations for later initialization
+    Create(EcosystemCreateArgs),
+    /// Initialize ecosystem and chain,
+    /// deploying necessary contracts and performing on-chain operations
+    Init(EcosystemInitArgs),
+    /// Change the default chain
+    ChangeDefaultChain(ChangeDefaultChain),
+}
+
+pub(crate) async fn run(shell: &Shell, args: EcosystemCommands) -> anyhow::Result<()> {
+    match args {
+        EcosystemCommands::Create(args) => create::run(args, shell),
+        EcosystemCommands::Init(args) => init::run(args, shell).await,
+        EcosystemCommands::ChangeDefaultChain(args) => change_default::run(args, shell),
+    }
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/args/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/args/mod.rs
new file mode 100644
index 000000000000..ebc7855c2b58
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/args/mod.rs
@@ -0,0 +1,2 @@
+pub mod prepare_configs;
+pub mod run;
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/args/prepare_configs.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/args/prepare_configs.rs
new file mode 100644
index 000000000000..3f91380b7bdf
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/args/prepare_configs.rs
@@ -0,0 +1,69 @@
+use clap::Parser;
+use common::{db::DatabaseConfig, Prompt};
+use config::ChainConfig;
+use serde::{Deserialize, Serialize};
+use slugify_rs::slugify;
+use url::Url;
+
+use crate::{
+    defaults::{generate_external_node_db_name, DATABASE_SERVER_URL, LOCAL_RPC_URL},
+    messages::{
+        msg_external_node_db_name_prompt, msg_external_node_db_url_prompt, MSG_L1_RPC_URL_PROMPT,
+        MSG_USE_DEFAULT_DATABASES_HELP,
+    },
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser, Default)]
+pub struct PrepareConfigArgs {
+    #[clap(long)]
+    pub db_url: Option<Url>,
+    #[clap(long)]
+    pub db_name: Option<String>,
+    #[clap(long)]
+    pub l1_rpc_url: Option<String>,
+    #[clap(long, short, help = MSG_USE_DEFAULT_DATABASES_HELP)]
+    pub use_default: bool,
+}
+
+impl PrepareConfigArgs {
+    pub fn fill_values_with_prompt(self, config: &ChainConfig) -> PrepareConfigFinal {
+        let db_name = generate_external_node_db_name(config);
+        let chain_name = config.name.clone();
+        if self.use_default {
+            PrepareConfigFinal {
+                db: DatabaseConfig::new(DATABASE_SERVER_URL.clone(), db_name),
+                l1_rpc_url: LOCAL_RPC_URL.to_string(),
+            }
+        } else {
+            let db_url = self.db_url.unwrap_or_else(|| {
+                Prompt::new(&msg_external_node_db_url_prompt(&chain_name))
+                    .default(DATABASE_SERVER_URL.as_str())
+                    .ask()
+            });
+            let db_name = slugify!(
+                &self.db_name.unwrap_or_else(|| {
+                    Prompt::new(&msg_external_node_db_name_prompt(&chain_name))
+                        .default(&db_name)
+                        .ask()
+                }),
+                separator = "_"
+            );
+            let l1_rpc_url = self.l1_rpc_url.unwrap_or_else(|| {
+                Prompt::new(MSG_L1_RPC_URL_PROMPT)
+                    .default(LOCAL_RPC_URL)
+                    .ask()
+            });
+
+            PrepareConfigFinal {
+                db: DatabaseConfig::new(db_url, db_name),
+                l1_rpc_url,
+            }
+        }
+    }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PrepareConfigFinal {
+    pub db: DatabaseConfig,
+    pub l1_rpc_url: String,
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/args/run.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/args/run.rs
new file mode 100644
index 000000000000..1bc0c06728d7
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/args/run.rs
@@ -0,0 +1,15 @@
+use clap::Parser;
+use serde::{Deserialize, Serialize};
+
+use crate::messages::{MSG_SERVER_ADDITIONAL_ARGS_HELP, MSG_SERVER_COMPONENTS_HELP};
+
+#[derive(Debug, Serialize, Deserialize, Parser)]
+pub struct RunExternalNodeArgs {
+    #[clap(long)]
+    pub reinit: bool,
+    #[clap(long, help = MSG_SERVER_COMPONENTS_HELP)]
+    pub components: Option<Vec<String>>,
+    #[clap(long, short)]
+    #[arg(trailing_var_arg = true, allow_hyphen_values = true, hide = false, help = MSG_SERVER_ADDITIONAL_ARGS_HELP)]
+    pub additional_args: Vec<String>,
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/init.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/init.rs
new file mode 100644
index 000000000000..c6101e88739c
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/init.rs
@@ -0,0 +1,53 @@
+use anyhow::Context;
+use common::{
+    config::global_config,
+    db::{drop_db_if_exists, init_db, migrate_db, DatabaseConfig},
+    spinner::Spinner,
+};
+use config::{traits::ReadConfigWithBasePath, ChainConfig, EcosystemConfig, SecretsConfig};
+use xshell::Shell;
+
+use crate::{
+    consts::SERVER_MIGRATIONS,
+    messages::{
+        MSG_CHAIN_NOT_INITIALIZED, MSG_EXTERNAL_NODE_CONFIG_NOT_INITIALIZED,
+        MSG_FAILED_TO_DROP_SERVER_DATABASE_ERR, MSG_INITIALIZING_DATABASES_SPINNER,
+    },
+    utils::rocks_db::{recreate_rocksdb_dirs, RocksDBDirOption},
+};
+
+pub async fn run(shell: &Shell) -> anyhow::Result<()> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    let chain = global_config().chain_name.clone();
+    let chain_config = ecosystem_config
+        .load_chain(chain)
+        .context(MSG_CHAIN_NOT_INITIALIZED)?;
+
+    init(shell, &chain_config).await
+}
+
+pub async fn init(shell: &Shell, chain_config: &ChainConfig) -> anyhow::Result<()> {
+    let spin = Spinner::new(MSG_INITIALIZING_DATABASES_SPINNER);
+    let secrets = SecretsConfig::read_with_base_path(
+        shell,
+        chain_config
+            .external_node_config_path
+            .clone()
+            .context(MSG_EXTERNAL_NODE_CONFIG_NOT_INITIALIZED)?,
+    )?;
+    let db_config = DatabaseConfig::from_url(secrets.database.server_url)?;
+    drop_db_if_exists(&db_config)
+        .await
+        .context(MSG_FAILED_TO_DROP_SERVER_DATABASE_ERR)?;
+    init_db(&db_config).await?;
+    recreate_rocksdb_dirs(
+        shell,
+        &chain_config.rocks_db_path,
+        RocksDBDirOption::ExternalNode,
+    )?;
+    let path_to_server_migration = chain_config.link_to_code.join(SERVER_MIGRATIONS);
+    migrate_db(shell, path_to_server_migration, &db_config.full_url()).await?;
+    spin.finish();
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/mod.rs
new file mode 100644
index 000000000000..06e422de08b8
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/mod.rs
@@ -0,0 +1,24 @@
+use args::{prepare_configs::PrepareConfigArgs, run::RunExternalNodeArgs};
+use clap::Parser;
+use serde::{Deserialize, Serialize};
+use xshell::Shell;
+
+mod args;
+mod init;
+mod prepare_configs;
+mod run;
+
+#[derive(Debug, Serialize, Deserialize, Parser)]
+pub enum ExternalNodeCommands {
+    Configs(PrepareConfigArgs),
+    Init,
+    Run(RunExternalNodeArgs),
+}
+
+pub async fn run(shell: &Shell, commands: ExternalNodeCommands) -> anyhow::Result<()> {
+    match commands {
+        ExternalNodeCommands::Configs(args) => prepare_configs::run(shell, args),
+        ExternalNodeCommands::Init => init::run(shell).await,
+        ExternalNodeCommands::Run(args) => run::run(shell, args).await,
+    }
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/prepare_configs.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/prepare_configs.rs
new file mode 100644
index 000000000000..09e9d1b460c4
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/prepare_configs.rs
@@ -0,0 +1,79 @@
+use std::path::Path;
+
+use anyhow::Context;
+use common::{config::global_config, logger};
+use config::{
+    external_node::ENConfig, traits::SaveConfigWithBasePath, ChainConfig, DatabaseSecrets,
+    EcosystemConfig, L1Secret, SecretsConfig,
+};
+use xshell::Shell;
+
+use crate::{
+    commands::external_node::args::prepare_configs::{PrepareConfigArgs, PrepareConfigFinal},
+    messages::{
+        msg_preparing_en_config_is_done, MSG_CHAIN_NOT_INITIALIZED, MSG_PREPARING_EN_CONFIGS,
+    },
+    utils::rocks_db::{recreate_rocksdb_dirs, RocksDBDirOption},
+};
+
+pub fn run(shell: &Shell, args: PrepareConfigArgs) -> anyhow::Result<()> {
+    logger::info(MSG_PREPARING_EN_CONFIGS);
+    let chain_name = global_config().chain_name.clone();
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    let mut chain_config = ecosystem_config
+        .load_chain(chain_name)
+        .context(MSG_CHAIN_NOT_INITIALIZED)?;
+
+    let args = args.fill_values_with_prompt(&chain_config);
+    let external_node_config_path = chain_config
+        .external_node_config_path
+        .unwrap_or_else(|| chain_config.configs.join("external_node"));
+    shell.create_dir(&external_node_config_path)?;
+    chain_config.external_node_config_path = Some(external_node_config_path.clone());
+    prepare_configs(shell, &chain_config, &external_node_config_path, args)?;
+    let chain_path = ecosystem_config.chains.join(&chain_config.name);
+    chain_config.save_with_base_path(shell, chain_path)?;
+    logger::info(msg_preparing_en_config_is_done(&external_node_config_path));
+    Ok(())
+}
+
+fn prepare_configs(
+    shell: &Shell,
+    config: &ChainConfig,
+    en_configs_path: &Path,
+    args: PrepareConfigFinal,
+) -> anyhow::Result<()> {
+    let genesis = config.get_genesis_config()?;
+    let general = config.get_general_config()?;
+    let en_config = ENConfig {
+        l2_chain_id: genesis.l2_chain_id,
+        l1_chain_id: genesis.l1_chain_id,
+        l1_batch_commit_data_generator_mode: genesis
+            .l1_batch_commit_data_generator_mode
+            .unwrap_or_default(),
+        main_node_url: general.api.web3_json_rpc.http_url.clone(),
+        main_node_rate_limit_rps: None,
+    };
+    let mut general_en = general.clone();
+    general_en.update_ports(&general.ports_config().next_empty_ports_config())?;
+    let secrets = SecretsConfig {
+        database: DatabaseSecrets {
+            server_url: args.db.full_url(),
+            prover_url: None,
+            other: Default::default(),
+        },
+        l1: L1Secret {
+            l1_rpc_url: args.l1_rpc_url.clone(),
+            other: Default::default(),
+        },
+        other: Default::default(),
+    };
+    secrets.save_with_base_path(shell, en_configs_path)?;
+    let dirs = recreate_rocksdb_dirs(shell, &config.rocks_db_path, RocksDBDirOption::ExternalNode)?;
+    general_en.set_rocks_db_config(dirs)?;
+
+    general_en.save_with_base_path(shell, en_configs_path)?;
+    en_config.save_with_base_path(shell, en_configs_path)?;
+
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/external_node/run.rs b/zk_toolbox/crates/zk_inception/src/commands/external_node/run.rs
new file mode 100644
index 000000000000..9d3da4663859
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/external_node/run.rs
@@ -0,0 +1,37 @@
+use anyhow::Context;
+use common::{config::global_config, logger};
+use config::{ChainConfig, EcosystemConfig};
+use xshell::Shell;
+
+use crate::{
+    commands::external_node::{args::run::RunExternalNodeArgs, init},
+    external_node::RunExternalNode,
+    messages::{MSG_CHAIN_NOT_INITIALIZED, MSG_STARTING_EN},
+};
+
+pub async fn run(shell: &Shell, args: RunExternalNodeArgs) -> anyhow::Result<()> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    let chain = global_config().chain_name.clone();
+    let chain_config = ecosystem_config
+        .load_chain(chain)
+        .context(MSG_CHAIN_NOT_INITIALIZED)?;
+
+    logger::info(MSG_STARTING_EN);
+
+    run_external_node(args, &chain_config, shell).await?;
+
+    Ok(())
+}
+
+async fn run_external_node(
+    args: RunExternalNodeArgs,
+    chain_config: &ChainConfig,
+    shell: &Shell,
+) -> anyhow::Result<()> {
+    if args.reinit {
+        init::init(shell, chain_config).await?
+    }
+    let server = RunExternalNode::new(args.components.clone(), chain_config)?;
+    server.run(shell, args.additional_args.clone())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/mod.rs
new file mode 100644
index 000000000000..db34e1d8647d
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/mod.rs
@@ -0,0 +1,7 @@
+pub mod args;
+pub mod chain;
+pub mod containers;
+pub mod ecosystem;
+pub mod external_node;
+pub mod prover;
+pub mod server;
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/args/init.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/args/init.rs
new file mode 100644
index 000000000000..dc320305152f
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/args/init.rs
@@ -0,0 +1,397 @@
+use clap::{Parser, ValueEnum};
+use common::{logger, Prompt, PromptConfirm, PromptSelect};
+use serde::{Deserialize, Serialize};
+use strum::IntoEnumIterator;
+use strum_macros::EnumIter;
+use xshell::Shell;
+
+use crate::{
+    commands::prover::gcs::get_project_ids,
+    consts::{DEFAULT_CREDENTIALS_FILE, DEFAULT_PROOF_STORE_DIR},
+    messages::{
+        MSG_CREATE_GCS_BUCKET_LOCATION_PROMPT, MSG_CREATE_GCS_BUCKET_NAME_PROMTP,
+        MSG_CREATE_GCS_BUCKET_PROJECT_ID_NO_PROJECTS_PROMPT,
+        MSG_CREATE_GCS_BUCKET_PROJECT_ID_PROMPT, MSG_CREATE_GCS_BUCKET_PROMPT,
+        MSG_DOWNLOAD_SETUP_KEY_PROMPT, MSG_GETTING_PROOF_STORE_CONFIG,
+        MSG_GETTING_PUBLIC_STORE_CONFIG, MSG_PROOF_STORE_CONFIG_PROMPT, MSG_PROOF_STORE_DIR_PROMPT,
+        MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_ERR, MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_PROMPT,
+        MSG_PROOF_STORE_GCS_CREDENTIALS_FILE_PROMPT, MSG_SAVE_TO_PUBLIC_BUCKET_PROMPT,
+        MSG_SETUP_KEY_PATH_PROMPT,
+    },
+};
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser, Default)]
+pub struct ProverInitArgs {
+    // Proof store object
+    #[clap(long)]
+    pub proof_store_dir: Option<String>,
+    #[clap(flatten)]
+    #[serde(flatten)]
+    pub proof_store_gcs_config: ProofStorageGCSTmp,
+    #[clap(flatten)]
+    #[serde(flatten)]
+    pub create_gcs_bucket_config: ProofStorageGCSCreateBucketTmp,
+
+    // Public store object
+    #[clap(long)]
+    pub shall_save_to_public_bucket: Option<bool>,
+    #[clap(long)]
+    pub public_store_dir: Option<String>,
+    #[clap(flatten)]
+    #[serde(flatten)]
+    pub public_store_gcs_config: PublicStorageGCSTmp,
+    #[clap(flatten)]
+    #[serde(flatten)]
+    pub public_create_gcs_bucket_config: PublicStorageGCSCreateBucketTmp,
+
+    #[clap(flatten)]
+    #[serde(flatten)]
+    pub setup_key_config: SetupKeyConfigTmp,
+}
+
+#[derive(Debug, Clone, ValueEnum, EnumIter, strum_macros::Display, PartialEq, Eq)]
+#[allow(clippy::upper_case_acronyms)]
+enum ProofStoreConfig {
+    Local,
+    GCS,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, Parser, Default)]
+pub struct ProofStorageGCSTmp {
+    #[clap(long)]
+    pub bucket_base_url: Option<String>,
+    #[clap(long)]
+    pub credentials_file: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser, Default)]
+pub struct ProofStorageGCSCreateBucketTmp {
+    #[clap(long)]
+    pub bucket_name: Option<String>,
+    #[clap(long)]
+    pub location: Option<String>,
+    #[clap(long)]
+    pub project_id: Option<String>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, Parser, Default)]
+pub struct PublicStorageGCSTmp {
+    #[clap(long)]
+    pub public_bucket_base_url: Option<String>,
+    #[clap(long)]
+    pub public_credentials_file: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Parser, Default)]
+pub struct PublicStorageGCSCreateBucketTmp {
+    #[clap(long)]
+    pub public_bucket_name: Option<String>,
+    #[clap(long)]
+    pub public_location: Option<String>,
+    #[clap(long)]
+    pub public_project_id: Option<String>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, Parser, Default)]
+pub struct SetupKeyConfigTmp {
+    #[clap(long)]
+    pub download_key: Option<bool>,
+    #[clap(long)]
+    pub setup_key_path: Option<String>,
+}
+
+#[derive(Debug, Clone)]
+pub struct ProofStorageFileBacked {
+    pub proof_store_dir: String,
+}
+
+#[derive(Debug, Clone)]
+pub struct ProofStorageGCS {
+    pub bucket_base_url: String,
+    pub credentials_file: String,
+}
+
+#[derive(Debug, Clone)]
+pub struct ProofStorageGCSCreateBucket {
+    pub bucket_name: String,
+    pub location: String,
+    pub project_id: String,
+    pub credentials_file: String,
+}
+
+#[derive(Debug, Clone)]
+#[allow(clippy::upper_case_acronyms)]
+pub enum ProofStorageConfig {
+    FileBacked(ProofStorageFileBacked),
+    GCS(ProofStorageGCS),
+    GCSCreateBucket(ProofStorageGCSCreateBucket),
+}
+
+#[derive(Debug, Clone)]
+pub struct SetupKeyConfig {
+    pub download_key: bool,
+    pub setup_key_path: String,
+}
+
+#[derive(Debug, Clone)]
+pub struct ProverInitArgsFinal {
+    pub proof_store: ProofStorageConfig,
+    pub public_store: Option<ProofStorageConfig>,
+    pub setup_key_config: SetupKeyConfig,
+}
+
+impl ProverInitArgs {
+    pub(crate) fn fill_values_with_prompt(
+        &self,
+        shell: &Shell,
+        setup_key_path: &str,
+    ) -> anyhow::Result<ProverInitArgsFinal> {
+        let proof_store = self.fill_proof_storage_values_with_prompt(shell)?;
+        let public_store = self.fill_public_storage_values_with_prompt(shell)?;
+        let setup_key_config = self.fill_setup_key_values_with_prompt(setup_key_path);
+        Ok(ProverInitArgsFinal {
+            proof_store,
+            public_store,
+            setup_key_config,
+        })
+    }
+
+    fn fill_proof_storage_values_with_prompt(
+        &self,
+        shell: &Shell,
+    ) -> anyhow::Result<ProofStorageConfig> {
+        logger::info(MSG_GETTING_PROOF_STORE_CONFIG);
+
+        if self.proof_store_dir.is_some() {
+            return Ok(self.handle_file_backed_config(self.proof_store_dir.clone()));
+        }
+
+        if self.partial_gcs_config_provided(
+            self.proof_store_gcs_config.bucket_base_url.clone(),
+            self.proof_store_gcs_config.credentials_file.clone(),
+        ) {
+            return Ok(self.ask_gcs_config(
+                self.proof_store_gcs_config.bucket_base_url.clone(),
+                self.proof_store_gcs_config.credentials_file.clone(),
+            ));
+        }
+
+        if self.partial_create_gcs_bucket_config_provided(
+            self.create_gcs_bucket_config.bucket_name.clone(),
+            self.create_gcs_bucket_config.location.clone(),
+            self.create_gcs_bucket_config.project_id.clone(),
+        ) {
+            let project_ids = get_project_ids(shell)?;
+            return Ok(self.handle_create_gcs_bucket(
+                project_ids,
+                self.create_gcs_bucket_config.project_id.clone(),
+                self.create_gcs_bucket_config.bucket_name.clone(),
+                self.create_gcs_bucket_config.location.clone(),
+                self.proof_store_gcs_config.credentials_file.clone(),
+            ));
+        }
+
+        match PromptSelect::new(MSG_PROOF_STORE_CONFIG_PROMPT, ProofStoreConfig::iter()).ask() {
+            ProofStoreConfig::Local => {
+                Ok(self.handle_file_backed_config(self.proof_store_dir.clone()))
+            }
+            ProofStoreConfig::GCS => {
+                let project_ids = get_project_ids(shell)?;
+                Ok(self.handle_gcs_config(
+                    project_ids,
+                    self.proof_store_gcs_config.bucket_base_url.clone(),
+                    self.proof_store_gcs_config.credentials_file.clone(),
+                ))
+            }
+        }
+    }
+
+    fn fill_public_storage_values_with_prompt(
+        &self,
+        shell: &Shell,
+    ) -> anyhow::Result<Option<ProofStorageConfig>> {
+        logger::info(MSG_GETTING_PUBLIC_STORE_CONFIG);
+        let shall_save_to_public_bucket = self
+            .shall_save_to_public_bucket
+            .unwrap_or_else(|| PromptConfirm::new(MSG_SAVE_TO_PUBLIC_BUCKET_PROMPT).ask());
+
+        if !shall_save_to_public_bucket {
+            return Ok(None);
+        }
+
+        if self.public_store_dir.is_some() {
+            return Ok(Some(
+                self.handle_file_backed_config(self.public_store_dir.clone()),
+            ));
+        }
+
+        if self.partial_gcs_config_provided(
+            self.public_store_gcs_config.public_bucket_base_url.clone(),
+            self.public_store_gcs_config.public_credentials_file.clone(),
+        ) {
+            return Ok(Some(self.ask_gcs_config(
+                self.public_store_gcs_config.public_bucket_base_url.clone(),
+                self.public_store_gcs_config.public_credentials_file.clone(),
+            )));
+        }
+
+        if self.partial_create_gcs_bucket_config_provided(
+            self.public_create_gcs_bucket_config
+                .public_bucket_name
+                .clone(),
+            self.public_create_gcs_bucket_config.public_location.clone(),
+            self.public_create_gcs_bucket_config
+                .public_project_id
+                .clone(),
+        ) {
+            let project_ids = get_project_ids(shell)?;
+            return Ok(Some(
+                self.handle_create_gcs_bucket(
+                    project_ids,
+                    self.public_create_gcs_bucket_config
+                        .public_project_id
+                        .clone(),
+                    self.public_create_gcs_bucket_config
+                        .public_bucket_name
+                        .clone(),
+                    self.public_create_gcs_bucket_config.public_location.clone(),
+                    self.public_store_gcs_config.public_credentials_file.clone(),
+                ),
+            ));
+        }
+
+        match PromptSelect::new(MSG_PROOF_STORE_CONFIG_PROMPT, ProofStoreConfig::iter()).ask() {
+            ProofStoreConfig::Local => Ok(Some(
+                self.handle_file_backed_config(self.public_store_dir.clone()),
+            )),
+            ProofStoreConfig::GCS => {
+                let project_ids = get_project_ids(shell)?;
+                Ok(Some(self.handle_gcs_config(
+                    project_ids,
+                    self.public_store_gcs_config.public_bucket_base_url.clone(),
+                    self.public_store_gcs_config.public_credentials_file.clone(),
+                )))
+            }
+        }
+    }
+
+    fn fill_setup_key_values_with_prompt(&self, setup_key_path: &str) -> SetupKeyConfig {
+        let download_key = self
+            .clone()
+            .setup_key_config
+            .download_key
+            .unwrap_or_else(|| PromptConfirm::new(MSG_DOWNLOAD_SETUP_KEY_PROMPT).ask());
+        let setup_key_path = self
+            .clone()
+            .setup_key_config
+            .setup_key_path
+            .unwrap_or_else(|| {
+                Prompt::new(MSG_SETUP_KEY_PATH_PROMPT)
+                    .default(setup_key_path)
+                    .ask()
+            });
+
+        SetupKeyConfig {
+            download_key,
+            setup_key_path,
+        }
+    }
+
+    fn partial_create_gcs_bucket_config_provided(
+        &self,
+        bucket_name: Option<String>,
+        location: Option<String>,
+        project_id: Option<String>,
+    ) -> bool {
+        bucket_name.is_some() || location.is_some() || project_id.is_some()
+    }
+
+    fn partial_gcs_config_provided(
+        &self,
+        bucket_base_url: Option<String>,
+        credentials_file: Option<String>,
+    ) -> bool {
+        bucket_base_url.is_some() || credentials_file.is_some()
+    }
+
+    fn handle_file_backed_config(&self, store_dir: Option<String>) -> ProofStorageConfig {
+        let proof_store_dir = store_dir.unwrap_or_else(|| {
+            Prompt::new(MSG_PROOF_STORE_DIR_PROMPT)
+                .default(DEFAULT_PROOF_STORE_DIR)
+                .ask()
+        });
+
+        ProofStorageConfig::FileBacked(ProofStorageFileBacked { proof_store_dir })
+    }
+
+    fn handle_gcs_config(
+        &self,
+        project_ids: Vec<String>,
+        bucket_base_url: Option<String>,
+        credentials_file: Option<String>,
+    ) -> ProofStorageConfig {
+        if !self.partial_gcs_config_provided(bucket_base_url.clone(), credentials_file.clone())
+            && PromptConfirm::new(MSG_CREATE_GCS_BUCKET_PROMPT).ask()
+        {
+            return self.handle_create_gcs_bucket(project_ids, None, None, None, None);
+        }
+
+        self.ask_gcs_config(bucket_base_url, credentials_file)
+    }
+
+    fn handle_create_gcs_bucket(
+        &self,
+        project_ids: Vec<String>,
+        project_id: Option<String>,
+        bucket_name: Option<String>,
+        location: Option<String>,
+        credentials_file: Option<String>,
+    ) -> ProofStorageConfig {
+        let project_id = project_id.unwrap_or_else(|| {
+            if project_ids.is_empty() {
+                Prompt::new(MSG_CREATE_GCS_BUCKET_PROJECT_ID_NO_PROJECTS_PROMPT).ask()
+            } else {
+                PromptSelect::new(MSG_CREATE_GCS_BUCKET_PROJECT_ID_PROMPT, project_ids).ask()
+            }
+        });
+        let bucket_name =
+            bucket_name.unwrap_or_else(|| Prompt::new(MSG_CREATE_GCS_BUCKET_NAME_PROMTP).ask());
+        let location =
+            location.unwrap_or_else(|| Prompt::new(MSG_CREATE_GCS_BUCKET_LOCATION_PROMPT).ask());
+        let credentials_file = credentials_file.unwrap_or_else(|| {
+            Prompt::new(MSG_PROOF_STORE_GCS_CREDENTIALS_FILE_PROMPT)
+                .default(DEFAULT_CREDENTIALS_FILE)
+                .ask()
+        });
+
+        ProofStorageConfig::GCSCreateBucket(ProofStorageGCSCreateBucket {
+            bucket_name,
+            location,
+            project_id,
+            credentials_file,
+        })
+    }
+
+    fn ask_gcs_config(
+        &self,
+        bucket_base_url: Option<String>,
+        credentials_file: Option<String>,
+    ) -> ProofStorageConfig {
+        let mut bucket_base_url = bucket_base_url
+            .unwrap_or_else(|| Prompt::new(MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_PROMPT).ask());
+        while !bucket_base_url.starts_with("gs://") {
+            logger::error(MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_ERR);
+            bucket_base_url = Prompt::new(MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_PROMPT).ask();
+        }
+        let credentials_file = credentials_file.unwrap_or_else(|| {
+            Prompt::new(MSG_PROOF_STORE_GCS_CREDENTIALS_FILE_PROMPT)
+                .default(DEFAULT_CREDENTIALS_FILE)
+                .ask()
+        });
+
+        ProofStorageConfig::GCS(ProofStorageGCS {
+            bucket_base_url,
+            credentials_file,
+        })
+    }
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/args/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/args/mod.rs
new file mode 100644
index 000000000000..43763f10a418
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/args/mod.rs
@@ -0,0 +1 @@
+pub mod init;
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/gcs.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/gcs.rs
new file mode 100644
index 000000000000..0c76cb10f542
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/gcs.rs
@@ -0,0 +1,54 @@
+use common::{cmd::Cmd, logger, spinner::Spinner};
+use xshell::{cmd, Shell};
+use zksync_config::{configs::object_store::ObjectStoreMode, ObjectStoreConfig};
+
+use super::args::init::ProofStorageGCSCreateBucket;
+use crate::{
+    consts::PROVER_STORE_MAX_RETRIES,
+    messages::{
+        msg_bucket_created, MSG_CREATING_GCS_BUCKET_SPINNER, MSG_GETTING_GCP_PROJECTS_SPINNER,
+    },
+};
+
+pub(crate) fn create_gcs_bucket(
+    shell: &Shell,
+    config: ProofStorageGCSCreateBucket,
+) -> anyhow::Result<ObjectStoreConfig> {
+    let bucket_name = config.bucket_name;
+    let location = config.location;
+    let project_id = config.project_id;
+    let cmd = Cmd::new(cmd!(
+        shell,
+        "gcloud storage buckets create gs://{bucket_name} --location={location} --project={project_id}"
+    ));
+    let spinner = Spinner::new(MSG_CREATING_GCS_BUCKET_SPINNER);
+    cmd.run()?;
+    spinner.finish();
+
+    logger::info(msg_bucket_created(&bucket_name));
+
+    Ok(ObjectStoreConfig {
+        mode: ObjectStoreMode::GCSWithCredentialFile {
+            bucket_base_url: format!("gs://{}", bucket_name),
+            gcs_credential_file_path: config.credentials_file,
+        },
+        max_retries: PROVER_STORE_MAX_RETRIES,
+        local_mirror_path: None,
+    })
+}
+
+pub(crate) fn get_project_ids(shell: &Shell) -> anyhow::Result<Vec<String>> {
+    let spinner = Spinner::new(MSG_GETTING_GCP_PROJECTS_SPINNER);
+
+    let mut cmd = Cmd::new(cmd!(
+        shell,
+        "gcloud projects list --format='value(projectId)'"
+    ));
+    let output = cmd.run_with_output()?;
+    let project_ids: Vec<String> = String::from_utf8(output.stdout)?
+        .lines()
+        .map(|line| line.to_string())
+        .collect();
+    spinner.finish();
+    Ok(project_ids)
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/generate_sk.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/generate_sk.rs
new file mode 100644
index 000000000000..7a92f193f9b8
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/generate_sk.rs
@@ -0,0 +1,27 @@
+use anyhow::Ok;
+use common::{cmd::Cmd, logger, spinner::Spinner};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use super::utils::get_link_to_prover;
+use crate::messages::{MSG_GENERATING_SK_SPINNER, MSG_SK_GENERATED};
+
+pub(crate) async fn run(shell: &Shell) -> anyhow::Result<()> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    let link_to_prover = get_link_to_prover(&ecosystem_config);
+    shell.change_dir(&link_to_prover);
+
+    let spinner = Spinner::new(MSG_GENERATING_SK_SPINNER);
+    let cmd = Cmd::new(cmd!(
+        shell,
+        "cargo run --features gpu --release --bin key_generator -- 
+            generate-sk all --recompute-if-missing 
+            --setup-path=vk_setup_data_generator_server_fri/data 
+            --path={link_to_prover}/vk_setup_data_generator_server_fri/data"
+    ));
+    cmd.run()?;
+    spinner.finish();
+    logger::outro(MSG_SK_GENERATED);
+
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/init.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/init.rs
new file mode 100644
index 000000000000..47e4eb5f01bc
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/init.rs
@@ -0,0 +1,137 @@
+use common::{check_prover_prequisites, cmd::Cmd, logger, spinner::Spinner};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+use zksync_config::{
+    configs::{object_store::ObjectStoreMode, GeneralConfig},
+    ObjectStoreConfig,
+};
+
+use super::{
+    args::init::{ProofStorageConfig, ProverInitArgs},
+    gcs::create_gcs_bucket,
+    utils::get_link_to_prover,
+};
+use crate::{
+    consts::PROVER_STORE_MAX_RETRIES,
+    messages::{
+        MSG_CHAIN_NOT_FOUND_ERR, MSG_DOWNLOADING_SETUP_KEY_SPINNER,
+        MSG_GENERAL_CONFIG_NOT_FOUND_ERR, MSG_PROOF_COMPRESSOR_CONFIG_NOT_FOUND_ERR,
+        MSG_PROVER_CONFIG_NOT_FOUND_ERR, MSG_PROVER_INITIALIZED,
+    },
+};
+
+pub(crate) async fn run(args: ProverInitArgs, shell: &Shell) -> anyhow::Result<()> {
+    check_prover_prequisites(shell);
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    let chain_config = ecosystem_config
+        .load_chain(Some(ecosystem_config.default_chain.clone()))
+        .expect(MSG_CHAIN_NOT_FOUND_ERR);
+    let mut general_config = chain_config
+        .get_zksync_general_config()
+        .expect(MSG_GENERAL_CONFIG_NOT_FOUND_ERR);
+
+    let setup_key_path = get_setup_key_path(&general_config, &ecosystem_config)?;
+
+    let args = args.fill_values_with_prompt(shell, &setup_key_path)?;
+
+    let proof_object_store_config = get_object_store_config(shell, Some(args.proof_store))?;
+    let public_object_store_config = get_object_store_config(shell, args.public_store)?;
+
+    if args.setup_key_config.download_key {
+        download_setup_key(
+            shell,
+            &general_config,
+            &args.setup_key_config.setup_key_path,
+        )?;
+    }
+
+    let mut prover_config = general_config
+        .prover_config
+        .expect(MSG_PROVER_CONFIG_NOT_FOUND_ERR);
+    prover_config
+        .prover_object_store
+        .clone_from(&proof_object_store_config);
+    if let Some(public_object_store_config) = public_object_store_config {
+        prover_config.shall_save_to_public_bucket = true;
+        prover_config.public_object_store = Some(public_object_store_config);
+    } else {
+        prover_config.shall_save_to_public_bucket = false;
+    }
+    general_config.prover_config = Some(prover_config);
+
+    let mut proof_compressor_config = general_config
+        .proof_compressor_config
+        .expect(MSG_PROOF_COMPRESSOR_CONFIG_NOT_FOUND_ERR);
+    proof_compressor_config.universal_setup_path = args.setup_key_config.setup_key_path;
+    general_config.proof_compressor_config = Some(proof_compressor_config);
+
+    chain_config.save_zksync_general_config(&general_config)?;
+
+    logger::outro(MSG_PROVER_INITIALIZED);
+    Ok(())
+}
+
+fn download_setup_key(
+    shell: &Shell,
+    general_config: &GeneralConfig,
+    path: &str,
+) -> anyhow::Result<()> {
+    let spinner = Spinner::new(MSG_DOWNLOADING_SETUP_KEY_SPINNER);
+    let compressor_config: zksync_config::configs::FriProofCompressorConfig = general_config
+        .proof_compressor_config
+        .as_ref()
+        .expect(MSG_PROOF_COMPRESSOR_CONFIG_NOT_FOUND_ERR)
+        .clone();
+    let url = compressor_config.universal_setup_download_url;
+
+    let cmd = Cmd::new(cmd!(shell, "wget {url} -P {path}"));
+    cmd.run()?;
+    spinner.finish();
+    Ok(())
+}
+
+fn get_setup_key_path(
+    general_config: &GeneralConfig,
+    ecosystem_config: &EcosystemConfig,
+) -> anyhow::Result<String> {
+    let setup_key_path = general_config
+        .proof_compressor_config
+        .as_ref()
+        .expect(MSG_PROOF_COMPRESSOR_CONFIG_NOT_FOUND_ERR)
+        .universal_setup_path
+        .clone();
+    let link_to_prover = get_link_to_prover(ecosystem_config);
+    let path = link_to_prover.join(setup_key_path);
+    let string = path.to_str().unwrap();
+
+    Ok(String::from(string))
+}
+
+fn get_object_store_config(
+    shell: &Shell,
+    config: Option<ProofStorageConfig>,
+) -> anyhow::Result<Option<ObjectStoreConfig>> {
+    let object_store = match config {
+        Some(ProofStorageConfig::FileBacked(config)) => Some(ObjectStoreConfig {
+            mode: ObjectStoreMode::FileBacked {
+                file_backed_base_path: config.proof_store_dir,
+            },
+            max_retries: PROVER_STORE_MAX_RETRIES,
+            local_mirror_path: None,
+        }),
+        Some(ProofStorageConfig::GCS(config)) => Some(ObjectStoreConfig {
+            mode: ObjectStoreMode::GCSWithCredentialFile {
+                bucket_base_url: config.bucket_base_url,
+                gcs_credential_file_path: config.credentials_file,
+            },
+            max_retries: PROVER_STORE_MAX_RETRIES,
+            local_mirror_path: None,
+        }),
+        Some(ProofStorageConfig::GCSCreateBucket(config)) => {
+            Some(create_gcs_bucket(shell, config)?)
+        }
+        None => None,
+    };
+
+    Ok(object_store)
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/mod.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/mod.rs
new file mode 100644
index 000000000000..797b1e321cbf
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/mod.rs
@@ -0,0 +1,24 @@
+use args::init::ProverInitArgs;
+use clap::Subcommand;
+use xshell::Shell;
+
+mod args;
+mod gcs;
+mod generate_sk;
+mod init;
+mod utils;
+
+#[derive(Subcommand, Debug)]
+pub enum ProverCommands {
+    /// Initialize prover
+    Init(Box<ProverInitArgs>),
+    /// Generate setup keys
+    GenerateSK,
+}
+
+pub(crate) async fn run(shell: &Shell, args: ProverCommands) -> anyhow::Result<()> {
+    match args {
+        ProverCommands::Init(args) => init::run(*args, shell).await,
+        ProverCommands::GenerateSK => generate_sk::run(shell).await,
+    }
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/utils.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/utils.rs
new file mode 100644
index 000000000000..4dae70863dc9
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/prover/utils.rs
@@ -0,0 +1,10 @@
+use std::path::PathBuf;
+
+use config::EcosystemConfig;
+
+pub(crate) fn get_link_to_prover(config: &EcosystemConfig) -> PathBuf {
+    let link_to_code = config.link_to_code.clone();
+    let mut link_to_prover = link_to_code.into_os_string();
+    link_to_prover.push("/prover");
+    link_to_prover.into()
+}
diff --git a/zk_toolbox/crates/zk_inception/src/commands/server.rs b/zk_toolbox/crates/zk_inception/src/commands/server.rs
new file mode 100644
index 000000000000..b5a09ed04370
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/commands/server.rs
@@ -0,0 +1,62 @@
+use anyhow::Context;
+use common::{
+    config::global_config,
+    logger,
+    server::{Server, ServerMode},
+};
+use config::{
+    traits::FileConfigWithDefaultName, ChainConfig, ContractsConfig, EcosystemConfig,
+    GeneralConfig, GenesisConfig, SecretsConfig, WalletsConfig,
+};
+use xshell::Shell;
+
+use crate::{
+    commands::args::RunServerArgs,
+    messages::{MSG_CHAIN_NOT_INITIALIZED, MSG_FAILED_TO_RUN_SERVER_ERR, MSG_STARTING_SERVER},
+};
+
+pub fn run(shell: &Shell, args: RunServerArgs) -> anyhow::Result<()> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    let chain = global_config().chain_name.clone();
+    let chain_config = ecosystem_config
+        .load_chain(chain)
+        .context(MSG_CHAIN_NOT_INITIALIZED)?;
+
+    logger::info(MSG_STARTING_SERVER);
+
+    run_server(args, &chain_config, shell)?;
+
+    Ok(())
+}
+
+fn run_server(
+    args: RunServerArgs,
+    chain_config: &ChainConfig,
+    shell: &Shell,
+) -> anyhow::Result<()> {
+    let server = Server::new(args.components.clone(), chain_config.link_to_code.clone());
+
+    if args.build {
+        server.build(shell)?;
+        return Ok(());
+    }
+
+    let mode = if args.genesis {
+        ServerMode::Genesis
+    } else {
+        ServerMode::Normal
+    };
+    server
+        .run(
+            shell,
+            mode,
+            GenesisConfig::get_path_with_base_path(&chain_config.configs),
+            WalletsConfig::get_path_with_base_path(&chain_config.configs),
+            GeneralConfig::get_path_with_base_path(&chain_config.configs),
+            SecretsConfig::get_path_with_base_path(&chain_config.configs),
+            ContractsConfig::get_path_with_base_path(&chain_config.configs),
+            vec![],
+        )
+        .context(MSG_FAILED_TO_RUN_SERVER_ERR)
+}
diff --git a/zk_toolbox/crates/zk_inception/src/config_manipulations.rs b/zk_toolbox/crates/zk_inception/src/config_manipulations.rs
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/zk_toolbox/crates/zk_inception/src/consts.rs b/zk_toolbox/crates/zk_inception/src/consts.rs
new file mode 100644
index 000000000000..1693ff1d2f41
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/consts.rs
@@ -0,0 +1,8 @@
+pub const AMOUNT_FOR_DISTRIBUTION_TO_WALLETS: u128 = 1000000000000000000000;
+
+pub const MINIMUM_BALANCE_FOR_WALLET: u128 = 5000000000000000000;
+pub const SERVER_MIGRATIONS: &str = "core/lib/dal/migrations";
+pub const PROVER_MIGRATIONS: &str = "prover/prover_dal/migrations";
+pub const PROVER_STORE_MAX_RETRIES: u16 = 10;
+pub const DEFAULT_CREDENTIALS_FILE: &str = "~/.config/gcloud/application_default_credentials.json";
+pub const DEFAULT_PROOF_STORE_DIR: &str = "artifacts";
diff --git a/zk_toolbox/crates/zk_inception/src/defaults.rs b/zk_toolbox/crates/zk_inception/src/defaults.rs
new file mode 100644
index 000000000000..40be1293614b
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/defaults.rs
@@ -0,0 +1,48 @@
+use config::ChainConfig;
+use lazy_static::lazy_static;
+use url::Url;
+
+lazy_static! {
+    pub static ref DATABASE_SERVER_URL: Url =
+        Url::parse("postgres://postgres:notsecurepassword@localhost:5432").unwrap();
+    pub static ref DATABASE_PROVER_URL: Url =
+        Url::parse("postgres://postgres:notsecurepassword@localhost:5432").unwrap();
+}
+
+pub const ROCKS_DB_STATE_KEEPER: &str = "state_keeper";
+pub const ROCKS_DB_TREE: &str = "tree";
+pub const EN_ROCKS_DB_PREFIX: &str = "en";
+pub const MAIN_ROCKS_DB_PREFIX: &str = "main";
+
+pub const L2_CHAIN_ID: u32 = 271;
+/// Path to base chain configuration inside zksync-era
+/// Local RPC url
+pub(super) const LOCAL_RPC_URL: &str = "http://localhost:8545";
+
+pub struct DBNames {
+    pub server_name: String,
+    pub prover_name: String,
+}
+
+pub fn generate_db_names(config: &ChainConfig) -> DBNames {
+    DBNames {
+        server_name: format!(
+            "zksync_server_{}_{}",
+            config.l1_network.to_string().to_ascii_lowercase(),
+            config.name
+        ),
+        prover_name: format!(
+            "zksync_prover_{}_{}",
+            config.l1_network.to_string().to_ascii_lowercase(),
+            config.name
+        ),
+    }
+}
+
+pub fn generate_external_node_db_name(config: &ChainConfig) -> String {
+    format!(
+        "external_node_{}_{}",
+        config.l1_network.to_string().to_ascii_lowercase(),
+        config.name
+    )
+}
diff --git a/zk_toolbox/crates/zk_inception/src/external_node.rs b/zk_toolbox/crates/zk_inception/src/external_node.rs
new file mode 100644
index 000000000000..0770fa8b14cd
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/external_node.rs
@@ -0,0 +1,77 @@
+use std::path::PathBuf;
+
+use anyhow::Context;
+use common::cmd::Cmd;
+use config::{
+    external_node::ENConfig, traits::FileConfigWithDefaultName, ChainConfig, GeneralConfig,
+    SecretsConfig,
+};
+use xshell::{cmd, Shell};
+
+use crate::messages::MSG_FAILED_TO_RUN_SERVER_ERR;
+
+pub struct RunExternalNode {
+    components: Option<Vec<String>>,
+    code_path: PathBuf,
+    general_config: PathBuf,
+    secrets: PathBuf,
+    en_config: PathBuf,
+}
+
+impl RunExternalNode {
+    pub fn new(
+        components: Option<Vec<String>>,
+        chain_config: &ChainConfig,
+    ) -> anyhow::Result<Self> {
+        let en_path = chain_config
+            .external_node_config_path
+            .clone()
+            .context("External node is not initialized")?;
+        let general_config = GeneralConfig::get_path_with_base_path(&en_path);
+        let secrets = SecretsConfig::get_path_with_base_path(&en_path);
+        let enconfig = ENConfig::get_path_with_base_path(&en_path);
+
+        Ok(Self {
+            components,
+            code_path: chain_config.link_to_code.clone(),
+            general_config,
+            secrets,
+            en_config: enconfig,
+        })
+    }
+
+    pub fn run(&self, shell: &Shell, mut additional_args: Vec<String>) -> anyhow::Result<()> {
+        shell.change_dir(&self.code_path);
+        let config_general_config = &self.general_config.to_str().unwrap();
+        let en_config = &self.en_config.to_str().unwrap();
+        let secrets = &self.secrets.to_str().unwrap();
+        if let Some(components) = self.components() {
+            additional_args.push(format!("--components={}", components))
+        }
+        let cmd = Cmd::new(
+            cmd!(
+                shell,
+                "cargo run --release --bin zksync_external_node --
+                --config-path {config_general_config}
+                --secrets-path {secrets}
+                --external-node-config-path {en_config}
+                "
+            )
+            .args(additional_args)
+            .env_remove("RUSTUP_TOOLCHAIN"),
+        )
+        .with_force_run();
+
+        cmd.run().context(MSG_FAILED_TO_RUN_SERVER_ERR)?;
+        Ok(())
+    }
+
+    fn components(&self) -> Option<String> {
+        self.components.as_ref().and_then(|components| {
+            if components.is_empty() {
+                return None;
+            }
+            Some(components.join(","))
+        })
+    }
+}
diff --git a/zk_toolbox/crates/zk_inception/src/main.rs b/zk_toolbox/crates/zk_inception/src/main.rs
new file mode 100644
index 000000000000..0f8ade3690a8
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/main.rs
@@ -0,0 +1,131 @@
+use clap::{command, Parser, Subcommand};
+use common::{
+    check_general_prerequisites,
+    config::{global_config, init_global_config, GlobalConfig},
+    error::log_error,
+    init_prompt_theme, logger,
+};
+use config::EcosystemConfig;
+use xshell::Shell;
+
+use crate::commands::{
+    args::RunServerArgs, chain::ChainCommands, ecosystem::EcosystemCommands,
+    external_node::ExternalNodeCommands, prover::ProverCommands,
+};
+
+pub mod accept_ownership;
+mod commands;
+mod consts;
+mod defaults;
+pub mod external_node;
+mod messages;
+mod utils;
+
+#[derive(Parser, Debug)]
+#[command(version, about)]
+struct Inception {
+    #[command(subcommand)]
+    command: InceptionSubcommands,
+    #[clap(flatten)]
+    global: InceptionGlobalArgs,
+}
+
+#[derive(Subcommand, Debug)]
+pub enum InceptionSubcommands {
+    /// Ecosystem related commands
+    #[command(subcommand)]
+    Ecosystem(EcosystemCommands),
+    /// Chain related commands
+    #[command(subcommand)]
+    Chain(ChainCommands),
+    /// Prover related commands
+    #[command(subcommand)]
+    Prover(ProverCommands),
+    /// Run server
+    Server(RunServerArgs),
+    // Run External Node
+    #[command(subcommand)]
+    ExternalNode(ExternalNodeCommands),
+    /// Run containers for local development
+    Containers,
+}
+
+#[derive(Parser, Debug)]
+#[clap(next_help_heading = "Global options")]
+struct InceptionGlobalArgs {
+    /// Verbose mode
+    #[clap(short, long, global = true)]
+    verbose: bool,
+    /// Chain to use
+    #[clap(long, global = true)]
+    chain: Option<String>,
+    /// Ignores prerequisites checks
+    #[clap(long, global = true)]
+    ignore_prerequisites: bool,
+}
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    human_panic::setup_panic!();
+
+    init_prompt_theme();
+
+    logger::new_empty_line();
+    logger::intro();
+
+    let shell = Shell::new().unwrap();
+    let inception_args = Inception::parse();
+
+    init_global_config_inner(&shell, &inception_args.global)?;
+
+    if !global_config().ignore_prerequisites {
+        check_general_prerequisites(&shell);
+    }
+
+    match run_subcommand(inception_args, &shell).await {
+        Ok(_) => {}
+        Err(error) => {
+            log_error(error);
+            std::process::exit(1);
+        }
+    }
+    Ok(())
+}
+
+async fn run_subcommand(inception_args: Inception, shell: &Shell) -> anyhow::Result<()> {
+    match inception_args.command {
+        InceptionSubcommands::Ecosystem(args) => commands::ecosystem::run(shell, args).await?,
+        InceptionSubcommands::Chain(args) => commands::chain::run(shell, args).await?,
+        InceptionSubcommands::Prover(args) => commands::prover::run(shell, args).await?,
+        InceptionSubcommands::Server(args) => commands::server::run(shell, args)?,
+        InceptionSubcommands::Containers => commands::containers::run(shell)?,
+        InceptionSubcommands::ExternalNode(args) => {
+            commands::external_node::run(shell, args).await?
+        }
+    }
+    Ok(())
+}
+
+fn init_global_config_inner(
+    shell: &Shell,
+    inception_args: &InceptionGlobalArgs,
+) -> anyhow::Result<()> {
+    if let Some(name) = &inception_args.chain {
+        if let Ok(config) = EcosystemConfig::from_file(shell) {
+            let chains = config.list_of_chains();
+            if !chains.contains(name) {
+                anyhow::bail!(
+                    "Chain with name {} doesnt exist, please choose one of {:?}",
+                    name,
+                    &chains
+                );
+            }
+        }
+    }
+    init_global_config(GlobalConfig {
+        verbose: inception_args.verbose,
+        chain_name: inception_args.chain.clone(),
+        ignore_prerequisites: inception_args.ignore_prerequisites,
+    });
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/messages.rs b/zk_toolbox/crates/zk_inception/src/messages.rs
new file mode 100644
index 000000000000..32ab24a3f730
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/messages.rs
@@ -0,0 +1,250 @@
+use std::path::Path;
+
+use ethers::{
+    types::{H160, U256},
+    utils::format_ether,
+};
+
+/// Common messages
+pub(super) const MSG_SELECTED_CONFIG: &str = "Selected config";
+pub(super) const MSG_CHAIN_NOT_INITIALIZED: &str =
+    "Chain not initialized. Please create a chain first";
+
+/// Ecosystem create related messages
+pub(super) const MSG_L1_NETWORK_HELP: &str = "L1 Network";
+pub(super) const MSG_LINK_TO_CODE_HELP: &str = "Code link";
+pub(super) const MSG_START_CONTAINERS_HELP: &str =
+    "Start reth and postgres containers after creation";
+pub(super) const MSG_ECOSYSTEM_NAME_PROMPT: &str = "What do you want to name the ecosystem?";
+pub(super) const MSG_REPOSITORY_ORIGIN_PROMPT: &str = "Select the origin of zksync-era repository";
+pub(super) const MSG_LINK_TO_CODE_PROMPT: &str = "Where's the code located?";
+pub(super) const MSG_L1_NETWORK_PROMPT: &str = "Select the L1 network";
+pub(super) const MSG_START_CONTAINERS_PROMPT: &str =
+    "Do you want to start containers after creating the ecosystem?";
+pub(super) const MSG_CREATING_ECOSYSTEM: &str = "Creating ecosystem";
+pub(super) const MSG_CREATED_ECOSYSTEM: &str = "Ecosystem created successfully";
+pub(super) const MSG_CLONING_ERA_REPO_SPINNER: &str = "Cloning zksync-era repository...";
+pub(super) const MSG_CREATING_INITIAL_CONFIGURATIONS_SPINNER: &str =
+    "Creating initial configurations...";
+pub(super) const MSG_CREATING_DEFAULT_CHAIN_SPINNER: &str = "Creating default chain...";
+pub(super) const MSG_STARTING_CONTAINERS_SPINNER: &str = "Starting containers...";
+pub(super) const MSG_ECOSYSTEM_ALREADY_EXISTS_ERR: &str = "Ecosystem already exists";
+pub(super) const MSG_ECOSYSTEM_CONFIG_INVALID_ERR: &str = "Invalid ecosystem configuration";
+pub(super) const MSG_LINK_TO_CODE_SELECTION_CLONE: &str = "Clone for me (recommended)";
+pub(super) const MSG_LINK_TO_CODE_SELECTION_PATH: &str = "I have the code already";
+
+/// Ecosystem and chain init related messages
+pub(super) const MSG_L1_RPC_URL_HELP: &str = "L1 RPC URL";
+pub(super) const MSG_GENESIS_ARGS_HELP: &str = "Genesis options";
+pub(super) const MSG_DEV_ARG_HELP: &str =
+    "Deploy ecosystem  using all defaults. Suitable for local development";
+pub(super) const MSG_DEPLOY_ECOSYSTEM_PROMPT: &str =
+    "Do you want to deploy ecosystem contracts? (Not needed if you already have an existing one)";
+pub(super) const MSG_L1_RPC_URL_PROMPT: &str = "What is the RPC URL of the L1 network?";
+pub(super) const MSG_DEPLOY_PAYMASTER_PROMPT: &str = "Do you want to deploy Paymaster contract?";
+pub(super) const MSG_DEPLOY_ERC20_PROMPT: &str = "Do you want to deploy some test ERC20s?";
+pub(super) const MSG_ECOSYSTEM_CONTRACTS_PATH_PROMPT: &str = "Provide the path to the ecosystem contracts or keep it empty and you will be added to ZkSync ecosystem";
+pub(super) const MSG_L1_RPC_URL_INVALID_ERR: &str = "Invalid RPC URL";
+pub(super) const MSG_ECOSYSTEM_CONTRACTS_PATH_INVALID_ERR: &str = "Invalid path";
+pub(super) const MSG_GENESIS_DATABASE_ERR: &str = "Unable to perform genesis on the database";
+pub(super) const MSG_CHAIN_NOT_FOUND_ERR: &str = "Chain not found";
+pub(super) const MSG_INITIALIZING_ECOSYSTEM: &str = "Initializing ecosystem";
+pub(super) const MSG_DEPLOYING_ERC20: &str = "Deploying ERC20 contracts";
+pub(super) const MSG_CHAIN_INITIALIZED: &str = "Chain initialized successfully";
+pub(super) const MSG_DISTRIBUTING_ETH_SPINNER: &str = "Distributing eth...";
+pub(super) const MSG_INTALLING_DEPS_SPINNER: &str = "Installing and building dependencies...";
+pub(super) const MSG_DEPLOYING_ERC20_SPINNER: &str = "Deploying ERC20 contracts...";
+pub(super) const MSG_DEPLOYING_ECOSYSTEM_CONTRACTS_SPINNER: &str =
+    "Deploying ecosystem contracts...";
+pub(super) const MSG_REGISTERING_CHAIN_SPINNER: &str = "Registering chain...";
+pub(super) const MSG_ACCEPTING_ADMIN_SPINNER: &str = "Accepting admin...";
+pub(super) const MSG_RECREATE_ROCKS_DB_ERRROR: &str = "Failed to create rocks db path";
+
+pub(super) fn msg_initializing_chain(chain_name: &str) -> String {
+    format!("Initializing chain {chain_name}")
+}
+
+pub(super) fn msg_ecosystem_initialized(chains: &str) -> String {
+    format!("Ecosystem initialized successfully with chains {chains}")
+}
+
+/// Ecosystem default related messages
+pub(super) const MSG_DEFAULT_CHAIN_PROMPT: &str = "What chain do you want to set as default?";
+
+/// Ecosystem config related messages
+pub(super) const MSG_SAVE_INITIAL_CONFIG_ATTENTION: &str =
+    "ATTENTION: This file contains sensible placeholders. Please check them and update with the desired values.";
+pub(super) const MSG_SAVE_ERC20_CONFIG_ATTENTION: &str =
+    "ATTENTION: This file should be filled with the desired ERC20 tokens to deploy.";
+
+/// Ecosystem change default related messages
+pub(super) fn msg_chain_doesnt_exist_err(chain_name: &str, chains: &Vec<String>) -> String {
+    format!(
+        "Chain with name {} doesnt exist, please choose one of {:?}",
+        chain_name, chains
+    )
+}
+
+/// Chain create related messages
+pub(super) const MSG_PROVER_MODE_HELP: &str = "Prover options";
+pub(super) const MSG_WALLET_CREATION_HELP: &str = "Wallet options";
+pub(super) const MSG_WALLET_PATH_HELP: &str = "Wallet path";
+pub(super) const MSG_L1_COMMIT_DATA_GENERATOR_MODE_HELP: &str = "Commit data generation mode";
+pub(super) const MSG_BASE_TOKEN_ADDRESS_HELP: &str = "Base token address";
+pub(super) const MSG_BASE_TOKEN_PRICE_NOMINATOR_HELP: &str = "Base token nominator";
+pub(super) const MSG_BASE_TOKEN_PRICE_DENOMINATOR_HELP: &str = "Base token denominator";
+pub(super) const MSG_SET_AS_DEFAULT_HELP: &str = "Set as default chain";
+pub(super) const MSG_CHAIN_NAME_PROMPT: &str = "What do you want to name the chain?";
+pub(super) const MSG_CHAIN_ID_PROMPT: &str = "What's the chain id?";
+pub(super) const MSG_WALLET_CREATION_PROMPT: &str = "Select how do you want to create the wallet";
+pub(super) const MSG_PROVER_VERSION_PROMPT: &str = "Select the prover mode";
+pub(super) const MSG_L1_BATCH_COMMIT_DATA_GENERATOR_MODE_PROMPT: &str =
+    "Select the commit data generator mode";
+pub(super) const MSG_WALLET_PATH_PROMPT: &str = "What is the wallet path?";
+pub(super) const MSG_BASE_TOKEN_SELECTION_PROMPT: &str = "Select the base token to use";
+pub(super) const MSG_BASE_TOKEN_ADDRESS_PROMPT: &str = "What is the token address?";
+pub(super) const MSG_BASE_TOKEN_PRICE_NOMINATOR_PROMPT: &str =
+    "What is the base token price nominator?";
+pub(super) const MSG_BASE_TOKEN_PRICE_DENOMINATOR_PROMPT: &str =
+    "What is the base token price denominator?";
+pub(super) const MSG_SET_AS_DEFAULT_PROMPT: &str = "Set this chain as default?";
+pub(super) const MSG_WALLET_PATH_INVALID_ERR: &str = "Invalid path";
+pub(super) const MSG_NUMBER_VALIDATOR_NOT_ZERO_ERR: &str = "Number is not zero";
+pub(super) const MSG_NUMBER_VALIDATOR_GREATHER_THAN_ZERO_ERR: &str =
+    "Number should be greater than zero";
+pub(super) const MSG_CREATING_CHAIN: &str = "Creating chain";
+pub(super) const MSG_CHAIN_CREATED: &str = "Chain created successfully";
+pub(super) const MSG_CREATING_CHAIN_CONFIGURATIONS_SPINNER: &str =
+    "Creating chain configurations...";
+
+/// Chain genesis related messages
+pub(super) const MSG_SERVER_DB_URL_HELP: &str = "Server database url without database name";
+pub(super) const MSG_SERVER_DB_NAME_HELP: &str = "Server database name";
+pub(super) const MSG_PROVER_DB_URL_HELP: &str = "Prover database url without database name";
+pub(super) const MSG_PROVER_DB_NAME_HELP: &str = "Prover database name";
+pub(super) const MSG_USE_DEFAULT_DATABASES_HELP: &str = "Use default database urls and names";
+pub(super) const MSG_GENESIS_COMPLETED: &str = "Genesis completed successfully";
+pub(super) const MSG_STARTING_GENESIS: &str = "Starting genesis process";
+pub(super) const MSG_INITIALIZING_DATABASES_SPINNER: &str = "Initializing databases...";
+pub(super) const MSG_STARTING_GENESIS_SPINNER: &str =
+    "Starting the genesis of the server. Building the entire server may take a lot of time...";
+pub(super) const MSG_INITIALIZING_SERVER_DATABASE: &str = "Initializing server database";
+pub(super) const MSG_FAILED_TO_DROP_SERVER_DATABASE_ERR: &str = "Failed to drop server database";
+pub(super) const MSG_INITIALIZING_PROVER_DATABASE: &str = "Initializing prover database";
+pub(super) const MSG_FAILED_TO_DROP_PROVER_DATABASE_ERR: &str = "Failed to drop prover database";
+
+pub(super) fn msg_server_db_url_prompt(chain_name: &str) -> String {
+    format!("Please provide server database url for chain {chain_name}")
+}
+
+pub(super) fn msg_external_node_db_url_prompt(chain_name: &str) -> String {
+    format!("Please provide external_node database url for chain {chain_name}")
+}
+
+pub(super) fn msg_prover_db_url_prompt(chain_name: &str) -> String {
+    format!("Please provide prover database url for chain {chain_name}")
+}
+
+pub(super) fn msg_prover_db_name_prompt(chain_name: &str) -> String {
+    format!("Please provide prover database name for chain {chain_name}")
+}
+
+pub(super) fn msg_external_node_db_name_prompt(chain_name: &str) -> String {
+    format!("Please provide external_node database name for chain {chain_name}")
+}
+
+pub(super) fn msg_server_db_name_prompt(chain_name: &str) -> String {
+    format!("Please provide server database name for chain {chain_name}")
+}
+
+/// Chain initialize bridges related messages
+pub(super) const MSG_INITIALIZING_BRIDGES_SPINNER: &str = "Initializing bridges";
+
+/// Chain deploy paymaster related messages
+pub(super) const MSG_DEPLOYING_PAYMASTER: &str = "Deploying paymaster";
+
+/// Run server related messages
+pub(super) const MSG_SERVER_COMPONENTS_HELP: &str = "Components of server to run";
+pub(super) const MSG_SERVER_GENESIS_HELP: &str = "Run server in genesis mode";
+pub(super) const MSG_SERVER_ADDITIONAL_ARGS_HELP: &str =
+    "Additional arguments that can be passed through the CLI";
+pub(super) const MSG_SERVER_BUILD_HELP: &str = "Build server but don't run it";
+
+/// Accept ownership related messages
+pub(super) const MSG_ACCEPTING_GOVERNANCE_SPINNER: &str = "Accepting governance...";
+
+/// Containers related messages
+pub(super) const MSG_STARTING_CONTAINERS: &str = "Starting containers";
+pub(super) const MSG_STARTING_DOCKER_CONTAINERS_SPINNER: &str =
+    "Starting containers using docker...";
+pub(super) const MSG_CONTAINERS_STARTED: &str = "Containers started successfully";
+pub(super) const MSG_RETRY_START_CONTAINERS_PROMPT: &str =
+    "Failed to start containers. Make sure there is nothing running on default ports for Ethereum node l1 and postgres. Want to try again?";
+pub(super) const MSG_FAILED_TO_FIND_ECOSYSTEM_ERR: &str = "Failed to find ecosystem folder.";
+
+/// Server related messages
+pub(super) const MSG_STARTING_SERVER: &str = "Starting server";
+pub(super) const MSG_FAILED_TO_RUN_SERVER_ERR: &str = "Failed to start server";
+pub(super) const MSG_BUILDING_L1_CONTRACTS: &str = "Building L1 contracts...";
+pub(super) const MSG_PREPARING_EN_CONFIGS: &str = "Preparing External Node config";
+
+/// Forge utils related messages
+pub(super) const MSG_DEPLOYER_PK_NOT_SET_ERR: &str = "Deployer private key is not set";
+
+pub(super) fn msg_address_doesnt_have_enough_money_prompt(
+    address: &H160,
+    actual: U256,
+    expected: U256,
+) -> String {
+    let actual = format_ether(actual);
+    let expected = format_ether(expected);
+    format!(
+        "Address {address:?} doesn't have enough money to deploy contracts only {actual} ETH but expected: {expected} ETH do you want to try again?"
+    )
+}
+
+pub(super) fn msg_preparing_en_config_is_done(path: &Path) -> String {
+    format!("External nodes configs could be found in: {path:?}")
+}
+
+pub(super) const MSG_EXTERNAL_NODE_CONFIG_NOT_INITIALIZED: &str =
+    "External node is not initialized";
+
+pub(super) const MSG_STARTING_EN: &str = "Starting external node";
+
+/// Prover related messages
+pub(super) const MSG_GENERATING_SK_SPINNER: &str = "Generating setup keys...";
+pub(super) const MSG_SK_GENERATED: &str = "Setup keys generated successfully";
+pub(super) const MSG_PROOF_STORE_CONFIG_PROMPT: &str =
+    "Select where you would like to store the proofs";
+pub(super) const MSG_PROOF_STORE_DIR_PROMPT: &str =
+    "Provide the path where you would like to store the proofs:";
+pub(super) const MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_PROMPT: &str =
+    "Provide the base URL of the GCS bucket (e.g., gs://bucket-name):";
+pub(super) const MSG_PROOF_STORE_GCS_BUCKET_BASE_URL_ERR: &str =
+    "Bucket base URL should start with gs://";
+pub(super) const MSG_PROOF_STORE_GCS_CREDENTIALS_FILE_PROMPT: &str =
+    "Provide the path to the GCS credentials file:";
+pub(super) const MSG_GENERAL_CONFIG_NOT_FOUND_ERR: &str = "General config not found";
+pub(super) const MSG_PROVER_CONFIG_NOT_FOUND_ERR: &str = "Prover config not found";
+pub(super) const MSG_PROVER_INITIALIZED: &str = "Prover has been initialized successfully";
+pub(super) const MSG_CREATE_GCS_BUCKET_PROMPT: &str = "Do you want to create a new GCS bucket?";
+pub(super) const MSG_CREATE_GCS_BUCKET_PROJECT_ID_PROMPT: &str = "Select the project ID:";
+pub(super) const MSG_CREATE_GCS_BUCKET_PROJECT_ID_NO_PROJECTS_PROMPT: &str =
+    "Provide a project ID:";
+pub(super) const MSG_CREATE_GCS_BUCKET_NAME_PROMTP: &str = "What do you want to name the bucket?";
+pub(super) const MSG_CREATE_GCS_BUCKET_LOCATION_PROMPT: &str = "What location do you want to use? Find available locations at https://cloud.google.com/storage/docs/locations";
+pub(super) const MSG_PROOF_COMPRESSOR_CONFIG_NOT_FOUND_ERR: &str =
+    "Proof compressor config not found";
+pub(super) const MSG_DOWNLOADING_SETUP_KEY_SPINNER: &str = "Downloading setup key...";
+pub(super) const MSG_DOWNLOAD_SETUP_KEY_PROMPT: &str = "Do you want to download the setup key?";
+pub(super) const MSG_SETUP_KEY_PATH_PROMPT: &str = "Provide the path to the setup key:";
+pub(super) const MSG_GETTING_GCP_PROJECTS_SPINNER: &str = "Getting GCP projects...";
+pub(super) const MSG_GETTING_PROOF_STORE_CONFIG: &str = "Getting proof store configuration...";
+pub(super) const MSG_GETTING_PUBLIC_STORE_CONFIG: &str = "Getting public store configuration...";
+pub(super) const MSG_CREATING_GCS_BUCKET_SPINNER: &str = "Creating GCS bucket...";
+pub(super) const MSG_SAVE_TO_PUBLIC_BUCKET_PROMPT: &str = "Do you want to save to public bucket?";
+
+pub(super) fn msg_bucket_created(bucket_name: &str) -> String {
+    format!("Bucket created successfully with url: gs://{bucket_name}")
+}
diff --git a/zk_toolbox/crates/zk_inception/src/utils/forge.rs b/zk_toolbox/crates/zk_inception/src/utils/forge.rs
new file mode 100644
index 000000000000..cabc8ff7566b
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/utils/forge.rs
@@ -0,0 +1,41 @@
+use anyhow::anyhow;
+use common::forge::ForgeScript;
+use ethers::types::{H256, U256};
+
+use crate::{
+    consts::MINIMUM_BALANCE_FOR_WALLET,
+    messages::{msg_address_doesnt_have_enough_money_prompt, MSG_DEPLOYER_PK_NOT_SET_ERR},
+};
+
+pub fn fill_forge_private_key(
+    mut forge: ForgeScript,
+    private_key: Option<H256>,
+) -> anyhow::Result<ForgeScript> {
+    if !forge.wallet_args_passed() {
+        forge = forge.with_private_key(private_key.ok_or(anyhow!(MSG_DEPLOYER_PK_NOT_SET_ERR))?);
+    }
+    Ok(forge)
+}
+
+pub async fn check_the_balance(forge: &ForgeScript) -> anyhow::Result<()> {
+    let Some(address) = forge.address() else {
+        return Ok(());
+    };
+
+    let expected_balance = U256::from(MINIMUM_BALANCE_FOR_WALLET);
+    while let Some(balance) = forge.get_the_balance().await? {
+        if balance >= expected_balance {
+            return Ok(());
+        }
+        if !common::PromptConfirm::new(msg_address_doesnt_have_enough_money_prompt(
+            &address,
+            balance,
+            expected_balance,
+        ))
+        .ask()
+        {
+            break;
+        }
+    }
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_inception/src/utils/mod.rs b/zk_toolbox/crates/zk_inception/src/utils/mod.rs
new file mode 100644
index 000000000000..a84f0a336de5
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/utils/mod.rs
@@ -0,0 +1,2 @@
+pub mod forge;
+pub mod rocks_db;
diff --git a/zk_toolbox/crates/zk_inception/src/utils/rocks_db.rs b/zk_toolbox/crates/zk_inception/src/utils/rocks_db.rs
new file mode 100644
index 000000000000..fc80aca100bc
--- /dev/null
+++ b/zk_toolbox/crates/zk_inception/src/utils/rocks_db.rs
@@ -0,0 +1,39 @@
+use std::path::Path;
+
+use config::RocksDbs;
+use xshell::Shell;
+
+use crate::defaults::{
+    EN_ROCKS_DB_PREFIX, MAIN_ROCKS_DB_PREFIX, ROCKS_DB_STATE_KEEPER, ROCKS_DB_TREE,
+};
+
+pub enum RocksDBDirOption {
+    Main,
+    ExternalNode,
+}
+
+impl RocksDBDirOption {
+    pub fn prefix(&self) -> &str {
+        match self {
+            RocksDBDirOption::Main => MAIN_ROCKS_DB_PREFIX,
+            RocksDBDirOption::ExternalNode => EN_ROCKS_DB_PREFIX,
+        }
+    }
+}
+
+pub fn recreate_rocksdb_dirs(
+    shell: &Shell,
+    rocks_db_path: &Path,
+    option: RocksDBDirOption,
+) -> anyhow::Result<RocksDbs> {
+    let state_keeper = rocks_db_path
+        .join(option.prefix())
+        .join(ROCKS_DB_STATE_KEEPER);
+    shell.remove_path(&state_keeper)?;
+    let merkle_tree = rocks_db_path.join(option.prefix()).join(ROCKS_DB_TREE);
+    shell.remove_path(&merkle_tree)?;
+    Ok(RocksDbs {
+        state_keeper: shell.create_dir(state_keeper)?,
+        merkle_tree: shell.create_dir(merkle_tree)?,
+    })
+}
diff --git a/zk_toolbox/crates/zk_supervisor/Cargo.toml b/zk_toolbox/crates/zk_supervisor/Cargo.toml
new file mode 100644
index 000000000000..d8f5d7862a04
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "zk_supervisor"
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+license.workspace = true
+authors.workspace = true
+exclude.workspace = true
+repository.workspace = true
+description.workspace = true
+keywords.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+clap.workspace = true
+common.workspace = true
+config.workspace = true
+human-panic.workspace = true
+strum.workspace = true
+strum_macros.workspace = true
+tokio.workspace = true
+url.workspace = true
+xshell.workspace = true
+serde.workspace = true
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/args/mod.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/args/mod.rs
new file mode 100644
index 000000000000..1541e7f518d8
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/args/mod.rs
@@ -0,0 +1,41 @@
+use clap::Parser;
+
+use crate::{
+    dals::SelectedDals,
+    messages::{MSG_DATABASE_COMMON_CORE_HELP, MSG_DATABASE_COMMON_PROVER_HELP},
+};
+
+pub mod new_migration;
+
+#[derive(Debug, Parser)]
+pub struct DatabaseCommonArgs {
+    #[clap(short, long, default_missing_value = "true", num_args = 0..=1, help = MSG_DATABASE_COMMON_PROVER_HELP)]
+    pub prover: Option<bool>,
+    #[clap(short, long, default_missing_value = "true", num_args = 0..=1, help = MSG_DATABASE_COMMON_CORE_HELP)]
+    pub core: Option<bool>,
+}
+
+impl DatabaseCommonArgs {
+    pub fn parse(self) -> DatabaseCommonArgsFinal {
+        if self.prover.is_none() && self.core.is_none() {
+            return DatabaseCommonArgsFinal {
+                selected_dals: SelectedDals {
+                    prover: true,
+                    core: true,
+                },
+            };
+        }
+
+        DatabaseCommonArgsFinal {
+            selected_dals: SelectedDals {
+                prover: self.prover.unwrap_or(false),
+                core: self.core.unwrap_or(false),
+            },
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct DatabaseCommonArgsFinal {
+    pub selected_dals: SelectedDals,
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/args/new_migration.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/args/new_migration.rs
new file mode 100644
index 000000000000..ef053ca50c77
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/args/new_migration.rs
@@ -0,0 +1,49 @@
+use clap::{Parser, ValueEnum};
+use common::{Prompt, PromptSelect};
+use strum::IntoEnumIterator;
+use strum_macros::{Display, EnumIter};
+
+use crate::messages::{
+    MSG_DATABASE_NEW_MIGRATION_DATABASE_HELP, MSG_DATABASE_NEW_MIGRATION_DB_PROMPT,
+    MSG_DATABASE_NEW_MIGRATION_NAME_HELP, MSG_DATABASE_NEW_MIGRATION_NAME_PROMPT,
+};
+
+#[derive(Debug, Parser)]
+pub struct DatabaseNewMigrationArgs {
+    #[clap(long, help = MSG_DATABASE_NEW_MIGRATION_DATABASE_HELP)]
+    pub database: Option<SelectedDatabase>,
+    #[clap(long, help = MSG_DATABASE_NEW_MIGRATION_NAME_HELP)]
+    pub name: Option<String>,
+}
+
+impl DatabaseNewMigrationArgs {
+    pub fn fill_values_with_prompt(self) -> DatabaseNewMigrationArgsFinal {
+        let selected_database = self.database.unwrap_or_else(|| {
+            PromptSelect::new(
+                MSG_DATABASE_NEW_MIGRATION_DB_PROMPT,
+                SelectedDatabase::iter(),
+            )
+            .ask()
+        });
+        let name = self
+            .name
+            .unwrap_or_else(|| Prompt::new(MSG_DATABASE_NEW_MIGRATION_NAME_PROMPT).ask());
+
+        DatabaseNewMigrationArgsFinal {
+            selected_database,
+            name,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct DatabaseNewMigrationArgsFinal {
+    pub selected_database: SelectedDatabase,
+    pub name: String,
+}
+
+#[derive(Debug, Clone, ValueEnum, EnumIter, PartialEq, Eq, Display)]
+pub enum SelectedDatabase {
+    Prover,
+    Core,
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/check_sqlx_data.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/check_sqlx_data.rs
new file mode 100644
index 000000000000..6a5bc663dc7f
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/check_sqlx_data.rs
@@ -0,0 +1,59 @@
+use std::path::Path;
+
+use common::{cmd::Cmd, logger, spinner::Spinner};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use super::args::DatabaseCommonArgs;
+use crate::{
+    dals::{get_dals, Dal},
+    messages::{
+        msg_database_info, msg_database_loading, msg_database_success,
+        MSG_DATABASE_CHECK_SQLX_DATA_GERUND, MSG_DATABASE_CHECK_SQLX_DATA_PAST,
+        MSG_NO_DATABASES_SELECTED,
+    },
+};
+
+pub fn run(shell: &Shell, args: DatabaseCommonArgs) -> anyhow::Result<()> {
+    let args = args.parse();
+    if args.selected_dals.none() {
+        logger::outro(MSG_NO_DATABASES_SELECTED);
+        return Ok(());
+    }
+
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    logger::info(msg_database_info(MSG_DATABASE_CHECK_SQLX_DATA_GERUND));
+
+    let dals = get_dals(shell, &args.selected_dals)?;
+    for dal in dals {
+        check_sqlx_data(shell, &ecosystem_config.link_to_code, dal)?;
+    }
+
+    logger::outro(msg_database_success(MSG_DATABASE_CHECK_SQLX_DATA_PAST));
+
+    Ok(())
+}
+
+pub fn check_sqlx_data(
+    shell: &Shell,
+    link_to_code: impl AsRef<Path>,
+    dal: Dal,
+) -> anyhow::Result<()> {
+    let dir = link_to_code.as_ref().join(&dal.path);
+    let _dir_guard = shell.push_dir(dir);
+    let url = dal.url.as_str();
+
+    let spinner = Spinner::new(&msg_database_loading(
+        MSG_DATABASE_CHECK_SQLX_DATA_GERUND,
+        &dal.path,
+    ));
+    Cmd::new(cmd!(
+        shell,
+        "cargo sqlx prepare --check --database-url {url} -- --tests"
+    ))
+    .run()?;
+    spinner.finish();
+
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/drop.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/drop.rs
new file mode 100644
index 000000000000..fb6996b40ee3
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/drop.rs
@@ -0,0 +1,42 @@
+use common::{
+    db::{drop_db_if_exists, DatabaseConfig},
+    logger,
+    spinner::Spinner,
+};
+use xshell::Shell;
+
+use super::args::DatabaseCommonArgs;
+use crate::{
+    dals::{get_dals, Dal},
+    messages::{
+        msg_database_info, msg_database_loading, msg_database_success, MSG_DATABASE_DROP_GERUND,
+        MSG_DATABASE_DROP_PAST, MSG_NO_DATABASES_SELECTED,
+    },
+};
+
+pub async fn run(shell: &Shell, args: DatabaseCommonArgs) -> anyhow::Result<()> {
+    let args = args.parse();
+    if args.selected_dals.none() {
+        logger::outro(MSG_NO_DATABASES_SELECTED);
+        return Ok(());
+    }
+
+    logger::info(msg_database_info(MSG_DATABASE_DROP_GERUND));
+
+    let dals = get_dals(shell, &args.selected_dals)?;
+    for dal in dals {
+        drop_database(dal).await?;
+    }
+
+    logger::outro(msg_database_success(MSG_DATABASE_DROP_PAST));
+
+    Ok(())
+}
+
+pub async fn drop_database(dal: Dal) -> anyhow::Result<()> {
+    let spinner = Spinner::new(&msg_database_loading(MSG_DATABASE_DROP_GERUND, &dal.path));
+    let db = DatabaseConfig::from_url(dal.url)?;
+    drop_db_if_exists(&db).await?;
+    spinner.finish();
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/migrate.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/migrate.rs
new file mode 100644
index 000000000000..72bc7d59148e
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/migrate.rs
@@ -0,0 +1,54 @@
+use std::path::Path;
+
+use common::{cmd::Cmd, logger, spinner::Spinner};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use super::args::DatabaseCommonArgs;
+use crate::{
+    dals::{get_dals, Dal},
+    messages::{
+        msg_database_info, msg_database_loading, msg_database_success, MSG_DATABASE_MIGRATE_GERUND,
+        MSG_DATABASE_MIGRATE_PAST, MSG_NO_DATABASES_SELECTED,
+    },
+};
+
+pub fn run(shell: &Shell, args: DatabaseCommonArgs) -> anyhow::Result<()> {
+    let args = args.parse();
+    if args.selected_dals.none() {
+        logger::outro(MSG_NO_DATABASES_SELECTED);
+        return Ok(());
+    }
+
+    logger::info(msg_database_info(MSG_DATABASE_MIGRATE_GERUND));
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    let dals = get_dals(shell, &args.selected_dals)?;
+    for dal in dals {
+        migrate_database(shell, &ecosystem_config.link_to_code, dal)?;
+    }
+
+    logger::outro(msg_database_success(MSG_DATABASE_MIGRATE_PAST));
+
+    Ok(())
+}
+
+fn migrate_database(shell: &Shell, link_to_code: impl AsRef<Path>, dal: Dal) -> anyhow::Result<()> {
+    let dir = link_to_code.as_ref().join(&dal.path);
+    let _dir_guard = shell.push_dir(dir);
+    let url = dal.url.as_str();
+
+    let spinner = Spinner::new(&msg_database_loading(
+        MSG_DATABASE_MIGRATE_GERUND,
+        &dal.path,
+    ));
+    Cmd::new(cmd!(
+        shell,
+        "cargo sqlx database create --database-url {url}"
+    ))
+    .run()?;
+    Cmd::new(cmd!(shell, "cargo sqlx migrate run --database-url {url}")).run()?;
+    spinner.finish();
+
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/mod.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/mod.rs
new file mode 100644
index 000000000000..74c4063a6974
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/mod.rs
@@ -0,0 +1,48 @@
+use clap::Subcommand;
+use xshell::Shell;
+
+use self::args::{new_migration::DatabaseNewMigrationArgs, DatabaseCommonArgs};
+use crate::messages::{
+    MSG_DATABASE_CHECK_SQLX_DATA_ABOUT, MSG_DATABASE_DROP_ABOUT, MSG_DATABASE_MIGRATE_ABOUT,
+    MSG_DATABASE_NEW_MIGRATION_ABOUT, MSG_DATABASE_PREPARE_ABOUT, MSG_DATABASE_RESET_ABOUT,
+    MSG_DATABASE_SETUP_ABOUT,
+};
+
+mod args;
+mod check_sqlx_data;
+mod drop;
+mod migrate;
+mod new_migration;
+mod prepare;
+mod reset;
+mod setup;
+
+#[derive(Subcommand, Debug)]
+pub enum DatabaseCommands {
+    #[clap(about = MSG_DATABASE_CHECK_SQLX_DATA_ABOUT)]
+    CheckSqlxData(DatabaseCommonArgs),
+    #[clap(about = MSG_DATABASE_DROP_ABOUT)]
+    Drop(DatabaseCommonArgs),
+    #[clap(about = MSG_DATABASE_MIGRATE_ABOUT)]
+    Migrate(DatabaseCommonArgs),
+    #[clap(about = MSG_DATABASE_NEW_MIGRATION_ABOUT)]
+    NewMigration(DatabaseNewMigrationArgs),
+    #[clap(about = MSG_DATABASE_PREPARE_ABOUT)]
+    Prepare(DatabaseCommonArgs),
+    #[clap(about = MSG_DATABASE_RESET_ABOUT)]
+    Reset(DatabaseCommonArgs),
+    #[clap(about = MSG_DATABASE_SETUP_ABOUT)]
+    Setup(DatabaseCommonArgs),
+}
+
+pub async fn run(shell: &Shell, args: DatabaseCommands) -> anyhow::Result<()> {
+    match args {
+        DatabaseCommands::CheckSqlxData(args) => check_sqlx_data::run(shell, args),
+        DatabaseCommands::Drop(args) => drop::run(shell, args).await,
+        DatabaseCommands::Migrate(args) => migrate::run(shell, args),
+        DatabaseCommands::NewMigration(args) => new_migration::run(shell, args),
+        DatabaseCommands::Prepare(args) => prepare::run(shell, args),
+        DatabaseCommands::Reset(args) => reset::run(shell, args).await,
+        DatabaseCommands::Setup(args) => setup::run(shell, args),
+    }
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/new_migration.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/new_migration.rs
new file mode 100644
index 000000000000..127e01bdc10f
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/new_migration.rs
@@ -0,0 +1,43 @@
+use std::path::Path;
+
+use common::{cmd::Cmd, logger, spinner::Spinner};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use super::args::new_migration::{DatabaseNewMigrationArgs, SelectedDatabase};
+use crate::{
+    dals::{get_core_dal, get_prover_dal, Dal},
+    messages::{msg_database_new_migration_loading, MSG_DATABASE_NEW_MIGRATION_SUCCESS},
+};
+
+pub fn run(shell: &Shell, args: DatabaseNewMigrationArgs) -> anyhow::Result<()> {
+    let args = args.fill_values_with_prompt();
+
+    let dal = match args.selected_database {
+        SelectedDatabase::Core => get_core_dal(shell)?,
+        SelectedDatabase::Prover => get_prover_dal(shell)?,
+    };
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    generate_migration(shell, ecosystem_config.link_to_code, dal, args.name)?;
+
+    logger::outro(MSG_DATABASE_NEW_MIGRATION_SUCCESS);
+
+    Ok(())
+}
+
+fn generate_migration(
+    shell: &Shell,
+    link_to_code: impl AsRef<Path>,
+    dal: Dal,
+    name: String,
+) -> anyhow::Result<()> {
+    let dir = link_to_code.as_ref().join(&dal.path);
+    let _dir_guard = shell.push_dir(dir);
+
+    let spinner = Spinner::new(&msg_database_new_migration_loading(&dal.path));
+    Cmd::new(cmd!(shell, "cargo sqlx migrate add -r {name}")).run()?;
+    spinner.finish();
+
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/prepare.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/prepare.rs
new file mode 100644
index 000000000000..48f32319ac55
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/prepare.rs
@@ -0,0 +1,58 @@
+use std::path::Path;
+
+use common::{cmd::Cmd, logger, spinner::Spinner};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use super::args::DatabaseCommonArgs;
+use crate::{
+    dals::{get_dals, Dal},
+    messages::{
+        msg_database_info, msg_database_loading, msg_database_success, MSG_DATABASE_PREPARE_GERUND,
+        MSG_DATABASE_PREPARE_PAST, MSG_NO_DATABASES_SELECTED,
+    },
+};
+
+pub fn run(shell: &Shell, args: DatabaseCommonArgs) -> anyhow::Result<()> {
+    let args = args.parse();
+    if args.selected_dals.none() {
+        logger::outro(MSG_NO_DATABASES_SELECTED);
+        return Ok(());
+    }
+
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    logger::info(msg_database_info(MSG_DATABASE_PREPARE_GERUND));
+
+    let dals = get_dals(shell, &args.selected_dals)?;
+    for dal in dals {
+        prepare_sqlx_data(shell, &ecosystem_config.link_to_code, dal)?;
+    }
+
+    logger::outro(msg_database_success(MSG_DATABASE_PREPARE_PAST));
+
+    Ok(())
+}
+
+pub fn prepare_sqlx_data(
+    shell: &Shell,
+    link_to_code: impl AsRef<Path>,
+    dal: Dal,
+) -> anyhow::Result<()> {
+    let dir = link_to_code.as_ref().join(&dal.path);
+    let _dir_guard = shell.push_dir(dir);
+    let url = dal.url.as_str();
+
+    let spinner = Spinner::new(&msg_database_loading(
+        MSG_DATABASE_PREPARE_GERUND,
+        &dal.path,
+    ));
+    Cmd::new(cmd!(
+        shell,
+        "cargo sqlx prepare --database-url {url} -- --tests"
+    ))
+    .run()?;
+    spinner.finish();
+
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/reset.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/reset.rs
new file mode 100644
index 000000000000..aa813a155510
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/reset.rs
@@ -0,0 +1,46 @@
+use std::path::Path;
+
+use common::logger;
+use config::EcosystemConfig;
+use xshell::Shell;
+
+use super::{args::DatabaseCommonArgs, drop::drop_database, setup::setup_database};
+use crate::{
+    dals::{get_dals, Dal},
+    messages::{
+        msg_database_info, msg_database_loading, msg_database_success, MSG_DATABASE_RESET_GERUND,
+        MSG_DATABASE_RESET_PAST, MSG_NO_DATABASES_SELECTED,
+    },
+};
+
+pub async fn run(shell: &Shell, args: DatabaseCommonArgs) -> anyhow::Result<()> {
+    let args = args.parse();
+    if args.selected_dals.none() {
+        logger::outro(MSG_NO_DATABASES_SELECTED);
+        return Ok(());
+    }
+
+    let ecoseystem_config = EcosystemConfig::from_file(shell)?;
+
+    logger::info(msg_database_info(MSG_DATABASE_RESET_GERUND));
+
+    let dals = get_dals(shell, &args.selected_dals)?;
+    for dal in dals {
+        logger::info(&msg_database_loading(MSG_DATABASE_RESET_GERUND, &dal.path));
+        reset_database(shell, ecoseystem_config.link_to_code.clone(), dal).await?;
+    }
+
+    logger::outro(msg_database_success(MSG_DATABASE_RESET_PAST));
+
+    Ok(())
+}
+
+async fn reset_database(
+    shell: &Shell,
+    link_to_code: impl AsRef<Path>,
+    dal: Dal,
+) -> anyhow::Result<()> {
+    drop_database(dal.clone()).await?;
+    setup_database(shell, link_to_code, dal)?;
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/database/setup.rs b/zk_toolbox/crates/zk_supervisor/src/commands/database/setup.rs
new file mode 100644
index 000000000000..d9d37041774b
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/database/setup.rs
@@ -0,0 +1,56 @@
+use std::path::Path;
+
+use common::{cmd::Cmd, logger, spinner::Spinner};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use super::args::DatabaseCommonArgs;
+use crate::{
+    dals::{get_dals, Dal},
+    messages::{
+        msg_database_info, msg_database_loading, msg_database_success, MSG_DATABASE_SETUP_GERUND,
+        MSG_DATABASE_SETUP_PAST, MSG_NO_DATABASES_SELECTED,
+    },
+};
+
+pub fn run(shell: &Shell, args: DatabaseCommonArgs) -> anyhow::Result<()> {
+    let args = args.parse();
+    if args.selected_dals.none() {
+        logger::outro(MSG_NO_DATABASES_SELECTED);
+        return Ok(());
+    }
+
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+
+    logger::info(msg_database_info(MSG_DATABASE_SETUP_GERUND));
+
+    let dals = get_dals(shell, &args.selected_dals)?;
+    for dal in dals {
+        setup_database(shell, &ecosystem_config.link_to_code, dal)?;
+    }
+
+    logger::outro(msg_database_success(MSG_DATABASE_SETUP_PAST));
+
+    Ok(())
+}
+
+pub fn setup_database(
+    shell: &Shell,
+    link_to_code: impl AsRef<Path>,
+    dal: Dal,
+) -> anyhow::Result<()> {
+    let dir = link_to_code.as_ref().join(&dal.path);
+    let _dir_guard = shell.push_dir(dir);
+    let url = dal.url.as_str();
+
+    let spinner = Spinner::new(&msg_database_loading(MSG_DATABASE_SETUP_GERUND, &dal.path));
+    Cmd::new(cmd!(
+        shell,
+        "cargo sqlx database create --database-url {url}"
+    ))
+    .run()?;
+    Cmd::new(cmd!(shell, "cargo sqlx migrate run --database-url {url}")).run()?;
+    spinner.finish();
+
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/mod.rs b/zk_toolbox/crates/zk_supervisor/src/commands/mod.rs
new file mode 100644
index 000000000000..90da1b288d48
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/mod.rs
@@ -0,0 +1,2 @@
+pub mod database;
+pub mod test;
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/args/integration.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/args/integration.rs
new file mode 100644
index 000000000000..a41ccf3d48df
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/args/integration.rs
@@ -0,0 +1,10 @@
+use clap::Parser;
+use serde::{Deserialize, Serialize};
+
+use crate::messages::MSG_TESTS_EXTERNAL_NODE_HELP;
+
+#[derive(Debug, Serialize, Deserialize, Parser)]
+pub struct IntegrationArgs {
+    #[clap(short, long, help = MSG_TESTS_EXTERNAL_NODE_HELP)]
+    pub external_node: bool,
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/args/mod.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/args/mod.rs
new file mode 100644
index 000000000000..6a00b2152bdd
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/args/mod.rs
@@ -0,0 +1,2 @@
+pub mod integration;
+pub mod revert;
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/args/revert.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/args/revert.rs
new file mode 100644
index 000000000000..dc78282fd0d6
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/args/revert.rs
@@ -0,0 +1,9 @@
+use clap::Parser;
+
+use crate::messages::MSG_REVERT_TEST_ENABLE_CONSENSUS_HELP;
+
+#[derive(Debug, Parser)]
+pub struct RevertArgs {
+    #[clap(long, help = MSG_REVERT_TEST_ENABLE_CONSENSUS_HELP)]
+    pub enable_consensus: bool,
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/integration.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/integration.rs
new file mode 100644
index 000000000000..f44559fe4e07
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/integration.rs
@@ -0,0 +1,65 @@
+use common::{cmd::Cmd, config::global_config, logger, spinner::Spinner};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use super::args::integration::IntegrationArgs;
+use crate::messages::{
+    msg_integration_tests_run, MSG_INTEGRATION_TESTS_BUILDING_CONTRACTS,
+    MSG_INTEGRATION_TESTS_BUILDING_DEPENDENCIES, MSG_INTEGRATION_TESTS_RUN_SUCCESS,
+};
+
+const TS_INTEGRATION_PATH: &str = "core/tests/ts-integration";
+const CONTRACTS_TEST_DATA_PATH: &str = "etc/contracts-test-data";
+
+pub fn run(shell: &Shell, args: IntegrationArgs) -> anyhow::Result<()> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    shell.change_dir(ecosystem_config.link_to_code.join(TS_INTEGRATION_PATH));
+
+    logger::info(msg_integration_tests_run(args.external_node));
+
+    build_repository(shell, &ecosystem_config)?;
+    build_test_contracts(shell, &ecosystem_config)?;
+
+    let mut command = cmd!(shell, "yarn jest --forceExit --testTimeout 60000")
+        .env("CHAIN_NAME", ecosystem_config.default_chain);
+
+    if args.external_node {
+        command = command.env("EXTERNAL_NODE", format!("{:?}", args.external_node))
+    }
+    if global_config().verbose {
+        command = command.env(
+            "ZKSYNC_DEBUG_LOGS",
+            format!("{:?}", global_config().verbose),
+        )
+    }
+
+    Cmd::new(command).with_force_run().run()?;
+
+    logger::outro(MSG_INTEGRATION_TESTS_RUN_SUCCESS);
+
+    Ok(())
+}
+
+fn build_repository(shell: &Shell, ecosystem_config: &EcosystemConfig) -> anyhow::Result<()> {
+    let _dir_guard = shell.push_dir(&ecosystem_config.link_to_code);
+    let spinner = Spinner::new(MSG_INTEGRATION_TESTS_BUILDING_DEPENDENCIES);
+
+    Cmd::new(cmd!(shell, "yarn install --frozen-lockfile")).run()?;
+    Cmd::new(cmd!(shell, "yarn utils build")).run()?;
+
+    spinner.finish();
+    Ok(())
+}
+
+fn build_test_contracts(shell: &Shell, ecosystem_config: &EcosystemConfig) -> anyhow::Result<()> {
+    let spinner = Spinner::new(MSG_INTEGRATION_TESTS_BUILDING_CONTRACTS);
+
+    Cmd::new(cmd!(shell, "yarn build")).run()?;
+    Cmd::new(cmd!(shell, "yarn build-yul")).run()?;
+
+    let _dir_guard = shell.push_dir(ecosystem_config.link_to_code.join(CONTRACTS_TEST_DATA_PATH));
+    Cmd::new(cmd!(shell, "yarn build")).run()?;
+
+    spinner.finish();
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/mod.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/mod.rs
new file mode 100644
index 000000000000..c930ab0cc0e2
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/mod.rs
@@ -0,0 +1,24 @@
+use args::{integration::IntegrationArgs, revert::RevertArgs};
+use clap::Subcommand;
+use xshell::Shell;
+
+use crate::messages::{MSG_INTEGRATION_TESTS_ABOUT, MSG_REVERT_TEST_ABOUT};
+
+mod args;
+mod integration;
+mod revert;
+
+#[derive(Subcommand, Debug)]
+pub enum TestCommands {
+    #[clap(about = MSG_INTEGRATION_TESTS_ABOUT)]
+    Integration(IntegrationArgs),
+    #[clap(about = MSG_REVERT_TEST_ABOUT)]
+    Revert(RevertArgs),
+}
+
+pub fn run(shell: &Shell, args: TestCommands) -> anyhow::Result<()> {
+    match args {
+        TestCommands::Integration(args) => integration::run(shell, args),
+        TestCommands::Revert(args) => revert::run(shell, args),
+    }
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/revert.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/revert.rs
new file mode 100644
index 000000000000..71de1a2027a3
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/revert.rs
@@ -0,0 +1,50 @@
+use common::{cmd::Cmd, logger, server::Server, spinner::Spinner};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use super::args::revert::RevertArgs;
+use crate::messages::{MSG_REVERT_TEST_RUN_INFO, MSG_REVERT_TEST_RUN_SUCCESS};
+
+const REVERT_TESTS_PATH: &str = "core/tests/revert-test";
+
+pub fn run(shell: &Shell, args: RevertArgs) -> anyhow::Result<()> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    shell.change_dir(ecosystem_config.link_to_code.join(REVERT_TESTS_PATH));
+
+    logger::info(MSG_REVERT_TEST_RUN_INFO);
+    Server::new(None, ecosystem_config.link_to_code.clone()).build(shell)?;
+    install_and_build_dependencies(shell, &ecosystem_config)?;
+    run_test(shell, &args, &ecosystem_config)?;
+    logger::outro(MSG_REVERT_TEST_RUN_SUCCESS);
+
+    Ok(())
+}
+
+fn install_and_build_dependencies(
+    shell: &Shell,
+    ecosystem_config: &EcosystemConfig,
+) -> anyhow::Result<()> {
+    let _dir_guard = shell.push_dir(&ecosystem_config.link_to_code);
+    let spinner = Spinner::new("Installing and building dependencies...");
+    Cmd::new(cmd!(shell, "yarn install")).run()?;
+    Cmd::new(cmd!(shell, "yarn utils build")).run()?;
+    spinner.finish();
+    Ok(())
+}
+
+fn run_test(
+    shell: &Shell,
+    args: &RevertArgs,
+    ecosystem_config: &EcosystemConfig,
+) -> anyhow::Result<()> {
+    Spinner::new("Running test...").freeze();
+
+    let mut cmd = Cmd::new(cmd!(shell, "yarn mocha tests/revert-and-restart.test.ts"))
+        .env("CHAIN_NAME", &ecosystem_config.default_chain);
+    if args.enable_consensus {
+        cmd = cmd.env("ENABLE_CONSENSUS", "true");
+    }
+    cmd.with_force_run().run()?;
+
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/dals.rs b/zk_toolbox/crates/zk_supervisor/src/dals.rs
new file mode 100644
index 000000000000..ae8815c96899
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/dals.rs
@@ -0,0 +1,74 @@
+use anyhow::{anyhow, Context};
+use common::config::global_config;
+use config::{EcosystemConfig, SecretsConfig};
+use url::Url;
+use xshell::Shell;
+
+use crate::messages::{MSG_CHAIN_NOT_FOUND_ERR, MSG_PROVER_URL_MUST_BE_PRESENTED};
+
+const CORE_DAL_PATH: &str = "core/lib/dal";
+const PROVER_DAL_PATH: &str = "prover/prover_dal";
+
+#[derive(Debug, Clone)]
+pub struct SelectedDals {
+    pub prover: bool,
+    pub core: bool,
+}
+
+impl SelectedDals {
+    /// Returns true if no databases are selected
+    pub fn none(&self) -> bool {
+        !self.prover && !self.core
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Dal {
+    pub path: String,
+    pub url: Url,
+}
+
+pub fn get_dals(shell: &Shell, selected_dals: &SelectedDals) -> anyhow::Result<Vec<Dal>> {
+    let mut dals = vec![];
+
+    if selected_dals.prover {
+        dals.push(get_prover_dal(shell)?);
+    }
+    if selected_dals.core {
+        dals.push(get_core_dal(shell)?);
+    }
+
+    Ok(dals)
+}
+
+pub fn get_prover_dal(shell: &Shell) -> anyhow::Result<Dal> {
+    let secrets = get_secrets(shell)?;
+
+    Ok(Dal {
+        path: PROVER_DAL_PATH.to_string(),
+        url: secrets
+            .database
+            .prover_url
+            .context(MSG_PROVER_URL_MUST_BE_PRESENTED)?
+            .clone(),
+    })
+}
+
+pub fn get_core_dal(shell: &Shell) -> anyhow::Result<Dal> {
+    let secrets = get_secrets(shell)?;
+
+    Ok(Dal {
+        path: CORE_DAL_PATH.to_string(),
+        url: secrets.database.server_url.clone(),
+    })
+}
+
+fn get_secrets(shell: &Shell) -> anyhow::Result<SecretsConfig> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    let chain_config = ecosystem_config
+        .load_chain(global_config().chain_name.clone())
+        .ok_or(anyhow!(MSG_CHAIN_NOT_FOUND_ERR))?;
+    let secrets = chain_config.get_secrets_config()?;
+
+    Ok(secrets)
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/main.rs b/zk_toolbox/crates/zk_supervisor/src/main.rs
new file mode 100644
index 000000000000..79c28511c0a1
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/main.rs
@@ -0,0 +1,103 @@
+use clap::{Parser, Subcommand};
+use commands::{database::DatabaseCommands, test::TestCommands};
+use common::{
+    check_general_prerequisites,
+    config::{global_config, init_global_config, GlobalConfig},
+    error::log_error,
+    init_prompt_theme, logger,
+};
+use config::EcosystemConfig;
+use messages::{
+    msg_global_chain_does_not_exist, MSG_SUBCOMMAND_DATABASE_ABOUT, MSG_SUBCOMMAND_TESTS_ABOUT,
+};
+use xshell::Shell;
+
+mod commands;
+mod dals;
+mod messages;
+
+#[derive(Parser, Debug)]
+#[command(version, about)]
+struct Supervisor {
+    #[command(subcommand)]
+    command: SupervisorSubcommands,
+    #[clap(flatten)]
+    global: SupervisorGlobalArgs,
+}
+
+#[derive(Subcommand, Debug)]
+enum SupervisorSubcommands {
+    #[command(subcommand, about = MSG_SUBCOMMAND_DATABASE_ABOUT)]
+    Database(DatabaseCommands),
+    #[command(subcommand, about = MSG_SUBCOMMAND_TESTS_ABOUT)]
+    Test(TestCommands),
+}
+
+#[derive(Parser, Debug)]
+#[clap(next_help_heading = "Global options")]
+struct SupervisorGlobalArgs {
+    /// Verbose mode
+    #[clap(short, long, global = true)]
+    verbose: bool,
+    /// Chain to use
+    #[clap(long, global = true)]
+    chain: Option<String>,
+    /// Ignores prerequisites checks
+    #[clap(long, global = true)]
+    ignore_prerequisites: bool,
+}
+
+#[tokio::main]
+async fn main() -> anyhow::Result<()> {
+    human_panic::setup_panic!();
+
+    init_prompt_theme();
+
+    logger::new_empty_line();
+    logger::intro();
+
+    let shell = Shell::new().unwrap();
+    let args = Supervisor::parse();
+
+    init_global_config_inner(&shell, &args.global)?;
+
+    if !global_config().ignore_prerequisites {
+        check_general_prerequisites(&shell);
+    }
+
+    match run_subcommand(args, &shell).await {
+        Ok(_) => {}
+        Err(error) => {
+            log_error(error);
+            std::process::exit(1);
+        }
+    }
+
+    Ok(())
+}
+
+async fn run_subcommand(args: Supervisor, shell: &Shell) -> anyhow::Result<()> {
+    match args.command {
+        SupervisorSubcommands::Database(command) => commands::database::run(shell, command).await?,
+        SupervisorSubcommands::Test(command) => commands::test::run(shell, command)?,
+    }
+    Ok(())
+}
+
+fn init_global_config_inner(shell: &Shell, args: &SupervisorGlobalArgs) -> anyhow::Result<()> {
+    if let Some(name) = &args.chain {
+        if let Ok(config) = EcosystemConfig::from_file(shell) {
+            let chains = config.list_of_chains();
+            if !chains.contains(name) {
+                anyhow::bail!(msg_global_chain_does_not_exist(name, &chains.join(", ")));
+            }
+        }
+    }
+
+    init_global_config(GlobalConfig {
+        verbose: args.verbose,
+        chain_name: args.chain.clone(),
+        ignore_prerequisites: args.ignore_prerequisites,
+    });
+    Ok(())
+}
diff --git a/zk_toolbox/crates/zk_supervisor/src/messages.rs b/zk_toolbox/crates/zk_supervisor/src/messages.rs
new file mode 100644
index 000000000000..97d30baf1d9e
--- /dev/null
+++ b/zk_toolbox/crates/zk_supervisor/src/messages.rs
@@ -0,0 +1,96 @@
+// Ecosystem related messages
+pub(super) const MSG_CHAIN_NOT_FOUND_ERR: &str = "Chain not found";
+
+pub(super) fn msg_global_chain_does_not_exist(chain: &str, available_chains: &str) -> String {
+    format!("Chain with name {chain} doesnt exist, please choose one of: {available_chains}")
+}
+
+// Subcommands help
+pub(super) const MSG_SUBCOMMAND_DATABASE_ABOUT: &str = "Database related commands";
+pub(super) const MSG_SUBCOMMAND_TESTS_ABOUT: &str = "Run tests";
+
+// Database related messages
+pub(super) const MSG_NO_DATABASES_SELECTED: &str = "No databases selected";
+
+pub(super) fn msg_database_info(gerund_verb: &str) -> String {
+    format!("{gerund_verb} databases")
+}
+
+pub(super) fn msg_database_success(past_verb: &str) -> String {
+    format!("Databases {past_verb} successfully")
+}
+
+pub(super) fn msg_database_loading(gerund_verb: &str, dal: &str) -> String {
+    format!("{gerund_verb} database for dal {dal}...")
+}
+
+pub(super) const MSG_DATABASE_CHECK_SQLX_DATA_GERUND: &str = "Checking";
+pub(super) const MSG_DATABASE_CHECK_SQLX_DATA_PAST: &str = "checked";
+pub(super) const MSG_DATABASE_DROP_GERUND: &str = "Dropping";
+pub(super) const MSG_DATABASE_DROP_PAST: &str = "dropped";
+pub(super) const MSG_DATABASE_MIGRATE_GERUND: &str = "Migrating";
+pub(super) const MSG_DATABASE_MIGRATE_PAST: &str = "migrated";
+pub(super) const MSG_DATABASE_PREPARE_GERUND: &str = "Preparing";
+pub(super) const MSG_DATABASE_PREPARE_PAST: &str = "prepared";
+pub(super) const MSG_DATABASE_RESET_GERUND: &str = "Resetting";
+pub(super) const MSG_DATABASE_RESET_PAST: &str = "reset";
+pub(super) const MSG_DATABASE_SETUP_GERUND: &str = "Setting up";
+pub(super) const MSG_DATABASE_SETUP_PAST: &str = "set up";
+
+pub(super) const MSG_PROVER_URL_MUST_BE_PRESENTED: &str = "Prover url must be presented";
+
+pub(super) const MSG_DATABASE_COMMON_PROVER_HELP: &str = "Prover database";
+pub(super) const MSG_DATABASE_COMMON_CORE_HELP: &str = "Core database";
+pub(super) const MSG_DATABASE_NEW_MIGRATION_DATABASE_HELP: &str =
+    "Database to create new migration for";
+pub(super) const MSG_DATABASE_NEW_MIGRATION_NAME_HELP: &str = "Migration name";
+
+pub(super) const MSG_DATABASE_CHECK_SQLX_DATA_ABOUT: &str = "Check sqlx-data.json is up to date. If no databases are selected, all databases will be checked.";
+pub(super) const MSG_DATABASE_DROP_ABOUT: &str =
+    "Drop databases. If no databases are selected, all databases will be dropped.";
+pub(super) const MSG_DATABASE_MIGRATE_ABOUT: &str =
+    "Migrate databases. If no databases are selected, all databases will be migrated.";
+pub(super) const MSG_DATABASE_NEW_MIGRATION_ABOUT: &str = "Create new migration";
+pub(super) const MSG_DATABASE_PREPARE_ABOUT: &str =
+    "Prepare sqlx-data.json. If no databases are selected, all databases will be prepared.";
+pub(super) const MSG_DATABASE_RESET_ABOUT: &str =
+    "Reset databases. If no databases are selected, all databases will be reset.";
+pub(super) const MSG_DATABASE_SETUP_ABOUT: &str =
+    "Setup databases. If no databases are selected, all databases will be setup.";
+
+// Database new_migration messages
+pub(super) const MSG_DATABASE_NEW_MIGRATION_DB_PROMPT: &str =
+    "What database do you want to create a new migration for?";
+pub(super) const MSG_DATABASE_NEW_MIGRATION_NAME_PROMPT: &str =
+    "How do you want to name the migration?";
+
+pub(super) fn msg_database_new_migration_loading(dal: &str) -> String {
+    format!("Creating new database migration for dal {}...", dal)
+}
+
+pub(super) const MSG_DATABASE_NEW_MIGRATION_SUCCESS: &str = "Migration created successfully";
+
+// Tests related messages
+pub(super) const MSG_INTEGRATION_TESTS_ABOUT: &str = "Run integration tests";
+pub(super) const MSG_REVERT_TEST_ABOUT: &str = "Run revert tests";
+pub(super) const MSG_TESTS_EXTERNAL_NODE_HELP: &str = "Run tests for external node";
+
+// Integration tests related messages
+pub(super) fn msg_integration_tests_run(external_node: bool) -> String {
+    let base = "Running integration tests";
+    if external_node {
+        format!("{} for external node", base)
+    } else {
+        format!("{} for main server", base)
+    }
+}
+
+pub(super) const MSG_INTEGRATION_TESTS_RUN_SUCCESS: &str = "Integration tests ran successfully";
+pub(super) const MSG_INTEGRATION_TESTS_BUILDING_DEPENDENCIES: &str =
+    "Building repository dependencies...";
+pub(super) const MSG_INTEGRATION_TESTS_BUILDING_CONTRACTS: &str = "Building test contracts...";
+
+// Revert tests related messages
+pub(super) const MSG_REVERT_TEST_ENABLE_CONSENSUS_HELP: &str = "Enable consensus";
+pub(super) const MSG_REVERT_TEST_RUN_INFO: &str = "Running revert and restart test";
+pub(super) const MSG_REVERT_TEST_RUN_SUCCESS: &str = "Revert and restart test ran successfully";
diff --git a/zk_toolbox/rust-toolchain b/zk_toolbox/rust-toolchain
new file mode 100644
index 000000000000..54227249d1ff
--- /dev/null
+++ b/zk_toolbox/rust-toolchain
@@ -0,0 +1 @@
+1.78.0